@b3dotfun/sdk 0.0.29 → 0.0.30-alpha.0

package/src/anyspend/react/hooks/useAnyspendFlow.ts

@@ -7,7 +7,7 @@ import {
   useGeoOnrampOptions,
 } from "@b3dotfun/sdk/anyspend/react";
 import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
-import { useAccountWallet, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { useAccountWallet, useProfile, useRouter, useSearchParamsSSR } from "@b3dotfun/sdk/global-account/react";
 import { formatTokenAmount, formatUnits } from "@b3dotfun/sdk/shared/utils/number";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
@@ -35,6 +35,7 @@ interface UseAnyspendFlowProps {
   onTransactionSuccess?: () => void;
   sourceTokenAddress?: string;
   sourceTokenChainId?: number;
+  slippage?: number;
 }
 
 export function useAnyspendFlow({
@@ -46,7 +47,11 @@ export function useAnyspendFlow({
   onTransactionSuccess,
   sourceTokenAddress,
   sourceTokenChainId,
+  slippage = 0,
 }: UseAnyspendFlowProps) {
+  const searchParams = useSearchParamsSSR();
+  const router = useRouter();
+
   // Panel and order state
   const [activePanel, setActivePanel] = useState<PanelView>(loadOrder ? PanelView.ORDER_DETAILS : PanelView.MAIN);
   const [orderId, setOrderId] = useState<string | undefined>(loadOrder);
@@ -82,6 +87,12 @@ export function useAnyspendFlow({
     }
   }, [selectedRecipientAddress, globalAddress]);
 
+  useEffect(() => {
+    if (paymentType === "crypto") {
+      setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+    }
+  }, [paymentType]);
+
   // Fetch specific token when sourceTokenAddress and sourceTokenChainId are provided
   useEffect(() => {
     const fetchSourceToken = async () => {
@@ -135,12 +146,27 @@ export function useAnyspendFlow({
     if (anyspendQuote?.data?.currencyOut?.amount && anyspendQuote.data.currencyOut.currency?.decimals) {
       const amount = anyspendQuote.data.currencyOut.amount;
       const decimals = anyspendQuote.data.currencyOut.currency.decimals;
-      const formattedAmount = formatTokenAmount(BigInt(amount), decimals, 6, false);
+
+      // Apply slippage (0-100) - reduce amount by slippage percentageFixed slippage value
+      const amountWithSlippage = (BigInt(amount) * BigInt(100 - slippage)) / BigInt(100);
+
+      const formattedAmount = formatTokenAmount(amountWithSlippage, decimals, 6, false);
       setDstAmount(formattedAmount);
     } else {
       setDstAmount("");
     }
-  }, [anyspendQuote]);
+  }, [anyspendQuote, slippage]);
+
+  // Update useEffect for URL parameter to not override loadOrder
+  useEffect(() => {
+    if (loadOrder) return; // Skip if we have a loadOrder
+
+    const orderIdParam = searchParams.get("orderId");
+    if (orderIdParam) {
+      setOrderId(orderIdParam);
+      setActivePanel(PanelView.ORDER_DETAILS);
+    }
+  }, [searchParams, loadOrder]);
 
   // Order creation hooks
   const { createOrder, isCreatingOrder } = useAnyspendCreateOrder({
@@ -149,6 +175,18 @@ export function useAnyspendFlow({
       setOrderId(newOrderId);
       setActivePanel(PanelView.ORDER_DETAILS);
       onOrderSuccess?.(newOrderId);
+
+      // Add orderId and payment method to URL for persistence
+      const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
+      params.set("orderId", newOrderId);
+      if (selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+        console.log("Setting cryptoPaymentMethod in URL:", selectedCryptoPaymentMethod);
+        params.set("cryptoPaymentMethod", selectedCryptoPaymentMethod);
+      } else {
+        console.log("Payment method is NONE, not setting in URL");
+      }
+      console.log("Final URL params:", params.toString());
+      router.push(`${window.location.pathname}?${params.toString()}`);
     },
     onError: error => {
       console.error(error);

package/src/bondkit/abis/BondkitTokenABI.ts

@@ -158,11 +158,6 @@ export const BondkitTokenABI = [
     name: "ValidationInvalidLPSplitRatio",
     type: "error",
   },
-  {
-    inputs: [{ internalType: "address", name: "providedAddress", type: "address" }],
-    name: "ValidationInvalidMigrationAdminAddress",
-    type: "error",
-  },
   {
     inputs: [{ internalType: "uint24", name: "value", type: "uint24" }],
     name: "ValidationInvalidV4PoolFee",
@@ -183,6 +178,15 @@ export const BondkitTokenABI = [
     name: "Approval",
     type: "event",
   },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "previousAdmin", type: "address" },
+      { indexed: true, internalType: "address", name: "newAdmin", type: "address" },
+    ],
+    name: "B3AdminUpdated",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [
@@ -234,6 +238,15 @@ export const BondkitTokenABI = [
     name: "BondkitTokenMigrated",
     type: "event",
   },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: false, internalType: "uint256", name: "totalRaisedBonding", type: "uint256" },
+      { indexed: false, internalType: "uint256", name: "targetAmount", type: "uint256" },
+    ],
+    name: "DexTriggerThresholdMet",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [
@@ -302,6 +315,13 @@ export const BondkitTokenABI = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [],
+    name: "b3Admin",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [{ internalType: "address", name: "account", type: "address" }],
     name: "balanceOf",
@@ -323,7 +343,7 @@ export const BondkitTokenABI = [
     ],
     name: "buy",
     outputs: [],
-    stateMutability: "payable",
+    stateMutability: "nonpayable",
     type: "function",
   },
   {
@@ -334,7 +354,7 @@ export const BondkitTokenABI = [
     ],
     name: "buyFor",
     outputs: [],
-    stateMutability: "payable",
+    stateMutability: "nonpayable",
     type: "function",
   },
   {
@@ -397,6 +417,13 @@ export const BondkitTokenABI = [
     stateMutability: "view",
     type: "function",
   },
+  {
+    inputs: [],
+    name: "getB3Admin",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [],
     name: "getBondingCurveConfig",
@@ -539,7 +566,6 @@ export const BondkitTokenABI = [
           { internalType: "uint256", name: "lpSplitRatioFeeRecipientBps", type: "uint256" },
           { internalType: "uint256", name: "targetAmount", type: "uint256" },
           { internalType: "address", name: "tradingToken", type: "address" },
-          { internalType: "address", name: "migrationAdminAddress", type: "address" },
           { internalType: "address", name: "bondingPhaseSplitter", type: "address" },
           { internalType: "address", name: "v4PoolManager", type: "address" },
           { internalType: "address", name: "v4Hook", type: "address" },
@@ -659,6 +685,13 @@ export const BondkitTokenABI = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [{ internalType: "address", name: "_newAdmin", type: "address" }],
+    name: "updateB3Admin",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
   {
     inputs: [{ internalType: "address", name: "_bondingPhaseSplitter", type: "address" }],
     name: "updateSplitter",
@@ -701,5 +734,4 @@ export const BondkitTokenABI = [
     stateMutability: "view",
     type: "function",
   },
-  { stateMutability: "payable", type: "receive" },
 ] as const;

package/src/bondkit/abis/BondkitTokenFactoryABI.ts

@@ -57,11 +57,6 @@ export const BondkitTokenFactoryABI = [
     name: "ValidationInvalidLPSplitRatio",
     type: "error",
   },
-  {
-    inputs: [{ internalType: "address", name: "providedAddress", type: "address" }],
-    name: "ValidationInvalidMigrationAdminAddress",
-    type: "error",
-  },
   {
     inputs: [{ internalType: "uint24", name: "value", type: "uint24" }],
     name: "ValidationInvalidV4PoolFee",
@@ -80,7 +75,6 @@ export const BondkitTokenFactoryABI = [
       { indexed: false, internalType: "string", name: "name", type: "string" },
       { indexed: false, internalType: "string", name: "symbol", type: "string" },
       { indexed: true, internalType: "address", name: "feeRecipient", type: "address" },
-      { indexed: false, internalType: "address", name: "migrationAdmin", type: "address" },
     ],
     name: "BondkitTokenCreated",
     type: "event",
@@ -132,7 +126,6 @@ export const BondkitTokenFactoryABI = [
       { internalType: "uint256", name: "lpSplitRatioFeeRecipientBps", type: "uint256" },
       { internalType: "uint256", name: "targetAmount", type: "uint256" },
       { internalType: "address", name: "tradingToken", type: "address" },
-      { internalType: "address", name: "migrationAdminAddress", type: "address" },
       { internalType: "address", name: "bondingPhaseSplitter", type: "address" },
       { internalType: "address", name: "v4PoolManager", type: "address" },
       { internalType: "address", name: "v4Hook", type: "address" },
@@ -175,7 +168,6 @@ export const BondkitTokenFactoryABI = [
           { internalType: "uint256", name: "lpSplitRatioFeeRecipientBps", type: "uint256" },
           { internalType: "uint256", name: "targetAmount", type: "uint256" },
           { internalType: "address", name: "tradingToken", type: "address" },
-          { internalType: "address", name: "migrationAdminAddress", type: "address" },
           { internalType: "address", name: "bondingPhaseSplitter", type: "address" },
           { internalType: "address", name: "v4PoolManager", type: "address" },
           { internalType: "address", name: "v4Hook", type: "address" },
@@ -227,7 +219,6 @@ export const BondkitTokenFactoryABI = [
           { internalType: "uint256", name: "lpSplitRatioFeeRecipientBps", type: "uint256" },
           { internalType: "uint256", name: "targetAmount", type: "uint256" },
           { internalType: "address", name: "tradingToken", type: "address" },
-          { internalType: "address", name: "migrationAdminAddress", type: "address" },
           { internalType: "address", name: "bondingPhaseSplitter", type: "address" },
           { internalType: "address", name: "v4PoolManager", type: "address" },
           { internalType: "address", name: "v4Hook", type: "address" },

package/src/bondkit/constants.ts

@@ -1,5 +1,5 @@
 import type { Address } from "viem";
 
-export const BaseBondkitTokenFactoryContractAddress: Address = "0x0ccA36e9BE8Fdf456dE4BC20b378B1560Aeb6653";
+export const BaseBondkitTokenFactoryContractAddress: Address = "0x5d641bbB206d4B5585eCCd919F36270200A9A2Ad";
 
 export const BaseMainnetRpcUrl = "https://base-rpc.publicnode.com";

package/src/global-account/react/components/LinkAccount/LinkAccount.tsx

@@ -1,3 +1,4 @@
+import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { Loader2 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
@@ -122,12 +123,20 @@ export function LinkAccount({
           client,
           strategy: "email",
           email,
+          ecosystem: {
+            id: ecosystemWalletId,
+            partnerId: partnerId,
+          },
         });
       } else if (selectedMethod === "phone") {
         await preAuthenticate({
           client,
           strategy: "phone",
           phoneNumber: phone,
+          ecosystem: {
+            id: ecosystemWalletId,
+            partnerId: partnerId,
+          },
         });
       }
 
@@ -142,11 +151,13 @@ export function LinkAccount({
 
   const handleLinkAccount = async () => {
     if (!otp) {
+      console.error("No OTP entered");
       setError("Please enter the verification code");
       return;
     }
 
     try {
+      setOtpSent(false);
       setLinkingState(true, selectedMethod);
       setError(null);
 
@@ -171,15 +182,10 @@ export function LinkAccount({
           mutationOptions,
         );
       }
-
-      onSuccess?.();
-      onClose?.();
     } catch (error) {
       console.error("Error linking account:", error);
       setError(error instanceof Error ? error.message : "Failed to link account");
       onError?.(error as Error);
-    } finally {
-      setLinkingState(false);
     }
   };
 
@@ -239,8 +245,13 @@ export function LinkAccount({
     setLinkingState(false);
   }, [isLinking, setSelectedMethod, setEmail, setPhone, setOtp, setOtpSent, setError, setLinkingState]);
 
-  useEffect(() => {
-    if (isLinking) {
+  const handleFinishedLinking = useCallback(
+    (success: boolean) => {
+      if (success) {
+        onSuccess?.();
+        onClose?.();
+      }
+
       setLinkingState(false);
       navigateBack();
       setB3ModalContentType({
@@ -250,6 +261,13 @@ export function LinkAccount({
         chain,
         partnerId,
       });
+    },
+    [chain, navigateBack, partnerId, setB3ModalContentType, setLinkingState, onSuccess, onClose],
+  );
+
+  useEffect(() => {
+    if (isLinking) {
+      handleFinishedLinking(true);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [profiles.length]);
@@ -338,15 +356,13 @@ export function LinkAccount({
                   className="bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2"
                   value={otp}
                   onChange={e => setOtp(e.target.value)}
-                  disabled={isLinking && linkingMethod === selectedMethod}
                 />
               </div>
               <Button
                 className="bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white"
                 onClick={handleLinkAccount}
-                disabled={!otp || (isLinking && linkingMethod === selectedMethod)}
               >
-                {isLinking && linkingMethod === selectedMethod ? <Loader2 className="animate-spin" /> : "Link Account"}
+                Link Account
               </Button>
             </div>
           ) : (

package/src/global-account/react/components/ManageAccount/ManageAccount.tsx

@@ -597,12 +597,16 @@ export function ManageAccount({
             >
               Mints
             </TabTriggerPrimitive>
+            {/*
+            // TODO: Apps is a remnant of session key flow. Moving forward, we should find a way to properly associate apps from linked partners that a user has logged in with
+            https://linear.app/npclabs/issue/B3-2318/find-a-way-to-properly-display-which-partner-apps-a-user-has-logged-in
+            
             <TabTriggerPrimitive
               value="apps"
               className="data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4"
             >
               Apps
-            </TabTriggerPrimitive>
+            </TabTriggerPrimitive> */}
             <TabTriggerPrimitive
               value="settings"
               className="data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4"

package/src/global-account/react/hooks/useUnifiedChainSwitchAndExecute.ts

@@ -192,6 +192,7 @@ export function useUnifiedChainSwitchAndExecute() {
 
   return {
     switchChainAndExecute,
+    switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,
     isSwitchingOrExecuting,
     isActiveSmartWallet,
     isActiveEOAWallet,

package/src/global-account/react/stores/useModalStore.ts

@@ -289,8 +289,8 @@ export interface AnySpendBondKitProps extends BaseModalProps {
   imageUrl?: string;
   /** Token name to display */
   tokenName?: string;
-  /** Optional pre-filled ETH amount */
-  ethAmount?: string;
+  /** Optional pre-filled B3 amount */
+  b3Amount?: string;
   /** Callback function called when purchase is successful */
   onSuccess?: (txHash?: string) => void;
 }
@@ -318,6 +318,8 @@ export interface AnySpendDepositHypeProps extends BaseModalProps {
   paymentType?: "crypto" | "fiat";
   /** Deposit contract address */
   depositContractAddress: string;
+  /** Main footer */
+  mainFooter?: React.ReactNode;
   /** Callback function called when the deposit is successful */
   onSuccess?: () => void;
 }

package/dist/cjs/anyspend/abis/bondKit.d.ts

@@ -1,35 +0,0 @@
-export declare const ABI_bondKit: readonly [{
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "_recipient";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "_minTokensOut";
-        readonly type: "uint256";
-    }];
-    readonly name: "buyFor";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "name";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "symbol";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}];

package/dist/cjs/anyspend/abis/bondKit.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ABI_bondKit = void 0;
-exports.ABI_bondKit = [
-    {
-        inputs: [
-            { internalType: "address", name: "_recipient", type: "address" },
-            { internalType: "uint256", name: "_minTokensOut", type: "uint256" },
-        ],
-        name: "buyFor",
-        outputs: [],
-        stateMutability: "payable",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "name",
-        outputs: [{ internalType: "string", name: "", type: "string" }],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "symbol",
-        outputs: [{ internalType: "string", name: "", type: "string" }],
-        stateMutability: "view",
-        type: "function",
-    },
-];

package/dist/esm/anyspend/abis/bondKit.d.ts

@@ -1,35 +0,0 @@
-export declare const ABI_bondKit: readonly [{
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "_recipient";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "_minTokensOut";
-        readonly type: "uint256";
-    }];
-    readonly name: "buyFor";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "name";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "symbol";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}];

package/dist/esm/anyspend/abis/bondKit.js

@@ -1,26 +0,0 @@
-export const ABI_bondKit = [
-    {
-        inputs: [
-            { internalType: "address", name: "_recipient", type: "address" },
-            { internalType: "uint256", name: "_minTokensOut", type: "uint256" },
-        ],
-        name: "buyFor",
-        outputs: [],
-        stateMutability: "payable",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "name",
-        outputs: [{ internalType: "string", name: "", type: "string" }],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [],
-        name: "symbol",
-        outputs: [{ internalType: "string", name: "", type: "string" }],
-        stateMutability: "view",
-        type: "function",
-    },
-];

package/dist/types/anyspend/abis/bondKit.d.ts

@@ -1,35 +0,0 @@
-export declare const ABI_bondKit: readonly [{
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "_recipient";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "_minTokensOut";
-        readonly type: "uint256";
-    }];
-    readonly name: "buyFor";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "name";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "symbol";
-    readonly outputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}];

package/src/anyspend/abis/bondKit.ts

@@ -1,26 +0,0 @@
-export const ABI_bondKit = [
-  {
-    inputs: [
-      { internalType: "address", name: "_recipient", type: "address" },
-      { internalType: "uint256", name: "_minTokensOut", type: "uint256" },
-    ],
-    name: "buyFor",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [{ internalType: "string", name: "", type: "string" }],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [{ internalType: "string", name: "", type: "string" }],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;