ExecutionMode -> sponsorGas

Author: 0xFirekeeper

Thirdweb/Thirdweb.Wallets/SmarterWallet.cs

@@ -5,12 +5,6 @@
 
 namespace Thirdweb;
 
-public enum ExecutionMode
-{
-    EOA,
-    EIP7702,
-}
-
 /// <summary>
 /// Represents a 7702 delegated wallet with granular session key permissions and automatic session key execution.
 /// </summary>
@@ -24,27 +18,27 @@ public class SmarterWallet : IThirdwebWallet
     internal IThirdwebWallet UserWallet { get; }
     internal ThirdwebContract UserContract { get; }
     internal BigInteger ChainId { get; }
-    internal ExecutionMode ExecutionMode { get; }
+    internal bool SponsorGas { get; }
 
     private EIP7702Authorization? Authorization { get; set; }
 
-    internal SmarterWallet(ThirdwebClient client, BigInteger chainId, IThirdwebWallet userWallet, ThirdwebContract userContract, EIP7702Authorization? authorization, ExecutionMode executionMode)
+    internal SmarterWallet(ThirdwebClient client, BigInteger chainId, IThirdwebWallet userWallet, ThirdwebContract userContract, EIP7702Authorization? authorization, bool sponsorGas)
     {
         this.Client = client;
         this.ChainId = chainId;
         this.UserWallet = userWallet;
         this.UserContract = userContract;
         this.Authorization = authorization;
-        this.ExecutionMode = executionMode;
+        this.SponsorGas = sponsorGas;
     }
 
-    public static async Task<SmarterWallet> Create(ThirdwebClient client, BigInteger chainId, IThirdwebWallet userWallet, ExecutionMode executionMode)
+    public static async Task<SmarterWallet> Create(ThirdwebClient client, BigInteger chainId, IThirdwebWallet userWallet, bool sponsorGas = true)
     {
         var userWalletAddress = await userWallet.GetAddress();
         var userContract = await ThirdwebContract.Create(client, userWalletAddress, chainId, Constants.MINIMAL_ACCOUNT_7702_ABI);
         var needsDelegation = !await Utils.IsDelegatedAccount(client, chainId, userWalletAddress);
-        EIP7702Authorization? authorization = needsDelegation ? await userWallet.SignAuthorization(chainId, Constants.MINIMAL_ACCOUNT_7702, willSelfExecute: executionMode == ExecutionMode.EOA) : null;
-        var wallet = new SmarterWallet(client, chainId, userWallet, userContract, authorization, executionMode);
+        EIP7702Authorization? authorization = needsDelegation ? await userWallet.SignAuthorization(chainId, Constants.MINIMAL_ACCOUNT_7702, willSelfExecute: !sponsorGas) : null;
+        var wallet = new SmarterWallet(client, chainId, userWallet, userContract, authorization, sponsorGas);
         Utils.TrackConnection(wallet);
         return wallet;
     }
@@ -145,66 +139,59 @@ public async Task<string> SendTransaction(ThirdwebTransactionInput transaction)
             }
         };
 
-        switch (this.ExecutionMode)
+        if (this.SponsorGas)
         {
-            case ExecutionMode.EIP7702:
-                var wrappedCalls = new WrappedCalls() { Calls = calls, Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes() };
-                var signature = await EIP712.GenerateSignature_SmartAccount_7702_WrappedCalls("MinimalAccount", "1", this.ChainId, userWalletAddress, wrappedCalls, this.UserWallet);
-                var response = await BundlerClient.TwExecute(
-                    client: this.Client,
-                    // url: $"{this.ChainId}.bundler.thirdweb.com",
-                    url: "http://localhost:8787?chain=11155111",
-                    requestId: 7702,
-                    eoaAddress: userWalletAddress,
-                    wrappedCalls: wrappedCalls,
-                    signature: signature,
-                    authorization: this.Authorization != null && !await Utils.IsDelegatedAccount(this.Client, this.ChainId, userWalletAddress) ? this.Authorization : null
-                );
-                var queueId = response?.QueueId;
-                string txHash = null;
-                var ct = new CancellationTokenSource(this.Client.FetchTimeoutOptions.GetTimeout(TimeoutType.Other));
-                try
-                {
-                    while (txHash == null)
-                    {
-                        ct.Token.ThrowIfCancellationRequested();
-
-                        var hashResponse = await BundlerClient
-                            .TwGetTransactionHash(
-                                client: this.Client,
-                                // url: $"{this.ChainId}.bundler.thirdweb.com",
-                                url: "http://localhost:8787?chain=11155111",
-                                requestId: 7702,
-                                queueId
-                            )
-                            .ConfigureAwait(false);
-
-                        txHash = hashResponse?.TransactionHash;
-                        await ThirdwebTask.Delay(100, ct.Token).ConfigureAwait(false);
-                    }
-                    return txHash;
-                }
-                catch (OperationCanceledException)
-                {
-                    throw new Exception($"EIP-7702 sponsored transaction timed out with queue id: {queueId}");
-                }
-            case ExecutionMode.EOA:
-                // Add up values of all calls
-                BigInteger totalValue = 0;
-                foreach (var call in calls)
+            var wrappedCalls = new WrappedCalls() { Calls = calls, Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes() };
+            var signature = await EIP712.GenerateSignature_SmartAccount_7702_WrappedCalls("MinimalAccount", "1", this.ChainId, userWalletAddress, wrappedCalls, this.UserWallet);
+            var response = await BundlerClient.TwExecute(
+                client: this.Client,
+                // url: $"{this.ChainId}.bundler.thirdweb.com",
+                url: "http://localhost:8787?chain=11155111",
+                requestId: 7702,
+                eoaAddress: userWalletAddress,
+                wrappedCalls: wrappedCalls,
+                signature: signature,
+                authorization: this.Authorization != null && !await Utils.IsDelegatedAccount(this.Client, this.ChainId, userWalletAddress) ? this.Authorization : null
+            );
+            var queueId = response?.QueueId;
+            string txHash = null;
+            var ct = new CancellationTokenSource(this.Client.FetchTimeoutOptions.GetTimeout(TimeoutType.Other));
+            try
+            {
+                while (txHash == null)
                 {
-                    totalValue += call.Value;
+                    ct.Token.ThrowIfCancellationRequested();
+
+                    var hashResponse = await BundlerClient
+                        .TwGetTransactionHash(
+                            client: this.Client,
+                            // url: $"{this.ChainId}.bundler.thirdweb.com",
+                            url: "http://localhost:8787?chain=11155111",
+                            requestId: 7702,
+                            queueId
+                        )
+                        .ConfigureAwait(false);
+
+                    txHash = hashResponse?.TransactionHash;
+                    await ThirdwebTask.Delay(100, ct.Token).ConfigureAwait(false);
                 }
-                // Prepare a tx using the user wallet as the executor
-                var finalTx = await this.UserContract.Prepare(wallet: this.UserWallet, method: "execute", weiValue: totalValue, parameters: new object[] { calls });
-                finalTx.Input.AuthorizationList = this.Authorization != null ? new List<EIP7702Authorization>() { this.Authorization.Value } : null;
-
-                // Append authorization if not delegated yet
-
-                // Send the transaction and return the
-                return await ThirdwebTransaction.Send(finalTx);
-            default:
-                throw new NotImplementedException($"Execution mode {this.ExecutionMode} is not supported.");
+                return txHash;
+            }
+            catch (OperationCanceledException)
+            {
+                throw new Exception($"EIP-7702 sponsored transaction timed out with queue id: {queueId}");
+            }
+        }
+        else
+        {
+            BigInteger totalValue = 0;
+            foreach (var call in calls)
+            {
+                totalValue += call.Value;
+            }
+            var finalTx = await this.UserContract.Prepare(wallet: this.UserWallet, method: "execute", weiValue: totalValue, parameters: new object[] { calls });
+            finalTx.Input.AuthorizationList = this.Authorization != null ? new List<EIP7702Authorization>() { this.Authorization.Value } : null;
+            return await ThirdwebTransaction.Send(finalTx);
         }
     }