Merge pull request #4791 from ethereum-optimism/sc/l2g-nonce-too-high

feat(l2g): properly return NonceTooHigh

Merge pull request #4791 from ethereum-optimism/sc/l2g-nonce-too-high
feat(l2g): properly return NonceTooHigh
d11d4ad7 · mergify[bot] · GitHub · 83823b0e · 4729bc7b · d11d4ad7
Commit d11d4ad7 authored Jan 26, 2023 by mergify[bot] Committed by GitHub Jan 26, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

thin-toes-remember.md .changeset/thin-toes-remember.md +5 -0

tx_pool.go l2geth/core/tx_pool.go +3 -1

No files found.
--- a/.changeset/thin-toes-remember.md
+++ b/.changeset/thin-toes-remember.md
+---
+'@eth-optimism/l2geth': patch
+---
+
+Has l2geth return a NonceToHigh response if the txn nonce is greater than the expected nonce.
--- a/l2geth/core/tx_pool.go
+++ b/l2geth/core/tx_pool.go
@@ -555,8 +555,10 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 	}
 	// Ensure the transaction adheres to nonce ordering
 	if rcfg.UsingOVM {
-		if pool.currentState.GetNonce(from) != tx.Nonce() {
+		if pool.currentState.GetNonce(from) > tx.Nonce() {
 			return ErrNonceTooLow
+		} else if pool.currentState.GetNonce(from) < tx.Nonce() {
+			return ErrNonceTooHigh
 		}
 	} else {
 		if pool.currentState.GetNonce(from) > tx.Nonce() {