diff --git a/src/darksend.cpp b/src/darksend.cpp index 86b68b4c54..fbe11a0264 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -1364,7 +1364,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready) int64 balanceNeedsAnonymized = pwalletMain->GetBalance() - pwalletMain->GetAnonymizedBalance(); if(balanceNeedsAnonymized > maxAmount*COIN) balanceNeedsAnonymized= maxAmount*COIN; - if(balanceNeedsAnonymized < COIN*1.1){ + if(balanceNeedsAnonymized < COIN*2.5){ LogPrintf("DoAutomaticDenominating : No funds detected in need of denominating \n"); return false; } diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 856c7d6cc7..d8407560ce 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -385,6 +385,15 @@ void OverviewPage::runDoAutomaticDenomination(){ } void OverviewPage::toggleDarksend(){ + int64 balance = pwalletMain->GetBalance(); + if(balance < 2.5*coin){ + QMessageBox::warning(this, tr("Darksend"), + tr("Darksend requires at least 2.5 DRK to use."), + QMessageBox::Ok, QMessageBox::O + return; + } + + darkSendPool.cachedNumBlocks = 0; fEnableDarksend = !fEnableDarksend; diff --git a/src/wallet.cpp b/src/wallet.cpp index 75794cff09..844c4f5faf 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1784,9 +1784,6 @@ bool CWallet::CreateCollateralTransaction(CTransaction& txCollateral, std::strin if (!SelectCoinsCollateral(vCoinsCollateral, nValueIn2)) { - BOOST_FOREACH(CTxIn v, vCoinsCollateral) - UnlockCoin(v.prevout); - strReason = "Error: Darksend requires a collateral transaction and could not locate an acceptable input!"; return false; } @@ -1819,9 +1816,6 @@ bool CWallet::CreateCollateralTransaction(CTransaction& txCollateral, std::strin vinNumber++; } - BOOST_FOREACH(CTxIn v, vCoinsCollateral) - LockCoin(v.prevout); - return true; }