Revert "Add filter for max transaction size (#7925)"

This reverts commit 480f5f6

src/Nethermind/Nethermind.Core/Transaction.cs

@@ -47,10 +47,10 @@ public class Transaction
         public UInt256 MaxPriorityFeePerGas => GasPrice;
         public UInt256 DecodedMaxFeePerGas { get; set; }
         public UInt256 MaxFeePerGas => Supports1559 ? DecodedMaxFeePerGas : GasPrice;
-        public bool SupportsAccessList => Type.SupportsAccessList();
-        public bool Supports1559 => Type.Supports1559();
-        public bool SupportsBlobs => Type.SupportsBlobs();
-        public bool SupportsAuthorizationList => Type.SupportsAuthorizationList();
+        public bool SupportsAccessList => Type >= TxType.AccessList && Type != TxType.DepositTx;
+        public bool Supports1559 => Type >= TxType.EIP1559 && Type != TxType.DepositTx;
+        public bool SupportsBlobs => Type == TxType.Blob && Type != TxType.DepositTx;
+        public bool SupportsAuthorizationList => Type == TxType.SetCode && Type != TxType.DepositTx;
         public long GasLimit { get; set; }
         public Address? To { get; set; }
         public UInt256 Value { get; set; }
@@ -195,9 +195,9 @@ private void ClearPreHashInternal()
         /// <summary>
         /// Encoded transaction length
         /// </summary>
-        public int GetLength(ITransactionSizeCalculator sizeCalculator, bool shouldCountBlobs)
+        public int GetLength(ITransactionSizeCalculator sizeCalculator)
         {
-            return _size ??= sizeCalculator.GetLength(this, shouldCountBlobs);
+            return _size ??= sizeCalculator.GetLength(this);
         }
 
         public string ToShortString()
@@ -334,7 +334,7 @@ public class SystemTransaction : Transaction
     /// <remarks>Created because of cyclic dependencies between Core and Rlp modules</remarks>
     public interface ITransactionSizeCalculator
     {
-        int GetLength(Transaction tx, bool shouldCountBlobs = true);
+        int GetLength(Transaction tx);
     }
 
     /// <summary>

src/Nethermind/Nethermind.Core/TxTypeExtensions.cs

@@ -6,17 +6,7 @@ namespace Nethermind.Core;
 public static class TxTypeExtensions
 {
     public static bool IsTxTypeWithAccessList(this TxType txType)
-        => txType != TxType.Legacy;
-
-    public static bool SupportsAccessList(this TxType txType)
-        => txType >= TxType.AccessList && txType != TxType.DepositTx;
-
-    public static bool Supports1559(this TxType txType)
-        => txType >= TxType.EIP1559 && txType != TxType.DepositTx;
-
-    public static bool SupportsBlobs(this TxType txType)
-        => txType == TxType.Blob && txType != TxType.DepositTx;
-
-    public static bool SupportsAuthorizationList(this TxType txType)
-        => txType == TxType.SetCode && txType != TxType.DepositTx;
+    {
+        return txType != TxType.Legacy;
+    }
 }

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using System.Collections.Generic;
 using System.Net;
 using DotNetty.Buffers;
 using FluentAssertions;
@@ -230,7 +231,7 @@ public void should_divide_GetPooledTransactionsMessage_if_max_message_size_is_ex
             _syncManager,
             RunImmediatelyScheduler.Instance,
             _transactionPool,
-            new PooledTxsRequestor(_transactionPool, new TxPoolConfig() { MaxTxSize = sizeOfOneTx }, _specProvider),
+            new PooledTxsRequestor(_transactionPool, new TxPoolConfig()),
             _gossipPolicy,
             new ForkInfo(_specProvider, _genesisBlock.Header.Hash!),
             LimboLogs.Instance,

src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/PooledTxsRequestor.cs

@@ -71,10 +71,6 @@ public void RequestTransactionsEth68(Action<V66.Messages.GetPooledTransactionsMe
                 int txSize = size;
                 TxType txType = (TxType)type;
 
-                long maxSize = txType.SupportsBlobs() ? _configuredMaxBlobTxSize : _configuredMaxTxSize;
-                if (txSize > maxSize)
-                    continue;
-
                 if (txSize > packetSizeLeft && toRequestCount > 0)
                 {
                     RequestPooledTransactionsEth66(send, hashesToRequest);

src/Nethermind/Nethermind.Precompiles.Benchmark/ModExpBenchmark.cs

@@ -13,12 +13,12 @@ public class ModExpBenchmark : PrecompileBenchmarkBase
         protected override IEnumerable<IPrecompile> Precompiles => new[] { ModExpPrecompile.Instance };
         protected override string InputsDirectory => "modexp";
 
-        [Benchmark]
-        public (ReadOnlyMemory<byte>, bool) BigInt()
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            return ModExpPrecompile.OldRun(Input.Bytes);
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
+//         [Benchmark]
+//         public (ReadOnlyMemory<byte>, bool) BigInt()
+//         {
+// #pragma warning disable CS0618 // Type or member is obsolete
+//             return ModExpPrecompile.OldRun(Input.Bytes);
+// #pragma warning restore CS0618 // Type or member is obsolete
+//         }
     }
 }

src/Nethermind/Nethermind.Runner/Properties/launchSettings.json

@@ -65,7 +65,7 @@
     },
     "Mainnet": {
       "commandName": "Project",
-      "commandLineArgs": "-c mainnet --data-dir .data",
+      "commandLineArgs": "-c mainnet --data-dir C:/praca/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Nethermind/Nethermind.Runner/configs/mainnet.json

@@ -31,9 +31,10 @@
     "Port": 8545,
     "AdditionalRpcUrls": [
       "http://localhost:8551|http;ws|net;eth;subscribe;engine;web3;client"
-    ]
+    ],
+    "JwtSecretFile": "C:/tmp/jwtsecret"
   },
   "Merge": {
     "Enabled": true
   }
-}
+}

src/Nethermind/Nethermind.TxPool.Test/TxBroadcasterTests.cs

@@ -196,7 +196,7 @@ public void should_announce_details_of_full_blob_tx()
         _broadcaster.AddPeer(peer);
         _broadcaster.BroadcastPersistentTxs();
 
-        peer.Received(1).SendNewTransactions(Arg.Is<IEnumerable<Transaction>>(t => t.FirstOrDefault().GetLength(true) == size), false);
+        peer.Received(1).SendNewTransactions(Arg.Is<IEnumerable<Transaction>>(t => t.FirstOrDefault().GetLength() == size), false);
     }
 
     [Test]

src/Nethermind/Nethermind.TxPool.Test/TxPoolTests.Blobs.cs

@@ -42,24 +42,6 @@ public void should_reject_blob_tx_if_blobs_not_supported([Values(true, false)] b
                 : AcceptTxResult.NotSupportedTxType);
         }
 
-        [Test]
-        public void should_reject_blob_tx_if_max_size_is_exceeded([Values(true, false)] bool sizeExceeded, [Values(1, 2, 3, 4, 5, 6)] int numberOfBlobs)
-        {
-            Transaction tx = Build.A.Transaction
-                .WithShardBlobTxTypeAndFields(numberOfBlobs)
-                .WithMaxPriorityFeePerGas(1.GWei())
-                .WithMaxFeePerGas(1.GWei())
-                .SignedAndResolved(_ethereumEcdsa, TestItem.PrivateKeyA).TestObject;
-            EnsureSenderBalance(TestItem.AddressA, UInt256.MaxValue);
-
-            var txPoolConfig = new TxPoolConfig() { MaxBlobTxSize = tx.GetLength(shouldCountBlobs: false) - (sizeExceeded ? 1 : 0) };
-            _txPool = CreatePool(txPoolConfig, GetCancunSpecProvider());
-
-            AcceptTxResult result = _txPool.SubmitTx(tx, TxHandlingOptions.PersistentBroadcast);
-            result.Should().Be(sizeExceeded ? AcceptTxResult.MaxTxSizeExceeded : AcceptTxResult.Accepted);
-            _txPool.GetPendingBlobTransactionsCount().Should().Be(sizeExceeded ? 0 : 1);
-        }
-
         [Test]
         public void blob_pool_size_should_be_correct([Values(true, false)] bool persistentStorageEnabled)
         {

src/Nethermind/Nethermind.TxPool.Test/TxPoolTests.cs

@@ -361,20 +361,6 @@ public void should_ignore_block_gas_limit_exceeded()
             result.Should().Be(AcceptTxResult.GasLimitExceeded);
         }
 
-        [Test]
-        public void should_reject_tx_if_max_size_is_exceeded([Values(true, false)] bool sizeExceeded)
-        {
-            Transaction tx = Build.A.Transaction.SignedAndResolved(_ethereumEcdsa, TestItem.PrivateKeyA).TestObject;
-            EnsureSenderBalance(tx);
-
-            var txPoolConfig = new TxPoolConfig() { MaxTxSize = tx.GetLength() - (sizeExceeded ? 1 : 0) };
-            _txPool = CreatePool(txPoolConfig);
-
-            AcceptTxResult result = _txPool.SubmitTx(tx, TxHandlingOptions.PersistentBroadcast);
-            result.Should().Be(sizeExceeded ? AcceptTxResult.MaxTxSizeExceeded : AcceptTxResult.Accepted);
-            _txPool.GetPendingTransactionsCount().Should().Be(sizeExceeded ? 0 : 1);
-        }
-
         [Test]
         public void should_accept_tx_when_base_fee_is_high()
         {

src/Nethermind/Nethermind.TxPool/AcceptTxResult.cs

@@ -90,11 +90,6 @@ namespace Nethermind.TxPool
         /// </summary>
         public static readonly AcceptTxResult NotSupportedTxType = new(15, nameof(NotSupportedTxType));
 
-        /// <summary>
-        /// Transaction size exceeds configured max size.
-        /// </summary>
-        public static readonly AcceptTxResult MaxTxSizeExceeded = new(16, nameof(MaxTxSizeExceeded));
-
         /// <summary>
         /// The node is syncing and cannot accept transactions at this time.
         /// </summary>

src/Nethermind/Nethermind.TxPool/ITxPoolConfig.cs

@@ -43,14 +43,6 @@ public interface ITxPoolConfig : IConfig
 
     long? GasLimit { get; set; }
 
-    [ConfigItem(DefaultValue = "131072",
-        Description = "The max transaction size allowed, in bytes.")]
-    long? MaxTxSize { get; set; }
-
-    [ConfigItem(DefaultValue = "1048576",
-        Description = "The max blob transaction size allowed, excluding blobs, in bytes.")]
-    long? MaxBlobTxSize { get; set; }
-
     [ConfigItem(DefaultValue = "null",
         Description = "The current transaction pool state reporting interval, in minutes.")]
     int? ReportMinutes { get; set; }

src/Nethermind/Nethermind.TxPool/NetworkTransactionSizeCalculator.cs

@@ -15,10 +15,8 @@ public NetworkTransactionSizeCalculator(TxDecoder txDecoder)
         _txDecoder = txDecoder;
     }
 
-    public int GetLength(Transaction tx, bool shouldCountBlobs)
+    public int GetLength(Transaction tx)
     {
-        return shouldCountBlobs
-            ? _txDecoder.GetLength(tx, RlpBehaviors.InMempoolForm | RlpBehaviors.SkipTypedWrapping)
-            : _txDecoder.GetLength(tx, RlpBehaviors.SkipTypedWrapping);
+        return _txDecoder.GetLength(tx, RlpBehaviors.InMempoolForm | RlpBehaviors.SkipTypedWrapping);
     }
 }

src/Nethermind/Nethermind.TxPool/TransactionExtensions.cs

@@ -16,9 +16,9 @@ public static class TransactionExtensions
         private static readonly long MaxSizeOfTxForBroadcast = 4.KiB(); //4KB, as in Geth https://github.com/ethereum/go-ethereum/pull/27618
         private static readonly ITransactionSizeCalculator _transactionSizeCalculator = new NetworkTransactionSizeCalculator(TxDecoder.Instance);
 
-        public static int GetLength(this Transaction tx, bool shouldCountBlobs = true)
+        public static int GetLength(this Transaction tx)
         {
-            return tx.GetLength(_transactionSizeCalculator, shouldCountBlobs);
+            return tx.GetLength(_transactionSizeCalculator);
         }
 
         public static bool CanPayBaseFee(this Transaction tx, UInt256 currentBaseFee) => tx.MaxFeePerGas >= currentBaseFee;

src/Nethermind/Nethermind.TxPool/TxPool.cs

@@ -127,7 +127,6 @@ public TxPool(IEthereumEcdsa ecdsa,
             _preHashFilters =
             [
                 new NotSupportedTxFilter(txPoolConfig, _logger),
-                new SizeTxFilter(txPoolConfig, _logger),
                 new GasLimitTxFilter(_headInfo, txPoolConfig, _logger),
                 new PriorityFeeTooLowFilter(_logger),
                 new FeeTooLowFilter(_headInfo, _transactions, _blobTransactions, thereIsPriorityContract, _logger),

src/Nethermind/Nethermind.TxPool/TxPoolConfig.cs

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using Nethermind.Core.Extensions;
-
 namespace Nethermind.TxPool
 {
     public class TxPoolConfig : ITxPoolConfig
@@ -20,8 +18,6 @@ public class TxPoolConfig : ITxPoolConfig
         public int MaxPendingBlobTxsPerSender { get; set; } = 16;
         public int HashCacheSize { get; set; } = 512 * 1024;
         public long? GasLimit { get; set; } = null;
-        public long? MaxTxSize { get; set; } = 128.KiB();
-        public long? MaxBlobTxSize { get; set; } = 1.MiB();
         public int? ReportMinutes { get; set; } = null;
     }
 }