Move forks into namespace package

Author: SamWilsn

pyproject.toml

@@ -130,101 +130,101 @@ packages = [
     "ethereum_spec_tools.lint",
     "ethereum_spec_tools.lint.lints",
     "ethereum",
-    "ethereum.frontier",
-    "ethereum.frontier.utils",
-    "ethereum.frontier.vm",
-    "ethereum.frontier.vm.instructions",
-    "ethereum.frontier.vm.precompiled_contracts",
+    "ethereum.forks.frontier",
+    "ethereum.forks.frontier.utils",
+    "ethereum.forks.frontier.vm",
+    "ethereum.forks.frontier.vm.instructions",
+    "ethereum.forks.frontier.vm.precompiled_contracts",
     "ethereum.utils",
     "ethereum.crypto",
     "ethereum_optimized",
-    "ethereum.homestead",
-    "ethereum.homestead.utils",
-    "ethereum.homestead.vm",
-    "ethereum.homestead.vm.instructions",
-    "ethereum.homestead.vm.precompiled_contracts",
-    "ethereum.dao_fork",
-    "ethereum.dao_fork.utils",
-    "ethereum.dao_fork.vm",
-    "ethereum.dao_fork.vm.instructions",
-    "ethereum.dao_fork.vm.precompiled_contracts",
-    "ethereum.tangerine_whistle",
-    "ethereum.tangerine_whistle.utils",
-    "ethereum.tangerine_whistle.vm",
-    "ethereum.tangerine_whistle.vm.instructions",
-    "ethereum.tangerine_whistle.vm.precompiled_contracts",
-    "ethereum.spurious_dragon",
-    "ethereum.spurious_dragon.utils",
-    "ethereum.spurious_dragon.vm",
-    "ethereum.spurious_dragon.vm.instructions",
-    "ethereum.spurious_dragon.vm.precompiled_contracts",
-    "ethereum.byzantium",
-    "ethereum.byzantium.utils",
-    "ethereum.byzantium.vm",
-    "ethereum.byzantium.vm.instructions",
-    "ethereum.byzantium.vm.precompiled_contracts",
-    "ethereum.constantinople",
-    "ethereum.constantinople.utils",
-    "ethereum.constantinople.vm",
-    "ethereum.constantinople.vm.instructions",
-    "ethereum.constantinople.vm.precompiled_contracts",
-    "ethereum.istanbul",
-    "ethereum.istanbul.utils",
-    "ethereum.istanbul.vm",
-    "ethereum.istanbul.vm.instructions",
-    "ethereum.istanbul.vm.precompiled_contracts",
-    "ethereum.muir_glacier",
-    "ethereum.muir_glacier.utils",
-    "ethereum.muir_glacier.vm",
-    "ethereum.muir_glacier.vm.instructions",
-    "ethereum.muir_glacier.vm.precompiled_contracts",
-    "ethereum.berlin",
-    "ethereum.berlin.utils",
-    "ethereum.berlin.vm",
-    "ethereum.berlin.vm.instructions",
-    "ethereum.berlin.vm.precompiled_contracts",
-    "ethereum.london",
-    "ethereum.london.utils",
-    "ethereum.london.vm",
-    "ethereum.london.vm.instructions",
-    "ethereum.london.vm.precompiled_contracts",
-    "ethereum.arrow_glacier",
-    "ethereum.arrow_glacier.utils",
-    "ethereum.arrow_glacier.vm",
-    "ethereum.arrow_glacier.vm.instructions",
-    "ethereum.arrow_glacier.vm.precompiled_contracts",
-    "ethereum.gray_glacier",
-    "ethereum.gray_glacier.utils",
-    "ethereum.gray_glacier.vm",
-    "ethereum.gray_glacier.vm.instructions",
-    "ethereum.gray_glacier.vm.precompiled_contracts",
-    "ethereum.paris",
-    "ethereum.paris.utils",
-    "ethereum.paris.vm",
-    "ethereum.paris.vm.instructions",
-    "ethereum.paris.vm.precompiled_contracts",
-    "ethereum.shanghai",
-    "ethereum.shanghai.utils",
-    "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",
-    "ethereum.prague",
-    "ethereum.prague.utils",
-    "ethereum.prague.vm",
-    "ethereum.prague.vm.instructions",
-    "ethereum.prague.vm.precompiled_contracts",
-    "ethereum.prague.vm.precompiled_contracts.bls12_381",
-    "ethereum.osaka",
-    "ethereum.osaka.utils",
-    "ethereum.osaka.vm",
-    "ethereum.osaka.vm.instructions",
-    "ethereum.osaka.vm.precompiled_contracts",
-    "ethereum.osaka.vm.precompiled_contracts.bls12_381",
+    "ethereum.forks.homestead",
+    "ethereum.forks.homestead.utils",
+    "ethereum.forks.homestead.vm",
+    "ethereum.forks.homestead.vm.instructions",
+    "ethereum.forks.homestead.vm.precompiled_contracts",
+    "ethereum.forks.dao_fork",
+    "ethereum.forks.dao_fork.utils",
+    "ethereum.forks.dao_fork.vm",
+    "ethereum.forks.dao_fork.vm.instructions",
+    "ethereum.forks.dao_fork.vm.precompiled_contracts",
+    "ethereum.forks.tangerine_whistle",
+    "ethereum.forks.tangerine_whistle.utils",
+    "ethereum.forks.tangerine_whistle.vm",
+    "ethereum.forks.tangerine_whistle.vm.instructions",
+    "ethereum.forks.tangerine_whistle.vm.precompiled_contracts",
+    "ethereum.forks.spurious_dragon",
+    "ethereum.forks.spurious_dragon.utils",
+    "ethereum.forks.spurious_dragon.vm",
+    "ethereum.forks.spurious_dragon.vm.instructions",
+    "ethereum.forks.spurious_dragon.vm.precompiled_contracts",
+    "ethereum.forks.byzantium",
+    "ethereum.forks.byzantium.utils",
+    "ethereum.forks.byzantium.vm",
+    "ethereum.forks.byzantium.vm.instructions",
+    "ethereum.forks.byzantium.vm.precompiled_contracts",
+    "ethereum.forks.constantinople",
+    "ethereum.forks.constantinople.utils",
+    "ethereum.forks.constantinople.vm",
+    "ethereum.forks.constantinople.vm.instructions",
+    "ethereum.forks.constantinople.vm.precompiled_contracts",
+    "ethereum.forks.istanbul",
+    "ethereum.forks.istanbul.utils",
+    "ethereum.forks.istanbul.vm",
+    "ethereum.forks.istanbul.vm.instructions",
+    "ethereum.forks.istanbul.vm.precompiled_contracts",
+    "ethereum.forks.muir_glacier",
+    "ethereum.forks.muir_glacier.utils",
+    "ethereum.forks.muir_glacier.vm",
+    "ethereum.forks.muir_glacier.vm.instructions",
+    "ethereum.forks.muir_glacier.vm.precompiled_contracts",
+    "ethereum.forks.berlin",
+    "ethereum.forks.berlin.utils",
+    "ethereum.forks.berlin.vm",
+    "ethereum.forks.berlin.vm.instructions",
+    "ethereum.forks.berlin.vm.precompiled_contracts",
+    "ethereum.forks.london",
+    "ethereum.forks.london.utils",
+    "ethereum.forks.london.vm",
+    "ethereum.forks.london.vm.instructions",
+    "ethereum.forks.london.vm.precompiled_contracts",
+    "ethereum.forks.arrow_glacier",
+    "ethereum.forks.arrow_glacier.utils",
+    "ethereum.forks.arrow_glacier.vm",
+    "ethereum.forks.arrow_glacier.vm.instructions",
+    "ethereum.forks.arrow_glacier.vm.precompiled_contracts",
+    "ethereum.forks.gray_glacier",
+    "ethereum.forks.gray_glacier.utils",
+    "ethereum.forks.gray_glacier.vm",
+    "ethereum.forks.gray_glacier.vm.instructions",
+    "ethereum.forks.gray_glacier.vm.precompiled_contracts",
+    "ethereum.forks.paris",
+    "ethereum.forks.paris.utils",
+    "ethereum.forks.paris.vm",
+    "ethereum.forks.paris.vm.instructions",
+    "ethereum.forks.paris.vm.precompiled_contracts",
+    "ethereum.forks.shanghai",
+    "ethereum.forks.shanghai.utils",
+    "ethereum.forks.shanghai.vm",
+    "ethereum.forks.shanghai.vm.instructions",
+    "ethereum.forks.shanghai.vm.precompiled_contracts",
+    "ethereum.forks.cancun",
+    "ethereum.forks.cancun.utils",
+    "ethereum.forks.cancun.vm",
+    "ethereum.forks.cancun.vm.instructions",
+    "ethereum.forks.cancun.vm.precompiled_contracts",
+    "ethereum.forks.prague",
+    "ethereum.forks.prague.utils",
+    "ethereum.forks.prague.vm",
+    "ethereum.forks.prague.vm.instructions",
+    "ethereum.forks.prague.vm.precompiled_contracts",
+    "ethereum.forks.prague.vm.precompiled_contracts.bls12_381",
+    "ethereum.forks.osaka",
+    "ethereum.forks.osaka.utils",
+    "ethereum.forks.osaka.vm",
+    "ethereum.forks.osaka.vm.instructions",
+    "ethereum.forks.osaka.vm.precompiled_contracts",
+    "ethereum.forks.osaka.vm.precompiled_contracts.bls12_381",
 ]
 
 [tool.setuptools.package-data]

src/ethereum/arrow_glacier/__init__.py …ethereum/forks/arrow_glacier/__init__.pysrc/ethereum/arrow_glacier/__init__.py renamed to src/ethereum/forks/arrow_glacier/__init__.py src/ethereum/arrow_glacier/__init__.py renamed to src/ethereum/forks/arrow_glacier/__init__.py

@@ -72,8 +72,8 @@ class Header:
     of the Merkle-Patricia [Trie] representing the Ethereum world state.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.gray_glacier.state.state_root
-    [Trie]: ref:ethereum.gray_glacier.trie.Trie
+    [`state_root()`]: ref:ethereum.forks.arrow_glacier.state.state_root
+    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
     """
 
     transactions_root: Root
@@ -84,8 +84,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.gray_glacier.trie.root
-    [Trie]: ref:ethereum.gray_glacier.trie.Trie
+    [`root()`]: ref:ethereum.forks.arrow_glacier.trie.root
+    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
     """
 
     receipt_root: Root
@@ -95,16 +95,16 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.gray_glacier.trie.root
-    [Trie]: ref:ethereum.gray_glacier.trie.Trie
+    [`root()`]: ref:ethereum.forks.arrow_glacier.trie.root
+    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
     """
 
     bloom: Bloom
     """
     Bloom filter for logs generated by transactions in this block.
     Constructed from all logs in the block using the [logs bloom] mechanism.
 
-    [logs bloom]: ref:ethereum.gray_glacier.bloom.logs_bloom
+    [logs bloom]: ref:ethereum.forks.arrow_glacier.bloom.logs_bloom
     """
 
     difficulty: Uint
@@ -115,7 +115,7 @@ class Header:
     [`calculate_block_difficulty()`] function.
 
     [`calculate_block_difficulty()`]:
-    ref:ethereum.gray_glacier.fork.calculate_block_difficulty
+    ref:ethereum.forks.arrow_glacier.fork.calculate_block_difficulty
     """
 
     number: Uint
@@ -155,19 +155,19 @@ class Header:
     mix_digest: Bytes32
     """
     Mix hash used in the mining process, which is a cryptographic commitment
-    to the block's contents. It [validates] that PoW was done on the correct
+    to the block's contents. It [validates][u] that PoW was done on the correct
     block.
 
-    [validates]: ref:ethereum.gray_glacier.fork.validate_proof_of_work
+    [u]: ref:ethereum.forks.arrow_glacier.fork.validate_proof_of_work
     """
 
     nonce: Bytes8
     """
     Nonce used in the mining process, which is a value that miners
-    increment to find a valid block hash. This is also used to [validate] the
-    proof-of-work for this block.
+    increment to find a valid block hash. This is also used to [validate][v]
+    the proof-of-work for this block.
 
-    [validate]: ref:ethereum.gray_glacier.fork.validate_proof_of_work
+    [v]: ref:ethereum.forks.arrow_glacier.fork.validate_proof_of_work
     """
 
     base_fee_per_gas: Uint
@@ -200,15 +200,15 @@ class Block:
     Ommers are used to provide rewards for near-valid mined blocks that didn't
     become part of the canonical chain.
 
-    [`header`]: ref:ethereum.gray_glacier.blocks.Header
+    [`header`]: ref:ethereum.forks.arrow_glacier.blocks.Header
     """
 
     header: Header
     """
     The block header containing metadata and cryptographic commitments. Refer
     [headers] for more details on the fields included in the header.
 
-    [headers]: ref:ethereum.gray_glacier.blocks.Header
+    [headers]: ref:ethereum.forks.arrow_glacier.blocks.Header
     """
 
     transactions: Tuple[Bytes | LegacyTransaction, ...]
@@ -235,11 +235,11 @@ class Log:
     [`LOG1`], [`LOG2`], [`LOG3`] and [`LOG4`]), which can be efficiently
     searched using the bloom filter in the block header.
 
-    [`LOG0`]: ref:ethereum.gray_glacier.vm.instructions.log.log0
-    [`LOG1`]: ref:ethereum.gray_glacier.vm.instructions.log.log1
-    [`LOG2`]: ref:ethereum.gray_glacier.vm.instructions.log.log2
-    [`LOG3`]: ref:ethereum.gray_glacier.vm.instructions.log.log3
-    [`LOG4`]: ref:ethereum.gray_glacier.vm.instructions.log.log4
+    [`LOG0`]: ref:ethereum.forks.arrow_glacier.vm.instructions.log.log0
+    [`LOG1`]: ref:ethereum.forks.arrow_glacier.vm.instructions.log.log1
+    [`LOG2`]: ref:ethereum.forks.arrow_glacier.vm.instructions.log.log2
+    [`LOG3`]: ref:ethereum.forks.arrow_glacier.vm.instructions.log.log3
+    [`LOG4`]: ref:ethereum.forks.arrow_glacier.vm.instructions.log.log4
     """
 
     address: Address

src/ethereum/gray_glacier/blocks.py …c/ethereum/forks/arrow_glacier/blocks.pysrc/ethereum/gray_glacier/blocks.py renamed to src/ethereum/forks/arrow_glacier/blocks.py src/ethereum/gray_glacier/blocks.py renamed to src/ethereum/forks/arrow_glacier/blocks.py

@@ -36,7 +36,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import keccak256
-from ethereum.london import trie as previous_trie
+from ethereum.forks.london import trie as previous_trie
 from ethereum.utils.hexadecimal import hex_to_bytes
 
 from .blocks import Receipt