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

Additional locking and race condition prevention

This commit is contained in:
Eirik0 2019-04-16 19:35:04 -06:00
parent 699288b4b4
commit 7c4ad6e298
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet.cpp
View File

@ -606,6 +606,9 @@ void CWallet::RunSaplingMigration(int blockHeight) {
saplingMigrationOperation = operation;
q->addOperation(operation);
} else if (blockHeight % 500 == 499) {
if (saplingMigrationOperation != nullptr) {
saplingMigrationOperation->cancel();
}
for (const CTransaction& transaction : pendingSaplingMigrationTxs) {
// The following is taken from z_sendmany/z_mergetoaddress
// Send the transaction
@ -623,6 +626,7 @@ void CWallet::RunSaplingMigration(int blockHeight) {
}
void CWallet::AddPendingSaplingMigrationTx(const CTransaction& tx) {
LOCK(cs_wallet);
pendingSaplingMigrationTxs.push_back(tx);
}