@b3dotfun/sdk 0.0.51-alpha.0 → 0.0.51-alpha.1

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/dist/types/shared/constants/chains/b3Chain.d.ts

@@ -12,7 +12,6 @@ export declare const b3Mainnet: {
             readonly url: "https://explorer.b3.fun";
         };
     };
-    blockTime?: number | undefined | undefined;
     contracts?: {
         [x: string]: import("viem").ChainContract | {
             [sourceId: number]: import("viem").ChainContract | undefined;
@@ -20,7 +19,7 @@ export declare const b3Mainnet: {
         ensRegistry?: import("viem").ChainContract | undefined;
         ensUniversalResolver?: import("viem").ChainContract | undefined;
         multicall3?: import("viem").ChainContract | undefined;
-        erc6492Verifier?: import("viem").ChainContract | undefined;
+        universalSignatureVerifier?: import("viem").ChainContract | undefined;
     } | undefined;
     ensTlds?: readonly string[] | undefined;
     id: 8333;
@@ -30,7 +29,6 @@ export declare const b3Mainnet: {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
-    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://mainnet-rpc.b3.fun"];
@@ -58,7 +56,6 @@ export declare const getViemChainConfig: (config: ChainNetworks) => {
             readonly url: string;
         };
     };
-    blockTime?: number | undefined | undefined;
     contracts?: {
         [x: string]: import("viem").ChainContract | {
             [sourceId: number]: import("viem").ChainContract | undefined;
@@ -66,7 +63,7 @@ export declare const getViemChainConfig: (config: ChainNetworks) => {
         ensRegistry?: import("viem").ChainContract | undefined;
         ensUniversalResolver?: import("viem").ChainContract | undefined;
         multicall3?: import("viem").ChainContract | undefined;
-        erc6492Verifier?: import("viem").ChainContract | undefined;
+        universalSignatureVerifier?: import("viem").ChainContract | undefined;
     } | undefined;
     ensTlds?: readonly string[] | undefined;
     id: number;
@@ -76,7 +73,6 @@ export declare const getViemChainConfig: (config: ChainNetworks) => {
         name: string;
         decimals: number;
     };
-    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly [string];
@@ -107,7 +103,6 @@ export declare const b3Chain: Chain | {
             readonly url: "https://explorer.b3.fun";
         };
     };
-    blockTime?: number | undefined | undefined;
     contracts?: {
         [x: string]: import("viem").ChainContract | {
             [sourceId: number]: import("viem").ChainContract | undefined;
@@ -115,7 +110,7 @@ export declare const b3Chain: Chain | {
         ensRegistry?: import("viem").ChainContract | undefined;
         ensUniversalResolver?: import("viem").ChainContract | undefined;
         multicall3?: import("viem").ChainContract | undefined;
-        erc6492Verifier?: import("viem").ChainContract | undefined;
+        universalSignatureVerifier?: import("viem").ChainContract | undefined;
     } | undefined;
     ensTlds?: readonly string[] | undefined;
     id: 8333;
@@ -125,7 +120,6 @@ export declare const b3Chain: Chain | {
         readonly symbol: "ETH";
         readonly decimals: 18;
     };
-    experimental_preconfirmationTime?: number | undefined | undefined;
     rpcUrls: {
         readonly default: {
             readonly http: readonly ["https://mainnet-rpc.b3.fun"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.51-alpha.0",
+  "version": "0.0.51-alpha.1",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",
@@ -301,7 +301,7 @@
     "@solana/web3.js": "^1.98.2",
     "@stripe/react-stripe-js": "^3.7.0",
     "@stripe/stripe-js": "^7.3.1",
-    "@thirdweb-dev/wagmi-adapter": "0.2.165",
+    "@thirdweb-dev/wagmi-adapter": "0.2.159",
     "@web3icons/react": "3.16.0",
     "big.js": "^7.0.1",
     "class-variance-authority": "0.7.0",
@@ -374,11 +374,10 @@
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
     "react-native-mmkv": "^3.2.0",
-    "thirdweb": "5.108.14",
+    "thirdweb": "5.108.9",
     "three": "^0.175.0",
-    "viem": "2.37.9",
-    "wagmi": "2.16.9",
-    "@wagmi/core": "2.20.3"
+    "viem": "^2.28.1",
+    "wagmi": "^2.14.15"
   },
   "peerDependenciesMeta": {
     "@react-three/postprocessing": {

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);

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

@@ -1,14 +1,12 @@
 import { useAuthStore } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
-import { useEffect, useMemo, useState } from "react";
-import { viemAdapter } from "thirdweb/adapters/viem";
+import { useEffect, useState } from "react";
 import { useConnectedWallets, useWalletInfo } from "thirdweb/react";
 import { Wallet } from "thirdweb/wallets";
 
 const debug = debugB3React("useFirstEOA");
 
-export function useFirstEOA(chain?: { id: number; name: string; rpc: string }) {
+export function useFirstEOA() {
   const wallets = useConnectedWallets();
   const isConnected = useAuthStore(state => state.isConnected);
   const [firstEOA, setFirstEOA] = useState<Wallet | undefined>(undefined);
@@ -41,25 +39,9 @@ export function useFirstEOA(chain?: { id: number; name: string; rpc: string }) {
     autoSelectFirstEOAWallet();
   }, [isConnected, wallets]);
 
-  const walletClient = useMemo(() => {
-    if (!firstEOA) return undefined;
-    if (!chain) return undefined;
-    try {
-      const viemClientWallet = viemAdapter.wallet.toViem({
-        client,
-        chain,
-        wallet: firstEOA,
-      });
-      return viemClientWallet;
-    } catch (err) {
-      console.error("Error setting wallet client", err);
-    }
-  }, [firstEOA, chain]);
-
   return {
     account: firstEOA,
     address,
     info: walletInfo,
-    walletClient,
   };
 }

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,
+  };
+}