|
|
@ -2208,7 +2208,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const |
|
|
|
{ |
|
|
|
#ifdef KOMODO_ENABLE_INTEREST |
|
|
|
extern char ASSETCHAINS_SYMBOL[16]; |
|
|
|
if ( strcmp(ASSETCHAINS_SYMBOL,"REVS") == 0 && chainActive.Tip() != 0 ) |
|
|
|
if ( ASSETCHAINS_SYMBOL[0] == 0 && nHeight >= 60000 && chainActive.Tip() != 0 ) |
|
|
|
{ |
|
|
|
if ( pcoin->vout[i].nValue >= COIN ) |
|
|
|
{ |
|
|
@ -2458,7 +2458,7 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx* |
|
|
|
} |
|
|
|
return (nValueRet >= nTargetValue); |
|
|
|
} |
|
|
|
fprintf(stderr,"nValueRet %8f vs target %.8f\n",(double)nValueRet/COIN,(double)nTargetValue/COIN); |
|
|
|
//fprintf(stderr,"nValueRet %8f vs target %.8f\n",(double)nValueRet/COIN,(double)nTargetValue/COIN);
|
|
|
|
return (SelectCoinsMinConf(nTargetValue, 1, 6, vCoins, setCoinsRet, nValueRet,interestp) || |
|
|
|
SelectCoinsMinConf(nTargetValue, 1, 1, vCoins, setCoinsRet, nValueRet,interestp) || |
|
|
|
(bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue, 0, 1, vCoins, setCoinsRet, nValueRet,interestp))); |
|
|
@ -2591,16 +2591,16 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, |
|
|
|
//reflecting an assumption the user would accept a bit more delay for
|
|
|
|
//a chance at a free transaction.
|
|
|
|
//But mempool inputs might still be in the mempool, so their age stays 0
|
|
|
|
fprintf(stderr,"nCredit %.8f interest %.8f\n",(double)nCredit/COIN,(double)pcoin.first->vout[pcoin.second].interest/COIN); |
|
|
|
//fprintf(stderr,"nCredit %.8f interest %.8f\n",(double)nCredit/COIN,(double)pcoin.first->vout[pcoin.second].interest/COIN);
|
|
|
|
interest2 += pcoin.first->vout[pcoin.second].interest; |
|
|
|
int age = pcoin.first->GetDepthInMainChain(); |
|
|
|
if (age != 0) |
|
|
|
age += 1; |
|
|
|
dPriority += (double)nCredit * age; |
|
|
|
} |
|
|
|
fprintf(stderr,"interest sum %.8f, interest2 %.8f\n",(double)interest/COIN,(double)interest2/COIN); |
|
|
|
//fprintf(stderr,"interest sum %.8f, interest2 %.8f\n",(double)interest/COIN,(double)interest2/COIN);
|
|
|
|
CAmount nChange = (nValueIn - nValue + interest); |
|
|
|
fprintf(stderr,"wallet change %.8f (%.8f - %.8f) interest %.8f total %.8f\n",(double)nChange/COIN,(double)nValueIn/COIN,(double)nValue/COIN,(double)interest/COIN,(double)nTotalValue/COIN); |
|
|
|
//fprintf(stderr,"wallet change %.8f (%.8f - %.8f) interest %.8f total %.8f\n",(double)nChange/COIN,(double)nValueIn/COIN,(double)nValue/COIN,(double)interest/COIN,(double)nTotalValue/COIN);
|
|
|
|
if (nSubtractFeeFromAmount == 0) |
|
|
|
nChange -= nFeeRet; |
|
|
|
|
|
|
|