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

Merge pull request #6238 from daira/fix-orchard-wallet-rewind 

Don't attempt to rewind the Orchard wallet to a height after its current checkpoint
This commit is contained in:
Daira Hopwood 2022-11-10 19:12:32 +00:00 committed by GitHub
parent fadbb794f1 e85dae7f12
commit 14cce06163
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/release-notes.md
View File

@ -4,3 +4,8 @@ release-notes at release time)
Notable changes
===============
Fixed
-----
This release fixes an error "Assertion `uResultHeight == rewindHeight` failed" (#5958)
that could sometimes happen when restarting a node.

14
src/wallet/wallet.cpp
View File

@ -4693,9 +4693,13 @@ int CWallet::ScanForWalletTransactions(
{
LOCK2(cs_main, cs_wallet);
// no need to read and scan block, if block was created before
// our wallet birthday (as adjusted for block time variability)
while (chainActive.Next(pindex) != NULL && nTimeFirstKey && pindex->GetBlockTime() < nTimeFirstKey - TIMESTAMP_WINDOW) {
// There is no need to read and scan blocks that were created before
// our wallet birthday (as adjusted for block time variability).
// If there is an Orchard wallet checkpoint, the rewind point must not
// be advanced past the last Orchard wallet checkpoint height.
auto optOrchardCheckpointHeight = orchardWallet.GetLastCheckpointHeight();
while (chainActive.Next(pindex) != NULL && nTimeFirstKey && pindex->GetBlockTime() < nTimeFirstKey - TIMESTAMP_WINDOW &&
(!optOrchardCheckpointHeight.has_value() || pindex->nHeight < optOrchardCheckpointHeight.value())) {
pindex = chainActive.Next(pindex);
}
@ -4705,7 +4709,7 @@ int CWallet::ScanForWalletTransactions(
// the witness data that is being removed in the rewind here.
auto nu5_height = chainParams.GetConsensus().GetActivationHeight(Consensus::UPGRADE_NU5);
bool performOrchardWalletUpdates{false};
if (orchardWallet.GetLastCheckpointHeight().has_value()) {
if (optOrchardCheckpointHeight.has_value()) {
// We have a checkpoint, so attempt to rewind the Orchard wallet at most as
// far as the NU5 activation block.
// If there's no activation height, we shouldn't have a checkpoint already,
@ -4718,7 +4722,7 @@ int CWallet::ScanForWalletTransactions(
LogPrintf(
"CWallet::ScanForWalletTransactions(): Rewinding Orchard wallet to height %d; current is %d",
rewindHeight,
orchardWallet.GetLastCheckpointHeight().value());
optOrchardCheckpointHeight.value());
uint32_t uResultHeight{0};
if (orchardWallet.Rewind(rewindHeight, uResultHeight)) {
// rewind was successful or a no-op, so perform Orchard wallet updates