Return raw txs in mempool form if possible (#8330)

Author: flcl42

src/Nethermind/Nethermind.Blockchain.Test/Validators/BlockValidatorTests.cs

@@ -6,7 +6,6 @@
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Test.Builders;
-using Nethermind.Crypto;
 using Nethermind.Logging;
 using Nethermind.Specs;
 using Nethermind.Specs.Forks;
@@ -159,8 +158,6 @@ public void ValidateProcessedBlock_StateRootIsWrong_ErrorIsSet()
 
     private static IEnumerable<TestCaseData> BadSuggestedBlocks()
     {
-        KzgPolynomialCommitments.InitializeAsync().Wait();
-
         yield return new TestCaseData(
         Build.A.Block.WithHeader(Build.A.BlockHeader.WithUnclesHash(Keccak.Zero).TestObject).TestObject,
         Substitute.For<ISpecProvider>(),

src/Nethermind/Nethermind.Blockchain.Test/Validators/TxValidatorTests.cs

@@ -687,7 +687,6 @@ private static IEnumerable<TestCaseData> ShardBlobTxIncorrectTransactions
     {
         get
         {
-            KzgPolynomialCommitments.InitializeAsync().Wait();
             static TransactionBuilder<Transaction> MakeTestObject(int blobCount = 1) => Build.A.Transaction
                 .WithChainId(TestBlockchainIds.ChainId)
                 .WithTimestamp(ulong.MaxValue)

src/Nethermind/Nethermind.Core.Test/Builders/TransactionBuilder.cs

@@ -183,6 +183,11 @@ public TransactionBuilder<T> WithShardBlobTxTypeAndFields(int blobCount = 1, boo
                     proofs: new byte[blobCount][]
                     );
 
+                if (!KzgPolynomialCommitments.IsInitialized)
+                {
+                    KzgPolynomialCommitments.InitializeAsync().Wait();
+                }
+
                 for (int i = 0; i < blobCount; i++)
                 {
                     TestObjectInternal.BlobVersionedHashes[i] = new byte[32];
@@ -191,20 +196,11 @@ public TransactionBuilder<T> WithShardBlobTxTypeAndFields(int blobCount = 1, boo
                     wrapper.Commitments[i] = new byte[Ckzg.Ckzg.BytesPerCommitment];
                     wrapper.Proofs[i] = new byte[Ckzg.Ckzg.BytesPerProof];
 
-                    if (KzgPolynomialCommitments.IsInitialized)
-                    {
-                        KzgPolynomialCommitments.KzgifyBlob(
-                            wrapper.Blobs[i],
-                            wrapper.Commitments[i],
-                            wrapper.Proofs[i],
-                            TestObjectInternal.BlobVersionedHashes[i].AsSpan());
-                    }
-                    else
-                    {
-                        TestObjectInternal.BlobVersionedHashes[i]![0] = KzgPolynomialCommitments.KzgBlobHashVersionV1;
-                        wrapper.Commitments[i][0] = (byte)(i % 256);
-                        wrapper.Proofs[i][0] = (byte)(i % 256);
-                    }
+                    KzgPolynomialCommitments.KzgifyBlob(
+                        wrapper.Blobs[i],
+                        wrapper.Commitments[i],
+                        wrapper.Proofs[i],
+                        TestObjectInternal.BlobVersionedHashes[i].AsSpan());
                 }
 
                 TestObjectInternal.NetworkWrapper = wrapper;

src/Nethermind/Nethermind.JsonRpc.Test/Modules/Eth/EthRpcModuleTests.cs

@@ -27,6 +27,7 @@
 using Nethermind.Facade.Eth.RpcTransaction;
 using Nethermind.Facade.Filters;
 using Nethermind.Int256;
+using Nethermind.JsonRpc.Client;
 using Nethermind.Serialization.Json;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Specs;
@@ -104,6 +105,21 @@ public async Task Eth_get_raw_transaction_by_hash_for_typed_transaction()
         Assert.That(serialized, Is.EqualTo("{\"jsonrpc\":\"2.0\",\"result\":\"02f86c0180850165a0bc0085028fa6ae008252089400000000000000000000000000000000000000000180c080a063b08cc0a06c88fb1dd79f273736b3463af12c6754f9df764aa222d2693a5d43a0606b869eab1c9d01ff462f887826cb8f349ea8f1b59d0635ae77155b3b84ad86\",\"id\":67}"), serialized.Replace("\"", "\\\""));
     }
 
+    [Test]
+    public async Task Eth_get_raw_transaction_by_hash_from_pool()
+    {
+        using Context ctx = await Context.CreateWithCancunEnabled();
+        Transaction sent = Build.A.Transaction.WithShardBlobTxTypeAndFields().WithMaxPriorityFeePerGas(6.GWei()).WithMaxFeePerGas(11.GWei()).SignedAndResolved(TestItem.PrivateKeyC).TestObject;
+        ctx.Test.TxPool.SubmitTx(sent, TxHandlingOptions.None);
+
+        string serialized = await ctx.Test.TestEthRpc("eth_getRawTransactionByHash", sent.Hash);
+        byte[]? txBytes = new EthereumJsonSerializer().Deserialize<JsonRpcResponse<byte[]>>(serialized).Result;
+
+        Transaction tx = null!;
+        Assert.DoesNotThrow(() => tx = TxDecoder.Instance.Decode(txBytes, RlpBehaviors.SkipTypedWrapping | RlpBehaviors.InMempoolForm));
+        Assert.That(tx.IsInMempoolForm());
+    }
+
 
     [Test]
     public async Task eth_maxPriorityFeePerGas_test()

src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugRpcModule.cs

@@ -19,6 +19,8 @@
 using Nethermind.JsonRpc.Modules.Eth;
 using Nethermind.Core.Specs;
 using Nethermind.Facade.Eth.RpcTransaction;
+using DotNetty.Buffers;
+using Nethermind.TxPool;
 
 namespace Nethermind.JsonRpc.Modules.DebugModule;
 
@@ -291,15 +293,21 @@ public ResultWrapper<bool> debug_resetHead(Hash256 blockHash)
         return ResultWrapper<bool>.Success(true);
     }
 
-    public ResultWrapper<byte[]> debug_getRawTransaction(Hash256 transactionHash)
+    public ResultWrapper<string?> debug_getRawTransaction(Hash256 transactionHash)
     {
-        var transaction = _debugBridge.GetTransactionFromHash(transactionHash);
+        Transaction? transaction = _debugBridge.GetTransactionFromHash(transactionHash);
         if (transaction is null)
         {
-            return ResultWrapper<byte[]>.Fail($"Transaction {transactionHash} was not found", ErrorCodes.ResourceNotFound);
+            return ResultWrapper<string?>.Fail($"Transaction {transactionHash} was not found", ErrorCodes.ResourceNotFound);
         }
-        var rlp = Rlp.Encode(transaction);
-        return ResultWrapper<byte[]>.Success(rlp.Bytes);
+
+        RlpBehaviors encodingSettings = RlpBehaviors.SkipTypedWrapping | (transaction.IsInMempoolForm() ? RlpBehaviors.InMempoolForm : RlpBehaviors.None);
+
+        IByteBuffer buffer = PooledByteBufferAllocator.Default.Buffer(TxDecoder.Instance.GetLength(transaction, encodingSettings));
+        using NettyRlpStream stream = new(buffer);
+        TxDecoder.Instance.Encode(stream, transaction, encodingSettings);
+
+        return ResultWrapper<string?>.Success(buffer.AsSpan().ToHexString(false));
     }
 
     public ResultWrapper<byte[][]> debug_getRawReceipts(BlockParameter blockParameter)

src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/IDebugRpcModule.cs

@@ -100,7 +100,7 @@ public interface IDebugRpcModule : IRpcModule
     ResultWrapper<byte[]> debug_getRawHeader(BlockParameter blockParameter);
 
     [JsonRpcMethod(Description = "Get Raw Transaction format.")]
-    ResultWrapper<byte[]> debug_getRawTransaction(Hash256 transactionHash);
+    ResultWrapper<string> debug_getRawTransaction(Hash256 transactionHash);
 
     [JsonRpcMethod(Description = "Retrives Nethermind Sync Stage, With extra Metadata")]
     Task<ResultWrapper<SyncReportSymmary>> debug_getSyncStage();

src/Nethermind/Nethermind.JsonRpc/Modules/Eth/EthRpcModule.cs

@@ -406,9 +406,11 @@ public ResultWrapper<BlockForRpc> eth_getBlockByNumber(BlockParameter blockParam
             return ResultWrapper<string?>.Success(null);
         }
 
-        IByteBuffer buffer = PooledByteBufferAllocator.Default.Buffer(TxDecoder.Instance.GetLength(transaction, RlpBehaviors.None));
+        RlpBehaviors encodingSettings = RlpBehaviors.SkipTypedWrapping | (transaction.IsInMempoolForm() ? RlpBehaviors.InMempoolForm : RlpBehaviors.None);
+
+        IByteBuffer buffer = PooledByteBufferAllocator.Default.Buffer(TxDecoder.Instance.GetLength(transaction, encodingSettings));
         using NettyRlpStream stream = new(buffer);
-        TxDecoder.Instance.Encode(stream, transaction, RlpBehaviors.SkipTypedWrapping);
+        TxDecoder.Instance.Encode(stream, transaction, encodingSettings);
 
         return ResultWrapper<string?>.Success(buffer.AsSpan().ToHexString(false));
     }

src/Nethermind/Nethermind.TxPool/TransactionExtensions.cs

@@ -91,5 +91,7 @@ internal static bool IsOverflowWhenAddingTxCostToCumulative(this Transaction tx,
 
         internal static bool IsOverflowInTxCostAndValue(this Transaction tx, out UInt256 txCost)
             => IsOverflowWhenAddingTxCostToCumulative(tx, UInt256.Zero, out txCost);
+
+        public static bool IsInMempoolForm(this Transaction tx) => tx.NetworkWrapper is not null;
     }
 }