thirdweb 5.61.7-nightly-da9f1964e4ae74ed5d33666788e2d16e4d56614d-20241015000333 → 5.63.0-nightly-3a141e742c19eeeecf031a3014cb476ee69d4c0c-20241016000332

package/src/react/web/wallets/shared/OTPLoginUI.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
@@ -9,7 +9,6 @@ import {
   preAuthenticate,
 } from "../../../../wallets/in-app/web/lib/auth/index.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
-import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { fontSize } from "../../../core/design-system/index.js";
 import { setLastAuthProvider } from "../../../core/utils/storage.js";
@@ -54,7 +53,12 @@ export function OTPLoginUI(props: {
   const [verifyStatus, setVerifyStatus] = useState<VerificationStatus>("idle");
   const [error, setError] = useState<string | undefined>();
   const [accountStatus, setAccountStatus] = useState<AccountStatus>("sending");
-  const isEcosystem = useMemo(() => isEcosystemWallet(wallet.id), [wallet.id]);
+  const ecosystem = isEcosystemWallet(wallet)
+    ? {
+        id: wallet.id,
+        partnerId: wallet.getConfig()?.partnerId,
+      }
+    : undefined;
 
   const [screen] = useState<ScreenToShow>("base");
 
@@ -66,13 +70,7 @@ export function OTPLoginUI(props: {
     try {
       if ("email" in userInfo) {
         await preAuthenticate({
-          ecosystem: isEcosystem
-            ? {
-                id: wallet.id as EcosystemWalletId,
-                partnerId: (wallet as Wallet<EcosystemWalletId>).getConfig()
-                  ?.partnerId,
-              }
-            : undefined,
+          ecosystem,
           email: userInfo.email,
           strategy: "email",
           client: props.client,
@@ -80,13 +78,7 @@ export function OTPLoginUI(props: {
         setAccountStatus("sent");
       } else if ("phone" in userInfo) {
         await preAuthenticate({
-          ecosystem: isEcosystem
-            ? {
-                id: wallet.id as EcosystemWalletId,
-                partnerId: (wallet as Wallet<EcosystemWalletId>).getConfig()
-                  ?.partnerId,
-              }
-            : undefined,
+          ecosystem,
           phoneNumber: userInfo.phone,
           strategy: "phone",
           client: props.client,
@@ -100,7 +92,7 @@ export function OTPLoginUI(props: {
       setVerifyStatus("idle");
       setAccountStatus("error");
     }
-  }, [props.client, userInfo, wallet, isEcosystem]);
+  }, [props.client, userInfo, ecosystem]);
 
   async function connect(otp: string) {
     if ("email" in userInfo) {
@@ -133,6 +125,7 @@ export function OTPLoginUI(props: {
         strategy: "email",
         email: userInfo.email,
         verificationCode: otp,
+        ecosystem,
       });
     } else if ("phone" in userInfo) {
       await linkProfile({
@@ -140,6 +133,7 @@ export function OTPLoginUI(props: {
         strategy: "phone",
         phoneNumber: userInfo.phone,
         verificationCode: otp,
+        ecosystem,
       });
     }
   }

package/src/react/web/wallets/shared/PassKeyLogin.tsx

@@ -211,6 +211,12 @@ function SignupScreen(props: {
   const { wallet, done, client, chain } = props;
   const [error, setError] = useState<string | undefined>();
   const [status, setStatus] = useState<"loading" | "error">("loading");
+  const ecosystem = isEcosystemWallet(wallet)
+    ? {
+        id: wallet.id,
+        partnerId: wallet.getConfig()?.partnerId,
+      }
+    : undefined;
 
   async function signup() {
     setStatus("loading");
@@ -220,6 +226,7 @@ function SignupScreen(props: {
           client,
           strategy: "passkey",
           type: "sign-up",
+          ecosystem,
         });
       } else {
         await wallet.connect({

package/src/react/web/wallets/shared/SocialLogin.tsx

@@ -39,6 +39,12 @@ export function SocialLogin(props: {
   const ewLocale = props.locale;
   const locale = ewLocale.socialLoginScreen;
   const themeObj = useCustomTheme();
+  const ecosystem = isEcosystemWallet(props.wallet)
+    ? {
+        id: props.wallet.id,
+        partnerId: props.wallet.getConfig()?.partnerId,
+      }
+    : undefined;
 
   const [authError, setAuthError] = useState<string | undefined>(undefined);
   const { done, wallet } = props;
@@ -62,12 +68,7 @@ export function SocialLogin(props: {
       return loginWithOauthRedirect({
         authOption: props.socialAuth,
         client: props.client,
-        ecosystem: isEcosystemWallet(wallet)
-          ? {
-              id: wallet.id,
-              partnerId: wallet.getConfig()?.partnerId,
-            }
-          : undefined,
+        ecosystem,
         redirectUrl: walletConfig?.auth?.redirectUrl,
         mode: walletConfig?.auth?.mode,
       });
@@ -78,12 +79,7 @@ export function SocialLogin(props: {
         authOption: props.socialAuth,
         themeObj,
         client: props.client,
-        ecosystem: isEcosystemWallet(wallet)
-          ? {
-              id: wallet.id,
-              partnerId: wallet.getConfig()?.partnerId,
-            }
-          : undefined,
+        ecosystem,
       });
 
       if (!socialWindow) {
@@ -99,6 +95,7 @@ export function SocialLogin(props: {
           closeOpenedWindow: (openedWindow) => {
             openedWindow.close();
           },
+          ecosystem,
         }).catch((e) => {
           setAuthError(e.message);
           throw e;

package/src/react/web/wallets/shared/oauthSignIn.ts

@@ -38,6 +38,7 @@ function getOauthLoginPath(
     case "google":
     case "farcaster":
     case "telegram":
+    case "twitch":
     case "line":
     case "x":
     case "guest":

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.61.7-nightly-da9f1964e4ae74ed5d33666788e2d16e4d56614d-20241015000333";
+export const version = "5.63.0-nightly-3a141e742c19eeeecf031a3014cb476ee69d4c0c-20241016000332";

package/src/wallets/in-app/{web/lib → core}/actions/generate-wallet.enclave.ts

@@ -1,7 +1,8 @@
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
-import { getClientFetch } from "../../../../../utils/fetch.js";
-import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import type { UserWallet } from "../wallet/enclave-wallet.js";
+import type { Ecosystem } from "../wallet/types.js";
 
 /**
  * Generate a new enclave wallet using an auth token
@@ -34,10 +35,7 @@ export async function generateWallet({
   }
 
   const { wallet } = (await response.json()) as {
-    wallet: {
-      address: string;
-      type: "enclave";
-    };
+    wallet: UserWallet;
   };
 
   return wallet;

package/src/wallets/in-app/{web/lib → core}/actions/get-enclave-user-status.ts

@@ -1,8 +1,8 @@
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
-import { getClientFetch } from "../../../../../utils/fetch.js";
-import type { UserStatus } from "../../../core/wallet/enclave-wallet.js";
-import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import type { UserStatus } from "../wallet/enclave-wallet.js";
+import type { Ecosystem } from "../wallet/types.js";
 
 /**
  * Gets the user's status from the backend.

package/src/wallets/in-app/{web/lib → core}/actions/sign-message.enclave.ts

@@ -1,26 +1,24 @@
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
-import { getClientFetch } from "../../../../../utils/fetch.js";
-import { stringify } from "../../../../../utils/json.js";
-import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
-import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import { stringify } from "../../../../utils/json.js";
+import type { ClientScopedStorage } from "../authentication/client-scoped-storage.js";
 
 export async function signMessage({
   client,
-  ecosystem,
   payload: { message, isRaw },
   storage,
 }: {
   client: ThirdwebClient;
-  ecosystem?: Ecosystem;
   payload: {
     message: string;
     isRaw: boolean;
   };
   storage: ClientScopedStorage;
 }) {
-  const clientFetch = getClientFetch(client, ecosystem);
   const authToken = await storage.getAuthCookie();
+  const ecosystem = storage.ecosystem;
+  const clientFetch = getClientFetch(client, ecosystem);
 
   if (!authToken) {
     throw new Error("No auth token found when signing message");

package/src/wallets/in-app/{web/lib → core}/actions/sign-transaction.enclave.ts

@@ -1,24 +1,22 @@
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
-import { getClientFetch } from "../../../../../utils/fetch.js";
-import { stringify } from "../../../../../utils/json.js";
-import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
-import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import type { Hex } from "../../../../utils/encoding/hex.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import { stringify } from "../../../../utils/json.js";
+import type { ClientScopedStorage } from "../authentication/client-scoped-storage.js";
 
 export async function signTransaction({
   client,
-  ecosystem,
   payload,
   storage,
 }: {
   client: ThirdwebClient;
-  ecosystem?: Ecosystem;
   payload: Record<string, Hex | number | undefined>;
   storage: ClientScopedStorage;
 }) {
-  const clientFetch = getClientFetch(client, ecosystem);
   const authToken = await storage.getAuthCookie();
+  const ecosystem = storage.ecosystem;
+  const clientFetch = getClientFetch(client, ecosystem);
 
   if (!authToken) {
     throw new Error("No auth token found when signing transaction");

package/src/wallets/in-app/{web/lib → core}/actions/sign-typed-data.enclave.ts

@@ -1,28 +1,26 @@
 import type { TypedData } from "abitype";
 import type { TypedDataDefinition } from "viem";
-import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
-import { getClientFetch } from "../../../../../utils/fetch.js";
-import { stringify } from "../../../../../utils/json.js";
-import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
-import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import { stringify } from "../../../../utils/json.js";
+import type { ClientScopedStorage } from "../authentication/client-scoped-storage.js";
 
 export async function signTypedData<
   const typedData extends TypedData | Record<string, unknown>,
   primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
 >({
   client,
-  ecosystem,
   payload,
   storage,
 }: {
   client: ThirdwebClient;
-  ecosystem?: Ecosystem;
   payload: TypedDataDefinition<typedData, primaryType>;
   storage: ClientScopedStorage;
 }) {
-  const clientFetch = getClientFetch(client, ecosystem);
   const authToken = await storage.getAuthCookie();
+  const ecosystem = storage.ecosystem;
+  const clientFetch = getClientFetch(client, ecosystem);
 
   if (!authToken) {
     throw new Error("No auth token found when signing typed data");

package/src/wallets/in-app/core/authentication/client-scoped-storage.ts

@@ -1,5 +1,4 @@
 import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
-import type { EcosystemWalletId } from "../../../wallet-types.js";
 import {
   AUTH_TOKEN_LOCAL_STORAGE_NAME,
   DEVICE_SHARE_LOCAL_STORAGE_NAME,
@@ -8,6 +7,7 @@ import {
   WALLET_CONNECT_SESSIONS_LOCAL_STORAGE_NAME,
   WALLET_USER_ID_LOCAL_STORAGE_NAME,
 } from "../constants/settings.js";
+import type { Ecosystem } from "../wallet/types.js";
 
 const data = new Map<string, string>();
 
@@ -17,20 +17,22 @@ const data = new Map<string, string>();
 export class ClientScopedStorage {
   protected key: string;
   protected storage: AsyncStorage | null;
+  public ecosystem?: Ecosystem;
   /**
    * @internal
    */
   constructor({
     storage,
     clientId,
-    ecosystemId,
+    ecosystem,
   }: {
     storage: AsyncStorage | null;
     clientId: string;
-    ecosystemId?: EcosystemWalletId;
+    ecosystem?: Ecosystem;
   }) {
     this.storage = storage;
-    this.key = getLocalStorageKey(clientId, ecosystemId);
+    this.key = getLocalStorageKey(clientId, ecosystem?.id);
+    this.ecosystem = ecosystem;
   }
 
   protected async getItem(key: string): Promise<string | null> {

package/src/wallets/in-app/core/authentication/guest.ts

@@ -19,7 +19,7 @@ export async function guestAuthenticate(args: {
   const storage = new ClientScopedStorage({
     storage: args.storage,
     clientId: args.client.clientId,
-    ecosystemId: args.ecosystem?.id,
+    ecosystem: args.ecosystem,
   });
 
   let sessionId = await storage.getGuestSessionId();

package/src/wallets/in-app/core/authentication/types.ts

@@ -100,6 +100,7 @@ export type AuthProvider =
   | "Coinbase"
   | "X"
   | "Line"
+  | "Twitch"
   | "Farcaster"
   | "Telegram";
 

package/src/wallets/in-app/core/wallet/enclave-wallet.ts

@@ -11,10 +11,10 @@ import type {
   Account,
   SendTransactionOption,
 } from "../../../interfaces/wallet.js";
-import { getUserStatus } from "../../web/lib/actions/get-enclave-user-status.js";
-import { signMessage as signEnclaveMessage } from "../../web/lib/actions/sign-message.enclave.js";
-import { signTransaction as signEnclaveTransaction } from "../../web/lib/actions/sign-transaction.enclave.js";
-import { signTypedData as signEnclaveTypedData } from "../../web/lib/actions/sign-typed-data.enclave.js";
+import { getUserStatus } from "../actions/get-enclave-user-status.js";
+import { signMessage as signEnclaveMessage } from "../actions/sign-message.enclave.js";
+import { signTransaction as signEnclaveTransaction } from "../actions/sign-transaction.enclave.js";
+import { signTypedData as signEnclaveTypedData } from "../actions/sign-typed-data.enclave.js";
 import type { ClientScopedStorage } from "../authentication/client-scoped-storage.js";
 import type {
   AuthDetails,
@@ -33,18 +33,16 @@ export type UserStatus = {
       | { address: string; [key: string]: string }
       | { id: string; [key: string]: string };
   }[];
-  wallets:
-    | [
-        {
-          address: string;
-          createdAt: string;
-          type: "sharded" | "enclave";
-        },
-      ]
-    | [];
+  wallets: UserWallet[];
   id: string;
 };
 
+export type UserWallet = {
+  address: string;
+  createdAt: string;
+  type: "sharded" | "enclave";
+};
+
 export class EnclaveWallet implements IWebWallet {
   private client: ThirdwebClient;
   private ecosystem?: Ecosystem;
@@ -130,7 +128,6 @@ export class EnclaveWallet implements IWebWallet {
    */
   async getAccount(): Promise<Account> {
     const client = this.client;
-    const ecosystem = this.ecosystem;
     const storage = this.localStorage;
 
     const _signTransaction = async (tx: SendTransactionOption) => {
@@ -171,7 +168,6 @@ export class EnclaveWallet implements IWebWallet {
 
       return signEnclaveTransaction({
         client,
-        ecosystem,
         storage,
         payload: transaction,
       });
@@ -218,7 +214,6 @@ export class EnclaveWallet implements IWebWallet {
 
         const { signature } = await signEnclaveMessage({
           client,
-          ecosystem,
           payload: messagePayload,
           storage,
         });
@@ -228,7 +223,6 @@ export class EnclaveWallet implements IWebWallet {
         const parsedTypedData = parseTypedData(_typedData);
         const { signature } = await signEnclaveTypedData({
           client,
-          ecosystem,
           payload: parsedTypedData,
           storage,
         });

package/src/wallets/in-app/native/auth/passkeys.ts

@@ -125,7 +125,7 @@ export async function hasStoredPasskey(
   const storage = new ClientScopedStorage({
     storage: nativeLocalStorage,
     clientId: client.clientId,
-    ecosystemId: ecosystemId,
+    ecosystem: ecosystemId ? { id: ecosystemId } : undefined,
   });
   const credId = await storage.getPasskeyCredentialId();
   return !!credId;

package/src/wallets/in-app/native/helpers/api/fetchers.ts

@@ -14,6 +14,8 @@ import { createErrorMessage } from "../errors.js";
 
 const EMBEDDED_WALLET_TOKEN_HEADER = "embedded-wallet-token";
 const PAPER_CLIENT_ID_HEADER = "x-thirdweb-client-id";
+const ECOSYSTEM_ID_HEADER = "x-ecosystem-id";
+const ECOSYSTEM_PARTNER_ID_HEADER = "x-ecosystem-partner-id";
 
 let sessionNonce: Hex | undefined = undefined;
 
@@ -63,6 +65,12 @@ export async function authFetchEmbeddedWalletUser(args: {
           authTokenClient || ""
         }`,
         [PAPER_CLIENT_ID_HEADER]: client.clientId,
+        ...(storage.ecosystem
+          ? {
+              [ECOSYSTEM_ID_HEADER]: storage.ecosystem.id,
+              [ECOSYSTEM_PARTNER_ID_HEADER]: storage.ecosystem?.partnerId,
+            }
+          : {}),
         ...getSessionHeaders(),
       }
     : {
@@ -70,6 +78,12 @@ export async function authFetchEmbeddedWalletUser(args: {
           authTokenClient || ""
         }`,
         [PAPER_CLIENT_ID_HEADER]: client.clientId,
+        ...(storage.ecosystem
+          ? {
+              [ECOSYSTEM_ID_HEADER]: storage.ecosystem.id,
+              [ECOSYSTEM_PARTNER_ID_HEADER]: storage.ecosystem?.partnerId,
+            }
+          : {}),
         ...getSessionHeaders(),
       };
 

package/src/wallets/in-app/native/helpers/auth/middleware.ts

@@ -102,10 +102,11 @@ async function getRecoveryCode(args: {
     }
     try {
       return await getCognitoRecoveryPasswordV2({ client, storage });
-    } catch {
+    } catch (err) {
+      console.error("Error recovering wallet", err);
       return await getCognitoRecoveryPasswordV1({ client, storage }).catch(
         () => {
-          throw new Error("Something went wrong getting cognito recovery code");
+          throw new Error("Something went wrong while recovering wallet");
         },
       );
     }

package/src/wallets/in-app/native/helpers/constants.ts

@@ -22,6 +22,8 @@ export const GENERATE_RECOVERY_PASSWORD_LAMBDA_FUNCTION_V1 =
   "arn:aws:lambda:us-west-2:324457261097:function:recovery-share-password-GenerateRecoverySharePassw-bbE5ZbVAToil";
 export const GENERATE_RECOVERY_PASSWORD_LAMBDA_FUNCTION_V2 =
   "arn:aws:lambda:us-west-2:324457261097:function:lambda-thirdweb-auth-enc-key-prod-ThirdwebAuthEncKeyFunction";
+export const ENCLAVE_KMS_KEY_ARN =
+  "arn:aws:kms:us-west-2:324457261097:key/8b2a8cd5-9b22-4ea0-a6bc-463824a78f20";
 
 // TODO allow overriding domain
 const DOMAIN_URL_2023 = getThirdwebBaseUrl("inAppWallet");