Forks/cancun

setup.cfg

@@ -16,6 +16,8 @@ packages =
     ethereum_spec_tools/evm_tools
     ethereum_spec_tools/evm_tools/t8n
     ethereum_spec_tools/evm_tools/b11r
+    ethereum_spec_tools/evm_tools/statetest
+    ethereum_spec_tools/evm_tools/loaders
     ethereum_spec_tools/lint
     ethereum_spec_tools/lint/lints
     ethereum
@@ -97,6 +99,11 @@ packages =
     ethereum/shanghai/vm
     ethereum/shanghai/vm/instructions
     ethereum/shanghai/vm/precompiled_contracts
+    ethereum/cancun
+    ethereum/cancun/utils
+    ethereum/cancun/vm
+    ethereum/cancun/vm/instructions
+    ethereum/cancun/vm/precompiled_contracts
 
 
 package_dir =
@@ -107,6 +114,7 @@ install_requires =
     pycryptodome>=3,<4
     coincurve>=18,<19
     typing_extensions>=4
+    eth2spec @ git+https://github.com/ethereum/consensus-specs.git@d302b35d40c72842d444ef2ea64344e3cb889804
 
 [options.package_data]
 ethereum =
@@ -119,6 +127,9 @@ ethereum =
     assets/blocks/block_1234567.json
     assets/blocks/block_12964999.json
 
+ethereum_spec_tools =
+    py.typed
+
 [options.entry_points]
 console_scripts =
     ethereum-spec-lint = ethereum_spec_tools.lint:main
@@ -145,6 +156,7 @@ test =
     pytest-xdist>=3.3.1,<4
     GitPython>=3.1.0,<3.2
     filelock>=3.12.3,<3.13
+    platformdirs>=4.2,<5
     requests
 
 lint =

src/ethereum/arrow_glacier/vm/exceptions.py

@@ -63,7 +63,11 @@ class InvalidOpcode(ExceptionalHalt):
     Raised when an invalid opcode is encountered.
     """
 
-    pass
+    code: int
+
+    def __init__(self, code: int) -> None:
+        super().__init__(code)
+        self.code = code
 
 
 class InvalidJumpDestError(ExceptionalHalt):

src/ethereum/arrow_glacier/vm/precompiled_contracts/modexp.py

@@ -33,7 +33,6 @@ def modexp(evm: Evm) -> None:
     modulus_length = U256.from_be_bytes(buffer_read(data, U256(64), U256(32)))
 
     exp_start = U256(96) + base_length
-    modulus_start = exp_start + exp_length
 
     exp_head = Uint.from_be_bytes(
         buffer_read(data, exp_start, min(U256(32), exp_length))
@@ -51,6 +50,8 @@ def modexp(evm: Evm) -> None:
 
     base = Uint.from_be_bytes(buffer_read(data, U256(96), base_length))
     exp = Uint.from_be_bytes(buffer_read(data, exp_start, exp_length))
+
+    modulus_start = exp_start + exp_length
     modulus = Uint.from_be_bytes(
         buffer_read(data, modulus_start, modulus_length)
     )