thirdweb 5.66.0-nightly-880c3453ee8fc0fabbde0afb752a17894cd579a0-20241106000325 → 5.67.0-nightly-734707e28b829262a1b40f7db8c005d2adeaeaf9-20241107000509

package/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,

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

@@ -101,10 +101,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",
@@ -113,11 +110,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");
@@ -133,7 +134,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: {
@@ -163,7 +164,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(
@@ -176,6 +177,7 @@ export class InAppWebConnector implements InAppConnector {
       client: this.client,
       ecosystem: this.ecosystem,
     });
+
     if (!user) {
       throw new Error("Cannot initialize wallet, no user logged in");
     }
@@ -186,16 +188,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,
@@ -233,7 +234,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");