From 593327bc8feaa65a1795ef1338985dacfadebd40 Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Wed, 7 May 2025 16:53:01 +0100 Subject: [PATCH 1/3] chore: bump prague to stable and osaka to develop. --- .github/configs/feature.yaml | 6 +++--- docs/CHANGELOG.md | 9 ++++++--- src/ethereum_test_forks/forks/forks.py | 8 -------- src/ethereum_test_forks/tests/test_forks.py | 6 +++--- tox.ini | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml index 9629e403246..9f9c49f8fde 100644 --- a/.github/configs/feature.yaml +++ b/.github/configs/feature.yaml @@ -1,15 +1,15 @@ # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too stable: evm-type: stable - fill-params: --until=Cancun + fill-params: --until=Prague solc: 0.8.21 develop: evm-type: develop - fill-params: --until=Prague + fill-params: --until=Osaka solc: 0.8.21 static: evm-type: static - fill-params: --until=Prague --fill-static-tests ./tests/static + fill-params: --until=Osaka --fill-static-tests ./tests/static solc: 0.8.21 benchmark_30M: evm-type: benchmark diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 15835b9afd5..6cbf0ae049b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -9,8 +9,10 @@ Test fixtures for use by clients are available for each release on the [Github r ### ๐Ÿ’ฅ Breaking Changes - Python 3.10 support was removed in this release ([#1808](https://github.com/ethereum/execution-spec-tests/pull/1808)). +- Tests for the Prague fork are now marked as stable will be included in the `fixtures_stable.tar.gz` tarball from now on. +- Tests for the Osaka fork are now included in the `fixtures_develop.tar.gz` tarball. -#### ๐Ÿ’ฅ Important Change for `fill` Users +### ๐Ÿ’ฅ Important Change for `fill` Users The output behavior of `fill` has changed ([#1608](https://github.com/ethereum/execution-spec-tests/pull/1608)): @@ -80,6 +82,7 @@ Users can select any of the artifacts depending on their testing needs for their - ๐Ÿ”€ Refactor and clean up of exceptions including EOF exceptions within client specific mappers [#1803](https://github.com/ethereum/execution-spec-tests/pull/1803). - ๐Ÿ”€ Rename `tests/zkevm/` to `tests/benchmark/` and replace the `zkevm` pytest mark with `benchmark` [#1804](https://github.com/ethereum/execution-spec-tests/pull/1804). - ๐Ÿ”€ Add fixture comparison check to optimize coverage workflow in CI ([#1833](https://github.com/ethereum/execution-spec-tests/pull/1833)). +- ๐Ÿ”€ Move Prague to stable and Osaka to develop ([#1573](https://github.com/ethereum/execution-spec-tests/pull/1573)). ### ๐Ÿงช Test Cases @@ -600,8 +603,8 @@ The following changes may be potentially breaking (all clients were tested with - ๐Ÿ’ฅ "Merge" has been renamed to "Paris" in the "network" field of the Blockchain tests, and in the "post" field of the State tests ([#480](https://github.com/ethereum/execution-spec-tests/pull/480)). - โœจ Port entry point scripts to use [click](https://click.palletsprojects.com) and add tests ([#483](https://github.com/ethereum/execution-spec-tests/pull/483)). - ๐Ÿ’ฅ As part of the pydantic conversion, the fixtures have the following (possibly breaking) changes ([#486](https://github.com/ethereum/execution-spec-tests/pull/486)): - - State test field `transaction` now uses the proper zero-padded hex number format for fields `maxPriorityFeePerGas`, `maxFeePerGas`, and `maxFeePerBlobGas`. - - Fixtures' hashes (in the `_info` field) are now calculated by removing the "_info" field entirely instead of it being set to an empty dict. + - State test field `transaction` now uses the proper zero-padded hex number format for fields `maxPriorityFeePerGas`, `maxFeePerGas`, and `maxFeePerBlobGas`. + - Fixtures' hashes (in the `_info` field) are now calculated by removing the "_info" field entirely instead of it being set to an empty dict. - ๐Ÿž Relax minor and patch dependency requirements to avoid conflicting package dependencies ([#510](https://github.com/ethereum/execution-spec-tests/pull/510)). - ๐Ÿ”€ Update all CI actions to use their respective Node.js 20 versions, ahead of their Node.js 16 version deprecations ([#527](https://github.com/ethereum/execution-spec-tests/pull/527)). - โœจ Releases now contain a `fixtures_eip7692.tar.gz` which contains all EOF fixtures ([#573](https://github.com/ethereum/execution-spec-tests/pull/573)). diff --git a/src/ethereum_test_forks/forks/forks.py b/src/ethereum_test_forks/forks/forks.py index d8f068a22b5..9ef7bf17980 100644 --- a/src/ethereum_test_forks/forks/forks.py +++ b/src/ethereum_test_forks/forks/forks.py @@ -1123,14 +1123,6 @@ class Prague(Cancun): "BLOB_BASE_FEE_UPDATE_FRACTION": 5007716, } - @classmethod - def is_deployed(cls) -> bool: - """ - Flag that the fork has not been deployed to mainnet; it is under active - development. - """ - return False - @classmethod def solc_min_version(cls) -> Version: """Return minimum version of solc that supports this fork.""" diff --git a/src/ethereum_test_forks/tests/test_forks.py b/src/ethereum_test_forks/tests/test_forks.py index 6ee5533ab25..34425f111fa 100644 --- a/src/ethereum_test_forks/tests/test_forks.py +++ b/src/ethereum_test_forks/tests/test_forks.py @@ -41,9 +41,9 @@ from ..transition_base_fork import transition_fork FIRST_DEPLOYED = Frontier -LAST_DEPLOYED = Cancun -LAST_DEVELOPMENT = Prague -DEVELOPMENT_FORKS = [Prague] +LAST_DEPLOYED = Prague +LAST_DEVELOPMENT = Osaka +DEVELOPMENT_FORKS = [Osaka] def test_transition_forks(): diff --git a/tox.ini b/tox.ini index 92cd0fab845..410c5c06db2 100644 --- a/tox.ini +++ b/tox.ini @@ -77,7 +77,7 @@ commands = [forks] -develop = Prague +develop = Osaka eip7692 = EOFv1 [testenv:tests-deployed] From 1f7523479502447eb130255a6332c1317b9d71ec Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Tue, 1 Jul 2025 17:06:54 +0100 Subject: [PATCH 2/3] chore: update changelog. --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6cbf0ae049b..45fc89202ac 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -12,7 +12,7 @@ Test fixtures for use by clients are available for each release on the [Github r - Tests for the Prague fork are now marked as stable will be included in the `fixtures_stable.tar.gz` tarball from now on. - Tests for the Osaka fork are now included in the `fixtures_develop.tar.gz` tarball. -### ๐Ÿ’ฅ Important Change for `fill` Users +#### ๐Ÿ’ฅ Important Change for `fill` Users The output behavior of `fill` has changed ([#1608](https://github.com/ethereum/execution-spec-tests/pull/1608)): From 5d2dd366e8b6dbec6abd807071a1c49ef0f1dfd0 Mon Sep 17 00:00:00 2001 From: danceratopz Date: Fri, 4 Jul 2025 00:22:10 +0200 Subject: [PATCH 3/3] docs: fix-up changelog for markdownlint --- docs/CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 45fc89202ac..60616bc61e1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -603,8 +603,10 @@ The following changes may be potentially breaking (all clients were tested with - ๐Ÿ’ฅ "Merge" has been renamed to "Paris" in the "network" field of the Blockchain tests, and in the "post" field of the State tests ([#480](https://github.com/ethereum/execution-spec-tests/pull/480)). - โœจ Port entry point scripts to use [click](https://click.palletsprojects.com) and add tests ([#483](https://github.com/ethereum/execution-spec-tests/pull/483)). - ๐Ÿ’ฅ As part of the pydantic conversion, the fixtures have the following (possibly breaking) changes ([#486](https://github.com/ethereum/execution-spec-tests/pull/486)): - - State test field `transaction` now uses the proper zero-padded hex number format for fields `maxPriorityFeePerGas`, `maxFeePerGas`, and `maxFeePerBlobGas`. - - Fixtures' hashes (in the `_info` field) are now calculated by removing the "_info" field entirely instead of it being set to an empty dict. + + - State test field `transaction` now uses the proper zero-padded hex number format for fields `maxPriorityFeePerGas`, `maxFeePerGas`, and `maxFeePerBlobGas`. + - Fixtures' hashes (in the `_info` field) are now calculated by removing the "_info" field entirely instead of it being set to an empty dict. + - ๐Ÿž Relax minor and patch dependency requirements to avoid conflicting package dependencies ([#510](https://github.com/ethereum/execution-spec-tests/pull/510)). - ๐Ÿ”€ Update all CI actions to use their respective Node.js 20 versions, ahead of their Node.js 16 version deprecations ([#527](https://github.com/ethereum/execution-spec-tests/pull/527)). - โœจ Releases now contain a `fixtures_eip7692.tar.gz` which contains all EOF fixtures ([#573](https://github.com/ethereum/execution-spec-tests/pull/573)).