Wallet API - revoking session keys and getting all active signers (#138)

0xFirekeeper · web-flow · commit fa9f2fb84c53 · 2023-12-13T00:33:28.000+03:00
diff --git a/Assets/Thirdweb/Core/Plugin/thirdweb.jslib b/Assets/Thirdweb/Core/Plugin/thirdweb.jslib
@@ -252,6 +252,52 @@ var plugin = {
         dynCall_viii(cb, idPtr, null, buffer);
       });
   },
+  ThirdwebSmartWalletRevokeSessionKey: async function (taskId, signer, 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
+      .smartWalletRevokeSessionKey(UTF8ToString(signer))
+      .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);
+      });
+  },
+  ThirdwebSmartWalletGetAllActiveSigners: 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
+      .smartWalletGetAllActiveSigners()
+      .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);
+      });
+  },
   ThirdwebWaitForTransactionResult: async function (taskId, txHash, cb) {
     // convert taskId from pointer to str and allocate it to keep in memory
     var id = UTF8ToString(taskId);
diff --git a/Assets/Thirdweb/Core/Scripts/Bridge.cs b/Assets/Thirdweb/Core/Scripts/Bridge.cs
@@ -262,6 +262,23 @@ public static async Task<T> SmartWalletCreateSessionKey<T>(string options)
             return JsonConvert.DeserializeObject<Result<T>>(result).result;
         }
 
+        public static async Task<T> SmartWalletRevokeSessionKey<T>(string signer)
+        {
+            if (!Utils.IsWebGLBuild())
+            {
+                ThirdwebDebug.LogWarning("Interacting with the thirdweb SDK is not fully supported in the editor.");
+                return default;
+            }
+            string taskId = Guid.NewGuid().ToString();
+            var task = new TaskCompletionSource<string>();
+            taskMap[taskId] = task;
+#if UNITY_WEBGL
+            ThirdwebSmartWalletRevokeSessionKey(taskId, signer, jsCallback);
+#endif
+            string result = await task.Task;
+            return JsonConvert.DeserializeObject<Result<T>>(result).result;
+        }
+
         public static async Task<TransactionReceipt> WaitForTransactionResult(string txHash)
         {
             if (!Utils.IsWebGLBuild())
@@ -279,6 +296,23 @@ public static async Task<TransactionReceipt> WaitForTransactionResult(string txH
             return JsonConvert.DeserializeObject<Result<TransactionReceipt>>(result).result;
         }
 
+        public static async Task<T> SmartWalletGetAllActiveSigners<T>()
+        {
+            if (!Utils.IsWebGLBuild())
+            {
+                ThirdwebDebug.LogWarning("Interacting with the thirdweb SDK is not fully supported in the editor.");
+                return default;
+            }
+            string taskId = Guid.NewGuid().ToString();
+            var task = new TaskCompletionSource<string>();
+            taskMap[taskId] = task;
+#if UNITY_WEBGL
+            ThirdwebSmartWalletGetAllActiveSigners(taskId, jsCallback);
+#endif
+            string result = await task.Task;
+            return JsonConvert.DeserializeObject<Result<T>>(result).result;
+        }
+
         public static async Task<BigInteger> GetLatestBlockNumber()
         {
             if (!Utils.IsWebGLBuild())
@@ -371,6 +405,10 @@ public static async Task<string> GetEmail()
         [DllImport("__Internal")]
         private static extern string ThirdwebSmartWalletCreateSessionKey(string taskId, string options, Action<string, string, string> cb);
         [DllImport("__Internal")]
+        private static extern string ThirdwebSmartWalletRevokeSessionKey(string taskId, string signer, Action<string, string, string> cb);
+        [DllImport("__Internal")]
+        private static extern string ThirdwebSmartWalletGetAllActiveSigners(string taskId, Action<string, string, string> cb);
+        [DllImport("__Internal")]
         private static extern string ThirdwebWaitForTransactionResult(string taskId, string txHash, Action<string, string, string> cb);
         [DllImport("__Internal")]
         private static extern string ThirdwebGetLatestBlockNumber(string taskId, Action<string, string, string> cb);
diff --git a/Assets/Thirdweb/Core/Scripts/Types.cs b/Assets/Thirdweb/Core/Scripts/Types.cs
@@ -530,4 +530,35 @@ public override readonly string ToString()
                 + $"\n>eventSignature: {eventSignature}";
         }
     }
+
+    [System.Serializable]
+    public struct SignerWithPermissions
+    {
+        public bool? isAdmin;
+        public string signer;
+        public SignerPermissions permissions;
+
+        public override readonly string ToString()
+        {
+            return $"SignerWithPermissions:" + $"\n>isAdmin: {isAdmin}" + $"\n>signer: {signer}" + $"\n>permissions: {permissions}";
+        }
+    }
+
+    [System.Serializable]
+    public struct SignerPermissions
+    {
+        public string startDate;
+        public string expirationDate;
+        public string nativeTokenLimitPerTransaction;
+        public List<string> approvedCallTargets;
+
+        public override readonly string ToString()
+        {
+            return $"SignerPermissions:"
+                + $"\n>startDate: {startDate}"
+                + $"\n>expirationDate: {expirationDate}"
+                + $"\n>nativeTokenLimitPerTransaction: {nativeTokenLimitPerTransaction}"
+                + $"\n>approvedCallTargets: {approvedCallTargets}";
+        }
+    }
 }
diff --git a/Assets/Thirdweb/Core/Scripts/Utils.cs b/Assets/Thirdweb/Core/Scripts/Utils.cs
@@ -457,5 +457,13 @@ public static bool Supports1559(string chainId)
                     return true;
             }
         }
+
+        public static string JSDateToUnixTimestamp(string dateString)
+        {
+            DateTime dateTime = DateTime.Parse(dateString, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
+            DateTime unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+            long unixTimestamp = (long)(dateTime - unixEpoch).TotalSeconds;
+            return unixTimestamp.ToString();
+        }
     }
 }
diff --git a/Assets/Thirdweb/Core/Scripts/Wallet.cs b/Assets/Thirdweb/Core/Scripts/Wallet.cs
@@ -573,7 +573,6 @@ public async Task<TransactionResult> RemoveAdmin(string admin)
         /// <param name="reqValidityStartTimestamp">UNIX timestamp of when the signer's permissions request validity starts.</param>
         /// <param name="reqValidityEndTimestamp">UNIX timestamp of when the signer's permissions request validity ends.</param>
         /// <returns>The result of the transaction as a TransactionResult object.</returns>
-        /// <exception cref="UnityException"></exception>
         public async Task<TransactionResult> CreateSessionKey(
             string signerAddress,
             List<string> approvedTargets,
@@ -603,8 +602,6 @@ 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()
                 {
@@ -623,6 +620,99 @@ string reqValidityEndTimestamp
             }
         }
 
+        /// <summary>
+        /// Smart Wallet only: Revoke a signer for the connected smart account.
+        /// </summary>
+        /// <param name="signerAddress">Address of the signer to revoke.</param>
+        /// <returns>The result of the transaction as a TransactionResult object.</returns>
+        public async Task<TransactionResult> RevokeSessionKey(string signerAddress)
+        {
+            if (Utils.IsWebGLBuild())
+            {
+                return await Bridge.SmartWalletRevokeSessionKey<TransactionResult>(signerAddress);
+            }
+            else
+            {
+                var smartWallet = ThirdwebManager.Instance.SDK.session.ActiveWallet as Wallets.ThirdwebSmartWallet;
+                var request = new Contracts.Account.ContractDefinition.SignerPermissionRequest()
+                {
+                    Signer = signerAddress,
+                    IsAdmin = 0,
+                    ApprovedTargets = new List<string>(),
+                    NativeTokenLimitPerTransaction = 0,
+                    PermissionStartTimestamp = 0,
+                    PermissionEndTimestamp = 0,
+                    ReqValidityStartTimestamp = 0,
+                    ReqValidityEndTimestamp = Utils.GetUnixTimeStampIn10Years(),
+                    Uid = Guid.NewGuid().ToByteArray()
+                };
+                string signature = await EIP712.GenerateSignature_SmartAccount("Account", "1", await GetChainId(), await GetAddress(), request);
+                return await smartWallet.SmartWallet.SetPermissionsForSigner(request, signature.HexToByteArray());
+            }
+        }
+
+        /// <summary>
+        /// Smart Wallet only: Get all active signers for the connected smart account.
+        /// </summary>
+        /// <returns>A list of SignerWithPermissions objects.</returns>
+        public async Task<List<SignerWithPermissions>> GetAllActiveSigners()
+        {
+            if (Utils.IsWebGLBuild())
+            {
+                var activeSigners = await Bridge.SmartWalletGetAllActiveSigners<List<SignerWithPermissions>>();
+                for (int i = 0; i < activeSigners.Count; i++)
+                {
+                    var signer = activeSigners[i];
+                    signer.permissions.startDate = signer.permissions.startDate == "0" ? "0" : Utils.JSDateToUnixTimestamp(signer.permissions.startDate);
+                    signer.permissions.expirationDate = signer.permissions.expirationDate == "0" ? "0" : Utils.JSDateToUnixTimestamp(signer.permissions.expirationDate);
+                    activeSigners[i] = signer;
+                }
+                return activeSigners;
+            }
+            else
+            {
+                string address = await GetAddress();
+                var raw = await TransactionManager.ThirdwebRead<Contracts.Account.ContractDefinition.GetAllActiveSignersFunction, Contracts.Account.ContractDefinition.GetAllActiveSignersOutputDTO>(
+                    address,
+                    new Contracts.Account.ContractDefinition.GetAllActiveSignersFunction()
+                );
+                var signers = new List<SignerWithPermissions>();
+                foreach (var rawSigner in raw.Signers)
+                {
+                    bool? isAdmin;
+                    try
+                    {
+                        isAdmin = (
+                            await TransactionManager.ThirdwebRead<Contracts.Account.ContractDefinition.IsAdminFunction, Contracts.Account.ContractDefinition.IsAdminOutputDTO>(
+                                address,
+                                new Contracts.Account.ContractDefinition.IsAdminFunction() { Account = rawSigner.Signer }
+                            )
+                        ).ReturnValue1;
+                    }
+                    catch
+                    {
+                        isAdmin = null;
+                    }
+
+                    signers.Add(
+                        new SignerWithPermissions()
+                        {
+                            isAdmin = isAdmin,
+                            signer = rawSigner.Signer,
+                            permissions = new SignerPermissions()
+                            {
+                                approvedCallTargets = rawSigner.ApprovedTargets,
+                                nativeTokenLimitPerTransaction = rawSigner.NativeTokenLimitPerTransaction.ToString(),
+                                startDate = rawSigner.StartTimestamp.ToString(),
+                                expirationDate = rawSigner.EndTimestamp.ToString(),
+                            }
+                        }
+                    );
+                }
+                return signers;
+            }
+        }
+
         /// <summary>
         /// Sends a raw transaction from the connected wallet.
         /// </summary>
diff --git a/Assets/WebGLTemplates/Thirdweb/lib/thirdweb-unity-bridge.js b/Assets/WebGLTemplates/Thirdweb/lib/thirdweb-unity-bridge.js

Original file line number	Diff line number	Diff line change
`@@ -457,5 +457,13 @@ public static bool Supports1559(string chainId)`
`457`	`457`	`return true;`
`458`	`458`	`}`
`459`	`459`	`}`
	`460`	`+`
	`461`	`+ public static string JSDateToUnixTimestamp(string dateString)`
	`462`	`+ {`
	`463`	`+ DateTime dateTime = DateTime.Parse(dateString, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);`
	`464`	`+ DateTime unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);`
	`465`	`+ long unixTimestamp = (long)(dateTime - unixEpoch).TotalSeconds;`
	`466`	`+ return unixTimestamp.ToString();`
	`467`	`+ }`
`460`	`468`	`}`
`461`	`469`	`}`