Blob transaction replacement rule (besu-eth#6874)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Author: fab-10

CHANGELOG.md

@@ -34,6 +34,7 @@
 - Experimental Snap Sync Server [#6640](https://github.com/hyperledger/besu/pull/6640)
 - Upgrade Reference Tests to 13.2 [#6854](https://github.com/hyperledger/besu/pull/6854)
 - Update Web3j dependencies [#6811](https://github.com/hyperledger/besu/pull/6811)
+- Add `tx-pool-blob-price-bump` option to configure the price bump percentage required to replace blob transactions (by default 100%) [#6874](https://github.com/hyperledger/besu/pull/6874)
 
 ### Bug fixes
 - Fix txpool dump/restore race condition [#6665](https://github.com/hyperledger/besu/pull/6665)

besu/src/main/java/org/hyperledger/besu/cli/options/TransactionPoolOptions.java

@@ -52,6 +52,7 @@ public class TransactionPoolOptions implements CLIOptions<TransactionPoolConfigu
   private static final String TX_POOL_ENABLE_SAVE_RESTORE = "--tx-pool-enable-save-restore";
   private static final String TX_POOL_SAVE_FILE = "--tx-pool-save-file";
   private static final String TX_POOL_PRICE_BUMP = "--tx-pool-price-bump";
+  private static final String TX_POOL_BLOB_PRICE_BUMP = "--tx-pool-blob-price-bump";
   private static final String RPC_TX_FEECAP = "--rpc-tx-feecap";
   private static final String STRICT_TX_REPLAY_PROTECTION_ENABLED_FLAG =
       "--strict-tx-replay-protection-enabled";
@@ -102,6 +103,15 @@ public class TransactionPoolOptions implements CLIOptions<TransactionPoolConfigu
       arity = "1")
   private Percentage priceBump = TransactionPoolConfiguration.DEFAULT_PRICE_BUMP;
 
+  @CommandLine.Option(
+      names = {TX_POOL_BLOB_PRICE_BUMP},
+      paramLabel = "<Percentage>",
+      converter = PercentageConverter.class,
+      description =
+          "Blob price bump percentage to replace an already existing transaction blob tx (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private Percentage blobPriceBump = TransactionPoolConfiguration.DEFAULT_BLOB_PRICE_BUMP;
+
   @CommandLine.Option(
       names = {RPC_TX_FEECAP},
       description =
@@ -277,6 +287,7 @@ public static TransactionPoolOptions fromConfig(final TransactionPoolConfigurati
     options.saveRestoreEnabled = config.getEnableSaveRestore();
     options.noLocalPriority = config.getNoLocalPriority();
     options.priceBump = config.getPriceBump();
+    options.blobPriceBump = config.getBlobPriceBump();
     options.txFeeCap = config.getTxFeeCap();
     options.saveFile = config.getSaveFile();
     options.strictTxReplayProtectionEnabled = config.getStrictTransactionReplayProtectionEnabled();
@@ -334,6 +345,7 @@ public TransactionPoolConfiguration toDomainObject() {
         .enableSaveRestore(saveRestoreEnabled)
         .noLocalPriority(noLocalPriority)
         .priceBump(priceBump)
+        .blobPriceBump(blobPriceBump)
         .txFeeCap(txFeeCap)
         .saveFile(saveFile)
         .strictTransactionReplayProtectionEnabled(strictTxReplayProtectionEnabled)

besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java

@@ -168,6 +168,31 @@ public void invalidPriceBumpShouldFail() {
         "101");
   }
 
+  @Test
+  public void blobPriceBump() {
+    final Percentage blobPriceBump = Percentage.fromInt(50);
+    internalTestSuccess(
+        config -> assertThat(config.getBlobPriceBump()).isEqualTo(blobPriceBump),
+        "--tx-pool-blob-price-bump",
+        blobPriceBump.toString());
+  }
+
+  @Test
+  public void invalidBlobPriceBumpShouldFail() {
+    internalTestFailure(
+        "Invalid value: 101, should be a number between 0 and 100 inclusive",
+        "--tx-pool-blob-price-bump",
+        "101");
+  }
+
+  @Test
+  public void defaultBlobPriceBump() {
+    internalTestSuccess(
+        config ->
+            assertThat(config.getBlobPriceBump())
+                .isEqualTo(TransactionPoolConfiguration.DEFAULT_BLOB_PRICE_BUMP));
+  }
+
   @Test
   public void txFeeCap() {
     final Wei txFeeCap = Wei.fromEth(2);

besu/src/test/resources/everything_config.toml

@@ -174,6 +174,7 @@ privacy-flexible-groups-enabled=false
 # Transaction Pool
 tx-pool="layered"
 tx-pool-price-bump=13
+tx-pool-blob-price-bump=100
 rpc-tx-feecap=2000000000000000000
 strict-tx-replay-protection-enabled=true
 tx-pool-no-local-priority=false

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/AbstractIsolationTests.java

@@ -116,7 +116,8 @@ public abstract class AbstractIsolationTests {
       ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(100).build();
 
   protected final TransactionPoolReplacementHandler transactionReplacementHandler =
-      new TransactionPoolReplacementHandler(poolConfiguration.getPriceBump());
+      new TransactionPoolReplacementHandler(
+          poolConfiguration.getPriceBump(), poolConfiguration.getBlobPriceBump());
 
   protected final BiFunction<PendingTransaction, PendingTransaction, Boolean>
       transactionReplacementTester =

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java

@@ -64,6 +64,7 @@ enum Implementation {
   int DEFAULT_TX_RETENTION_HOURS = 13;
   boolean DEFAULT_STRICT_TX_REPLAY_PROTECTION_ENABLED = false;
   Percentage DEFAULT_PRICE_BUMP = Percentage.fromInt(10);
+  Percentage DEFAULT_BLOB_PRICE_BUMP = Percentage.fromInt(100);
   Wei DEFAULT_RPC_TX_FEE_CAP = Wei.fromEth(1);
   boolean DEFAULT_NO_LOCAL_PRIORITY = false;
   boolean DEFAULT_ENABLE_SAVE_RESTORE = false;
@@ -102,6 +103,11 @@ default Percentage getPriceBump() {
     return DEFAULT_PRICE_BUMP;
   }
 
+  @Value.Default
+  default Percentage getBlobPriceBump() {
+    return DEFAULT_BLOB_PRICE_BUMP;
+  }
+
   @Value.Default
   default Wei getTxFeeCap() {
     return DEFAULT_RPC_TX_FEE_CAP;

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java

@@ -292,7 +292,9 @@ private static PendingTransactions createLayeredPendingTransactions(
       final MiningParameters miningParameters) {
 
     final TransactionPoolReplacementHandler transactionReplacementHandler =
-        new TransactionPoolReplacementHandler(transactionPoolConfiguration.getPriceBump());
+        new TransactionPoolReplacementHandler(
+            transactionPoolConfiguration.getPriceBump(),
+            transactionPoolConfiguration.getBlobPriceBump());
 
     final BiFunction<PendingTransaction, PendingTransaction, Boolean> transactionReplacementTester =
         (t1, t2) ->

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandler.java

@@ -26,11 +26,12 @@
 public class TransactionPoolReplacementHandler {
   private final List<TransactionPoolReplacementRule> rules;
 
-  public TransactionPoolReplacementHandler(final Percentage priceBump) {
+  public TransactionPoolReplacementHandler(
+      final Percentage priceBump, final Percentage blobPriceBump) {
     this(
         asList(
             new TransactionReplacementByGasPriceRule(priceBump),
-            new TransactionReplacementByFeeMarketRule(priceBump)));
+            new TransactionReplacementByFeeMarketRule(priceBump, blobPriceBump)));
   }
 
   @VisibleForTesting

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByFeeMarketRule.java

@@ -28,9 +28,12 @@ public class TransactionReplacementByFeeMarketRule implements TransactionPoolRep
   private static final TransactionPriceCalculator EIP1559_CALCULATOR =
       TransactionPriceCalculator.eip1559();
   private final Percentage priceBump;
+  private final Percentage blobPriceBump;
 
-  public TransactionReplacementByFeeMarketRule(final Percentage priceBump) {
+  public TransactionReplacementByFeeMarketRule(
+      final Percentage priceBump, final Percentage blobPriceBump) {
     this.priceBump = priceBump;
+    this.blobPriceBump = blobPriceBump;
   }
 
   @Override
@@ -39,6 +42,16 @@ public boolean shouldReplace(
       final PendingTransaction newPendingTransaction,
       final Optional<Wei> maybeBaseFee) {
 
+    return validExecutionPriceReplacement(
+            existingPendingTransaction, newPendingTransaction, maybeBaseFee)
+        && validBlobPriceReplacement(existingPendingTransaction, newPendingTransaction);
+  }
+
+  private boolean validExecutionPriceReplacement(
+      final PendingTransaction existingPendingTransaction,
+      final PendingTransaction newPendingTransaction,
+      final Optional<Wei> maybeBaseFee) {
+
     // bail early if basefee is absent or neither transaction supports 1559 fee market
     if (maybeBaseFee.isEmpty()
         || !(isNotGasPriced(existingPendingTransaction) || isNotGasPriced(newPendingTransaction))) {
@@ -65,6 +78,37 @@ public boolean shouldReplace(
     return false;
   }
 
+  private boolean validBlobPriceReplacement(
+      final PendingTransaction existingPendingTransaction,
+      final PendingTransaction newPendingTransaction) {
+
+    final var existingType = existingPendingTransaction.getTransaction().getType();
+    final var newType = newPendingTransaction.getTransaction().getType();
+
+    if (existingType.supportsBlob() || newType.supportsBlob()) {
+      if (existingType.supportsBlob() && newType.supportsBlob()) {
+        final Wei replacementThreshold =
+            existingPendingTransaction
+                .getTransaction()
+                .getMaxFeePerBlobGas()
+                .orElseThrow()
+                .multiply(100 + blobPriceBump.getValue())
+                .divide(100);
+        return newPendingTransaction
+                .getTransaction()
+                .getMaxFeePerBlobGas()
+                .orElseThrow()
+                .compareTo(replacementThreshold)
+            >= 0;
+      }
+      // blob tx can only replace and be replaced by blob tx
+      return false;
+    }
+
+    // in case no blob tx, then we are fine
+    return true;
+  }
+
   private Wei priceOf(final Transaction transaction, final Optional<Wei> maybeBaseFee) {
     final TransactionPriceCalculator transactionPriceCalculator =
         transaction.getType().supports1559FeeMarket() ? EIP1559_CALCULATOR : FRONTIER_CALCULATOR;

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java

@@ -110,7 +110,8 @@ public AbstractPendingTransactionsSorter(
     this.clock = clock;
     this.chainHeadHeaderSupplier = chainHeadHeaderSupplier;
     this.transactionReplacementHandler =
-        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+        new TransactionPoolReplacementHandler(
+            poolConfig.getPriceBump(), poolConfig.getBlobPriceBump());
     final LabelledMetric<Counter> transactionAddedCounter =
         metricsSystem.createLabelledCounter(
             BesuMetricCategory.TRANSACTION_POOL,