Use TransactionSelectionContext in all the methods of the plugin sele…

…ctor

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

ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java

@@ -412,8 +412,7 @@ private TransactionSelectionResult handleTransactionSelected(
           evaluationContext, timeoutSelectionResult, txWorldStateUpdater);
     }
 
-    pluginTransactionSelector.onTransactionSelected(
-        evaluationContext.getPendingTransaction(), processingResult);
+    pluginTransactionSelector.onTransactionSelected(evaluationContext, processingResult);
     blockWorldStateUpdater = worldState.updater();
     LOG.atTrace()
         .setMessage("Selected {} for block creation, evaluated in {}")
@@ -440,7 +439,7 @@ private TransactionSelectionResult handleTransactionNotSelected(
 
     transactionSelectionResults.updateNotSelected(
         evaluationContext.getTransaction(), selectionResult);
-    pluginTransactionSelector.onTransactionNotSelected(pendingTransaction, selectionResult);
+    pluginTransactionSelector.onTransactionNotSelected(evaluationContext, selectionResult);
     LOG.atTrace()
         .setMessage("Not selected {} for block creation with result {}, evaluated in {}")
         .addArgument(pendingTransaction::toTraceLog)

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

@@ -726,21 +726,22 @@ public void transactionSelectionPluginShouldBeNotifiedWhenTransactionSelectionCo
 
     selector.buildTransactionListForBlock();
 
-    ArgumentCaptor<PendingTransaction> argumentCaptor =
-        ArgumentCaptor.forClass(PendingTransaction.class);
+    @SuppressWarnings("unchecked")
+    ArgumentCaptor<TransactionEvaluationContext<PendingTransaction>> argumentCaptor =
+        ArgumentCaptor.forClass(TransactionEvaluationContext.class);
 
     // selected transaction must be notified to the selector
     verify(transactionSelector)
         .onTransactionSelected(argumentCaptor.capture(), any(TransactionProcessingResult.class));
-    PendingTransaction selected = argumentCaptor.getValue();
+    PendingTransaction selected = argumentCaptor.getValue().getPendingTransaction();
     assertThat(selected.getTransaction()).isEqualTo(transaction);
 
     // unselected transaction must be notified to the selector with correct reason
     verify(transactionSelector)
         .onTransactionNotSelected(
             argumentCaptor.capture(),
             eq(TransactionSelectionResult.invalid(invalidReason.toString())));
-    PendingTransaction rejectedTransaction = argumentCaptor.getValue();
+    PendingTransaction rejectedTransaction = argumentCaptor.getValue().getPendingTransaction();
     assertThat(rejectedTransaction.getTransaction()).isEqualTo(invalidTransaction);
   }
 

plugin-api/build.gradle

@@ -69,7 +69,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'huR8kAtuiOvjy2384yFZh4PI971rEH14QMjnra3aWTE='
+  knownHash = 'IGq+V3KaStHCRFkeK3KwPxJYKO4RX9YM1O4JYITk8S8='
 }
 check.dependsOn('checkAPIChanges')
 

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/PluginTransactionSelector.java

@@ -60,19 +60,19 @@ TransactionSelectionResult evaluateTransactionPostProcessing(
   /**
    * Method called when a transaction is selected to be added to a block.
    *
-   * @param pendingTransaction The transaction that has been selected.
+   * @param evaluationContext The current selection context
    * @param processingResult The result of processing the selected transaction.
    */
   default void onTransactionSelected(
-      final PendingTransaction pendingTransaction,
+      final TransactionEvaluationContext<? extends PendingTransaction> evaluationContext,
       final TransactionProcessingResult processingResult) {}
   /**
    * Method called when a transaction is not selected to be added to a block.
    *
-   * @param pendingTransaction The transaction that has not been selected.
+   * @param evaluationContext The current selection context
    * @param transactionSelectionResult The transaction selection result
    */
   default void onTransactionNotSelected(
-      final PendingTransaction pendingTransaction,
+      final TransactionEvaluationContext<? extends PendingTransaction> evaluationContext,
       final TransactionSelectionResult transactionSelectionResult) {}
 }