highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 15:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2660 from TheBlueMatt/gmfrefactor

Browse Source 
Refactor fee rules to make them actually readable.
This commit is contained in:
Pieter Wuille
2013-06-22 10:08:57 -07:00
parent 48628fd98c 87cce04c17
commit b4a8a326c0
3 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet.cpp
View File

@@ -1307,7 +1307,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend,
// Check that enough fee is included
int64 nPayFee = nTransactionFee * (1 + (int64)nBytes / 1000);
bool fAllowFree = AllowFree(dPriority);
int64 nMinFee = GetMinFee(wtxNew, 1, fAllowFree, GMF_SEND);
int64 nMinFee = GetMinFee(wtxNew, fAllowFree, GMF_SEND);
if (nFeeRet < max(nPayFee, nMinFee))
{
nFeeRet = max(nPayFee, nMinFee);