Move forks into namespace package #1416

SamWilsn · 2025-09-08T19:44:48Z

Note to Reviewers

This pull request will fail tests until a change has been made in EEST:

diff --git a/src/ethereum_spec_tests/ethereum_clis/clis/execution_specs.py b/src/ethereum_spec_tests/ethereum_clis/clis/execution_specs.py
index 7dc7f1ef5..67c518d6b 100644
--- a/src/ethereum_spec_tests/ethereum_clis/clis/execution_specs.py
+++ b/src/ethereum_spec_tests/ethereum_clis/clis/execution_specs.py
@@ -152,10 +152,10 @@ class ExecutionSpecsExceptionMapper(ExceptionMapper):
             "InsufficientMaxFeePerBlobGasError"
         ),
         TransactionException.TYPE_3_TX_PRE_FORK: (
-            "module 'ethereum.shanghai.transactions' has no attribute 'BlobTransaction'"
+            "module 'ethereum.forks.shanghai.transactions' has no attribute 'BlobTransaction'"
         ),
         TransactionException.TYPE_4_TX_PRE_FORK: (
-            "'ethereum.cancun.transactions' has no attribute 'SetCodeTransaction'"
+            "'ethereum.forks.cancun.transactions' has no attribute 'SetCodeTransaction'"
         ),
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "InvalidBlobVersionedHashError"

Also git guesses the renames very wrong for this sometimes. I don't know why.

What was wrong?

Related to Issue #1357

It isn't possible to load forks that aren't contained in the ethereum-execution package itself.

How was it fixed?

This PR moves all forks into a namespace package, which allows any package to add a fork.

Cute Animal Picture

codecov-commenter · 2025-09-09T01:58:35Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 93.49112% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.07%. Comparing base (cdbe21f) to head (68129ed).
⚠️ Report is 1 commits behind head on forks/osaka.

Files with missing lines	Patch %	Lines
src/ethereum/forks/byzantium/trie.py	94.36%	4 Missing and 4 partials ⚠️
src/ethereum/forks/dao_fork/dao.py	70.00%	3 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@               Coverage Diff                @@
##           forks/osaka    #1416       +/-   ##
================================================
- Coverage        97.16%   86.07%   -11.10%     
================================================
  Files              583      743      +160     
  Lines            34637    44072     +9435     
  Branches          3056     3891      +835     
================================================
+ Hits             33656    37936     +4280     
- Misses             536     5659     +5123     
- Partials           445      477       +32

Flag	Coverage Δ
unittests	`86.07% <93.49%> (-11.10%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

gurukamath

LGTM!

src/ethereum_spec_tools/evm_tools/t8n/__init__.py

Carsons-Eels

The Network Upgrades PR was to be rolled into this one ( #1414 ) but diff looks like all those files just got deleted rather than moved or updated. Is this intended?

SamWilsn · 2025-09-12T01:25:15Z

The content has been moved into src/ethereum/forks/*/__init__.py

A PR in the specs repo broke our existing links: ethereum/execution-specs#1416 This PR fixes it and adds the Prague and Osaka specs.

…mulator (ethereum#1416) * fix(exceptions): UndefinedException return on new * feat(rpc,plugins/consume): Support exception mapper * fix(exceptions): Allow undefined mapper * feat(plugins/consume): Add more mappers * fix(logging): don't use newlines within log messages * refactor(exceptions,specs): ExceptionWithMessage contains a list * new(exceptions): Add `INVALID_BLOCK_HASH` exception * feat(clis): Add ethjs exceptions * feat(clis): Add geth exceptions * feat(plugins/consume): Add besu exceptions * feat(plugins/consume): Add nethermind exceptions * feat(plugins/consume): Add reth exceptions * feat(consume): add `--strict-exception-matching` parameter * more reth exceptions * refactor mappers * add ethjs exception * fix(tests): EIP-7685: Add expected exception to `test_invalid_multi_type_requests_engine` * add reth exception * fix(plugins/consume): log failure * feat(clis): Add Erigon Exception Mapper * feat(specs): Allow setting expected block exception for state tests (only affects generated block tests) * fix(tests): Add block exceltion to test_blob_type_tx_pre_fork * fix(clis): Exceptions in mappers * change(plugins/consume): Enable strict exception matching by default * fix(specs): Exception message check on strict match * docs: changelog * chore(clis): update exception mappers for TYPE_4_TX_PRE_FORK * refactor(consume): cache exception mappers in session-scoped fixture * refactor(consume): make string match more robust by applying `lower()` * feat(consume): allow disabling of strict exception checking per fork * refactor(consume/hive): create `strict_exception_matching` fixture * fix: whitelist * changelog: Add exception * changelog: Invalid versioned hashes exception * refactor(consume/engine): Better error logging * fix(clis/reth): Exception mapper * fix(clis/besu): Exception mapper * fix(clis/geth): Exception mapper * fix(clis/ethereumjs): Exception mapper * fix(clis/erigon): Exception mapper --------- Co-authored-by: danceratopz <danceratopz@gmail.com>

A PR in the specs repo broke our existing links: ethereum/execution-specs#1416 This PR fixes it and adds the Prague and Osaka specs.

SamWilsn requested review from Carsons-Eels and gurukamath September 8, 2025 19:44

SamWilsn force-pushed the namespace-forks branch 2 times, most recently from 99377ad to 426e56d Compare September 8, 2025 21:43

marioevz mentioned this pull request Sep 10, 2025

fix(clis/eels): Use regex for missing-module-definition exceptions ethereum/execution-spec-tests#2127

Merged

5 tasks

SamWilsn mentioned this pull request Sep 10, 2025

Network upgrades #1414

Closed

gurukamath approved these changes Sep 11, 2025

View reviewed changes

src/ethereum_spec_tools/evm_tools/t8n/__init__.py Show resolved Hide resolved

gurukamath approved these changes Sep 11, 2025

View reviewed changes

gurukamath mentioned this pull request Sep 11, 2025

refactor(tool): Change is_after_fork method #1424

Closed

Carsons-Eels reviewed Sep 11, 2025

View reviewed changes

SamWilsn force-pushed the namespace-forks branch from 5e55ec5 to 5f87dbf Compare September 15, 2025 17:52

SamWilsn added 2 commits September 15, 2025 14:03

Move forks into namespace package

f6fb274

Move network-upgrades into __init__.py

68129ed

SamWilsn force-pushed the namespace-forks branch from 5f87dbf to 68129ed Compare September 15, 2025 18:14

SamWilsn merged commit 5ddb904 into ethereum:forks/osaka Sep 16, 2025
8 checks passed

SamWilsn deleted the namespace-forks branch September 16, 2025 00:23

johnletey mentioned this pull request Sep 16, 2025

params: add prague spec url to description ethereum/go-ethereum#32548

Closed

lightclient mentioned this pull request Sep 19, 2025

params: update config description links to new format ethereum/go-ethereum#32681

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move forks into namespace package #1416

Move forks into namespace package #1416

Uh oh!

SamWilsn commented Sep 8, 2025 •

edited

Loading

Uh oh!

codecov-commenter commented Sep 9, 2025 •

edited

Loading

Uh oh!

gurukamath left a comment

Uh oh!

Uh oh!

Carsons-Eels left a comment

Uh oh!

SamWilsn commented Sep 12, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Move forks into namespace package #1416

Move forks into namespace package #1416

Uh oh!

Conversation

SamWilsn commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Note to Reviewers

What was wrong?

How was it fixed?

Cute Animal Picture

Uh oh!

codecov-commenter commented Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

gurukamath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Carsons-Eels left a comment

Choose a reason for hiding this comment

Uh oh!

SamWilsn commented Sep 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SamWilsn commented Sep 8, 2025 •

edited

Loading

codecov-commenter commented Sep 9, 2025 •

edited

Loading

SamWilsn commented Sep 12, 2025 •

edited

Loading