Cross platform Wallet.IsDeployed for SW

+ better errors for native

Author: 0xFirekeeper

Assets/Thirdweb/Core/Plugin/thirdweb.jslib

@@ -436,6 +436,29 @@ var plugin = {
         dynCall_viii(cb, idPtr, null, buffer);
       });
   },
+  ThirdwebSmartWalletIsDeployed: async function (taskId, cb) {
+    // convert taskId from pointer to str and allocate it to keep in memory
+    var id = UTF8ToString(taskId);
+    var idSize = lengthBytesUTF8(id) + 1;
+    var idPtr = _malloc(idSize);
+    stringToUTF8(id, idPtr, idSize);
+    // execute bridge call
+    window.bridge
+      .smartWalletIsDeployed()
+      .then((returnStr) => {
+        var bufferSize = lengthBytesUTF8(returnStr) + 1;
+        var buffer = _malloc(bufferSize);
+        stringToUTF8(returnStr, buffer, bufferSize);
+        dynCall_viii(cb, idPtr, buffer, null);
+      })
+      .catch((err) => {
+        var msg = err.message;
+        var bufferSize = lengthBytesUTF8(msg) + 1;
+        var buffer = _malloc(bufferSize);
+        stringToUTF8(msg, buffer, bufferSize);
+        dynCall_viii(cb, idPtr, null, buffer);
+      });
+  },
 };
 
 mergeInto(LibraryManager.library, plugin);

Assets/Thirdweb/Core/Scripts/Bridge.cs

@@ -398,6 +398,23 @@ public static async Task<string> GetSigner()
             return JsonConvert.DeserializeObject<Result<string>>(result).result;
         }
 
+        public static async Task<bool> SmartWalletIsDeployed()
+        {
+            if (!Utils.IsWebGLBuild())
+            {
+                ThirdwebDebug.LogWarning("Interacting with the thirdweb SDK is not fully supported in the editor.");
+                return false;
+            }
+            string taskId = Guid.NewGuid().ToString();
+            var task = new TaskCompletionSource<string>();
+            taskMap[taskId] = task;
+#if UNITY_WEBGL
+            ThirdwebSmartWalletIsDeployed(taskId, jsCallback);
+#endif
+            string result = await task.Task;
+            return JsonConvert.DeserializeObject<Result<bool>>(result).result;
+        }
+
 #if UNITY_WEBGL
         [DllImport("__Internal")]
         private static extern string ThirdwebInvoke(string taskId, string route, string payload, Action<string, string, string> cb);
@@ -437,6 +454,8 @@ public static async Task<string> GetSigner()
         private static extern string ThirdwebGetEmail(string taskId, Action<string, string, string> cb);
         [DllImport("__Internal")]
         private static extern string ThirdwebGetSignerAddress(string taskId, Action<string, string, string> cb);
+        [DllImport("__Internal")]
+        private static extern string ThirdwebSmartWalletIsDeployed(string taskId, Action<string, string, string> cb);
 #endif
     }
 }

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -643,6 +643,7 @@ public async Task<TransactionResult> AddAdmin(string admin)
             {
                 if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
                     throw new UnityException("This functionality is only available for SmartWallets.");
+
                 var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
                 var request = new Contracts.Account.ContractDefinition.SignerPermissionRequest()
                 {
@@ -677,6 +678,7 @@ public async Task<TransactionResult> RemoveAdmin(string admin)
             {
                 if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
                     throw new UnityException("This functionality is only available for SmartWallets.");
+
                 var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
                 var request = new Contracts.Account.ContractDefinition.SignerPermissionRequest()
                 {
@@ -735,6 +737,9 @@ string reqValidityEndTimestamp
             }
             else
             {
+                if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
+                    throw new UnityException("This functionality is only available for SmartWallets.");
+
                 var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
                 var request = new Contracts.Account.ContractDefinition.SignerPermissionRequest()
                 {
@@ -766,6 +771,9 @@ public async Task<TransactionResult> RevokeSessionKey(string signerAddress)
             }
             else
             {
+                if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
+                    throw new UnityException("This functionality is only available for SmartWallets.");
+
                 var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
                 var request = new Contracts.Account.ContractDefinition.SignerPermissionRequest()
                 {
@@ -804,6 +812,9 @@ public async Task<List<SignerWithPermissions>> GetAllActiveSigners()
             }
             else
             {
+                if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
+                    throw new UnityException("This functionality is only available for SmartWallets.");
+
                 string address = await GetAddress();
                 var raw = await TransactionManager.ThirdwebRead<Contracts.Account.ContractDefinition.GetAllActiveSignersFunction, Contracts.Account.ContractDefinition.GetAllActiveSignersOutputDTO>(
                     address,
@@ -846,6 +857,26 @@ public async Task<List<SignerWithPermissions>> GetAllActiveSigners()
             }
         }
 
+        /// <summary>
+        /// Smart Wallet only: check if the account is deployed.
+        /// </summary>
+        /// <returns>True if the account is deployed, false otherwise.</returns>
+        public async Task<bool> IsDeployed()
+        {
+            if (Utils.IsWebGLBuild())
+            {
+                return await Bridge.SmartWalletIsDeployed();
+            }
+            else
+            {
+                if (ThirdwebManager.Instance.SDK.session.ActiveWallet.GetProvider() != WalletProvider.SmartWallet)
+                    throw new UnityException("This functionality is only available for SmartWallets.");
+
+                var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
+                return smartWallet.SmartWallet.IsDeployed;
+            }
+        }
+
         /// <summary>
         /// Sends a raw transaction from the connected wallet.
         /// </summary>