Repository navigation
Merge ethereum-optimism/reth 0fbe4285 for op-reth v2.6.1 - #81
Merged
Merged
Conversation
…mxyz#26372) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…radigmxyz#26437) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…z#26449) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
Co-authored-by: kuyziss <20692751+kuyziss@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>
…yz#26750) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> Co-authored-by: joshieDo <93316087+joshieDo@users.noreply.github.com>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…mxyz#26708) (cherry picked from commit 90ea46d)
Squash the fork CI support from 04e73b7 and push-event support from b0d194c into one replayable maintenance commit. Preserve release action pins and advisory policy when resolving the replay. Select the book build job without entering Pages deployment. Refresh the standalone lockfile to patched h2 and rustls releases instead of suppressing RUSTSEC-2026-0258 and RUSTSEC-2026-0285; rustls requires the updated AWS-LC backend. Co-authored-by: Josh Klopfenstein <git@joshklop.com> Co-authored-by: falcorocks <14293929+falcorocks@users.noreply.github.com> Maintenance CI: Compare optimism push vectors against v2.5.2, retaining actual PR and merge-queue bases.:
0fbe428 is the reth pin of op-reth v2.6.1 (reth v2.5.2 plus two commits). Conflicts resolved the same way as the reth-2.x v2.5.2 merge.
The Firehose ExEx only emitted FIRE INIT and the genesis block; its block tracing was disabled. Emit both from the component-initialized hook, which runs before the consensus engine exists, so no block is traced first.
UlysseCorbeil
approved these changes
Oct 22, 2026
UlysseCorbeil
left a comment
UlysseCorbeil
left a comment
There was a problem hiding this comment.
Diffed against reth-v2.5.2-fh3.1-3, lgtm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges ethereum-optimism/reth
0fbe4285(reth v2.5.2 plus two commits), the reth pin of op-rethv2.6.1. The previous pin was op-rs/rethaef8d3ef, based on reth v2.4.0.Five files conflicted. git rerere replayed the resolutions from the reth-2.x v2.5.2 merge for
Cargo.lock,crates/engine/tree/Cargo.toml,crates/engine/tree/src/tree/payload_validator.rsandcrates/rpc/rpc/Cargo.toml; each was checked against tagreth-v2.5.2-fh3.1-3, and the only differences are the reth-2.x-onlyFirehoseLiveHooksand the EIP-7928 BAL RLP patch.crates/trie/parallel/src/state_root_task.rstakes upstream's side. Every other SF-modified file outsidecrates/firehosenow matchesreth-v2.5.2-fh3.1-3.Firehose changes for revm 42, taken from the reth-2.x v2.5 merges:
CodeChangejournal entry instead of assuming empty code. Contract creations are reported as before.TreeState::state_trie_overlays()returns the newOverlayManager.alloy-evmpatch moves tostreamingfast/evmv0.38.0-sf.firehose-tracerstays at 5.5.0.Also cherry-picks
4b7797bcf7fromrelease/reth-2.x, which removes the unused Firehose ExEx (run_exex) and emitsFIRE INITand genesis fromreth_firehose::init_blockchain.cargo test -p reth-firehose -p reth-firehose-testsandcargo test -p reth-engine-tree --test firehose_live_tracingpass.The op-reth side is streamingfast/optimism
bump/op-reth-v2.6.1. Once merged, tagop-reth-v2.6.1-fh3.1so it can point at the tag.