From 86973351ad8008ae0df7c9f6550cbaebd2f691b1 Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Fri, 23 Jan 2026 16:22:18 +0000 Subject: [PATCH 1/2] nit(testing): Move position of `valid_opcodes` so merge catches the conflict --- .../src/execution_testing/forks/forks/forks.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index 72624785d2..d3ea5cc25c 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -3355,6 +3355,15 @@ def is_deployed(cls) -> bool: """Return True if this fork is deployed.""" return False + @classmethod + def valid_opcodes( + cls, *, block_number: int = 0, timestamp: int = 0 + ) -> List[Opcodes]: + """Add SLOTNUM opcode for Amsterdam (EIP-7843).""" + return [Opcodes.SLOTNUM] + super(Amsterdam, cls).valid_opcodes( + block_number=block_number, timestamp=timestamp + ) + @classmethod def engine_new_payload_version( cls, *, block_number: int = 0, timestamp: int = 0 @@ -3397,12 +3406,3 @@ def opcode_gas_map( **base_map, Opcodes.SLOTNUM: gas_costs.G_BASE, } - - @classmethod - def valid_opcodes( - cls, *, block_number: int = 0, timestamp: int = 0 - ) -> List[Opcodes]: - """Add SLOTNUM opcode for Amsterdam (EIP-7843).""" - return [Opcodes.SLOTNUM] + super(Amsterdam, cls).valid_opcodes( - block_number=block_number, timestamp=timestamp - ) From 8cfb4425c655597814dcc15930ae83d6d82361ad Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Fri, 23 Jan 2026 16:24:43 +0000 Subject: [PATCH 2/2] fixup --- .../execution_testing/forks/forks/forks.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index d3ea5cc25c..111db3b4fb 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -3364,6 +3364,22 @@ def valid_opcodes( block_number=block_number, timestamp=timestamp ) + @classmethod + def opcode_gas_map( + cls, *, block_number: int = 0, timestamp: int = 0 + ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]: + """Add SLOTNUM opcode gas cost for Amsterdam (EIP-7843).""" + gas_costs = cls.gas_costs( + block_number=block_number, timestamp=timestamp + ) + base_map = super(Amsterdam, cls).opcode_gas_map( + block_number=block_number, timestamp=timestamp + ) + return { + **base_map, + Opcodes.SLOTNUM: gas_costs.G_BASE, + } + @classmethod def engine_new_payload_version( cls, *, block_number: int = 0, timestamp: int = 0 @@ -3390,19 +3406,3 @@ def header_slot_number_required( """Slot number in header required from Amsterdam (EIP-7843).""" del block_number, timestamp return True - - @classmethod - def opcode_gas_map( - cls, *, block_number: int = 0, timestamp: int = 0 - ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]: - """Add SLOTNUM opcode gas cost for Amsterdam (EIP-7843).""" - gas_costs = cls.gas_costs( - block_number=block_number, timestamp=timestamp - ) - base_map = super(Amsterdam, cls).opcode_gas_map( - block_number=block_number, timestamp=timestamp - ) - return { - **base_map, - Opcodes.SLOTNUM: gas_costs.G_BASE, - }