thirdweb 5.53.0-nightly-9d84aff26615b6a553ac002e7f51a0ed5172eb5d-20240909000344 → 5.53.0

package/src/social/profiles.ts

@@ -1,7 +1,7 @@
 import type { ThirdwebClient } from "../client/client.js";
 import { getThirdwebBaseUrl } from "../utils/domains.js";
 import { getClientFetch } from "../utils/fetch.js";
-import type { SocialProfiles } from "./types.js";
+import type { SocialProfile } from "./types.js";
 
 /**
  * Fetches the wallet's available social profiles.
@@ -23,7 +23,7 @@ import type { SocialProfiles } from "./types.js";
 export async function getSocialProfiles(args: {
   address: string;
   client: ThirdwebClient;
-}): Promise<SocialProfiles> {
+}): Promise<SocialProfile[]> {
   const { address, client } = args;
 
   const clientFetch = getClientFetch(client);
@@ -42,5 +42,5 @@ export async function getSocialProfiles(args: {
     }
   }
 
-  return (await response.json()).data as SocialProfiles;
+  return (await response.json()).data as SocialProfile[];
 }

package/src/social/types.ts

@@ -34,10 +34,10 @@ export type EnsProfile = {
   telegram?: string;
 };
 
-export type SocialProfiles = {
+export type SocialProfile = {
   type: "farcaster" | "lens" | "ens";
   name?: string;
   avatar?: string;
   bio?: string;
   metadata?: FarcasterProfile | LensProfile | EnsProfile;
-}[];
+};

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -8,6 +8,8 @@ import {
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import {
+  BASE_USDC_IMPLEMENTATION,
+  BASE_USDC_PROXY_CONTRACT,
   NFT_DROP_CONTRACT,
   NFT_DROP_IMPLEMENTATION,
   POLYGON_USDT_IMPLEMENTATION,
@@ -31,6 +33,13 @@ describe("Resolve implementation", async () => {
     );
   });
 
+  it("should extract implementation address for base USDC proxy contract", async () => {
+    const resolved = resolveImplementation(BASE_USDC_PROXY_CONTRACT);
+    expect((await resolved).address).to.equal(
+      BASE_USDC_IMPLEMENTATION.toLowerCase(),
+    );
+  });
+
   it("should extract implementation address for ERC1967 proxy contract", async () => {
     const implementationAddress = await deployContract({
       client: TEST_CLIENT,

package/src/utils/bytecode/resolveImplementation.ts

@@ -120,24 +120,32 @@ async function getImplementationFromStorageSlot(
   });
 
   try {
-    let proxyStorage = "";
-
-    proxyStorage = await eth_getStorageAt(rpcRequest, {
-      address: contract.address,
-      position:
-        "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-    });
-
-    if (proxyStorage === ZERO_BYTES32 && contract.chain.id === 137) {
-      proxyStorage = await eth_getStorageAt(rpcRequest, {
+    const proxyStoragePromises = [
+      eth_getStorageAt(rpcRequest, {
+        address: contract.address,
+        position:
+          "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+      }),
+      eth_getStorageAt(rpcRequest, {
         address: contract.address,
         position:
           // keccak256("matic.network.proxy.implementation") - used in polygon USDT proxy: https://polygonscan.com/address/0xc2132d05d31c914a87c6611c10748aeb04b58e8f#code
           "0xbaab7dbf64751104133af04abc7d9979f0fda3b059a322a8333f533d3f32bf7f",
-      });
-    }
+      }),
+      eth_getStorageAt(rpcRequest, {
+        address: contract.address,
+        position:
+          // keccak256("org.zeppelinos.proxy.implementation") - e.g. base USDC proxy: https://basescan.org/address/0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913#code
+          "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3",
+      }),
+    ];
 
-    return `0x${proxyStorage.slice(-40)}`;
+    const proxyStorages = await Promise.all(proxyStoragePromises);
+    const proxyStorage = proxyStorages.find(
+      (storage) => storage !== ZERO_BYTES32,
+    );
+
+    return proxyStorage ? `0x${proxyStorage.slice(-40)}` : AddressZero;
   } catch {
     return undefined;
   }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.53.0-nightly-9d84aff26615b6a553ac002e7f51a0ed5172eb5d-20240909000344";
+export const version = "5.53.0";

package/src/wallets/coinbase/coinbaseMobileSDK.ts

@@ -1,9 +1,5 @@
-import { configure, handleResponse } from "@coinbase/wallet-mobile-sdk";
 import type { ProviderInterface } from "@coinbase/wallet-sdk";
-import { Linking } from "react-native";
-import type { Chain } from "../../chains/types.js";
-import type { COINBASE } from "../constants.js";
-import type { CreateWalletArgs } from "../wallet-types.js";
+import type { CoinbaseWalletCreationOptions } from "./coinbaseWebSDK.js";
 
 let _provider: ProviderInterface | undefined;
 
@@ -11,44 +7,78 @@ let _provider: ProviderInterface | undefined;
  * @internal
  */
 export async function getCoinbaseMobileProvider(
-  options?: CreateWalletArgs<typeof COINBASE>[1],
+  options?: CoinbaseWalletCreationOptions,
 ): Promise<ProviderInterface> {
   if (!_provider) {
-    const callbackURL = new URL(
-      options?.mobileConfig?.callbackURL || "https://thirdweb.com/wsegue",
-    );
-    const mobileProvider: ProviderInterface = (await initMobileProvider({
-      chain: options?.chains ? options.chains[0] : undefined,
-      ...options?.mobileConfig,
-    })) as unknown as ProviderInterface;
-    _provider = mobileProvider;
-    Linking.addEventListener("url", ({ url }) => {
-      const incomingUrl = new URL(url);
-      if (
-        callbackURL &&
-        incomingUrl.host === callbackURL.host &&
-        incomingUrl.protocol === callbackURL.protocol &&
-        incomingUrl.hostname === callbackURL.hostname
-      ) {
+    // if explicitly set to smart wallet only, use the smart wallet provider
+    const useSmartWallet = options?.walletConfig?.options === "smartWalletOnly";
+    let mobileProvider: ProviderInterface;
+    if (useSmartWallet) {
+      mobileProvider = (await initSmartWalletProvider(
+        options,
+      )) as unknown as ProviderInterface;
+      const ExpoLinking = await import("expo-linking");
+      const { handleResponse } = await import("@mobile-wallet-protocol/client");
+      ExpoLinking.addEventListener("url", ({ url }) => {
+        handleResponse(url);
+      });
+    } else {
+      // otherwise, use the coinbase app provider
+      // TODO: remove this path once the new @mobile-wallet-protocol/client supports it
+      mobileProvider = (await initCoinbaseAppProvider(
+        options,
+      )) as unknown as ProviderInterface;
+      const ExpoLinking = await import("expo-linking");
+      const { handleResponse } = await import("@coinbase/wallet-mobile-sdk");
+      ExpoLinking.addEventListener("url", ({ url }) => {
         // @ts-expect-error - Passing a URL object to handleResponse crashes the function
         handleResponse(url);
-      }
-    });
+      });
+    }
+    _provider = mobileProvider;
     return mobileProvider;
   }
   return _provider;
 }
 
-async function initMobileProvider(args: {
-  chain?: Chain;
-  callbackURL?: string;
-  hostURL?: string;
-  hostPackageName?: string;
-}) {
+async function initSmartWalletProvider(
+  options?: CoinbaseWalletCreationOptions,
+) {
+  const { EIP1193Provider, Wallets } = await import(
+    "@mobile-wallet-protocol/client"
+  );
+  const appDeeplinkUrl = options?.mobileConfig?.callbackURL;
+  if (!appDeeplinkUrl) {
+    throw new Error(
+      "callbackURL is required. Set it when creating the coinbase wallet. Ex: createWallet('com.coinbase.wallet', { mobileConfig: { callbackUrl: 'https://example.com' }}",
+    );
+  }
+  const sdk = new EIP1193Provider({
+    metadata: {
+      appName: options?.appMetadata?.name || "thirdweb powered app",
+      appChainIds: options?.chains?.map((c) => c.id),
+      appDeeplinkUrl,
+      appLogoUrl: options?.appMetadata?.logoUrl,
+    },
+    wallet: Wallets.CoinbaseSmartWallet, // TODO support both smart and EOA once the SDK supports it
+  });
+  return sdk;
+}
+
+async function initCoinbaseAppProvider(
+  options?: CoinbaseWalletCreationOptions,
+) {
+  const appDeeplinkUrl = options?.mobileConfig?.callbackURL;
+  if (!appDeeplinkUrl) {
+    throw new Error(
+      "callbackURL is required. Set it when creating the coinbase wallet. Ex: createWallet('com.coinbase.wallet', { mobileConfig: { callbackUrl: 'https://example.com' }}",
+    );
+  }
+  const { configure } = await import("@coinbase/wallet-mobile-sdk");
   configure({
-    callbackURL: new URL(args.callbackURL || "https://thirdweb.com/wsegue"),
-    hostURL: new URL(args.hostURL || "https://wallet.coinbase.com/wsegue"),
-    hostPackageName: args.hostPackageName || "org.toshi",
+    callbackURL: new URL(appDeeplinkUrl),
+    hostURL: new URL("https://wallet.coinbase.com/wsegue"),
+    hostPackageName: "org.toshi",
   });
   let CoinbaseWalletMobileSDK = (
     await import(
@@ -67,8 +97,9 @@ async function initMobileProvider(args: {
       }
     ).default;
   }
+  const chain = options.chains?.[0];
   return new CoinbaseWalletMobileSDK({
-    jsonRpcUrl: args.chain?.rpc,
-    chainId: args.chain?.id,
+    jsonRpcUrl: chain?.rpc,
+    chainId: chain?.id,
   });
 }

package/src/wallets/coinbase/coinbaseWebSDK.ts

@@ -295,7 +295,6 @@ function createAccount(provider: ProviderInterface, _address: string) {
           },
         ],
       })) as Hex;
-
       return {
         transactionHash,
       };

package/src/wallets/coinbase/utils.ts

@@ -2,5 +2,5 @@ import type { ProviderInterface } from "@coinbase/wallet-sdk";
 
 export async function showCoinbasePopup(provider: ProviderInterface) {
   // biome-ignore lint/suspicious/noExplicitAny: based on the latest CB SDK - scary but works
-  await (provider as any)?.communicator?.waitForPopupLoaded();
+  await (provider as any)?.communicator?.waitForPopupLoaded?.();
 }