neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix locking of funds for mixing (#3194)

Browse Source 
* Fix locking of funds for mixing

Lock funds earlier and actually lock mixing collaterals

* Streamline the locking logic in PrepareDenominate
This commit is contained in:
UdjinM6 2019-11-13 23:03:52 +03:00 committed by GitHub
parent 415b81e41e
commit 460e0f475a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/privatesend/privatesend-client.cpp
View File

@ -450,15 +450,6 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector<std::pair<CTxDS
return false; return false;
} }
// lock the funds we're going to use
for (const auto& txin : txMyCollateral.vin) {
vecOutPointLocked.push_back(txin.prevout);
}
for (const auto& pair : vecPSInOutPairsIn) {
vecOutPointLocked.push_back(pair.first.prevout);
}
// we should already be connected to a Masternode // we should already be connected to a Masternode
if (!nSessionID) { if (!nSessionID) {
LogPrint(BCLog::PRIVATESEND, "CPrivateSendClientSession::SendDenominate -- No Masternode has been selected yet.\n"); LogPrint(BCLog::PRIVATESEND, "CPrivateSendClientSession::SendDenominate -- No Masternode has been selected yet.\n");
@ -922,6 +913,11 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool
} }
} }
} }
// lock the funds we're going to use for our collateral
for (const auto& txin : txMyCollateral.vin) {
vpwallets[0]->LockCoin(txin.prevout);
vecOutPointLocked.push_back(txin.prevout);
}
} // LOCK2(cs_main, vpwallets[0]->cs_wallet); } // LOCK2(cs_main, vpwallets[0]->cs_wallet);
// Always attempt to join an existing queue // Always attempt to join an existing queue
@ -1291,16 +1287,15 @@ bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::
bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun) bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun)
{ {
AssertLockHeld(cs_main);
AssertLockHeld(vpwallets[0]->cs_wallet);
std::vector<int> vecBits; std::vector<int> vecBits;
if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) { if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
strErrorRet = "Incorrect session denom"; strErrorRet = "Incorrect session denom";
return false; return false;
} }
for (const auto& pair : vecPSInOutPairsIn) {
vpwallets[0]->LockCoin(pair.first.prevout);
}
// NOTE: No need to randomize order of inputs because they were // NOTE: No need to randomize order of inputs because they were
// initially shuffled in CWallet::SelectPSInOutPairsByDenominations already. // initially shuffled in CWallet::SelectPSInOutPairsByDenominations already.
int nDenomResult{0}; int nDenomResult{0};
@ -1312,8 +1307,6 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
// Try to add up to PRIVATESEND_ENTRY_MAX_SIZE of every needed denomination // Try to add up to PRIVATESEND_ENTRY_MAX_SIZE of every needed denomination
for (const auto& pair : vecPSInOutPairsIn) { for (const auto& pair : vecPSInOutPairsIn) {
if (pair.second.nRounds < nMinRounds || pair.second.nRounds > nMaxRounds) { if (pair.second.nRounds < nMinRounds || pair.second.nRounds > nMaxRounds) {
// unlock unused coins
vpwallets[0]->UnlockCoin(pair.first.prevout);
continue; continue;
} }
bool fFound = false; bool fFound = false;
@ -1343,22 +1336,23 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
break; break;
} }
} }
if (!fFound || fDryRun) {
// unlock unused coins and if we are not going to mix right away
vpwallets[0]->UnlockCoin(pair.first.prevout);
}
} }
if (nDenomResult != nSessionDenom) { if (nDenomResult != nSessionDenom) {
// unlock used coins on failure
for (const auto& pair : vecPSInOutPairsRet) {
vpwallets[0]->UnlockCoin(pair.first.prevout);
}
keyHolderStorage.ReturnAll(); keyHolderStorage.ReturnAll();
strErrorRet = "Can't prepare current denominated outputs"; strErrorRet = "Can't prepare current denominated outputs";
return false; return false;
} }
if (fDryRun) {
return true;
}
for (const auto& pair : vecPSInOutPairsRet) {
vpwallets[0]->LockCoin(pair.first.prevout);
vecOutPointLocked.push_back(pair.first.prevout);
}
return true; return true;
} }