@b3dotfun/sdk 0.0.50 → 0.0.51-alpha.1

package/dist/cjs/bondkit/bondkitToken.js

@@ -44,9 +44,18 @@ class BondkitToken {
         this.contract = (0, viem_1.getContract)({
             address: this.contractAddress,
             abi: abis_1.BondkitTokenABI,
-            client: this.walletClientInstance,
+            client: {
+                public: this.publicClient,
+                wallet: this.walletClientInstance,
+            },
         });
-        this.contract.read.tradingToken().then(tradingToken => {
+        (0, viem_1.getContract)({
+            address: this.contractAddress,
+            abi: abis_1.BondkitTokenABI,
+            client: this.publicClient, // Use public client for read operations
+        })
+            .read.tradingToken()
+            .then(tradingToken => {
             this.tradingToken = tradingToken;
         });
     }
@@ -66,7 +75,10 @@ class BondkitToken {
             this.contract = (0, viem_1.getContract)({
                 address: this.contractAddress,
                 abi: abis_1.BondkitTokenABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -113,7 +125,10 @@ class BondkitToken {
             this.contract = (0, viem_1.getContract)({
                 address: this.contractAddress,
                 abi: abis_1.BondkitTokenABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -426,7 +441,10 @@ class BondkitToken {
                         this.contract = (0, viem_1.getContract)({
                             address: this.contractAddress,
                             abi: abis_1.BondkitTokenABI,
-                            client: this.walletClientInstance,
+                            client: {
+                                public: this.publicClient,
+                                wallet: this.walletClientInstance,
+                            },
                         });
                     }
                 }
@@ -436,6 +454,19 @@ class BondkitToken {
                 throw new Error("Wallet key not set or client not connected for write operation.");
             }
         }
+        // Only attempt chain switching for browser wallet providers
+        // Private key users cannot switch chains programmatically
+        if (this.connectedProvider && this.walletClientInstance.account) {
+            const walletChainId = await this.walletClientInstance.getChainId();
+            if (walletChainId !== this.chain.id) {
+                try {
+                    await this.walletClientInstance.switchChain({ id: this.chain.id });
+                }
+                catch (switchErr) {
+                    throw new Error(`Please switch your wallet to ${this.chain.name} (${this.chain.id}).`);
+                }
+            }
+        }
         const accountToUse = this.walletKey ? (0, accounts_1.privateKeyToAccount)(this.walletKey) : this.walletClientInstance.account;
         if (!accountToUse)
             throw new Error("Account for transaction could not be determined.");
@@ -530,7 +561,10 @@ class BondkitToken {
             const tradingTokenContract = (0, viem_1.getContract)({
                 address: this.tradingToken,
                 abi: viem_1.erc20Abi,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             const currentAllowance = await tradingTokenContract.read.allowance([
                 this.walletClientInstance.account?.address,

package/dist/cjs/bondkit/bondkitTokenFactory.js

@@ -31,7 +31,10 @@ class BondkitTokenFactory {
         this.contract = (0, viem_1.getContract)({
             address: this.contractAddress,
             abi: abis_1.BondkitTokenFactoryABI,
-            client: this.walletClientInstance,
+            client: {
+                public: this.publicClient,
+                wallet: this.walletClientInstance,
+            },
         });
     }
     connect(provider) {
@@ -46,7 +49,10 @@ class BondkitTokenFactory {
             this.contract = (0, viem_1.getContract)({
                 address: this.contractAddress,
                 abi: abis_1.BondkitTokenFactoryABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             this.publicClient = (0, viem_1.createPublicClient)({
                 chain: this.chain,
@@ -95,7 +101,10 @@ class BondkitTokenFactory {
             this.contract = (0, viem_1.getContract)({
                 address: this.contractAddress,
                 abi: abis_1.BondkitTokenFactoryABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -126,7 +135,10 @@ class BondkitTokenFactory {
                 this.contract = (0, viem_1.getContract)({
                     address: this.contractAddress,
                     abi: abis_1.BondkitTokenFactoryABI,
-                    client: this.walletClientInstance,
+                    client: {
+                        public: this.publicClient,
+                        wallet: this.walletClientInstance,
+                    },
                 });
             }
         }
@@ -164,7 +176,6 @@ class BondkitTokenFactory {
                 account: accountToUse,
                 chain: this.chain,
             });
-            console.log("hash", hash);
             const receipt = await this.publicClient.waitForTransactionReceipt({ hash });
             for (const log of receipt.logs) {
                 try {

package/dist/cjs/global-account/react/hooks/useAuthentication.js

@@ -16,6 +16,7 @@ const react_3 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
 const in_app_1 = require("thirdweb/wallets/in-app");
 const wagmi_1 = require("wagmi");
+const useTWAuth_1 = require("./useTWAuth");
 const useUserQuery_1 = require("./useUserQuery");
 const useWagmiConfig_1 = require("./useWagmiConfig");
 const debug = (0, debug_1.debugB3React)("useAuthentication");
@@ -33,7 +34,7 @@ function useAuthentication(partnerId) {
     const setHasStartedConnecting = (0, react_1.useAuthStore)(state => state.setHasStartedConnecting);
     const setActiveWallet = (0, react_3.useSetActiveWallet)();
     const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
-    const { authenticate } = (0, react_1.useSiwe)();
+    const { authenticate } = (0, useTWAuth_1.useTWAuth)();
     const { user, setUser } = (0, useUserQuery_1.useUserQuery)();
     const useAutoConnectLoadingPrevious = (0, react_2.useRef)(false);
     const wagmiConfig = (0, useWagmiConfig_1.useWagmiConfig)(partnerId);
@@ -106,10 +107,10 @@ function useAuthentication(partnerId) {
     }, [wallets, syncWagmi]);
     const authenticateUser = (0, react_2.useCallback)(async (wallet) => {
         setHasStartedConnecting(true);
-        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
-        if (!account) {
-            throw new Error("No account found during auto-connect");
+        if (!wallet) {
+            throw new Error("No wallet found during auto-connect");
         }
+        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
         if (!account) {
             throw new Error("No account found during auto-connect");
         }
@@ -127,7 +128,7 @@ function useAuthentication(partnerId) {
         catch (error) {
             // If re-authentication fails, try fresh authentication
             debug("Re-authentication failed, attempting fresh authentication");
-            const userAuth = await authenticate(account, partnerId);
+            const userAuth = await authenticate(wallet, partnerId);
             setUser(userAuth.user);
             setIsAuthenticated(true);
             setIsAuthenticating(false);
@@ -171,7 +172,7 @@ function useAuthentication(partnerId) {
         setIsConnected,
         setUser,
     ]);
-    const logout = async (callback) => {
+    const logout = (0, react_2.useCallback)(async (callback) => {
         if (activeWallet) {
             debug("@@logout:activeWallet", activeWallet);
             disconnect(activeWallet);
@@ -188,6 +189,7 @@ function useAuthentication(partnerId) {
             localStorage.removeItem("thirdweb:connected-wallet-ids");
             localStorage.removeItem("wagmi.store");
             localStorage.removeItem("lastAuthProvider");
+            localStorage.removeItem("b3-user");
         }
         app_1.default.logout();
         debug("@@logout:loggedOut");
@@ -195,7 +197,7 @@ function useAuthentication(partnerId) {
         setIsConnected(false);
         setUser();
         callback?.();
-    };
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
     const { isLoading: useAutoConnectLoading } = (0, react_3.useAutoConnect)({
         client: thirdweb_1.client,
         wallets: [wallet],

package/dist/cjs/global-account/react/hooks/useSiwe.js

@@ -11,6 +11,7 @@ const useSearchParamsSSR_1 = require("./useSearchParamsSSR");
 function useSiwe() {
     const referralCode = (0, useSearchParamsSSR_1.useSearchParam)("referralCode");
     const authenticate = (0, react_1.useCallback)(async (account, partnerId) => {
+        console.warn("@@useSiwe is deprecated, use useTWAuth instead");
         if (!account || !account.signMessage)
             throw new Error("Account not found");
         console.log("@@useAuthenticate:referralCode", referralCode);

package/dist/cjs/global-account/react/hooks/useTWAuth.d.ts

@@ -0,0 +1,4 @@
+import { Wallet } from "thirdweb/wallets";
+export declare function useTWAuth(): {
+    authenticate: (wallet: Wallet, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+};

package/dist/cjs/global-account/react/hooks/useTWAuth.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useTWAuth = useTWAuth;
+const app_1 = __importDefault(require("../../../global-account/app"));
+const debug_1 = __importDefault(require("../../../shared/utils/debug"));
+const react_1 = require("react");
+const useSearchParamsSSR_1 = require("./useSearchParamsSSR");
+function useTWAuth() {
+    const referralCode = (0, useSearchParamsSSR_1.useSearchParam)("referralCode");
+    const authenticate = (0, react_1.useCallback)(async (wallet, partnerId) => {
+        if (!wallet || !wallet?.getAuthToken?.())
+            throw new Error("Wallet not found");
+        const authToken = wallet.getAuthToken();
+        (0, debug_1.default)("@@useTWSignIn:authToken", authToken);
+        (0, debug_1.default)("@@useTWSignIn:referralCode", referralCode);
+        // authenticate
+        const response = await app_1.default.authenticate({
+            strategy: "thirdweb-jwt",
+            accessToken: authToken,
+            // http://localhost:5173/?referralCode=GIO2
+            referralCode,
+            partnerId: partnerId,
+        });
+        (0, debug_1.default)("@@useTWSignIn:response", response);
+        return response;
+    }, [referralCode]);
+    return {
+        authenticate,
+    };
+}

package/dist/esm/bondkit/bondkitToken.js

@@ -41,9 +41,18 @@ export class BondkitToken {
         this.contract = getContract({
             address: this.contractAddress,
             abi: BondkitTokenABI,
-            client: this.walletClientInstance,
+            client: {
+                public: this.publicClient,
+                wallet: this.walletClientInstance,
+            },
         });
-        this.contract.read.tradingToken().then(tradingToken => {
+        getContract({
+            address: this.contractAddress,
+            abi: BondkitTokenABI,
+            client: this.publicClient, // Use public client for read operations
+        })
+            .read.tradingToken()
+            .then(tradingToken => {
             this.tradingToken = tradingToken;
         });
     }
@@ -63,7 +72,10 @@ export class BondkitToken {
             this.contract = getContract({
                 address: this.contractAddress,
                 abi: BondkitTokenABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -110,7 +122,10 @@ export class BondkitToken {
             this.contract = getContract({
                 address: this.contractAddress,
                 abi: BondkitTokenABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -423,7 +438,10 @@ export class BondkitToken {
                         this.contract = getContract({
                             address: this.contractAddress,
                             abi: BondkitTokenABI,
-                            client: this.walletClientInstance,
+                            client: {
+                                public: this.publicClient,
+                                wallet: this.walletClientInstance,
+                            },
                         });
                     }
                 }
@@ -433,6 +451,19 @@ export class BondkitToken {
                 throw new Error("Wallet key not set or client not connected for write operation.");
             }
         }
+        // Only attempt chain switching for browser wallet providers
+        // Private key users cannot switch chains programmatically
+        if (this.connectedProvider && this.walletClientInstance.account) {
+            const walletChainId = await this.walletClientInstance.getChainId();
+            if (walletChainId !== this.chain.id) {
+                try {
+                    await this.walletClientInstance.switchChain({ id: this.chain.id });
+                }
+                catch (switchErr) {
+                    throw new Error(`Please switch your wallet to ${this.chain.name} (${this.chain.id}).`);
+                }
+            }
+        }
         const accountToUse = this.walletKey ? privateKeyToAccount(this.walletKey) : this.walletClientInstance.account;
         if (!accountToUse)
             throw new Error("Account for transaction could not be determined.");
@@ -527,7 +558,10 @@ export class BondkitToken {
             const tradingTokenContract = getContract({
                 address: this.tradingToken,
                 abi: erc20Abi,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             const currentAllowance = await tradingTokenContract.read.allowance([
                 this.walletClientInstance.account?.address,

package/dist/esm/bondkit/bondkitTokenFactory.js

@@ -28,7 +28,10 @@ export class BondkitTokenFactory {
         this.contract = getContract({
             address: this.contractAddress,
             abi: BondkitTokenFactoryABI,
-            client: this.walletClientInstance,
+            client: {
+                public: this.publicClient,
+                wallet: this.walletClientInstance,
+            },
         });
     }
     connect(provider) {
@@ -43,7 +46,10 @@ export class BondkitTokenFactory {
             this.contract = getContract({
                 address: this.contractAddress,
                 abi: BondkitTokenFactoryABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             this.publicClient = createPublicClient({
                 chain: this.chain,
@@ -92,7 +98,10 @@ export class BondkitTokenFactory {
             this.contract = getContract({
                 address: this.contractAddress,
                 abi: BondkitTokenFactoryABI,
-                client: this.walletClientInstance,
+                client: {
+                    public: this.publicClient,
+                    wallet: this.walletClientInstance,
+                },
             });
             return true;
         }
@@ -123,7 +132,10 @@ export class BondkitTokenFactory {
                 this.contract = getContract({
                     address: this.contractAddress,
                     abi: BondkitTokenFactoryABI,
-                    client: this.walletClientInstance,
+                    client: {
+                        public: this.publicClient,
+                        wallet: this.walletClientInstance,
+                    },
                 });
             }
         }
@@ -161,7 +173,6 @@ export class BondkitTokenFactory {
                 account: accountToUse,
                 chain: this.chain,
             });
-            console.log("hash", hash);
             const receipt = await this.publicClient.waitForTransactionReceipt({ hash });
             for (const log of receipt.logs) {
                 try {

package/dist/esm/global-account/react/hooks/useAuthentication.js

@@ -1,6 +1,6 @@
 import app from "../../../global-account/app.js";
 import { authenticateWithB3JWT } from "../../../global-account/bsmnt.js";
-import { useAuthStore, useSiwe } from "../../../global-account/react/index.js";
+import { useAuthStore } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { client } from "../../../shared/utils/thirdweb.js";
@@ -10,6 +10,7 @@ import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, us
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
 import { useAccount, useConnect, useSwitchAccount } from "wagmi";
+import { useTWAuth } from "./useTWAuth.js";
 import { useUserQuery } from "./useUserQuery.js";
 import { useWagmiConfig } from "./useWagmiConfig.js";
 const debug = debugB3React("useAuthentication");
@@ -27,7 +28,7 @@ export function useAuthentication(partnerId) {
     const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
     const setActiveWallet = useSetActiveWallet();
     const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
-    const { authenticate } = useSiwe();
+    const { authenticate } = useTWAuth();
     const { user, setUser } = useUserQuery();
     const useAutoConnectLoadingPrevious = useRef(false);
     const wagmiConfig = useWagmiConfig(partnerId);
@@ -100,10 +101,10 @@ export function useAuthentication(partnerId) {
     }, [wallets, syncWagmi]);
     const authenticateUser = useCallback(async (wallet) => {
         setHasStartedConnecting(true);
-        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
-        if (!account) {
-            throw new Error("No account found during auto-connect");
+        if (!wallet) {
+            throw new Error("No wallet found during auto-connect");
         }
+        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
         if (!account) {
             throw new Error("No account found during auto-connect");
         }
@@ -121,7 +122,7 @@ export function useAuthentication(partnerId) {
         catch (error) {
             // If re-authentication fails, try fresh authentication
             debug("Re-authentication failed, attempting fresh authentication");
-            const userAuth = await authenticate(account, partnerId);
+            const userAuth = await authenticate(wallet, partnerId);
             setUser(userAuth.user);
             setIsAuthenticated(true);
             setIsAuthenticating(false);
@@ -165,7 +166,7 @@ export function useAuthentication(partnerId) {
         setIsConnected,
         setUser,
     ]);
-    const logout = async (callback) => {
+    const logout = useCallback(async (callback) => {
         if (activeWallet) {
             debug("@@logout:activeWallet", activeWallet);
             disconnect(activeWallet);
@@ -182,6 +183,7 @@ export function useAuthentication(partnerId) {
             localStorage.removeItem("thirdweb:connected-wallet-ids");
             localStorage.removeItem("wagmi.store");
             localStorage.removeItem("lastAuthProvider");
+            localStorage.removeItem("b3-user");
         }
         app.logout();
         debug("@@logout:loggedOut");
@@ -189,7 +191,7 @@ export function useAuthentication(partnerId) {
         setIsConnected(false);
         setUser();
         callback?.();
-    };
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
     const { isLoading: useAutoConnectLoading } = useAutoConnect({
         client,
         wallets: [wallet],

package/dist/esm/global-account/react/hooks/useSiwe.js

@@ -5,6 +5,7 @@ import { useSearchParam } from "./useSearchParamsSSR.js";
 export function useSiwe() {
     const referralCode = useSearchParam("referralCode");
     const authenticate = useCallback(async (account, partnerId) => {
+        console.warn("@@useSiwe is deprecated, use useTWAuth instead");
         if (!account || !account.signMessage)
             throw new Error("Account not found");
         console.log("@@useAuthenticate:referralCode", referralCode);

package/dist/esm/global-account/react/hooks/useTWAuth.d.ts

@@ -0,0 +1,4 @@
+import { Wallet } from "thirdweb/wallets";
+export declare function useTWAuth(): {
+    authenticate: (wallet: Wallet, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+};

package/dist/esm/global-account/react/hooks/useTWAuth.js

@@ -0,0 +1,27 @@
+import app from "../../../global-account/app.js";
+import debug from "../../../shared/utils/debug.js";
+import { useCallback } from "react";
+import { useSearchParam } from "./useSearchParamsSSR.js";
+export function useTWAuth() {
+    const referralCode = useSearchParam("referralCode");
+    const authenticate = useCallback(async (wallet, partnerId) => {
+        if (!wallet || !wallet?.getAuthToken?.())
+            throw new Error("Wallet not found");
+        const authToken = wallet.getAuthToken();
+        debug("@@useTWSignIn:authToken", authToken);
+        debug("@@useTWSignIn:referralCode", referralCode);
+        // authenticate
+        const response = await app.authenticate({
+            strategy: "thirdweb-jwt",
+            accessToken: authToken,
+            // http://localhost:5173/?referralCode=GIO2
+            referralCode,
+            partnerId: partnerId,
+        });
+        debug("@@useTWSignIn:response", response);
+        return response;
+    }, [referralCode]);
+    return {
+        authenticate,
+    };
+}

package/dist/types/global-account/react/hooks/useTWAuth.d.ts

@@ -0,0 +1,4 @@
+import { Wallet } from "thirdweb/wallets";
+export declare function useTWAuth(): {
+    authenticate: (wallet: Wallet, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.50",
+  "version": "0.0.51-alpha.1",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",

package/src/bondkit/bondkitToken.ts

@@ -91,12 +91,21 @@ export class BondkitToken {
     this.contract = getContract({
       address: this.contractAddress,
       abi: BondkitTokenABI,
-      client: this.walletClientInstance,
+      client: {
+        public: this.publicClient,
+        wallet: this.walletClientInstance,
+      },
     });
 
-    this.contract.read.tradingToken().then(tradingToken => {
-      this.tradingToken = tradingToken as Address;
-    });
+    getContract({
+      address: this.contractAddress,
+      abi: BondkitTokenABI,
+      client: this.publicClient, // Use public client for read operations
+    })
+      .read.tradingToken()
+      .then(tradingToken => {
+        this.tradingToken = tradingToken as Address;
+      });
   }
 
   public connect(provider?: EIP1193Provider): boolean {
@@ -119,7 +128,10 @@ export class BondkitToken {
       this.contract = getContract({
         address: this.contractAddress,
         abi: BondkitTokenABI,
-        client: this.walletClientInstance,
+        client: {
+          public: this.publicClient,
+          wallet: this.walletClientInstance,
+        },
       });
       return true;
     } catch (error) {
@@ -167,7 +179,10 @@ export class BondkitToken {
       this.contract = getContract({
         address: this.contractAddress,
         abi: BondkitTokenABI,
-        client: this.walletClientInstance,
+        client: {
+          public: this.publicClient,
+          wallet: this.walletClientInstance,
+        },
       });
 
       return true;
@@ -505,7 +520,10 @@ export class BondkitToken {
             this.contract = getContract({
               address: this.contractAddress,
               abi: BondkitTokenABI,
-              client: this.walletClientInstance,
+              client: {
+                public: this.publicClient,
+                wallet: this.walletClientInstance,
+              },
             });
           }
         } catch (_) {}
@@ -514,6 +532,19 @@ export class BondkitToken {
         throw new Error("Wallet key not set or client not connected for write operation.");
       }
     }
+
+    // Only attempt chain switching for browser wallet providers
+    // Private key users cannot switch chains programmatically
+    if (this.connectedProvider && this.walletClientInstance.account) {
+      const walletChainId = await this.walletClientInstance.getChainId();
+      if (walletChainId !== this.chain.id) {
+        try {
+          await this.walletClientInstance.switchChain({ id: this.chain.id });
+        } catch (switchErr) {
+          throw new Error(`Please switch your wallet to ${this.chain.name} (${this.chain.id}).`);
+        }
+      }
+    }
     const accountToUse = this.walletKey ? privateKeyToAccount(this.walletKey) : this.walletClientInstance.account;
     if (!accountToUse) throw new Error("Account for transaction could not be determined.");
 
@@ -624,7 +655,10 @@ export class BondkitToken {
       const tradingTokenContract = getContract({
         address: this.tradingToken as Address,
         abi: erc20Abi,
-        client: this.walletClientInstance,
+        client: {
+          public: this.publicClient,
+          wallet: this.walletClientInstance,
+        },
       });
 
       const currentAllowance = await tradingTokenContract.read.allowance([

package/src/bondkit/bondkitTokenFactory.ts

@@ -56,7 +56,10 @@ export class BondkitTokenFactory {
     this.contract = getContract({
       address: this.contractAddress,
       abi: BondkitTokenFactoryABI,
-      client: this.walletClientInstance,
+      client: {
+        public: this.publicClient,
+        wallet: this.walletClientInstance,
+      },
     });
   }
 
@@ -75,7 +78,10 @@ export class BondkitTokenFactory {
       this.contract = getContract({
         address: this.contractAddress,
         abi: BondkitTokenFactoryABI,
-        client: this.walletClientInstance,
+        client: {
+          public: this.publicClient,
+          wallet: this.walletClientInstance,
+        },
       });
 
       this.publicClient = createPublicClient({
@@ -127,7 +133,10 @@ export class BondkitTokenFactory {
       this.contract = getContract({
         address: this.contractAddress,
         abi: BondkitTokenFactoryABI,
-        client: this.walletClientInstance,
+        client: {
+          public: this.publicClient,
+          wallet: this.walletClientInstance,
+        },
       });
 
       return true;
@@ -157,7 +166,10 @@ export class BondkitTokenFactory {
         this.contract = getContract({
           address: this.contractAddress,
           abi: BondkitTokenFactoryABI,
-          client: this.walletClientInstance,
+          client: {
+            public: this.publicClient,
+            wallet: this.walletClientInstance,
+          },
         });
       }
     } catch (_) {}
@@ -201,7 +213,6 @@ export class BondkitTokenFactory {
         chain: this.chain,
       });
 
-      console.log("hash", hash);
       const receipt: TransactionReceipt = await this.publicClient.waitForTransactionReceipt({ hash });
 
       for (const log of receipt.logs) {

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

@@ -1,6 +1,6 @@
 import app from "@b3dotfun/sdk/global-account/app";
 import { authenticateWithB3JWT } from "@b3dotfun/sdk/global-account/bsmnt";
-import { useAuthStore, useSiwe } from "@b3dotfun/sdk/global-account/react";
+import { useAuthStore } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
@@ -17,6 +17,7 @@ import {
 import { Wallet, ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
 import { useAccount, useConnect, useSwitchAccount } from "wagmi";
+import { useTWAuth } from "./useTWAuth";
 import { useUserQuery } from "./useUserQuery";
 import { useWagmiConfig } from "./useWagmiConfig";
 
@@ -36,7 +37,7 @@ export function useAuthentication(partnerId: string) {
   const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
   const setActiveWallet = useSetActiveWallet();
   const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
-  const { authenticate } = useSiwe();
+  const { authenticate } = useTWAuth();
   const { user, setUser } = useUserQuery();
   const useAutoConnectLoadingPrevious = useRef(false);
   const wagmiConfig = useWagmiConfig(partnerId);
@@ -119,10 +120,11 @@ export function useAuthentication(partnerId: string) {
     async (wallet?: Wallet) => {
       setHasStartedConnecting(true);
 
-      const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
-      if (!account) {
-        throw new Error("No account found during auto-connect");
+      if (!wallet) {
+        throw new Error("No wallet found during auto-connect");
       }
+
+      const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
       if (!account) {
         throw new Error("No account found during auto-connect");
       }
@@ -141,7 +143,7 @@ export function useAuthentication(partnerId: string) {
       } catch (error) {
         // If re-authentication fails, try fresh authentication
         debug("Re-authentication failed, attempting fresh authentication");
-        const userAuth = await authenticate(account, partnerId);
+        const userAuth = await authenticate(wallet, partnerId);
         setUser(userAuth.user);
         setIsAuthenticated(true);
         setIsAuthenticating(false);
@@ -193,35 +195,39 @@ export function useAuthentication(partnerId: string) {
     ],
   );
 
-  const logout = async (callback?: () => void) => {
-    if (activeWallet) {
-      debug("@@logout:activeWallet", activeWallet);
-      disconnect(activeWallet);
-      debug("@@logout:activeWallet", activeWallet);
-    }
+  const logout = useCallback(
+    async (callback?: () => void) => {
+      if (activeWallet) {
+        debug("@@logout:activeWallet", activeWallet);
+        disconnect(activeWallet);
+        debug("@@logout:activeWallet", activeWallet);
+      }
 
-    // Log out of each wallet
-    wallets.forEach(wallet => {
-      console.log("@@logging out", wallet);
-      disconnect(wallet);
-    });
+      // Log out of each wallet
+      wallets.forEach(wallet => {
+        console.log("@@logging out", wallet);
+        disconnect(wallet);
+      });
 
-    // Delete localStorage thirdweb:connected-wallet-ids
-    // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
-    if (typeof localStorage !== "undefined") {
-      localStorage.removeItem("thirdweb:connected-wallet-ids");
-      localStorage.removeItem("wagmi.store");
-      localStorage.removeItem("lastAuthProvider");
-    }
+      // Delete localStorage thirdweb:connected-wallet-ids
+      // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
+      if (typeof localStorage !== "undefined") {
+        localStorage.removeItem("thirdweb:connected-wallet-ids");
+        localStorage.removeItem("wagmi.store");
+        localStorage.removeItem("lastAuthProvider");
+        localStorage.removeItem("b3-user");
+      }
 
-    app.logout();
-    debug("@@logout:loggedOut");
+      app.logout();
+      debug("@@logout:loggedOut");
 
-    setIsAuthenticated(false);
-    setIsConnected(false);
-    setUser();
-    callback?.();
-  };
+      setIsAuthenticated(false);
+      setIsConnected(false);
+      setUser();
+      callback?.();
+    },
+    [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected],
+  );
 
   const { isLoading: useAutoConnectLoading } = useAutoConnect({
     client,

package/src/global-account/react/hooks/useSiwe.tsx

@@ -9,6 +9,7 @@ export function useSiwe() {
 
   const authenticate = useCallback(
     async (account: Account, partnerId: string) => {
+      console.warn("@@useSiwe is deprecated, use useTWAuth instead");
       if (!account || !account.signMessage) throw new Error("Account not found");
 
       console.log("@@useAuthenticate:referralCode", referralCode);

package/src/global-account/react/hooks/useTWAuth.tsx

@@ -0,0 +1,36 @@
+import app from "@b3dotfun/sdk/global-account/app";
+import debug from "@b3dotfun/sdk/shared/utils/debug";
+import { useCallback } from "react";
+import { Wallet } from "thirdweb/wallets";
+import { useSearchParam } from "./useSearchParamsSSR";
+
+export function useTWAuth() {
+  const referralCode = useSearchParam("referralCode");
+
+  const authenticate = useCallback(
+    async (wallet: Wallet, partnerId: string) => {
+      if (!wallet || !wallet?.getAuthToken?.()) throw new Error("Wallet not found");
+
+      const authToken = wallet.getAuthToken();
+      debug("@@useTWSignIn:authToken", authToken);
+      debug("@@useTWSignIn:referralCode", referralCode);
+
+      // authenticate
+      const response = await app.authenticate({
+        strategy: "thirdweb-jwt",
+        accessToken: authToken,
+        // http://localhost:5173/?referralCode=GIO2
+        referralCode,
+        partnerId: partnerId,
+      });
+      debug("@@useTWSignIn:response", response);
+
+      return response;
+    },
+    [referralCode],
+  );
+
+  return {
+    authenticate,
+  };
+}