refactor: move post-frontier opcodes

Author: Carsons-Eels

packages/testing/src/execution_testing/forks/forks/forks.py

@@ -223,21 +223,14 @@ def gas_costs(
             GAS_OPCODE_XOR=3,
             GAS_OPCODE_NOT=3,
             GAS_OPCODE_BYTE=3,
-            GAS_OPCODE_SHL=3,
-            GAS_OPCODE_SHR=3,
-            GAS_OPCODE_SAR=3,
-            GAS_OPCODE_CLZ=5,
-            GAS_OPCODE_BLOBHASH=3,
             GAS_OPCODE_JUMP=8,
             GAS_OPCODE_JUMPI=10,
             GAS_OPCODE_CALLDATALOAD=3,
             GAS_OPCODE_CALLDATACOPY=3,
             GAS_OPCODE_CODECOPY=3,
-            GAS_OPCODE_RETURNDATACOPY=3,
             GAS_OPCODE_MLOAD=3,
             GAS_OPCODE_MSTORE=3,
             GAS_OPCODE_MSTORE8=3,
-            GAS_OPCODE_MCOPY=3,
             GAS_OPCODE_PUSH_N=3,
             GAS_OPCODE_DUP_N=3,
             GAS_OPCODE_SWAP_N=3,
@@ -1778,6 +1771,7 @@ def gas_costs(
             GAS_PRECOMPILE_ECMUL=40_000,
             GAS_PRECOMPILE_ECPAIRING_BASE=100_000,
             GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000,
+            GAS_OPCODE_RETURNDATACOPY=3,
         )
 
 
@@ -1816,6 +1810,20 @@ def create_opcodes(
             block_number=block_number, timestamp=timestamp
         )
 
+    @classmethod
+    def gas_costs(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> GasCosts:
+        """At Constantinople, shift opcodes are introduced."""
+        return replace(
+            super(Constantinople, cls).gas_costs(
+                block_number=block_number, timestamp=timestamp
+            ),
+            GAS_OPCODE_SHL=3,
+            GAS_OPCODE_SHR=3,
+            GAS_OPCODE_SAR=3,
+        )
+
     @classmethod
     def opcode_gas_map(
         cls, *, block_number: int = 0, timestamp: int = 0
@@ -2700,6 +2708,8 @@ def gas_costs(
                 block_number=block_number, timestamp=timestamp
             ),
             GAS_PRECOMPILE_POINT_EVALUATION=50_000,
+            GAS_OPCODE_BLOBHASH=3,
+            GAS_OPCODE_MCOPY=3,
         )
 
     @classmethod
@@ -2829,6 +2839,7 @@ def gas_costs(
             GAS_PRECOMPILE_BLS_G2MAP=23_800,
             GAS_PRECOMPILE_BLS_PAIRING_BASE=37_700,
             GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600,
+            GAS_OPCODE_CLZ=5,
         )
 
     @classmethod

packages/testing/src/execution_testing/forks/gas_costs.py

@@ -114,21 +114,23 @@ class GasCosts:
     GAS_OPCODE_XOR: int
     GAS_OPCODE_NOT: int
     GAS_OPCODE_BYTE: int
-    GAS_OPCODE_SHL: int
-    GAS_OPCODE_SHR: int
-    GAS_OPCODE_SAR: int
-    GAS_OPCODE_CLZ: int
-    GAS_OPCODE_BLOBHASH: int
     GAS_OPCODE_JUMP: int
     GAS_OPCODE_JUMPI: int
     GAS_OPCODE_CALLDATALOAD: int
     GAS_OPCODE_CALLDATACOPY: int
     GAS_OPCODE_CODECOPY: int
-    GAS_OPCODE_RETURNDATACOPY: int
     GAS_OPCODE_MLOAD: int
     GAS_OPCODE_MSTORE: int
     GAS_OPCODE_MSTORE8: int
-    GAS_OPCODE_MCOPY: int
     GAS_OPCODE_PUSH_N: int
     GAS_OPCODE_DUP_N: int
     GAS_OPCODE_SWAP_N: int
+
+    # Defined post-Frontier
+    GAS_OPCODE_SHL: int = 0
+    GAS_OPCODE_SHR: int = 0
+    GAS_OPCODE_SAR: int = 0
+    GAS_OPCODE_RETURNDATACOPY: int = 0
+    GAS_OPCODE_BLOBHASH: int = 0
+    GAS_OPCODE_MCOPY: int = 0
+    GAS_OPCODE_CLZ: int = 0