@b3dotfun/sdk 0.0.40-alpha.6 → 0.0.40-alpha.8

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

@@ -1,9 +1,15 @@
+import { Users } from "@b3dotfun/b3-api";
 import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "@b3dotfun/sdk/global-account/react";
 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 { useCallback, useEffect, useState } from "react";
+import { inAppWalletConnector } from "@thirdweb-dev/wagmi-adapter";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { Toaster } from "sonner";
 import {
   getLastAuthProvider,
@@ -18,8 +24,7 @@ import { ClientType, setClientType } from "../../../client-manager";
 import { StyleRoot } from "../StyleRoot";
 import { B3Context, B3ContextType } from "./types";
 
-import { Users } from "@b3dotfun/b3-api";
-import "@reservoir0x/relay-kit-ui/styles.css";
+const debug = debugB3React("B3Provider");
 
 /**
  * Default permissions configuration for B3 provider
@@ -31,17 +36,6 @@ const DEFAULT_PERMISSIONS = {
   endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
 };
 
-/**
- * Creates wagmi config with optional custom RPC URLs
- * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
- */
-function createWagmiConfig(rpcUrls?: Record<number, string>) {
-  return createConfig({
-    chains: [supportedChains[0], ...supportedChains.slice(1)],
-    transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(rpcUrls?.[chain.id])])) as any,
-  });
-}
-
 // Create queryClient instance
 const queryClient = new QueryClient();
 
@@ -58,6 +52,7 @@ export function B3Provider({
   toaster,
   clientType = "rest",
   rpcUrls,
+  partnerId,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
@@ -71,10 +66,8 @@ export function B3Provider({
   };
   clientType?: ClientType;
   rpcUrls?: Record<number, string>;
+  partnerId?: string;
 }) {
-  // Create wagmi config with custom RPC URLs if provided
-  const [wagmiConfig] = useState(() => createWagmiConfig(rpcUrls));
-
   // Initialize Google Analytics on mount
   useEffect(() => {
     loadGA4Script();
@@ -85,10 +78,41 @@ export function B3Provider({
     setClientType(clientType);
   }, [clientType]);
 
+  const ecocystemConfig = useMemo(() => {
+    if (!partnerId) return undefined;
+
+    return {
+      ecosystemId: ecosystemWalletId,
+      partnerId: partnerId,
+      client,
+    };
+  }, [partnerId]);
+
+  /**
+   * Creates wagmi config with optional custom RPC URLs
+   * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
+   */
+  const wagmiConfig = useMemo(
+    () =>
+      createConfig({
+        chains: [supportedChains[0], ...supportedChains.slice(1)],
+        transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(rpcUrls?.[chain.id])])) as any,
+        connectors: [
+          inAppWalletConnector({
+            ...(ecocystemConfig || {}),
+            client,
+          }),
+          // injected(),
+          // coinbaseWallet({ appName: "HypeDuel" }),
+        ],
+      }),
+    [partnerId],
+  );
+
   return (
-    <WagmiProvider config={wagmiConfig}>
-      <QueryClientProvider client={queryClient}>
-        <ThirdwebProvider>
+    <ThirdwebProvider>
+      <WagmiProvider config={wagmiConfig}>
+        <QueryClientProvider client={queryClient}>
           <TooltipProvider>
             <InnerProvider
               accountOverride={accountOverride}
@@ -105,9 +129,9 @@ export function B3Provider({
               </RelayKitProviderWrapper>
             </InnerProvider>
           </TooltipProvider>
-        </ThirdwebProvider>
-      </QueryClientProvider>
-    </WagmiProvider>
+        </QueryClientProvider>
+      </WagmiProvider>
+    </ThirdwebProvider>
   );
 }
 
@@ -136,6 +160,7 @@ export function InnerProvider({
   const wallets = useConnectedWallets();
   const setActiveWallet = useSetActiveWallet();
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  debug("@@wallets", wallets);
 
   const [user, setUser] = useState<Users | undefined>(() => {
     // Try to restore user from localStorage on initialization
@@ -169,7 +194,7 @@ export function InnerProvider({
     (wallet: Wallet) => {
       setManuallySelectedWallet(wallet);
       const account = wallet.getAccount();
-      console.log("@@gio:setWallet", wallet.id, account?.address);
+      debug("@@setWallet", wallet.id, account?.address);
       setActiveWallet(wallet);
     },
     [setManuallySelectedWallet, setActiveWallet],

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

@@ -10,7 +10,7 @@ import {
   useConnect,
   WalletRow,
 } from "@b3dotfun/sdk/global-account/react";
-import { debug } from "@b3dotfun/sdk/shared/utils/debug";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { useState } from "react";
 import { Chain } from "thirdweb";
@@ -27,6 +27,8 @@ interface LoginStepCustomProps {
   maxInitialWallets?: number;
 }
 
+const debug = debugB3React("LoginStepCustom");
+
 export function LoginStepCustom({
   onSuccess,
   onError,
@@ -76,7 +78,7 @@ export function LoginStepCustom({
       }
 
       const account = connectResult?.getAccount();
-      console.log("@@gio:connectResult", { connectResult, account, options });
+      debug("@@connectResult", { connectResult, account, options });
       if (!account) throw new Error("Failed to connect");
       await onSuccess(account);
       setIsAuthenticated(true);

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

@@ -124,8 +124,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     if (activeWallet) {
       debug("@@logout:activeWallet", activeWallet);
       disconnect(activeWallet);
-      debug("@@logout:disconnected");
-      console.log("@@gio:logout:activeWallet", activeWallet);
+      debug("@@logout:activeWallet", activeWallet);
     }
 
     // Log out of each wallet