DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'FSM' of https://github.com/jl777/komodo

Browse Source
This commit is contained in:
blackjok3r
2019-01-10 02:25:59 +08:00
parent 9646dd709a e755fa0e7b
commit a543b675f6
27 changed files with 226 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/wallet.cpp
View File

@@ -1184,6 +1184,7 @@ bool DecrementNoteWitnesses(NoteDataMap& noteDataMap, int indexHeight, int64_t n
return true;
}
void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
{
LOCK(cs_wallet);
@@ -1193,10 +1194,17 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
if (!::DecrementNoteWitnesses(wtxItem.second.mapSaplingNoteData, pindex->GetHeight(), nWitnessCacheSize))
needsRescan = true;
}
nWitnessCacheSize -= 1;
// TODO: If nWitnessCache is zero, we need to regenerate the caches (#1302)
assert(nWitnessCacheSize > 0);
if ( WITNESS_CACHE_SIZE == _COINBASE_MATURITY+10 )
{
nWitnessCacheSize -= 1;
// TODO: If nWitnessCache is zero, we need to regenerate the caches (#1302)
assert(nWitnessCacheSize > 0);
}
else
{
if ( nWitnessCacheSize > 0 )
nWitnessCacheSize--;
}
// For performance reasons, we write out the witness cache in
// CWallet::SetBestChain() (which also ensures that overall consistency
// of the wallet.dat is maintained).