Page MenuHomePhabricator
Files F13115889

No OneTemporary
Actions

View Options

diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp
index 3164950f7..c72890d1d 100644
--- a/src/wallet/fees.cpp
+++ b/src/wallet/fees.cpp
@@ -1,48 +1,48 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2017 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet/fees.h"
#include "config.h"
#include "policy/policy.h"
#include "txmempool.h"
#include "util.h"
#include "validation.h"
#include "wallet/coincontrol.h"
#include "wallet/wallet.h"
Amount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget,
const CTxMemPool &pool, Amount targetFee) {
Amount nFeeNeeded = targetFee;
// User didn't set: use -txconfirmtarget to estimate...
if (nFeeNeeded == Amount::zero()) {
int estimateFoundTarget = nConfirmTarget;
nFeeNeeded = pool.estimateSmartFee(nConfirmTarget, &estimateFoundTarget)
- .GetFee(nTxBytes);
+ .GetFeeCeiling(nTxBytes);
// ... unless we don't have enough mempool data for estimatefee, then
// use fallbackFee.
if (nFeeNeeded == Amount::zero()) {
- nFeeNeeded = CWallet::fallbackFee.GetFee(nTxBytes);
+ nFeeNeeded = CWallet::fallbackFee.GetFeeCeiling(nTxBytes);
}
}
// Prevent user from paying a fee below minRelayTxFee or minTxFee.
nFeeNeeded =
std::max(nFeeNeeded, GetConfig().GetMinFeePerKB().GetFee(nTxBytes));
// But always obey the maximum.
if (nFeeNeeded > maxTxFee) {
nFeeNeeded = maxTxFee;
}
return nFeeNeeded;
}
Amount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget,
const CTxMemPool &pool) {
// payTxFee is the user-set global for desired feerate.
return GetMinimumFee(nTxBytes, nConfirmTarget, pool,
- payTxFee.GetFee(nTxBytes));
+ payTxFee.GetFeeCeiling(nTxBytes));
}
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Sun, Mar 2, 12:32 (1 d, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187853
Default Alt Text
(2 KB)

Event Timeline