Update with latest Besu changes

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

gradle.properties

@@ -1,5 +1,5 @@
 releaseVersion=1.2.0-rc3.2
-besuVersion=25.1-delivery45
+besuVersion=25.2-bundles
 arithmetizationVersion=beta-v1.2.0-rc3
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=linea-sequencer

sequencer/src/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorFactory.java

@@ -25,6 +25,7 @@
 import net.consensys.linea.metrics.HistogramMetrics;
 import net.consensys.linea.plugins.config.LineaL1L2BridgeSharedConfiguration;
 import net.consensys.linea.sequencer.txselection.selectors.LineaTransactionSelector;
+import org.hyperledger.besu.plugin.data.ProcessableBlockHeader;
 import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.txselection.BlockTransactionSelectionService;
 import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelector;
@@ -80,17 +81,7 @@ public PluginTransactionSelector create(final SelectorsStateManager selectorsSta
   }
 
   @Override
-  public void selectPendingTransactions(final BlockTransactionSelectionService blockTransactionSelectionService) {
-    final var bundles = privateTxPool.getBundles();
-
-    for(final var bundle: bundles) {
-      for(final var pendingTx: bundle) {
-        if(! blockTransactionSelectionService.evaluatePendingTransaction(pendingTx)) {
-          blockTransactionSelectionService.rollback();
-          break;
-        }
-      }
-      blockTransactionSelectionService.commit();
-    }
-  }
+  public void selectPendingTransactions(
+      final BlockTransactionSelectionService blockTransactionSelectionService,
+      final ProcessableBlockHeader pendingBlockHeader) {}
 }

sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataTransactionSelector.java

@@ -22,7 +22,7 @@
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.plugin.data.TransactionProcessingResult;
 import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
-import org.hyperledger.besu.plugin.services.txselection.AbstractPluginTransactionSelector;
+import org.hyperledger.besu.plugin.services.txselection.AbstractStatefulPluginTransactionSelector;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager.DuplicableLongState;
 import org.hyperledger.besu.plugin.services.txselection.TransactionEvaluationContext;
@@ -34,7 +34,7 @@
  */
 @Slf4j
 public class MaxBlockCallDataTransactionSelector
-    extends AbstractPluginTransactionSelector<DuplicableLongState> {
+    extends AbstractStatefulPluginTransactionSelector<DuplicableLongState> {
 
   private final int maxBlockCallDataSize;
 
@@ -63,7 +63,7 @@ public TransactionSelectionResult evaluateTransactionPreProcessing(
     final int transactionCallDataSize = transaction.getPayload().size();
 
     final var selectorState = getWorkingState();
-    final var stateCumulativeBlockCallDataSize = selectorState.getValue();
+    final var stateCumulativeBlockCallDataSize = selectorState.get();
 
     final long newCumulativeBlockCallDataSize =
         Math.addExact(stateCumulativeBlockCallDataSize, transactionCallDataSize);
@@ -85,7 +85,7 @@ public TransactionSelectionResult evaluateTransactionPreProcessing(
         .addArgument(newCumulativeBlockCallDataSize)
         .log();
 
-    selectorState.setValue(newCumulativeBlockCallDataSize);
+    selectorState.set(newCumulativeBlockCallDataSize);
 
     return SELECTED;
   }

sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelector.java

@@ -23,7 +23,7 @@
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.plugin.data.TransactionProcessingResult;
 import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
-import org.hyperledger.besu.plugin.services.txselection.AbstractPluginTransactionSelector;
+import org.hyperledger.besu.plugin.services.txselection.AbstractStatefulPluginTransactionSelector;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager.DuplicableLongState;
 import org.hyperledger.besu.plugin.services.txselection.TransactionEvaluationContext;
@@ -35,7 +35,8 @@
  * configure a max gas per block that is below the limit defined by the protocol.
  */
 @Slf4j
-public class MaxBlockGasTransactionSelector extends AbstractPluginTransactionSelector<DuplicableLongState> {
+public class MaxBlockGasTransactionSelector
+    extends AbstractStatefulPluginTransactionSelector<DuplicableLongState> {
 
   private final long maxGasPerBlock;
 
@@ -76,7 +77,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing(
     }
 
     final var selectorState = getWorkingState();
-    final var stateCumulativeBlockGasUsed = selectorState.getValue();
+    final var stateCumulativeBlockGasUsed = selectorState.get();
 
     final long newCumulativeBlockGasUsed =
         Math.addExact(stateCumulativeBlockGasUsed, gasUsedByTransaction);
@@ -93,7 +94,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing(
       return TX_TOO_LARGE_FOR_REMAINING_USER_GAS;
     }
 
-    selectorState.setValue(newCumulativeBlockGasUsed);
+    selectorState.set(newCumulativeBlockGasUsed);
 
     return SELECTED;
   }

sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java

@@ -20,7 +20,6 @@
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
 
 import java.math.BigInteger;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -44,7 +43,7 @@
 import org.hyperledger.besu.plugin.data.TransactionProcessingResult;
 import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
 import org.hyperledger.besu.plugin.services.tracer.BlockAwareOperationTracer;
-import org.hyperledger.besu.plugin.services.txselection.AbstractPluginTransactionSelector;
+import org.hyperledger.besu.plugin.services.txselection.AbstractStatefulPluginTransactionSelector;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager;
 import org.hyperledger.besu.plugin.services.txselection.SelectorsStateManager.DuplicableState;
 import org.hyperledger.besu.plugin.services.txselection.TransactionEvaluationContext;
@@ -58,8 +57,8 @@
  */
 @Slf4j
 public class TraceLineLimitTransactionSelector
-    extends AbstractPluginTransactionSelector<
-    TraceLineLimitTransactionSelector.DuplicableLineLimitMap> {
+    extends AbstractStatefulPluginTransactionSelector<
+        TraceLineLimitTransactionSelector.DuplicableLineLimitMap> {
   private static final Marker BLOCK_LINE_COUNT_MARKER = MarkerFactory.getMarker("BLOCK_LINE_COUNT");
   @VisibleForTesting protected static Set<Hash> overLineCountLimitCache = new LinkedHashSet<>();
   private final ZkTracer zkTracer;
@@ -145,7 +144,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing(
       final TransactionProcessingResult processingResult) {
 
     final var selectorState = getWorkingState();
-    final var stateLineLimitMap = selectorState.getValue();
+    final var stateLineLimitMap = selectorState.get();
 
     // check that we are not exceeding line number for any module
     final Map<String, Integer> currCumulatedLineCount = zkTracer.getModulesLineCount();
@@ -186,7 +185,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing(
         break;
     }
 
-    selectorState.setValue(currCumulatedLineCount);
+    selectorState.set(currCumulatedLineCount);
 
     return SELECTED;
   }
@@ -243,7 +242,7 @@ public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBo
           .addKeyValue(
               "traceCounts",
               () ->
-                  getConfirmedState().getValue().entrySet().stream()
+                  getCommitedState().get().entrySet().stream()
                       .sorted(Map.Entry.comparingByKey())
                       .map(e -> '"' + e.getKey() + "\":" + e.getValue())
                       .collect(Collectors.joining(",")))
@@ -259,7 +258,7 @@ public DuplicableLineLimitMap(final Map<String, Integer> map) {
 
     @Override
     protected DuplicableState<Map<String, Integer>> deepCopy() {
-      return new DuplicableLineLimitMap(Map.copyOf(getValue()));
+      return new DuplicableLineLimitMap(Map.copyOf(get()));
     }
   }
 }

sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java

@@ -46,54 +46,46 @@ public void initialize() {
     selectorsStateManager = new SelectorsStateManager();
     transactionSelector =
         new MaxBlockCallDataTransactionSelector(selectorsStateManager, BLOCK_CALL_DATA_MAX_SIZE);
+    selectorsStateManager.blockSelectionStarted();
   }
 
   @Test
   public void shouldSelectTransactionWhen_BlockCallDataSize_IsLessThan_MaxBlockCallDataSize() {
     final var evaluationContext1 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext1, SELECTED);
 
     final var evaluationContext2 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE - 1);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext2, SELECTED);
   }
 
   @Test
   public void shouldSelectTransactionWhen_BlockCallDataSize_IsEqualTo_MaxBlockCallDataSize() {
     final var evaluationContext1 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext1, SELECTED);
 
     final var evaluationContext2 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext2, SELECTED);
   }
 
   @Test
   public void
       shouldNotSelectTransactionWhen_BlockCallDataSize_IsGreaterThan_MaxBlockCallDataSize() {
     final var evaluationContext1 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext1, SELECTED);
 
     final var evaluationContext2 = mockTransactionOfCallDataSize(BLOCK_CALL_DATA_HALF_SIZE + 1);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext2, BLOCK_CALLDATA_OVERFLOW);
   }
 
   @Test
   public void shouldNotSelectAdditionalTransactionOnceBlockIsFull() {
     final var evaluationContext1 = mockTransactionOfCallDataSize(TX_CALL_DATA_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext1, SELECTED);
 
     final var evaluationContext2 = mockTransactionOfCallDataSize(TX_CALL_DATA_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext2, BLOCK_CALLDATA_OVERFLOW);
 
     final var evaluationContext3 = mockTransactionOfCallDataSize(TX_CALL_DATA_SIZE);
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(transactionSelector, evaluationContext3, BLOCK_CALLDATA_OVERFLOW);
   }
 

sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelectorTest.java

@@ -46,14 +46,14 @@ public void initialize() {
     selectorsStateManager = new SelectorsStateManager();
     transactionSelector =
         new MaxBlockGasTransactionSelector(selectorsStateManager, MAX_GAS_PER_BLOCK);
+    selectorsStateManager.blockSelectionStarted();
   }
 
   @Test
   public void shouldSelectWhen_GasUsedByTransaction_IsLessThan_MaxGasPerBlock() {
     final var mockTransactionProcessingResult =
         mockTransactionProcessingResult(MAX_GAS_PER_BLOCK - 1);
     final var evaluationContext = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(
         transactionSelector, evaluationContext, mockTransactionProcessingResult, SELECTED);
   }
@@ -62,7 +62,6 @@ public void shouldSelectWhen_GasUsedByTransaction_IsLessThan_MaxGasPerBlock() {
   public void shouldSelectWhen_GasUsedByTransaction_IsEqual_MaxGasPerBlock() {
     final var mockTransactionProcessingResult = mockTransactionProcessingResult(MAX_GAS_PER_BLOCK);
     final var evaluationContext = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(
         transactionSelector, evaluationContext, mockTransactionProcessingResult, SELECTED);
   }
@@ -72,7 +71,6 @@ public void shouldNotSelectWhen_GasUsedByTransaction_IsGreaterThan_MaxGasPerBloc
     final var mockTransactionProcessingResult =
         mockTransactionProcessingResult(MAX_GAS_PER_BLOCK + 1);
     final var evaluationContext = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
     verifyTransactionSelection(
         transactionSelector,
         evaluationContext,
@@ -83,7 +81,6 @@ public void shouldNotSelectWhen_GasUsedByTransaction_IsGreaterThan_MaxGasPerBloc
   @Test
   public void shouldNotSelectWhen_CumulativeGasUsed_IsGreaterThan_MaxGasPerBlock() {
     final var evaluationContext1 = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
 
     // block empty, transaction 80% max gas, should select
     verifyTransactionSelection(
@@ -93,7 +90,6 @@ public void shouldNotSelectWhen_CumulativeGasUsed_IsGreaterThan_MaxGasPerBlock()
         SELECTED);
 
     final var evaluationContext2 = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
 
     // block 80% full, transaction 80% max gas, should not select
     verifyTransactionSelection(
@@ -103,7 +99,6 @@ public void shouldNotSelectWhen_CumulativeGasUsed_IsGreaterThan_MaxGasPerBlock()
         TX_TOO_LARGE_FOR_REMAINING_USER_GAS);
 
     final var evaluationContext3 = mockEvaluationContext();
-    selectorsStateManager.startNewEvaluation();
 
     // block 80% full, transaction 20% max gas, should select
     verifyTransactionSelection(