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

Max nonce txpool #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Max nonce txpool #18

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4087285
core: cache nonces for tx validation
MariusVanDerWijden Mar 1, 2021
e54992d
core: added maxNonce to txpool
MariusVanDerWijden Mar 2, 2021
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
Next Next commit
core: cache nonces for tx validation
  • Loading branch information
@MariusVanDerWijden
MariusVanDerWijden committed Mar 1, 2021
commit 40872858a05257ab4491599328ffa233ca56ba76
4 changes: 3 additions & 1 deletion core/tx_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ type TxPool struct {
eip2718 bool // Fork indicator whether we are using EIP-2718 type transactions.

currentState *state.StateDB // Current state in the blockchain head
currentNonces *txNoncer // Current state tracking for nonces
pendingNonces *txNoncer // Pending state tracking virtual nonces
currentMaxGas uint64 // Current gas limit for transaction caps

Expand Down Expand Up @@ -550,7 +551,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
return ErrUnderpriced
}
// Ensure the transaction adheres to nonce ordering
if pool.currentState.GetNonce(from) > tx.Nonce() {
if pool.currentNonces.get(from) > tx.Nonce() {
return ErrNonceTooLow
}
// Transactor should have enough funds to cover the costs
Expand Down Expand Up @@ -1194,6 +1195,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
}
pool.currentState = statedb
pool.pendingNonces = newTxNoncer(statedb)
pool.currentNonces = newTxNoncer(statedb)
pool.currentMaxGas = newHead.GasLimit

// Inject any transactions discarded due to reorgs
Expand Down