diff --git a/crates/trie/sparse/src/trie.rs b/crates/trie/sparse/src/trie.rs index 28cdb423ee72..80b0e31985ca 100644 --- a/crates/trie/sparse/src/trie.rs +++ b/crates/trie/sparse/src/trie.rs @@ -381,6 +381,7 @@ impl
RevealedSparseTrie
{ // Memoize the hash of a previously blinded node in a new extension // node. hash: Some(*hash), + store_in_db_trie: None, }); self.reveal_node_or_hash(child_path, &ext.child)?; } @@ -602,14 +603,14 @@ impl
RevealedSparseTrie
{ while let Some((mut path, level)) = paths.pop() { match self.nodes.get(&path).unwrap() { SparseNode::Empty | SparseNode::Hash(_) => {} - SparseNode::Leaf { hash, .. } => { + SparseNode::Leaf { key: _, hash } => { if hash.is_some() && !prefix_set.contains(&path) { continue } targets.push(path); } - SparseNode::Extension { key, hash } => { + SparseNode::Extension { key, hash, store_in_db_trie: _ } => { if hash.is_some() && !prefix_set.contains(&path) { continue } @@ -621,7 +622,7 @@ impl
RevealedSparseTrie
{ paths.push((path, level + 1)); } } - SparseNode::Branch { state_mask, hash, .. } => { + SparseNode::Branch { state_mask, hash, store_in_db_trie: _ } => { if hash.is_some() && !prefix_set.contains(&path) { continue } @@ -673,26 +674,37 @@ impl
RevealedSparseTrie
{
(rlp_node, SparseNodeType::Leaf)
}
}
- SparseNode::Extension { key, hash } => {
+ SparseNode::Extension { key, hash, store_in_db_trie } => {
let mut child_path = path.clone();
child_path.extend_from_slice_unchecked(key);
- if let Some(hash) = hash.filter(|_| !prefix_set_contains(&path)) {
- (
- RlpNode::word_rlp(&hash),
- SparseNodeType::Extension { store_in_db_trie: true },
- )
+ if let Some((hash, store_in_db_trie)) =
+ hash.zip(*store_in_db_trie).filter(|_| !prefix_set_contains(&path))
+ {
+ (RlpNode::word_rlp(&hash), SparseNodeType::Extension { store_in_db_trie })
} else if buffers.rlp_node_stack.last().is_some_and(|e| e.0 == child_path) {
let (_, child, child_node_type) = buffers.rlp_node_stack.pop().unwrap();
self.rlp_buf.clear();
let rlp_node = ExtensionNodeRef::new(key, &child).rlp(&mut self.rlp_buf);
*hash = rlp_node.as_hash();
+ let store_in_db_trie_value = child_node_type.store_in_db_trie();
+
+ trace!(
+ target: "trie::sparse",
+ ?path,
+ ?child_path,
+ ?child_node_type,
+ "Extension node"
+ );
+
+ *store_in_db_trie = Some(store_in_db_trie_value);
+
(
rlp_node,
SparseNodeType::Extension {
// Inherit the `store_in_db_trie` flag from the child node, which is
// always the branch node
- store_in_db_trie: child_node_type.store_in_db_trie(),
+ store_in_db_trie: store_in_db_trie_value,
},
)
} else {
@@ -1228,7 +1240,14 @@ pub enum SparseNode {
key: Nibbles,
/// Pre-computed hash of the sparse node.
/// Can be reused unless this trie path has been updated.
+ ///
+ /// If [`None`], then the value is not known and should be calculated from scratch.
hash: Option