core: don't cache zero nonce in txNoncer (scroll-tech#88)

ryanmorphl2 · web-flow · commit a41137df581b · 2024-06-12T14:49:21.000+08:00
* core: don't cache zero nonce in txNoncer (ethereum#25603) * revert change
diff --git a/core/tx_noncer.go b/core/tx_noncer.go
@@ -49,7 +49,9 @@ func (txn *txNoncer) get(addr common.Address) uint64 {
 	defer txn.lock.Unlock()
 
 	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]
 }
@@ -70,7 +72,9 @@ func (txn *txNoncer) setIfLower(addr common.Address, nonce uint64) {
 	defer txn.lock.Unlock()
 
 	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 {
 		return

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ func (txn *txNoncer) get(addr common.Address) uint64 {`
`49`	`49`	`defer txn.lock.Unlock()`
`50`	`50`
`51`	`51`	`if _, ok := txn.nonces[addr]; !ok {`
`52`		`- txn.nonces[addr] = txn.fallback.GetNonce(addr)`
	`52`	`+ if nonce := txn.fallback.GetNonce(addr); nonce != 0 {`
	`53`	`+ txn.nonces[addr] = nonce`
	`54`	`+ }`
`53`	`55`	`}`
`54`	`56`	`return txn.nonces[addr]`
`55`	`57`	`}`
`@@ -70,7 +72,9 @@ func (txn *txNoncer) setIfLower(addr common.Address, nonce uint64) {`
`70`	`72`	`defer txn.lock.Unlock()`
`71`	`73`
`72`	`74`	`if _, ok := txn.nonces[addr]; !ok {`
`73`		`- txn.nonces[addr] = txn.fallback.GetNonce(addr)`
	`75`	`+ if nonce := txn.fallback.GetNonce(addr); nonce != 0 {`
	`76`	`+ txn.nonces[addr] = nonce`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`	`if txn.nonces[addr] <= nonce {`
`76`	`80`	`return`