zcash_client_sqlite: Fix incomplete truncation due to bad reorg handling. #1549
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nuttycom
force-pushed
the
debug/commitment_tree_conflict
branch
from
1fc8848 to
b367c65
Compare
nuttycom
force-pushed
the
debug/commitment_tree_conflict
branch
5 times, most recently
from
700ca4e to
54695c2
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1549 +/- ##
==========================================
+ Coverage 61.32% 61.62% +0.30%
==========================================
Files 147 148 +1
Lines 18667 18808 +141
==========================================
+ Hits 11447 11590 +143
+ Misses 7220 7218 -2 ☔ View full report in Codecov by Sentry. |
nuttycom
force-pushed
the
debug/commitment_tree_conflict
branch
2 times, most recently
from
abe88b4 to
a4217d6
Compare
|
This branch has been tested with an affected wallet, and resolves the problems that blocked additional scanning. |
str4d
requested changes
Sep 27, 2024
zcash_client_sqlite/src/wallet/init/migrations/fix_broken_commitment_trees.rs
Show resolved
Hide resolved
nuttycom
commented
Sep 27, 2024
zcash_client_sqlite/src/wallet/init/migrations/fix_broken_commitment_trees.rs
Show resolved
Hide resolved
nuttycom
force-pushed
the
debug/commitment_tree_conflict
branch
from
a4217d6 to
4dd90b7
Compare
|
force-pushed to address review comments. |
nuttycom
commented
Sep 27, 2024
…n truncation. This is a minimal fix for the failing test; however, it it does not fix users' existing wallets, and also does not correctly set retention flags. The correct fix requires a change to the `shardtree` API that will be made in a subsequent commit.
…te commitment trees.
nuttycom
force-pushed
the
debug/commitment_tree_conflict
branch
from
4dd90b7 to
11f5a15
Compare
|
force-pushed to correctly uncomment tests that were inadvertently left commented out. |
str4d
approved these changes
Sep 27, 2024
| @@ -2511,21 +2511,22 @@ where | |||
| // Truncate back to the reorg height, but retain the block cache. | |||
| st.truncate_to_height_retaining_cache(reorg_height); | |||
|
|
|||
| // The following error-prone tree state is generated by the current truncate implementation: | |||
| // The following error-prone tree state is generated by the a previous (buggy) truncate | |||
There was a problem hiding this comment.
Suggested change
| // The following error-prone tree state is generated by the a previous (buggy) truncate | |
| // The following error-prone tree state is generated by a previous (buggy) truncate |
| orchard = { git = "https://github.com/zcash/orchard", rev = "55fb089a335bbbc1cda186c706bc037073df8eb7" } | ||
| incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" } | ||
| incrementalmerkletree-testing = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" } | ||
| shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" } |
There was a problem hiding this comment.
I checked these commits are what I expected.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.