jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: add root_with_updates method to sparse trie (#14393)

Browse Source
This commit is contained in:
Dan Cline
2025-02-11 09:47:19 -05:00
committed by GitHub
parent 1cd72206a1
commit 8e479f36d3
3 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/engine/tree/src/tree/root.rs
View File

@ -1011,11 +1011,10 @@ where
debug!(target: "engine::root", num_iterations, "All proofs processed, ending calculation");
let start = Instant::now();
let root = trie.root().expect("sparse trie should be revealed");
let (root, trie_updates) = trie.root_with_updates().expect("sparse trie should be revealed");
let elapsed = start.elapsed();
metrics.sparse_trie_final_update_duration_histogram.record(elapsed);
let trie_updates = trie.take_trie_updates().expect("retention must be enabled");
Ok((root, trie_updates, num_iterations))
}

50
crates/trie/sparse/src/state.rs
View File

@ -482,30 +482,50 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> {
self.state.root()
}
/// Returns sparse trie root and trie updates if the trie has been revealed.
pub fn root_with_updates(&mut self) -> Option<(B256, TrieUpdates)> {
let storage_tries = self.storage_trie_updates();
self.state.root_with_updates().map(|(root, updates)| {
let updates = TrieUpdates {
account_nodes: updates.updated_nodes,
removed_nodes: updates.removed_nodes,
storage_tries,
};
(root, updates)
})
}
/// Returns storage trie updates for tries that have been revealed.
///
/// Panics if any of the storage tries are not revealed.
pub fn storage_trie_updates(&mut self) -> B256HashMap<StorageTrieUpdates> {
self.storages
.iter_mut()
.map(|(address, trie)| {
let trie = trie.as_revealed_mut().unwrap();
let updates = trie.take_updates();
let updates = StorageTrieUpdates {
is_deleted: updates.wiped,
storage_nodes: updates.updated_nodes,
removed_nodes: updates.removed_nodes,
};
(*address, updates)
})
.filter(|(_, updates)| !updates.is_empty())
.collect()
}
/// Returns [`TrieUpdates`] by taking the updates from the revealed sparse tries.
///
/// Returns `None` if the accounts trie is not revealed.
pub fn take_trie_updates(&mut self) -> Option<TrieUpdates> {
let storage_tries = self.storage_trie_updates();
self.state.as_revealed_mut().map(|state| {
let updates = state.take_updates();
TrieUpdates {
account_nodes: updates.updated_nodes,
removed_nodes: updates.removed_nodes,
storage_tries: self
.storages
.iter_mut()
.map(|(address, trie)| {
let trie = trie.as_revealed_mut().unwrap();
let updates = trie.take_updates();
let updates = StorageTrieUpdates {
is_deleted: updates.wiped,
storage_nodes: updates.updated_nodes,
removed_nodes: updates.removed_nodes,
};
(*address, updates)
})
.filter(|(_, updates)| !updates.is_empty())
.collect(),
storage_tries,
}
})
}

6
crates/trie/sparse/src/trie.rs
View File

@ -134,6 +134,12 @@ impl<P> SparseTrie<P> {
Some(self.as_revealed_mut()?.root())
}
/// Returns both the trie root and takes sparse trie updates if the trie has been revealed.
pub fn root_with_updates(&mut self) -> Option<(B256, SparseTrieUpdates)> {
let revealed = self.as_revealed_mut()?;
Some((revealed.root(), revealed.take_updates()))
}
/// Calculates the hashes of the nodes below the provided level.
pub fn calculate_below_level(&mut self, level: usize) {
self.as_revealed_mut().unwrap().update_rlp_node_level(level);