Support 3rd party executors, fix sign typed data

Author: 0xFirekeeper

Thirdweb.Console/Program.Types.cs

@@ -154,18 +154,18 @@
 // --------------------------------------------------------------------------
 
 var chainWith7702 = 911867;
-var delegationContractAddress = "0x08e47c0d38feb3d849abc01e2b7fb5d3d0d626e9"; // MinimalAccount
+var delegationContractAddress = "0xb012446cba783d0f7723daf96cf4c49005022307"; // MinimalAccount
 
 // Required environment variables
-var executorWalletAddress = Environment.GetEnvironmentVariable("ENGINE_EXECUTOR_WALLET_ADDRESS") ?? throw new Exception("ENGINE_EXECUTOR_WALLET_ADDRESS is required");
+var backendWalletAddress = Environment.GetEnvironmentVariable("ENGINE_BACKEND_WALLET_ADDRESS") ?? throw new Exception("ENGINE_BACKEND_WALLET_ADDRESS is required");
 var engineUrl = Environment.GetEnvironmentVariable("ENGINE_URL") ?? throw new Exception("ENGINE_URL is required");
 var engineAccessToken = Environment.GetEnvironmentVariable("ENGINE_ACCESS_TOKEN") ?? throw new Exception("ENGINE_ACCESS_TOKEN is required");
 
 // --------------------------------------------------------------------------
 // Initialize Engine Wallet
 // --------------------------------------------------------------------------
 
-var engineWallet = await EngineWallet.Create(client, engineUrl, engineAccessToken, executorWalletAddress, 15);
+var engineWallet = await EngineWallet.Create(client, engineUrl, engineAccessToken, backendWalletAddress, 15);
 
 // --------------------------------------------------------------------------
 // Delegation Contract Implementation
@@ -185,7 +185,7 @@
 // Sign message for session key
 var sessionKeyParams = new SessionKeyParams_7702()
 {
-    Signer = executorWalletAddress,
+    Signer = backendWalletAddress,
     NativeTokenLimitPerTransaction = 0,
     StartTimestamp = 0,
     EndTimestamp = Utils.GetUnixTimeStampNow() + (3600 * 24),
@@ -210,7 +210,7 @@
 var eoaContract = await ThirdwebContract.Create(client, eoaWalletAddress, chainWith7702, delegationContract.Abi);
 
 // --------------------------------------------------------------------------
-// Mint Tokens (DropERC20) to the EOA Using the Executor
+// Mint Tokens (DropERC20) to the EOA Using the backend session key
 // --------------------------------------------------------------------------
 
 var erc20ContractAddress = "0xAA462a5BE0fc5214507FDB4fB2474a7d5c69065b"; // DropERC20
@@ -225,7 +225,7 @@
     "execute",
     new object[]
     {
-        new List<Thirdweb.Console.Call>
+        new List<Call>
         {
             new()
             {
@@ -257,6 +257,57 @@
 var eoaBalanceAfter = await erc20Contract.ERC20_BalanceOf(eoaWalletAddress);
 Console.WriteLine($"EOA balance after: {eoaBalanceAfter}");
 
+// --------------------------------------------------------------------------
+// Mint Tokens (DropERC20) to the EOA Using an alternative executor
+// --------------------------------------------------------------------------
+
+// Executor wallet (managed)
+var executorWallet = await PrivateKeyWallet.Create(client, privateKey);
+
+// Log ERC20 balance before mint
+eoaBalanceBefore = await erc20Contract.ERC20_BalanceOf(eoaWalletAddress);
+Console.WriteLine($"EOA balance before: {eoaBalanceBefore}");
+
+// Sign wrapped calls 712 using an authorized session key (backend wallet in this case)
+var wrappedCalls = new WrappedCalls()
+{
+    Calls = new List<Call>
+    {
+        new()
+        {
+            Data = erc20Contract
+                .CreateCallData(
+                    "claim",
+                    new object[]
+                    {
+                        eoaWalletAddress, // receiver
+                        100, // quantity
+                        Constants.NATIVE_TOKEN_ADDRESS, // currency
+                        0, // pricePerToken
+                        new object[] { Array.Empty<byte>(), BigInteger.Zero, BigInteger.Zero, Constants.ADDRESS_ZERO }, // allowlistProof
+                        Array.Empty<byte>() // data
+                    }
+                )
+                .HexToBytes(),
+            To = erc20ContractAddress,
+            Value = BigInteger.Zero
+        }
+    },
+    Uid = Guid.NewGuid().ToByteArray().BytesToHex().HexToBytes32()
+};
+var wrappedCallsSig = await EIP712.GenerateSignature_SmartAccount_7702_WrappedCalls("MinimalAccount", "1", chainWith7702, eoaWalletAddress, wrappedCalls, engineWallet);
+
+// Create execution call data, this time in a way that can be broadcast by anyone
+executeCallData = eoaContract.CreateCallData("executeWithSig", wrappedCalls, wrappedCallsSig.HexToBytes());
+
+var executeTx = await ThirdwebTransaction.Create(wallet: executorWallet, txInput: new ThirdwebTransactionInput(chainId: chainWith7702, to: eoaWalletAddress, data: executeCallData));
+executeReceipt = await ThirdwebTransaction.SendAndWaitForTransactionReceipt(executeTx);
+Console.WriteLine($"Execute receipt: {JsonConvert.SerializeObject(executeReceipt, Formatting.Indented)}");
+
+// Log ERC20 balance after mint
+eoaBalanceAfter = await erc20Contract.ERC20_BalanceOf(eoaWalletAddress);
+Console.WriteLine($"EOA balance after: {eoaBalanceAfter}");
+
 #endregion
 
 #region Smart Ecosystem Wallet

Thirdweb.Console/Program.cs

@@ -14,6 +14,28 @@ public static class EIP712
 {
     #region Generation
 
+    /// <summary>
+    /// Generates a signature for a 7702 smart account wrapped calls request.
+    /// </summary>
+    /// <param name="domainName">The domain name.</param>
+    /// <param name="version">The version.</param>
+    /// <param name="chainId">The chain ID.</param>
+    /// <param name="verifyingContract">The verifying contract.</param>
+    /// <param name="wrappedCalls">The wrapped calls request.</param>
+    /// <param name="signer">The wallet signer.</param>
+    public static async Task<string> GenerateSignature_SmartAccount_7702_WrappedCalls(
+        string domainName,
+        string version,
+        BigInteger chainId,
+        string verifyingContract,
+        AccountAbstraction.WrappedCalls wrappedCalls,
+        IThirdwebWallet signer
+    )
+    {
+        var typedData = GetTypedDefinition_SmartAccount_7702_WrappedCalls(domainName, version, chainId, verifyingContract);
+        return await signer.SignTypedDataV4(wrappedCalls, typedData);
+    }
+
     /// <summary>
     /// Generates a signature for a 7702 smart account session key.
     /// </summary>
@@ -203,6 +225,30 @@ IThirdwebWallet signer
 
     #region Typed Definitions
 
+    /// <summary>
+    /// Gets the typed data definition for a 7702 smart account wrapped calls request.
+    /// </summary>
+    /// <param name="domainName">The domain name.</param>
+    /// <param name="version">The version.</param>
+    /// <param name="chainId">The chain ID.</param>
+    /// <param name="verifyingContract">The verifying contract.</param>
+    /// <returns>The typed data definition.</returns>
+    public static TypedData<Domain> GetTypedDefinition_SmartAccount_7702_WrappedCalls(string domainName, string version, BigInteger chainId, string verifyingContract)
+    {
+        return new TypedData<Domain>
+        {
+            Domain = new Domain
+            {
+                Name = domainName,
+                Version = version,
+                ChainId = chainId,
+                VerifyingContract = verifyingContract,
+            },
+            Types = MemberDescriptionFactory.GetTypesMemberDescription(typeof(Domain), typeof(AccountAbstraction.WrappedCalls), typeof(AccountAbstraction.Call)),
+            PrimaryType = "WrappedCalls",
+        };
+    }
+
     /// <summary>
     /// Gets the typed data definition for a 7702 smart account session key.
     /// </summary>

Thirdweb/Thirdweb.Wallets/EIP712.cs

@@ -246,6 +246,11 @@ public async Task<string> SignTypedDataV4(string json)
         }
 
         var processedJson = Utils.PreprocessTypedDataJson(json);
+        // TODO: remove this sanitization when engine is upgraded to match spec
+        processedJson = processedJson.Replace("message", "value");
+        var tempObj = JObject.Parse(processedJson);
+        _ = tempObj["types"].Value<JObject>().Remove("EIP712Domain");
+        processedJson = tempObj.ToString();
 
         var url = $"{this._engineUrl}/backend-wallet/sign-typed-data";
 
@@ -307,7 +312,6 @@ public async Task<string> SendTransaction(ThirdwebTransactionInput transaction)
         var url = $"{this._engineUrl}/backend-wallet/{transaction.ChainId.Value}/send-transaction";
 
         var requestContent = new StringContent(JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }), Encoding.UTF8, "application/json");
-        Console.WriteLine(JsonConvert.SerializeObject(payload, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
 
         var response = await this._engineClient.PostAsync(url, requestContent).ConfigureAwait(false);
         _ = response.EnsureSuccessStatusCode();

Thirdweb/Thirdweb.Wallets/EngineWallet/EngineWallet.cs

@@ -513,3 +513,31 @@ public class SessionKeyParams_7702
     [JsonProperty("uid")]
     public byte[] Uid { get; set; }
 }
+
+[Struct("Call")]
+public class Call
+{
+    [Parameter("bytes", "data", 1)]
+    [JsonProperty("data")]
+    public byte[] Data { get; set; }
+
+    [Parameter("address", "to", 2)]
+    [JsonProperty("to")]
+    public string To { get; set; }
+
+    [Parameter("uint256", "value", 3)]
+    [JsonProperty("value")]
+    public BigInteger Value { get; set; }
+}
+
+[Struct("WrappedCalls")]
+public class WrappedCalls
+{
+    [Parameter("tuple[]", "calls", 1, "Call[]")]
+    [JsonProperty("calls")]
+    public List<Call> Calls { get; set; }
+
+    [Parameter("bytes32", "uid", 2)]
+    [JsonProperty("uid")]
+    public byte[] Uid { get; set; }
+}