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

Don't put NONCE_TOO_LOW transactions into the invalid nonce cache #6067

Merged
merged 6 commits into from
Oct 31, 2023
Merged

Don't put NONCE_TOO_LOW transactions into the invalid nonce cache #6067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d32cb8
Don't put NONCE_TOO_LOW transactions into the invalid nonce cache
matthew1001 Oct 20, 2023
c332988
Update unit tests
matthew1001 Oct 30, 2023
f4e90e7
Merge branch 'main' into nonce-cache-fix
matthew1001 Oct 30, 2023
2ad5b1e
Use list of errors to ignore
matthew1001 Oct 30, 2023
12b4c0d
Merge branch 'main' into nonce-cache-fix
matthew1001 Oct 31, 2023
5b1e039
Merge branch 'main' into nonce-cache-fix
fab-10 Oct 31, 2023
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
7 changes: 6 additions & 1 deletion ...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.IntSummaryStatistics;
Expand Down Expand Up @@ -93,6 +94,8 @@
public class TransactionPool implements BlockAddedObserver {
private static final Logger LOG = LoggerFactory.getLogger(TransactionPool.class);
private static final Logger LOG_FOR_REPLAY = LoggerFactory.getLogger("LOG_FOR_REPLAY");
private static final List<TransactionInvalidReason> INVALID_TX_CACHE_IGNORED_ERRORS =
new ArrayList<>(Arrays.asList(TransactionInvalidReason.NONCE_TOO_LOW));
private final Supplier<PendingTransactions> pendingTransactionsSupplier;
private final PluginTransactionValidator pluginTransactionValidator;
private volatile PendingTransactions pendingTransactions;
Expand Down Expand Up @@ -277,7 +280,9 @@ private ValidationResult<TransactionInvalidReason> addTransaction(
.log();
metrics.incrementRejected(
isLocal, hasPriority, validationResult.result.getInvalidReason(), "txpool");
if (!isLocal) {
if (!isLocal
&& !INVALID_TX_CACHE_IGNORED_ERRORS.contains(
validationResult.result.getInvalidReason())) {
pendingTransactions.signalInvalidAndRemoveDependentTransactions(transaction);
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractLegacyTransactionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_LOW;
import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TRANSACTION_ALREADY_KNOWN;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
Expand All @@ -38,7 +38,7 @@ public abstract class AbstractLegacyTransactionPoolTest extends AbstractTransact
public void shouldNotAddRemoteTransactionsWhenThereIsALowestInvalidNonceForTheSender() {
givenTransactionIsValid(transaction1);
when(transactionValidatorFactory.get().validate(eq(transaction0), any(Optional.class), any()))
.thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
.thenReturn(ValidationResult.invalid(TRANSACTION_ALREADY_KNOWN));

transactionPool.addRemoteTransactions(asList(transaction0, transaction1));

Expand Down