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

reducing lower limit to 1.5DRK

Browse Source
This commit is contained in:
Evan Duffield 2014-12-25 20:58:39 -07:00
parent 5eb3bcdcc0
commit 31ca8ad5f9
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/darksend.cpp
View File

@ -1421,6 +1421,7 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
int maxRounds = 2; int maxRounds = 2;
int maxAmount = DARKSEND_POOL_MAX/COIN; int maxAmount = DARKSEND_POOL_MAX/COIN;
bool hasFeeInput = false; bool hasFeeInput = false;
int64_t lowestDenom = COIN*1;
// if we have more denominated funds (of any maturity) than the nAnonymizeDarkcoinAmount, we should use use those // if we have more denominated funds (of any maturity) than the nAnonymizeDarkcoinAmount, we should use use those
if(pwalletMain->GetDenominatedBalance(true) >= nAnonymizeDarkcoinAmount*COIN || if(pwalletMain->GetDenominatedBalance(true) >= nAnonymizeDarkcoinAmount*COIN ||
@ -1433,8 +1434,8 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
int64_t balanceNeedsAnonymized = pwalletMain->GetBalance() - pwalletMain->GetAnonymizedBalance(); int64_t balanceNeedsAnonymized = pwalletMain->GetBalance() - pwalletMain->GetAnonymizedBalance();
if(balanceNeedsAnonymized > maxAmount*COIN) balanceNeedsAnonymized= maxAmount*COIN; if(balanceNeedsAnonymized > maxAmount*COIN) balanceNeedsAnonymized= maxAmount*COIN;
if(balanceNeedsAnonymized < COIN*2.5 || if(balanceNeedsAnonymized < lowestDenom ||
(vecDisabledDenominations.size() > 0 && balanceNeedsAnonymized < COIN*12.5)){ (vecDisabledDenominations.size() > 0 && balanceNeedsAnonymized < COIN*10)){
LogPrintf("DoAutomaticDenominating : No funds detected in need of denominating \n"); LogPrintf("DoAutomaticDenominating : No funds detected in need of denominating \n");
return false; return false;
} }
@ -1462,8 +1463,8 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
} }
// the darksend pool can only take 2.5DRK minimum // the darksend pool can only take 2.5DRK minimum
if(nValueIn < COIN*2.5 || if(nValueIn < lowestDenom ||
(vecDisabledDenominations.size() > 0 && nValueIn < COIN*12.5) (vecDisabledDenominations.size() > 0 && nValueIn < COIN*10)
){ ){
//simply look for non-denominated coins //simply look for non-denominated coins
if (pwalletMain->SelectCoinsDark(maxAmount*COIN, 9999999*COIN, vCoins, nValueIn, minRounds, maxRounds, hasFeeInput)) if (pwalletMain->SelectCoinsDark(maxAmount*COIN, 9999999*COIN, vCoins, nValueIn, minRounds, maxRounds, hasFeeInput))
@ -1791,7 +1792,7 @@ bool CDarkSendPool::SplitUpMoney(bool justCollateral)
LogPrintf("SplitUpMoney: Not enough outputs to make a transaction\n"); LogPrintf("SplitUpMoney: Not enough outputs to make a transaction\n");
return false; return false;
} }
if((!justCollateral && nTotalOut <= 1.1*COIN) || vecSend.size() < 1){ if((!justCollateral && nTotalOut <= 1*COIN) || vecSend.size() < 1){
LogPrintf("SplitUpMoney: Not enough outputs to make a transaction\n"); LogPrintf("SplitUpMoney: Not enough outputs to make a transaction\n");
return false; return false;
} }

8
src/qt/overviewpage.cpp
View File

@ -400,17 +400,17 @@ void OverviewPage::runDoAutomaticDenomination(){
} }
void OverviewPage::toggleDarksend(){ void OverviewPage::toggleDarksend(){
if(!fEnableDarksend){
int64_t balance = pwalletMain->GetBalance(); int64_t balance = pwalletMain->GetBalance();
if(balance < 2.5*COIN){ if(balance < 1.49*COIN){
QMessageBox::warning(this, tr("Darksend"), QMessageBox::warning(this, tr("Darksend"),
tr("Darksend requires at least 2.5 DRK to use."), tr("Darksend requires at least 1.5 DRK to use."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
return; return;
} }
}
darkSendPool.cachedNumBlocks = 0; darkSendPool.cachedNumBlocks = 0;
fEnableDarksend = !fEnableDarksend; fEnableDarksend = !fEnableDarksend;
if(!fEnableDarksend){ if(!fEnableDarksend){

2
src/wallet.cpp
View File

@ -1416,7 +1416,7 @@ bool CWallet::SelectCoinsDark(int64_t nValueMin, int64_t nValueMax, std::vector<
BOOST_FOREACH(const COutput& out, vCoins) BOOST_FOREACH(const COutput& out, vCoins)
{ {
//there's no reason to allow inputs less than 1 COIN into DS (other than denominations smaller than that amount) //there's no reason to allow inputs less than 1 COIN into DS (other than denominations smaller than that amount)
if(out.tx->vout[out.i].nValue <= 1*COIN && out.tx->vout[out.i].nValue != (.1*COIN)+1) continue; if(out.tx->vout[out.i].nValue < 1*COIN && out.tx->vout[out.i].nValue != (.1*COIN)+1) continue;
if(fMasterNode && out.tx->vout[out.i].nValue == 1000*COIN) continue; //masternode input if(fMasterNode && out.tx->vout[out.i].nValue == 1000*COIN) continue; //masternode input
if(nValueRet + out.tx->vout[out.i].nValue <= nValueMax){ if(nValueRet + out.tx->vout[out.i].nValue <= nValueMax){