Refactor TransactionForRpc (Alternative)

src/Nethermind/Nethermind.Facade/Eth/RpcTransaction/TransactionForRpc.cs

@@ -80,12 +80,6 @@ internal static void RegisterTransactionType<T>() where T : TransactionForRpc, I
 
         public override TransactionForRpc? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            if (reader.ValueIsEscaped)
-            {
-                string escapedJson = JsonSerializer.Deserialize<string>(ref reader);
-                return JsonSerializer.Deserialize<TransactionForRpc>(escapedJson, options);
-            }
-
             // Copy the reader so we can do a double parse:
             // The first parse extract the `Type` while the second parses the entire Transaction
             Utf8JsonReader txTypeReader = reader;

src/Nethermind/Nethermind.JsonRpc.Test/RpcTest.cs

@@ -1,9 +1,8 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System;
 using System.IO;
-using System.Linq;
+using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
@@ -14,8 +13,6 @@
 using Nethermind.Logging;
 using Nethermind.Serialization.Json;
 
-using NUnit.Framework;
-
 namespace Nethermind.JsonRpc.Test;
 
 public static class RpcTest
@@ -63,10 +60,26 @@ private static IJsonRpcService BuildRpcService<T>(T module) where T : class, IRp
         return service;
     }
 
-    public static JsonRpcRequest GetJsonRequest(string method, params string[]? parameters)
+    public static JsonRpcRequest GetJsonRequest(string method, params string?[]? parameters)
     {
-        var doc = JsonDocument.Parse(JsonSerializer.Serialize(parameters?.ToArray()));
-        var request = new JsonRpcRequest()
+        // NOTE: Since parameters are already passed as strings we want to avoid double serialization of JSON objects
+        var sb = new StringBuilder("[");
+        foreach (var param in parameters ?? [])
+        {
+            if (!string.IsNullOrEmpty(param) && param[0] == '{')
+            {
+                sb.Append(param);
+            }
+            else
+            {
+                sb.Append(JsonSerializer.Serialize(param));
+            }
+            sb.Append(',');
+        }
+        sb.Append(']');
+        var doc = JsonDocument.Parse(sb.ToString(), new JsonDocumentOptions { AllowTrailingCommas = true });
+
+        var request = new JsonRpcRequest
         {
             JsonRpc = "2.0",
             Method = method,