feat(tests): export 'chain_id' in fixture config (#1131)

* export chain_id in fixtureConfig

* adjust unit tests

* Update src/pytest_plugins/consume/hive_simulators/conftest.py

* fix

* fix: Make fixture readers backwards compatible

---------

Co-authored-by: Mario Vega <[email protected]>

Author: winsvega

src/cli/check_fixtures.py

@@ -48,10 +48,12 @@ def check_json(json_file_path: Path):
                 message=f"Fixture hash attributes do not match for {fixture_name}",
             )
         if "hash" in fixture.info and fixture.info["hash"] != original_hash:
+            info_hash = fixture.info["hash"]
             raise HashMismatchExceptionError(
                 original_hash,
                 fixture.info["hash"],
-                message=f"Fixture info['hash'] does not match calculated hash for {fixture_name}",
+                message=f"Fixture info['hash'] does not match calculated hash for {fixture_name}:"
+                f"'{info_hash}' != '{original_hash}'",
             )
 
 

src/ethereum_test_fixtures/blockchain.py

@@ -16,7 +16,7 @@
 
 import ethereum_rlp as eth_rlp
 from ethereum_types.numeric import Uint
-from pydantic import AliasChoices, Field, PlainSerializer, computed_field
+from pydantic import AliasChoices, Field, PlainSerializer, computed_field, model_validator
 
 from ethereum_test_base_types import (
     Address,
@@ -401,6 +401,7 @@ class FixtureConfig(CamelModel):
     """Chain configuration for a fixture."""
 
     fork: str = Field(..., alias="network")
+    chain_id: ZeroPaddedHexNumber = Field(ZeroPaddedHexNumber(1), alias="chainid")
     blob_schedule: FixtureBlobSchedule | None = None
 
 
@@ -422,6 +423,22 @@ class BlockchainFixtureCommon(BaseFixture):
     last_block_hash: Hash = Field(..., alias="lastblockhash")  # FIXME: lastBlockHash
     config: FixtureConfig
 
+    @model_validator(mode="before")
+    @classmethod
+    def config_network_default(cls, data: Any) -> Any:
+        """
+        Check if the config.network is populated, otherwise use the root-level field value for
+        backward compatibility.
+        """
+        if (
+            isinstance(data, dict)
+            and "config" in data
+            and isinstance(data["config"], dict)
+            and "network" not in data["config"]
+        ):
+            data["config"]["network"] = data["network"]
+        return data
+
     def get_fork(self) -> str | None:
         """Return fork of the fixture as a string."""
         return self.fork

src/ethereum_test_fixtures/state.py

@@ -98,6 +98,7 @@ class FixtureConfig(CamelModel):
     """Chain configuration for a fixture."""
 
     blob_schedule: FixtureBlobSchedule | None = None
+    chain_id: ZeroPaddedHexNumber = Field(ZeroPaddedHexNumber(1), alias="chainid")
 
 
 class StateFixture(BaseFixture):

src/ethereum_test_specs/blockchain.py

@@ -588,6 +588,7 @@ def make_fixture(
             config=FixtureConfig(
                 fork=network_info,
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(fork.blob_schedule()),
+                chain_id=self.chain_id,
             ),
         )
 
@@ -686,6 +687,7 @@ def make_hive_fixture(
             last_block_hash=head_hash,
             config=FixtureConfig(
                 fork=network_info,
+                chain_id=self.chain_id,
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(fork.blob_schedule()),
             ),
         )

src/ethereum_test_specs/state.py

@@ -178,6 +178,7 @@ def make_state_test_fixture(
             transaction=FixtureTransaction.from_transaction(tx),
             config=FixtureConfig(
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(fork.blob_schedule()),
+                chain_id=self.chain_id,
             ),
         )
 

src/ethereum_test_specs/tests/fixtures/blockchain_london_invalid_filled.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/London": {
         "_info": {
-            "hash": "0x76838b666ca44a330fcf031ae20392647c3251ad54f29e995890bd608948b915",
+            "hash": "0x94854ed3844fcf06f8b74349e63aa0e6dcf43a307f5888b93be310ff39de55ff",
             "fixture_format": "blockchain_test"
         },
         "network": "London",
@@ -541,7 +541,8 @@
         },
         "sealEngine": "NoProof",
         "config": {
-            "network": "London"
+            "network": "London",
+            "chainid": "0x01"
         }
     }
 }

src/ethereum_test_specs/tests/fixtures/blockchain_london_valid_filled.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/London": {
         "_info": {
-            "hash": "0x7694748a5d5e0ea1e5e914210fb8db7c8077f070dd29ffcb13774d526aee35de",
+            "hash": "0x4ba67dfce5957e3339bf3e6e7ad78f4345b34a087c4656c92fddbef3726b1ec2",
             "fixture_format": "blockchain_test"
         },
         "network": "London",
@@ -419,7 +419,8 @@
         },
         "sealEngine": "NoProof",
         "config": {
-            "network": "London"
+            "network": "London",
+            "chainid": "0x01"
         }
     }
 }

src/ethereum_test_specs/tests/fixtures/blockchain_shanghai_invalid_filled_engine.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/Shanghai": {
         "_info": {
-            "hash": "0x75f8ac4dbd5bfee6046a0edd5bec5448e23d1f249c10025a47bfb46ff7dab303",
+            "hash": "0xf3c8b8fddf2e80c7a3d4764f9ee022d2e3ef44898e279d1242750cd7083aead4",
             "fixture_format": "blockchain_test_engine"
         },
         "lastblockhash": "0xfc75f11c05ec814a890141bef919bb7c20dd29245e37e9bcea66008dfde98526",
@@ -314,7 +314,8 @@
             }
         },
         "config": {
-            "network": "Shanghai"
+            "network": "Shanghai",
+            "chainid": "0x01"
         }
     }
 }

src/ethereum_test_specs/tests/fixtures/blockchain_shanghai_valid_filled_engine.json

@@ -1,7 +1,7 @@
 {
     "000/my_blockchain_test/Shanghai": {
         "_info": {
-            "hash": "0xe0738285cd63c07ce0dbc7801ad9d91962d25edcca544bc8475d88a86cab4a15",
+            "hash": "0xed072f321c295a71beffd44f8130bc90a4fe755a506b30b2057aa342bd9c00f2",
             "fixture_format": "blockchain_test_engine"
         },
         "lastblockhash": "0xfc75f11c05ec814a890141bef919bb7c20dd29245e37e9bcea66008dfde98526",
@@ -260,7 +260,8 @@
             }
         },
         "config": {
-            "network": "Shanghai"
+            "network": "Shanghai",
+            "chainid": "0x01"
         }
     }
 }

src/ethereum_test_specs/tests/fixtures/chainid_cancun_blockchain_test.json

@@ -1,7 +1,7 @@
 {
     "000/my_chain_id_test/Cancun": {
         "_info": {
-            "hash": "0xdc67839b9bbea740321a4ce4cd9124e14387e74627761cf65ff425bc44d56c1e",
+            "hash": "0x6e77c3ba39a0874917e9dcd7f911de1e950e82e028603a0fc39630f973579fd9",
             "fixture_format": "blockchain_test"
         },
         "network": "Cancun",
@@ -130,6 +130,7 @@
         "sealEngine": "NoProof",
         "config": {
             "network": "Cancun",
+            "chainid": "0x01",
             "blobSchedule": {
                 "Cancun": {
                     "max": "0x06",