DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2017-02-05 20:44:31 +02:00
parent 2c7ad758f0
commit f87150f4a1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet.cpp
View File

@@ -2449,7 +2449,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
LogPrint("selectcoins", "SelectCoins() best subset: "); LogPrint("selectcoins", "SelectCoins() best subset: ");
for (unsigned int i = 0; i < vValue.size(); i++) for (unsigned int i = 0; i < vValue.size(); i++)
if (vfBest[i]) if (vfBest[i])
LogPrint("selectcoins", "%s ", FormatMoney(vValue[i].first)); LogPrint("selectcoins", "%s + %s, ", FormatMoney(vValue[i].first),FormatMoney(interests[i]));
LogPrint("selectcoins", "total %s\n", FormatMoney(nBest)); LogPrint("selectcoins", "total %s\n", FormatMoney(nBest));
} }
@@ -2480,6 +2480,8 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*
continue; continue;
} }
value += out.tx->vout[out.i].nValue; value += out.tx->vout[out.i].nValue;
if ( KOMODO_EXCHANGEWALLET == 0 )
value += out.tx->vout[out.i].interest;
} }
if (value <= nTargetValue) { if (value <= nTargetValue) {
CAmount valueWithCoinbase = 0; CAmount valueWithCoinbase = 0;
@@ -2488,12 +2490,13 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*
continue; continue;
} }
valueWithCoinbase += out.tx->vout[out.i].nValue; valueWithCoinbase += out.tx->vout[out.i].nValue;
if ( KOMODO_EXCHANGEWALLET == 0 )
valueWithCoinbase += out.tx->vout[out.i].interest;
} }
fNeedCoinbaseCoinsRet = (valueWithCoinbase >= nTargetValue); fNeedCoinbaseCoinsRet = (valueWithCoinbase >= nTargetValue);
} }
} }
// coin control -> return all selected outputs (we want all to go into the transaction for sure) // coin control -> return all selected outputs (we want all to go into the transaction for sure)
*interestp = 0;
if (coinControl && coinControl->HasSelected()) if (coinControl && coinControl->HasSelected())
{ {
BOOST_FOREACH(const COutput& out, vCoins) BOOST_FOREACH(const COutput& out, vCoins)