allow future nonce during parallelization

Signed-off-by: Karim Taam <[email protected]>
hyperledger · Jan 15, 2025 · 3d9d9a2 · 3d9d9a2
1 parent 103ad88
commit 3d9d9a2
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 25 deletions.
diff --git a/...reum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java b/...reum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java
@@ -295,7 +295,7 @@ protected TransactionProcessingResult getTransactionProcessingResult(
         OperationTracer.NO_TRACING,
         blockHashLookup,
         true,
-        TransactionValidationParams.processingBlock(),
+        TransactionValidationParams.blockProcessing(),
         privateMetadataUpdater,
         blobGasPrice);
   }

diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java b/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java
@@ -20,9 +20,13 @@
 @Value.Style(allParameters = true)
 public interface TransactionValidationParams {
 
-  TransactionValidationParams processingBlockParams =
+  TransactionValidationParams blockProcessingParams =
       ImmutableTransactionValidationParams.of(false, false, false, true, false, false);
 
+  TransactionValidationParams parallelBlockProcessingParams =
+      ImmutableTransactionValidationParams.copyOf(blockProcessingParams)
+          .withIsAllowFutureNonce(true);
+
   TransactionValidationParams transactionPoolParams =
       ImmutableTransactionValidationParams.of(true, false, true, true, true, false);
 
@@ -76,8 +80,12 @@ static TransactionValidationParams transactionSimulatorAllowExceedingBalance() {
     return transactionSimulatorAllowExceedingBalanceParams;
   }
 
-  static TransactionValidationParams processingBlock() {
-    return processingBlockParams;
+  static TransactionValidationParams blockProcessing() {
+    return blockProcessingParams;
+  }
+
+  static TransactionValidationParams parallelBlockProcessing() {
+    return parallelBlockProcessingParams;
   }
 
   static TransactionValidationParams transactionPool() {

diff --git a/...ger/besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessor.java b/...ger/besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessor.java
@@ -173,7 +173,7 @@ public void traceBeforeRewardTransaction(
               },
               blockHashLookup,
               true,
-              TransactionValidationParams.processingBlock(),
+              TransactionValidationParams.parallelBlockProcessing(),
               privateMetadataUpdater,
               blobGasPrice);
 

diff --git a/...ain/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java b/...ain/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java
@@ -179,7 +179,7 @@ public BlockProcessingResult processBlock(
               miningBeneficiary,
               blockHashLookup,
               false,
-              TransactionValidationParams.processingBlock(),
+              TransactionValidationParams.blockProcessing(),
               Wei.ZERO);
       if (result.isInvalid()) {
         return BlockProcessingResult.FAILED;

diff --git a/...g/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java b/...g/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java
@@ -108,7 +108,7 @@ public BlockProcessingResult processBlock(
               miningBeneficiary,
               blockHashLookup,
               true,
-              TransactionValidationParams.processingBlock(),
+              TransactionValidationParams.blockProcessing(),
               Wei.ZERO);
       if (result.isInvalid()) {
         return BlockProcessingResult.FAILED;

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/BlockSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/BlockSimulator.java
@@ -354,7 +354,7 @@ ImmutableTransactionValidationParams buildTransactionValidationParams(
 
     if (shouldValidate) {
       return ImmutableTransactionValidationParams.builder()
-          .from(TransactionValidationParams.processingBlock())
+          .from(TransactionValidationParams.blockProcessing())
           .build();
     }
 

diff --git a/.../src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java b/.../src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.processingBlockParams;
+import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.blockProcessingParams;
 import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.transactionPoolParams;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.BLOB_GAS_PRICE_BELOW_CURRENT_BLOB_BASE_FEE;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE;
@@ -75,7 +75,7 @@ public class MainnetTransactionValidatorTest {
   protected static final KeyPair senderKeys = SIGNATURE_ALGORITHM.get().generateKeyPair();
 
   private static final TransactionValidationParams transactionValidationParams =
-      processingBlockParams;
+      blockProcessingParams;
 
   @Mock protected GasCalculator gasCalculator;
 
@@ -169,7 +169,7 @@ public void shouldRejectTransactionWhenSenderAccountDoesNotExist() {
     final TransactionValidator validator =
         createTransactionValidator(
             gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
-    assertThat(validator.validateForSender(basicTransaction, null, processingBlockParams))
+    assertThat(validator.validateForSender(basicTransaction, null, blockProcessingParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE));
   }
 
@@ -180,7 +180,7 @@ public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
             gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Account account = accountWithNonce(basicTransaction.getNonce() + 1);
-    assertThat(validator.validateForSender(basicTransaction, account, processingBlockParams))
+    assertThat(validator.validateForSender(basicTransaction, account, blockProcessingParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_LOW));
   }
 
@@ -192,7 +192,7 @@ public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
             gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Account account = accountWithNonce(basicTransaction.getNonce() - 1);
-    assertThat(validator.validateForSender(basicTransaction, account, processingBlockParams))
+    assertThat(validator.validateForSender(basicTransaction, account, blockProcessingParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH));
   }
 
@@ -218,7 +218,7 @@ public void shouldRejectTransactionWhenNonceExceedsMaximumAllowedNonce() {
         new TransactionTestFixture().nonce(11).createTransaction(senderKeys);
     final Account account = accountWithNonce(5);
 
-    assertThat(validator.validateForSender(transaction, account, processingBlockParams))
+    assertThat(validator.validateForSender(transaction, account, blockProcessingParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH));
   }
 
@@ -235,7 +235,7 @@ public void transactionWithNullSenderCanBeValidIfGasPriceAndValueIsZero() {
 
     assertThat(
             validator.validateForSender(
-                builder.createTransaction(senderKeyPair), null, processingBlockParams))
+                builder.createTransaction(senderKeyPair), null, blockProcessingParams))
         .isEqualTo(ValidationResult.valid());
   }
 
@@ -251,7 +251,7 @@ public void shouldRejectTransactionIfAccountIsNotEOA() {
             .thenReturn(Hash.fromHexStringLenient("0xdeadbeef"))
             .getMock();
 
-    assertThat(validator.validateForSender(basicTransaction, invalidEOA, processingBlockParams))
+    assertThat(validator.validateForSender(basicTransaction, invalidEOA, blockProcessingParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED));
   }
 

diff --git a/.../src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java b/.../src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java
@@ -77,8 +77,8 @@ public void transactionSimulator() {
   }
 
   @Test
-  public void processingBlock() {
-    final TransactionValidationParams params = TransactionValidationParams.processingBlock();
+  public void blockProcessing() {
+    final TransactionValidationParams params = TransactionValidationParams.blockProcessing();
     assertThat(params.isAllowFutureNonce()).isFalse();
     assertThat(params.checkOnchainPermissions()).isTrue();
     assertThat(params.checkLocalPermissions()).isFalse();

diff --git a/...besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessorTest.java b/...besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessorTest.java
@@ -123,7 +123,7 @@ void testRunTransaction() {
             any(OperationTracer.class),
             any(BlockHashLookup.class),
             eq(true),
-            eq(TransactionValidationParams.processingBlock()),
+            eq(TransactionValidationParams.blockProcessing()),
             eq(privateMetadataUpdater),
             eq(blobGasPrice));
 
@@ -198,7 +198,7 @@ void testRunTransactionWithConflict() {
             any(OperationTracer.class),
             any(BlockHashLookup.class),
             eq(true),
-            eq(TransactionValidationParams.processingBlock()),
+            eq(TransactionValidationParams.blockProcessing()),
             eq(privateMetadataUpdater),
             eq(blobGasPrice));
 

diff --git a/...reum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/BlockSimulatorTest.java b/...reum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/BlockSimulatorTest.java
@@ -237,7 +237,7 @@ public void shouldApplyBlockHeaderOverridesCorrectly() {
   public void testBuildTransactionValidationParams() {
     var configWhenValidate =
         ImmutableTransactionValidationParams.builder()
-            .from(TransactionValidationParams.processingBlock())
+            .from(TransactionValidationParams.blockProcessing())
             .build();
 
     ImmutableTransactionValidationParams params =

diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
@@ -275,7 +275,7 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
                         ? Hash.ZERO
                         : Hash.hash(Bytes.wrap(Long.toString(blockNumber).getBytes(UTF_8))),
                 false,
-                TransactionValidationParams.processingBlock(),
+                TransactionValidationParams.blockProcessing(),
                 tracer,
                 blobGasPrice);
         timer.stop();

diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java
@@ -411,7 +411,7 @@ static T8nResult runTest(
                 blockHeader.getCoinbase(),
                 blockHashLookup,
                 false,
-                TransactionValidationParams.processingBlock(),
+                TransactionValidationParams.blockProcessing(),
                 tracer,
                 blobGasPrice);
         tracerManager.disposeTracer(tracer);

diff --git a/...encetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java b/...encetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
@@ -175,7 +175,7 @@ public void milestone(
       final Transaction transaction = Transaction.readFrom(RLP.input(rlp));
       final ValidationResult<TransactionInvalidReason> validation =
           transactionValidator(milestone)
-              .validate(transaction, baseFee, Optional.empty(), TransactionValidationParams.processingBlock());
+              .validate(transaction, baseFee, Optional.empty(), TransactionValidationParams.blockProcessing());
       if (!validation.isValid()) {
         throw new RuntimeException(
             String.format(

diff --git a/.../reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java b/.../reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
@@ -162,7 +162,7 @@ public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
             blockHeader.getCoinbase(),
             protocolSpec.getBlockHashProcessor().createBlockHashLookup(blockchain, blockHeader),
             false,
-            TransactionValidationParams.processingBlock(),
+            TransactionValidationParams.blockProcessing(),
             blobGasPrice);
     if (result.isInvalid()) {
       assertThat(spec.getExpectException())