feat(fixtures/specs): Add fixture config objects

Author: marioevz

docs/consuming_tests/blockchain_test.md

@@ -54,8 +54,12 @@ For each [`Fixture`](#fixture) test object in the JSON fixture file, perform the
 
 #### - `network`: [`Fork`](./common_types.md#fork)
 
+##### TO BE DEPRECATED
+
 Fork configuration for the test.
 
+This field is going to be replaced by the value contained in `config.network`.
+
 #### - `pre`: [`Alloc`](./common_types.md#alloc-mappingaddressaccount)
 
 Starting account allocation for the test. State root calculated from this allocation must match the one in the genesis block.
@@ -84,6 +88,16 @@ Account allocation for verification after all the blocks have been processed.
 
 Deprecated: Seal engine used to mine the blocks.
 
+#### - `config`: [`FixtureConfig`](#fixtureconfig)
+
+Chain configuration object to be applied to the client running the blockchain test.
+
+### `FixtureConfig`
+
+#### - `network`: [`Fork`](./common_types.md#fork)
+
+Fork configuration for the test. It is guaranteed that this field contains the same value as the root field `network`.
+
 ### `FixtureHeader`
 
 #### - `parentHash`: [`Hash`](./common_types.md#hash)

docs/consuming_tests/blockchain_test_engine.md

@@ -45,8 +45,12 @@ For each [`HiveFixture`](#hivefixture) test object in the JSON fixture file, per
 
 #### - `network`: [`Fork`](./common_types.md#fork)
 
+##### TO BE DEPRECATED
+
 Fork configuration for the test.
 
+This field is going to be replaced by the value contained in `config.network`.
+
 #### - `genesisBlockHeader`: [`FixtureHeader`](./blockchain_test.md#fixtureheader)
 
 Genesis block header.
@@ -63,10 +67,24 @@ Version of the `engine_forkchoiceUpdatedVX` directive to use to set the head of
 
 Starting account allocation for the test. State root calculated from this allocation must match the one in the genesis block.
 
+#### - `lastblockhash`: [`Hash`](./common_types.md#hash)
+
+Hash of the last valid block, or the genesis block hash if the list of blocks is empty, or contains a single invalid block.
+
 #### - `post`: [`Alloc`](./common_types.md#alloc-mappingaddressaccount)
 
 Account allocation for verification after all the blocks have been processed.
 
+#### - `config`: [`FixtureConfig`](#fixtureconfig)
+
+Chain configuration object to be applied to the client running the blockchain engine test.
+
+### `FixtureConfig`
+
+#### - `network`: [`Fork`](./common_types.md#fork)
+
+Fork configuration for the test. It is guaranteed that this field contains the same value as the root field `network`.
+
 ### `FixtureEngineNewPayload`
 
 #### - `executionPayload`: [`FixtureExecutionPayload`](#fixtureexecutionpayload)

docs/consuming_tests/state_test.md

@@ -60,6 +60,14 @@ Transaction to be executed.
 
 Mapping of lists of post for verification per fork, where each element represents a single possible outcome of the transaction execution after being applied to the `pre`.
 
+#### - `config`: [`FixtureConfig`](#fixtureconfig)
+
+Chain configuration object.
+
+### `FixtureConfig`
+
+At the moment, this object is an empty dictionary and contains no fields.
+
 ### `FixtureEnvironment`
 
 #### - `currentCoinbase`: [`Address`](./common_types.md#address)

src/ethereum_test_fixtures/blockchain.py

@@ -396,6 +396,12 @@ def without_rlp(self) -> FixtureBlockBase:
         )
 
 
+class FixtureConfig(CamelModel):
+    """Chain configuration for a fixture."""
+
+    fork: str = Field(..., alias="network")
+
+
 class InvalidFixtureBlock(CamelModel):
     """Representation of an invalid Ethereum block within a test Fixture."""
 
@@ -412,6 +418,7 @@ class BlockchainFixtureCommon(BaseFixture):
     pre: Alloc
     post_state: Alloc | None = Field(None)
     last_block_hash: Hash = Field(..., alias="lastblockhash")  # FIXME: lastBlockHash
+    config: FixtureConfig
 
     def get_fork(self) -> str | None:
         """Return fork of the fixture as a string."""

src/ethereum_test_fixtures/state.py

@@ -86,6 +86,12 @@ class FixtureForkPost(CamelModel):
     expect_exception: TransactionExceptionInstanceOrList | None = None
 
 
+class FixtureConfig(CamelModel):
+    """Chain configuration for a fixture."""
+
+    pass
+
+
 class StateFixture(BaseFixture):
     """Fixture for a single StateTest."""
 
@@ -96,6 +102,7 @@ class StateFixture(BaseFixture):
     pre: Alloc
     transaction: FixtureTransaction
     post: Mapping[str, List[FixtureForkPost]]
+    config: FixtureConfig
 
     def get_fork(self) -> str | None:
         """Return fork of the fixture as a string."""

src/ethereum_test_specs/blockchain.py

@@ -30,6 +30,7 @@
 from ethereum_test_fixtures.blockchain import (
     FixtureBlock,
     FixtureBlockBase,
+    FixtureConfig,
     FixtureEngineNewPayload,
     FixtureHeader,
     FixtureTransaction,
@@ -573,14 +574,18 @@ def make_fixture(
                 )
 
         self.verify_post_state(t8n, t8n_state=alloc)
+        network_info = self.network_info(fork, eips)
         return BlockchainFixture(
-            fork=self.network_info(fork, eips),
+            fork=network_info,
             genesis=genesis.header,
             genesis_rlp=genesis.rlp,
             blocks=fixture_blocks,
             last_block_hash=head,
             pre=pre,
             post_state=alloc,
+            config=FixtureConfig(
+                fork=network_info,
+            ),
         )
 
     def make_hive_fixture(
@@ -666,15 +671,19 @@ def make_hive_fixture(
                 error_code=None,
             )
 
+        network_info = self.network_info(fork, eips)
         return BlockchainEngineFixture(
-            fork=self.network_info(fork, eips),
+            fork=network_info,
             genesis=genesis.header,
             payloads=fixture_payloads,
             fcu_version=fcu_version,
             pre=pre,
             post_state=alloc,
             sync_payload=sync_payload,
             last_block_hash=head_hash,
+            config=FixtureConfig(
+                fork=network_info,
+            ),
         )
 
     def generate(

src/ethereum_test_specs/state.py

@@ -17,6 +17,7 @@
     StateFixture,
 )
 from ethereum_test_fixtures.state import (
+    FixtureConfig,
     FixtureEnvironment,
     FixtureForkPost,
     FixtureTransaction,
@@ -173,6 +174,7 @@ def make_state_test_fixture(
                 ]
             },
             transaction=FixtureTransaction.from_transaction(tx),
+            config=FixtureConfig(),
         )
 
     def generate(

src/ethereum_test_specs/tests/fixtures/blockchain_london_invalid_filled.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/London": {
         "_info": {
-            "hash": "0x4de3f84e3cb1e678141d81ce96ce75edb53f1824a708e26098b610c3c1030e66",
+            "hash": "0x76838b666ca44a330fcf031ae20392647c3251ad54f29e995890bd608948b915",
             "fixture_format": "blockchain_test"
         },
         "network": "London",
@@ -539,6 +539,9 @@
                 "storage": {}
             }
         },
-        "sealEngine": "NoProof"
+        "sealEngine": "NoProof",
+        "config": {
+            "network": "London"
+        }
     }
 }

src/ethereum_test_specs/tests/fixtures/blockchain_london_valid_filled.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/London": {
         "_info": {
-            "hash": "0x91032fb245f4488b204198312cbf16429c121435705ac3f9c6eb3943ec0bc36d",
+            "hash": "0x7694748a5d5e0ea1e5e914210fb8db7c8077f070dd29ffcb13774d526aee35de",
             "fixture_format": "blockchain_test"
         },
         "network": "London",
@@ -417,6 +417,9 @@
                 "storage": {}
             }
         },
-        "sealEngine": "NoProof"
+        "sealEngine": "NoProof",
+        "config": {
+            "network": "London"
+        }
     }
 }

src/ethereum_test_specs/tests/fixtures/blockchain_shanghai_invalid_filled_engine.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/Shanghai": {
         "_info": {
-            "hash": "0x107426e7483fe00d8db263f7522d523a6efbed5c93fd98006e65593ce496a1c4",
+            "hash": "0x75f8ac4dbd5bfee6046a0edd5bec5448e23d1f249c10025a47bfb46ff7dab303",
             "fixture_format": "blockchain_test_engine"
         },
         "lastblockhash": "0xfc75f11c05ec814a890141bef919bb7c20dd29245e37e9bcea66008dfde98526",
@@ -188,7 +188,6 @@
                 "forkchoiceUpdatedVersion": "2"
             }
         ],
-        "lastblockhash": "0xfc75f11c05ec814a890141bef919bb7c20dd29245e37e9bcea66008dfde98526",
         "pre": {
             "0x000000000000000000000000000000000000c0de": {
                 "nonce": "0x01",
@@ -313,6 +312,9 @@
                 "code": "0x",
                 "storage": {}
             }
+        },
+        "config": {
+            "network": "Shanghai"
         }
     }
 }