@b3dotfun/sdk 0.1.69 → 0.1.70-alpha.10

package/src/anyspend/utils/chain.ts

@@ -3,15 +3,16 @@ import {
   ABSTRACT_PUBLIC_RPC,
   ARBITRUM_PUBLIC_RPC,
   AVALANCHE_PUBLIC_RPC,
-  B3_PUBLIC_RPC,
   BASE_PUBLIC_RPC,
   BSC_PUBLIC_RPC,
   ETHEREUM_PUBLIC_RPC,
   HYPEREVM_PUBLIC_RPC,
   OPTIMISM_PUBLIC_RPC,
+  PLUME_PUBLIC_RPC,
   POLYGON_PUBLIC_RPC,
 } from "@b3dotfun/sdk/anyspend/constants/rpc";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { b3Viem } from "@b3dotfun/sdk/shared/constants/chains/b3Viem";
 import invariant from "invariant";
 import {
   Account,
@@ -25,7 +26,7 @@ import {
   Transport,
   WalletClient,
 } from "viem";
-import { abstract, arbitrum, avalanche, b3, base, bsc, mainnet, optimism, polygon } from "viem/chains";
+import { abstract, arbitrum, avalanche, base, bsc, mainnet, optimism, polygon } from "viem/chains";
 import { ChainType, IBaseChain, IEVMChain, IHyperliquidChain, ISolanaChain } from "../types/chain";
 import {
   getAvaxToken,
@@ -33,10 +34,12 @@ import {
   getEthToken,
   getHyperEVMNativeToken,
   getHyperliquidUSDCToken,
+  getPlumeNativeToken,
   getPolToken,
   getSolanaToken,
   HYPEREVM_CHAIN_ID,
   HYPERLIQUID_CHAIN_ID,
+  PLUME_CHAIN_ID,
 } from "./token";
 
 function getCustomEvmChain(chain: Chain, rpcUrl: string): Chain {
@@ -84,11 +87,19 @@ export function clearChainRpcOverrides(): void {
 export const hyperEVM = defineChain({
   id: HYPEREVM_CHAIN_ID,
   name: "HyperEVM",
-  nativeCurrency: { name: "HyperEVM", symbol: "HYPE", decimals: 18 },
+  nativeCurrency: { name: "Hyperliquid", symbol: "HYPE", decimals: 18 },
   rpcUrls: { default: { http: [HYPEREVM_PUBLIC_RPC] } },
   blockExplorers: { default: { name: "HyperEVM Explorer", url: "https://hyperevmscan.io/" } },
 });
 
+export const plume = defineChain({
+  id: PLUME_CHAIN_ID,
+  name: "Plume",
+  nativeCurrency: { name: "Plume", symbol: "PLUME", decimals: 18 },
+  rpcUrls: { default: { http: [PLUME_PUBLIC_RPC] } },
+  blockExplorers: { default: { name: "Plume Explorer", url: "https://explorer.plume.org" } },
+});
+
 // export const b4testnet = defineChain({
 //   id: 19934,
 //   name: "B4 Testnet",
@@ -203,16 +214,16 @@ export const EVM_MAINNET: Record<number, IEVMChain> = {
     coingeckoName: "bsc",
     wethAddress: "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
   },
-  [b3.id]: {
-    id: b3.id,
-    name: b3.name,
+  [b3Viem.id]: {
+    id: b3Viem.id,
+    name: b3Viem.name,
     logoUrl: "https://assets.relay.link/icons/square/8333/light.png",
     type: ChainType.EVM,
     nativeRequired: parseEther("0.0001"),
     canDepositNative: true,
-    defaultToken: getEthToken(b3.id),
-    nativeToken: getEthToken(b3.id),
-    viem: getCustomEvmChain(b3, B3_PUBLIC_RPC),
+    defaultToken: getEthToken(b3Viem.id),
+    nativeToken: getEthToken(b3Viem.id),
+    viem: b3Viem,
     pollingInterval: 1000, // 1 second for B3
     zapperEnum: "B3_MAINNET",
     coingeckoName: "b3",
@@ -247,6 +258,20 @@ export const EVM_MAINNET: Record<number, IEVMChain> = {
     coingeckoName: "hyperevm",
     wethAddress: "0x5555555555555555555555555555555555555555",
   },
+  [plume.id]: {
+    id: plume.id,
+    name: plume.name,
+    logoUrl: "https://cdn.b3.fun/b3os-icons/plume.svg",
+    type: ChainType.EVM,
+    nativeRequired: parseEther("5"), // 5 PLUME ≈ $0.06 — gas reserve; Plume gasPrice ~1000 gwei × 2.2M gas (approve+deposit) needs ~2.2 PLUME, +headroom for spikes
+    canDepositNative: true,
+    defaultToken: getPlumeNativeToken(),
+    nativeToken: getPlumeNativeToken(),
+    viem: plume,
+    pollingInterval: 1000, // 1 second for Plume (L2 fast blocks)
+    coingeckoName: "plume-network",
+    wethAddress: "0xea237441c92cae6fc17caaf9a7acb3f953be4bd1", // WPLUME (wrapped native)
+  },
 };
 
 export const EVM_TESTNET: Record<number, IEVMChain> = {
@@ -605,7 +630,7 @@ export function getPaymentUrl(
 }
 
 export function getExplorerTxUrl(chainId: number, txHash: string) {
-  if (chainId === b3.id) {
+  if (chainId === b3Viem.id) {
     return "https://explorer.b3.fun/b3/tx/" + txHash;
   }
   if (EVM_CHAINS[chainId]) {

package/src/anyspend/utils/token.ts

@@ -4,6 +4,7 @@ import { avalanche, bsc, polygon } from "viem/chains";
 
 export const HYPERLIQUID_CHAIN_ID = 1337;
 export const HYPEREVM_CHAIN_ID = 999;
+export const PLUME_CHAIN_ID = 98866;
 
 /**
  * Hyperliquid uses a special 34-character USDC address format (0x + 32 hex digits)
@@ -106,3 +107,16 @@ export function getHyperliquidUSDCToken(): components["schemas"]["Token"] {
     },
   };
 }
+
+export function getPlumeNativeToken(): components["schemas"]["Token"] {
+  return {
+    chainId: PLUME_CHAIN_ID,
+    address: ZERO_ADDRESS,
+    symbol: "PLUME",
+    name: "Plume",
+    decimals: 18,
+    metadata: {
+      logoURI: "https://cdn.b3.fun/b3os-icons/plume.svg",
+    },
+  };
+}

package/src/app.shared.ts

@@ -2,18 +2,37 @@ import { ClientApplication } from "@b3dotfun/b3-api";
 import { AuthenticationClient } from "@feathersjs/authentication-client";
 import Cookies from "js-cookie";
 import { B3_AUTH_COOKIE_NAME } from "./shared/constants";
+import { getSessionDurationDays } from "./shared/utils/session-duration";
 
+/** Default API URL derived from environment variables. */
 export const B3_API_URL =
   process.env.EXPO_PUBLIC_B3_API || process.env.NEXT_PUBLIC_B3_API || process.env.PUBLIC_B3_API || "https://api.b3.fun";
 
-const DEV_USER_GROUP = 4;
+/**
+ * Runtime-overridable API URL. Set by `B3Provider` when an `apiUrl` prop
+ * is provided. Falls back to the env-var-derived `B3_API_URL`.
+ */
+let _apiUrlOverride: string | null = null;
+
+/**
+ * Override the B3 API URL at runtime. Called by `B3Provider` when an
+ * `apiUrl` prop is provided. Pass `null` to revert to the default.
+ */
+export function setB3ApiUrl(url: string | null): void {
+  _apiUrlOverride = url;
+}
+
+/** Get the current B3 API URL (prefers runtime override, then env var). */
+export function getB3ApiUrl(): string {
+  return _apiUrlOverride || B3_API_URL;
+}
 
 export const authenticate = async (
   app: ClientApplication,
   accessToken: string,
   identityToken: string,
   params?: Record<string, any>,
-) => {
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token
@@ -33,12 +52,14 @@ export const authenticate = async (
       },
     );
 
-    // Extend cookie expiration to 30 days for dev users
-    if (response?.user?.userGroups?.includes(DEV_USER_GROUP)) {
-      const token = Cookies.get(B3_AUTH_COOKIE_NAME);
-      if (token) {
-        Cookies.set(B3_AUTH_COOKIE_NAME, token, { expires: 30 });
-      }
+    const token = Cookies.get(B3_AUTH_COOKIE_NAME);
+    if (token) {
+      const days = getSessionDurationDays(response?.user?.preferences, params?.partnerId);
+      Cookies.set(B3_AUTH_COOKIE_NAME, token, {
+        ...(days > 0 ? { expires: days } : {}),
+        secure: true,
+        sameSite: "Lax",
+      });
     }
 
     return response;

package/src/global-account/app.native.ts

@@ -77,7 +77,11 @@ const app = createClient(socketio(socket), {
   storageKey: B3_AUTH_COOKIE_NAME,
 });
 
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token

package/src/global-account/better-auth-client.ts

@@ -0,0 +1,43 @@
+import { createAuthClient } from "better-auth/client";
+import { twoFactorClient } from "better-auth/client/plugins";
+import { getB3ApiUrl } from "../app.shared";
+
+export type B3BetterAuthClient = ReturnType<typeof createB3BetterAuthClient>;
+
+export function createB3BetterAuthClient(baseURL?: string) {
+  return createAuthClient({
+    baseURL: baseURL ?? getB3ApiUrl(),
+    basePath: "/auth",
+    fetchOptions: {
+      credentials: "include",
+    },
+    plugins: [twoFactorClient()],
+  });
+}
+
+// Lazily-initialized singleton. Recreated when the API URL changes via
+// `resetBetterAuthClient()` (called by B3Provider when `apiUrl` changes).
+let _client: B3BetterAuthClient | null = null;
+let _clientUrl: string | null = null;
+
+/** Get the shared BetterAuth client, creating it if needed. */
+export function getBetterAuthClient(): B3BetterAuthClient {
+  const url = getB3ApiUrl();
+  if (!_client || _clientUrl !== url) {
+    _client = createB3BetterAuthClient(url);
+    _clientUrl = url;
+  }
+  return _client;
+}
+
+/** Force-recreate the client on next access (e.g. after API URL change). */
+export function resetBetterAuthClient(): void {
+  _client = null;
+  _clientUrl = null;
+}
+
+/**
+ * @deprecated Use `getBetterAuthClient()` instead. This static singleton
+ * does not reflect runtime API URL changes via `B3Provider apiUrl` prop.
+ */
+export const betterAuthClient = createB3BetterAuthClient();

package/src/global-account/bsmnt.native.ts

@@ -80,7 +80,11 @@ const app = createClient(socketio(socket), {
   storageKey: BSMNT_AUTH_COOKIE_NAME,
 });
 
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token

package/src/global-account/bsmnt.ts

@@ -42,7 +42,11 @@ const app = createClient(socketio(socket), {
   storageKey: BSMNT_AUTH_COOKIE_NAME,
 });
 
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token
@@ -73,13 +77,10 @@ export const resetSocket = () => {
   // reset the socket connection
 };
 
-export function extractAvatarIdFromUrl(url: string): string | null {
-  const regex = /https:\/\/models\.readyplayer\.me\/([a-f0-9]{24})\.[a-zA-Z0-9]+/;
-  const match = url.match(regex);
-  return match ? match[1] : null;
-}
-
-export const authenticateWithB3JWT = async (fullToken: string, params?: Record<string, any>) => {
+export const authenticateWithB3JWT = async (
+  fullToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   // Do not authenticate if there is no token
   if (!fullToken) {
     console.log("No token found, not authenticating");

package/src/global-account/client-manager.ts

@@ -2,7 +2,7 @@ import { ClientApplication, createClient } from "@b3dotfun/b3-api";
 import rest from "@feathersjs/rest-client";
 import socketio from "@feathersjs/socketio-client";
 import io from "socket.io-client";
-import { authenticate as authenticateB3, B3_API_URL, clientOptions } from "../app.shared";
+import { authenticate as authenticateB3, getB3ApiUrl, clientOptions } from "../app.shared";
 
 export type ClientType = "socket" | "rest";
 
@@ -13,17 +13,21 @@ let currentClient: ClientApplication | null = null;
 // Socket client instance
 let socketClient: ClientApplication | null = null;
 let socketInstance: any = null;
+let socketClientUrl: string | null = null;
 
 // REST client instance
 let restClient: ClientApplication | null = null;
+let restClientUrl: string | null = null;
 
 /**
  * Creates a socket client
  */
 function createSocketClient(): ClientApplication {
-  if (!socketClient) {
-    socketInstance = io(B3_API_URL, { transports: ["websocket"] });
+  const url = getB3ApiUrl();
+  if (!socketClient || socketClientUrl !== url) {
+    socketInstance = io(url, { transports: ["websocket"] });
     socketClient = createClient(socketio(socketInstance), clientOptions);
+    socketClientUrl = url;
   }
   return socketClient;
 }
@@ -40,13 +44,24 @@ function resolveFetch(): typeof fetch {
 }
 
 function createRestClient(): ClientApplication {
-  if (!restClient) {
-    const connection = rest(B3_API_URL).fetch(resolveFetch());
+  const url = getB3ApiUrl();
+  if (!restClient || restClientUrl !== url) {
+    const connection = rest(url).fetch(resolveFetch());
     restClient = createClient(connection, clientOptions);
+    restClientUrl = url;
   }
   return restClient;
 }
 
+/** Reset all cached clients (called when API URL changes). */
+export function resetClients(): void {
+  socketClient = null;
+  socketClientUrl = null;
+  restClient = null;
+  restClientUrl = null;
+  currentClient = null;
+}
+
 /**
  * Sets the active client type and creates the appropriate client
  *
@@ -99,7 +114,11 @@ export function resetSocket(): void {
 /**
  * Authenticates with the current active client
  */
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   return authenticateB3(getClient(), accessToken, identityToken, params);
 };
 
@@ -111,7 +130,7 @@ export const authenticateWithClient = async (
   accessToken: string,
   identityToken: string,
   params?: Record<string, any>,
-) => {
+): Promise<Record<string, any> | null> => {
   const client = getClientByType(clientType);
   return authenticateB3(client, accessToken, identityToken, params);
 };
@@ -119,7 +138,15 @@ export const authenticateWithClient = async (
 /**
  * Authenticates with both clients in parallel (useful for migration scenarios)
  */
-export const authenticateBoth = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticateBoth = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<{
+  socket: Record<string, any> | null;
+  rest: Record<string, any> | null;
+  success: boolean;
+}> => {
   const [socketResult, restResult] = await Promise.allSettled([
     authenticateWithClient("socket", accessToken, identityToken, params),
     authenticateWithClient("rest", accessToken, identityToken, params),
@@ -135,7 +162,12 @@ export const authenticateBoth = async (accessToken: string, identityToken: strin
 /**
  * Switches the client type and authenticates
  */
-export async function switchClientAndAuth(type: ClientType, access: string, id: string, params?: any) {
+export async function switchClientAndAuth(
+  type: ClientType,
+  access: string,
+  id: string,
+  params?: any,
+): Promise<Record<string, any> | null> {
   setClientType(type);
   return authenticateWithClient(type, access, id, params);
 }

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

@@ -13,7 +13,7 @@ import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profi
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
-import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
+import { uploadFile as uploadToB3 } from "@b3dotfun/sdk/shared/utils/upload";
 import { Loader2, Upload, X } from "lucide-react";
 import { useCallback, useRef, useState } from "react";
 import type { Area } from "react-easy-crop";
@@ -21,7 +21,6 @@ import Cropper from "react-easy-crop";
 import "react-easy-crop/react-easy-crop.css";
 
 import { useActiveAccount } from "thirdweb/react";
-import { upload } from "thirdweb/storage";
 import { useModalStore } from "../../stores";
 import ModalHeader from "../ModalHeader/ModalHeader";
 
@@ -62,6 +61,8 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const contentType = useModalStore(state => state.contentType);
 
+  const { authStrategy } = useB3Config();
+  const isBetterAuth = authStrategy === "better-auth";
   const account = useActiveAccount();
   const { data: profile, refetch: refreshProfile } = useProfile({
     address: account?.address,
@@ -162,7 +163,7 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
   };
 
   const handleSaveChanges = async () => {
-    if (!account?.address) {
+    if (!isBetterAuth && !account?.address) {
       toast.error("No account connected");
       return;
     }
@@ -241,22 +242,18 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
         }
       }
 
-      // Upload to IPFS if we have a file
+      // Upload file if we have one
       if (fileToUpload) {
-        debug("Starting upload to IPFS", fileToUpload);
+        debug("Starting upload", fileToUpload);
 
-        // Upload to IPFS using Thirdweb
-        const ipfsUrl = await upload({
-          client,
-          files: [fileToUpload],
-        });
+        const avatarUrl = await uploadToB3(fileToUpload);
 
-        debug("Upload successful", ipfsUrl);
+        debug("Upload successful", avatarUrl);
 
         // Save avatar URL using profiles service
         const user = await app.service("users").setAvatar(
           {
-            avatar: ipfsUrl,
+            avatar: avatarUrl,
           },
           // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
           {},

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

@@ -27,6 +27,7 @@ import { LinkAccount } from "./LinkAccount/LinkAccount";
 import { LinkNewAccount } from "./LinkAccount/LinkNewAccount";
 import { ManageAccount } from "./ManageAccount/ManageAccount";
 import NotificationsContent from "./ManageAccount/NotificationsContent";
+import SessionDurationContent from "./ManageAccount/SessionDurationContent";
 import { RequestPermissions } from "./RequestPermissions/RequestPermissions";
 import { Send } from "./Send/Send";
 import { SignInWithB3Flow } from "./SignInWithB3/SignInWithB3Flow";
@@ -43,7 +44,7 @@ export function B3DynamicModal() {
   const navigateBack = useModalStore(state => state.navigateBack);
   const { theme } = useB3Config();
   const isMobile = useIsMobile();
-  const { toasts, removeToast } = useToastContext();
+  const { toasts, removeToast, headerMode } = useToastContext();
 
   // Define arrays for different modal type groups
   const fullWidthTypes = [
@@ -172,6 +173,8 @@ export function B3DynamicModal() {
         return <Send {...contentType} />;
       case "notifications":
         return <NotificationsContent {...contentType} />;
+      case "sessionDuration":
+        return <SessionDurationContent partnerId={contentType.partnerId} />;
       // Add other modal types here
       default:
         return null;
@@ -247,7 +250,7 @@ export function B3DynamicModal() {
 
           {/* Toast Container - Part of modal-inner-content layer */}
           <AnimatePresence>
-            {toasts.length > 0 && (
+            {!headerMode && toasts.length > 0 && (
               <motion.div
                 initial={{ height: 0 }}
                 animate={{ height: "auto" }}

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

@@ -1,16 +1,20 @@
+import { EIP1193 } from "thirdweb/wallets";
 import { useAuthentication } from "../../hooks";
 import { useAutoSelectWallet } from "../../hooks/useAutoSelectWallet";
 
 const AuthenticationProvider = ({
   partnerId,
   automaticallySetFirstEoa,
+  defaultEoaProvider,
 }: {
   partnerId: string;
   automaticallySetFirstEoa: boolean;
+  defaultEoaProvider?: EIP1193.EIP1193Provider;
 }) => {
   useAuthentication(partnerId);
   useAutoSelectWallet({
     enabled: automaticallySetFirstEoa,
+    defaultEoaProvider,
   });
 
   return null;

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

@@ -15,6 +15,8 @@ const DEFAULT_PERMISSIONS: PermissionsConfig = {
   endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
 };
 
+export type AuthStrategy = "thirdweb" | "better-auth";
+
 export interface B3ConfigContextType {
   accountOverride?: Account;
   automaticallySetFirstEoa: boolean;
@@ -25,6 +27,7 @@ export interface B3ConfigContextType {
   partnerId: string;
   stripePublishableKey?: string;
   createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+  authStrategy: AuthStrategy;
 }
 
 const B3ConfigContext = createContext<B3ConfigContextType | null>(null);
@@ -40,6 +43,7 @@ export function B3ConfigProvider({
   partnerId,
   stripePublishableKey,
   createClientReferenceId,
+  authStrategy = "thirdweb",
 }: {
   children: React.ReactNode;
   accountOverride?: Account;
@@ -51,6 +55,7 @@ export function B3ConfigProvider({
   partnerId: string;
   stripePublishableKey?: string;
   createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+  authStrategy?: AuthStrategy;
 }) {
   return (
     <B3ConfigContext.Provider
@@ -64,6 +69,7 @@ export function B3ConfigProvider({
         partnerId,
         stripePublishableKey,
         createClientReferenceId,
+        authStrategy,
       }}
     >
       {children}

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

@@ -1,19 +1,16 @@
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { WalletProvider } from "@b3dotfun/sdk/wallet/react";
 import { ThirdwebProvider } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 
 import { ClientType } from "../../../client-manager";
 
-import { WagmiProvider } from "wagmi";
+import { useMemo } from "react";
 import { createWagmiConfig } from "../../utils/createWagmiConfig";
 import AuthenticationProvider from "./AuthenticationProvider";
 import { B3ConfigProvider } from "./B3ConfigProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
 
-// Create queryClient instance
-const queryClient = new QueryClient();
-
 /**
  * Main B3Provider component
  */
@@ -82,23 +79,21 @@ export function InnerProvider({
   partnerId: string;
   rpcUrls?: Record<number, string>;
 }) {
-  const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
+  const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId, rpcUrls }), [partnerId, rpcUrls]);
 
   return (
-    <WagmiProvider config={wagmiConfig}>
-      <QueryClientProvider client={queryClient}>
-        <B3ConfigProvider
-          accountOverride={accountOverride}
-          environment={environment}
-          automaticallySetFirstEoa={false}
-          theme={theme}
-          clientType={clientType}
-          partnerId={partnerId}
-          defaultPermissions={defaultPermissions}
-        >
-          {children}
-        </B3ConfigProvider>
-      </QueryClientProvider>
-    </WagmiProvider>
+    <WalletProvider wagmiConfig={wagmiConfig}>
+      <B3ConfigProvider
+        accountOverride={accountOverride}
+        environment={environment}
+        automaticallySetFirstEoa={false}
+        theme={theme}
+        clientType={clientType}
+        partnerId={partnerId}
+        defaultPermissions={defaultPermissions}
+      >
+        {children}
+      </B3ConfigProvider>
+    </WalletProvider>
   );
 }