Refactor TxDecoder

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

@@ -171,7 +171,6 @@ public bool Before_eip_2930_has_to_be_legacy_tx(TxType txType, bool eip2930)
     [TestCase(TxType.AccessList, true, false, ExpectedResult = true)]
     [TestCase(TxType.EIP1559, true, false, ExpectedResult = false)]
     [TestCase(TxType.EIP1559, true, true, ExpectedResult = true)]
-    [TestCase((TxType)100, true, false, ExpectedResult = false)]
     public bool Before_eip_1559_has_to_be_legacy_or_access_list_tx(TxType txType, bool eip2930, bool eip1559)
     {
         byte[] sigData = new byte[65];
@@ -184,7 +183,7 @@ public bool Before_eip_1559_has_to_be_legacy_or_access_list_tx(TxType txType, bo
             .WithChainId(TestBlockchainIds.ChainId)
             .WithMaxPriorityFeePerGas(txType == TxType.EIP1559 ? 10.GWei() : 5.GWei())
             .WithMaxFeePerGas(txType == TxType.EIP1559 ? 10.GWei() : 5.GWei())
-            .WithAccessList(txType == TxType.AccessList || txType == TxType.EIP1559
+            .WithAccessList(txType is TxType.AccessList or TxType.EIP1559
                 ? AccessList.Empty
                 : null)
             .WithSignature(signature).TestObject;

src/Nethermind/Nethermind.Core.Test/Encoding/ShardBlobTxDecoderTests.cs

@@ -18,7 +18,7 @@ namespace Nethermind.Core.Test.Encoding;
 [TestFixture]
 public partial class ShardBlobTxDecoderTests
 {
-    private readonly TxDecoder _txDecoder = new();
+    private readonly TxDecoder _txDecoder = TxDecoder.Instance;
 
     [SetUp]
     public static Task SetUp() => KzgPolynomialCommitments.InitializeAsync();

src/Nethermind/Nethermind.Core.Test/Encoding/TxDecoderTests.cs

@@ -22,7 +22,7 @@ namespace Nethermind.Core.Test.Encoding
     [TestFixture]
     public class TxDecoderTests
     {
-        private readonly TxDecoder _txDecoder = new();
+        private readonly TxDecoder _txDecoder = TxDecoder.Instance;
 
         public static IEnumerable<(TransactionBuilder<Transaction>, string)> TestObjectsSource()
         {
@@ -72,12 +72,11 @@ public void CanCorrectlyCalculateTxHash_when_called_concurrently((Transaction Tx
         {
             Transaction tx = testCase.Tx;
 
-            TxDecoder decoder = new TxDecoder();
-            Rlp rlp = decoder.Encode(tx);
+            Rlp rlp = _txDecoder.Encode(tx);
 
             Hash256 expectedHash = Keccak.Compute(rlp.Bytes);
 
-            Transaction decodedTx = decoder.Decode(new RlpStream(rlp.Bytes))!;
+            Transaction decodedTx = _txDecoder.Decode(new RlpStream(rlp.Bytes))!;
 
             decodedTx.SetPreHash(rlp.Bytes);
 

src/Nethermind/Nethermind.Core/Transaction.cs

@@ -19,6 +19,7 @@ namespace Nethermind.Core
     [DebuggerDisplay("{Hash}, Value: {Value}, To: {To}, Gas: {GasLimit}")]
     public class Transaction
     {
+        public const byte MaxTxType = 0x7F;
         public const int BaseTxGasCost = 21000;
 
         public ulong? ChainId { get; set; }

src/Nethermind/Nethermind.Core/TxType.cs

@@ -9,7 +9,6 @@ public enum TxType : byte
         AccessList = 1,
         EIP1559 = 2,
         Blob = 3,
-
-        DepositTx = 0x7E,
+        DepositTx = 0x7E
     }
 }

src/Nethermind/Nethermind.Crypto/TransactionExtensions.cs

@@ -9,7 +9,7 @@ namespace Nethermind.Crypto
 {
     public static class TransactionExtensions
     {
-        private static readonly TxDecoder _txDecoder = new();
+        private static readonly TxDecoder _txDecoder = TxDecoder.Instance;
 
         public static Hash256 CalculateHash(this Transaction transaction)
         {

src/Nethermind/Nethermind.JsonRpc/Modules/Trace/TraceRpcModule.cs

@@ -38,7 +38,7 @@ public class TraceRpcModule : ITraceRpcModule
         private readonly IReceiptFinder _receiptFinder;
         private readonly ITracer _tracer;
         private readonly IBlockFinder _blockFinder;
-        private readonly TxDecoder _txDecoder = new();
+        private readonly TxDecoder _txDecoder = TxDecoder.Instance;
         private readonly IJsonRpcConfig _jsonRpcConfig;
         private readonly TimeSpan _cancellationTokenTimeout;
         private readonly IStateReader _stateReader;

src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V3.cs

@@ -146,9 +146,8 @@ public virtual async Task NewPayloadV3_should_decline_mempool_encoding(bool inMe
 
         ExecutionPayloadV3 payload = (await rpcModule.engine_getPayloadV3(Bytes.FromHexString(payloadId!))).Data!.ExecutionPayload;
 
-        TxDecoder rlpEncoder = new();
         RlpBehaviors rlpBehaviors = (inMempoolForm ? RlpBehaviors.InMempoolForm : RlpBehaviors.None) | RlpBehaviors.SkipTypedWrapping;
-        payload.Transactions = transactions.Select(tx => rlpEncoder.Encode(tx, rlpBehaviors).Bytes).ToArray();
+        payload.Transactions = transactions.Select(tx => TxDecoder.Instance.Encode(tx, rlpBehaviors).Bytes).ToArray();
         byte[]?[] blobVersionedHashes = transactions.SelectMany(tx => tx.BlobVersionedHashes ?? Array.Empty<byte[]>()).ToArray();
 
         ResultWrapper<PayloadStatusV1> result = await rpcModule.engine_newPayloadV3(payload, blobVersionedHashes, payload.ParentBeaconBlockRoot);
@@ -217,6 +216,26 @@ public async Task NewPayloadV3_WrongStateRoot_CorrectErrorIsReturnedAfterProcess
         Assert.That(result.Data.ValidationError, Does.StartWith("InvalidStateRoot"));
     }
 
+    [Test]
+    public async Task NewPayloadV3_UnsupportedTxType_BlockIsRejectedWithCorrectErrorMessage()
+    {
+        (IEngineRpcModule prevRpcModule, string? payloadId, Transaction[] transactions, _) = await BuildAndGetPayloadV3Result(Cancun.Instance, 1);
+        ExecutionPayloadV3 payload = (await prevRpcModule.engine_getPayloadV3(Bytes.FromHexString(payloadId!))).Data!.ExecutionPayload;
+
+        payload.TryGetBlock(out Block? b);
+        byte[] txRlp = TxDecoder.Instance.EncodeTx(payload.GetTransactions()[0], RlpBehaviors.SkipTypedWrapping).Bytes;
+        txRlp[0] = 100; // set TxType to 100
+        payload.Transactions = [txRlp];
+        payload.BlockHash = b!.CalculateHash();
+
+        byte[]?[] blobVersionedHashes = transactions.SelectMany(tx => tx.BlobVersionedHashes ?? []).ToArray();
+        ResultWrapper<PayloadStatusV1> result = await prevRpcModule.engine_newPayloadV3(payload, blobVersionedHashes, payload.ParentBeaconBlockRoot);
+
+        Assert.That(result.ErrorCode, Is.EqualTo(ErrorCodes.None));
+        result.Data.Status.Should().Be("INVALID");
+        Assert.That(result.Data.ValidationError, Does.StartWith("Transaction 0 is not valid"));
+    }
+
     [Test]
     public async Task NewPayloadV3_should_decline_null_blobversionedhashes()
     {

src/Nethermind/Nethermind.Merge.Plugin/Data/ExecutionPayload.cs

@@ -123,8 +123,8 @@ public virtual bool TryGetBlock(out Block? block, UInt256? totalDifficulty = nul
     {
         try
         {
-            var transactions = GetTransactions();
-            var header = new BlockHeader(
+            Transaction[] transactions = GetTransactions();
+            BlockHeader header = new(
                 ParentHash,
                 Keccak.OfAnEmptySequenceRlp,
                 FeeRecipient,

src/Nethermind/Nethermind.Network.Test/P2P/Subprotocols/Eth/V68/Eth68ProtocolHandlerTests.cs

@@ -279,7 +279,7 @@ private void HandleZeroMessage<T>(T msg, byte messageCode) where T : MessageBase
 
     private void GenerateLists(int txCount, out ArrayPoolList<byte> types, out ArrayPoolList<int> sizes, out ArrayPoolList<Hash256> hashes)
     {
-        TxDecoder txDecoder = new();
+        TxDecoder txDecoder = TxDecoder.Instance;
         types = new(txCount);
         sizes = new(txCount);
         hashes = new(txCount);

src/Nethermind/Nethermind.Network/P2P/ProtocolHandlers/SyncPeerProtocolHandlerBase.cs

@@ -87,7 +87,7 @@ protected SyncPeerProtocolHandlerBase(ISession session,
             SyncServer = syncServer ?? throw new ArgumentNullException(nameof(syncServer));
             BackgroundTaskScheduler = new BackgroundTaskSchedulerWrapper(this, backgroundTaskScheduler ?? throw new ArgumentNullException(nameof(BackgroundTaskScheduler)));
             _timestamper = Timestamper.Default;
-            _txDecoder = new TxDecoder();
+            _txDecoder = TxDecoder.Instance;
             _headersRequests = new MessageQueue<GetBlockHeadersMessage, IOwnedReadOnlyList<BlockHeader>>(Send);
             _bodiesRequests = new MessageQueue<GetBlockBodiesMessage, (OwnedBlockBodies, long)>(Send);
 

src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/V62/Messages/BlockBodiesMessageSerializer.cs

@@ -55,7 +55,7 @@ public BlockBodiesMessage Deserialize(IByteBuffer byteBuffer)
 
         private class BlockBodyDecoder : IRlpValueDecoder<BlockBody>
         {
-            private readonly TxDecoder _txDecoder = new();
+            private readonly TxDecoder _txDecoder = TxDecoder.Instance;
             private readonly HeaderDecoder _headerDecoder = new();
             private readonly WithdrawalDecoder _withdrawalDecoderDecoder = new();
 

src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/V62/Messages/TransactionsMessageSerializer.cs

@@ -10,7 +10,7 @@ namespace Nethermind.Network.P2P.Subprotocols.Eth.V62.Messages
 {
     public class TransactionsMessageSerializer : IZeroInnerMessageSerializer<TransactionsMessage>
     {
-        private readonly TxDecoder _decoder = new();
+        private readonly TxDecoder _decoder = TxDecoder.Instance;
 
         public void Serialize(IByteBuffer byteBuffer, TransactionsMessage message)
         {

src/Nethermind/Nethermind.Serialization.Rlp/BlockDecoder.cs

@@ -11,7 +11,7 @@ namespace Nethermind.Serialization.Rlp
     public class BlockDecoder : IRlpValueDecoder<Block>, IRlpStreamDecoder<Block>
     {
         private readonly HeaderDecoder _headerDecoder = new();
-        private readonly TxDecoder _txDecoder = new();
+        private readonly TxDecoder _txDecoder = TxDecoder.Instance;
         private readonly WithdrawalDecoder _withdrawalDecoder = new();
 
         public Block? Decode(RlpStream rlpStream, RlpBehaviors rlpBehaviors = RlpBehaviors.None)

src/Nethermind/Nethermind.Serialization.Rlp/Eip2930/AccessListDecoder.cs

@@ -13,6 +13,8 @@ public class AccessListDecoder : IRlpStreamDecoder<AccessList?>, IRlpValueDecode
     {
         private const int IndexLength = 32;
 
+        public static readonly AccessListDecoder Instance = new();
+
         /// <summary>
         /// We pay a high code quality tax for the performance optimization on RLP.
         /// Adding more RLP decoders is costly (time wise) but the path taken saves a lot of allocations and GC.

src/Nethermind/Nethermind.Serialization.Rlp/MyTxDecoder/AccessListTxDecoder.cs

@@ -0,0 +1,75 @@
+// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using Nethermind.Core;
+using Nethermind.Serialization.Rlp.Eip2930;
+
+namespace Nethermind.Serialization.Rlp.TxDecoders;
+
+public class BaseAccessListTxDecoder<T>(TxType txType, Func<T>? transactionFactory = null)
+    : BaseTxDecoder<T>(txType, transactionFactory) where T : Transaction, new()
+{
+    public override void Encode(Transaction transaction, RlpStream stream, RlpBehaviors rlpBehaviors = RlpBehaviors.None,
+        bool forSigning = false, bool isEip155Enabled = false, ulong chainId = 0)
+    {
+        int contentLength = GetContentLength(transaction, rlpBehaviors, forSigning);
+        int sequenceLength = Rlp.LengthOfSequence(contentLength);
+
+        if ((rlpBehaviors & RlpBehaviors.SkipTypedWrapping) == 0)
+        {
+            stream.StartByteArray(sequenceLength + 1, false);
+        }
+
+        stream.WriteByte((byte)Type);
+        EncodeTypedWrapped(transaction, stream, rlpBehaviors, forSigning, contentLength);
+    }
+
+    protected virtual void EncodeTypedWrapped(Transaction transaction, RlpStream stream, RlpBehaviors rlpBehaviors, bool forSigning, int contentLength)
+    {
+        stream.StartSequence(contentLength);
+        EncodePayload(transaction, stream, rlpBehaviors);
+        EncodeSignature(transaction.Signature, stream, forSigning);
+    }
+
+    public override int GetLength(Transaction transaction, RlpBehaviors rlpBehaviors, bool forSigning = false, bool isEip155Enabled = false,
+        ulong chainId = 0)
+    {
+        int txPayloadLength = base.GetLength(transaction, rlpBehaviors, forSigning, isEip155Enabled, chainId);
+        return rlpBehaviors.HasFlag(RlpBehaviors.SkipTypedWrapping)
+            ? 1 + txPayloadLength
+            : Rlp.LengthOfSequence(1 + txPayloadLength);
+    }
+
+    protected override void DecodePayload(Transaction transaction, RlpStream rlpStream, RlpBehaviors rlpBehaviors = RlpBehaviors.None)
+    {
+        transaction.ChainId = rlpStream.DecodeULong();
+        base.DecodePayload(transaction, rlpStream, rlpBehaviors);
+        transaction.AccessList = AccessListDecoder.Instance.Decode(rlpStream, rlpBehaviors);
+    }
+
+    protected override void DecodePayload(Transaction transaction, ref Rlp.ValueDecoderContext decoderContext,
+        RlpBehaviors rlpBehaviors = RlpBehaviors.None)
+    {
+        transaction.ChainId = decoderContext.DecodeULong();
+        base.DecodePayload(transaction, ref decoderContext, rlpBehaviors);
+        transaction.AccessList = AccessListDecoder.Instance.Decode(ref decoderContext, rlpBehaviors);
+    }
+
+    protected override void EncodePayload(Transaction transaction, RlpStream stream, RlpBehaviors rlpBehaviors = RlpBehaviors.None)
+    {
+        stream.Encode(transaction.ChainId ?? 0);
+        base.EncodePayload(transaction, stream, rlpBehaviors);
+        AccessListDecoder.Instance.Encode(stream, transaction.AccessList, rlpBehaviors);
+    }
+
+    protected override int GetPayloadLength(Transaction transaction)
+    {
+        return base.GetPayloadLength(transaction)
+               + Rlp.LengthOf(transaction.ChainId ?? 0)
+               + AccessListDecoder.Instance.GetLength(transaction.AccessList, RlpBehaviors.None);
+    }
+}
+
+public sealed class AccessListTxDecoder<T>(Func<T>? transactionFactory = null) : BaseAccessListTxDecoder<T>(TxType.AccessList, transactionFactory) where T : Transaction, new();
+