Force forks to deal with blocks from previous forks

Author: SamWilsn

src/ethereum/arrow_glacier/blocks.py

@@ -9,12 +9,15 @@
 chain.
 """
 from dataclasses import dataclass
-from typing import Tuple, Union
+from typing import Optional, 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.london import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
@@ -51,6 +54,13 @@ class Header:
     base_fee_per_gas: Uint
 
 
+AnyHeader: TypeAlias = Union[previous_blocks.AnyHeader, Header]
+"""
+Represents all headers that may have appeared in the blockchain before or in
+the current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -63,6 +73,13 @@ class Block:
     ommers: Tuple[Header, ...]
 
 
+AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
+"""
+Represents all blocks that may have appeared in the blockchain before or in the
+current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Log:
@@ -109,3 +126,13 @@ def decode_receipt(receipt: Union[Bytes, Receipt]) -> Receipt:
         return rlp.decode_to(Receipt, receipt[1:])
     else:
         return receipt
+
+
+def header_base_fee_per_gas(header: AnyHeader) -> Optional[Uint]:
+    """
+    Returns the `base_fee_per_gas` of the given header, or `None` for headers
+    without that field.
+    """
+    if isinstance(header, Header):
+        return header.base_fee_per_gas
+    return previous_blocks.header_base_fee_per_gas(header)

src/ethereum/arrow_glacier/fork.py

@@ -26,9 +26,19 @@
     InvalidBlock,
     InvalidSenderError,
 )
+from ethereum.london import fork as previous_fork
 
 from . import vm
-from .blocks import Block, Header, Log, Receipt, encode_receipt
+from .blocks import (
+    AnyBlock,
+    AnyHeader,
+    Block,
+    Header,
+    Log,
+    Receipt,
+    encode_receipt,
+    header_base_fee_per_gas,
+)
 from .bloom import logs_bloom
 from .fork_types import Address
 from .state import (
@@ -63,6 +73,7 @@
 GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
 GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
+INITIAL_BASE_FEE = Uint(1000000000)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 10700000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
@@ -74,7 +85,7 @@ class BlockChain:
     History and current state of the block chain.
     """
 
-    blocks: List[Block]
+    blocks: List[AnyBlock]
     state: State
     chain_id: U64
 
@@ -270,7 +281,7 @@ def calculate_base_fee_per_gas(
     return Uint(expected_base_fee_per_gas)
 
 
-def validate_header(chain: BlockChain, header: Header) -> None:
+def validate_header(chain: BlockChain, header: AnyHeader) -> None:
     """
     Verifies a block header.
 
@@ -304,15 +315,25 @@ def validate_header(chain: BlockChain, header: Header) -> None:
         parent_header_number - first_block_number
     ].header
 
+    if not isinstance(header, Header):
+        assert not isinstance(parent_header, Header)
+        return previous_fork.validate_header(chain, header)
+
     if header.gas_used > header.gas_limit:
         raise InvalidBlock
 
-    expected_base_fee_per_gas = calculate_base_fee_per_gas(
-        header.gas_limit,
-        parent_header.gas_limit,
-        parent_header.gas_used,
-        parent_header.base_fee_per_gas,
-    )
+    expected_base_fee_per_gas = INITIAL_BASE_FEE
+    parent_base_fee_per_gas = header_base_fee_per_gas(parent_header)
+    if parent_base_fee_per_gas is not None:
+        # For every block except the first, calculate the base fee per gas
+        # based on the parent block.
+        expected_base_fee_per_gas = calculate_base_fee_per_gas(
+            header.gas_limit,
+            parent_header.gas_limit,
+            parent_header.gas_used,
+            parent_base_fee_per_gas,
+        )
+
     if expected_base_fee_per_gas != header.base_fee_per_gas:
         raise InvalidBlock
 
@@ -554,7 +575,7 @@ def apply_body(
 
 
 def validate_ommers(
-    ommers: Tuple[Header, ...], block_header: Header, chain: BlockChain
+    ommers: Tuple[AnyHeader, ...], block_header: Header, chain: BlockChain
 ) -> None:
     """
     Validates the ommers mentioned in the block.

src/ethereum/berlin/blocks.py

@@ -15,6 +15,9 @@
 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.muir_glacier import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
@@ -45,6 +48,13 @@ class Header:
     nonce: Bytes8
 
 
+AnyHeader: TypeAlias = Union[previous_blocks.AnyHeader, Header]
+"""
+Represents all headers that may have appeared in the blockchain before or in
+the current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -57,6 +67,13 @@ class Block:
     ommers: Tuple[Header, ...]
 
 
+AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
+"""
+Represents all blocks that may have appeared in the blockchain before or in the
+current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Log:

src/ethereum/berlin/fork.py

@@ -25,9 +25,18 @@
     InvalidBlock,
     InvalidSenderError,
 )
+from ethereum.muir_glacier import fork as previous_fork
 
 from . import vm
-from .blocks import Block, Header, Log, Receipt, encode_receipt
+from .blocks import (
+    AnyBlock,
+    AnyHeader,
+    Block,
+    Header,
+    Log,
+    Receipt,
+    encode_receipt,
+)
 from .bloom import logs_bloom
 from .fork_types import Address
 from .state import (
@@ -70,7 +79,7 @@ class BlockChain:
     History and current state of the block chain.
     """
 
-    blocks: List[Block]
+    blocks: List[AnyBlock]
     state: State
     chain_id: U64
 
@@ -203,7 +212,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         chain.blocks = chain.blocks[-255:]
 
 
-def validate_header(chain: BlockChain, header: Header) -> None:
+def validate_header(chain: BlockChain, header: AnyHeader) -> None:
     """
     Verifies a block header.
 
@@ -240,6 +249,10 @@ def validate_header(chain: BlockChain, header: Header) -> None:
     if header.gas_used > header.gas_limit:
         raise InvalidBlock
 
+    if not isinstance(header, Header):
+        assert not isinstance(parent_header, Header)
+        return previous_fork.validate_header(chain, header)
+
     parent_has_ommers = parent_header.ommers_hash != EMPTY_OMMER_HASH
     if header.timestamp <= parent_header.timestamp:
         raise InvalidBlock
@@ -461,7 +474,7 @@ def apply_body(
 
 
 def validate_ommers(
-    ommers: Tuple[Header, ...], block_header: Header, chain: BlockChain
+    ommers: Tuple[AnyHeader, ...], block_header: Header, chain: BlockChain
 ) -> None:
     """
     Validates the ommers mentioned in the block.

src/ethereum/byzantium/blocks.py

@@ -9,11 +9,14 @@
 chain.
 """
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, Union
 
 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.spurious_dragon import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
@@ -44,6 +47,13 @@ class Header:
     nonce: Bytes8
 
 
+AnyHeader: TypeAlias = Union[previous_blocks.AnyHeader, Header]
+"""
+Represents all headers that may have appeared in the blockchain before or in
+the current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -56,6 +66,13 @@ class Block:
     ommers: Tuple[Header, ...]
 
 
+AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
+"""
+Represents all blocks that may have appeared in the blockchain before or in the
+current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Log:

src/ethereum/byzantium/fork.py

@@ -24,9 +24,10 @@
     InvalidBlock,
     InvalidSenderError,
 )
+from ethereum.spurious_dragon import fork as previous_fork
 
 from . import vm
-from .blocks import Block, Header, Log, Receipt
+from .blocks import AnyBlock, AnyHeader, Block, Header, Log, Receipt
 from .bloom import logs_bloom
 from .fork_types import Address
 from .state import (
@@ -65,7 +66,7 @@ class BlockChain:
     History and current state of the block chain.
     """
 
-    blocks: List[Block]
+    blocks: List[AnyBlock]
     state: State
     chain_id: U64
 
@@ -198,7 +199,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         chain.blocks = chain.blocks[-255:]
 
 
-def validate_header(chain: BlockChain, header: Header) -> None:
+def validate_header(chain: BlockChain, header: AnyHeader) -> None:
     """
     Verifies a block header.
 
@@ -235,6 +236,10 @@ def validate_header(chain: BlockChain, header: Header) -> None:
     if header.gas_used > header.gas_limit:
         raise InvalidBlock
 
+    if not isinstance(header, Header):
+        assert not isinstance(parent_header, Header)
+        return previous_fork.validate_header(chain, header)
+
     parent_has_ommers = parent_header.ommers_hash != EMPTY_OMMER_HASH
     if header.timestamp <= parent_header.timestamp:
         raise InvalidBlock
@@ -453,7 +458,7 @@ def apply_body(
 
 
 def validate_ommers(
-    ommers: Tuple[Header, ...], block_header: Header, chain: BlockChain
+    ommers: Tuple[AnyHeader, ...], block_header: Header, chain: BlockChain
 ) -> None:
     """
     Validates the ommers mentioned in the block.

src/ethereum/cancun/blocks.py

@@ -9,12 +9,15 @@
 chain.
 """
 from dataclasses import dataclass
-from typing import Tuple, Union
+from typing import Optional, 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 U64, U256, Uint
+from typing_extensions import TypeAlias
+
+from ethereum.shanghai import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
@@ -69,6 +72,13 @@ class Header:
     parent_beacon_block_root: Root
 
 
+AnyHeader: TypeAlias = Union[previous_blocks.AnyHeader, Header]
+"""
+Represents all headers that may have appeared in the blockchain before or in
+the current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -82,6 +92,13 @@ class Block:
     withdrawals: Tuple[Withdrawal, ...]
 
 
+AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
+"""
+Represents all blocks that may have appeared in the blockchain before or in the
+current fork.
+"""
+
+
 @slotted_freezable
 @dataclass
 class Log:
@@ -130,3 +147,13 @@ def decode_receipt(receipt: Union[Bytes, Receipt]) -> Receipt:
         return rlp.decode_to(Receipt, receipt[1:])
     else:
         return receipt
+
+
+def header_base_fee_per_gas(header: AnyHeader) -> Optional[Uint]:
+    """
+    Returns the `base_fee_per_gas` of the given header, or `None` for headers
+    without that field.
+    """
+    if isinstance(header, Header):
+        return header.base_fee_per_gas
+    return previous_blocks.header_base_fee_per_gas(header)