cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

core: don't cache zero nonce in txNoncer (#25603)

Browse Source 
This changes the nonce cache used by TxPool to not store cached
nonces for non-existing accounts.
This commit is contained in:
Seungbae Yu 2022-09-17 01:23:13 +09:00 committed by GitHub
parent 8ade5e6c14
commit ada603fab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/tx_noncer.go
View File

@ -49,7 +49,9 @@ func (txn *txNoncer) get(addr common.Address) uint64 {
defer txn.lock.Unlock() defer txn.lock.Unlock()
if _, ok := txn.nonces[addr]; !ok { if _, ok := txn.nonces[addr]; !ok {
txn.nonces[addr] = txn.fallback.GetNonce(addr) if nonce := txn.fallback.GetNonce(addr); nonce != 0 {
txn.nonces[addr] = nonce
}
} }
return txn.nonces[addr] return txn.nonces[addr]
} }
@ -70,7 +72,9 @@ func (txn *txNoncer) setIfLower(addr common.Address, nonce uint64) {
defer txn.lock.Unlock() defer txn.lock.Unlock()
if _, ok := txn.nonces[addr]; !ok { if _, ok := txn.nonces[addr]; !ok {
txn.nonces[addr] = txn.fallback.GetNonce(addr) if nonce := txn.fallback.GetNonce(addr); nonce != 0 {
txn.nonces[addr] = nonce
}
} }
if txn.nonces[addr] <= nonce { if txn.nonces[addr] <= nonce {
return return

3
core/tx_pool.go
View File

@ -463,9 +463,6 @@ func (pool *TxPool) SetGasPrice(price *big.Int) {
// Nonce returns the next nonce of an account, with all transactions executable // Nonce returns the next nonce of an account, with all transactions executable
// by the pool already applied on top. // by the pool already applied on top.
func (pool *TxPool) Nonce(addr common.Address) uint64 { func (pool *TxPool) Nonce(addr common.Address) uint64 {
pool.mu.RLock()
defer pool.mu.RUnlock()
return pool.pendingNonces.get(addr) return pool.pendingNonces.get(addr)
} }