Merge pull request #2129 from gmaxwell/wallet_less_frequent_fees
If the prio. will be enough after the next block don't force fees. [wallet]
This commit is contained in:
commit
9980d118ee
1 changed files with 4 additions and 1 deletions
|
@ -1154,7 +1154,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
|
||||||
BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
|
BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
|
||||||
{
|
{
|
||||||
int64 nCredit = pcoin.first->vout[pcoin.second].nValue;
|
int64 nCredit = pcoin.first->vout[pcoin.second].nValue;
|
||||||
dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain();
|
//The priority after the next block (depth+1) is used instead of the current,
|
||||||
|
//reflecting an assumption the user would accept a bit more delay for
|
||||||
|
//a chance at a free transaction.
|
||||||
|
dPriority += (double)nCredit * (pcoin.first->GetDepthInMainChain()+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int64 nChange = nValueIn - nValue - nFeeRet;
|
int64 nChange = nValueIn - nValue - nFeeRet;
|
||||||
|
|
Loading…
Reference in a new issue