Improve eth/66 support

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -21,6 +21,7 @@
 import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATED_AND_USELESS_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
 import static org.hyperledger.besu.config.experimental.MergeConfigOptions.isMergeEnabled;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
@@ -1117,10 +1118,10 @@ static class JsonRPCWebsocketOptionGroup {
       names = {"--tx-pool-hashes-max-size"},
       paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
       description =
-          "Maximum number of pending transaction hashes that will be kept in the transaction pool (default: ${DEFAULT-VALUE})",
+          "Deprecated, has not effect. Maximum number of pending transaction hashes that will be kept in the transaction pool",
       arity = "1")
-  private final Integer pooledTransactionHashesSize =
-      TransactionPoolConfiguration.MAX_PENDING_TRANSACTIONS_HASHES;
+  @SuppressWarnings("unused")
+  private final Integer pooledTransactionHashesSize = null; // NOSONAR
 
   @Option(
       names = {"--tx-pool-retention-hours"},
@@ -1826,6 +1827,10 @@ private void issueOptionWarnings() {
           "--privacy-onchain-groups-enabled",
           "--privacy-flexible-groups-enabled");
     }
+
+    if (pooledTransactionHashesSize != null) { // NOSONAR
+      logger.warn(DEPRECATED_AND_USELESS_WARNING_MSG, "--tx-pool-hashes-max-size");
+    }
   }
 
   private void configure() throws Exception {
@@ -2651,7 +2656,6 @@ private TransactionPoolConfiguration buildTransactionPoolConfiguration() {
     return unstableTransactionPoolOptions
         .toDomainObject()
         .txPoolMaxSize(txPoolMaxSize)
-        .pooledTransactionHashesSize(pooledTransactionHashesSize)
         .pendingTxRetentionPeriod(pendingTxRetentionPeriod)
         .priceBump(Percentage.fromInt(priceBump))
         .txFeeCap(txFeeCap)

besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java

@@ -29,6 +29,8 @@ public class CommandLineUtils {
   public static final String MULTI_DEPENDENCY_WARNING_MSG =
       "{} ignored because none of {} was defined.";
   public static final String DEPRECATION_WARNING_MSG = "{} has been deprecated, use {} instead.";
+  public static final String DEPRECATED_AND_USELESS_WARNING_MSG =
+      "{} has been deprecated and is now useless, remove it.";
 
   /**
    * Check if options are passed that require an option to be true to have any effect and log a

besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java

@@ -26,6 +26,7 @@
 import static org.hyperledger.besu.cli.config.NetworkName.RINKEBY;
 import static org.hyperledger.besu.cli.config.NetworkName.ROPSTEN;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATED_AND_USELESS_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ENGINE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
@@ -3884,6 +3885,13 @@ public void onchainPrivacyGroupEnabledOptionIsDeprecated() {
             "--privacy-flexible-groups-enabled");
   }
 
+  @Test
+  public void txPoolHashesMaxSizeOptionIsDeprecated() {
+    parseCommand("--tx-pool-hashes-max-size", "1024");
+
+    verify(mockLogger).warn(DEPRECATED_AND_USELESS_WARNING_MSG, "--tx-pool-hashes-max-size");
+  }
+
   @Test
   public void flexiblePrivacyGroupEnabledFlagValueIsSet() {
     parseCommand(

consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java

@@ -133,7 +133,6 @@ public void proposerAddressCanBeExtractFromAConstructedBlock() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 blockchain::getChainHeadHeader,
@@ -169,7 +168,6 @@ public void insertsValidVoteIntoConstructedBlock() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 blockchain::getChainHeadHeader,
@@ -207,7 +205,6 @@ public void insertsNoVoteWhenAtEpoch() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 5,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 blockchain::getChainHeadHeader,

consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java

@@ -96,7 +96,6 @@ public void extraDataCreatedOnEpochBlocksContainsValidators() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 CliqueMinerExecutorTest::mockBlockHeader,
@@ -141,7 +140,6 @@ public void extraDataForNonEpochBlocksDoesNotContainValidaors() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 CliqueMinerExecutorTest::mockBlockHeader,
@@ -186,7 +184,6 @@ public void shouldUseLatestVanityData() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 CliqueMinerExecutorTest::mockBlockHeader,

consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java

@@ -334,7 +334,6 @@ private static ControllerAndState createControllerAndFinalState(
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            1,
             clock,
             metricsSystem,
             blockChain::getChainHeadHeader,

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/BftBlockCreatorTest.java

@@ -118,7 +118,6 @@ public BlockHeaderValidator.Builder createBlockHeaderRuleset(
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             blockchain::getChainHeadHeader,

consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/BftBlockCreatorTest.java

@@ -107,7 +107,6 @@ public void headerProducedPassesValidationRules() {
             new GasPricePendingTransactionsSorter(
                 TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
                 1,
-                5,
                 TestClock.fixed(),
                 metricsSystem,
                 blockchain::getChainHeadHeader,

consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java

@@ -439,7 +439,6 @@ private static ControllerAndState createControllerAndFinalState(
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            1,
             clock,
             metricsSystem,
             blockChain::getChainHeadHeader,

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java

@@ -49,10 +49,8 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerPendingTransactionTracker;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionBroadcaster;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
@@ -75,8 +73,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthGetFilterChangesIntegrationTest {
 
-  @Mock private TransactionBatchAddedListener batchAddedListener;
-  @Mock private TransactionBatchAddedListener pendingBatchAddedListener;
+  @Mock private TransactionBroadcaster batchAddedListener;
   private MutableBlockchain blockchain;
   private final String ETH_METHOD = "eth_getFilterChanges";
   private final String JSON_RPC_VERSION = "2.0";
@@ -86,7 +83,6 @@ public class EthGetFilterChangesIntegrationTest {
   private GasPricePendingTransactionsSorter transactions;
 
   private static final int MAX_TRANSACTIONS = 5;
-  private static final int MAX_HASHES = 5;
   private static final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final Transaction transaction = createTransaction(1);
   private FilterManager filterManager;
@@ -101,16 +97,12 @@ public void setUp() {
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             MAX_TRANSACTIONS,
-            MAX_HASHES,
             TestClock.fixed(),
             metricsSystem,
             blockchain::getChainHeadHeader,
             TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
     final ProtocolContext protocolContext = executionContext.getProtocolContext();
 
-    PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
-    PeerPendingTransactionTracker peerPendingTransactionTracker =
-        mock(PeerPendingTransactionTracker.class);
     EthContext ethContext = mock(EthContext.class);
     EthPeers ethPeers = mock(EthPeers.class);
     when(ethContext.getEthPeers()).thenReturn(ethPeers);
@@ -121,11 +113,8 @@ public void setUp() {
             executionContext.getProtocolSchedule(),
             protocolContext,
             batchAddedListener,
-            pendingBatchAddedListener,
             syncState,
             ethContext,
-            peerTransactionTracker,
-            peerPendingTransactionTracker,
             new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
             metricsSystem,
             TransactionPoolConfiguration.DEFAULT);

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java

@@ -49,10 +49,8 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerPendingTransactionTracker;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionBroadcaster;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
@@ -75,8 +73,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthGetFilterChangesIntegrationTest {
 
-  @Mock private TransactionBatchAddedListener batchAddedListener;
-  @Mock private TransactionBatchAddedListener pendingBatchAddedListener;
+  @Mock private TransactionBroadcaster batchAddedListener;
   private MutableBlockchain blockchain;
   private final String ETH_METHOD = "eth_getFilterChanges";
   private final String JSON_RPC_VERSION = "2.0";
@@ -86,7 +83,6 @@ public class EthGetFilterChangesIntegrationTest {
   private BaseFeePendingTransactionsSorter transactions;
 
   private static final int MAX_TRANSACTIONS = 5;
-  private static final int MAX_HASHES = 5;
   private static final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final Transaction transaction = createTransaction(1);
   private FilterManager filterManager;
@@ -101,16 +97,12 @@ public void setUp() {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             MAX_TRANSACTIONS,
-            MAX_HASHES,
             TestClock.fixed(),
             metricsSystem,
             blockchain::getChainHeadHeader,
             TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
     final ProtocolContext protocolContext = executionContext.getProtocolContext();
 
-    PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
-    PeerPendingTransactionTracker peerPendingTransactionTracker =
-        mock(PeerPendingTransactionTracker.class);
     EthContext ethContext = mock(EthContext.class);
     EthPeers ethPeers = mock(EthPeers.class);
     when(ethContext.getEthPeers()).thenReturn(ethPeers);
@@ -121,11 +113,8 @@ public void setUp() {
             executionContext.getProtocolSchedule(),
             protocolContext,
             batchAddedListener,
-            pendingBatchAddedListener,
             syncState,
             ethContext,
-            peerTransactionTracker,
-            peerPendingTransactionTracker,
             new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
             metricsSystem,
             TransactionPoolConfiguration.DEFAULT);

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java

@@ -84,7 +84,6 @@ public class BlockTransactionSelectorTest {
       new GasPricePendingTransactionsSorter(
           TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
           5,
-          5,
           TestClock.fixed(),
           metricsSystem,
           BlockTransactionSelectorTest::mockBlockHeader,
@@ -337,7 +336,6 @@ public void useSingleGasSpaceForAllTransactions() {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             5,
-            5,
             TestClock.fixed(),
             metricsSystem,
             () -> {

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreatorTest.java

@@ -96,7 +96,6 @@ public void createMainnetBlock1() throws IOException {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
@@ -158,7 +157,6 @@ public void createMainnetBlock1_fixedDifficulty1() {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
@@ -215,7 +213,6 @@ public void rewardBeneficiary_zeroReward_skipZeroRewardsFalse() {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
@@ -288,7 +285,6 @@ public void rewardBeneficiary_zeroReward_skipZeroRewardsTrue() {
         new BaseFeePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutorTest.java

@@ -45,7 +45,6 @@ public void startingMiningWithoutCoinbaseThrowsException() {
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             PoWMinerExecutorTest::mockBlockHeader,
@@ -75,7 +74,6 @@ public void settingCoinbaseToNullThrowsException() {
         new GasPricePendingTransactionsSorter(
             TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
             1,
-            5,
             TestClock.fixed(),
             metricsSystem,
             PoWMinerExecutorTest::mockBlockHeader,

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java

@@ -38,9 +38,11 @@
 
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -680,6 +682,17 @@ public boolean isGoQuorumPrivateTransaction(final boolean goQuorumCompatibilityM
     return GoQuorumPrivateTransactionDetector.isGoQuorumPrivateTransactionV(v.get());
   }
 
+  /**
+   * Return the list of transaction hashes extracted from the collection of Transaction passed as
+   * argument
+   *
+   * @param transactions a collection of transactions
+   * @return the list of transaction hashes
+   */
+  public static List<Hash> toHashList(final Collection<Transaction> transactions) {
+    return transactions.stream().map(Transaction::getHash).collect(Collectors.toUnmodifiableList());
+  }
+
   private static Bytes32 computeSenderRecoveryHash(
       final TransactionType transactionType,
       final long nonce,

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java

@@ -495,6 +495,11 @@ public Bytes nodeId() {
     return connection.getPeerInfo().getNodeId();
   }
 
+  public boolean hasSupportForMessage(final int messageCode) {
+    return getAgreedCapabilities().stream()
+        .anyMatch(cap -> EthProtocol.get().isValidMessageCode(cap.getVersion(), messageCode));
+  }
+
   @Override
   public String toString() {
     return String.format("Peer %s...", nodeId().toString().substring(0, 20));

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java

@@ -18,7 +18,7 @@
 
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionsMessageProcessor;
+import org.hyperledger.besu.ethereum.eth.transactions.NewPooledTransactionHashesMessageProcessor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,11 +33,11 @@ public class BufferedGetPooledTransactionsFromPeerFetcher {
   private static final int MAX_HASHES = 256;
 
   private final EthPeer peer;
-  private final PendingTransactionsMessageProcessor processor;
+  private final NewPooledTransactionHashesMessageProcessor processor;
   private final Queue<Hash> txAnnounces;
 
   public BufferedGetPooledTransactionsFromPeerFetcher(
-      final EthPeer peer, final PendingTransactionsMessageProcessor processor) {
+      final EthPeer peer, final NewPooledTransactionHashesMessageProcessor processor) {
     this.peer = peer;
     this.processor = processor;
     this.txAnnounces = Queues.synchronizedQueue(EvictingQueue.create(MAX_PENDING_TRANSACTIONS));