feat: auto-migrate in-app wallets to enclave system

Author: joaquim-verges

.changeset/empty-needles-reply.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Automatically migrate in-app wallets to the new enclave system

packages/react-native-adapter/package.json

@@ -23,10 +23,7 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist/*",
-    "src/*"
-  ],
+  "files": ["dist/*", "src/*"],
   "dependencies": {
     "@aws-sdk/client-kms": "3.679.0",
     "@aws-sdk/client-lambda": "3.680.0",

packages/thirdweb/package.json

@@ -326,7 +326,7 @@
     "@codspeed/vitest-plugin": "3.1.1",
     "@coinbase/wallet-mobile-sdk": "1.1.2",
     "@mobile-wallet-protocol/client": "0.1.1",
-    "@react-native-async-storage/async-storage": "2.0.0",
+    "@react-native-async-storage/async-storage": "1.24.0",
     "@size-limit/preset-big-lib": "11.1.6",
     "@storybook/addon-essentials": "8.3.6",
     "@storybook/addon-interactions": "8.3.6",

packages/thirdweb/src/react/web/wallets/shared/PassKeyLogin.tsx

@@ -160,7 +160,8 @@ function LoginScreen(props: {
         await setLastAuthProvider("passkey", webLocalStorage);
       }
       done();
-    } catch {
+    } catch (e) {
+      console.error("Failed to login with passkey", e);
       setStatus("error");
     }
   }

packages/thirdweb/src/wallets/in-app/core/actions/generate-wallet.enclave.ts

@@ -9,13 +9,13 @@ import type { Ecosystem } from "../wallet/types.js";
  * @internal
  */
 export async function generateWallet({
-  authToken,
   client,
   ecosystem,
+  authToken,
 }: {
   client: ThirdwebClient;
-  ecosystem: Ecosystem;
   authToken: string;
+  ecosystem?: Ecosystem;
 }) {
   const clientFetch = getClientFetch(client, ecosystem);
   const response = await clientFetch(

packages/thirdweb/src/wallets/in-app/native/native-connector.ts

@@ -80,27 +80,26 @@ export class InAppNativeConnector implements InAppConnector {
     }
     let wallet = user.wallets[0];
 
-    // TODO (enclaves): Migration to enclave wallet for in-app wallets as well
-    if (
-      authResult &&
-      this.storage.ecosystem &&
-      wallet &&
-      wallet.type === "sharded"
-    ) {
-      const { migrateToEnclaveWallet } = await import(
-        "./helpers/wallet/migration.js"
-      );
-      wallet = await migrateToEnclaveWallet({
-        client: this.client,
-        storage: this.storage,
-        storedToken: authResult.storedToken,
-        encryptionKey,
-      });
+    if (authResult && wallet && wallet.type === "sharded") {
+      try {
+        const { migrateToEnclaveWallet } = await import(
+          "./helpers/wallet/migration.js"
+        );
+        wallet = await migrateToEnclaveWallet({
+          client: this.client,
+          storage: this.storage,
+          storedToken: authResult.storedToken,
+          encryptionKey,
+        });
+      } catch {
+        console.warn(
+          "Failed to migrate from sharded to enclave wallet, continuing with sharded wallet",
+        );
+      }
     }
 
-    if (authResult && this.ecosystem && !wallet) {
-      // new ecosystem user, generate enclave wallet
-      // TODO (enclaves): same flow for in-app wallets
+    if (authResult && !wallet) {
+      // new user, generate enclave wallet
       const { generateWallet } = await import(
         "../core/actions/generate-wallet.enclave.js"
       );

packages/thirdweb/src/wallets/in-app/web/lib/auth/iframe-auth.ts

@@ -128,7 +128,7 @@ export class Auth {
       });
     }
 
-    if (user.wallets.length === 0 && this.ecosystem) {
+    if (user.wallets.length === 0) {
       // If this is a new ecosystem wallet without an enclave yet, we'll generate an enclave
       const result = await generateWallet({
         authToken: authToken.storedToken.cookieString,

packages/thirdweb/src/wallets/in-app/web/lib/web-connector.ts

@@ -99,10 +99,7 @@ export class InAppWebConnector implements InAppConnector {
       onAuthSuccess: async (authResult) => {
         onAuthSuccess?.(authResult);
 
-        if (
-          this.ecosystem &&
-          authResult.storedToken.authDetails.walletType === "sharded"
-        ) {
+        if (authResult.storedToken.authDetails.walletType === "sharded") {
           // If this is an existing sharded ecosystem wallet, we'll need to migrate
           const result = await this.querier.call<boolean>({
             procedureName: "migrateFromShardToEnclave",
@@ -111,11 +108,15 @@ export class InAppWebConnector implements InAppConnector {
             },
           });
           if (!result) {
-            throw new Error("Failed to migrate from sharded to enclave wallet");
+            console.warn(
+              "Failed to migrate from sharded to enclave wallet, continuing with sharded wallet",
+            );
           }
         }
 
-        await this.initializeWallet(authResult.storedToken.cookieString);
+        this.wallet = await this.initializeWallet(
+          authResult.storedToken.cookieString,
+        );
 
         if (!this.wallet) {
           throw new Error("Failed to initialize wallet");
@@ -131,7 +132,7 @@ export class InAppWebConnector implements InAppConnector {
           deviceShareStored,
         });
 
-        if (authResult.storedToken.authDetails.walletType !== "enclave") {
+        if (this.wallet instanceof IFrameWallet) {
           await this.querier.call({
             procedureName: "initIframe",
             params: {
@@ -161,7 +162,7 @@ export class InAppWebConnector implements InAppConnector {
     });
   }
 
-  async initializeWallet(authToken?: string) {
+  async initializeWallet(authToken?: string): Promise<IWebWallet> {
     const storedAuthToken = await this.storage.getAuthCookie();
     if (!authToken && storedAuthToken === null) {
       throw new Error(
@@ -174,6 +175,7 @@ export class InAppWebConnector implements InAppConnector {
       client: this.client,
       ecosystem: this.ecosystem,
     });
+
     if (!user) {
       throw new Error("Cannot initialize wallet, no user logged in");
     }
@@ -184,16 +186,15 @@ export class InAppWebConnector implements InAppConnector {
     }
 
     if (user.wallets[0]?.type === "enclave") {
-      this.wallet = new EnclaveWallet({
+      return new EnclaveWallet({
         client: this.client,
         ecosystem: this.ecosystem,
         address: user.wallets[0].address,
         storage: this.storage,
       });
-      return;
     }
 
-    this.wallet = new IFrameWallet({
+    return new IFrameWallet({
       client: this.client,
       ecosystem: this.ecosystem,
       querier: this.querier,
@@ -231,7 +232,7 @@ export class InAppWebConnector implements InAppConnector {
       if (!localAuthToken) {
         return { status: "Logged Out" };
       }
-      await this.initializeWallet(localAuthToken);
+      this.wallet = await this.initializeWallet(localAuthToken);
     }
     if (!this.wallet) {
       throw new Error("Wallet not initialized");