From dc9325f5d40f3f88ae63937c2c9fca052261d08b Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Tue, 15 Apr 2025 19:16:39 +0000 Subject: [PATCH 1/2] eels-resolutions: Update to `forks/prague` --- docs/CHANGELOG.md | 1 + eels_resolutions.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 9a3386ebdf2..9bf43c0979c 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,6 +15,7 @@ Test fixtures for use by clients are available for each release on the [Github r - ✨ The `static_filler` plug-in now has support for static state tests (from [GeneralStateTests](https://github.com/ethereum/tests/tree/develop/src/GeneralStateTestsFiller)) ([#1362](https://github.com/ethereum/execution-spec-tests/pull/1362)). - ✨ Introduce `pytest.mark.exception_test` to mark tests that contain an invalid transaction or block ([#1436](https://github.com/ethereum/execution-spec-tests/pull/1436)). - 🐞 Fix `DeprecationWarning: Pickle, copy, and deepcopy support will be removed from itertools in Python 3.14.` by avoiding use `itertools` object in the spec `BaseTest` pydantic model ([#1414](https://github.com/ethereum/execution-spec-tests/pull/1414)). +- 🔀 Filling EELS branch updated to `forks/prague` ([#1454](https://github.com/ethereum/execution-spec-tests/pull/1454)). #### `consume` diff --git a/eels_resolutions.json b/eels_resolutions.json index fd5d3ce6a30..7065a4740d1 100644 --- a/eels_resolutions.json +++ b/eels_resolutions.json @@ -36,6 +36,6 @@ }, "Prague": { "git_url": "https://github.com/ethereum/execution-specs.git", - "branch": "devnets/prague/6" + "branch": "forks/prague" } } From bf942c11678fb68534419e18efd22ef5d58ff1e6 Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Tue, 15 Apr 2025 19:42:29 +0000 Subject: [PATCH 2/2] fix(types): Duplicate `accessList` as `accessLists` --- src/ethereum_test_types/tests/test_types.py | 9 +++++++++ src/ethereum_test_types/types.py | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/ethereum_test_types/tests/test_types.py b/src/ethereum_test_types/tests/test_types.py index e535989185e..a11278b62d7 100644 --- a/src/ethereum_test_types/tests/test_types.py +++ b/src/ethereum_test_types/tests/test_types.py @@ -610,6 +610,15 @@ def test_account_merge( ], } ], + "accessLists": [ + { + "address": "0x0000000000000000000000000000000000001234", + "storageKeys": [ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000000000000000000000000001", + ], + } + ], "value": "0x0", "input": "0x0100", "gas": "0x5208", diff --git a/src/ethereum_test_types/types.py b/src/ethereum_test_types/types.py index 1c3f0426021..79872a429b4 100644 --- a/src/ethereum_test_types/types.py +++ b/src/ethereum_test_types/types.py @@ -655,6 +655,9 @@ def serialize_to_as_none(self, serializer): default = serializer(self) if default is not None and "to" not in default: default["to"] = None + # TODO: Remove when https://github.com/ethereum/execution-specs/issues/1194 is fixed. + if default is not None and "accessList" in default: + default["accessLists"] = default["accessList"] return default