force forks to deal with old headers

SamWilsn · SamWilsn · commit 30a309dff237 · 2025-03-05T04:49:47.000-05:00
diff --git a/setup.cfg b/setup.cfg
@@ -128,7 +128,7 @@ install_requires =
     typing_extensions>=4.2
     py-ecc>=8.0.0b2,<9
     ethereum-types>=0.2.1,<0.3
-    ethereum-rlp>=0.1.1,<0.2
+    ethereum-rlp>=0.1.2,<0.2
 
 [options.package_data]
 ethereum =
diff --git a/src/ethereum/arrow_glacier/blocks.py b/src/ethereum/arrow_glacier/blocks.py
@@ -70,7 +70,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/arrow_glacier/fork.py b/src/ethereum/arrow_glacier/fork.py
@@ -537,7 +537,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Union[LegacyTransaction, Bytes], ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -653,7 +653,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/berlin/blocks.py b/src/ethereum/berlin/blocks.py
@@ -64,7 +64,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/berlin/fork.py b/src/ethereum/berlin/fork.py
@@ -436,7 +436,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Union[LegacyTransaction, Bytes], ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -552,7 +552,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/byzantium/blocks.py b/src/ethereum/byzantium/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/byzantium/fork.py b/src/ethereum/byzantium/fork.py
@@ -420,7 +420,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -536,7 +536,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/cancun/blocks.py b/src/ethereum/cancun/blocks.py
@@ -88,7 +88,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
     withdrawals: Tuple[Withdrawal, ...]
 
 
diff --git a/src/ethereum/constantinople/blocks.py b/src/ethereum/constantinople/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/constantinople/fork.py b/src/ethereum/constantinople/fork.py
@@ -420,7 +420,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -536,7 +536,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/dao_fork/blocks.py b/src/ethereum/dao_fork/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/dao_fork/fork.py b/src/ethereum/dao_fork/fork.py
@@ -429,7 +429,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -545,7 +545,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/frontier/blocks.py b/src/ethereum/frontier/blocks.py
@@ -11,6 +11,7 @@
 from dataclasses import dataclass
 from typing import Tuple
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
@@ -52,6 +53,15 @@ class Header:
 """
 
 
+def decode_header(raw_header: rlp.Simple) -> AnyHeader:
+    """
+    Convert `raw_header` from raw sequences and bytes to a structured block
+    header.
+    """
+    # Because frontier is the first fork, we know what type the header is.
+    return rlp.deserialize_to(Header, raw_header)
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -61,7 +71,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Block
diff --git a/src/ethereum/gray_glacier/blocks.py b/src/ethereum/gray_glacier/blocks.py
@@ -70,7 +70,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/gray_glacier/fork.py b/src/ethereum/gray_glacier/fork.py
@@ -537,7 +537,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Union[LegacyTransaction, Bytes], ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -653,7 +653,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/homestead/blocks.py b/src/ethereum/homestead/blocks.py
@@ -11,11 +11,13 @@
 from dataclasses import dataclass
 from typing import Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 from typing_extensions import TypeAlias
 
+from ethereum.exceptions import InvalidBlock
 from ethereum.frontier import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
diff --git a/src/ethereum/homestead/fork.py b/src/ethereum/homestead/fork.py
@@ -412,7 +412,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -528,7 +528,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/istanbul/blocks.py b/src/ethereum/istanbul/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/istanbul/fork.py b/src/ethereum/istanbul/fork.py
@@ -420,7 +420,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -536,7 +536,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/london/blocks.py b/src/ethereum/london/blocks.py
@@ -70,7 +70,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/london/fork.py b/src/ethereum/london/fork.py
@@ -537,7 +537,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Union[LegacyTransaction, Bytes], ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -653,7 +653,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/muir_glacier/blocks.py b/src/ethereum/muir_glacier/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/muir_glacier/fork.py b/src/ethereum/muir_glacier/fork.py
@@ -422,7 +422,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -538,7 +538,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/paris/blocks.py b/src/ethereum/paris/blocks.py
@@ -70,7 +70,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/shanghai/blocks.py b/src/ethereum/shanghai/blocks.py
@@ -84,7 +84,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
     withdrawals: Tuple[Withdrawal, ...]
 
 
diff --git a/src/ethereum/spurious_dragon/blocks.py b/src/ethereum/spurious_dragon/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/spurious_dragon/fork.py b/src/ethereum/spurious_dragon/fork.py
@@ -413,7 +413,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -529,7 +529,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum/tangerine_whistle/blocks.py b/src/ethereum/tangerine_whistle/blocks.py
@@ -63,7 +63,7 @@ class Block:
 
     header: Header
     transactions: Tuple[Transaction, ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[AnyHeader, ...]
 
 
 AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
diff --git a/src/ethereum/tangerine_whistle/fork.py b/src/ethereum/tangerine_whistle/fork.py
@@ -411,7 +411,7 @@ def make_receipt(
 def apply_body(
     block_env: vm.BlockEnvironment,
     transactions: Tuple[Transaction, ...],
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> vm.BlockOutput:
     """
     Executes a block.
@@ -527,7 +527,7 @@ def pay_rewards(
     state: State,
     block_number: Uint,
     coinbase: Address,
-    ommers: Tuple[Header, ...],
+    ommers: Tuple[AnyHeader, ...],
 ) -> None:
     """
     Pay rewards to the block miner as well as the ommers miners.
diff --git a/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py b/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py
diff --git a/tests/helpers/load_state_tests.py b/tests/helpers/load_state_tests.py
diff --git a/tests/homestead/test_rlp.py b/tests/homestead/test_rlp.py
