Fix main thread encryption/decryption freeze (#180)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/Utils.cs

@@ -316,7 +316,7 @@ public static void DeleteLocalAccount()
                 File.Delete(GetAccountPath());
         }
 
-        public static Account UnlockOrGenerateLocalAccount(BigInteger chainId, string password = null, string privateKey = null)
+        public static async Task<Account> UnlockOrGenerateLocalAccount(BigInteger chainId, string password = null, string privateKey = null)
         {
             password = string.IsNullOrEmpty(password) ? GetDeviceIdentifier() : password;
 
@@ -334,7 +334,7 @@ public static Account UnlockOrGenerateLocalAccount(BigInteger chainId, string pa
                     try
                     {
                         var encryptedJson = File.ReadAllText(path);
-                        var key = keyStoreService.DecryptKeyStoreFromJson(password, encryptedJson);
+                        var key = await Task.Run(() => keyStoreService.DecryptKeyStoreFromJson(password, encryptedJson));
                         return new Account(key, chainId);
                     }
                     catch (System.Exception)
@@ -350,13 +350,13 @@ public static Account UnlockOrGenerateLocalAccount(BigInteger chainId, string pa
                         rng.GetBytes(seed);
                     }
                     var ecKey = Nethereum.Signer.EthECKey.GenerateKey(seed);
-                    File.WriteAllText(path, EncryptAndGenerateKeyStore(ecKey, password));
+                    File.WriteAllText(path, await EncryptAndGenerateKeyStore(ecKey, password));
                     return new Account(ecKey, chainId);
                 }
             }
         }
 
-        public static string EncryptAndGenerateKeyStore(EthECKey ecKey, string password)
+        public static async Task<string> EncryptAndGenerateKeyStore(EthECKey ecKey, string password)
         {
             var keyStoreService = new Nethereum.KeyStore.KeyStoreScryptService();
             var scryptParams = new Nethereum.KeyStore.Model.ScryptParams
@@ -366,7 +366,7 @@ public static string EncryptAndGenerateKeyStore(EthECKey ecKey, string password)
                 R = 1,
                 P = 8
             };
-            var keyStore = keyStoreService.EncryptAndGenerateKeyStore(password, ecKey.GetPrivateKeyAsBytes(), ecKey.GetPublicAddress(), scryptParams);
+            var keyStore = await Task.Run(() => keyStoreService.EncryptAndGenerateKeyStore(password, ecKey.GetPrivateKeyAsBytes(), ecKey.GetPublicAddress(), scryptParams));
             return keyStoreService.SerializeKeyStoreToJson(keyStore);
         }
 

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -91,7 +91,7 @@ public async Task<string> Export(string password)
             else
             {
                 var localAccount = ThirdwebManager.Instance.SDK.Session.ActiveWallet.GetLocalAccount() ?? throw new Exception("No local account found");
-                return Utils.EncryptAndGenerateKeyStore(new EthECKey(localAccount.PrivateKey), password);
+                return await Utils.EncryptAndGenerateKeyStore(new EthECKey(localAccount.PrivateKey), password);
             }
         }
 

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebLocalWallet.cs

@@ -20,11 +20,11 @@ public ThirdwebLocalWallet()
             _signerProvider = WalletProvider.LocalWallet;
         }
 
-        public Task<string> Connect(WalletConnection walletConnection, string rpc)
+        public async Task<string> Connect(WalletConnection walletConnection, string rpc)
         {
-            _account = Utils.UnlockOrGenerateLocalAccount(walletConnection.chainId, walletConnection.password, null);
+            _account = await Utils.UnlockOrGenerateLocalAccount(walletConnection.chainId, walletConnection.password, null);
             _web3 = new Web3(_account, rpc);
-            return Task.FromResult(_account.Address);
+            return _account.Address;
         }
 
         public Task Disconnect(bool endSession = true)