Merge branch 'main' into is-poa

besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java

@@ -48,9 +48,9 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidator;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
@@ -99,7 +99,7 @@ public class BesuEventsImplTest {
   @Mock private EthContext mockEthContext;
   @Mock private EthMessages mockEthMessages;
   @Mock private EthScheduler mockEthScheduler;
-  @Mock private MainnetTransactionValidator mockTransactionValidator;
+  @Mock private TransactionValidator mockTransactionValidator;
   @Mock private ProtocolSpec mockProtocolSpec;
   @Mock private WorldStateArchive mockWorldStateArchive;
   @Mock private MutableWorldState mockWorldState;

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java

@@ -18,8 +18,8 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.PermissionTransactionFilter;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.TransactionFilter;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -216,12 +216,12 @@ public String listMilestones() {
   /**
    * Sets transaction filter.
    *
-   * @param transactionFilter the transaction filter
+   * @param permissionTransactionFilter the transaction filter
    */
   @Override
-  public void setTransactionFilter(final TransactionFilter transactionFilter) {
+  public void setTransactionFilter(final PermissionTransactionFilter permissionTransactionFilter) {
     transitionUtils.dispatchConsumerAccordingToMergeState(
-        protocolSchedule -> protocolSchedule.setTransactionFilter(transactionFilter));
+        protocolSchedule -> protocolSchedule.setTransactionFilter(permissionTransactionFilter));
   }
 
   /**

crypto/algorithms/build.gradle

@@ -29,7 +29,7 @@ jar {
 }
 
 dependencies {
-  api 'org.bouncycastle:bcprov-jdk15on'
+  api 'org.bouncycastle:bcprov-jdk18on'
   api 'org.slf4j:slf4j-api'
 
   implementation 'net.java.dev.jna:jna'

enclave/build.gradle

@@ -9,7 +9,7 @@ dependencies {
   implementation 'io.vertx:vertx-web'
   implementation 'org.apache.tuweni:tuweni-net'
 
-  runtimeOnly('org.bouncycastle:bcpkix-jdk15on')
+  runtimeOnly('org.bouncycastle:bcpkix-jdk18on')
 
   // test dependencies.
   testImplementation project(':testutil')
@@ -20,7 +20,7 @@ dependencies {
   // integration test dependencies.
   integrationTestImplementation project(':testutil')
   integrationTestImplementation 'org.assertj:assertj-core'
-  integrationTestImplementation 'org.bouncycastle:bcpkix-jdk15on'
+  integrationTestImplementation 'org.bouncycastle:bcpkix-jdk18on'
   integrationTestImplementation 'org.awaitility:awaitility'
   integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.mockito:mockito-core'

ethereum/api/build.gradle

@@ -69,14 +69,14 @@ dependencies {
   implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.antlr:antlr4-runtime'
-  implementation 'org.bouncycastle:bcprov-jdk15on'
+  implementation 'org.bouncycastle:bcprov-jdk18on'
   implementation 'org.springframework.security:spring-security-crypto'
   implementation 'org.xerial.snappy:snappy-java'
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
 
-  runtimeOnly 'org.bouncycastle:bcpkix-jdk15on'
+  runtimeOnly 'org.bouncycastle:bcpkix-jdk18on'
   runtimeOnly 'io.netty:netty-transport-native-epoll'
   runtimeOnly 'io.netty:netty-transport-native-kqueue'
 
@@ -106,7 +106,7 @@ dependencies {
 
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
-  testSupportImplementation 'org.bouncycastle:bcpkix-jdk15on'
+  testSupportImplementation 'org.bouncycastle:bcpkix-jdk18on'
 
   integrationTestImplementation project(':config')
   integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
@@ -125,7 +125,7 @@ dependencies {
 
 artifacts { testSupportArtifacts testSupportJar }
 
-task generateTestBlockchain() {
+tasks.register('generateTestBlockchain') {
   def srcFiles = 'src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data'
   def dataPath = "$buildDir/generated/data"
   def blocksBin = "$buildDir/resources/test/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.bin"

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java

@@ -115,6 +115,7 @@ public class EthGetTransactionReceiptTest {
           null,
           Optional.empty(),
           null,
+          true,
           true);
   private final ProtocolSpec statusTransactionTypeSpec =
       new ProtocolSpec(
@@ -144,6 +145,7 @@ public class EthGetTransactionReceiptTest {
           null,
           Optional.empty(),
           null,
+          true,
           true);
 
   @SuppressWarnings("unchecked")

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilterTest.java → ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingPermissionTransactionFilterTest.java

@@ -45,7 +45,7 @@
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
-public class PendingTransactionFilterTest {
+public class PendingPermissionTransactionFilterTest {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
@@ -97,7 +97,7 @@ public static Collection<Object[]> data() {
   private final int limit;
   private final List<String> expectedListOfTransactionHash;
 
-  public PendingTransactionFilterTest(
+  public PendingPermissionTransactionFilterTest(
       final List<Filter> filters,
       final int limit,
       final List<String> expectedListOfTransactionHash) {

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

@@ -43,6 +43,7 @@
 
 import java.util.ArrayList;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -78,15 +79,12 @@
  */
 public class BlockTransactionSelector {
 
-  public record TransactionValidationResult(
-      Transaction transaction, ValidationResult<TransactionInvalidReason> validationResult) {}
-
   public static class TransactionSelectionResults {
     private final List<Transaction> transactions = Lists.newArrayList();
     private final Map<TransactionType, List<Transaction>> transactionsByType =
         new EnumMap<>(TransactionType.class);
     private final List<TransactionReceipt> receipts = Lists.newArrayList();
-    private final List<TransactionValidationResult> invalidTransactions = Lists.newArrayList();
+    private final Map<Transaction, TransactionInvalidReason> invalidTransactions = new HashMap<>();
     private final List<TransactionSelectionResult> selectionResults = Lists.newArrayList();
     private long cumulativeGasUsed = 0;
     private long cumulativeDataGasUsed = 0;
@@ -114,9 +112,8 @@ private void update(
     }
 
     private void updateWithInvalidTransaction(
-        final Transaction transaction,
-        final ValidationResult<TransactionInvalidReason> validationResult) {
-      invalidTransactions.add(new TransactionValidationResult(transaction, validationResult));
+        final Transaction transaction, final TransactionInvalidReason invalidReason) {
+      invalidTransactions.put(transaction, invalidReason);
     }
 
     public List<Transaction> getTransactions() {
@@ -139,7 +136,7 @@ public long getCumulativeDataGasUsed() {
       return cumulativeDataGasUsed;
     }
 
-    public List<TransactionValidationResult> getInvalidTransactions() {
+    public Map<Transaction, TransactionInvalidReason> getInvalidTransactions() {
       return invalidTransactions;
     }
 
@@ -278,7 +275,7 @@ public TransactionSelectionResults buildTransactionListForBlock() {
         .log();
     pendingTransactions.selectTransactions(
         pendingTransaction -> {
-          final var res = evaluateTransaction(pendingTransaction, false);
+          final var res = evaluateTransaction(pendingTransaction);
           transactionSelectionResults.addSelectionResult(res);
           return res;
         });
@@ -298,7 +295,7 @@ public TransactionSelectionResults buildTransactionListForBlock() {
   public TransactionSelectionResults evaluateTransactions(final List<Transaction> transactions) {
     transactions.forEach(
         transaction ->
-            transactionSelectionResults.addSelectionResult(evaluateTransaction(transaction, true)));
+            transactionSelectionResults.addSelectionResult(evaluateTransaction(transaction)));
     return transactionSelectionResults;
   }
 
@@ -311,8 +308,7 @@ public TransactionSelectionResults evaluateTransactions(final List<Transaction>
    * the space remaining in the block.
    *
    */
-  private TransactionSelectionResult evaluateTransaction(
-      final Transaction transaction, final boolean reportFutureNonceTransactionsAsInvalid) {
+  private TransactionSelectionResult evaluateTransaction(final Transaction transaction) {
     if (isCancelled.get()) {
       throw new CancellationException("Cancelled during transaction selection.");
     }
@@ -393,12 +389,9 @@ private TransactionSelectionResult evaluateTransaction(
       }
       return txSelectionResult;
     } else {
+      transactionSelectionResults.updateWithInvalidTransaction(
+          transaction, effectiveResult.getValidationResult().getInvalidReason());
 
-      final boolean isIncorrectNonce = isIncorrectNonce(effectiveResult.getValidationResult());
-      if (!isIncorrectNonce || reportFutureNonceTransactionsAsInvalid) {
-        transactionSelectionResults.updateWithInvalidTransaction(
-            transaction, effectiveResult.getValidationResult());
-      }
       return transactionSelectionResultForInvalidResult(
           transaction, effectiveResult.getValidationResult());
     }
@@ -472,10 +465,6 @@ private boolean isTransientValidationError(final TransactionInvalidReason invali
         || invalidReason.equals(TransactionInvalidReason.NONCE_TOO_HIGH);
   }
 
-  private boolean isIncorrectNonce(final ValidationResult<TransactionInvalidReason> result) {
-    return result.getInvalidReason().equals(TransactionInvalidReason.NONCE_TOO_HIGH);
-  }
-
   private boolean transactionTooLargeForBlock(final Transaction transaction) {
     final long dataGasUsed = gasCalculator.dataGasCost(transaction.getBlobCount());
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionFilter.java → ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PermissionTransactionFilter.java

@@ -1,5 +1,6 @@
 /*
- * Copyright ConsenSys AG.
+ *
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -11,11 +12,12 @@
  * specific language governing permissions and limitations under the License.
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
  */
 package org.hyperledger.besu.ethereum.core;
 
 @FunctionalInterface
-public interface TransactionFilter {
+public interface PermissionTransactionFilter {
   boolean permitted(
       Transaction transaction, boolean checkLocalPermissions, boolean checkOnchainPermissions);
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java

@@ -72,6 +72,7 @@ public static ProtocolSpecBuilder tangerineWhistleDefinition(
       final EvmConfiguration evmConfiguration) {
     return MainnetProtocolSpecs.homesteadDefinition(
             contractSizeLimit, configStackSizeLimit, evmConfiguration)
+        .isReplayProtectionSupported(true)
         .gasCalculator(TangerineWhistleGasCalculator::new)
         .transactionValidatorBuilder(
             (gasCalculator, gasLimitCalculator) ->

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolSchedule.java

@@ -20,8 +20,8 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.PermissionTransactionFilter;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.TransactionFilter;
 import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec.BlockNumberProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec.TimestampProtocolSpec;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
@@ -111,9 +111,12 @@ public boolean anyMatch(final Predicate<ScheduledProtocolSpec> predicate) {
   }
 
   @Override
-  public void setTransactionFilter(final TransactionFilter transactionFilter) {
+  public void setTransactionFilter(final PermissionTransactionFilter permissionTransactionFilter) {
     protocolSpecs.forEach(
-        spec -> spec.spec().getTransactionValidator().setTransactionFilter(transactionFilter));
+        spec ->
+            spec.spec()
+                .getTransactionValidator()
+                .setPermissionTransactionFilter(permissionTransactionFilter));
   }
 
   @Override

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java

@@ -257,6 +257,7 @@ public static ProtocolSpecBuilder spuriousDragonDefinition(
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
 
     return tangerineWhistleDefinition(OptionalInt.empty(), configStackSizeLimit, evmConfiguration)
+        .isReplayProtectionSupported(true)
         .gasCalculator(SpuriousDragonGasCalculator::new)
         .skipZeroBlockRewards(true)
         .messageCallProcessorBuilder(

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

@@ -64,7 +64,7 @@ public class MainnetTransactionProcessor {
 
   protected final GasCalculator gasCalculator;
 
-  protected final MainnetTransactionValidator transactionValidator;
+  protected final TransactionValidator transactionValidator;
 
   private final AbstractMessageProcessor contractCreationProcessor;
 
@@ -81,7 +81,7 @@ public class MainnetTransactionProcessor {
 
   public MainnetTransactionProcessor(
       final GasCalculator gasCalculator,
-      final MainnetTransactionValidator transactionValidator,
+      final TransactionValidator transactionValidator,
       final AbstractMessageProcessor contractCreationProcessor,
       final AbstractMessageProcessor messageCallProcessor,
       final boolean clearEmptyAccounts,
@@ -498,7 +498,7 @@ public TransactionProcessingResult processTransaction(
     }
   }
 
-  public MainnetTransactionValidator getTransactionValidator() {
+  public TransactionValidator getTransactionValidator() {
     return transactionValidator;
   }