github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-08 03:01:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(trie): cleanup modified branch masks in update_leaf on reveal failure (#21629)

Browse Source
This commit is contained in:
Brian Picciano
2026-01-30 17:06:28 +01:00
committed by GitHub
parent d4fa6806b7
commit f90b5c8a7f
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/trie/sparse-parallel/src/trie.rs
View File

@@ -338,6 +338,8 @@ impl SparseTrie for ParallelSparseTrie {
let mut next = Some(Nibbles::default()); let mut next = Some(Nibbles::default());
// Track the original node that was modified (path, original_node) for rollback // Track the original node that was modified (path, original_node) for rollback
let mut modified_original: Option<(Nibbles, SparseNode)> = None; let mut modified_original: Option<(Nibbles, SparseNode)> = None;
// Track inserted branch masks for rollback
let mut inserted_masks: Vec<Nibbles> = Vec::new();
// Traverse the upper subtrie to find the node to update or the subtrie to update. // Traverse the upper subtrie to find the node to update or the subtrie to update.
// //
@@ -392,6 +394,7 @@ impl SparseTrie for ParallelSparseTrie {
self.rollback_insert( self.rollback_insert(
&full_path, &full_path,
&new_nodes, &new_nodes,
&inserted_masks,
modified_original.take(), modified_original.take(),
); );
return Err(e); return Err(e);
@@ -405,6 +408,7 @@ impl SparseTrie for ParallelSparseTrie {
self.rollback_insert( self.rollback_insert(
&full_path, &full_path,
&new_nodes, &new_nodes,
&inserted_masks,
modified_original.take(), modified_original.take(),
); );
return Err(e.into()); return Err(e.into());
@@ -423,6 +427,7 @@ impl SparseTrie for ParallelSparseTrie {
self.rollback_insert( self.rollback_insert(
&full_path, &full_path,
&new_nodes, &new_nodes,
&inserted_masks,
modified_original.take(), modified_original.take(),
); );
return Err(e); return Err(e);
@@ -432,6 +437,7 @@ impl SparseTrie for ParallelSparseTrie {
self.rollback_insert( self.rollback_insert(
&full_path, &full_path,
&new_nodes, &new_nodes,
&inserted_masks,
modified_original.take(), modified_original.take(),
); );
return Err(SparseTrieErrorKind::NodeNotFoundInProvider { return Err(SparseTrieErrorKind::NodeNotFoundInProvider {
@@ -443,8 +449,9 @@ impl SparseTrie for ParallelSparseTrie {
None None
}; };
if let Some(masks) = reveal_masks { if let Some(_masks) = reveal_masks {
self.branch_node_masks.insert(reveal_path, masks); self.branch_node_masks.insert(reveal_path, _masks);
inserted_masks.push(reveal_path);
} }
} }
@@ -525,6 +532,10 @@ impl SparseTrie for ParallelSparseTrie {
if let Some(lower) = self.lower_subtrie_for_path_mut(&full_path) { if let Some(lower) = self.lower_subtrie_for_path_mut(&full_path) {
lower.inner.values.remove(&full_path); lower.inner.values.remove(&full_path);
} }
// Clean up any branch masks that were inserted during upper subtrie traversal
for mask_path in &inserted_masks {
self.branch_node_masks.remove(mask_path);
}
return Err(e); return Err(e);
} }
} }
@@ -1297,13 +1308,14 @@ impl ParallelSparseTrie {
} }
/// Rolls back a partial update by removing the value, removing any inserted nodes, /// Rolls back a partial update by removing the value, removing any inserted nodes,
/// and restoring any modified original node. /// removing any inserted branch masks, and restoring any modified original node.
/// This ensures `update_leaf` is atomic - either it succeeds completely or leaves the trie /// This ensures `update_leaf` is atomic - either it succeeds completely or leaves the trie
/// unchanged. /// unchanged.
fn rollback_insert( fn rollback_insert(
&mut self, &mut self,
full_path: &Nibbles, full_path: &Nibbles,
inserted_nodes: &[Nibbles], inserted_nodes: &[Nibbles],
inserted_masks: &[Nibbles],
modified_original: Option<(Nibbles, SparseNode)>, modified_original: Option<(Nibbles, SparseNode)>,
) { ) {
self.upper_subtrie.inner.values.remove(full_path); self.upper_subtrie.inner.values.remove(full_path);
@@ -1316,6 +1328,10 @@ impl ParallelSparseTrie {
} }
} }
} }
// Remove any branch masks that were inserted
for mask_path in inserted_masks {
self.branch_node_masks.remove(mask_path);
}
// Restore the original node that was modified // Restore the original node that was modified
if let Some((path, original_node)) = modified_original { if let Some((path, original_node)) = modified_original {
self.upper_subtrie.nodes.insert(path, original_node); self.upper_subtrie.nodes.insert(path, original_node);