core/txpool/blobpool: revert #29989, WLock on Nonce (#30142)

4 months ago · 803dc6b664
parent 37590b2c55
commit 803dc6b664
1 changed files with 3 additions and 2 deletions
--- a/core/txpool/blobpool/blobpool.go
+++ b/core/txpool/blobpool/blobpool.go
@ -1598,8 +1598,9 @@ func (p *BlobPool) SubscribeTransactions(ch chan<- core.NewTxsEvent, reorgs bool
 // Nonce returns the next nonce of an account, with all transactions executable
 // by the pool already applied on top.
 func (p *BlobPool) Nonce(addr common.Address) uint64 {
-	p.lock.RLock()
-	defer p.lock.RUnlock()
+	// We need a write lock here, since state.GetNonce might write the cache.
+	p.lock.Lock()
+	defer p.lock.Unlock()

 	if txs, ok := p.index[addr]; ok {
 		return txs[len(txs)-1].nonce + 1