diff options
| author | Eric Lombrozo <elombrozo@gmail.com> | 2013-01-08 03:42:22 -0800 |
|---|---|---|
| committer | Eric Lombrozo <elombrozo@gmail.com> | 2013-06-05 23:15:19 -0700 |
| commit | 788536f1755c6a9ea81394a2199ca27c9e90944e (patch) | |
| tree | 42d681506aba9cd30c10e3f238d401526267f3ae /src/wallet.cpp | |
| parent | effc2770f50554416e7d7b27f5c5b5cef9489440 (diff) | |
| download | bitcoin-788536f1755c6a9ea81394a2199ca27c9e90944e.tar.xz | |
Moved CInPoint to core. Removed GetMinFee from CTransaction and made it a regular function in main.
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 549d9bbf4b..da75752bb4 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1277,7 +1277,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 = CTransaction::AllowFree(dPriority); - int64 nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND); + int64 nMinFee = GetMinFee(wtxNew, 1, fAllowFree, GMF_SEND); if (nFeeRet < max(nPayFee, nMinFee)) { nFeeRet = max(nPayFee, nMinFee); |