thirdweb 5.30.0-nightly-991cb72bdb1b94fcf0f9a3de36b2ec8ee07ae5ec-20240619000538 → 5.30.0-nightly-fab5cd43bed972b0a3f70f0f39a790349672ba72-20240620192731

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -2,12 +2,13 @@ import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
 import type { Account } from "../../../interfaces/wallet.js";
 import {
-  type AuthArgsType,
   type AuthLoginReturnType,
   type GetUser,
   type LogoutReturnType,
-  type PreAuthArgsType,
+  type MultiStepAuthArgsType,
+  type MultiStepAuthProviderType,
   type SendEmailOtpReturnType,
+  type SingleStepAuthArgsType,
   UserWalletStatus,
   oauthStrategyToAuthProvider,
 } from "../../core/authentication/type.js";
@@ -43,7 +44,11 @@ export class InAppWebConnector implements InAppConnector {
    * `const thirdwebInAppWallet = new InAppWalletSdk({ clientId: "", chain: "Goerli" });`
    * @internal
    */
-  constructor({ client, onAuthSuccess }: InAppWalletConstructorType) {
+  constructor({
+    client,
+    onAuthSuccess,
+    ecosystem,
+  }: InAppWalletConstructorType) {
     if (this.isClientIdLegacyPaper(client.clientId)) {
       throw new Error(
         "You are using a legacy clientId. Please use the clientId found on the thirdweb dashboard settings page",
@@ -53,10 +58,12 @@ export class InAppWebConnector implements InAppConnector {
     this.client = client;
     this.querier = new InAppWalletIframeCommunicator({
       clientId: client.clientId,
+      ecosystem,
       baseUrl,
     });
     this.wallet = new IFrameWallet({
       client,
+      ecosystem,
       querier: this.querier,
     });
 
@@ -64,6 +71,7 @@ export class InAppWebConnector implements InAppConnector {
       client,
       querier: this.querier,
       baseUrl,
+      ecosystem,
       onAuthSuccess: async (authResult) => {
         onAuthSuccess?.(authResult);
         await this.wallet.postWalletSetUp({
@@ -73,6 +81,8 @@ export class InAppWebConnector implements InAppConnector {
         await this.querier.call({
           procedureName: "initIframe",
           params: {
+            partnerId: ecosystem?.partnerId,
+            ecosystemId: ecosystem?.id,
             deviceShareStored: authResult.walletDetails.deviceShareStored,
             clientId: this.client.clientId,
             walletUserId: authResult.storedToken.authDetails.userWalletId,
@@ -123,7 +133,7 @@ export class InAppWebConnector implements InAppConnector {
   }
 
   async preAuthenticate(
-    args: PreAuthArgsType,
+    args: MultiStepAuthProviderType,
   ): Promise<SendEmailOtpReturnType> {
     const strategy = args.strategy;
     switch (strategy) {
@@ -136,12 +146,14 @@ export class InAppWebConnector implements InAppConnector {
       default:
         assertUnreachable(
           strategy,
-          `Provider: ${strategy} doesnt require pre-authentication`,
+          `Provider: ${strategy} doesn't require pre-authentication`,
         );
     }
   }
 
-  async authenticate(args: AuthArgsType): Promise<AuthLoginReturnType> {
+  async authenticate(
+    args: MultiStepAuthArgsType | SingleStepAuthArgsType,
+  ): Promise<AuthLoginReturnType> {
     const strategy = args.strategy;
     switch (strategy) {
       case "email": {
@@ -189,14 +201,16 @@ export class InAppWebConnector implements InAppConnector {
       case "passkey": {
         if (args.type === "sign-up") {
           const authToken = await registerPasskey({
-            client: args.client,
+            client: this.wallet.client,
+            ecosystem: this.wallet.ecosystem,
             authenticatorType: args.authenticatorType,
             username: args.passkeyName,
           });
           return this.auth.loginWithAuthToken(authToken);
         }
         const authToken = await loginWithPasskey({
-          client: args.client,
+          client: this.wallet.client,
+          ecosystem: this.wallet.ecosystem,
           authenticatorType: args.authenticatorType,
         });
         return this.auth.loginWithAuthToken(authToken);

package/src/wallets/in-app/web/types.ts

@@ -2,9 +2,25 @@
 // types for class constructors still a little messy right now.
 
 import type { ThirdwebClient } from "../../../client/client.js";
+import type { EcosystemWalletId } from "../../wallet-types.js";
 import type { AuthAndWalletRpcReturnType } from "../core/authentication/type.js";
 import type { InAppWalletIframeCommunicator } from "./utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 
+export type Ecosystem = {
+  id: EcosystemWalletId;
+  partnerId?: string;
+};
+
+export type EcosystemPermssions = {
+  allowlistedBundleIds: string[];
+  allowlistedDomains: string[];
+  createdAt: string;
+  id: string;
+  name: string;
+  permissions: ("PROMPT_USER_V1" | "FULL_CONTROL_V1")[];
+  updatedAt: string;
+};
+
 // Open to PRs from whoever sees this and knows of a cleaner way to handle things
 export type ClientIdConstructorType = {
   /**
@@ -18,6 +34,11 @@ export type InAppWalletConstructorType = ClientIdConstructorType & {
    * @returns
    */
   onAuthSuccess?: (authResult: AuthAndWalletRpcReturnType) => void;
+
+  /**
+   * @param ecosystem - An optional set of options to connect to an ecosystem wallet.
+   */
+  ecosystem?: Ecosystem;
 };
 
 export type ClientIdWithQuerierType = ClientIdConstructorType & {

package/src/wallets/in-app/web/utils/Storage/LocalStorage.ts

@@ -1,3 +1,4 @@
+import type { EcosystemWalletId } from "../../../../wallet-types.js";
 import {
   AUTH_TOKEN_LOCAL_STORAGE_NAME,
   DEVICE_SHARE_LOCAL_STORAGE_NAME,
@@ -13,13 +14,16 @@ const data = new Map<string, string>();
  */
 export class LocalStorage {
   protected isSupported: boolean;
-  protected clientId: string;
+  protected key: string;
   /**
    * @internal
    */
-  constructor({ clientId }: { clientId: string }) {
+  constructor({
+    clientId,
+    ecosystemId,
+  }: { clientId: string; ecosystemId?: EcosystemWalletId }) {
     this.isSupported = typeof window !== "undefined" && !!window.localStorage;
-    this.clientId = clientId;
+    this.key = getLocalStorageKey(clientId, ecosystemId);
   }
 
   protected async getItem(key: string): Promise<string | null> {
@@ -49,9 +53,7 @@ export class LocalStorage {
    * @internal
    */
   async getWalletConnectSessions(): Promise<string | null> {
-    return this.getItem(
-      WALLET_CONNECT_SESSIONS_LOCAL_STORAGE_NAME(this.clientId),
-    );
+    return this.getItem(WALLET_CONNECT_SESSIONS_LOCAL_STORAGE_NAME(this.key));
   }
 
   /**
@@ -59,7 +61,7 @@ export class LocalStorage {
    */
   async saveWalletConnectSessions(stringifiedSessions: string): Promise<void> {
     await this.setItem(
-      WALLET_CONNECT_SESSIONS_LOCAL_STORAGE_NAME(this.clientId),
+      WALLET_CONNECT_SESSIONS_LOCAL_STORAGE_NAME(this.key),
       stringifiedSessions,
     );
   }
@@ -68,38 +70,33 @@ export class LocalStorage {
    * @internal
    */
   async savePasskeyCredentialId(id: string): Promise<void> {
-    await this.setItem(
-      PASSKEY_CREDENTIAL_ID_LOCAL_STORAGE_NAME(this.clientId),
-      id,
-    );
+    await this.setItem(PASSKEY_CREDENTIAL_ID_LOCAL_STORAGE_NAME(this.key), id);
   }
 
   /**
    * @internal
    */
   async getPasskeyCredentialId(): Promise<string | null> {
-    return this.getItem(
-      PASSKEY_CREDENTIAL_ID_LOCAL_STORAGE_NAME(this.clientId),
-    );
+    return this.getItem(PASSKEY_CREDENTIAL_ID_LOCAL_STORAGE_NAME(this.key));
   }
 
   /**
    * @internal
    */
   async saveAuthCookie(cookie: string): Promise<void> {
-    await this.setItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.clientId), cookie);
+    await this.setItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.key), cookie);
   }
   /**
    * @internal
    */
   async getAuthCookie(): Promise<string | null> {
-    return this.getItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.clientId));
+    return this.getItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.key));
   }
   /**
    * @internal
    */
   async removeAuthCookie(): Promise<boolean> {
-    return this.removeItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.clientId));
+    return this.removeItem(AUTH_TOKEN_LOCAL_STORAGE_NAME(this.key));
   }
 
   /**
@@ -108,7 +105,7 @@ export class LocalStorage {
   async saveDeviceShare(share: string, userId: string): Promise<void> {
     await this.saveWalletUserId(userId);
     await this.setItem(
-      DEVICE_SHARE_LOCAL_STORAGE_NAME(this.clientId, userId),
+      DEVICE_SHARE_LOCAL_STORAGE_NAME(this.key, userId),
       share,
     );
   }
@@ -118,9 +115,7 @@ export class LocalStorage {
   async getDeviceShare(): Promise<string | null> {
     const userId = await this.getWalletUserId();
     if (userId) {
-      return this.getItem(
-        DEVICE_SHARE_LOCAL_STORAGE_NAME(this.clientId, userId),
-      );
+      return this.getItem(DEVICE_SHARE_LOCAL_STORAGE_NAME(this.key, userId));
     }
     return null;
   }
@@ -130,9 +125,7 @@ export class LocalStorage {
   async removeDeviceShare(): Promise<boolean> {
     const userId = await this.getWalletUserId();
     if (userId) {
-      return this.removeItem(
-        DEVICE_SHARE_LOCAL_STORAGE_NAME(this.clientId, userId),
-      );
+      return this.removeItem(DEVICE_SHARE_LOCAL_STORAGE_NAME(this.key, userId));
     }
     return false;
   }
@@ -141,21 +134,22 @@ export class LocalStorage {
    * @internal
    */
   async getWalletUserId(): Promise<string | null> {
-    return this.getItem(WALLET_USER_ID_LOCAL_STORAGE_NAME(this.clientId));
+    return this.getItem(WALLET_USER_ID_LOCAL_STORAGE_NAME(this.key));
   }
   /**
    * @internal
    */
   async saveWalletUserId(userId: string): Promise<void> {
-    await this.setItem(
-      WALLET_USER_ID_LOCAL_STORAGE_NAME(this.clientId),
-      userId,
-    );
+    await this.setItem(WALLET_USER_ID_LOCAL_STORAGE_NAME(this.key), userId);
   }
   /**
    * @internal
    */
   async removeWalletUserId(): Promise<boolean> {
-    return this.removeItem(WALLET_USER_ID_LOCAL_STORAGE_NAME(this.clientId));
+    return this.removeItem(WALLET_USER_ID_LOCAL_STORAGE_NAME(this.key));
   }
 }
+
+const getLocalStorageKey = (clientId: string, ecosystemId?: string) => {
+  return `${clientId}${ecosystemId ? `-${ecosystemId}` : ""}`;
+};

package/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts

@@ -52,6 +52,7 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
     // Creating the IFrame element for communication
     let iframe = document.getElementById(iframeId) as HTMLIFrameElement | null;
     const hrefLink = new URL(link);
+
     // TODO (ew) - bring back version tracking
     // const sdkVersion = process.env.THIRDWEB_EWS_SDK_VERSION;
     // if (!sdkVersion) {
@@ -60,24 +61,25 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
     // hrefLink.searchParams.set("sdkVersion", sdkVersion);
     if (!iframe || iframe.src !== hrefLink.href) {
       // ! Do not update the hrefLink here or it'll cause multiple re-renders
-      if (!iframe) {
-        iframe = document.createElement("iframe");
-        const mergedIframeStyles = {
-          ...iframeBaseStyle,
-        };
-        Object.assign(iframe.style, mergedIframeStyles);
-        iframe.setAttribute("id", iframeId);
-        iframe.setAttribute("fetchpriority", "high");
-        container.appendChild(iframe);
-      }
+
+      iframe = document.createElement("iframe");
+      const mergedIframeStyles = {
+        ...iframeBaseStyle,
+      };
+      Object.assign(iframe.style, mergedIframeStyles);
+      iframe.setAttribute("id", iframeId);
+      iframe.setAttribute("fetchpriority", "high");
+      container.appendChild(iframe);
+
       iframe.src = hrefLink.href;
+
       // iframe.setAttribute("data-version", sdkVersion);
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
       const onIframeLoaded = (event: MessageEvent<any>) => {
         if (event.data.eventType === "ewsIframeLoaded") {
           window.removeEventListener("message", onIframeLoaded);
           if (!iframe) {
-            console.warn("thirdweb Iframe not found");
+            console.warn("thirdweb iFrame not found");
             return;
           }
           this.onIframeLoadHandler(iframe, onIframeInitialize)();

package/src/wallets/in-app/web/utils/iFrameCommunication/InAppWalletIframeCommunicator.ts

@@ -1,4 +1,5 @@
 import { IN_APP_WALLET_PATH } from "../../../core/constants/settings.js";
+import type { Ecosystem } from "../../types.js";
 import { LocalStorage } from "../Storage/LocalStorage.js";
 import { IframeCommunicator } from "./IframeCommunicator.js";
 
@@ -10,21 +11,32 @@ export class InAppWalletIframeCommunicator<
   T extends { [key: string]: any },
 > extends IframeCommunicator<T> {
   clientId: string;
+  ecosystem?: Ecosystem;
   /**
    * @internal
    */
-  constructor({ clientId, baseUrl }: { clientId: string; baseUrl: string }) {
+  constructor({
+    clientId,
+    baseUrl,
+    ecosystem,
+  }: {
+    clientId: string;
+    baseUrl: string;
+    ecosystem?: Ecosystem;
+  }) {
     super({
-      iframeId: IN_APP_WALLET_IFRAME_ID,
+      iframeId: IN_APP_WALLET_IFRAME_ID + (ecosystem?.id || ""),
       link: createInAppWalletIframeLink({
         clientId,
         path: IN_APP_WALLET_PATH,
+        ecosystem,
         baseUrl,
       }).href,
       baseUrl,
       container: document.body,
     });
     this.clientId = clientId;
+    this.ecosystem = ecosystem;
   }
 
   /**
@@ -33,6 +45,7 @@ export class InAppWalletIframeCommunicator<
   override async onIframeLoadedInitVariables() {
     const localStorage = new LocalStorage({
       clientId: this.clientId,
+      ecosystemId: this.ecosystem?.id,
     });
 
     return {
@@ -40,6 +53,8 @@ export class InAppWalletIframeCommunicator<
       deviceShareStored: await localStorage.getDeviceShare(),
       walletUserId: await localStorage.getWalletUserId(),
       clientId: this.clientId,
+      partnerId: this.ecosystem?.partnerId,
+      ecosystemId: this.ecosystem?.id,
     };
   }
 }
@@ -52,11 +67,13 @@ export function createInAppWalletIframeLink({
   clientId,
   baseUrl,
   path,
+  ecosystem,
   queryParams,
 }: {
   clientId: string;
   baseUrl: string;
   path: string;
+  ecosystem?: Ecosystem;
   queryParams?: { [key: string]: string | number };
 }) {
   const inAppWalletUrl = new URL(`${path}`, baseUrl);
@@ -69,6 +86,12 @@ export function createInAppWalletIframeLink({
     }
   }
   inAppWalletUrl.searchParams.set("clientId", clientId);
+  if (ecosystem?.partnerId !== undefined) {
+    inAppWalletUrl.searchParams.set("partnerId", ecosystem.partnerId);
+  }
+  if (ecosystem?.id !== undefined) {
+    inAppWalletUrl.searchParams.set("ecosystemId", ecosystem.id);
+  }
   return inAppWalletUrl;
 }
 export const IN_APP_WALLET_IFRAME_ID = "thirdweb-in-app-wallet-iframe";

package/src/wallets/injected/index.ts

@@ -196,6 +196,16 @@ function createAccount(provider: Ethereum, address: string) {
         params: [account.address, stringifiedData],
       });
     },
+    async watchAsset(asset) {
+      const result = await provider.request(
+        {
+          method: "wallet_watchAsset",
+          params: asset,
+        },
+        { retryCount: 0 },
+      );
+      return result;
+    },
   };
 
   return account;

package/src/wallets/interfaces/wallet.ts

@@ -26,6 +26,16 @@ export type SendRawTransactionOptions = {
   chainId: number;
 };
 
+export type WatchAssetParams = {
+  type: "ERC20";
+  options: {
+    address: Address;
+    symbol: string;
+    decimals: number;
+    image?: string | undefined;
+  };
+};
+
 /**
  * Wallet interface
  */
@@ -238,4 +248,16 @@ export type Account = {
     // biome-ignore lint/suspicious/noExplicitAny: any transaction type is allowed here
     transaction: PreparedTransaction<any>,
   ) => Promise<void>;
+  /**
+   * Add an asset to the wallet's watchlist.
+   * @param asset - The asset to watch.
+   *
+   * @example
+   * ```ts
+   * if (account.watchAsset) {
+   *  const success = await account.watchAsset({ type: "ERC20", options: { address: "0x...", symbol: "...", decimals: 18 } });
+   * }
+   * ```
+   */
+  watchAsset?: (asset: WatchAssetParams) => Promise<boolean>;
 };

package/src/wallets/native/create-wallet.ts

@@ -8,6 +8,7 @@ import type { WCSupportedWalletIds } from "../__generated__/wallet-ids.js";
 import { coinbaseWalletSDK } from "../coinbase/coinbase-wallet.js";
 import { getCoinbaseMobileProvider } from "../coinbase/coinbaseMobileSDK.js";
 import { COINBASE } from "../constants.js";
+import { isEcosystemWallet } from "../ecosystem/is-ecosystem-wallet.js";
 import { inAppWallet } from "../in-app/native/in-app.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { smartWallet } from "../smart/smart-wallet.js";
@@ -40,11 +41,11 @@ export function createWallet<const ID extends WalletId>(
 ): Wallet<ID> {
   const [id, creationOptions] = args;
 
-  switch (id) {
+  switch (true) {
     /**
      * SMART WALLET
      */
-    case "smart": {
+    case id === "smart": {
       // same as web
       return smartWallet(
         creationOptions as CreateWalletArgs<"smart">[1],
@@ -53,18 +54,27 @@ export function createWallet<const ID extends WalletId>(
     /**
      * IN-APP WALLET
      */
-    case "embedded":
-    case "inApp": {
+    case id === "embedded":
+    case id === "inApp": {
       return inAppWallet(
         creationOptions as CreateWalletArgs<"inApp">[1],
       ) as Wallet<ID>;
     }
 
+    /**
+     * ECOSYSTEM WALLETS
+     */
+    case isEcosystemWallet(id): {
+      throw new Error(
+        "Ecosystem wallets are not yet supported in the React Native SDK",
+      );
+    }
+
     /**
      * COINBASE WALLET VIA SDK
      * -> if no injected coinbase found, we'll use the coinbase SDK
      */
-    case COINBASE: {
+    case id === COINBASE: {
       const options = creationOptions as CreateWalletArgs<typeof COINBASE>[1];
       return coinbaseWalletSDK({
         createOptions: options,

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -6,6 +6,7 @@ import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import { baseSepolia } from "../../exports/chains.js";
+
 import {
   addAdmin,
   adminUpdatedEvent,
@@ -189,7 +190,6 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         events: [adminUpdatedEvent()],
         logs: receipt.logs,
       });
-      expect(logs.length).toBe(1);
       expect(logs[0]?.args.signer).toBe(newAdmin.address);
       expect(logs[0]?.args.isAdmin).toBe(true);
     });
@@ -255,7 +255,6 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         events: [adminUpdatedEvent()],
         logs: receipt.logs,
       });
-      expect(logs.length).toBe(1);
       expect(logs[0]?.args.signer).toBe(newAdmin.address);
       expect(logs[0]?.args.isAdmin).toBe(true);
 

package/src/wallets/types.ts

@@ -19,5 +19,9 @@ export type AppMetadata = {
   logoUrl?: string;
 };
 
+export type SocialAuthOption = "google" | "apple" | "facebook";
+
+export type AuthOption = "email" | "phone" | "passkey" | SocialAuthOption;
+
 export type DisconnectFn = () => Promise<void>;
 export type SwitchChainFn = (chain: Chain) => Promise<void>;