[WebGL] Support Smart Wallet Account Overrides (#129)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Plugin/thirdweb.jslib

@@ -59,6 +59,7 @@ var plugin = {
     email,
     personalWallet,
     authOptions,
+    smartWalletAccountOverride,
     cb
   ) {
     // convert taskId from pointer to str and allocate it to keep in memory
@@ -74,7 +75,8 @@ var plugin = {
         UTF8ToString(password),
         UTF8ToString(email),
         UTF8ToString(personalWallet),
-        UTF8ToString(authOptions)
+        UTF8ToString(authOptions),
+        UTF8ToString(smartWalletAccountOverride)
       )
       .then((address) => {
         if (address) {

Assets/Thirdweb/Core/Scripts/Bridge.cs

@@ -97,8 +97,9 @@ public static async Task<string> Connect(WalletConnection walletConnection)
                 walletConnection.chainId.ToString(), 
                 string.IsNullOrEmpty(walletConnection.password) ? Utils.GetDeviceIdentifier() : walletConnection.password, 
                 walletConnection.email, 
-                walletConnection.personalWallet.ToString()[..1].ToLower() + walletConnection.personalWallet.ToString()[1..], 
+                walletConnection.personalWallet.ToString()[..1].ToLower() + walletConnection.personalWallet.ToString()[1..],
                 JsonConvert.SerializeObject(walletConnection.authOptions),
+                walletConnection.smartWalletAccountOverride,
                 jsCallback
             );
 #endif
@@ -267,7 +268,7 @@ public static async Task<T> SmartWalletCreateSessionKey<T>(string options)
         [DllImport("__Internal")]
         private static extern string ThirdwebInitialize(string chainOrRPC, string options);
         [DllImport("__Internal")]
-        private static extern string ThirdwebConnect(string taskId, string wallet, string chainId, string password, string email, string personalWallet, string authOptions, Action<string, string, string> cb);
+        private static extern string ThirdwebConnect(string taskId, string wallet, string chainId, string password, string email, string personalWallet, string authOptions, string smartWalletAccountOverride, Action<string, string, string> cb);
         [DllImport("__Internal")]
         private static extern string ThirdwebDisconnect(string taskId, Action<string, string, string> cb);
         [DllImport("__Internal")]

Assets/WebGLTemplates/Thirdweb/lib/thirdweb-unity-bridge.js

@@ -347076,72 +347076,72 @@ Code: ${s}`;
             this.walletMap.set(s.id, o));
         }
       }
-      async connect(e = "injected", t, n, a, i = "localWallet", s) {
+      async connect(e = "injected", t, n, a, i = "localWallet", s, o) {
         if (!this.activeSDK) throw new Error("SDK not initialized");
-        let o = this.walletMap.get(e),
-          c = Number(t);
-        if (o) {
+        let c = this.walletMap.get(e),
+          u = Number(t);
+        if (c) {
           if (
-            (o.walletId === sb.walletIds.localWallet &&
-              (await this.initializeLocalWallet(n), o.connect({ chainId: c })),
-            o.walletId === sb.walletIds.embeddedWallet)
+            (c.walletId === sb.walletIds.localWallet &&
+              (await this.initializeLocalWallet(n), c.connect({ chainId: u })),
+            c.walletId === sb.walletIds.embeddedWallet)
           ) {
-            let u = o,
-              l = JSON.parse(s || "{}");
-            if (l.authProvider === 0) {
+            let l = c,
+              f = JSON.parse(s || "{}");
+            if (f.authProvider === 0) {
               if (!a) throw new Error("Email is required for EmbeddedWallet");
-              let f = await u.authenticate({
+              let h = await l.authenticate({
                 strategy: "iframe_email_verification",
                 email: a,
               });
-              await u.connect({ chainId: c, authResult: f });
-            } else if (l.authProvider < 4) {
-              let f;
-              switch (l.authProvider) {
+              await l.connect({ chainId: u, authResult: h });
+            } else if (f.authProvider < 4) {
+              let h;
+              switch (f.authProvider) {
                 case 1:
-                  f = "google";
+                  h = "google";
                   break;
                 case 2:
-                  f = "apple";
+                  h = "apple";
                   break;
                 case 3:
-                  f = "facebook";
+                  h = "facebook";
                   break;
                 default:
-                  throw new Error("Invalid auth provider: " + l.authProvider);
+                  throw new Error("Invalid auth provider: " + f.authProvider);
               }
-              let h = this.openPopupWindow();
-              if (!h) throw new Error("Failed to open login window");
-              let y = await u.authenticate({
-                strategy: f,
-                openedWindow: h,
-                closeOpenedWindow: (w) => {
-                  w.close();
+              let y = this.openPopupWindow();
+              if (!y) throw new Error("Failed to open login window");
+              let w = await l.authenticate({
+                strategy: h,
+                openedWindow: y,
+                closeOpenedWindow: (S) => {
+                  S.close();
                 },
               });
-              await u.connect({ chainId: c, authResult: y });
-            } else if (l.authProvider === 4) {
-              let f = await u.authenticate({
+              await l.connect({ chainId: u, authResult: w });
+            } else if (f.authProvider === 4) {
+              let h = await l.authenticate({
                 strategy: "jwt",
-                jwt: l.authToken,
+                jwt: f.authToken,
               });
-              await u.connect({ chainId: c, authResult: f });
-            } else throw new Error("Invalid auth provider: " + l.authProvider);
-          } else if (o.walletId === sb.walletIds.smartWallet) {
-            let u = o,
-              l = this.walletMap.get(i);
+              await l.connect({ chainId: u, authResult: h });
+            } else throw new Error("Invalid auth provider: " + f.authProvider);
+          } else if (c.walletId === sb.walletIds.smartWallet) {
+            let l = c,
+              f = this.walletMap.get(i);
             if (
-              (await this.connect(l?.walletId, t, n, a, i), this.activeWallet)
+              (await this.connect(f?.walletId, t, n, a, i), this.activeWallet)
             )
-              await this.initializeSmartWallet(u, this.activeWallet);
+              await this.initializeSmartWallet(l, this.activeWallet, o);
             else
               throw new Error(
                 "Unable to connect EOA wallet to initialize smart wallet!"
               );
-          } else await o.connect({ chainId: c });
+          } else await c.connect({ chainId: u });
           return (
-            (this.activeWallet = o),
-            this.updateSDKSigner(await o.getSigner()),
+            (this.activeWallet = c),
+            this.updateSDKSigner(await c.getSigner()),
             await this.activeSDK.wallet.getAddress()
           );
         } else throw new Error("Invalid Wallet");
@@ -347310,10 +347310,15 @@ Code: ${s}`;
           .get(sb.walletIds.localWallet)
           .export({ strategy: "encryptedJson", password: e });
       }
-      async initializeSmartWallet(e, t) {
-        let n = await t.getAddress();
-        console.debug("Personal wallet address:", n),
-          await e.connect({ personalWallet: t }),
+      async initializeSmartWallet(e, t, n) {
+        n &&
+          console.debug(
+            "Initializing smart wallet with account address override:",
+            n
+          );
+        let a = await t.getAddress();
+        console.debug("Personal wallet address:", a),
+          await e.connect({ personalWallet: t, accountAddress: n }),
           e.listenerCount("disconnect") === 1 &&
             e.on("disconnect", () => {
               t.disconnect();