Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow future nonce during parallelization #8122

Closed
wants to merge 1 commit into from
Closed

allow future nonce during parallelization #8122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -77,7 +81,11 @@ static TransactionValidationParams transactionSimulatorAllowExceedingBalance() {
}

static TransactionValidationParams processingBlock() {
return processingBlockParams;
return blockProcessingParams;
}

static TransactionValidationParams parallelBlockProcessing() {
return parallelBlockProcessingParams;
}

static TransactionValidationParams transactionPool() {
Expand Down
2 changes: 1 addition & 1 deletion ...ger/besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void traceBeforeRewardTransaction(
},
blockHashLookup,
true,
TransactionValidationParams.processingBlock(),
TransactionValidationParams.parallelBlockProcessing(),
privateMetadataUpdater,
blobGasPrice);

Expand Down
16 changes: 8 additions & 8 deletions .../src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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));
}

Expand All @@ -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));
}

Expand All @@ -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));
}

Expand All @@ -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));
}

Expand All @@ -235,7 +235,7 @@ public void transactionWithNullSenderCanBeValidIfGasPriceAndValueIsZero() {

assertThat(
validator.validateForSender(
builder.createTransaction(senderKeyPair), null, processingBlockParams))
builder.createTransaction(senderKeyPair), null, blockProcessingParams))
.isEqualTo(ValidationResult.valid());
}

Expand All @@ -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));
}

Expand Down
Loading