From 2e80a802fe675cf61c975f64dbe8fb90c089731f Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Thu, 2 Apr 2026 18:12:06 +0800
Subject: [PATCH] core/vm: tighten eip-8024 min stack bounds

Set DUPN/SWAPN/EXCHANGE minStack to 17/18/3 to match immediate decoding constraints and add a regression test for the amsterdam jump table.
---
 core/vm/eips.go      |  6 +++---
 core/vm/eips_test.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 core/vm/eips_test.go

diff --git a/core/vm/eips.go b/core/vm/eips.go
index 3ccd9aaaf0..89db80b30c 100644
--- a/core/vm/eips.go
+++ b/core/vm/eips.go
@@ -349,19 +349,19 @@ func enable8024(jt *JumpTable) {
 	jt[DUPN] = &operation{
 		execute:     opDupN,
 		constantGas: GasFastestStep,
-		minStack:    minStack(1, 0),
+		minStack:    minStack(17, 0),
 		maxStack:    maxStack(0, 1),
 	}
 	jt[SWAPN] = &operation{
 		execute:     opSwapN,
 		constantGas: GasFastestStep,
-		minStack:    minStack(2, 0),
+		minStack:    minStack(18, 0),
 		maxStack:    maxStack(0, 0),
 	}
 	jt[EXCHANGE] = &operation{
 		execute:     opExchange,
 		constantGas: GasFastestStep,
-		minStack:    minStack(2, 0),
+		minStack:    minStack(3, 0),
 		maxStack:    maxStack(0, 0),
 	}
 }
diff --git a/core/vm/eips_test.go b/core/vm/eips_test.go
new file mode 100644
index 0000000000..d2bd8cebc2
--- /dev/null
+++ b/core/vm/eips_test.go
@@ -0,0 +1,30 @@
+// Copyright 2026 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 vm
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestEIP8024MinStackBounds(t *testing.T) {
+	jt := newAmsterdamInstructionSet()
+	require.Equal(t, 17, jt[DUPN].minStack)
+	require.Equal(t, 18, jt[SWAPN].minStack)
+	require.Equal(t, 3, jt[EXCHANGE].minStack)
+}