diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 13:09:18 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-20 13:09:18 -0800 |
| commit | 781c06c0f534913321a415a4fb64a60734e43101 (patch) | |
| tree | f2d96b0c74da35b701513a629817c7e944798827 /src/wallet.cpp | |
| parent | 595925592d36fb5d5d34beea3c3e71fca2b6726e (diff) | |
| parent | dbbf1d4a48c8761a67a4477bef48f17c0badef7b (diff) | |
| download | bitcoin-781c06c0f534913321a415a4fb64a60734e43101.tar.xz | |
Merge pull request #677 from luke-jr/minfee_modes
API: GetMinFee modes
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 539452841f..c35081ce44 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1003,6 +1003,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW int64 nChange = nValueIn - nValue - nFeeRet; // if sub-cent change is required, the fee must be raised to at least MIN_TX_FEE // or until nChange becomes zero + // NOTE: this depends on the exact behaviour of GetMinFee if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < CENT) { int64 nMoveToFee = min(nChange, MIN_TX_FEE - nFeeRet); @@ -1055,7 +1056,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW // Check that enough fee is included int64 nPayFee = nTransactionFee * (1 + (int64)nBytes / 1000); bool fAllowFree = CTransaction::AllowFree(dPriority); - int64 nMinFee = wtxNew.GetMinFee(1, fAllowFree); + int64 nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND); if (nFeeRet < max(nPayFee, nMinFee)) { nFeeRet = max(nPayFee, nMinFee); |