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

Auto merge of #3995 - bitcartel:no_migration_during_block_download_phase, r=Eirik0 

Don't allow Sprout-to-Sapling migration when syncing during IBD or after wake from sleep.

Prevent migration transactions from being created in response to incoming blocks when a node launches and syncs (the initial block download phase) and when a node wakes from sleep/hibernation and starts syncing old blocks rapidly.
This commit is contained in:
Homu 2019-05-09 13:51:49 -07:00
parent 785989f2f9 6921c81b9d
commit e97621acf7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet.cpp
View File

@ -581,7 +581,13 @@ void CWallet::ChainTip(const CBlockIndex *pindex,
{
if (added) {
ChainTipAdded(pindex, pblock, sproutTree, saplingTree);
RunSaplingMigration(pindex->nHeight);
// Prevent migration transactions from being created when node is syncing after launch,
// and also when node wakes up from suspension/hibernation and incoming blocks are old.
if (!IsInitialBlockDownload() &&
pblock->GetBlockTime() > GetAdjustedTime() - 3 * 60 * 60)
{
RunSaplingMigration(pindex->nHeight);
}
} else {
DecrementNoteWitnesses(pindex);
UpdateSaplingNullifierNoteMapForBlock(pblock);