@b3dotfun/sdk 0.0.88 → 0.0.89-alpha.0

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

@@ -1,24 +1,16 @@
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
+import { useEffect } from "react";
+import { ThirdwebProvider } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 
 import { ClientType } from "../../../client-manager";
 
 import { WagmiProvider } from "wagmi";
+import { useB3ConfigStore } from "../../stores/configStore";
 import { createWagmiConfig } from "../../utils/createWagmiConfig";
+import AuthenticationProvider from "./AuthenticationProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
-import { B3Context, B3ContextType } from "./types";
-
-/**
- * Default permissions configuration for B3 provider
- */
-const DEFAULT_PERMISSIONS = {
-  approvedTargets: ["0xa8e42121e318e3D3BeD7f5969AF6D360045317DD"], // Example contract
-  nativeTokenLimitPerTransaction: 0.1, // in ETH
-  startDate: new Date(),
-  endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
-};
 
 // Create queryClient instance
 const queryClient = new QueryClient();
@@ -35,44 +27,53 @@ export function B3Provider({
   partnerId,
   rpcUrls,
   onConnect,
+  defaultPermissions,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
   accountOverride?: Account;
-  environment: B3ContextType["environment"];
+  environment?: "development" | "production";
   clientType?: ClientType;
   partnerId: string;
   rpcUrls?: Record<number, string>;
   onConnect?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
+  defaultPermissions?: PermissionsConfig;
 }) {
+  const setConfig = useB3ConfigStore(state => state.setConfig);
+
+  // Initialize config store on mount - props are static and never change
+  useEffect(() => {
+    setConfig({
+      accountOverride,
+      environment: environment ?? "development",
+      automaticallySetFirstEoa: false,
+      theme,
+      clientType,
+      partnerId,
+      defaultPermissions,
+    });
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
   return (
     <ThirdwebProvider>
       <LocalSDKProvider onConnectCallback={onConnect}>
-        <InnerProvider
-          accountOverride={accountOverride}
-          environment={environment}
-          theme={theme}
-          clientType={clientType}
-          partnerId={partnerId}
-          rpcUrls={rpcUrls}
-        >
-          {/* <RelayKitProviderWrapper> */}
-          {children}
-          {/* </RelayKitProviderWrapper> */}
-        </InnerProvider>
+        {/* <RelayKitProviderWrapper> */}
+        {children}
+        <AuthenticationProvider partnerId={partnerId} automaticallySetFirstEoa={false} />
+        {/* </RelayKitProviderWrapper> */}
       </LocalSDKProvider>
     </ThirdwebProvider>
   );
 }
 
 /**
- * Inner provider component that provides the actual B3Context
+ * Inner provider component for native
  */
 export function InnerProvider({
   children,
   accountOverride,
   environment,
-  defaultPermissions = DEFAULT_PERMISSIONS,
+  defaultPermissions,
   theme = "light",
   clientType = "socket",
   partnerId,
@@ -80,44 +81,32 @@ export function InnerProvider({
 }: {
   children: React.ReactNode;
   accountOverride?: Account;
-  environment: B3ContextType["environment"];
+  environment?: "development" | "production";
   defaultPermissions?: PermissionsConfig;
   theme: "light" | "dark";
   clientType?: ClientType;
   partnerId: string;
   rpcUrls?: Record<number, string>;
 }) {
-  const activeAccount = useActiveAccount();
-  //const { user, setUser, refetchUser } = useAuthentication(partnerId);
+  const setConfig = useB3ConfigStore(state => state.setConfig);
   const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
 
-  // Use given accountOverride or activeAccount from thirdweb
-  const effectiveAccount = accountOverride || activeAccount;
+  // Initialize config store on mount - props are static and never change
+  useEffect(() => {
+    setConfig({
+      accountOverride,
+      environment: environment ?? "development",
+      automaticallySetFirstEoa: false,
+      theme,
+      clientType,
+      partnerId,
+      defaultPermissions,
+    });
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   return (
     <WagmiProvider config={wagmiConfig}>
-      <QueryClientProvider client={queryClient}>
-        <B3Context.Provider
-          value={{
-            //account: effectiveAccount,
-            automaticallySetFirstEoa: false,
-            //setWallet: () => {},
-            wallet: undefined,
-            //user,
-            //setUser,
-            initialized: true,
-            ready: !!effectiveAccount,
-            environment,
-            defaultPermissions,
-            theme,
-            clientType,
-            partnerId,
-            //refetchUser,
-          }}
-        >
-          {children}
-        </B3Context.Provider>
-      </QueryClientProvider>
+      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
     </WagmiProvider>
   );
 }

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

@@ -1,31 +1,21 @@
 import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
-import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "@b3dotfun/sdk/global-account/react";
-import { useAutoSelectWallet } from "@b3dotfun/sdk/global-account/react/hooks/useAutoSelectWallet";
+import { RelayKitProviderWrapper, TooltipProvider } from "@b3dotfun/sdk/global-account/react";
 import { createWagmiConfig } from "@b3dotfun/sdk/global-account/react/utils/createWagmiConfig";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { loadGA4Script } from "@b3dotfun/sdk/global-account/utils/analytics";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useEffect, useMemo } from "react";
-import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
+import { ThirdwebProvider } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 import { CreateConnectorFn, WagmiProvider } from "wagmi";
 import { ClientType, setClientType } from "../../../client-manager";
+import { useB3ConfigStore } from "../../stores/configStore";
 import { StyleRoot } from "../StyleRoot";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index";
+import AuthenticationProvider from "./AuthenticationProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
-import { B3Context, B3ContextType } from "./types";
-
-/**
- * Default permissions configuration for B3 provider
- */
-const DEFAULT_PERMISSIONS = {
-  approvedTargets: ["0xa8e42121e318e3D3BeD7f5969AF6D360045317DD"], // Example contract
-  nativeTokenLimitPerTransaction: 0.1, // in ETH
-  startDate: new Date(),
-  endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
-};
 
 // Create queryClient instance
 const queryClient = new QueryClient();
@@ -51,11 +41,12 @@ export function B3Provider({
   overrideDefaultConnectors = false,
   createClientReferenceId,
   enableTurnkey = false,
+  defaultPermissions,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
   accountOverride?: Account;
-  environment: B3ContextType["environment"];
+  environment?: "development" | "production";
   automaticallySetFirstEoa?: boolean;
   simDuneApiKey?: string;
   toaster?: {
@@ -72,7 +63,38 @@ export function B3Provider({
   overrideDefaultConnectors?: boolean;
   createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
   enableTurnkey?: boolean;
+  defaultPermissions?: PermissionsConfig;
 }) {
+  const setConfig = useB3ConfigStore(state => state.setConfig);
+
+  // Initialize config store on mount
+  useEffect(() => {
+    setConfig({
+      accountOverride,
+      environment: environment ?? "development",
+      automaticallySetFirstEoa: !!automaticallySetFirstEoa,
+      theme,
+      clientType,
+      partnerId,
+      stripePublishableKey,
+      createClientReferenceId,
+      enableTurnkey,
+      defaultPermissions,
+    });
+  }, [
+    accountOverride,
+    environment,
+    automaticallySetFirstEoa,
+    theme,
+    clientType,
+    partnerId,
+    stripePublishableKey,
+    createClientReferenceId,
+    enableTurnkey,
+    defaultPermissions,
+    setConfig,
+  ]); // eslint-disable-line react-hooks/exhaustive-deps
+
   // Initialize Google Analytics on mount
   useEffect(() => {
     loadGA4Script();
@@ -95,24 +117,13 @@ export function B3Provider({
           <TooltipProvider>
             <ToastProvider>
               <LocalSDKProvider onConnectCallback={onConnect}>
-                <InnerProvider
-                  accountOverride={accountOverride}
-                  environment={environment}
-                  theme={theme}
-                  automaticallySetFirstEoa={!!automaticallySetFirstEoa}
-                  clientType={clientType}
-                  partnerId={partnerId}
-                  stripePublishableKey={stripePublishableKey}
-                  createClientReferenceId={createClientReferenceId}
-                  enableTurnkey={enableTurnkey}
-                >
-                  <ToastContextConnector />
-                  <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
-                    {children}
-                    {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
-                    <StyleRoot id="b3-root" />
-                  </RelayKitProviderWrapper>
-                </InnerProvider>
+                <ToastContextConnector />
+                <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
+                  {children}
+                  {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
+                  <StyleRoot id="b3-root" />
+                </RelayKitProviderWrapper>
+                <AuthenticationProvider partnerId={partnerId} automaticallySetFirstEoa={!!automaticallySetFirstEoa} />
               </LocalSDKProvider>
             </ToastProvider>
           </TooltipProvider>
@@ -122,79 +133,6 @@ export function B3Provider({
   );
 }
 
-/**
- * Inner provider component that provides the actual B3Context
- */
-export function InnerProvider({
-  children,
-  accountOverride,
-  environment,
-  defaultPermissions = DEFAULT_PERMISSIONS,
-  automaticallySetFirstEoa,
-  theme = "light",
-  clientType = "socket",
-  partnerId,
-  stripePublishableKey,
-  createClientReferenceId,
-  enableTurnkey,
-}: {
-  children: React.ReactNode;
-  accountOverride?: Account;
-  environment: B3ContextType["environment"];
-  defaultPermissions?: PermissionsConfig;
-  automaticallySetFirstEoa: boolean;
-  theme: "light" | "dark";
-  clientType?: ClientType;
-  partnerId: string;
-  stripePublishableKey?: string;
-  createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
-  enableTurnkey?: boolean;
-}) {
-  const activeAccount = useActiveAccount();
-  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-  //const isConnected = useAuthStore(state => state.isConnected);
-  //const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
-
-  // Use given accountOverride or activeAccount from thirdweb
-  // WOJ: why if isAuthenticated is false, we don't use activeAccount, which should be undefined?
-  // skip isAuthenticated check ?
-  const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
-
-  // Wrapper to set active wallet via thirdweb
-  // Note: `wallet` in context is deprecated - use useActiveWallet() from thirdweb/react instead
-
-  // Auto-select first EOA wallet when enabled
-  useAutoSelectWallet({
-    enabled: automaticallySetFirstEoa,
-  });
-
-  return (
-    <B3Context.Provider
-      value={{
-        account: effectiveAccount,
-        // setWallet,
-        //wallet: undefined, // Deprecated: use useActiveWallet() from thirdweb/react instead
-        //user,
-        //setUser,
-        //refetchUser,
-        initialized: true,
-        ready: !!effectiveAccount,
-        automaticallySetFirstEoa,
-        environment,
-        defaultPermissions,
-        theme,
-        clientType,
-        partnerId: partnerId,
-        stripePublishableKey,
-        createClientReferenceId,
-        enableTurnkey,
-      }}
-    >
-      {children}
-    </B3Context.Provider>
-  );
-}
-
 /**
  * Component to connect the toast context to the global toast API
  */

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

@@ -19,6 +19,9 @@ export function RelayKitProviderWrapper({
     fetchChains();
   }, []);
 
+  const isTurnkeyPrimary = process.env.NEXT_PUBLIC_TURNKEY_PRIMARY === "true";
+  const appName = isTurnkeyPrimary ? "Smart Wallet" : "AnySpend";
+
   return (
     <RelayKitProvider
       options={{
@@ -30,7 +33,7 @@ export function RelayKitProviderWrapper({
         },
         chains: relayChains,
         privateChainIds: undefined,
-        appName: "AnySpend",
+        appName,
         useGasFeeEstimations: true,
       }}
     >

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

@@ -1,18 +1,9 @@
-import { useContext, useMemo } from "react";
-import { B3Context } from "./types";
+import { useB3Config } from "./useB3Config";
 
 /**
- * Hook to access the B3 context
- * @throws Error if used outside a B3Provider
- * @deprecated Use useB3Config or useB3Account instead
+ * Hook to access the B3 configuration
+ * @deprecated This is just an alias for useB3Config. Use useB3Config directly instead.
  */
 export function useB3() {
-  const context = useContext(B3Context);
-
-  if (!context.initialized) {
-    throw new Error("useB3 must be used within a B3Provider");
-  }
-
-  // Return a stable reference
-  return useMemo(() => context, [context]);
+  return useB3Config();
 }

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

@@ -1,7 +1,11 @@
 import { useActiveAccount } from "thirdweb/react";
+import { useAuthStore } from "../../stores/useAuthStore";
 
 // Wrapper around useActiveAccount
 export const useB3Account = () => {
-  const account = useActiveAccount();
-  return account;
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  const activeAccount = useActiveAccount();
+  const effectiveAccount = isAuthenticated ? activeAccount : undefined;
+
+  return effectiveAccount;
 };

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

@@ -1,34 +1,21 @@
-import { useContext, useMemo } from "react";
-import { B3Context } from "./types";
+import { useB3ConfigStore } from "../../stores/configStore";
 
+/**
+ * Hook to access B3 configuration
+ * Returns all config values from the Zustand store
+ * Since config is static (set once at initialization), destructuring is fine here
+ */
 export const useB3Config = () => {
-  const context = useContext(B3Context);
-
-  if (!context) {
-    throw new Error("useB3 must be used within a B3Provider");
-  }
-
-  const {
-    automaticallySetFirstEoa,
-    environment,
-    theme,
-    clientType,
-    partnerId,
-    createClientReferenceId,
-    enableTurnkey,
-  } = context;
-
-  // Return a stable reference
-  return useMemo(
-    () => ({
-      automaticallySetFirstEoa,
-      environment,
-      theme,
-      clientType,
-      partnerId,
-      createClientReferenceId,
-      enableTurnkey,
-    }),
-    [automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey],
-  );
+  return useB3ConfigStore(state => ({
+    automaticallySetFirstEoa: state.automaticallySetFirstEoa,
+    environment: state.environment,
+    theme: state.theme,
+    clientType: state.clientType,
+    partnerId: state.partnerId,
+    createClientReferenceId: state.createClientReferenceId,
+    enableTurnkey: state.enableTurnkey,
+    stripePublishableKey: state.stripePublishableKey,
+    defaultPermissions: state.defaultPermissions,
+    accountOverride: state.accountOverride,
+  }));
 };

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

@@ -1,10 +1,9 @@
 import {
   useAccountWallet,
-  useAuthentication,
-  useB3Config,
   useModalStore,
   useProfile,
   useSimBalance,
+  useUser,
 } from "@b3dotfun/sdk/global-account/react";
 import { formatUsername } from "@b3dotfun/sdk/shared/utils";
 import { formatDisplayNumber } from "@b3dotfun/sdk/shared/utils/number";
@@ -22,8 +21,7 @@ const ProfileSection = () => {
     address: eoaAddress || account?.address,
     fresh: true,
   });
-  const { partnerId } = useB3Config();
-  const { user } = useAuthentication(partnerId);
+  const { user } = useUser();
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const navigateBack = useModalStore(state => state.navigateBack);

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
-import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -26,7 +26,7 @@ export const DiscordChannel = ({
   onConnectionChange,
   onToggle,
 }: DiscordChannelProps) => {
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   const [discordId, setDiscordId] = useState("");
   const [isConnecting, setIsConnecting] = useState(false);

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
-import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -31,7 +31,7 @@ export const EmailChannel = ({
   onConnectionChange,
   onToggle,
 }: EmailChannelProps) => {
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   const [email, setEmail] = useState("");
   const [emailError, setEmailError] = useState<string | null>(null);

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
-import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -32,7 +32,7 @@ export const PhoneChannel = ({
   onConnectionChange,
   onToggle,
 }: PhoneChannelProps) => {
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   const [phoneNumber, setPhoneNumber] = useState("");
   const [isConnectingSMS, setIsConnectingSMS] = useState(false);

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
-import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -26,7 +26,7 @@ export const TelegramChannel = ({
   onConnectionChange,
   onToggle,
 }: TelegramChannelProps) => {
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   const [isConnecting, setIsConnecting] = useState(false);
   const [status, setStatus] = useState<"idle" | "pending" | "connected">("idle");

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

@@ -1,11 +1,11 @@
 import {
   Button,
-  useB3,
+  PermissionItem,
+  RequestPermissionsModalProps,
   useAddTWSessionKey,
+  useB3Config,
   useGetAllTWSigners,
-  RequestPermissionsModalProps,
 } from "@b3dotfun/sdk/global-account/react";
-import { PermissionItem } from "@b3dotfun/sdk/global-account/react";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { formatAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
@@ -30,7 +30,7 @@ export function RequestPermissions({
 }: RequestPermissionsModalProps) {
   const [isApproving, setIsApproving] = useState(false);
   const account = useActiveAccount();
-  const { defaultPermissions } = useB3();
+  const { defaultPermissions } = useB3Config();
   const DEFAULT_PERMISSIONS = useMemo(
     () => permissions ?? (defaultPermissions as PermissionsConfig),
     [defaultPermissions, permissions],

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

@@ -5,7 +5,7 @@ import {
   StyleRoot,
   useAccountWallet,
   useAuthentication,
-  useB3,
+  useB3Config,
   useIsMobile,
 } from "@b3dotfun/sdk/global-account/react";
 import Icon from "@b3dotfun/sdk/global-account/react/components/custom/Icon";
@@ -30,7 +30,7 @@ type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackButton">
 
 export function SignIn(props: SignInWithB3Props) {
   const { className } = props;
-  const { automaticallySetFirstEoa, partnerId } = useB3();
+  const { automaticallySetFirstEoa, partnerId } = useB3Config();
   const {
     address: globalAddress,
     ensName,