feat(specs): support transaction types in fill unit tests (#1215)

winsvega · web-flow · commit 38621dc8f2cb · 2025-02-13T10:23:20.000-06:00
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_cancun_blockchain_test_engine_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_cancun_blockchain_test_engine_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Cancun": {
+    "000/my_chain_id_test/Cancun/tx_type_0": {
         "_info": {
             "hash": "0x82d853aef147345cedd8eb383c3ea00c1d1c4b64222911fd2580806de1f51c15",
             "fixture_format": "blockchain_test_engine"
@@ -122,4 +122,4 @@
             }
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_cancun_blockchain_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_cancun_blockchain_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Cancun": {
+    "000/my_chain_id_test/Cancun/tx_type_0": {
         "_info": {
             "hash": "0x6e77c3ba39a0874917e9dcd7f911de1e950e82e028603a0fc39630f973579fd9",
             "fixture_format": "blockchain_test"
@@ -140,4 +140,4 @@
             }
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_cancun_state_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_cancun_state_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Cancun": {
+    "000/my_chain_id_test/Cancun/tx_type_0": {
         "_info": {
             "hash": "0x9e980ae5cce8c6222831e99c0a33facfd7b8e50be053b84e3ed357c2c1818491",
             "fixture_format": "state_test"
@@ -91,4 +91,4 @@
             ]
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_cancun_state_test_tx_type_1.json b/src/ethereum_test_specs/tests/fixtures/chainid_cancun_state_test_tx_type_1.json
@@ -0,0 +1,105 @@
+{
+    "000/my_chain_id_test/Cancun/tx_type_1": {
+        "_info": {
+            "hash": "0x5ca0b01465e00811b102c33dadc2366055d6c73684bfb67b8414fa6146b38bca",
+            "fixture_format": "state_test"
+        },
+        "env": {
+            "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentGasLimit": "0x02540be400",
+            "currentNumber": "0x01",
+            "currentTimestamp": "0x03e8",
+            "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "currentDifficulty": "0x00",
+            "currentBaseFee": "0x07",
+            "currentExcessBlobGas": "0x00"
+        },
+        "config": {
+            "chainid": "0x01",
+            "blobSchedule": {
+                "Cancun": {
+                    "max": "0x06",
+                    "target": "0x03",
+                    "baseFeeUpdateFraction": "0x32f0ed"
+                }
+            }
+        },
+        "pre": {
+            "0x1000000000000000000000000000000000000000": {
+                "nonce": "0x00",
+                "balance": "0x00",
+                "code": "0x4660015500",
+                "storage": {}
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+                "nonce": "0x00",
+                "balance": "0x3635c9adc5dea00000",
+                "code": "0x",
+                "storage": {}
+            }
+        },
+        "transaction": {
+            "accessLists" : [
+                [
+                    {
+                        "address" : "0x0000000000000000000000000000000000001234",
+                        "storageKeys" : [
+                            "0x0000000000000000000000000000000000000000000000000000000000000000",
+                            "0x0000000000000000000000000000000000000000000000000000000000000001"
+                        ]
+                    }
+                ]
+            ],
+            "nonce": "0x00",
+            "gasPrice": "0x0a",
+            "gasLimit": [
+                "0x05f5e100"
+            ],
+            "to": "0x1000000000000000000000000000000000000000",
+            "value": [
+                "0x00"
+            ],
+            "data": [
+                "0x"
+            ],
+            "sender": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+        },
+        "post": {
+            "Cancun": [
+                {
+                    "hash": "0xac58d5721514e1a25b3d952de498e835c25ad680fc6883c7cccfdb89582734dd",
+                    "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes": "0x01f8bf01800a8405f5e1009410000000000000000000000000000000000000008080f85bf859940000000000000000000000000000000000001234f842a00000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000180a07d812c52979e6d8616538f2146e9499ca59f01b8c540d7a950ec7e695020a123a02cec47a8982651456ad416578b8792e197e4f1861bcbcfb33e3f2ef75109c322",
+                    "indexes": {
+                        "data": 0,
+                        "gas": 0,
+                        "value": 0
+                    },
+                    "state": {
+                        "0x1000000000000000000000000000000000000000": {
+                            "nonce": "0x00",
+                            "balance": "0x00",
+                            "code": "0x4660015500",
+                            "storage": {
+                                "0x01": "0x01"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+                            "balance": "0x0241cb",
+                            "nonce": "0x00",
+                            "code": "0x",
+                            "storage": {}
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+                            "nonce": "0x01",
+                            "balance": "0x3635c9adc5de987a06",
+                            "code": "0x",
+                            "storage": {}
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_istanbul_blockchain_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_istanbul_blockchain_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Istanbul": {
+    "000/my_chain_id_test/Istanbul/tx_type_0": {
         "_info": {
             "hash": "0x8b79023dc05fa9a4e374938ea0c6e04248cc6f30a3e2754737885901693e0c6e",
             "fixture_format": "blockchain_test"
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_london_blockchain_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_london_blockchain_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/London": {
+    "000/my_chain_id_test/London/tx_type_0": {
         "_info": {
             "hash": "0x8f3a32616f93086c33339f1d020a97103df4963edcef3a108babcc95d4cd3951",
             "fixture_format": "blockchain_test"
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_paris_blockchain_test_engine_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_paris_blockchain_test_engine_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Paris": {
+    "000/my_chain_id_test/Paris/tx_type_0": {
         "_info": {
             "hash": "0xf07acbb0efdbea6064fa443f0c8a74de6bb3e9895a7717759deedb99310eec4e",
             "fixture_format": "blockchain_test_engine"
@@ -92,4 +92,4 @@
             "chainid": "0x01"
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_paris_state_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_paris_state_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Paris": {
+    "000/my_chain_id_test/Paris/tx_type_0": {
         "_info": {
             "hash": "0x9de75fac42e382815fa12e0252e64b901ed1b0225446209223c8a3569e1c2857",
             "fixture_format": "state_test"
@@ -83,4 +83,4 @@
             "chainid": "0x01"
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_shanghai_blockchain_test_engine_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_shanghai_blockchain_test_engine_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Shanghai": {
+    "000/my_chain_id_test/Shanghai/tx_type_0": {
         "_info": {
             "hash": "0x361818ee5736a45c10c34ec445bf872d280b2f2ad61c297cceb14772b1393006",
             "fixture_format": "blockchain_test_engine"
@@ -94,4 +94,4 @@
             "chainid": "0x01"
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/fixtures/chainid_shanghai_state_test_tx_type_0.json b/src/ethereum_test_specs/tests/fixtures/chainid_shanghai_state_test_tx_type_0.json
@@ -1,5 +1,5 @@
 {
-    "000/my_chain_id_test/Shanghai": {
+    "000/my_chain_id_test/Shanghai/tx_type_0": {
         "_info": {
             "hash": "0xdd6900920530f2ba834d659b952c023a5962c352512529da8ed9614d99a0c1b8",
             "fixture_format": "state_test"
@@ -83,4 +83,4 @@
             "chainid": "0x01"
         }
     }
-}
+}
diff --git a/src/ethereum_test_specs/tests/test_fixtures.py b/src/ethereum_test_specs/tests/test_fixtures.py
@@ -2,14 +2,15 @@
 
 import json
 import os
+from enum import IntEnum
 from typing import Any, List, Mapping
 
 import pytest
 from click.testing import CliRunner
 
 import cli.check_fixtures
 from ethereum_clis import ExecutionSpecsTransitionTool
-from ethereum_test_base_types import Account, Address, Hash
+from ethereum_test_base_types import AccessList, Account, Address, Hash
 from ethereum_test_exceptions import TransactionException
 from ethereum_test_fixtures import (
     BlockchainEngineFixture,
@@ -101,24 +102,36 @@ def test_make_genesis(fork: Fork, fixture_hash: bytes):  # noqa: D103
     assert fixture.genesis.block_hash.startswith(fixture_hash)
 
 
+class TransactionType(IntEnum):
+    """Transaction types."""
+
+    LEGACY = 0
+    ACCESS_LIST = 1
+    BASE_FEE = 2
+    BLOB_TRANSACTION = 3
+    SET_CODE = 4
+
+
 @pytest.mark.run_in_serial
 @pytest.mark.parametrize(
-    "fork,fixture_format",
+    "fork,fixture_format,tx_type",
     [
-        (Istanbul, BlockchainFixture),
-        (London, BlockchainFixture),
-        (Cancun, BlockchainFixture),
-        (Paris, BlockchainEngineFixture),
-        (Shanghai, BlockchainEngineFixture),
-        (Cancun, BlockchainEngineFixture),
-        (Paris, StateFixture),
-        (Shanghai, StateFixture),
-        (Cancun, StateFixture),
+        (Istanbul, BlockchainFixture, TransactionType.LEGACY),
+        (London, BlockchainFixture, TransactionType.LEGACY),
+        (Cancun, BlockchainFixture, TransactionType.LEGACY),
+        (Paris, BlockchainEngineFixture, TransactionType.LEGACY),
+        (Shanghai, BlockchainEngineFixture, TransactionType.LEGACY),
+        (Cancun, BlockchainEngineFixture, TransactionType.LEGACY),
+        (Paris, StateFixture, TransactionType.LEGACY),
+        (Shanghai, StateFixture, TransactionType.LEGACY),
+        (Cancun, StateFixture, TransactionType.LEGACY),
+        (Cancun, StateFixture, TransactionType.ACCESS_LIST),
     ],
 )
 def test_fill_state_test(
     fork: Fork,
     fixture_format: FixtureFormat,
+    tx_type: TransactionType,
 ):
     """Test `ethereum_test.filler.fill_fixtures` with `StateTest`."""
     env = Environment(
@@ -134,15 +147,30 @@ def test_fill_state_test(
         "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": Account(balance=1000000000000000000000),
     }
 
-    tx = Transaction(
-        ty=0x0,
-        chain_id=0x0,
-        nonce=0,
-        to="0x1000000000000000000000000000000000000000",
-        gas_limit=100000000,
-        gas_price=10,
-        protected=False,
-    )
+    if tx_type == TransactionType.LEGACY:
+        tx = Transaction(
+            chain_id=0x0,
+            nonce=0,
+            to="0x1000000000000000000000000000000000000000",
+            gas_limit=100000000,
+            gas_price=10,
+            protected=False,
+        )
+    elif tx_type == TransactionType.ACCESS_LIST:
+        tx = Transaction(
+            ty=0x1,
+            chain_id=0x1,
+            nonce=0,
+            to="0x1000000000000000000000000000000000000000",
+            gas_limit=100000000,
+            gas_price=10,
+            access_list=[
+                AccessList(
+                    address=0x1234,
+                    storage_keys=[0, 1],
+                )
+            ],
+        )
 
     post = {
         "0x1000000000000000000000000000000000000000": Account(
@@ -165,10 +193,15 @@ def test_fill_state_test(
     )
     assert generated_fixture.__class__ == fixture_format
     fixture = {
-        f"000/my_chain_id_test/{fork}": generated_fixture.json_dict_with_info(hash_only=True),
+        f"000/my_chain_id_test/{fork}/tx_type_{tx_type}": generated_fixture.json_dict_with_info(
+            hash_only=True
+        ),
     }
 
-    expected_json_file = f"chainid_{fork.name().lower()}_{fixture_format.fixture_format_name}.json"
+    fixture_format_name = fixture_format.fixture_format_name
+    expected_json_file = (
+        f"chainid_{fork.name().lower()}_{fixture_format_name}_tx_type_{tx_type}.json"
+    )
     with open(
         os.path.join(
             "src",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "000/my_chain_id_test/Cancun": {`
	`2`	`+ "000/my_chain_id_test/Cancun/tx_type_0": {`
`3`	`3`	`"_info": {`
`4`	`4`	`"hash": "0x82d853aef147345cedd8eb383c3ea00c1d1c4b64222911fd2580806de1f51c15",`
`5`	`5`	`"fixture_format": "blockchain_test_engine"`
`@@ -122,4 +122,4 @@`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`-}`
	`125`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "000/my_chain_id_test/Istanbul": {`
	`2`	`+ "000/my_chain_id_test/Istanbul/tx_type_0": {`
`3`	`3`	`"_info": {`
`4`	`4`	`"hash": "0x8b79023dc05fa9a4e374938ea0c6e04248cc6f30a3e2754737885901693e0c6e",`
`5`	`5`	`"fixture_format": "blockchain_test"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "000/my_chain_id_test/London": {`
	`2`	`+ "000/my_chain_id_test/London/tx_type_0": {`
`3`	`3`	`"_info": {`
`4`	`4`	`"hash": "0x8f3a32616f93086c33339f1d020a97103df4963edcef3a108babcc95d4cd3951",`
`5`	`5`	`"fixture_format": "blockchain_test"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "000/my_chain_id_test/Paris": {`
	`2`	`+ "000/my_chain_id_test/Paris/tx_type_0": {`
`3`	`3`	`"_info": {`
`4`	`4`	`"hash": "0xf07acbb0efdbea6064fa443f0c8a74de6bb3e9895a7717759deedb99310eec4e",`
`5`	`5`	`"fixture_format": "blockchain_test_engine"`
`@@ -92,4 +92,4 @@`
`92`	`92`	`"chainid": "0x01"`
`93`	`93`	`}`
`94`	`94`	`}`
`95`		`-}`
	`95`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "000/my_chain_id_test/Shanghai": {`
	`2`	`+ "000/my_chain_id_test/Shanghai/tx_type_0": {`
`3`	`3`	`"_info": {`
`4`	`4`	`"hash": "0x361818ee5736a45c10c34ec445bf872d280b2f2ad61c297cceb14772b1393006",`
`5`	`5`	`"fixture_format": "blockchain_test_engine"`
`@@ -94,4 +94,4 @@`
`94`	`94`	`"chainid": "0x01"`
`95`	`95`	`}`
`96`	`96`	`}`
`97`		`-}`
	`97`	`+}`