diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-06-22 10:08:57 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-06-22 10:08:57 -0700 |
| commit | b4a8a326c067a350b5a5ff0e565555b57ffb3a2e (patch) | |
| tree | 74143027afbf9170257c5928832df67c387cd19a /src/wallet.cpp | |
| parent | 48628fd98c587a557c9b3dc9eefed1bd5d20725e (diff) | |
| parent | 87cce04c171800d29df1f13ecf9b36c933262b08 (diff) | |
| download | bitcoin-b4a8a326c067a350b5a5ff0e565555b57ffb3a2e.tar.xz | |
Merge pull request #2660 from TheBlueMatt/gmfrefactor
Refactor fee rules to make them actually readable.
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 1087db632d..a205d52b55 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -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); |