diff --git a/core/vm/evm.go b/core/vm/evm.go index cb9a6fc4a7..8975c791c8 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -149,8 +149,6 @@ func NewEVM(blockCtx BlockContext, statedb StateDB, chainConfig *params.ChainCon evm.precompiles = activePrecompiledContracts(evm.chainRules) switch { - case evm.chainRules.IsAmsterdam: - evm.table = &amsterdamInstructionSet case evm.chainRules.IsOsaka: evm.table = &osakaInstructionSet case evm.chainRules.IsVerkle: diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 08746224ab..d7a4d9da1d 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -63,7 +63,6 @@ var ( verkleInstructionSet = newVerkleInstructionSet() pragueInstructionSet = newPragueInstructionSet() osakaInstructionSet = newOsakaInstructionSet() - amsterdamInstructionSet = newAmsterdamInstructionSet() ) // JumpTable contains the EVM opcodes supported at a given fork. @@ -93,12 +92,6 @@ func newVerkleInstructionSet() JumpTable { return validate(instructionSet) } -func newAmsterdamInstructionSet() JumpTable { - instructionSet := newOsakaInstructionSet() - enable8024(&instructionSet) // EIP-8024 (DUPN, SWAPN, EXCHANGE) - return validate(instructionSet) -} - func newOsakaInstructionSet() JumpTable { instructionSet := newPragueInstructionSet() enable7939(&instructionSet) // EIP-7939 (CLZ opcode) diff --git a/core/vm/jump_table_export.go b/core/vm/jump_table_export.go index fdf814d64c..89a2ebf6f4 100644 --- a/core/vm/jump_table_export.go +++ b/core/vm/jump_table_export.go @@ -28,8 +28,6 @@ func LookupInstructionSet(rules params.Rules) (JumpTable, error) { switch { case rules.IsVerkle: return newCancunInstructionSet(), errors.New("verkle-fork not defined yet") - case rules.IsAmsterdam: - return newAmsterdamInstructionSet(), nil case rules.IsOsaka: return newOsakaInstructionSet(), nil case rules.IsPrague: