zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix subtree completion condition and add asserts

This commit is contained in:
teor 2023-08-31 15:40:54 +10:00
parent 63728dad26
commit 8e2b284114
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zebra-state/src/service/finalized_state/disk_format/upgrade/add_subtrees.rs
View File

@ -34,12 +34,19 @@ pub fn run(
// Blocks cannot complete multiple level 16 subtrees,
// the subtree index can increase by a maximum of 1 every ~20 blocks.
if subtree_address.index() <= subtree_count {
// If this block does complete a subtree, the subtree is either completed by a note before
// the final note (so the final note is in the next subtree), or by the final note
// (so the final note is the end of this subtree).
if subtree_address.index() <= subtree_count && !tree.is_complete_subtree() {
prev_tree = Some(tree);
continue;
}
if let Some((index, node)) = tree.completed_subtree_index_and_root() {
assert_eq!(
index, subtree_count,
"trees are inserted in order with no gaps"
);
write_sapling_subtree(upgrade_db, index, height, node);
} else {
let mut prev_tree = prev_tree
@ -75,6 +82,10 @@ pub fn run(
and that the block must complete a subtree",
);
assert_eq!(
index, subtree_count,
"trees are inserted in order with no gaps"
);
write_sapling_subtree(upgrade_db, index, height, node);
};
@ -96,14 +107,19 @@ pub fn run(
continue;
};
// Blocks cannot complete multiple level 16 subtrees,
// the subtree index can increase by a maximum of 1 every ~20 blocks.
if subtree_address.index() <= subtree_count {
// Blocks cannot complete multiple level 16 subtrees.
// If a block does complete a subtree, it is either inside the block, or at the end.
// (See the detailed comment for Sapling.)
if subtree_address.index() <= subtree_count && !tree.is_complete_subtree() {
prev_tree = Some(tree);
continue;
}
if let Some((index, node)) = tree.completed_subtree_index_and_root() {
assert_eq!(
index, subtree_count,
"trees are inserted in order with no gaps"
);
write_orchard_subtree(upgrade_db, index, height, node);
} else {
let mut prev_tree = prev_tree
@ -139,6 +155,10 @@ pub fn run(
and that the block must complete a subtree",
);
assert_eq!(
index, subtree_count,
"trees are inserted in order with no gaps"
);
write_orchard_subtree(upgrade_db, index, height, node);
};