Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the storage of anchors in the state #2563

Merged
merged 3 commits into from
Aug 4, 2021
Merged

Fix the storage of anchors in the state #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2af3d16
Fix the storage of anchors in the state
conradoplg Aug 3, 2021
156a343
Merge remote-tracking branch 'origin/main' into fix-anchors-storage
conradoplg Aug 4, 2021
bc0bf03
Bump database version
conradoplg Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zebra-state/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub const MIN_TRANSPARENT_COINBASE_MATURITY: u32 = 100;
pub const MAX_BLOCK_REORG_HEIGHT: u32 = MIN_TRANSPARENT_COINBASE_MATURITY - 1;

/// The database format version, incremented each time the database format changes.
pub const DATABASE_FORMAT_VERSION: u32 = 6;
pub const DATABASE_FORMAT_VERSION: u32 = 7;

/// The maximum number of blocks to check for NU5 transactions,
/// before we assume we are on a pre-NU5 legacy chain.
Expand Down
4 changes: 2 additions & 2 deletions zebra-state/src/service/finalized_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ impl FinalizedState {
}

// Compute the new anchors and index them
batch.zs_insert(sapling_anchors, height, sapling_note_commitment_tree.root());
batch.zs_insert(orchard_anchors, height, orchard_note_commitment_tree.root());
batch.zs_insert(sapling_anchors, sapling_note_commitment_tree.root(), ());
batch.zs_insert(orchard_anchors, orchard_note_commitment_tree.root(), ());

// Update the note commitment trees
if let Some(h) = finalized_tip_height {
Expand Down