Skip to content

fix(trie): Reveal extension child when extension is last remaining child of a branch #18891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Oct 8, 2025
Merged

fix(trie): Reveal extension child when extension is last remaining child of a branch #18891

merged 4 commits into from
Oct 8, 2025

Conversation

@mediocregopher
Copy link
Collaborator

@mediocregopher mediocregopher commented Oct 7, 2025

No description provided.

@github-project-automation github-project-automation bot moved this to Backlog in Reth Tracker Oct 7, 2025
@mediocregopher mediocregopher marked this pull request as ready for review October 7, 2025 13:46
Rjected
Rjected approved these changes Oct 7, 2025
View reviewed changes
Copy link
Member

@Rjected Rjected left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes sense to me

@github-project-automation github-project-automation bot moved this from Backlog to In Progress in Reth Tracker Oct 7, 2025
yongkangc
yongkangc approved these changes Oct 8, 2025
View reviewed changes
Copy link
Member

@yongkangc yongkangc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

much clearer, the idea makes sense to me. left a small comment

crates/trie/sparse-parallel/src/trie.rs
Comment on lines +1199 to +1215
/// Called when a leaf is removed on a branch which has only one other remaining child. That
/// child must be revealed in order to properly collapse the branch.
///
/// If `recurse_into_extension` is true, and the remaining child is an extension node, then its
/// child will be ensured to be revealed as well.
///
/// ## Returns
///
/// The node of the remaining child, whether it was already revealed or not.
fn reveal_remaining_child_on_leaf_removal<P: TrieNodeProvider>(
&mut self,
provider: P,
full_path: &Nibbles, // only needed for logs
remaining_child_path: &Nibbles,
recurse_into_extension: bool,
) -> SparseTrieResult<SparseNode> {
let remaining_child_subtrie = self.subtrie_for_path_mut(remaining_child_path);
Copy link
Member

@yongkangc yongkangc Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

much clearer logic

crates/trie/sparse/src/trie.rs
leaf_full_path = ?full_path,
"Node child not revealed in remove_leaf, falling back to db",
);
if let Some(RevealedNode { node, tree_mask, hash_mask }) =
Copy link
Member

@yongkangc yongkangc Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we could add one comment to show the logic? found it hard to follow and find:

If `recurse_into_extension` is true, and the remaining child is an extension node, then its
    /// child will be ensured to be revealed as well.

Copy link
Collaborator Author

@mediocregopher mediocregopher Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, added some more exposition around the check for the extension node 👍

@mediocregopher mediocregopher added this pull request to the merge queue Oct 8, 2025
Merged via the queue into main with commit 273ee08 Oct 8, 2025
41 checks passed
@mediocregopher mediocregopher deleted the mediocregopher/tree-mask-fix branch October 8, 2025 11:20
@github-project-automation github-project-automation bot moved this from In Progress to Done in Reth Tracker Oct 8, 2025
CarlBeek added a commit to CarlBeek/reth that referenced this pull request Oct 10, 2025
@CarlBeek
Merge branch 'main' into repricing-tester
4b0d163 
* main: (280 commits)
  refactor: remove needless collect() calls in trie tests (paradigmxyz#18937)
  chore(grafana): use precompile address as legend (paradigmxyz#18913)
  perf(tree): worker pooling for storage in multiproof generation (paradigmxyz#18887)
  feat: wait for new blocks when build is in progress (paradigmxyz#18831)
  chore: align node_config threshold constant (paradigmxyz#18914)
  docs: duplicate comment in Eip4844PoolTransactionError (paradigmxyz#18858)
  ci: cache hive simulator images to reduce prepare-hive job time (paradigmxyz#18899)
  refactor: replace collect().is_empty() with next().is_none() in tests (paradigmxyz#18902)
  feat(provider): add get_account_before_block to ChangesetReader (paradigmxyz#18898)
  refactor(engine): separate concerns in on_forkchoice_updated for better maintainability (paradigmxyz#18661)
  chore(node): simplify EngineApiExt bounds by removing redundant constraints (paradigmxyz#18905)
  fix(trie): Reveal extension child when extension is last remaining child of a branch (paradigmxyz#18891)
  chore: make clippy happy (paradigmxyz#18900)
  chore: relax `ChainSpec` impls (paradigmxyz#18894)
  refactor: eliminate redundant allocation in precompile cache example (paradigmxyz#18886)
  fix(era-utils): fix off-by-one for Excluded end bound in process_iter (paradigmxyz#18731)
  docs: yellowpaper sections in consensus implementation (paradigmxyz#18881)
  feat(storage): read headers and transactions only from static files (paradigmxyz#18788)
  feat: Use generic `HeaderTy` for `reth db get static-file headers` (paradigmxyz#18870)
  fix: streamline payload conversion in custom engine API (paradigmxyz#18864)
  ...
frisitano added a commit to scroll-tech/reth that referenced this pull request Nov 17, 2025
@greged93 @Peponks9
@Forostovec @RomanHodulak @sky-coderay @klkvr @lean-apple @mediocregopher @radik878 @WilliamNwoke @yongkangc @Rjected @rnkrtt @shekhirin @fgimenez @stevencartavia @eeemmmmmm @wetkeyboard @TilakMaddy @emhane @maradini77 @sashaodessa @prestoalvarez @MozirDmitriy @gancerlory @mattsse @anim001k @meyer9 @0xKarl98 @jenpaff @asdv23 @GarmashAlex @frankudoags @loocapro @Galoretka @sashass1315 @frisitano
chore: merge upstream 7779ed8 (#363)
857624c 
* docs: yellowpaper sections in consensus implementation (paradigmxyz#18881)

* fix(era-utils): fix off-by-one for Excluded end bound in process_iter (paradigmxyz#18731)

Co-authored-by: Roman Hodulák <[email protected]>

* refactor: eliminate redundant allocation in precompile cache example (paradigmxyz#18886)

* chore: relax `ChainSpec` impls (paradigmxyz#18894)

* chore: make clippy happy (paradigmxyz#18900)

* fix(trie): Reveal extension child when extension is last remaining child of a branch (paradigmxyz#18891)

* chore(node): simplify EngineApiExt bounds by removing redundant constraints (paradigmxyz#18905)

* refactor(engine): separate concerns in on_forkchoice_updated for better maintainability (paradigmxyz#18661)

Co-authored-by: Nathaniel Bajo <[email protected]>
Co-authored-by: YK <[email protected]>
Co-authored-by: Brian Picciano <[email protected]>

* feat(provider): add get_account_before_block to ChangesetReader (paradigmxyz#18898)

* refactor: replace collect().is_empty() with next().is_none() in tests (paradigmxyz#18902)

Co-authored-by: Alexey Shekhirin <[email protected]>

* ci: cache hive simulator images to reduce prepare-hive job time (paradigmxyz#18899)

* docs: duplicate comment in Eip4844PoolTransactionError (paradigmxyz#18858)

* chore: align node_config threshold constant (paradigmxyz#18914)

* feat: wait for new blocks when build is in progress (paradigmxyz#18831)

Co-authored-by: Roman Hodulák <[email protected]>

* perf(tree): worker pooling for storage in multiproof generation (paradigmxyz#18887)

Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Alexey Shekhirin <[email protected]>

* chore(grafana): use precompile address as legend (paradigmxyz#18913)

* refactor: remove needless collect() calls in trie tests (paradigmxyz#18937)

* fix(examples): change method to launch with debug capabilities (paradigmxyz#18946)

* fix(example): launch with debug capabilities (paradigmxyz#18947)

* fix(testsuite): Fix unused updates in e2e-test-utils (paradigmxyz#18953)

* fix(payload): correct Debug label for PayloadTimestamp in PayloadServiceCommand (paradigmxyz#18954)

* chore(rpc): Moves `SequencerMetrics` into `reth-optimism-rpc` (paradigmxyz#18921)

* refactor: replace println! with structured logging in test_vectors (paradigmxyz#18956)

* refactor(cli): use structured logging (tracing) in p2p command (paradigmxyz#18957)

* perf(tree): add elapsed time to parallel state root completion log (paradigmxyz#18959)

* fix(trie): Properly upsert into StoragesTrie in repair-trie (paradigmxyz#18941)

* fix: misleading error message in db list: show actual table name (paradigmxyz#18896)

* fix: remove noisy stderr prints in ERA1 cleanup (EraClient::delete_outside_range) (paradigmxyz#18895)

* fix: use max B256 for upper bound in empty-storage check (paradigmxyz#18962)

* ci: remove reproducible build from release.yml (paradigmxyz#18958)

* chore(rpc): Remove redundant U256::from in suggested_priority_fee (paradigmxyz#18969)

* chore(ci): update eest 7594 issue link in hive expected failures file (paradigmxyz#18976)

* perf(tests): remove redundant format! in ef-tests run_only (paradigmxyz#18909)

* feat(cli): enable traces export via `tracing-otlp` cli arg (paradigmxyz#18242)

Co-authored-by: Dan Cline <[email protected]>

* feat: allow otlp level to be configurable (paradigmxyz#18981)

* chore(optimism): remove unnecessary Debug bounds from header generics (paradigmxyz#18989)

* refactor: convert satisfy_base_fee_ids to use closure (paradigmxyz#18979)

* chore: bump otlp crates (paradigmxyz#18984)

* fix(network): prevent metric leak in outgoing message queue on session teardown (paradigmxyz#18847)

* chore: remove unused imports in blockchain_provider (paradigmxyz#18867)

Co-authored-by: Matthias Seitz <[email protected]>

* fix(stateless): enforce BLOCKHASH ancestor header limit (paradigmxyz#18920)

* chore(evm): mark ExecuteOutput as unused and slated for removal (paradigmxyz#18754)

* refactor: unify `Pipeline` creation codepaths (paradigmxyz#18955)

* fix(engine): flatten storage cache (paradigmxyz#18880)

* perf(tree): worker pooling for account proofs (paradigmxyz#18901)

Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Alexey Shekhirin <[email protected]>

* refactor(storage): fix ChainStateKey enum variant name (paradigmxyz#18992)

* refactor(trie): remove proof task manager (paradigmxyz#18934)

Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Alexey Shekhirin <[email protected]>

* fix: required optimism primitives features in db-api (paradigmxyz#19005)

* refactor(engine): simplify InvalidBlockWitnessHook::on_invalid_block for better testability (paradigmxyz#18696)

* chore: replace poll_next_unpin loop with poll_recv_many (paradigmxyz#18978)

* fix: Set Era pipeline stage to last checkpoint when there is no target (paradigmxyz#19000)

* ci: Add tests for Paris scenario in hive.yml (paradigmxyz#19013)

* chore: bump book timeout (paradigmxyz#19016)

* feat: add metrics for safe and finalized block heights (paradigmxyz#18987)

* chore(privitives-traits): remove unused serde derives and camelCase attribute (paradigmxyz#19014)

* chore: refactor loop in `add_new_transactions` (paradigmxyz#19006)

* chore(ci): bump hive eest to v5.3.0 (paradigmxyz#19021)

* feat(devp2p): make eth p2p networkId configurable (paradigmxyz#19020)

Co-authored-by: frankudoags <frankudoags.com>

* chore: remove unused Args struct from exex-subscription example (paradigmxyz#19019)

* feat: add pending sequence as pub (paradigmxyz#19022)

* chore: bump alloy-core (paradigmxyz#19026)

* fix: unused warnings for tracing (paradigmxyz#19025)

* fix: respect cli blob size setting (paradigmxyz#19024)

* feat(engine): deprecate TestPipelineBuilder::with_executor_results (paradigmxyz#19017)

* perf: background init of workers (paradigmxyz#19012)

* chore(ci): update expected failures (paradigmxyz#19034)

* fix: use header type generic for mask (paradigmxyz#19037)

* fix: correct `Compact` impl for `Option` (paradigmxyz#19042)

* chore: increase versioned hash index cache (paradigmxyz#19038)

* chore(primitives-traits): relax SignerRecoverable bounds for Extended<B,T> (paradigmxyz#19045)

* feat: bump revm (paradigmxyz#18999)

* fix: resolve upstream merge

Signed-off-by: Gregory Edison <[email protected]>

* bump revm

* update deps and fix lints

* update openvm deps

* skip exex wal storage test

* pin revm tag scroll-v91

* bump openvm compat

---------

Signed-off-by: Gregory Edison <[email protected]>
Co-authored-by: josé v <[email protected]>
Co-authored-by: Forostovec <[email protected]>
Co-authored-by: Roman Hodulák <[email protected]>
Co-authored-by: Skylar Ray <[email protected]>
Co-authored-by: Arsenii Kulikov <[email protected]>
Co-authored-by: Léa Narzis <[email protected]>
Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: radik878 <[email protected]>
Co-authored-by: William Nwoke <[email protected]>
Co-authored-by: Nathaniel Bajo <[email protected]>
Co-authored-by: YK <[email protected]>
Co-authored-by: Dan Cline <[email protected]>
Co-authored-by: Merkel Tranjes <[email protected]>
Co-authored-by: Alexey Shekhirin <[email protected]>
Co-authored-by: Federico Gimenez <[email protected]>
Co-authored-by: stevencartavia <[email protected]>
Co-authored-by: emmmm <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: MIHAO PARK <[email protected]>
Co-authored-by: Tilak Madichetti <[email protected]>
Co-authored-by: Emilia Hane <[email protected]>
Co-authored-by: maradini77 <[email protected]>
Co-authored-by: sashaodessa <[email protected]>
Co-authored-by: Alvarez <[email protected]>
Co-authored-by: MozirDmitriy <[email protected]>
Co-authored-by: drhgencer <[email protected]>
Co-authored-by: Matthias Seitz <[email protected]>
Co-authored-by: anim001k <[email protected]>
Co-authored-by: Julian Meyer <[email protected]>
Co-authored-by: Karl Yu <[email protected]>
Co-authored-by: Jennifer <[email protected]>
Co-authored-by: Ivan Wang <[email protected]>
Co-authored-by: GarmashAlex <[email protected]>
Co-authored-by: Udoagwa Franklin <[email protected]>
Co-authored-by: Luca Provini <[email protected]>
Co-authored-by: Galoretka <[email protected]>
Co-authored-by: sashass1315 <[email protected]>
Co-authored-by: frisitano <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rjected Rjected Rjected approved these changes

@yongkangc yongkangc yongkangc approved these changes

@rkrasiuk rkrasiuk Awaiting requested review from rkrasiuk

@shekhirin shekhirin Awaiting requested review from shekhirin shekhirin is a code owner

@mattsse mattsse Awaiting requested review from mattsse

Assignees

No one assigned

Labels

None yet

Projects

Reth Tracker
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mediocregopher @Rjected @yongkangc