Add EIP-7702 and EOA execution options to ServerWallet

0xFirekeeper · 0xFirekeeper · commit e18354398f2c · 2025-07-18T07:21:57.000+07:00
Introduces EIP7702ExecutionOptions and EOAExecutionOptions classes for ServerWallet execution modes. Updates ServerWallet logic to support these new execution options and improves type handling. Also comments out ServerWallet usage in the console example and fixes account parsing in ServerWallet creation.
diff --git a/Thirdweb.Console/Program.cs b/Thirdweb.Console/Program.cs
@@ -27,7 +27,7 @@
 var privateKey = Environment.GetEnvironmentVariable("PRIVATE_KEY");
 
 // Fetch timeout options are optional, default is 120000ms
-var client = ThirdwebClient.Create(secretKey: secretKey);
+var client = ThirdwebClient.Create(secretKey: "4qXoZMCqQo9SD8YkrdvO5Ci9gYKrgRADHSY84Q0wwKHZS53_R1QNcIs2XbFBWR0xE7HTQPER45T1sN1JvdFKlA");
 
 //  Create a private key wallet
 var privateKeyWallet = await PrivateKeyWallet.Generate(client);
@@ -342,52 +342,44 @@
 
 #region Server Wallet
 
-// You need only pass this if you are using a self-managed vault (check your dashboard Transactions tab)
-var myAccessToken = Environment.GetEnvironmentVariable("VAULT_ACCESS_TOKEN");
-
-// ServerWallet is compatible with IThirdwebWallet and can be used with any SDK method/extension
-var serverWallet = await ServerWallet.Create(
-    client: client,
-    label: "Test",
-    // Optional, defaults to Auto - we choose between EIP-7702, EIP-4337 or native zkSync AA execution
-    executionOptions: new AutoExecutionOptions(),
-    vaultAccessToken: myAccessToken
-);
-var serverWalletAddress = await serverWallet.GetAddress();
-Console.WriteLine($"Server Wallet address: {serverWalletAddress}");
-
-var serverWalletPersonalSig = await serverWallet.PersonalSign("Hello, Thirdweb!");
-Console.WriteLine($"Server Wallet personal sign: {serverWalletPersonalSig}");
-
-var json =
-    /*lang=json,strict*/
-    "{\"types\":{\"EIP712Domain\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"version\",\"type\":\"string\"},{\"name\":\"chainId\",\"type\":\"uint256\"},{\"name\":\"verifyingContract\",\"type\":\"address\"}],\"Person\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"wallet\",\"type\":\"address\"}],\"Mail\":[{\"name\":\"from\",\"type\":\"Person\"},{\"name\":\"to\",\"type\":\"Person\"},{\"name\":\"contents\",\"type\":\"string\"}]},\"primaryType\":\"Mail\",\"domain\":{\"name\":\"Ether Mail\",\"version\":\"1\",\"chainId\":84532,\"verifyingContract\":\"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\"},\"message\":{\"from\":{\"name\":\"Cow\",\"wallet\":\"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826\"},\"to\":{\"name\":\"Bob\",\"wallet\":\"0xbBbBBBBbbBBBbbbBbbBbbBBbBbbBbBbBbBbbBBbB\"},\"contents\":\"Hello, Bob!\"}}";
-var serverWalletTypedDataSign = await serverWallet.SignTypedDataV4(json);
-Console.WriteLine($"Server Wallet typed data sign: {serverWalletTypedDataSign}");
-
-// ServerWallet forcing ERC-4337 Execution Mode
-var smartServerWallet = await ServerWallet.Create(
-    client: client,
-    label: "Test",
-    executionOptions: new ERC4337ExecutionOptions(chainId: 84532, signerAddress: serverWalletAddress),
-    vaultAccessToken: myAccessToken
-);
-var smartServerWalletAddress = await smartServerWallet.GetAddress();
-Console.WriteLine($"Smart Server Wallet address: {smartServerWalletAddress}");
-
-var smartServerWalletPersonalSig = await smartServerWallet.PersonalSign("Hello, Thirdweb!");
-Console.WriteLine($"Smart Server Wallet personal sign: {smartServerWalletPersonalSig}");
-
-var smartServerWalletTypedDataSign = await smartServerWallet.SignTypedDataV4(json);
-Console.WriteLine($"Smart Server Wallet typed data sign: {smartServerWalletTypedDataSign}");
-
-// Simple self transfer
-var serverWalletReceipt = await serverWallet.Transfer(chainId: 421614, toAddress: await serverWallet.GetAddress(), weiAmount: 0);
-Console.WriteLine($"Server Wallet Hash: {serverWalletReceipt.TransactionHash}");
-
-// Simple self transfer
-var smartServerWalletReceipt = await smartServerWallet.Transfer(chainId: 421614, toAddress: await smartServerWallet.GetAddress(), weiAmount: 0);
-Console.WriteLine($"Server Wallet Hash: {smartServerWalletReceipt.TransactionHash}");
+// // ServerWallet is compatible with IThirdwebWallet and can be used with any SDK method/extension
+// var serverWallet = await ServerWallet.Create(
+//     client: client,
+//     label: "Test",
+//     // Optional, defaults to Auto - we choose between EIP-7702, EIP-4337 or native zkSync AA execution / EOA is also available
+//     executionOptions: new AutoExecutionOptions()
+// );
+
+// var serverWalletAddress = await serverWallet.GetAddress();
+// Console.WriteLine($"Server Wallet address: {serverWalletAddress}");
+
+// var serverWalletPersonalSig = await serverWallet.PersonalSign("Hello, Thirdweb!");
+// Console.WriteLine($"Server Wallet personal sign: {serverWalletPersonalSig}");
+
+// var json =
+//     /*lang=json,strict*/
+//     "{\"types\":{\"EIP712Domain\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"version\",\"type\":\"string\"},{\"name\":\"chainId\",\"type\":\"uint256\"},{\"name\":\"verifyingContract\",\"type\":\"address\"}],\"Person\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"wallet\",\"type\":\"address\"}],\"Mail\":[{\"name\":\"from\",\"type\":\"Person\"},{\"name\":\"to\",\"type\":\"Person\"},{\"name\":\"contents\",\"type\":\"string\"}]},\"primaryType\":\"Mail\",\"domain\":{\"name\":\"Ether Mail\",\"version\":\"1\",\"chainId\":84532,\"verifyingContract\":\"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\"},\"message\":{\"from\":{\"name\":\"Cow\",\"wallet\":\"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826\"},\"to\":{\"name\":\"Bob\",\"wallet\":\"0xbBbBBBBbbBBBbbbBbbBbbBBbBbbBbBbBbBbbBBbB\"},\"contents\":\"Hello, Bob!\"}}";
+// var serverWalletTypedDataSign = await serverWallet.SignTypedDataV4(json);
+// Console.WriteLine($"Server Wallet typed data sign: {serverWalletTypedDataSign}");
+
+// // Simple self transfer
+// var serverWalletReceipt = await serverWallet.Transfer(chainId: 84532, toAddress: await serverWallet.GetAddress(), weiAmount: 0);
+// Console.WriteLine($"Server Wallet Hash: {serverWalletReceipt.TransactionHash}");
+
+// // ServerWallet forcing ERC-4337 Execution Mode
+// var smartServerWallet = await ServerWallet.Create(client: client, label: "Test", executionOptions: new ERC4337ExecutionOptions(chainId: 84532, signerAddress: serverWalletAddress));
+// var smartServerWalletAddress = await smartServerWallet.GetAddress();
+// Console.WriteLine($"Smart Server Wallet address: {smartServerWalletAddress}");
+
+// var smartServerWalletPersonalSig = await smartServerWallet.PersonalSign("Hello, Thirdweb!");
+// Console.WriteLine($"Smart Server Wallet personal sign: {smartServerWalletPersonalSig}");
+
+// var smartServerWalletTypedDataSign = await smartServerWallet.SignTypedDataV4(json);
+// Console.WriteLine($"Smart Server Wallet typed data sign: {smartServerWalletTypedDataSign}");
+
+// // Simple self transfer
+// var smartServerWalletReceipt = await smartServerWallet.Transfer(chainId: 84532, toAddress: await smartServerWallet.GetAddress(), weiAmount: 0);
+// Console.WriteLine($"Server Wallet Hash: {smartServerWalletReceipt.TransactionHash}");
 
 #endregion
 
diff --git a/Thirdweb/Thirdweb.Wallets/ServerWallet/ServerWallet.Types.cs b/Thirdweb/Thirdweb.Wallets/ServerWallet/ServerWallet.Types.cs
@@ -29,6 +29,32 @@ public class AutoExecutionOptions : ExecutionOptions
     public string From { get; set; }
 }
 
+/// <summary>
+/// Externally Owned Account (EOA) execution options
+/// </summary>
+[JsonObject]
+public class EIP7702ExecutionOptions : ExecutionOptions
+{
+    [JsonProperty("type")]
+    public string Type { get; set; } = "EIP7702";
+
+    [JsonProperty("from")]
+    public string From { get; set; }
+}
+
+/// <summary>
+/// Externally Owned Account (EOA) execution options
+/// </summary>
+[JsonObject]
+public class EOAExecutionOptions : ExecutionOptions
+{
+    [JsonProperty("type")]
+    public string Type { get; set; } = "EOA";
+
+    [JsonProperty("from")]
+    public string From { get; set; }
+}
+
 /// <summary>
 /// ERC-4337 execution options
 /// </summary>
diff --git a/Thirdweb/Thirdweb.Wallets/ServerWallet/ServerWallet.cs b/Thirdweb/Thirdweb.Wallets/ServerWallet/ServerWallet.cs
@@ -21,7 +21,7 @@ public partial class ServerWallet : IThirdwebWallet
     private readonly IThirdwebHttpClient _engineClient;
     private readonly ExecutionOptions _executionOptions;
 
-    private readonly JsonSerializerSettings _jsonSerializerSettings = new() { NullValueHandling = NullValueHandling.Ignore, Formatting = Formatting.Indented, };
+    private readonly JsonSerializerSettings _jsonSerializerSettings = new() { NullValueHandling = NullValueHandling.Ignore, Formatting = Formatting.Indented };
 
     internal ServerWallet(ThirdwebClient client, IThirdwebHttpClient engineClient, string walletAddress, ExecutionOptions executionOptions)
     {
@@ -65,7 +65,7 @@ public static async Task<ServerWallet> Create(ThirdwebClient client, string labe
         var content = await serverWalletListResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
 
         var responseObj = JObject.Parse(content);
-        var accounts = responseObj["result"]?.ToObject<JArray>();
+        var accounts = responseObj["result"]?["accounts"]?.ToObject<JArray>(); // TODO: Support pagination
 
         if (accounts == null || accounts.Count == 0)
         {
@@ -86,14 +86,28 @@ public static async Task<ServerWallet> Create(ThirdwebClient client, string labe
         }
 
         executionOptions ??= new AutoExecutionOptions { IdempotencyKey = Guid.NewGuid().ToString(), From = signerWalletAddress.ToChecksumAddress() };
-        if (executionOptions is AutoExecutionOptions autoExecutionOptions)
+        if (executionOptions is ERC4337ExecutionOptions erc4337ExecutionOptions)
+        {
+            erc4337ExecutionOptions.SmartAccountAddress = smartWalletAddress;
+            erc4337ExecutionOptions.SignerAddress = signerWalletAddress;
+        }
+        else if (executionOptions is EIP7702ExecutionOptions eip7702ExecutionOptions)
+        {
+            eip7702ExecutionOptions.From = signerWalletAddress.ToChecksumAddress();
+        }
+        else if (executionOptions is EOAExecutionOptions eoaExecutionOptions)
+        {
+            eoaExecutionOptions.From = signerWalletAddress.ToChecksumAddress();
+        }
+        else if (executionOptions is AutoExecutionOptions autoExecutionOptions)
         {
             autoExecutionOptions.From ??= signerWalletAddress.ToChecksumAddress();
         }
-        else if (executionOptions is ERC4337ExecutionOptions erc4337ExecutionOptions)
+        else
         {
-            erc4337ExecutionOptions.SmartAccountAddress = smartWalletAddress;
-            erc4337ExecutionOptions.SignerAddress = signerWalletAddress;
+            throw new InvalidOperationException(
+                $"Unsupported execution options type: {executionOptions.GetType().Name}. Supported types are AutoExecutionOptions, EIP7702ExecutionOptions, EOAExecutionOptions, and ERC4337ExecutionOptions."
+            );
         }
 
         var wallet = new ServerWallet(client, engineClient, smartWalletAddress ?? signerWalletAddress, executionOptions);
@@ -149,22 +163,19 @@ private object ToEngineTransaction(ThirdwebTransactionInput transaction)
                     data = transaction.Data ?? "0x",
                     value = transaction.Value?.HexValue ?? "0x00",
                     authorizationList = transaction.AuthorizationList != null && transaction.AuthorizationList.Count > 0
-                        ? transaction.AuthorizationList
-                            .Select(
-                                authorization =>
-                                    new
-                                    {
-                                        chainId = authorization.ChainId.HexToNumber(),
-                                        address = authorization.Address,
-                                        nonce = authorization.Nonce.HexToNumber(),
-                                        yParity = authorization.YParity.HexToNumber(),
-                                        r = authorization.R,
-                                        s = authorization.S
-                                    }
-                            )
+                        ? transaction
+                            .AuthorizationList.Select(authorization => new
+                            {
+                                chainId = authorization.ChainId.HexToNumber(),
+                                address = authorization.Address,
+                                nonce = authorization.Nonce.HexToNumber(),
+                                yParity = authorization.YParity.HexToNumber(),
+                                r = authorization.R,
+                                s = authorization.S,
+                            })
                             .ToArray()
                         : null,
-                }
+                },
             },
         };
     }
@@ -222,9 +233,9 @@ public async Task<string> PersonalSign(byte[] rawMessage)
             {
                 type = "auto",
                 from = address,
-                chainId = this._executionOptions.ChainId
+                chainId = this._executionOptions.ChainId,
             },
-            @params = new[] { new { message = rawMessage.BytesToHex(), format = "hex" } }
+            @params = new[] { new { message = rawMessage.BytesToHex(), format = "hex" } },
         };
 
         var requestContent = new StringContent(JsonConvert.SerializeObject(payload, this._jsonSerializerSettings), Encoding.UTF8, "application/json");
@@ -253,9 +264,9 @@ public async Task<string> PersonalSign(string message)
             {
                 type = "auto",
                 from = address,
-                chainId = this._executionOptions.ChainId
+                chainId = this._executionOptions.ChainId,
             },
-            @params = new[] { new { message, format = "text" } }
+            @params = new[] { new { message, format = "text" } },
         };
 
         var requestContent = new StringContent(JsonConvert.SerializeObject(payload, this._jsonSerializerSettings), Encoding.UTF8, "application/json");
@@ -288,7 +299,7 @@ public async Task<string> SignTypedDataV4(string json)
                 from = address,
                 chainId = BigInteger.Parse(JObject.Parse(processedJson)["domain"]?["chainId"]?.Value<string>()),
             },
-            @params = new[] { processedJson }
+            @params = new[] { processedJson },
         };
         var requestContent = new StringContent(JsonConvert.SerializeObject(payload, this._jsonSerializerSettings), Encoding.UTF8, "application/json");
 
