core/txpool: add eip2681 check for incoming transactions (#32726)

Author: jsvisa

core/txpool/validation.go

@@ -116,6 +116,10 @@ func ValidateTransaction(tx *types.Transaction, head *types.Header, signer types
 	if _, err := types.Sender(signer, tx); err != nil {
 		return fmt.Errorf("%w: %v", ErrInvalidSender, err)
 	}
+	// Limit nonce to 2^64-1 per EIP-2681
+	if tx.Nonce()+1 < tx.Nonce() {
+		return core.ErrNonceMax
+	}
 	// Ensure the transaction has more gas than the bare minimum needed to cover
 	// the transaction metadata
 	intrGas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.SetCodeAuthorizations(), tx.To() == nil, true, rules.IsIstanbul, rules.IsShanghai)

core/txpool/validation_test.go

@@ -0,0 +1,115 @@
+// Copyright 2025 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package txpool
+
+import (
+	"crypto/ecdsa"
+	"errors"
+	"math"
+	"math/big"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/params"
+)
+
+func TestValidateTransactionEIP2681(t *testing.T) {
+	key, err := crypto.GenerateKey()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	head := &types.Header{
+		Number:     big.NewInt(1),
+		GasLimit:   5000000,
+		Time:       1,
+		Difficulty: big.NewInt(1),
+	}
+
+	signer := types.LatestSigner(params.TestChainConfig)
+
+	// Create validation options
+	opts := &ValidationOptions{
+		Config:       params.TestChainConfig,
+		Accept:       0xFF, // Accept all transaction types
+		MaxSize:      32 * 1024,
+		MaxBlobCount: 6,
+		MinTip:       big.NewInt(0),
+	}
+
+	tests := []struct {
+		name    string
+		nonce   uint64
+		wantErr error
+	}{
+		{
+			name:    "normal nonce",
+			nonce:   42,
+			wantErr: nil,
+		},
+		{
+			name:    "max allowed nonce (2^64-2)",
+			nonce:   math.MaxUint64 - 1,
+			wantErr: nil,
+		},
+		{
+			name:    "EIP-2681 nonce overflow (2^64-1)",
+			nonce:   math.MaxUint64,
+			wantErr: core.ErrNonceMax,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tx := createTestTransaction(key, tt.nonce)
+			err := ValidateTransaction(tx, head, signer, opts)
+
+			if tt.wantErr == nil {
+				if err != nil {
+					t.Errorf("ValidateTransaction() error = %v, wantErr nil", err)
+				}
+			} else {
+				if err == nil {
+					t.Errorf("ValidateTransaction() error = nil, wantErr %v", tt.wantErr)
+				} else if !errors.Is(err, tt.wantErr) {
+					t.Errorf("ValidateTransaction() error = %v, wantErr %v", err, tt.wantErr)
+				}
+			}
+		})
+	}
+}
+
+// createTestTransaction creates a basic transaction for testing
+func createTestTransaction(key *ecdsa.PrivateKey, nonce uint64) *types.Transaction {
+	to := common.HexToAddress("0x0000000000000000000000000000000000000001")
+
+	txdata := &types.LegacyTx{
+		Nonce:    nonce,
+		To:       &to,
+		Value:    big.NewInt(1000),
+		Gas:      21000,
+		GasPrice: big.NewInt(1),
+		Data:     nil,
+	}
+
+	tx := types.NewTx(txdata)
+	signedTx, _ := types.SignTx(tx, types.HomesteadSigner{}, key)
+	return signedTx
+}

eth/api_backend_test.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"errors"
+	"math"
 	"math/big"
 	"testing"
 	"time"
@@ -130,6 +131,27 @@ func TestSendTx(t *testing.T) {
 	testSendTx(t, true)
 }
 
+func TestSendTxEIP2681(t *testing.T) {
+	b := initBackend(false)
+
+	// Test EIP-2681: nonce overflow should be rejected
+	tx := makeTx(uint64(math.MaxUint64), nil, nil, key) // max uint64 nonce
+	err := b.SendTx(context.Background(), tx)
+	if err == nil {
+		t.Fatal("Expected EIP-2681 nonce overflow error, but transaction was accepted")
+	}
+	if !errors.Is(err, core.ErrNonceMax) {
+		t.Errorf("Expected core.ErrNonceMax, got: %v", err)
+	}
+
+	// Test normal case: should succeed
+	normalTx := makeTx(0, nil, nil, key)
+	err = b.SendTx(context.Background(), normalTx)
+	if err != nil {
+		t.Errorf("Normal transaction should succeed, got error: %v", err)
+	}
+}
+
 func testSendTx(t *testing.T, withLocal bool) {
 	b := initBackend(withLocal)