Move forks into namespace package by SamWilsn · Pull Request #1416 · ethereum/execution-specs

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.

* core/overlay: copy BaseRoot in TransitionState.Copy (#32613) This change ensures TransitionState.Copy preserves BaseRoot. During a Verkle transition, ts.BaseRoot is required to construct the overlay MPT when ts.InTransition() is true. Previously, copies dropped BaseRoot, risking an invalid zero-hash base trie and inconsistent behavior. * core/txpool/blobpool: filter blob txs with sidecar version (#32577) As a consequence of moving blob sidecar version migration code around, we ended up building blocks with a mix of v0 and v1 blob transactions (different proof encoding in the sidecar). This PR makes sure we are not building illegal blocks after Osaka. Blob migration is left for another PR. Related issues and PRs: - https://github.com/ethereum/go-ethereum/pull/31791 - https://github.com/ethereum/go-ethereum/pull/32347 - https://github.com/ethereum/go-ethereum/pull/31966 - https://github.com/ethereum/go-ethereum/issues/32235 --------- Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * core/txpool/blobpool: migrate billy to new slot size (#31966) Implements a migration path for the blobpool slotter --------- Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * rlp: remove duplicate optionalAndTailField test case (#32614) * eth/catalyst: allow fcuV3 for BPO forks (#32615) This fixes an issue with the engine API after BPO forks have passed. * go.mod: add tool section in module file (#32598) This removes the tools.go workaround in favor of the official tool management infrastructure, which was added in Go 1.24. * cmd/keeper: add the keeper zkvm guest program (#32543) Keeper is a zmvm guest program that runs the block transition. It relies on the zkvm maker implementing `getInput`. For now, we only provide a single implementation for the 'ziren' VM. Why keeper? In the _Mass Effect_ lore, the keepers are animals (?) who maintain the citadel. Nothing is known from them, and attempts at tampering with them have failed, as they self-destruct upon inquiry. They have a secret, nefarious purpose that is only revealed later in the game series, don't want any spoilers so I didn't dig deeper. All in all, a good metaphor for zkvms. --------- Co-authored-by: weilzkm <140377101+weilzkm@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/evm/internal/t8ntool: use ApplyTransaction instead of ApplyMessage (#32618) ApplyTransaction calls the hooks and builds the receipt, so some duplicated code can be removed from t8ntool. Test cases have been changed to add the `blockNumber` and `blockHash` in receipts, since they were previously not filled in. * chore(superchain-registry): bump version for addresses cleanup (#672) * eth/downloader: Fix deposit receipt correction (#680) * core/tracing: remove unnecessary 'copy' field skip in TestAllHooksCalled (#32622) This test iterated over Hooks fields and skipped a field named copy. The Hooks struct has no such field, making the condition dead code. * p2p/discover: expose timeout in lookupFailed Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> # Conflicts: # p2p/discover/lookup.go * core/rawdb: fix typo in TestWriteAncientHeaderChain (#32587) * core/stateless: API methods to get execution witness of block This PR adds a new RPC call, which re-executes a block with stateless mode activated, so that the witness data are collected and returned. They are `debug_executionWitnessByHash` which takes in a block hash and `debug_executionWitness` which takes in a block number. --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> * core/vm: use go-bigmodexpfix for modexp (#32576) This changes the modexp precompile to use a fork of math/big with some patches by @GottfriedHerold to improve worst-case performance. * revert to using table parameter using it.lookup.tab inside is unsafe Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * go.mod: update c-kzg (#32639) Updates c-kzg to the latest release: https://github.com/ethereum/c-kzg-4844/releases/tag/v2.1.3 * go.mod: update go-eth-kzg (#32640) Updates go-eth-kzg: https://github.com/crate-crypto/go-eth-kzg/releases/tag/v1.4.0 * core/stateless: add vmwitnessstats cli flag to report leaf stats + log to console (#32619) The format that is currently reported by the chain isn't very useful, as it gives an average for ALL the nodes, and not only the leaves, which skews the results. Also, until now there was no way to activate the reporting of errors. We also decided that metrics weren't the right tool to report this data, so we decided to dump it to the console if the flag is enabled. A better system should be built, but for now, printing to the logs does the job. * triedb/pathdb: generalize the history indexer (#32523) This pull request is based on #32306 , is the second part for shipping trienode history. Specifically, this pull request generalize the existing index mechanism, making is usable by both state history and trienode history in the near future. * trie: add sub-trie iterator support (#32520) - Adds `NodeIteratorWithPrefix()` method to support iterating only nodes within a specific key prefix - Adds `NodeIteratorWithRange()` method to support iterating only nodes within a specific key range Current `NodeIterator` always traverses the entire remaining trie from a start position. For non-ethereum applications using the trie implementation, there's no way to limit iteration to just a subtree with a specific prefix. **Usage:** ```go // Only iterate nodes with prefix "key1" iter, err := trie.NodeIteratorWithPrefix([]byte("key1")) ``` Testing: Comprehensive test suite covering edge cases and boundary conditions. Closes #32484 --------- Co-authored-by: gballet <guillaume.ballet@gmail.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/keeper: disable GC for zkvm execution (#32638) ZKVMs are constrained environments that liberally allocate memory and never release it. In this context, using the GC is only going to cause issues down the road, and slow things down in any case. * all: Introduce feature toggles for Jovian (#677) * introduce IsMinBaseFee feature toggle Allows feature to be easily removed from Jovian hardfork. When the hardfork scope is locked, this commit can be reverted. * decouple features * add isOperatorFeeFix toggle * Remove approval hold job from release workflow (#683) Removed approval hold job from release process in CircleCI config. * core: fix fork readiness log (#32623) When I implemented in #31340 I didn't expect multiple forks to be configured at once, but this is exactly how BPOs are defined. This updates the method to determine the next scheduled fork rather than the last fork. * core/rawdb: report truncateErr in concurrent truncate failure (#32651) * build: update to execution-spec-tests v5.0.0 (#32592) https://github.com/ethereum/execution-spec-tests/releases/tag/v5.0.0 As of this release, execution-spec-tests also contains all state tests that were previously in ethereum/tests. We can probably remove the tests submodule now. However, this would mean we are missing the pre-cancun tests. Still need to figure out how to resolve this. --------- Co-authored-by: MariusVanDerWijden <m.vanderwijden@live.de> * eth/catalyst, beacon/engine: enable BPO and Osaka on stateless APIs (#32636) Addresses https://github.com/ethereum/go-ethereum/issues/32630 This pull request enables the stateless engine APIs for Osaka and the following BPOs. Apart from that, a few more descriptions have been added in the engine APIs, making it easier to follow the spec change. * eth/filters, cmd: add config of eth_getLogs address limit (#32327) Add cli configurable limit for the number of addresses allowed in eth_getLogs filter criteria: https://github.com/ethereum/go-ethereum/issues/32264 Key changes: - Added --rpc.getlogmaxaddrs CLI flag (default: 1000) to configure the maximum number of addresses - Updated ethconfig.Config with FilterMaxAddresses field for configuration management - Modified filter system to use the configurable limit instead of the hardcoded maxAddresses constant - Enhanced test coverage with new test cases for address limit validation - Removed hardcoded validation from JSON unmarshaling, moving it to runtime validation Please notice that I remove the check at FilterCriteria UnmarshalJSON because the runtime config can not pass into this validation. Please help review this change! --------- Co-authored-by: zsfelfoldi <zsfelfoldi@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * beacon/config: fix LoadForks with non-string values (#32609) Fixes a crash when loading the beacon chain config if new fields like `BLOB_SCHEDULE: []` are present. Previously, the config loader assumed all values were strings, causing errors such as: ``` Fatal: Could not load beacon chain config '/network-configs/config.yaml': failed to parse beacon chain config file: yaml: unmarshal errors: line 242: cannot unmarshal !!seq into string ``` This PR updates the parsing logic to handle non-string values correctly and adds explicit validation for fork fields. * internal/ethapi: skip tx gas limit check for calls (#32641) This disables the tx gaslimit cap for eth_call and related RPC operations. I don't like how this fix works. Ideally we'd be checking the tx gaslimit somewhere else, like in the block validator, or any other place that considers block transactions. Doing the check in StateTransition means it affects all possible ways of executing a message. The challenge is finding a place for this check that also triggers correctly in tests where it is wanted. So for now, we are just combining this with the EOA sender check for transactions. Both are disabled for call-type messages. * beacon/blsync: test validated finality (#32633) This PR improves `TestBlockSync` so that it also tests the finality update validation. Note: to this date four long and complex (at least partly AI generated) PRs arrived that did something related to testing finality but honestly we do not need a bloated "comprehensive" test to test a trivial feature because maintaining these tests can also be a pain over the long term. This PR adds some sufficient sanity checks to detect if finality ever gets broken by a future change. * core/state: add missing address key in state_object log (#32676) * crypto/bn256: switch to gnark again (#32659) We recently update our default implementation to gnark in https://github.com/ethereum/go-ethereum/pull/32024 Then we found a consensus issue and reverted it in https://github.com/ethereum/go-ethereum/commit/65d77c51295c3b5c237a082af856a6926766a51c We fixed the consensus issue and have been fuzzing it more since then in https://github.com/ethereum/go-ethereum/pull/32055/files https://github.com/ethereum/go-ethereum/pull/32065 https://github.com/ethereum/go-ethereum/pull/32055/files So I think now is the time to update it back to gnark * core/txpool/blobpool: remove conversion in GetBlobs (#32578) This disables blob proof conversion in `GetBlobs` by default, making it conditional. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * p2p: using testing.B.Loop (#32664) * core/state: using testing.B.Loop (#32658) before: go test -run=^$ -bench=. ./core/state/... 120.85s user 7.96s system 129% cpu 1:39.13 tota after: go test -run=^$ -bench=. ./core/state/... 21.32s user 2.12s system 97% cpu 24.006 total * eth: using testing.B.Loop (#32657) before: go test -run=^$ -bench=. ./eth/... 827.57s user 23.80s system 361% cpu 3:55.49 total after: go test -run=^$ -bench=. ./eth/... 281.62s user 13.62s system 245% cpu 2:00.49 total * log: using testing.B.Loop (#32663) before: go test -run=^$ -bench=. ./log -timeout=1h 12.19s user 2.19s system 89% cpu 16.025 total after: go test -run=^$ -bench=. ./log -timeout=1h 10.64s user 1.53s system 89% cpu 13.607 total --------- Co-authored-by: lightclient <lightclient@protonmail.com> * core: using testing.B.Loop (#32662) Co-authored-by: lightclient <lightclient@protonmail.com> * core/vm: using testing.B.Loop (#32660) before: go test -run=^$ -bench=. ./core/vm/... -timeout=1h 1841.87s user 40.96s system 124% cpu 25:15.76 total after: go test -run=^$ -bench=. ./core/vm/... -timeout=1h 1588.65s user 33.79s system 123% cpu 21:53.25 total --------- Co-authored-by: lightclient <lightclient@protonmail.com> * core/types: using testing.B.Loop (#32643) before: go test -run=^$ -bench=. ./core/types 47.80s user 2.18s system 102% cpu 48.936 tota after: go test -run=^$ -bench=. ./core/types 42.42s user 2.27s system 112% cpu 39.593 total * crypto: using testing.B.Loop (#32645) before: go test -run=^$ -bench=. ./crypto/... 94.83s user 2.68s system 138% cpu 1:10.55 tota after: go test -run=^$ -bench=. ./crypto/... 75.43s user 2.58s system 123% cpu 1:03.01 total * fix: correct typo in TestMustParseUint64Panic error message (#32648) Fix typo in test error message where "MustParseBig" was incorrectly used instead of "MustParseUint64" in the TestMustParseUint64Panic function. The test still functions correctly, but now the error message accurately reflects the function being tested. * common, eth: remove duplicate test cases (#32624) Remove redundant duplicate test vectors. The two entries were identical and back-to-back, providing no additional coverage while adding noise. Keeping a single instance maintains test intent and clarity without altering behavior. * core/rawdb: fix bad blocks sorted failure message to map index→number correctly (#32627) Fix the t.Fatalf format arguments in TestBadBlockStorage to match the intended #index output. Previously, the left number used i+1 and the right index used the block number, producing misleading diagnostics. Correct mapping improves test failure clarity and debuggability. * params: update config description links to new format (#32681) A PR in the specs repo broke our existing links: https://github.com/ethereum/execution-specs/pull/1416 This PR fixes it and adds the Prague and Osaka specs. * core/txpool/blobpool: introduce sidecar conversion for legacy blob transactions (#32656) This pull request introduces a queue for legacy sidecar conversion to handle transactions that persist after the Osaka fork. Simply dropping these transactions would significantly harm the user experience. To balance usability with system complexity, we have introduced a conversion time window of two hours post Osaka fork. During this period, the system will accept legacy blob transactions and convert them in a background process. After the window, all legacy transactions will be rejected. Notably, all the blob transactions will be validated statically before the conversion, and also all conversion are performed in a single thread, minimize the risk of being DoS. We believe this two hour window provides sufficient time to process in-flight legacy transactions and allows submitters to migrate to the new format. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * go.work.sum: add to repo (#32677) * core/state: fix committed-state expectations in StateDB tests (#32678) * triedb/pathdb: move head truncation log (#32649) Print the `Truncating from head` log only if head truncation is needed. * cmd, tests: fix snapshot dump and export-preimages (#32650) Address #32646 * go.work, build: remove workspace file (#32699) https://go.dev/ref/mod#go-work-file advises against checking `go.work` files because they can interfere with local development. We added the workspace file in order to make `go test` and other tools work across multiple modules. But it seems to cause weird issues with the `go.work.sum` file being modified, etc. So with this PR, we instead run all the `ci.go` commands for all modules in the workspace manually. * cmd/era: fix iterator error source handling in checkAccumulator (#32698) This change replaces wrapping a stale outer err with the iterator’s own error after Next(), and switches the post-BlockAndReceipts() check to use the returned err. According to internal/era iterator contract, Error() should be consulted immediately after Next() to surface iteration errors, while decoding errors from Block/Receipts are returned directly. The previous code could hide the real failure (using nil or unrelated err), leading to misleading diagnostics and missed iteration errors. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * cmd/evm/internal/t8ntool: fix nil pointer dereference in Osaka blob gas calculation (#32714) The parent header was missing the BaseFee field when calculating the reserve price for EIP-7918 in the Osaka fork, causing a nil pointer dereference. This fix ensures BaseFee is properly set from ParentBaseFee in the environment. Added regression test case 34 to verify Osaka fork blob gas calculation works correctly with parent base fee. * core/txpool/blobpool: add legacy sidecar conversion in reinject (#32688) This adds the conversion for the legacy sidecar if these transactions are reorged out after the osaka. * accounts/keystore: use runtime.AddCleanup (#32610) * internal/ethapi: fix merge transition in eth_simulate (#32616) This PR fixes the fork detection of `eth_simulateV1`, particularly for networks that are post-merge since genesis, like Hoodi. * trie: align AllFFPrefix test assertion and message (#32719) * build: module-aware FindMainPackages (#32736) This fixes `go run build/ci.go install`. It was failing because we resolved all main packages by parsing sources, which fails when the source directory contains multiple modules. * miner: default gaslimit 60M (#32734) * core/txpool/blobpool: fork boundary conversion 3 (#32716) This implements the conversion of existing blob transactions to the new proof version. Conversion is triggered at the Osaka fork boundary. The conversion is designed to be idempotent, and may be triggered multiple times in case of a reorg around the fork boundary. This change is the last missing piece that completes our strategy for the blobpool conversion. After the Osaka fork, - new transactions will be converted on-the-fly upon entry to the pool - reorged transactions will be converted while being reinjected - (this change) existing transactions will be converted in the background --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: lightclient <lightclient@protonmail.com> * trie: fix TestOneElementProof expected value message (#32738) - Correct the error message in TestOneElementProof to expect 'v' instead of 'k'. - The trie is updated with key "k" and value "v"; on mismatch the expected value must be 'v'. - Aligns the message with the actual test logic and other similar checks in this file, reducing confusion during test failures. No behavioral changes. * accounts/keystore: use ticker to avoid timer allocations (#32732) Replace time.After with a long‑lived time.Ticker in KeyStore.updater, preventing per‑iteration timer allocations and potential timer buildup. Co-authored-by: lightclient <lightclient@protonmail.com> * accounts/abi/bind: fix data race in TestWaitDeployedCornerCases (#32740) Fixes race in WaitDeploy test where the backend is closed before goroutine using it wraps up. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * all: add bpo1 and bpo2 overrides (#32737) This adds overrides to the cli for BPO1 and BPO2. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/txpool/blobpool: convert and add one-by-one (#32718) This is a small improvement on #32656 in case Add was called with multiple type 3 transactions, adding transactions to the pool one-by-one as they are converted. Announcement to peers is still done in a batch. Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * build: upgrade to execution-spec-tests v5.1.0 (#32742) https://github.com/ethereum/execution-spec-tests/releases/tag/v5.1.0 * core/txpool: add eip2681 check for incoming transactions (#32726) * all: refactor to use builtin max/min (#32694) Replaces the last few instances of `math.Max` and `math.Min` with go builtins. * params: schedule Osaka/BPO1/BPO2 for testnets (#32735) Timestamps taken from: - Holesky: https://github.com/eth-clients/holesky/blob/main/metadata/genesis.json - Sepolia: https://github.com/eth-clients/sepolia/blob/main/metadata/genesis.json - Hoodi: https://github.com/eth-clients/hoodi/blob/main/metadata/genesis.json * version: release go-ethereum v1.16.4 stable * version: begin v1.16.5 release cycle * internal/ethapi: fix outdated comments (#32751) Fix outdated comments * ethapi: reject oversize storage keys before hex decode (#32750) Bail out of decodeHash when the raw hex string is longer than 32 byte before actually decoding. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * signer/core: fix TestSignTx to decode res2 (#32749) Decode the modified transaction and verify the value differs from original. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * trie: correct error messages for UpdateStorage operations (#32746) Fix incorrect error messages in TestVerkleTreeReadWrite and TestVerkleRollBack functions. * eth/tracers/native: add keccak256preimage tracer (#32569) Introduces a new tracer which returns the preimages of evm KECCAK256 hashes. See #32570. --------- Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * params: add amsterdam fork config (#32687) Adds Amsterdam as fork config option. Co-authored-by: lightclient <lightclient@protonmail.com> * build: remove duplicated func FileExist (#32768) * eth/catalyst: check osaka in engine_getBlobsV1 (#32731) ref https://github.com/ethereum/execution-apis/blob/main/src/engine/osaka.md#cancun-api > Client software MUST return -38005: Unsupported fork error if the Osaka fork has been activated. --------- Signed-off-by: Delweng <delweng@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * trie: fix error message in test (#32772) Fixes an error message in TestReplication * internal/ethapi: remove redundant check in test (#32760) Removes a redundant check in TestCreateAccessListWithStateOverrides * cmd/evm/internal/t8ntool: panic on database corruption (#32776) These functions were previously ignoring the error returned by both `statedb.Commit()` and the subsequent `state.New()`, which could silently fail and cause panics later when the `statedb` is used. This change adds proper error checking and panics with a descriptive error message if state creation fails. While unlikely in normal operation, this can occur if there are database corruption issues or if invalid root hashes are provided, making debugging significantly easier when such issues do occur. This issue was encountered and fixed in https://github.com/gballet/go-ethereum/pull/552 where the error handling proved essential for debugging cc: @gballet as this was discussed in a call already. * params: fix bpo config comments (#32755) Looks like we forgot to update names when copying. * core/rawdb: update comments (#32668) - Replace outdated NewFreezer doc that referenced map[string]bool/snappy toggle with accurate description of -map[string]freezerTableConfig (noSnappy, prunable). - Fix misleading field comment on freezerTable.config that spoke as if it were a boolean (“if true”), clarifying it’s a struct and noting compression is non-retroactive. * params: implement String() method for ChainConfig (#32766) Fixes issue #32762 where ChainConfig logging displays pointer addresses instead of actual timestamp values for fork activation times. Before: ShanghaiTime:(*uint64)(0xc000373fb0), CancunTime:(*uint64)(0xc000373fb8) After: ShanghaiTime: 1681338455, CancunTime: 1710338135, VerkleTime: nil The String() method properly dereferences timestamp pointers and handles nil values for unset fork times, making logs more readable and useful for debugging chain configuration issues. --------- Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * params: add blob config information in the banner (#32771) Extend the chain banner with blob config information. Co-authored-by: Felix Lange <fjl@twurst.com> * core/txpool: remove unused signer field from TxPool (#32787) The TxPool.signer field was never read and each subpool (legacy/blob) maintains its own signer instance. This field remained after txpool refactoring into subpools and is dead code. Removing it reduces confusion and simplifies the constructor. * core/state: correct expected value in TestMessageCallGas (#32780) * go.mod, cmd/keeper/go.mod: upgrade victoria metrics dependency (#32720) This is required for geth to compile to WASM. * params: add bpo forks to eth_config (#32579) BPO forks should also be included in eth_config response. * params: schedule Osaka/BPO1/BPO2 for testnets (#32735) Timestamps taken from: - Holesky: https://github.com/eth-clients/holesky/blob/main/metadata/genesis.json - Sepolia: https://github.com/eth-clients/sepolia/blob/main/metadata/genesis.json - Hoodi: https://github.com/eth-clients/hoodi/blob/main/metadata/genesis.json * eth/catalyst: extend payloadVersion support to osaka/post-osaka forks (#32800) This PR updates the `payloadVersion` function in `simulated_beacon.go` to handle additional following forks used during development and testing phases after Osaka. This change ensures that the simulated beacon correctly resolves the payload version for these forks, enabling consistent and valid execution payload handling during local testing or simulation. * p2p: fix error message in test (#32804) * signer/core: fix error message in test (#32807) * params: fix banner message (#32796) * core/types, trie: reduce allocations in derivesha (#30747) Alternative to #30746, potential follow-up to #30743 . This PR makes the stacktrie always copy incoming value buffers, and reuse them internally. Improvement in #30743: ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ derivesha.1 │ derivesha.2 │ │ sec/op │ sec/op vs base │ DeriveSha200/stack_trie-8 477.8µ ± 2% 430.0µ ± 12% -10.00% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ B/op │ B/op vs base │ DeriveSha200/stack_trie-8 45.17Ki ± 0% 25.65Ki ± 0% -43.21% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ allocs/op │ allocs/op vs base │ DeriveSha200/stack_trie-8 1259.0 ± 0% 232.0 ± 0% -81.57% (p=0.000 n=10) ``` This PR further enhances that: ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ derivesha.2 │ derivesha.3 │ │ sec/op │ sec/op vs base │ DeriveSha200/stack_trie-8 430.0µ ± 12% 423.6µ ± 13% ~ (p=0.739 n=10) │ derivesha.2 │ derivesha.3 │ │ B/op │ B/op vs base │ DeriveSha200/stack_trie-8 25.654Ki ± 0% 4.960Ki ± 0% -80.67% (p=0.000 n=10) │ derivesha.2 │ derivesha.3 │ │ allocs/op │ allocs/op vs base │ DeriveSha200/stack_trie-8 232.00 ± 0% 37.00 ± 0% -84.05% (p=0.000 n=10) ``` So the total derivesha-improvement over *both PRS* is: ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ derivesha.1 │ derivesha.3 │ │ sec/op │ sec/op vs base │ DeriveSha200/stack_trie-8 477.8µ ± 2% 423.6µ ± 13% -11.33% (p=0.015 n=10) │ derivesha.1 │ derivesha.3 │ │ B/op │ B/op vs base │ DeriveSha200/stack_trie-8 45.171Ki ± 0% 4.960Ki ± 0% -89.02% (p=0.000 n=10) │ derivesha.1 │ derivesha.3 │ │ allocs/op │ allocs/op vs base │ DeriveSha200/stack_trie-8 1259.00 ± 0% 37.00 ± 0% -97.06% (p=0.000 n=10) ``` Since this PR always copies the incoming value, it adds a little bit of a penalty on the previous insert-benchmark, which copied nothing (always passed the same empty slice as input) : ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/trie cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ stacktrie.7 │ stacktrie.10 │ │ sec/op │ sec/op vs base │ Insert100K-8 88.21m ± 34% 92.37m ± 31% ~ (p=0.280 n=10) │ stacktrie.7 │ stacktrie.10 │ │ B/op │ B/op vs base │ Insert100K-8 3.424Ki ± 3% 4.581Ki ± 3% +33.80% (p=0.000 n=10) │ stacktrie.7 │ stacktrie.10 │ │ allocs/op │ allocs/op vs base │ Insert100K-8 22.00 ± 5% 26.00 ± 4% +18.18% (p=0.000 n=10) ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * p2p/enode: fix discovery AyncFilter deadlock on shutdown (#32572) Description: We found a occasionally node hang issue on BSC, I think Geth may also have the issue, so pick the fix patch here. The fix on BSC repo: https://github.com/bnb-chain/bsc/pull/3347 When the hang occurs, there are two routines stuck. - routine 1: AsyncFilter(...) On node start, it will run part of the DiscoveryV4 protocol, which could take considerable time, here is its hang callstack: ``` goroutine 9711 [chan receive]: // this routine was stuck on read channel: `<-f.slots` github.com/ethereum/go-ethereum/p2p/enode.AsyncFilter.func1() github.com/ethereum/go-ethereum/p2p/enode/iter.go:206 +0x125 created by github.com/ethereum/go-ethereum/p2p/enode.AsyncFilter in goroutine 1 github.com/ethereum/go-ethereum/p2p/enode/iter.go:192 +0x205 ``` - Routine 2: Node Stop It is the main routine to shutdown the process, but it got stuck when it tries to shutdown the discovery components, as it tries to drain the channel of `<-f.slots`, but the extra 1 slot will never have chance to be resumed. ``` goroutine 11796 [chan receive]: github.com/ethereum/go-ethereum/p2p/enode.(*asyncFilterIter).Close.func1() github.com/ethereum/go-ethereum/p2p/enode/iter.go:248 +0x5c sync.(*Once).doSlow(0xc032a97cb8?, 0xc032a97d18?) sync/once.go:78 +0xab sync.(*Once).Do(...) sync/once.go:69 github.com/ethereum/go-ethereum/p2p/enode.(*asyncFilterIter).Close(0xc092ff8d00?) github.com/ethereum/go-ethereum/p2p/enode/iter.go:244 +0x36 github.com/ethereum/go-ethereum/p2p/enode.(*bufferIter).Close.func1() github.com/ethereum/go-ethereum/p2p/enode/iter.go:299 +0x24 sync.(*Once).doSlow(0x11a175f?, 0x2bfe63e?) sync/once.go:78 +0xab sync.(*Once).Do(...) sync/once.go:69 github.com/ethereum/go-ethereum/p2p/enode.(*bufferIter).Close(0x30?) github.com/ethereum/go-ethereum/p2p/enode/iter.go:298 +0x36 github.com/ethereum/go-ethereum/p2p/enode.(*FairMix).Close(0xc0004bfea0) github.com/ethereum/go-ethereum/p2p/enode/iter.go:379 +0xb7 github.com/ethereum/go-ethereum/eth.(*Ethereum).Stop(0xc000997b00) github.com/ethereum/go-ethereum/eth/backend.go:960 +0x4a github.com/ethereum/go-ethereum/node.(*Node).stopServices(0xc0001362a0, {0xc012e16330, 0x1, 0xc000111410?}) github.com/ethereum/go-ethereum/node/node.go:333 +0xb3 github.com/ethereum/go-ethereum/node.(*Node).Close(0xc0001362a0) github.com/ethereum/go-ethereum/node/node.go:263 +0x167 created by github.com/ethereum/go-ethereum/cmd/utils.StartNode.func1.1 in goroutine 9729 github.com/ethereum/go-ethereum/cmd/utils/cmd.go:101 +0x78 ``` The rootcause of the hang is caused by the extra 1 slot, which was designed to make sure the routines in `AsyncFilter(...)` can be finished. This PR fixes it by making sure the extra 1 shot can always be resumed when node shutdown. * core: refactor StateProcessor to accept ChainContext interface (#32739) This pr implements https://github.com/ethereum/go-ethereum/issues/32733 to make StateProcessor more customisable. ## Compatibility notes This introduces a breaking change to users using geth EVM as a library. The `NewStateProcessor` function now takes one parameter which has the chainConfig embedded instead of 2 parameters. * p2p/enode: fix asyncfilter comment (#32823) just finisher the sentence Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * trie: cleaner array concatenation (#32756) It uses the slices.Concat and slices.Clone methods available now in Go. * internal/ethapi: add timestamp to logs in eth_simulate (#32831) Adds blockTimestamp to the logs in response of eth_simulateV1. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * build: faster gh actions workflow, no ubuntu on appveyor (#32829) This PR does a few things: - Sets the gh actions runner sizes for lint (s) and test (l) workflows - Runs the tests on gh actions in parallel - Skips fetching the spec tests when unnecessary (on windows in appveyor) - Removes ubuntu appveyor runner since it's essentially duplicate of the gh action workflow now The gh test seems to go down from ~35min to ~13min. * cmd/devp2p/internal/ethtest: update to PoS-only test chain (#32850) * core/rawdb: remove duplicated type storedReceiptRLP (#32820) Co-authored-by: Felix Lange <fjl@twurst.com> * eth/protocols/eth: use BlockChain interface in Handshake (#32847) * cmd/devp2p/internal/ethtest: accept responses in any order (#32834) In both `TestSimultaneousRequests` and `TestSameRequestID`, we send two concurrent requests. The client under test is free to respond in either order, so we need to handle responses both ways. Also fixes an issue where some generated blob transactions didn't have any blobs. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core/rawdb: correct misleading comments for state history accessors (#32783) * eth/filters: terminate pending tx subscription on error (#32794) Fixes issue #32793. When the pending tx subscription ends, the filter is removed from `api.filters`, but it is not terminated. There is no other way to terminate it, so the subscription will leak, and potentially block the producer side. * eth/filters: add `transactionReceipts` subscription (#32697) - Introduce a new subscription kind `transactionReceipts` to allow clients to receive transaction receipts over WebSocket as soon as they are available. - Accept optional `transactionHashes` filter to subscribe to receipts for specific transactions; an empty or omitted filter subscribes to all receipts. - Preserve the same receipt format as returned by `eth_getTransactionReceipt`. - Avoid additional HTTP polling, reducing RPC load and latency. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core/txpool/legacypool: fix validTxMeter to count transactions (#32845) invalidTxMeter was counting txs, while validTxMeter was counting accounts. Better make the two comparable. --------- Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * eth/protocols/snap: optimize incHash (#32748) * core/rawdb, triedb/pathdb: introduce trienode history (#32596) It's a pull request based on the #32523 , implementing the structure of trienode history. * ethclient: add SubscribeTransactionReceipts (#32869) Add `SubscribeTransactionReceipts` for ethclient. This is a complement to https://github.com/ethereum/go-ethereum/pull/32697. * node: fix error condition in gzipResponseWriter.init() (#32896) * core/types: optimize MergeBloom by using bitutil (#32882) ``` goos: darwin goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: VirtualApple @ 2.50GHz │ old.txt │ new.txt │ │ sec/op │ sec/op vs base │ CreateBloom/small-createbloom-10 1.676µ ± 4% 1.646µ ± 1% -1.76% (p=0.000 n=10) CreateBloom/large-createbloom-10 164.8µ ± 3% 164.3µ ± 0% ~ (p=0.247 n=10) CreateBloom/small-mergebloom-10 231.60n ± 0% 68.00n ± 0% -70.64% (p=0.000 n=10) CreateBloom/large-mergebloom-10 21.803µ ± 3% 5.107µ ± 1% -76.58% (p=0.000 n=10) geomean 6.111µ 3.113µ -49.06% │ old.txt │ new.txt │ │ B/op │ B/op vs base │ CreateBloom/small-createbloom-10 112.0 ± 0% 112.0 ± 0% ~ (p=1.000 n=10) ¹ CreateBloom/large-createbloom-10 10.94Ki ± 0% 10.94Ki ± 0% ~ (p=0.474 n=10) CreateBloom/small-mergebloom-10 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ CreateBloom/large-mergebloom-10 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ geomean ² +0.00% ² ¹ all samples are equal ² summaries must be >0 to compute geomean │ old.txt │ new.txt │ │ allocs/op │ allocs/op vs base │ CreateBloom/small-createbloom-10 6.000 ± 0% 6.000 ± 0% ~ (p=1.000 n=10) ¹ CreateBloom/large-createbloom-10 600.0 ± 0% 600.0 ± 0% ~ (p=1.000 n=10) ¹ CreateBloom/small-mergebloom-10 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ CreateBloom/large-mergebloom-10 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ geomean ² +0.00% ² ¹ all samples are equal ² summaries must be >0 to compute geomean ``` * p2p: rm unused var seedMinTableTime (#32876) * eth/filters: uninstall subscription in filter apis on error (#32894) Fix https://github.com/ethereum/go-ethereum/issues/32893. In the previous https://github.com/ethereum/go-ethereum/pull/32794, it only handles the pending tx filter, while there are also head and log filters. This PR applies the patch to all filter APIs and uses `defer` to maintain code consistency. * triedb, core/rawdb: implement the partial read in freezer (#32132) This PR implements the partial read functionalities in the freezer, optimizing the state history reader by resolving less data from freezer. --------- Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * p2p/enode: optimize LogDist (#32887) This speeds up LogDist by 75% using 64-bit operations instead of byte-wise XOR. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * p2p/enode: optimize DistCmp (#32888) This speeds up DistCmp by 75% through using 64-bit operations instead of byte-wise XOR. * core/txpool/legacypool: move queue out of main txpool (#32270) This PR move the queue out of the main transaction pool. For now there should be no functional changes. I see this as a first step to refactor the legacypool and make the queue a fully separate concept from the main pending pool. --------- Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> Co-authored-by: Csaba Kiraly <csaba.kiraly@gmail.com> * cmd/workload: filter fuzzer test (#31613) This PR adds a `filterfuzz` subcommand to the workload tester that generates requests similarly to `filtergen` (though with a much smaller block length limit) and also verifies the results by retrieving all block receipts in the range and locally filtering out relevant results. Unlike `filtergen` that operates on the finalized chain range only, `filterfuzz` does check the head region, actually it seeds a new query at every new chain head. * p2p/discover: wait for bootstrap to be done (#32881) This ensures the node is ready to accept other nodes into the table before it is used in a test. Closes #32863 * triedb/pathdb: catch int conversion overflow in 32-bit (#32899) The limit check for `MaxUint32` is done after the cast to `int`. On 64 bits machines, that will work without a problem. On 32 bits machines, that will always fail. The compiler catches it and refuses to build. Note that this only fixes the compiler build. ~~If the limit is above `MaxInt32` but strictly below `MaxUint32` then this will fail at runtime and we have another issue.~~ I checked and this should not happen during regular execution, although it might happen in tests. * eth/catalyst: remove useless log on enabling Engine API (#32901) * eth: do not warn on switching from snap sync to full sync (#32900) This happens normally after a restart, so it is better to use Info level here. Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> * core/txpool/legacypool: fix pricedList updates (#32906) This pr addresses a few issues brought by the #32270 - Add updates to pricedList after dropping transactions. - Remove redundant deletions in queue.evictList, since pool.removeTx(hash, true, true) already performs the removal. - Prevent duplicate addresses during promotion when Reset is not nil. * accounts/abi: check presence of payable fallback or receive before proceeding with transfer (#32374) remove todo * internal/ethapi: convert legacy blobtx proofs in sendRawTransaction (#32849) This adds a temporary conversion path for blob transactions with legacy proof sidecar. This feature will activate after Fusaka. We will phase this out when the fork has sufficiently settled and client side libraries have been upgraded to send the new proofs. * core,miner,parms: DA footprint block limit (constant gas scalar) (#655) * all: Make DA footprint gas scalar configurable (#675) Co-authored-by: Sebastian Stammler <seb@oplabs.co> * rpc: fix flaky test TestServerWebsocketReadLimit (#32889) * eth/protocols/eth: reject message containing duplicated txs and drop peer (#32728) Drop peer if sending the same transaction multiple times in a single message. Fixes https://github.com/ethereum/go-ethereum/issues/32724 --------- Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Csaba Kiraly <csaba.kiraly@gmail.com> * p2p/discover: remove hot-spin in table refresh trigger (#32912) This fixes a regression introduced in #32518. In that PR, we removed the slowdown logic that would throttle lookups when the table runs empty. Said logic was originally added in #20389. Usually it's fine, but there exist pathological cases, such as hive tests, where the node can only discover one other node, so it can only ever query that node and won't get any results. In cases like these, we need to throttle the creation of lookups to avoid crazy CPU usage. * version: release go-ethereum v1.16.5 stable * version: begin v1.16.6 release cycle * core/types: implement operator fee fix (Jovian) (#696) * fix!: multiply operatorFeeScalar by 100 instead of dividing by 1e6 * apply comments * apply comments * remove dup IsOperatorFeeFix --------- Co-authored-by: fakedev9999 <taehoon@succinct.xyz> * cmd/geth: log current key in expandVerkle instead of keylist[0] (#32689) Fix logging in the verkle dump path to report the actual key being processed. Previously, the loop always logged keylist[0], which misled users when expanding multiple keys and made debugging harder. This change aligns the log with the key passed to root.Get, improving traceability and diagnostics. * consensus/beacon: Fix OP Legacy header verification dispatch (#697) * ethclient: add support for eth_simulateV1 (#32856) Adds ethclient support for the eth_simulateV1 RPC method, which allows simulating transactions on top of a base state without making changes to the blockchain. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * internal/ethapi: add eth_SendRawTransactionSync (#32830) New RPC method eth_sendRawTransactionSync(rawTx, timeoutMs?) that submits a signed tx and blocks until a receipt is available or a timeout elapses. Two CLI flags to tune server-side limits: --rpc.txsync.defaulttimeout (default wait window) --rpc.txsync.maxtimeout (upper bound; requests are clamped) closes https://github.com/ethereum/go-ethereum/issues/32094 --------- Co-authored-by: aodhgan <gawnieg@gmail.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core/state: state copy bugfixes with Verkle Trees (#31696) This change addresses critical issues in the state object duplication process specific to Verkle trie implementations. Without these modifications, updates to state objects fail to propagate correctly through the trie structure after a statedb copy operation, leading to inaccuracies in the computation of the state root hash. --------- Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> * eth/ethconfig : fix eth generate config (#32929) * eth, internal: add blob conversion for SendRawTransactionSync (#32930) * all: Store DA footprint in blob gas used header field (#694) * cmd/utils: use maximum uint64 value for receipt chain insertion (#32934) * eth/fetcher: add metrics for tracking slow peers (#32964) This PR introduces two new metrics to monitor slow peers - One tracks the number of slow peers. - The other measures the time it takes for those peers to become "unfrozen" These metrics help with monitoring and evaluating the need for future optimization of the transaction fetcher and peer management, for example i n peer scoring and prioritization. Additionally, this PR moves the fetcher metrics into a separate file, `eth/fetcher/metrics.go`. * eth/fetcher: remove dangling peers from alternates (#32947) This PR removes dangling peers in `alternates` map In the current code, a dropped peer is removed from alternates for only the specific transaction hash it was requesting. If that peer is listed as an alternate for other transaction hashes, those entries still stick around in alternates/announced even though that peer already got dropped. * triedb/pathdb: fix index out of range panic in decodeSingle (#32937) Fixes TestCorruptedKeySection flaky test failure. https://github.com/ethereum/go-ethereum/actions/runs/18600235182/job/53037084761?pr=32920 * core/types: prealloc map in HashDifference as in TxDifference (#32946) * eth/filters: avoid rebuild the hash map multi times (#32965) * core/vm: don't call SetCode after contract creation if initcode didn't return anything (#32916) The code change is a noop here, and the tracing hook shouldn't be invoked if the account code doesn't actually change. * cmd/keeper: use the ziren keccak precompile (#32816) Uses the go module's `replace` directive to delegate keccak computation to precompiles. This is still in draft because it needs more testing. Also, it relies on a PR that I created, that hasn't been merged yet. _Note that this PR doesn't implement the stateful keccak state structure, and it reverts to the current behavior. This is a bit silly since this is what is used in the tree root computation. The runtime doesn't currently export the sponge. I will see if I can fix that in a further PR, but it is going to take more time. In the meantime, this is a useful first step_ * params: enable osaka on dev mode (#32917) enables the osaka fork on dev mode --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core/txpool: Initialize journal writer for tx tracker (#32921) Previously, the journal writer is nil until the first time rejournal (default 1h), which means during this period, txs submitted to this node are not written into journal file (transactions.rlp). If this node is shutdown before the first time rejournal, then txs in pending or queue will get lost. Here, this PR initializes the journal writer soon after launch to solve this issue. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/state: prevent SetCode hook if contract code is not changed (#32980) This PR prevents the SetCode hook from being called when the contract code remains unchanged. This situation can occur in the following cases: - The deployed runtime code has zero length - An EIP-7702 authorization attempt tries to unset a non-delegated account - An EIP-7702 authorization attempt tries to delegate to the same account * triedb/pathdb: make batch with pre-allocated size (#32914) In this PR, the database batch for writing the history index data is pre-allocated. It's observed that database batch repeatedly grows the size of the mega-batch, causing significant memory allocation pressure. This approach can effectively mitigate the overhead. * cmd/geth: add flag to set genesis (#32844) This PR is an alternative to #32556. Instead of trying to be smart and reuse `geth init`, we can introduce a new flag `--genesis` that loads the `genesis.json` from file into the `Genesis` object in the same path that the other network flags currently work in. Question: is something like `--genesis` enough to start deprecating `geth init`? -- ```console $ geth --datadir data --hoodi .. INFO [10-06|22:37:11.202] - BPO2: @1762955544 .. $ geth --datadir data --genesis genesis.json .. INFO [10-06|22:37:27.988] - BPO2: @1862955544 .. ``` Pull the genesis [from the specs](https://raw.githubusercontent.com/eth-clients/hoodi/refs/heads/main/metadata/genesis.json) and modify one of the BPO timestamps to simulate a shadow fork. --------- Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * core/types: remove unused `ErrInvalidTxType` var (#32989) The var `ErrInvalidTxType` is never used in the code base. * core/state: fix the flaky TestSizeTracker (#32993) * cmd/devp2p: distinguish the jwt in devp2p and geth (#32972) This PR fixes some docs for the devp2p suite and uses the CLI library's required value instead of manually checking if required flags are passed. * all: update c-kzg-4844 to 2.1.5 (#702) * superchain: update scr import to include worldchain-sepolia isthmus time (#704) * p2p: silence on listener shutdown (#33001) Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/utils: use IsHexAddress method (#32997) Using the `IsHexAddress` method will result in no gaps in the verification logic, making it simpler. * crypto: implement ziren keccak state (#32996) The #32816 was only using the keccak precompile for some minor task. This PR implements a keccak state, which is what is used for hashing the tree. * rpc: fix a flaky test of the websocket (#33002) Found in https://github.com/ethereum/go-ethereum/actions/runs/17803828253/job/50611300621?pr=32585 ``` --- FAIL: TestClientCancelWebsocket (0.33s) panic: read tcp 127.0.0.1:36048->127.0.0.1:38643: read: connection reset by peer [recovered, repanicked] goroutine 15 [running]: testing.tRunner.func1.2({0x98dd20, 0xc0005b0100}) /opt/actions-runner/_work/_tool/go/1.25.1/x64/src/testing/testing.go:1872 +0x237 testing.tRunner.func1() /opt/actions-runner/_work/_tool/go/1.25.1/x64/src/testing/testing.go:1875 +0x35b panic({0x98dd20?, 0xc0005b0100?}) /opt/actions-runner/_work/_tool/go/1.25.1/x64/src/runtime/panic.go:783 +0x132 github.com/ethereum/go-ethereum/rpc.httpTestClient(0xc0001dc1c0?, {0x9d5e40, 0x2}, 0xc0002bc1c0) /opt/actions-runner/_work/go-ethereum/go-ethereum/rpc/client_test.go:932 +0x2b1 github.com/ethereum/go-ethereum/rpc.testClientCancel({0x9d5e40, 0x2}, 0xc0001dc1c0) /opt/actions-runner/_work/go-ethereum/go-ethereum/rpc/client_test.go:356 +0x15f github.com/ethereum/go-ethereum/rpc.TestClientCancelWebsocket(0xc0001dc1c0?) /opt/actions-runner/_work/go-ethereum/go-ethereum/rpc/client_test.go:319 +0x25 testing.tRunner(0xc0001dc1c0, 0xa07370) /opt/actions-runner/_work/_tool/go/1.25.1/x64/src/testing/testing.go:1934 +0xea created by testing.(*T).Run in goroutine 1 /opt/actions-runner/_work/_tool/go/1.25.1/x64/src/testing/testing.go:1997 +0x465 FAIL github.com/ethereum/go-ethereum/rpc 0.371s ``` In `testClientCancel` we wrap the server listener in `flakeyListener`, which schedules an unconditional close of every accepted connection after a random delay, if the random delay is zero then the timer fires immediately, and then the http client paniced of connection reset by peer. Here we add a minimum 10ms to ensure the timeout won't fire immediately. Signed-off-by: jsvisa <delweng@gmail.com> * core: add gauge metrics + histograms for block gas used and blob gas used (#705) * core: add gauge metric for block gas used and blob gas used This can be used to track the DA footprint per block * encapsulate OPStack additions into new file and function * add histogram metrics for (blob)GasUsed * update fork.yaml * typos * eth/tracers: fix crasher in TraceCall with BlockOverrides (#33015) fix https://github.com/ethereum/go-ethereum/issues/33014 --------- Co-authored-by: lightclient <lightclient@protonmail.com> * .gitea/workflows, build: add release build for keeper (#32632) * build: fix keeper build (#33018) At the time keeper support was added into ci.go, we were using a go.work file to make ./cmd/keeper accessible from within the main go-ethereum module. The workspace file has since been removed, so we need to build keeper from within its own module instead. * superchain: update scr import to include jovian activation timestamp (#707) * core/rawdb, triedb/pathdb: re-structure the trienode history header (#32907) In this PR, several changes have been made: (a) restructure the trienode history header section Previously, the offsets of the key and value sections were recorded before encoding data into these sections. As a result, these offsets referred to the start position of each chunk rather than the end position. This caused an issue where the end position of the last chunk was unknown, making it incompatible with the freezer partial-read APIs. With this update, all offsets now refer to the end position, and the start position of the first chunk is always 0. (b) Enable partial freezer read for trienode data retrieval The partial freezer read feature is now utilized in trienode data retrieval, improving efficiency. * rpc: remove unused vars (#33012) * core/state: improve accessList copy (#33024) * core: don't modify the shared chainId between tests (#33020) * core/types: optimize modernSigner.Equal (#32971) Equal is called every time the transaction sender is accessed, even when the sender is cached, so it is worth optimizing. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * Add new precompile limits for Jovian (#709) This introduces more realistic limits on accelerated precompiles for the Jovian hard fork. * core: refine condition for using legacy chain freezer directory (#33032) * internal/jsre: pass correct args to setTimeout/setInterval callbacks (#32936) ## Description - Summary: Correct the JS timer callback argument forwarding to match standard JS semantics. - What changed: In `internal/jsre/jsre.go`, the callback is now invoked with only the arguments after the callback and delay. - Why: Previously, the callback received the function and delay as parameters, causing unexpected behavior and logic bugs for consumers. * .github: add 32-bit CI targets (#32911) This adds two new CI targets. One is for building all supported keeper executables, the other is for running unit tests on 32-bit Linux. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * superchain: Update for new Jovian timestamps (#712) * core/types: Populate Jovian receipt fields (#710) * core/types: Move receipt tests OP diff to separate file * core/types: Populate Jovian receipt fields * accounts/abi/bind/v2: fix error assertion in test (#33041) * p2p: cleanup v4 if v5 failed (#33005) Clean the previous resource (v4) if the latter (v5) failed. * common: simplify FileExist helper (#32969) * eth/downloader: fix incorrect waitgroup in test `XTestDelivery` (#33047) * eth/tracers: fix prestateTracer for EIP-6780 SELFDESTRUCT (#33050) fix https://github.com/ethereum/go-ethereum/issues/33049 * common: fix duration comparison in PrettyAge (#33064) This pull request updates `PrettyAge.String` so that the age formatter now treats exact unit boundaries (like a full day or week) as that unit instead of spilling into smaller components, keeping duration output aligned with human expectations. * core/rawdb: fix db inspector by supporting trienode history (#33087) * params: set osaka and BPO1 & BPO2 mainnet dates (#33063) Sets the fusaka, bpo1, bpo2 timestamps for mainnet see: https://notes.ethereum.org/@bbusa/fusaka-bpo-timeline * version: release go-ethereum v1.16.6 * version: begin v1.16.7 release cycle * core/txpool/blobpool: migrate billy to new slot size (#31966) Implements a migration path for the blobpool slotter --------- Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * params: set osaka and BPO1 & BPO2 mainnet dates (#33063) Sets the fusaka, bpo1, bpo2 timestamps for mainnet see: https://notes.ethereum.org/@bbusa/fusaka-bpo-timeline * superchain: update for new Jovian timestamps (#716) * go.mod: update to c-kzg v2.1.5 (#33093) We unfortunately missed this update for the Geth v1.16.6 release, but it is critical. * version: release go-ethereum v1.16.7 stable * triedb/pathdb: sync ancient store before journal (#32557) (#718) This pull request addresses the corrupted path database with log indicating: `history head truncation out of range, tail: 122557, head: 212208, target: 212557` This is a rare edge case where the in-memory layers, including the write buffer in the disk layer, are fully persisted (e.g., written to file), but the state history freezer is not properly closed (e.g., Geth is terminated after journaling but before freezer.Close). In this situation, the recent state history writes will be truncated on the next startup, while the in-memory layers resolve correctly. As a result, the state history falls behind the disk layer (including the write buffer). In this pull request, the state history freezer is always synced before journal, ensuring the state history writes are always persisted before the others. Edit: It's confirmed that devops team has 10s container termination setting. It explains why Geth didn't finish the entire termination without state history being closed. https://github.com/ethpandaops/fusaka-devnets/pull/63/files Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * ci: add GitHub Actions workflow to build, attest and sign op-geth docker image (#720) Signed-off-by: falcorocks <14293929+falcorocks@users.noreply.github.com> * eth, cmd: add RollupNetrestrictTxPoolGossipFlag and RollupTxPoolTrustedPeersOnlyFlag (#706) * eth, cmd: add RollupNetrestrictTxPoolGossipFlag * fork.yaml: description of fork changes for tx gossip netrestrict * eth: h.syncTransactions behind check for netrestrict for txpool gossip * eth, eth/protocols: propagate netrestrict to Peer and limit incoming/outgoing message. * eth, cmd: add RollupNetrestrictTxPoolGossipFlag PoC using `NilPool` (#713) * Make peer struct not aware of ip net restrict * Propagate Peer ip info to txpool * fix * cleanup * eth/handler_test: unit test for TxGossipNetRestrict and TxPool() method * eth: add short-circuit for incoming messages * eth: rely on AcceptTxs * eth: all tx propagating by default * consistent OP Stack additions comment * eth, cmd: restrict mempool only to trusted peers (#719) * address comments * eth/handler_test: modify unit test to check for trusted conn too * add txGossipAllowed * correct comments * update fork.yaml --------- Co-authored-by: Changwan Park <pcw109550@gmail.com> * downloader: skip blobGasUsed check for optimism chains on Jovian (#723) * Add IsOptimismJovian check to validate BlobGasUsed header field Allow nonzero BlobGasUsed for Jovian headers on Optimism chains while validating blob gas usage for other chains as before. * tweak comment * space * superchain: update for new Jovian timestamps (#724) * jovian: remove feature toggles (#703) * jovian: remove feature toggles the scope is now locked * Rename MinBaseFee extraData identifiers to Jovian * Fix expected error message in Optimism test * Add test and comments for new Jovian precompile input size limits (#731) * dockerfile: pin to alpine 3.22 (#737) * dockerfile: pin to alpine 3.22 * pin ca-certificates version * dockerfile: pin to golang:1.24-alpine@sha256:12c199 * dockerfile: pin to golang:1.24-alpine3.22 * Update superchain registry (#736) * params: Set JovianTime to zero in OptimismTestConfig (#742) * params: Set JovianTime to zero and remove Osaka in OptimismTestConfig * Unset OsakaTime in OptimismTestConfig * Fix `eth_simulateV1` after Jovian fork (#732) * fix(eth_simulatev1): Create synthetic Jovian Deposit TX, to not fail in the CalcDAFootprint() function. * fix(eth_simulatev1): Return block without synthetic Jovian deposit tx. * fix(eth_simulatev1): Extract JovianDepositTx() from tests, activate Jovian fork based on parent.Time. * Inject L1 attributes tx in Optimism simulation * Unexport JovianDepositTx and move to tests Remove exported JovianDepositTx from core/types and add a local jovianDepositTx helper in miner tests. Also remove the unused encoding/binary import from the core/types file and add it to the test files where needed. * Pass nil options to sim.execute in test * Pass nil as second argument in simulation test * Embed L1 attributes tx in simulator * Handle Optimism genesis without L1 tx * Rename finalTxes to prependedTxes * Remove nil argument from sim.execute calls * Update internal/ethapi/api.go Co-authored-by: kustrun <9192608+kustrun@users.noreply.github.com> --------- Co-authored-by: geoknee <georgeknee@googlemail.com> * Run go run build/ci.go check_generate (#741) * Run go run build/ci.go check_generate Unfortunately, the check_generate script doesn't consider eth/ethconfig, so ci can't catch this. * Fix check_generate script and add it to ci * consensus/misc/eip1559: Improve Holocene EIP-1559 params checks (#743) * version: begin v1.16.8 release cycle * core/txpool: drop peers on invalid KZG proofs Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: MariusVanDerWijden <m.vanderwijden@live.de>: * crypto/ecies: use aes blocksize Co-authored-by: Gary Rong <garyrong0905@gmail.com> * version: release go-ethereum v1.16.8 stable * all: reduce diff to upstream (#748) * miner: fix flaky TestInteropTxRejectedWithFailsafe test (#752) The test was flaky due to a race condition in transaction pool handling. When calling txpool.Add() with sync=false, the transaction is added to the pool's queue but promotion to the "pending" pool happens asynchronously in a background goroutine. The test's Has() check passed because it checks all transactions (both queued and pending), but generateWork() only retrieves transactions from the "pending" pool via Pending(). If the background promotion hadn't completed yet, the transaction wouldn't be processed. Fix by changing sync=false to sync=true, ensuring the Add() call waits for the transaction to be promoted to the pending pool before returning. * miner: fix flaky TestDAFilters tests (#753) Same root cause as d78d84f51: txpool.Add() with sync=false returns before transactions are promoted to the pending pool, causing a race with buildPayload() which only retrieves pending transactions. Fix by changing sync=false to sync=true. * Bump fork.yaml ref to v1.16.8 (#760) * sync-superchain: use yq instead of dasel (#762) * sync-superchain: use yq instead of dasel Replaces dasel with yq for reading TOML files. yq has more stable syntax across versions and is more commonly used in the ecosystem. * ci: update to use yq instead of dasel Updates CircleCI config to install yq instead of dasel for the check-sr-diff job. * ci: pin yq to v4.44.1 * crypto/ecies: fix ECIES invalid-curve handling (#33669) Fix ECIES invalid-curve handling in RLPx handshake (reject invalid ephemeral pubkeys early) - Add curve validation in crypto/ecies.GenerateShared to reject invalid public keys before ECDH. - Update RLPx PoC test to assert invalid curve points fail with ErrInvalidPublicKey. Motivation / Context RLPx handshake uses ECIES decryption on unauthenticated network input. Prior to this change, an invalid-curve ephemeral public key would proceed into ECDH and only fail at MAC verification, returning ErrInvalidMessage. This allows an oracle on decrypt success/failure and leaves the code path vulnerable to invalid…

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

Move forks into namespace package#1416

Move forks into namespace package#1416
SamWilsn merged 2 commits intoethereum:forks/osakafrom
SamWilsn:namespace-forks

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

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