@b3dotfun/sdk 0.1.69 → 0.1.70-alpha.1

package/src/global-account/react/hooks/useAuth.ts

@@ -6,7 +6,7 @@ import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { ConnectionOptions } from "@thirdweb-dev/wagmi-adapter";
 import { getConnectors } from "@wagmi/core";
-import { useCallback, useContext, useEffect, useRef } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import {
   useActiveWallet,
   useAutoConnect,
@@ -18,7 +18,7 @@ import { Wallet, ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
 import { useAccount, useConnect, useSwitchAccount } from "wagmi";
 import { LocalSDKContext } from "../components/B3Provider/LocalSDKProvider";
-import { getCachedWagmiConfig } from "../utils/createWagmiConfig";
+import { createWagmiConfig } from "../utils/createWagmiConfig";
 import { useSearchParam } from "./useSearchParamsSSR";
 import { useUserQuery } from "./useUserQuery";
 
@@ -30,7 +30,7 @@ const debug = debugB3React("useAuth");
  * This hook provides 1:1 feature parity with useAuthentication.ts
  */
 export function useAuth() {
-  const { onConnectCallback } = useContext(LocalSDKContext);
+  const { onConnectCallback, disableBSMNTAuthentication } = useContext(LocalSDKContext);
   const { disconnect } = useDisconnect();
   const wallets = useConnectedWallets();
   const activeWallet = useActiveWallet();
@@ -47,7 +47,7 @@ export function useAuth() {
   const useAutoConnectLoadingPrevious = useRef(false);
   const referralCode = useSearchParam("referralCode");
   const { partnerId } = useB3Config();
-  const wagmiConfig = getCachedWagmiConfig({ partnerId });
+  const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId }), [partnerId]);
   const { connect } = useConnect();
   const activeWagmiAccount = useAccount();
   const { switchAccount } = useSwitchAccount();
@@ -76,8 +76,10 @@ export function useAuth() {
 
       // Authenticate with BSMNT
       try {
-        const b3Jwt = await authenticateWithB3JWT(response.accessToken);
-        debug("BSMNT re-authentication successful", b3Jwt);
+        if (!disableBSMNTAuthentication) {
+          const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+          debug("BSMNT re-authentication successful", b3Jwt);
+        }
       } catch (bsmntError) {
         // BSMNT authentication failure shouldn't block the main auth flow
         debug("BSMNT re-authentication failed (non-critical)", bsmntError);
@@ -88,7 +90,7 @@ export function useAuth() {
       debug("Re-authentication failed", err);
       throw err;
     }
-  }, [setUser]);
+  }, [setUser, disableBSMNTAuthentication]);
 
   const syncWagmi = useCallback(async () => {
     function syncWagmiFunc() {
@@ -136,9 +138,7 @@ export function useAuth() {
       });
     }
     syncWagmiFunc();
-    // wagmi config shouldn't change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [partnerId, wallets]);
+  }, [wagmiConfig, wallets, connect, switchAccount]);
 
   useEffect(() => {
     syncWagmi();
@@ -159,9 +159,11 @@ export function useAuth() {
       setIsAuthenticating(false);
       debug("Re-authenticated successfully", { userAuth });
 
-      // Authenticate on BSMNT with B3 JWT
-      const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-      debug("@@b3Jwt", b3Jwt);
+      if (!disableBSMNTAuthentication) {
+        // Authenticate on BSMNT with B3 JWT
+        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+        debug("@@b3Jwt", b3Jwt);
+      }
 
       return userAuth;
     } catch (error) {
@@ -171,7 +173,14 @@ export function useAuth() {
       setIsAuthenticating(false);
       throw new Error("Authentication required. Please authenticate.");
     }
-  }, [reAuthenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+  }, [
+    reAuthenticate,
+    setIsAuthenticated,
+    setIsAuthenticating,
+    setUser,
+    setHasStartedConnecting,
+    disableBSMNTAuthentication,
+  ]);
 
   /**
    * Authenticate with B3
@@ -208,8 +217,10 @@ export function useAuth() {
 
         // Step 3: Authenticate with BSMNT for basement integration
         try {
-          const b3Jwt = await authenticateWithB3JWT(response.accessToken);
-          debug("BSMNT authentication successful", b3Jwt);
+          if (!disableBSMNTAuthentication) {
+            const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+            debug("BSMNT authentication successful", b3Jwt);
+          }
         } catch (bsmntError) {
           // BSMNT authentication failure shouldn't block the main auth flow
           debug("BSMNT authentication failed (non-critical)", bsmntError);
@@ -221,7 +232,7 @@ export function useAuth() {
         throw err;
       }
     },
-    [referralCode, setUser],
+    [referralCode, setUser, disableBSMNTAuthentication],
   );
 
   /**

package/src/global-account/react/hooks/useAuthentication.ts

@@ -6,7 +6,7 @@ import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { ConnectionOptions } from "@thirdweb-dev/wagmi-adapter";
 import { getConnectors } from "@wagmi/core";
-import { useCallback, useContext, useEffect, useRef } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import {
   useActiveWallet,
   useAutoConnect,
@@ -25,7 +25,7 @@ import { useUserQuery } from "./useUserQuery";
 const debug = debugB3React("useAuthentication");
 
 export function useAuthentication(partnerId: string, { skipAutoConnect = false }: { skipAutoConnect?: boolean } = {}) {
-  const { onConnectCallback, onLogoutCallback } = useContext(LocalSDKContext);
+  const { onConnectCallback, onLogoutCallback, disableBSMNTAuthentication } = useContext(LocalSDKContext);
   const { disconnect } = useDisconnect();
   const wallets = useConnectedWallets();
   // Keep refs so logout() always disconnects current wallets, not stale closure values.
@@ -57,7 +57,7 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
   const { authenticate } = useTWAuth();
   const { user, setUser } = useUserQuery();
   const useAutoConnectLoadingPrevious = useRef(false);
-  const wagmiConfig = createWagmiConfig({ partnerId });
+  const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId }), [partnerId]);
   const { connect } = useConnect();
   const activeWagmiAccount = useAccount();
   const { switchAccount } = useSwitchAccount();
@@ -113,9 +113,7 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
       });
     }
     syncWagmiFunc();
-    // wagmi config shouldn't change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [partnerId, wallets]);
+  }, [wagmiConfig, wallets, connect, switchAccount]);
 
   useEffect(() => {
     syncWagmi();
@@ -142,9 +140,11 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
         setIsAuthenticating(false);
         debug("Re-authenticated successfully", { userAuth });
 
-        // Authenticate on BSMNT with B3 JWT
-        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-        debug("@@b3Jwt", b3Jwt);
+        if (!disableBSMNTAuthentication) {
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          debug("@@b3Jwt", b3Jwt);
+        }
 
         return userAuth;
       } catch (error) {
@@ -156,14 +156,25 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
         setIsAuthenticating(false);
         debug("Fresh authentication successful", { userAuth });
 
-        // Authenticate on BSMNT with B3 JWT
-        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-        debug("@@b3Jwt", b3Jwt);
+        if (!disableBSMNTAuthentication) {
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          debug("@@b3Jwt", b3Jwt);
+        }
 
         return userAuth;
       }
     },
-    [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting],
+    [
+      activeWallet,
+      partnerId,
+      authenticate,
+      setIsAuthenticated,
+      setIsAuthenticating,
+      setUser,
+      setHasStartedConnecting,
+      disableBSMNTAuthentication,
+    ],
   );
 
   const logout = useCallback(

package/src/global-account/react/hooks/useAutoSelectWallet.ts

@@ -1,19 +1,53 @@
+import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { useCallback, useEffect } from "react";
-import { getLastAuthProvider, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
-import { Wallet } from "thirdweb/wallets";
+import { useCallback, useEffect, useRef } from "react";
+import { getLastAuthProvider, useAddConnectedWallet, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { EIP1193, Wallet } from "thirdweb/wallets";
 import { useAuthStore } from "../stores";
 
 const debug = debugB3React("useAutoSelectWallet");
 
 /**
- * Hook to automatically select the first EOA wallet when user is authenticated
- * Only auto-selects if the last auth was via wallet or no previous auth provider
+ * Hook to automatically connect a default EOA provider (if given) and
+ * select the first EOA wallet when user is authenticated.
+ * Only auto-selects if the last auth was via wallet or no previous auth provider.
  */
-export function useAutoSelectWallet({ enabled }: { enabled: boolean }) {
+export function useAutoSelectWallet({
+  enabled,
+  defaultEoaProvider,
+}: {
+  enabled: boolean;
+  defaultEoaProvider?: EIP1193.EIP1193Provider;
+}) {
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
   const wallets = useConnectedWallets();
   const setActiveWallet = useSetActiveWallet();
+  const addConnectedWallet = useAddConnectedWallet();
+  const hasConnectedProvider = useRef(false);
+
+  // Auto-connect the default EOA provider (e.g. Farcaster frame wallet) on mount.
+  // Uses useAddConnectedWallet instead of useConnect so the wallet is added to
+  // connectedWallets WITHOUT becoming the active wallet. This prevents
+  // useAuthentication's logout/onTimeout from disconnecting it (logout only
+  // disconnects ecosystem wallets and the active wallet).
+  useEffect(() => {
+    if (!defaultEoaProvider || hasConnectedProvider.current) return;
+    hasConnectedProvider.current = true;
+
+    const connectDefaultProvider = async () => {
+      try {
+        const wallet = EIP1193.fromProvider({ provider: defaultEoaProvider });
+        await wallet.connect({ client });
+        addConnectedWallet(wallet);
+        debug("Auto-connected default EOA provider", wallet.id);
+      } catch (error) {
+        debug("Failed to auto-connect default EOA provider", error);
+        hasConnectedProvider.current = false;
+      }
+    };
+
+    connectDefaultProvider();
+  }, [defaultEoaProvider, addConnectedWallet]);
 
   const setWallet = useCallback(
     (wallet: Wallet) => {

package/src/global-account/react/hooks/useBetterAuth.ts

@@ -0,0 +1,193 @@
+import app from "@b3dotfun/sdk/global-account/app";
+import { useAuthStore, useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useCallback } from "react";
+import { useBetterAuthClient } from "../components/B3Provider/BetterAuthClientProvider";
+import { useUserQuery } from "./useUserQuery";
+
+const debug = debugB3React("useBetterAuth");
+
+export type BetterAuthSocialProvider = "google" | "discord" | "apple" | "github" | "slack" | "microsoft";
+
+/** Thrown when email verification is required before the user can sign in. */
+export class EmailVerificationRequiredError extends Error {
+  constructor(message = "Check your email to verify your account before signing in.") {
+    super(message);
+    this.name = "EmailVerificationRequiredError";
+  }
+}
+
+/**
+ * Hook for authentication via Better Auth (email/password + social providers).
+ *
+ * Follows the same pattern as Thirdweb auth:
+ * 1. Better Auth sign-in returns a session token
+ * 2. Token is passed as accessToken to app.authenticate({ strategy: "better-auth" })
+ * 3. BetterAuthStrategy verifies the token and issues a Feathers JWT
+ */
+export function useBetterAuth() {
+  const { partnerId } = useB3Config();
+  const betterAuthClient = useBetterAuthClient();
+  const { setUser } = useUserQuery();
+  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+  const setIsConnected = useAuthStore(state => state.setIsConnected);
+  const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
+
+  const exchangeForFeathersJWT = useCallback(
+    async (sessionToken: string) => {
+      debug("Exchanging Better Auth token for Feathers JWT");
+
+      const response = await app.authenticate({
+        strategy: "better-auth",
+        accessToken: sessionToken,
+        partnerId,
+      } as any);
+
+      if (!response.user) {
+        throw new Error("No user returned from authentication");
+      }
+
+      setUser(response.user);
+      setIsAuthenticated(true);
+      setIsConnected(true);
+      setIsAuthenticating(false);
+
+      debug("Feathers JWT exchange successful", { userId: response.user?.userId });
+      return response;
+    },
+    [partnerId, setUser, setIsAuthenticated, setIsConnected, setIsAuthenticating],
+  );
+
+  const signInWithEmail = useCallback(
+    async (email: string, password: string) => {
+      debug("Signing in with email", { email });
+      setHasStartedConnecting(true);
+      setIsAuthenticating(true);
+
+      try {
+        const result = await betterAuthClient.signIn.email({ email, password });
+
+        if (result.error) {
+          throw new Error(result.error.message || "Sign in failed");
+        }
+
+        const token = result.data?.token;
+        if (!token) {
+          throw new Error("No session token returned from sign in");
+        }
+
+        return await exchangeForFeathersJWT(token);
+      } catch (error) {
+        setIsAuthenticating(false);
+        debug("Sign in failed", error);
+        throw error;
+      }
+    },
+    [exchangeForFeathersJWT, setIsAuthenticating, setHasStartedConnecting, betterAuthClient],
+  );
+
+  const signUpWithEmail = useCallback(
+    async (email: string, password: string, name: string, verifyCallbackURL?: string) => {
+      debug("Signing up with email", { email, name });
+      setHasStartedConnecting(true);
+      setIsAuthenticating(true);
+
+      try {
+        const result = await betterAuthClient.signUp.email({ email, password, name });
+
+        if (result.error) {
+          throw new Error(result.error.message || "Sign up failed");
+        }
+
+        const token = result.data?.token;
+        if (!token) {
+          // requireEmailVerification is enabled — send verification email with
+          // a callbackURL Better Auth redirects to after server-side verify.
+          // Pass verifyCallbackURL to land on a dedicated confirmation page.
+          await betterAuthClient.sendVerificationEmail({
+            email,
+            callbackURL: verifyCallbackURL || `${window.location.origin}?authStrategy=better-auth`,
+          });
+          throw new EmailVerificationRequiredError();
+        }
+
+        return await exchangeForFeathersJWT(token);
+      } catch (error) {
+        setIsAuthenticating(false);
+        debug("Sign up failed", error);
+        throw error;
+      }
+    },
+    [exchangeForFeathersJWT, setIsAuthenticating, setHasStartedConnecting, betterAuthClient],
+  );
+
+  const signInWithSocial = useCallback(
+    async (provider: BetterAuthSocialProvider) => {
+      debug("Signing in with social provider", { provider });
+      setHasStartedConnecting(true);
+      setIsAuthenticating(true);
+
+      try {
+        const result = await betterAuthClient.signIn.social({
+          provider,
+          callbackURL: window.location.href,
+        });
+
+        if (result.error) {
+          throw new Error(result.error.message || `${provider} sign in failed`);
+        }
+
+        // Social auth redirects to provider — JWT exchange happens on callback
+        // via BetterAuthProvider session restore
+      } catch (error) {
+        setIsAuthenticating(false);
+        debug("Social sign in failed", error);
+        throw error;
+      }
+    },
+    [setIsAuthenticating, setHasStartedConnecting, betterAuthClient],
+  );
+
+  const requestPasswordReset = useCallback(async (email: string, redirectTo?: string) => {
+    debug("Requesting password reset", { email });
+
+    const result = await betterAuthClient.requestPasswordReset({
+      email,
+      redirectTo,
+    });
+
+    if (result.error) {
+      throw new Error(result.error.message || "Password reset request failed");
+    }
+
+    debug("Password reset email sent");
+    return result;
+  }, [betterAuthClient]);
+
+  const resetPassword = useCallback(async (newPassword: string, token: string) => {
+    debug("Resetting password");
+
+    const result = await betterAuthClient.resetPassword({
+      newPassword,
+      token,
+    });
+
+    if (result.error) {
+      throw new Error(result.error.message || "Password reset failed");
+    }
+
+    debug("Password reset successful");
+    return result;
+  }, [betterAuthClient]);
+
+  return {
+    signInWithEmail,
+    signUpWithEmail,
+    signInWithSocial,
+    requestPasswordReset,
+    resetPassword,
+    exchangeForFeathersJWT,
+    betterAuthClient,
+  };
+}

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

@@ -4,7 +4,7 @@ import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { useCallback, useState } from "react";
 import { Chain } from "thirdweb";
 import { useConnect as useConnectTW } from "thirdweb/react";
-import { ecosystemWallet, SingleStepAuthArgsType } from "thirdweb/wallets";
+import { ecosystemWallet, MultiStepAuthArgsType, SingleStepAuthArgsType } from "thirdweb/wallets";
 const debug = debugB3React("useConnect");
 
 /**
@@ -23,7 +23,7 @@ export function useConnect(partnerId: string, chain?: Chain) {
    * It is used to connect to a wallet using the thirdweb client.
    */
   const connectTw = useCallback(
-    async (strategyOptions?: SingleStepAuthArgsType) => {
+    async (strategyOptions?: MultiStepAuthArgsType | SingleStepAuthArgsType) => {
       setIsLoading(true);
       return await connect(async () => {
         if (!strategyOptions) throw new Error("Strategy options are required");

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

@@ -12,7 +12,6 @@ import { useSearchParam } from "./useSearchParamsSSR";
  * @deprecated Use useAuth() instead
  */
 export function useTWAuth() {
-  console.warn("useTWAuth is deprecated. Please migrate to useAuth() for authentication.");
   const referralCode = useSearchParam("referralCode");
 
   const authenticate = useCallback(

package/src/global-account/react/stores/useModalStore.ts

@@ -44,6 +44,8 @@ export interface SignInWithB3ModalProps extends BaseModalProps {
   source?: "signInWithB3Button" | "requestPermissions";
   /** Whether to show the signers enabled modal */
   signersEnabled?: boolean;
+  /** URL Better Auth redirects to after server-side email verification. */
+  verifyEmailRedirectTo?: string;
 }
 
 /**
@@ -451,6 +453,16 @@ export interface SendModalProps extends BaseModalProps {
   onSuccess?: (txHash?: string) => void;
 }
 
+/**
+ * Props for the Session Duration modal
+ * Allows users to configure how long they stay signed in
+ */
+export interface SessionDurationModalProps extends BaseModalProps {
+  type: "sessionDuration";
+  partnerId: string;
+  chain: Chain;
+}
+
 /**
  * Props for the Notifications modal
  * Allows users to manage notification settings and channels
@@ -625,6 +637,8 @@ export interface AnySpendDepositModalProps extends BaseModalProps {
   actionLabel?: string;
   /** Whether to show chain selection step. Defaults to true if sourceTokenChainId is not provided */
   showChainSelection?: boolean;
+  /** Whether to show the "Fund with Fiat" option in the deposit options list. Defaults to true */
+  showFiatOption?: boolean;
   /** Minimum pool size for filtering tokens (default: 1,000,000) */
   minPoolSize?: number;
   /** Custom title for chain selection step */
@@ -677,6 +691,7 @@ export type ModalContentType =
   | DepositModalProps
   | SendModalProps
   | NotificationsModalProps
+  | SessionDurationModalProps
   | AnySpendCollectorClubPurchaseProps
   | AnySpendDepositModalProps
   | AnySpendWorkflowTriggerModalProps

package/src/global-account/react/utils/createWagmiConfig.tsx

@@ -1,9 +1,8 @@
+import { createWalletConfig } from "@b3dotfun/sdk/wallet/utils/createWalletConfig";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
-import { supportedChains } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { inAppWalletConnector } from "@thirdweb-dev/wagmi-adapter";
-import { http } from "viem";
-import { createConfig, type CreateConnectorFn } from "wagmi";
+import type { CreateConnectorFn } from "wagmi";
 
 export interface CreateWagmiConfigOptions {
   partnerId: string;
@@ -13,7 +12,8 @@ export interface CreateWagmiConfigOptions {
 }
 
 /**
- * Creates a wagmi config with optional custom RPC URLs and connectors
+ * Creates a wagmi config with the B3 ecosystem wallet connector.
+ * Delegates to createWalletConfig and adds the ecosystem connector on top.
  * @param options.partnerId - Partner ID for the ecosystem wallet
  * @param options.rpcUrls - Optional mapping of chain IDs to RPC URLs
  * @param options.connectors - Additional connectors to include
@@ -32,27 +32,8 @@ export function createWagmiConfig(options: CreateWagmiConfigOptions) {
 
   const finalConnectors = overrideDefaultConnectors ? connectors : [...defaultConnectors, ...connectors];
 
-  return createConfig({
-    chains: [supportedChains[0], ...supportedChains.slice(1)],
-    transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(rpcUrls?.[chain.id])])),
+  return createWalletConfig({
     connectors: finalConnectors,
+    rpcUrls,
   });
 }
-
-/** Module-level cache — wagmi configs must not be recreated on every render. */
-const wagmiConfigCache = new Map<string, ReturnType<typeof createWagmiConfig>>();
-
-/**
- * Returns a cached wagmi config for the given partnerId.
- * Use this instead of calling createWagmiConfig() directly inside React components or hooks
- * to avoid registering duplicate EventEmitter listeners on every render.
- */
-export function getCachedWagmiConfig(options: CreateWagmiConfigOptions) {
-  const key = options.partnerId;
-  let config = wagmiConfigCache.get(key);
-  if (!config) {
-    config = createWagmiConfig(options);
-    wagmiConfigCache.set(key, config);
-  }
-  return config;
-}

package/src/global-account/react/utils/index.ts

@@ -1,4 +1,3 @@
 export * from "./notificationsAPI";
 export * from "./profileDisplay";
 export * from "./toast";
-export * from "./updateAvatar";

package/src/global-account/react/utils/profileDisplay.ts

@@ -3,6 +3,21 @@ import { type Profile } from "thirdweb/wallets";
 
 const debug = debugB3React("profileDisplay");
 
+const ALLOWED_IPFS_GATEWAYS = [
+  "ipfs.io",
+  "gateway.pinata.cloud",
+  "cloudflare-ipfs.com",
+  "dweb.link",
+  "nftstorage.link",
+  "w3s.link",
+];
+
+const BLOCKED_HOSTNAMES = ["models.readyplayer.me", "readyplayer.me"];
+
+function isHostnameInList(hostname: string, list: string[]): boolean {
+  return list.some(entry => hostname === entry || hostname.endsWith(`.${entry}`));
+}
+
 /**
  * Validates that an image URL uses an allowed schema
  * @param url - The URL to validate
@@ -31,30 +46,17 @@ export function validateImageUrl(url: string | null | undefined): string | null
       return null;
     }
 
-    // Whitelist of allowed IPFS gateway hostnames
-    const allowedIpfsGateways = [
-      "ipfs.io",
-      "gateway.pinata.cloud",
-      "cloudflare-ipfs.com",
-      "dweb.link",
-      "nftstorage.link",
-      "w3s.link",
-    ];
-
-    // Check if hostname matches allowed IPFS gateways
     const hostname = parsedUrl.hostname.toLowerCase();
-    const isAllowedIpfsGateway = allowedIpfsGateways.some(gateway => {
-      // Exact match or subdomain of the gateway
-      return hostname === gateway || hostname.endsWith(`.${gateway}`);
-    });
 
-    if (isAllowedIpfsGateway) {
+    if (isHostnameInList(hostname, ALLOWED_IPFS_GATEWAYS)) {
       return url;
     }
 
-    // For standard HTTP(S) URLs from trusted sources
-    // Add additional hostname validation here if needed
-    // For now, allow all HTTP(S) URLs (can be restricted further if needed)
+    if (isHostnameInList(hostname, BLOCKED_HOSTNAMES)) {
+      debug("Rejected deprecated avatar service:", hostname, url);
+      return null;
+    }
+
     return url;
   } catch (error) {
     // Invalid URL format

package/src/shared/constants/chains/b3Chain.ts

@@ -1,6 +1,6 @@
+import { ChainNetworks } from "@b3dotfun/sdk/global-account/types/chain-networks";
 import { defineChain as defineThirdwebChain, Chain as ThirdwebChain } from "thirdweb";
 import { Chain, defineChain } from "viem";
-import { ChainNetworks } from "@b3dotfun/sdk/global-account/types/chain-networks";
 
 export const nullAddress = "0x0000000000000000000000000000000000000000";
 
@@ -58,11 +58,11 @@ export const b3Testnet: Chain = defineChain({
 export const b3Mainnet = defineChain({
   id: 8333,
   name: "B3",
-  rpc: "https://mainnet-rpc.b3.fun",
+  rpc: "https://late-dimensional-yard.b3-mainnet.quiknode.pro/461dbdbd44158cd7a7a764a58ffb01a67eef77f2",
   rpcUrls: {
     default: {
-      http: ["https://mainnet-rpc.b3.fun"],
-      ws: ["wss://mainnet-rpc.b3.fun/ws"],
+      http: ["https://late-dimensional-yard.b3-mainnet.quiknode.pro/461dbdbd44158cd7a7a764a58ffb01a67eef77f2"],
+      ws: ["wss://late-dimensional-yard.b3-mainnet.quiknode.pro/461dbdbd44158cd7a7a764a58ffb01a67eef77f2"],
     },
   },
   icon: {
@@ -133,7 +133,7 @@ export const thirdwebB3Testnet: ThirdwebChain = defineThirdwebChain({
 export const thirdwebB3Mainnet: ThirdwebChain = defineThirdwebChain({
   id: 8333,
   name: "B3",
-  rpc: "https://mainnet-rpc.b3.fun/http",
+  rpc: "https://late-dimensional-yard.b3-mainnet.quiknode.pro/461dbdbd44158cd7a7a764a58ffb01a67eef77f2/",
   icon: {
     url: "https://cdn.b3.fun/b3_logo.svg",
     width: 32,