simulators/ethereum/engine: fix transaction replacement

ethereum · Sep 28, 2023 · 964f181 · 964f181
1 parent 01d1559
commit 964f181
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/simulators/ethereum/engine/helper/tx.go b/simulators/ethereum/engine/helper/tx.go
@@ -512,7 +512,11 @@ func (txSender *TransactionSender) GetLastNonce(ctx context.Context, node client
 	if txSender.nonceMap != nil {
 		txSender.nonceMapLock.Lock()
 		defer txSender.nonceMapLock.Unlock()
-		return txSender.nonceMap[sender.GetAddress()], nil
+		nextNonce := txSender.nonceMap[sender.GetAddress()]
+		if nextNonce > 0 {
+			return nextNonce - 1, nil
+		}
+		return 0, fmt.Errorf("no previous nonce found in map for %s", sender.GetAddress().Hex())
 	} else {
 		return node.GetLastAccountNonce(ctx, sender.GetAddress(), header)
 	}