diff options
author | Matt Corallo <git@bluematt.me> | 2013-05-17 12:07:02 +0200 |
---|---|---|
committer | Matt Corallo <git@bluematt.me> | 2013-06-14 13:37:43 +0200 |
commit | 87cce04c171800d29df1f13ecf9b36c933262b08 (patch) | |
tree | 763dc008f7a63eab53b26bc3f82c0833adb7240e /src/wallet.cpp | |
parent | d1020b780a1493c6a709f70756b2af54a7126f40 (diff) |
Refactor fee rules to make them actually readable.
This (nearly) doesn't change fee rules at all:
* To make it into the fee transaction area, the dPriority comparison
changed from < to <=
* We now just ignore transactions > MAX_BLOCK_SIZE/4 instead of
doing some calculations to require increasingly large fees as
size increases.
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 9a4a92cd5f..b1828f471d 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1301,7 +1301,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); |