@b3dotfun/sdk 0.0.51-alpha.0 → 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);