Integrate Ecosystem Signing Policies

Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs

@@ -25,6 +25,7 @@ public class ThirdwebRPC : IDisposable
     private readonly object _responseLock = new();
     private readonly object _cacheLock = new();
     private readonly CancellationTokenSource _cancellationTokenSource = new();
+    private readonly JsonSerializerSettings _jsonSerializerSettings = new() { NullValueHandling = NullValueHandling.Ignore, };
 
     private int _requestIdCounter = 1;
 
@@ -167,7 +168,7 @@ private ThirdwebRPC(ThirdwebClient client, BigInteger chainId)
 
     private async Task SendBatchAsync(List<RpcRequest> batch)
     {
-        var batchJson = JsonConvert.SerializeObject(batch);
+        var batchJson = JsonConvert.SerializeObject(batch, this._jsonSerializerSettings);
         var content = new StringContent(batchJson, Encoding.UTF8, "application/json");
 
         try

Thirdweb/Thirdweb.Wallets/EngineWallet/EngineWallet.cs

@@ -188,7 +188,7 @@ public Task<string> EthSign(string message)
         throw new NotImplementedException();
     }
 
-    public async Task<string> PersonalSign(byte[] rawMessage)
+    public async Task<string> PersonalSign(byte[] rawMessage, object originalMessage = null, BigInteger? chainId = null)
     {
         if (rawMessage == null)
         {
@@ -207,7 +207,7 @@ public async Task<string> PersonalSign(byte[] rawMessage)
         return JObject.Parse(content)["result"].Value<string>();
     }
 
-    public async Task<string> PersonalSign(string message)
+    public async Task<string> PersonalSign(string message, object originalMessage = null, BigInteger? chainId = null)
     {
         if (string.IsNullOrEmpty(message))
         {

Thirdweb/Thirdweb.Wallets/IThirdwebWallet.cs

@@ -56,15 +56,19 @@ public interface IThirdwebWallet
     /// Signs a raw message using personal signing.
     /// </summary>
     /// <param name="rawMessage">The raw message to sign.</param>
+    /// <param name="originalMessage">Used for Ecosystem signing policies purposes only.</param>
+    /// <param name="chainId">Used for Ecosystem signing policies purposes only.</param>
     /// <returns>The signed message.</returns>
-    public Task<string> PersonalSign(byte[] rawMessage);
+    public Task<string> PersonalSign(byte[] rawMessage, object originalMessage = null, BigInteger? chainId = null);
 
     /// <summary>
     /// Signs a message using personal signing.
     /// </summary>
     /// <param name="message">The message to sign.</param>
+    /// <param name="originalMessage">Used for Ecosystem signing polciies purposes only.</param>
+    /// <param name="chainId">Used for Ecosystem signing polciies purposes only.</param>
     /// <returns>The signed message.</returns>
-    public Task<string> PersonalSign(string message);
+    public Task<string> PersonalSign(string message, object originalMessage = null, BigInteger? chainId = null);
 
     /// <summary>
     /// Recovers the address from a signed message using personal signing.

Thirdweb/Thirdweb.Wallets/InAppWallet/EcosystemWallet/EcosystemWallet.cs

@@ -48,6 +48,8 @@ public partial class EcosystemWallet : IThirdwebWallet
     private const string EMBEDDED_WALLET_PATH_V1 = $"{EMBEDDED_WALLET_BASE_PATH}/v1";
     private const string ENCLAVE_PATH = $"{EMBEDDED_WALLET_PATH_V1}/enclave-wallet";
 
+    private readonly JsonSerializerSettings _jsonSerializerSettings = new() { NullValueHandling = NullValueHandling.Ignore, };
+
     internal EcosystemWallet(
         string ecosystemId,
         string ecosystemPartnerId,
@@ -1001,17 +1003,26 @@ public Task<string> EthSign(string message)
         throw new NotImplementedException();
     }
 
-    public async Task<string> PersonalSign(byte[] rawMessage)
+    public async Task<string> PersonalSign(byte[] rawMessage, object originalMessage = null, BigInteger? chainId = null)
     {
         if (rawMessage == null)
         {
             throw new ArgumentNullException(nameof(rawMessage), "Message to sign cannot be null.");
         }
 
         var url = $"{ENCLAVE_PATH}/sign-message";
-        var payload = new { messagePayload = new { message = rawMessage.BytesToHex(), isRaw = true } };
+        var payload = new
+        {
+            messagePayload = new
+            {
+                message = rawMessage.BytesToHex(),
+                isRaw = true,
+                originalMessage,
+                chainId
+            }
+        };
 
-        var requestContent = new StringContent(JsonConvert.SerializeObject(payload), Encoding.UTF8, "application/json");
+        var requestContent = new StringContent(JsonConvert.SerializeObject(payload, this._jsonSerializerSettings), Encoding.UTF8, "application/json");
 
         var response = await this.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
         _ = response.EnsureSuccessStatusCode();
@@ -1021,17 +1032,26 @@ public async Task<string> PersonalSign(byte[] rawMessage)
         return res.Signature;
     }
 
-    public async Task<string> PersonalSign(string message)
+    public async Task<string> PersonalSign(string message, object originalMessage = null, BigInteger? chainId = null)
     {
         if (string.IsNullOrEmpty(message))
         {
             throw new ArgumentNullException(nameof(message), "Message to sign cannot be null.");
         }
 
         var url = $"{ENCLAVE_PATH}/sign-message";
-        var payload = new { messagePayload = new { message, isRaw = false } };
+        var payload = new
+        {
+            messagePayload = new
+            {
+                message,
+                isRaw = false,
+                originalMessage,
+                chainId
+            }
+        };
 
-        var requestContent = new StringContent(JsonConvert.SerializeObject(payload), Encoding.UTF8, "application/json");
+        var requestContent = new StringContent(JsonConvert.SerializeObject(payload, this._jsonSerializerSettings), Encoding.UTF8, "application/json");
 
         var response = await this.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
         _ = response.EnsureSuccessStatusCode();

Thirdweb/Thirdweb.Wallets/PrivateKeyWallet/PrivateKeyWallet.cs

@@ -209,7 +209,7 @@ public virtual Task<string> RecoverAddressFromEthSign(string message, string sig
         return Task.FromResult(address);
     }
 
-    public virtual Task<string> PersonalSign(byte[] rawMessage)
+    public virtual Task<string> PersonalSign(byte[] rawMessage, object originalMessage = null, BigInteger? chainId = null)
     {
         if (rawMessage == null)
         {
@@ -221,7 +221,7 @@ public virtual Task<string> PersonalSign(byte[] rawMessage)
         return Task.FromResult(signature);
     }
 
-    public virtual Task<string> PersonalSign(string message)
+    public virtual Task<string> PersonalSign(string message, object originalMessage = null, BigInteger? chainId = null)
     {
         if (string.IsNullOrEmpty(message))
         {

Thirdweb/Thirdweb.Wallets/SmartWallet/SmartWallet.cs

@@ -873,11 +873,12 @@ private async Task<PMSponsorOperationResponse> GetPaymasterAndData(object reques
 
     private async Task<byte[]> HashAndSignUserOp(UserOperationV6 userOp, ThirdwebContract entryPointContract)
     {
+        var hexified = EncodeUserOperation(userOp);
         var userOpHash = await ThirdwebContract.Read<byte[]>(entryPointContract, "getUserOpHash", userOp);
         var sig =
             this._personalAccount.AccountType == ThirdwebAccountType.ExternalAccount
-                ? await this._personalAccount.PersonalSign(userOpHash.BytesToHex()).ConfigureAwait(false)
-                : await this._personalAccount.PersonalSign(userOpHash).ConfigureAwait(false);
+                ? await this._personalAccount.PersonalSign(userOpHash.BytesToHex(), hexified, this.ActiveChainId).ConfigureAwait(false)
+                : await this._personalAccount.PersonalSign(userOpHash, hexified, this.ActiveChainId).ConfigureAwait(false);
         return sig.HexToBytes();
     }
 
@@ -945,10 +946,11 @@ private async Task<byte[]> HashAndSignUserOp(UserOperationV7 userOp, ThirdwebCon
 
         var userOpHash = await ThirdwebContract.Read<byte[]>(entryPointContract, "getUserOpHash", packedOp).ConfigureAwait(false);
 
+        var hexified = EncodeUserOperation(userOp);
         var sig =
             this._personalAccount.AccountType == ThirdwebAccountType.ExternalAccount
-                ? await this._personalAccount.PersonalSign(userOpHash.BytesToHex()).ConfigureAwait(false)
-                : await this._personalAccount.PersonalSign(userOpHash).ConfigureAwait(false);
+                ? await this._personalAccount.PersonalSign(userOpHash.BytesToHex(), hexified, this.ActiveChainId).ConfigureAwait(false)
+                : await this._personalAccount.PersonalSign(userOpHash, hexified, this.ActiveChainId).ConfigureAwait(false);
 
         return sig.HexToBytes();
     }
@@ -1081,17 +1083,15 @@ public Task<string> RecoverAddressFromEthSign(string message, string signature)
         throw new NotImplementedException();
     }
 
-    public Task<string> PersonalSign(byte[] rawMessage)
+    public Task<string> PersonalSign(byte[] rawMessage, object originalMessage = null, BigInteger? chainId = null)
     {
         throw new NotImplementedException();
     }
 
     /// <summary>
     /// Signs a message with the personal account. The message will be verified using EIPs 1271 and 6492 if applicable.
     /// </summary>
-    /// <param name="message">The message to sign.</param>
-    /// <returns>The signature.</returns>
-    public async Task<string> PersonalSign(string message)
+    public async Task<string> PersonalSign(string message, object originalMessage = null, BigInteger? chainId = null)
     {
         if (await Utils.IsZkSync(this.Client, this.ActiveChainId).ConfigureAwait(false))
         {

Thirdweb/Thirdweb.Wallets/SmartWallet/Thirdweb.AccountAbstraction/AATypes.cs

@@ -119,6 +119,7 @@ public class PackedUserOperation
     public virtual byte[] Signature { get; set; }
 }
 
+[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
 public class UserOperationHexifiedV6
 {
     [JsonProperty("sender")]
@@ -155,6 +156,7 @@ public class UserOperationHexifiedV6
     public string Signature { get; set; }
 }
 
+[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
 public class UserOperationHexifiedV7
 {
     [JsonProperty("sender")]