Skip to content

refactor(trie): remove TrieNodeProvider#23658

Merged
mediocregopher merged 8 commits into
mainfrom
mediocregopher/sparse-trie-parent-root-short-circuit
Apr 21, 2026
Merged

refactor(trie): remove TrieNodeProvider#23658
mediocregopher merged 8 commits into
mainfrom
mediocregopher/sparse-trie-parent-root-short-circuit

Conversation

@mediocregopher
Copy link
Copy Markdown
Member

@mediocregopher mediocregopher commented Apr 20, 2026 •
edited
Loading

  • Implements a small refactoring in SparseTrieCacheTask to remove the last real usage of TrieNodeProvider.

  • Remove update_leaf / remove_leaf methods from the SparseTrie trait, they are no longer used anywhere.

  • Delete TrieNodeProvider trait definition, all of its impls, and the associated code-paths in the proof workers.

@mediocregopher
fix(engine): reuse parent root when sparse trie is unchanged
715353b 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dab57-3907-736a-a44d-766b241007c7
Co-authored-by: Amp <amp@ampcode.com>
@github-project-automation github-project-automation Bot moved this to Backlog in Reth Tracker Apr 20, 2026
@mediocregopher mediocregopher added A-engine Related to the engine implementation A-trie Related to Merkle Patricia Trie implementation labels Apr 20, 2026
@mediocregopher mediocregopher self-assigned this Apr 20, 2026
@mediocregopher mediocregopher added the C-bug An unexpected or incorrect behavior label Apr 20, 2026
mediocregopher and others added 2 commits April 20, 2026 15:16
@mediocregopher
fix(trie): return blind errors for unrevealed roots
3735e45 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dab57-3907-736a-a44d-766b241007c7
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher
refactor(trie): remove leaf mutations from sparse trie trait
be598cb 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dab79-82df-7799-901a-a421b27793ea
Co-authored-by: Amp <amp@ampcode.com>
mediocregopher
mediocregopher commented Apr 20, 2026
View reviewed changes
Comment thread crates/trie/sparse/src/state.rs
Comment thread crates/trie/sparse/src/trie.rs
mediocregopher and others added 2 commits April 20, 2026 16:27
@mediocregopher
refactor(trie): remove sparse trie node providers
f5145b3 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dabaa-a995-7284-9f28-3bd06ea11b1a
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher
chore: merge origin/main into sparse-trie cleanup branch
f7b91cf 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dabb4-2a1a-7508-8ced-702e9cb20dcb
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher mediocregopher changed the title fix(engine): reuse parent root when sparse trie is unchanged refactor(trie): remove sparse trie provider plumbing Apr 20, 2026
mediocregopher and others added 2 commits April 21, 2026 08:37
@mediocregopher
docs(trie): restore sparse state account comment
e476826 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dabb4-2a1a-7508-8ced-702e9cb20dcb
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher
docs(trie): restore sparse state comments
b9f07f8 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019dabb4-2a1a-7508-8ced-702e9cb20dcb
Co-authored-by: Amp <amp@ampcode.com>
mediocregopher
mediocregopher commented Apr 21, 2026
View reviewed changes
Comment thread crates/engine/tree/src/tree/payload_processor/sparse_trie.rs
self.trie.root_with_updates(&self.proof_worker_handle).map_err(|e| {
ParallelStateRootError::Other(format!("could not calculate state root: {e:?}"))
})?;
let (state_root, trie_updates) = match self.trie.root_with_updates() {
Copy link
Copy Markdown
Member Author

@mediocregopher mediocregopher Apr 21, 2026

Choose a reason for hiding this comment

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

Note: This is the only logical change to this PR. If the block had no state updates then the account trie root node won't necessarily be revealed. Previously we would reveal it on-the-fly using a TrieNodeProvider. Now root_with_updates returns a blinded error. In this case we can assume that the SR hasn't changed, and we return the previous block's state root.

Comment thread crates/trie/sparse/src/parallel.rs
@@ -432,1043 +432,954 @@ impl SparseTrie for ParallelSparseTrie {
}
}

fn update_leaf<P: TrieNodeProvider>(
Copy link
Copy Markdown
Member Author

@mediocregopher mediocregopher Apr 21, 2026

Choose a reason for hiding this comment

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

The only real change to this file was to remove the update_leaf/remove_leaf methods out of the SparseTrie impl. This can be seen better using a --patience diff:

git diff origin/main..mediocregopher/sparse-trie-parent-root-short-circuit --patience -- crates/
trie/sparse/src/parallel.rs

@mediocregopher mediocregopher changed the title refactor(trie): remove sparse trie provider plumbing refactor(trie): remove TrieNodeProvider Apr 21, 2026
@mediocregopher mediocregopher removed the C-bug An unexpected or incorrect behavior label Apr 21, 2026
@mediocregopher mediocregopher marked this pull request as ready for review April 21, 2026 08:56
@mediocregopher
fix(trie): link sparse trie debug dependency
10aaeae 
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019daf67-d6b6-72ac-b122-04f1d8e50d71
Co-authored-by: Amp <amp@ampcode.com>
pepyakin
pepyakin approved these changes Apr 21, 2026
View reviewed changes
Comment thread crates/trie/parallel/src/proof_task.rs

/// Internal message for storage workers.
#[derive(Debug)]
pub(crate) enum StorageWorkerJob {
Copy link
Copy Markdown
Member

@pepyakin pepyakin Apr 21, 2026

Choose a reason for hiding this comment

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

Collapse?

Copy link
Copy Markdown
Member Author

@mediocregopher mediocregopher Apr 21, 2026

Choose a reason for hiding this comment

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

Could do yeah, I just didn't want to bloat the diff with any more new code than necessary

@github-project-automation github-project-automation Bot moved this from Backlog to In Progress in Reth Tracker Apr 21, 2026
@mediocregopher mediocregopher added this pull request to the merge queue Apr 21, 2026
Merged via the queue into main with commit 3edb271 Apr 21, 2026
34 checks passed
@mediocregopher mediocregopher deleted the mediocregopher/sparse-trie-parent-root-short-circuit branch April 21, 2026 12:47
@github-project-automation github-project-automation Bot moved this from In Progress to Done in Reth Tracker Apr 21, 2026
This was referenced Apr 22, 2026
Closed
Merged
crazywriter1 pushed a commit to crazywriter1/tempo that referenced this pull request Apr 23, 2026
@decofe @shekhirin
deps: update reth from main (2026-04-23) (tempoxyz#3698)
328c734 
Automated nightly update of reth dependencies from `paradigmxyz/reth`
main branch.

## Upstream reth changes


[`98ebc34...7839f3d`](paradigmxyz/reth@98ebc34...7839f3d)

🔗 Amp thread:
https://ampcode.com/threads/T-019db884-a7c3-738b-8f38-cc04f8942d8a
**Engine**
- Suppress persistence during payload building
([#23618](paradigmxyz/reth#23618))
- Align Amsterdam endpoint validation
([#23625](paradigmxyz/reth#23625))
- Revert [#23541](paradigmxyz/reth#23541) and
[#23578](paradigmxyz/reth#23578)
([#23646](paradigmxyz/reth#23646))
- Let consensus impls control which errors are transient
([#23668](paradigmxyz/reth#23668))
- Configure invalid header cache hit eviction
([#23670](paradigmxyz/reth#23670))

**Perf**
- Relax executor reset thresholds for re-execute
([#23617](paradigmxyz/reth#23617))
- Replace `BTreeMap` with `imbl::OrdMap` in `BestTransactions`
([#23621](paradigmxyz/reth#23621))
- Avoid reopening `.csoff` on every changeset lookup
([#23687](paradigmxyz/reth#23687))
- Disable read tx timeout during re-execute
([#23680](paradigmxyz/reth#23680))

**P2P / Net**
- Add snap/2 wire helpers and messages
([#23611](paradigmxyz/reth#23611))
- Optionally fetch BAL with full blocks
([#23629](paradigmxyz/reth#23629))
- Discv5 enabled by default
([#23686](paradigmxyz/reth#23686))

**DB**
- Add `reth db migrate-v2` for v1→v2 storage migration
([#23422](paradigmxyz/reth#23422))
- Detect and warn about ZFS
([#23685](paradigmxyz/reth#23685))

**BAL**
- Scaffold BAL store abstraction
([#23596](paradigmxyz/reth#23596))
- Enable BAL building in ethereum payload
([#23597](paradigmxyz/reth#23597))
- Add parallelization and batch IO flags
([#23663](paradigmxyz/reth#23663))

**Refactor**
- Make `WorkerPool` lazy by default
([#23627](paradigmxyz/reth#23627))
- Encapsulate state fetching in db provider
([#23656](paradigmxyz/reth#23656))
- Remove `TrieNodeProvider`
([#23658](paradigmxyz/reth#23658))
- Unify opaque consensus error helpers
([#23669](paradigmxyz/reth#23669))

**Payload**
- Add gas limit and slot number to `BlockOrPayload`
([#23624](paradigmxyz/reth#23624),
[#23626](paradigmxyz/reth#23626))

**Bench**
- Add CLI flag to fetch balances by default; require local benchmark
data ([#23655](paradigmxyz/reth#23655),
[#23679](paradigmxyz/reth#23679))

**Deps**
- Bump alloy crates to 2.0.1
([#23677](paradigmxyz/reth#23677)),
rustls-webpki
([#23681](paradigmxyz/reth#23681)), weekly
`cargo update`
([#23628](paradigmxyz/reth#23628))

**Testing**
- Remove unsafe `env::set_var(RUST_LOG)` from tests
([#23672](paradigmxyz/reth#23672))
- Address nightly clippy warnings
([#23630](paradigmxyz/reth#23630))

## Migrations

🔗 Amp thread:
https://ampcode.com/threads/T-019db884-dc46-71f5-a823-00c3a16191d4
- **Reth dependency bump**: All `reth-*` git dependencies updated from
rev `98ebc34` to `7839f3d`
- **Alloy version bump**: `alloy-*` crates updated from `2.0.0` to
`2.0.1`; `alloy-evm` changed from `0.33.2` to `0.33.0`
- **`ConsensusError::Other` → `ConsensusError::msg`**: All
`ConsensusError::Other(...)` calls migrated to
`ConsensusError::msg(...)`, which accepts `&str`/`impl Display` directly
instead of requiring `String` (removes `.to_string()` calls for string
literals)
- **`deny.toml` license exceptions**: Added MPL-2.0 exceptions for
`bitmaps`, `imbl`, and `imbl-sized-chunks` (new transitive dependencies)

[GitHub
Workflow](https://github.com/tempoxyz/tempo/actions/runs/24816009191)

---------

Co-authored-by: Alexey Shekhirin <github@shekhirin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pepyakin pepyakin pepyakin approved these changes

@shekhirin shekhirin shekhirin approved these changes

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

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

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

Assignees

@mediocregopher mediocregopher

Labels

A-engine Related to the engine implementation A-trie Related to Merkle Patricia Trie implementation

Projects

Reth Tracker
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mediocregopher @pepyakin @shekhirin