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

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

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useFirstEOA = useFirstEOA;
 const react_1 = require("../../../global-account/react");
 const debug_1 = require("../../../shared/utils/debug");
-const thirdweb_1 = require("../../../shared/utils/thirdweb");
 const react_2 = require("react");
-const viem_1 = require("thirdweb/adapters/viem");
 const react_3 = require("thirdweb/react");
 const debug = (0, debug_1.debugB3React)("useFirstEOA");
-function useFirstEOA(chain) {
+function useFirstEOA() {
     const wallets = (0, react_3.useConnectedWallets)();
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
     const [firstEOA, setFirstEOA] = (0, react_2.useState)(undefined);
@@ -35,27 +33,9 @@ function useFirstEOA(chain) {
         };
         autoSelectFirstEOAWallet();
     }, [isConnected, wallets]);
-    const walletClient = (0, react_2.useMemo)(() => {
-        if (!firstEOA)
-            return undefined;
-        if (!chain)
-            return undefined;
-        try {
-            const viemClientWallet = viem_1.viemAdapter.wallet.toViem({
-                client: thirdweb_1.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/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/cjs/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/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);