@b3dotfun/sdk 0.0.47 → 0.0.48-alpha.1

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

@@ -1,15 +1,16 @@
-import { Users } from "@b3dotfun/b3-api";
-import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import {
+  RelayKitProviderWrapper,
+  TooltipProvider,
+  useAuthentication,
+  useAuthStore,
+} from "@b3dotfun/sdk/global-account/react";
+import { useWagmiConfig } from "@b3dotfun/sdk/global-account/react/hooks/useWagmiConfig";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { loadGA4Script } from "@b3dotfun/sdk/global-account/utils/analytics";
-import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
-import { supportedChains } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import "@reservoir0x/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { inAppWalletConnector } from "@thirdweb-dev/wagmi-adapter";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { Toaster } from "sonner";
 import {
   getLastAuthProvider,
@@ -19,7 +20,7 @@ import {
   useSetActiveWallet,
 } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
-import { createConfig, http, WagmiProvider } from "wagmi";
+import { WagmiProvider } from "wagmi";
 import { ClientType, setClientType } from "../../../client-manager";
 import { StyleRoot } from "../StyleRoot";
 import { B3Context, B3ContextType } from "./types";
@@ -66,7 +67,7 @@ export function B3Provider({
   };
   clientType?: ClientType;
   rpcUrls?: Record<number, string>;
-  partnerId?: string;
+  partnerId: string;
 }) {
   // Initialize Google Analytics on mount
   useEffect(() => {
@@ -77,45 +78,11 @@ export function B3Provider({
   useEffect(() => {
     setClientType(clientType);
   }, [clientType]);
-
-  const ecocystemConfig = useMemo(() => {
-    if (!partnerId) return undefined;
-
-    return {
-      ecosystemId: ecosystemWalletId,
-      partnerId: partnerId,
-      client,
-    };
-  }, [partnerId]);
-
-  // Stringify rpcUrls for stable comparison to prevent wagmiConfig recreation
-  // when parent component passes new object references with same content
-  const rpcUrlsString = useMemo(() => (rpcUrls ? JSON.stringify(rpcUrls) : undefined), [rpcUrls]);
-
-  /**
-   * Creates wagmi config with optional custom RPC URLs
-   * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
-   */
-  const wagmiConfig = useMemo(() => {
-    const parsedRpcUrls = rpcUrlsString ? JSON.parse(rpcUrlsString) : undefined;
-
-    return createConfig({
-      chains: [supportedChains[0], ...supportedChains.slice(1)],
-      transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(parsedRpcUrls?.[chain.id])])),
-      connectors: [
-        inAppWalletConnector({
-          ...(ecocystemConfig || {}),
-          client,
-        }),
-        // injected(),
-        // coinbaseWallet({ appName: "HypeDuel" }),
-      ],
-    });
-  }, [ecocystemConfig, rpcUrlsString]);
+  const wagmiConfig = useWagmiConfig(partnerId, rpcUrls);
 
   return (
     <ThirdwebProvider>
-      <WagmiProvider config={wagmiConfig}>
+      <WagmiProvider config={wagmiConfig} reconnectOnMount={false}>
         <QueryClientProvider client={queryClient}>
           <TooltipProvider>
             <InnerProvider
@@ -124,6 +91,7 @@ export function B3Provider({
               theme={theme}
               automaticallySetFirstEoa={!!automaticallySetFirstEoa}
               clientType={clientType}
+              partnerId={partnerId}
             >
               <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
                 {children}
@@ -150,6 +118,7 @@ export function InnerProvider({
   automaticallySetFirstEoa,
   theme = "light",
   clientType = "socket",
+  partnerId,
 }: {
   children: React.ReactNode;
   accountOverride?: Account;
@@ -158,42 +127,23 @@ export function InnerProvider({
   automaticallySetFirstEoa: boolean;
   theme: "light" | "dark";
   clientType?: ClientType;
+  partnerId: string;
 }) {
   const activeAccount = useActiveAccount();
   const [manuallySelectedWallet, setManuallySelectedWallet] = useState<Wallet | undefined>(undefined);
   const wallets = useConnectedWallets();
-  const setActiveWallet = useSetActiveWallet();
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-  debug("@@wallets", wallets);
+  const isConnected = useAuthStore(state => state.isConnected);
+  const setActiveWallet = useSetActiveWallet();
+  const { user, setUser, refetchUser } = useAuthentication(partnerId);
 
-  const [user, setUser] = useState<Users | undefined>(() => {
-    // Try to restore user from localStorage on initialization
-    if (typeof window !== "undefined") {
-      try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : undefined;
-      } catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return undefined;
-      }
-    }
-    return undefined;
-  });
+  debug("@@B3Provider:isConnected", isConnected);
+  debug("@@wallets", wallets);
+  debug("@@B3Provider:user", user);
 
   // Use given accountOverride or activeAccount from thirdweb
   const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
 
-  // Persist user to localStorage when it changes
-  useEffect(() => {
-    if (typeof window !== "undefined") {
-      if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-      } else {
-        localStorage.removeItem("b3-user");
-      }
-    }
-  }, [user]);
-
   const setWallet = useCallback(
     (wallet: Wallet) => {
       setManuallySelectedWallet(wallet);
@@ -237,6 +187,7 @@ export function InnerProvider({
         wallet: manuallySelectedWallet,
         user,
         setUser,
+        refetchUser,
         initialized: true,
         ready: !!effectiveAccount,
         automaticallySetFirstEoa,
@@ -244,9 +195,14 @@ export function InnerProvider({
         defaultPermissions,
         theme,
         clientType,
+        partnerId: partnerId,
       }}
     >
-      {children}
+      <InnerProvider2>{children}</InnerProvider2>
     </B3Context.Provider>
   );
 }
+
+const InnerProvider2 = ({ children }: { children: React.ReactNode }) => {
+  return <>{children}</>;
+};

package/src/global-account/react/components/B3Provider/types.ts

@@ -14,12 +14,14 @@ export interface B3ContextType {
   setWallet: (wallet: Wallet) => void;
   wallet?: Wallet;
   setUser: (user?: Users) => void;
+  refetchUser: () => Promise<any>;
   initialized: boolean;
   ready: boolean;
   environment?: "development" | "production";
   defaultPermissions?: PermissionsConfig;
   theme: "light" | "dark";
   clientType: ClientType;
+  partnerId: string;
 }
 
 /**
@@ -32,9 +34,11 @@ export const B3Context = createContext<B3ContextType>({
   setWallet: () => {},
   wallet: undefined,
   setUser: () => {},
+  refetchUser: async () => {},
   initialized: false,
   ready: false,
   environment: "development",
   theme: "light",
   clientType: "rest",
+  partnerId: "",
 });

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

@@ -23,7 +23,6 @@ import { TokenBalanceRow } from "./TokenBalanceRow";
 
 interface BalanceContentProps {
   onLogout?: () => void;
-  partnerId: string;
   showDeposit?: boolean;
   showSwap?: boolean;
 }
@@ -33,14 +32,14 @@ function centerTruncate(str: string, length = 4) {
   return `${str.slice(0, length)}...${str.slice(-length)}`;
 }
 
-export function BalanceContent({ onLogout, partnerId, showDeposit = true, showSwap = true }: BalanceContentProps) {
+export function BalanceContent({ onLogout, showDeposit = true, showSwap = true }: BalanceContentProps) {
   const account = useActiveAccount();
   const { address: eoaAddress, info: eoaInfo } = useFirstEOA();
   const { data: profile } = useProfile({
     address: eoaAddress || account?.address,
     fresh: true,
   });
-  const { user } = useB3();
+  const { user, partnerId } = useB3();
   const { setB3ModalOpen, setB3ModalContentType, navigateBack } = useModalStore();
   const { logout } = useAuthentication(partnerId);
   const [logoutLoading, setLogoutLoading] = useState(false);

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

@@ -604,7 +604,7 @@ export function ManageAccount({
           </div>
 
           <TabsContentPrimitive value="overview" className="px-4 pb-4 pt-2">
-            <BalanceContent onLogout={onLogout} partnerId={partnerId} showDeposit={showDeposit} showSwap={showSwap} />
+            <BalanceContent onLogout={onLogout} showDeposit={showDeposit} showSwap={showSwap} />
           </TabsContentPrimitive>
 
           <TabsContentPrimitive value="tokens" className="px-4 pb-4 pt-2">

package/src/global-account/react/components/SignInWithB3/SignIn.tsx

@@ -29,7 +29,7 @@ type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackButton">
 
 export function SignIn(props: SignInWithB3Props) {
   const { className } = props;
-  const { automaticallySetFirstEoa } = useB3();
+  const { automaticallySetFirstEoa, partnerId } = useB3();
   const {
     wallet,
     address: globalAddress,
@@ -43,7 +43,7 @@ export function SignIn(props: SignInWithB3Props) {
   } = useAccountWallet();
 
   const isMobile = useIsMobile();
-  const { logout } = useAuthentication(String(process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID));
+  const { logout } = useAuthentication(partnerId);
   const onDisconnect = async () => {
     await logout();
   };

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

@@ -2,7 +2,7 @@ import {
   Button,
   SignInWithB3ModalProps,
   StyleRoot,
-  useAuthentication,
+  useAuthStore,
   useB3,
   useIsMobile,
   useModalStore,
@@ -21,7 +21,7 @@ export type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackB
 export function SignInWithB3(props: SignInWithB3Props) {
   const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
   const { account } = useB3();
-  const { isAuthenticating, isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+  const { isAuthenticating, isAuthenticated } = useAuthStore();
   const isMobile = useIsMobile();
 
   useEffect(() => {

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -5,7 +5,6 @@ import {
   useB3,
   useGetAllTWSigners,
   useModalStore,
-  useSiwe,
 } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback, useEffect, useState } from "react";
@@ -31,19 +30,16 @@ export function SignInWithB3Flow({
   sessionKeyAddress,
   partnerId,
   closeAfterLogin = false,
-  loginWithSiwe = false,
   source = "signInWithB3Button",
   signersEnabled = false,
 }: SignInWithB3ModalProps) {
-  const { setUser, automaticallySetFirstEoa } = useB3();
+  const { automaticallySetFirstEoa } = useB3();
   const [step, setStep] = useState<"login" | "permissions" | null>(source === "requestPermissions" ? null : "login");
   const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
   const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
   const account = useActiveAccount();
-  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const isAuthenticating = useAuthStore(state => state.isAuthenticating);
   const isConnected = useAuthStore(state => state.isConnected);
-  const setIsConnected = useAuthStore(state => state.setIsConnected);
   const [refetchCount, setRefetchCount] = useState(0);
   const [refetchError, setRefetchError] = useState<string | null>(null);
   const {
@@ -57,7 +53,6 @@ export function SignInWithB3Flow({
       enabled: signersEnabled,
     },
   });
-  const { authenticate } = useSiwe();
   const [refetchQueued, setRefetchQueued] = useState(false);
 
   // Enhanced refetchSigners function that tracks number of attempts
@@ -175,13 +170,11 @@ export function SignInWithB3Flow({
       sessionKeyAddress,
       partnerId,
       closeAfterLogin,
-      loginWithSiwe,
       source: "requestPermissions",
     });
   }, [
     chain,
     closeAfterLogin,
-    loginWithSiwe,
     onError,
     onLoginSuccess,
     onSessionKeySuccess,
@@ -193,20 +186,9 @@ export function SignInWithB3Flow({
 
   const handleLoginSuccess = useCallback(
     async (account: Account) => {
-      debug("Authenticating with B3 via SIWE");
-      setIsConnected(true);
-      if (loginWithSiwe) {
-        debug("setIsAuthenticating:true:1");
-        setIsAuthenticating(true);
-        const userAuth = await authenticate(account, partnerId);
-        setUser(userAuth.user);
-      }
-      debug("handleLoginSuccess:account", account);
       onLoginSuccess?.(account);
-      debug("setIsAuthenticating:false:1");
-      setIsAuthenticating(false);
     },
-    [loginWithSiwe, onLoginSuccess, authenticate, partnerId, setUser, setIsConnected, setIsAuthenticating],
+    [onLoginSuccess],
   );
 
   useEffect(() => {
@@ -243,7 +225,7 @@ export function SignInWithB3Flow({
   if (step === "login") {
     // Custom strategy
     if (strategies?.[0] === "privy") {
-      return <SignInWithB3Privy onSuccess={handleLoginSuccess} partnerId={partnerId} chain={chain} />;
+      return <SignInWithB3Privy onSuccess={handleLoginSuccess} chain={chain} />;
     }
 
     // Strategies are explicitly provided
@@ -251,7 +233,6 @@ export function SignInWithB3Flow({
       return (
         <LoginStepCustom
           strategies={strategies}
-          partnerId={partnerId}
           chain={chain}
           onSuccess={handleLoginSuccess}
           onError={onError}
@@ -261,7 +242,7 @@ export function SignInWithB3Flow({
     }
 
     // Default to handle all strategies we support
-    return <LoginStep partnerId={partnerId} chain={chain} onSuccess={handleLoginSuccess} onError={onError} />;
+    return <LoginStep chain={chain} onSuccess={handleLoginSuccess} onError={onError} />;
   }
 
   return null;

package/src/global-account/react/components/SignInWithB3/SignInWithB3Privy.tsx

@@ -2,6 +2,7 @@ import {
   Loading,
   useAuthentication,
   useAuthStore,
+  useB3,
   useHandleConnectWithPrivy,
 } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
@@ -14,12 +15,12 @@ interface SignInWithB3PrivyProps {
   onError?: (error: Error) => Promise<void>;
   onSuccess: (account: Account) => Promise<void>;
   accessToken?: string;
-  partnerId: string;
   chain: Chain;
 }
 
-export function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }: SignInWithB3PrivyProps) {
-  const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(partnerId, chain, onSuccess);
+export function SignInWithB3Privy({ onSuccess, onError, chain }: SignInWithB3PrivyProps) {
+  const { partnerId } = useB3();
+  const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
   const { logout } = useAuthentication(partnerId);

package/src/global-account/react/components/SignInWithB3/steps/LoginStep.tsx

@@ -1,6 +1,5 @@
-import { useAuthentication, useAuthStore, useB3, useQueryB3 } from "@b3dotfun/sdk/global-account/react";
+import { useAuthentication, useB3, useQueryB3 } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
-import { debug } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { Chain } from "thirdweb";
 import { ConnectEmbed, darkTheme, lightTheme } from "thirdweb/react";
@@ -14,7 +13,6 @@ interface LoginStepProps {
   /** Optional callback function called when an error occurs */
   onError?: (error: Error) => Promise<void>;
   /** Partner ID used for authentication */
-  partnerId: string;
   /** Blockchain chain information */
   chain: Chain;
   /** Optional authentication strategy options */
@@ -56,15 +54,12 @@ export function LoginStepContainer({ children, partnerId }: LoginStepContainerPr
   );
 }
 
-export function LoginStep({ onSuccess, onError, partnerId, chain }: LoginStepProps) {
+export function LoginStep({ onSuccess, chain }: LoginStepProps) {
+  const { partnerId, theme } = useB3();
   const wallet = ecosystemWallet(ecosystemWalletId, {
     partnerId: partnerId,
   });
-
-  const { theme } = useB3();
-  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const { logout } = useAuthentication(partnerId);
+  const { onConnect } = useAuthentication(partnerId);
 
   return (
     <LoginStepContainer partnerId={partnerId}>
@@ -86,54 +81,21 @@ export function LoginStep({ onSuccess, onError, partnerId, chain }: LoginStepPro
                 },
               })
         }
-        autoConnect
         style={{
           width: "100%",
           height: "100%",
           border: 0,
         }}
-        // TODO: Integrate with SIWE in useSIWE
-        // auth={{
-        //   isLoggedIn: async (address) => {
-        //     console.log("checking if logged in!", { address });
-        //     return await isLoggedIn();
-        //   },
-        //   doLogin: async (params) => {
-        //     console.log("logging in!");
-        //     await login(params);
-        //   },
-        //   getLoginPayload: async ({ address }) =>
-        //     generatePayload({ address }),
-        //   doLogout: async () => {
-        //     console.log("logging out!");
-        //     await logout();
-        //   },
-        // }}
         header={{
           title: "Sign in with B3",
           titleIcon: "https://cdn.b3.fun/b3_logo.svg",
         }}
         className="b3-login-step"
         onConnect={async wallet => {
-          try {
-            setIsAuthenticating(true);
-            debug("setIsAuthenticating:true:6");
-
-            const account = wallet.getAccount();
-            if (!account) throw new Error("No account found");
-
-            await onSuccess(account);
-            setIsAuthenticated(true);
-
-            console.log("connected!", wallet.id);
-          } catch (error) {
-            await onError?.(error as Error);
-            await logout();
-            setIsAuthenticated(false);
-          } finally {
-            debug("setIsAuthenticating:false:6");
-            setIsAuthenticating(false);
-          }
+          await onConnect(wallet);
+          const account = wallet.getAccount();
+          if (!account) throw new Error("No account found");
+          await onSuccess(account);
         }}
       />
     </LoginStepContainer>

package/src/global-account/react/components/SignInWithB3/steps/LoginStepCustom.tsx

@@ -7,6 +7,7 @@ import {
   LoginStepContainer,
   useAuthentication,
   useAuthStore,
+  useB3,
   useConnect,
   WalletRow,
 } from "@b3dotfun/sdk/global-account/react";
@@ -21,7 +22,6 @@ interface LoginStepCustomProps {
   automaticallySetFirstEoa: boolean;
   onSuccess: (account: Account) => Promise<void>;
   onError?: (error: Error) => Promise<void>;
-  partnerId: string;
   chain: Chain;
   strategies: AllowedStrategy[];
   maxInitialWallets?: number;
@@ -32,12 +32,12 @@ const debug = debugB3React("LoginStepCustom");
 export function LoginStepCustom({
   onSuccess,
   onError,
-  partnerId,
   chain,
   strategies,
   maxInitialWallets = 2,
   automaticallySetFirstEoa,
 }: LoginStepCustomProps) {
+  const { partnerId } = useB3();
   const [isLoading, setIsLoading] = useState(false);
   const [showAllWallets, setShowAllWallets] = useState(false);
   const { connect } = useConnect(partnerId, chain);

package/src/global-account/react/components/custom/ManageAccountButton.tsx

@@ -1,10 +1,11 @@
-import { Button, StyleRoot, useAuthentication, useModalStore } from "@b3dotfun/sdk/global-account/react";
+import { Button, StyleRoot, useAuthentication, useB3, useModalStore } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils";
 import { SignInWithB3Props } from "../SignInWithB3/SignInWithB3";
 
 export function ManageAccountButton(props: SignInWithB3Props & { className?: string }) {
+  const { partnerId } = useB3();
   const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-  const { isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
+  const { isConnected } = useAuthentication(partnerId);
 
   const handleClickManageAccount = () => {
     setB3ModalContentType({