Smart Wallet Native Transaction Queuing (#115)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/SmartWallet.cs

@@ -14,6 +14,8 @@
 using Nethereum.Contracts;
 using Nethereum.Hex.HexConvertors.Extensions;
 using Thirdweb.Redcode.Awaiting;
+using System.Threading;
+using System.Collections.Concurrent;
 
 namespace Thirdweb.AccountAbstraction
 {
@@ -34,24 +36,19 @@ public class UserOperationHexified
 
     public class SmartWallet
     {
+        private bool _deployed;
+        private bool _deploying;
+        private bool _initialized;
+
         public List<string> Accounts { get; internal set; }
         public string PersonalAddress { get; internal set; }
         public Web3 PersonalWeb3 { get; internal set; }
         public ThirdwebSDK.SmartWalletConfig Config { get; internal set; }
+        public bool IsDeployed => _deployed;
+        public bool IsDeploying => _deploying;
 
-        private bool _deployed;
-        public bool IsDeployed
-        {
-            get { return _deployed; }
-        }
-
-        private bool _deploying;
-        public bool IsDeploying
-        {
-            get { return _deploying; }
-        }
-
-        private bool _initialized;
+        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+        private readonly ConcurrentQueue<TaskCompletionSource<RpcResponseMessage>> _responseQueue = new ConcurrentQueue<TaskCompletionSource<RpcResponseMessage>>();
 
         public SmartWallet(Web3 personalWeb3, ThirdwebSDK.SmartWalletConfig config)
         {
@@ -141,14 +138,36 @@ internal async Task<RpcResponseMessage> Request(RpcRequestMessage requestMessage
         {
             ThirdwebDebug.Log("Requesting: " + requestMessage.Method + "...");
 
-            if (requestMessage.Method == "eth_chainId")
+            if (requestMessage.Method == "eth_sendTransaction")
             {
-                var chainId = await PersonalWeb3.Eth.ChainId.SendRequestAsync();
-                return new RpcResponseMessage(requestMessage.Id, chainId.HexValue);
+                var tcs = new TaskCompletionSource<RpcResponseMessage>();
+                _responseQueue.Enqueue(tcs);
+
+                await _semaphore.WaitAsync();
+
+                if (_responseQueue.TryDequeue(out var dequeuedTcs) && dequeuedTcs == tcs)
+                {
+                    try
+                    {
+                        var response = await CreateUserOpAndSend(requestMessage);
+                        tcs.SetResult(response);
+                    }
+                    catch (Exception ex)
+                    {
+                        tcs.SetException(ex);
+                    }
+                    finally
+                    {
+                        _semaphore.Release();
+                    }
+                }
+
+                return await tcs.Task;
             }
-            else if (requestMessage.Method == "eth_sendTransaction")
+            else if (requestMessage.Method == "eth_chainId")
             {
-                return await CreateUserOpAndSend(requestMessage);
+                var chainId = await PersonalWeb3.Eth.ChainId.SendRequestAsync();
+                return new RpcResponseMessage(requestMessage.Id, chainId.HexValue);
             }
             else
             {
@@ -227,22 +246,19 @@ private async Task<RpcResponseMessage> CreateUserOpAndSend(RpcRequestMessage req
             }
             ThirdwebDebug.Log("Tx Hash: " + txHash);
 
-            // // Check if successful
-
-            // var receipt = await new Web3(ThirdwebManager.Instance.SDK.session.RPC).Eth.Transactions.GetTransactionReceipt.SendRequestAsync(txHash);
-            // var decodedEvents = receipt.DecodeAllEvents<EntryPointContract.UserOperationEventEventDTO>();
-            // if (decodedEvents[0].Event.Success == false)
-            // {
-            //     ThirdwebDebug.Log("Transaction not successful, checking reason...");
-            //     var reason = await new Web3(ThirdwebManager.Instance.SDK.session.RPC).Eth.GetContractTransactionErrorReason.SendRequestAsync(txHash);
-            //     throw new Exception($"Transaction {txHash} reverted with reason: {reason}");
-            // }
-            // else
-            // {
-            //     ThirdwebDebug.Log("Transaction successful");
-            //     _deployed = true;
-            // }
+            // Check if successful
 
+            var receipt = await Transaction.WaitForTransactionResultRaw(txHash);
+            var decodedEvents = receipt.DecodeAllEvents<EntryPointContract.UserOperationEventEventDTO>();
+            if (decodedEvents[0].Event.Success == false)
+            {
+                throw new Exception($"Transaction {txHash} execution reverted");
+            }
+            else
+            {
+                ThirdwebDebug.Log("Transaction successful");
+                _deployed = true;
+            }
             return new RpcResponseMessage(requestMessage.Id, txHash);
         }
 

Assets/Thirdweb/Core/Scripts/Transaction.cs

@@ -361,13 +361,30 @@ public async Task<TransactionResult> SendAndWaitForTransactionResult(bool? gasle
         /// <param name="txHash">The transaction hash to wait for.</param>
         /// <returns>The transaction result as a <see cref="TransactionResult"/> object.</returns>
         public static async Task<TransactionResult> WaitForTransactionResult(string txHash)
+        {
+            var receipt = await WaitForTransactionResultRaw(txHash);
+            return receipt.ToTransactionResult();
+        }
+
+        /// <summary>
+        /// Waits for the transaction result asynchronously.
+        /// </summary>
+        /// <param name="txHash">The transaction hash to wait for.</param>
+        /// <returns>The transaction result as a <see cref="TransactionResult"/> object.</returns>
+        public static async Task<TransactionReceipt> WaitForTransactionResultRaw(string txHash)
         {
             if (Utils.IsWebGLBuild())
                 throw new UnityException("WaitForTransactionResult is not supported in WebGL builds.");
 
-            var receiptPoller = new Web3(ThirdwebManager.Instance.SDK.session.RPC);
-            var receipt = await receiptPoller.TransactionReceiptPolling.PollForReceiptAsync(txHash);
-            return receipt.ToTransactionResult();
+            var web3 = new Web3(ThirdwebManager.Instance.SDK.session.RPC);
+            var receipt = await web3.TransactionReceiptPolling.PollForReceiptAsync(txHash);
+            if (receipt.Failed())
+            {
+                var reason = await web3.Eth.GetContractTransactionErrorReason.SendRequestAsync(txHash);
+                if (!string.IsNullOrEmpty(reason))
+                    throw new UnityException($"Transaction failed: {reason}");
+            }
+            return receipt;
         }
 
         private async Task<string> Send()

Assets/Thirdweb/Core/Scripts/TransactionManager.cs

@@ -147,8 +147,7 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
                 }
             }
             ThirdwebDebug.Log("txHash: " + txHash);
-            var receiptPoller = new Web3(ThirdwebManager.Instance.SDK.session.RPC);
-            return await receiptPoller.TransactionReceiptPolling.PollForReceiptAsync(txHash);
+            return await Transaction.WaitForTransactionResultRaw(txHash);
         }
     }
 

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

@@ -40,6 +40,7 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
         public Task Disconnect()
         {
             _web3 = null;
+            _personalWallet.Disconnect();
             return Task.CompletedTask;
         }