Merge branch 'main' into zkbesu

# Conflicts: # besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java # besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java # ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java # ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java # ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java # ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java # ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java
Consensys · Feb 27, 2024 · 9245757 · 9245757
2 parents a6cd693 + 0c8dcfc
commit 9245757
Show file tree

Hide file tree

Showing 23 changed files with 225 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Additions and Improvements
 - Extend `Blockchain` service [#6592](https://github.com/hyperledger/besu/pull/6592)
 - RocksDB database metadata refactoring [#6555](https://github.com/hyperledger/besu/pull/6555)
+- Make layered txpool aware of minGasPrice and minPriorityFeePerGas dynamic options [#6611](https://github.com/hyperledger/besu/pull/6611)
 
 ### Bug fixes
 

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -698,7 +698,8 @@ public BesuController build() {
             syncState,
             transactionPoolConfiguration,
             pluginTransactionValidatorService,
-            besuComponent.map(BesuComponent::getBlobCache).orElse(new BlobCache()));
+            besuComponent.map(BesuComponent::getBlobCache).orElse(new BlobCache()),
+            miningParameters);
 
     final List<PeerValidator> peerValidators = createPeerValidators(protocolSchedule);
 

diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
@@ -34,6 +34,7 @@
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
@@ -167,7 +168,8 @@ public void setUp() {
             syncState,
             txPoolConfig,
             new PluginTransactionValidatorServiceImpl(),
-            new BlobCache());
+            new BlobCache(),
+            MiningParameters.newDefault());
 
     serviceImpl = new BesuEventsImpl(blockchain, blockBroadcaster, transactionPool, syncState);
   }

diff --git a/.../core/src/test/java/org/hyperledger/besu/ethereum/trie/bonsai/AbstractIsolationTests.java b/.../core/src/test/java/org/hyperledger/besu/ethereum/trie/bonsai/AbstractIsolationTests.java
@@ -134,7 +134,8 @@ public abstract class AbstractIsolationTests {
               new EndLayer(txPoolMetrics),
               txPoolMetrics,
               transactionReplacementTester,
-              new BlobCache()));
+              new BlobCache(),
+              MiningParameters.newDefault()));
 
   protected final List<GenesisAllocation> accounts =
       GenesisConfigFile.development()

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java b/.../src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java
@@ -17,6 +17,7 @@
 import static org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration.Implementation.LAYERED;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
@@ -55,7 +56,8 @@ public static TransactionPool createTransactionPool(
       final SyncState syncState,
       final TransactionPoolConfiguration transactionPoolConfiguration,
       final PluginTransactionValidatorService pluginTransactionValidatorService,
-      final BlobCache blobCache) {
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
 
     final TransactionPoolMetrics metrics = new TransactionPoolMetrics(metricsSystem);
 
@@ -78,7 +80,8 @@ public static TransactionPool createTransactionPool(
         transactionsMessageSender,
         newPooledTransactionHashesMessageSender,
         pluginTransactionValidatorService,
-        blobCache);
+        blobCache,
+        miningParameters);
   }
 
   static TransactionPool createTransactionPool(
@@ -93,7 +96,8 @@ static TransactionPool createTransactionPool(
       final TransactionsMessageSender transactionsMessageSender,
       final NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender,
       final PluginTransactionValidatorService pluginTransactionValidatorService,
-      final BlobCache blobCache) {
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
 
     final TransactionPool transactionPool =
         new TransactionPool(
@@ -104,7 +108,8 @@ static TransactionPool createTransactionPool(
                     clock,
                     metrics,
                     transactionPoolConfiguration,
-                    blobCache),
+                    blobCache,
+                    miningParameters),
             protocolSchedule,
             protocolContext,
             new TransactionBroadcaster(
@@ -233,7 +238,8 @@ private static PendingTransactions createPendingTransactions(
       final Clock clock,
       final TransactionPoolMetrics metrics,
       final TransactionPoolConfiguration transactionPoolConfiguration,
-      final BlobCache blobCache) {
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
 
     boolean isFeeMarketImplementBaseFee =
         protocolSchedule.anyMatch(
@@ -246,7 +252,8 @@ private static PendingTransactions createPendingTransactions(
           metrics,
           transactionPoolConfiguration,
           isFeeMarketImplementBaseFee,
-          blobCache);
+          blobCache,
+          miningParameters);
     } else {
       return createPendingTransactionSorter(
           protocolContext,
@@ -284,7 +291,8 @@ private static PendingTransactions createLayeredPendingTransactions(
       final TransactionPoolMetrics metrics,
       final TransactionPoolConfiguration transactionPoolConfiguration,
       final boolean isFeeMarketImplementBaseFee,
-      final BlobCache blobCache) {
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
 
     final TransactionPoolReplacementHandler transactionReplacementHandler =
         new TransactionPoolReplacementHandler(transactionPoolConfiguration.getPriceBump());
@@ -327,15 +335,17 @@ private static PendingTransactions createLayeredPendingTransactions(
               metrics,
               transactionReplacementTester,
               feeMarket,
-              blobCache);
+              blobCache,
+              miningParameters);
     } else {
       pendingTransactionsSorter =
           new GasPricePrioritizedTransactions(
               transactionPoolConfiguration,
               readyTransactions,
               metrics,
               transactionReplacementTester,
-              blobCache);
+              blobCache,
+              miningParameters);
     }
 
     return new LayeredPendingTransactions(transactionPoolConfiguration, pendingTransactionsSorter);

diff --git a/...g/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactions.java b/...g/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactions.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.eth.transactions.layered;
 
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.transactions.BlobCache;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
@@ -36,16 +37,19 @@
  */
 public abstract class AbstractPrioritizedTransactions extends AbstractSequentialTransactionsLayer {
   protected final TreeSet<PendingTransaction> orderByFee;
+  protected final MiningParameters miningParameters;
 
   public AbstractPrioritizedTransactions(
       final TransactionPoolConfiguration poolConfig,
       final TransactionsLayer prioritizedTransactions,
       final TransactionPoolMetrics metrics,
       final BiFunction<PendingTransaction, PendingTransaction, Boolean>
           transactionReplacementTester,
-      final BlobCache blobCache) {
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
     super(poolConfig, prioritizedTransactions, transactionReplacementTester, metrics, blobCache);
     this.orderByFee = new TreeSet<>(this::compareByFee);
+    this.miningParameters = miningParameters;
   }
 
   @Override

diff --git a/...rg/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java b/...rg/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java
@@ -18,6 +18,7 @@
 
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.BlobCache;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
@@ -47,8 +48,10 @@ public BaseFeePrioritizedTransactions(
       final BiFunction<PendingTransaction, PendingTransaction, Boolean>
           transactionReplacementTester,
       final FeeMarket feeMarket,
-      final BlobCache blobCache) {
-    super(poolConfig, nextLayer, metrics, transactionReplacementTester, blobCache);
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
+    super(
+        poolConfig, nextLayer, metrics, transactionReplacementTester, blobCache, miningParameters);
     this.nextBlockBaseFee =
         Optional.of(calculateNextBlockBaseFee(feeMarket, chainHeadHeaderSupplier.get()));
   }
@@ -146,11 +149,34 @@ private Wei calculateNextBlockBaseFee(final FeeMarket feeMarket, final BlockHead
 
   @Override
   protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
-    return nextBlockBaseFee
-        .map(
-            baseFee ->
-                pendingTransaction.getTransaction().getMaxGasPrice().greaterOrEqualThan(baseFee))
-        .orElse(false);
+    // check if the tx is willing to pay at least the base fee
+    if (nextBlockBaseFee
+        .map(pendingTransaction.getTransaction().getMaxGasPrice()::lessThan)
+        .orElse(true)) {
+      return false;
+    }
+
+    // priority txs are promoted even if they pay less
+    if (!pendingTransaction.hasPriority()) {
+      // check if max fee per gas is higher than the min gas price
+      if (pendingTransaction
+          .getTransaction()
+          .getMaxGasPrice()
+          .lessThan(miningParameters.getMinTransactionGasPrice())) {
+        return false;
+      }
+
+      // check if enough priority fee is paid
+      if (!miningParameters.getMinPriorityFeePerGas().equals(Wei.ZERO)) {
+        final Wei priorityFeePerGas =
+            pendingTransaction.getTransaction().getEffectivePriorityFeePerGas(nextBlockBaseFee);
+        if (priorityFeePerGas.lessThan(miningParameters.getMinPriorityFeePerGas())) {
+          return false;
+        }
+      }
+    }
+
+    return true;
   }
 
   @Override

diff --git a/...g/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java b/...g/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java
@@ -17,6 +17,7 @@
 import static java.util.Comparator.comparing;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.transactions.BlobCache;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
@@ -39,8 +40,10 @@ public GasPricePrioritizedTransactions(
       final TransactionPoolMetrics metrics,
       final BiFunction<PendingTransaction, PendingTransaction, Boolean>
           transactionReplacementTester,
-      final BlobCache blobCache) {
-    super(poolConfig, nextLayer, metrics, transactionReplacementTester, blobCache);
+      final BlobCache blobCache,
+      final MiningParameters miningParameters) {
+    super(
+        poolConfig, nextLayer, metrics, transactionReplacementTester, blobCache, miningParameters);
   }
 
   @Override
@@ -58,7 +61,12 @@ protected void internalBlockAdded(final BlockHeader blockHeader, final FeeMarket
 
   @Override
   protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
-    return true;
+    return pendingTransaction.hasPriority()
+        || pendingTransaction
+            .getTransaction()
+            .getGasPrice()
+            .map(miningParameters.getMinTransactionGasPrice()::lessThan)
+            .orElse(false);
   }
 
   @Override

diff --git a/...m/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java b/...m/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java
@@ -36,6 +36,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
@@ -1119,7 +1120,8 @@ public void transactionMessagesGoToTheCorrectExecutor() {
               new SyncState(blockchain, ethManager.ethContext().getEthPeers()),
               TransactionPoolConfiguration.DEFAULT,
               mock(PluginTransactionValidatorService.class),
-              new BlobCache())
+              new BlobCache(),
+              MiningParameters.newDefault())
           .setEnabled();
 
       // Send just a transaction message.

diff --git a/.../java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java b/.../java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java
@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
@@ -138,7 +139,8 @@ public void setupTest() {
             syncState,
             TransactionPoolConfiguration.DEFAULT,
             mock(PluginTransactionValidatorService.class),
-            new BlobCache());
+            new BlobCache(),
+            MiningParameters.newDefault());
     transactionPool.setEnabled();
 
     ethProtocolManager =

diff --git a/...test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionPoolTest.java b/...test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionPoolTest.java
@@ -129,6 +129,7 @@ public abstract class AbstractTransactionPoolTest {
   private static final KeyPair KEY_PAIR2 =
       SignatureAlgorithmFactory.getInstance().generateKeyPair();
   protected static final Wei BASE_FEE_FLOOR = Wei.of(7L);
+  protected static final Wei DEFAULT_MIN_GAS_PRICE = Wei.of(50L);
 
   @Mock(answer = Answers.RETURNS_DEEP_STUBS)
   protected TransactionValidatorFactory transactionValidatorFactory;
@@ -456,6 +457,7 @@ public void shouldNotReAddTransactionsThatAreInBothForksWhenReorgHappens() {
   }
 
   @Test
+  @EnabledIf("isBaseFeeMarket")
   public void shouldReAddBlobTxsWhenReorgHappens() {
     givenTransactionIsValid(transaction0);
     givenTransactionIsValid(transaction1);

diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java
@@ -32,6 +32,7 @@
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -167,7 +168,8 @@ public boolean isMessagePermitted(final EnodeURL destinationEnode, final int cod
             syncState,
             TransactionPoolConfiguration.DEFAULT,
             mock(PluginTransactionValidatorService.class),
-            new BlobCache());
+            new BlobCache(),
+            MiningParameters.newDefault());
 
     final EthProtocolManager ethProtocolManager =
         new EthProtocolManager(

diff --git a/.../test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java b/.../test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java
@@ -32,6 +32,7 @@
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
@@ -252,7 +253,8 @@ private void setupInitialSyncPhase(final boolean hasInitialSyncPhase) {
             transactionsMessageSender,
             newPooledTransactionHashesMessageSender,
             null,
-            new BlobCache());
+            new BlobCache(),
+            MiningParameters.newDefault());
 
     ethProtocolManager =
         new EthProtocolManager(
@@ -360,7 +362,8 @@ private TransactionPool createTransactionPool(
                         .build())
                 .build(),
             mock(PluginTransactionValidatorService.class),
-            new BlobCache());
+            new BlobCache(),
+            MiningParameters.newDefault());
 
     txPool.setEnabled();
     return txPool;