sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed coin locking issue

Browse Source
This commit is contained in:
Evan Duffield 2014-08-12 12:14:32 -07:00
parent f69ff36c77
commit 438514de17
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -6443,19 +6443,18 @@ bool CDarkSendPool::SignaturesComplete(){
}
void CDarkSendPool::SendMoney(const CTransaction& collateral, std::vector<CTxIn>& vin, std::vector<CTxOut>& vout, int64& fee, int64 amount){
if(!sessionFoundMasternode){
LogPrintf("CDarkSendPool::SendMoney() - No masternode has been selected yet.\n");
SetNull(true);
UnlockCoins();
return;
}
BOOST_FOREACH(CTxIn in, collateral.vin)
lockedCoins.push_back(in);
BOOST_FOREACH(CTxIn in, vin)
lockedCoins.push_back(in);
if(!sessionFoundMasternode){
LogPrintf("CDarkSendPool::SendMoney() - No masternode has been selected yet.\n");
UnlockCoins();
SetNull(true);
return;
}
/* BOOST_FOREACH(CTxOut& out, vout)
out.scriptPubKey.insert(0, OP_DARKSEND);
@ -7110,7 +7109,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun)
}
if(fDryRun) return true;
/*
// initial phase, find a masternode
if(!sessionFoundMasternode){
int64 nTotalValue = pwalletMain->GetTotalValue(vCoins) - DARKSEND_FEE;
@ -7171,7 +7170,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun)
return false;
}
}
*/
std::string strError = pwalletMain->DarkSendDenominate(minRounds, maxAmount);
LogPrintf("DoAutomaticDenominating : Running darksend denominate. Return '%s'\n", strError.c_str());
return true;

2
src/qt/forms/optionsdialog.ui
View File

@ -128,7 +128,7 @@
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
<number>100000</number>
</property>
<property name="singleStep">
<number>10</number>