refactor(specs): Genesis header creation

Author: marioevz

src/ethereum_test_fixtures/blockchain.py

@@ -222,18 +222,18 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> "FixtureHead
         return FixtureHeader(
             parent_hash=0,
             ommers_hash=EmptyOmmersRoot,
-            fee_recipient=0,
+            fee_recipient=env.fee_recipient,
             state_root=state_root,
             transactions_trie=EmptyTrieRoot,
             receipts_root=EmptyTrieRoot,
             logs_bloom=0,
-            difficulty=0x20000 if env.difficulty is None else env.difficulty,
-            number=0,
+            difficulty=env.difficulty,
+            number=env.number,
             gas_limit=env.gas_limit,
             gas_used=0,
-            timestamp=0,
-            extra_data=b"\x00",
-            prev_randao=0,
+            timestamp=env.timestamp,
+            extra_data=env.extra_data,
+            prev_randao=env.prev_randao,
             nonce=0,
             base_fee_per_gas=env.base_fee_per_gas,
             blob_gas_used=env.blob_gas_used,

src/ethereum_test_specs/blockchain.py

@@ -17,7 +17,6 @@
     HeaderNonce,
     HexNumber,
     Number,
-    ZeroPaddedHexNumber,
 )
 from ethereum_test_exceptions import (
     BlockException,
@@ -386,6 +385,18 @@ def verify_block_exception(self, transition_tool_exceptions_reliable: bool):
         )
 
 
+GENESIS_DEFAULTS: Dict[str, Any] = {
+    "fee_recipient": 0,
+    "number": 0,
+    "timestamp": 0,
+    "extra_data": b"\x00",
+    "prev_randao": 0,
+}
+"""
+Default values for the genesis environment that are used to create all genesis headers.
+"""
+
+
 class BlockchainTest(BaseTest):
     """Filler type that tests multiple blocks (valid or invalid) in a chain."""
 
@@ -435,9 +446,10 @@ def discard_fixture_format_by_marks(
 
     def get_genesis_environment(self, fork: Fork) -> Environment:
         """Get the genesis environment for pre-allocation groups."""
-        env = self.genesis_environment.set_fork_requirements(fork)
-        env.number = ZeroPaddedHexNumber(0)
-        return env
+        modified_values = self.genesis_environment.set_fork_requirements(fork).model_dump(
+            exclude_unset=True
+        )
+        return Environment(**(GENESIS_DEFAULTS | modified_values))
 
     def make_genesis(
         self, *, fork: Fork, apply_pre_allocation_blockchain: bool

src/ethereum_test_specs/state.py

@@ -242,7 +242,7 @@ def make_state_test_fixture(
 
     def get_genesis_environment(self, fork: Fork) -> Environment:
         """Get the genesis environment for pre-allocation groups."""
-        return self._generate_blockchain_genesis_environment(fork=fork).set_fork_requirements(fork)
+        return self.generate_blockchain_test(fork=fork).get_genesis_environment(fork=fork)
 
     def generate(
         self,

src/ethereum_test_specs/tests/test_fixtures.py

@@ -470,7 +470,7 @@ def genesis_environment(self):  # noqa: D102
         return Environment(
             gas_limit=100_000_000_000_000_000,
             base_fee_per_gas=1000,
-            fee_recipient="0xba5e000000000000000000000000000000000000",
+            fee_recipient="0x0000000000000000000000000000000000000000",
         )
 
     @pytest.fixture
@@ -867,7 +867,7 @@ def test_fill_blockchain_invalid_txs(
     genesis_environment = Environment(
         gas_limit=100_000_000_000_000_000,
         base_fee_per_gas=1000,
-        fee_recipient="0xba5e000000000000000000000000000000000000",
+        fee_recipient="0x0000000000000000000000000000000000000000",
     )
 
     fixture_format: FixtureFormat = (