diff options
author | John Newbery <john@johnnewbery.com> | 2019-02-20 13:45:16 -0500 |
---|---|---|
committer | John Newbery <john@johnnewbery.com> | 2019-04-18 11:34:42 -0400 |
commit | 5c759c73b2602c7fde1c50dbafe5525904c1b64c (patch) | |
tree | 6abb472994f52454f55b70d51bd79755f5883104 /src/wallet/fees.cpp | |
parent | bb68abe784b9fd49bddf38105d142a31ef0f9e77 (diff) |
[wallet] Move maxTxFee to wallet
This commit moves the maxtxfee setting to the wallet. There is only
one minor behavior change:
- an error message in feebumper now refers to -maxtxfee instead of
maxTxFee.
Diffstat (limited to 'src/wallet/fees.cpp')
-rw-r--r-- | src/wallet/fees.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp index 560c86a70a..d9ae18ed60 100644 --- a/src/wallet/fees.cpp +++ b/src/wallet/fees.cpp @@ -22,7 +22,7 @@ CAmount GetMinimumFee(const CWallet& wallet, unsigned int nTxBytes, const CCoinC { CAmount fee_needed = GetMinimumFeeRate(wallet, coin_control, feeCalc).GetFee(nTxBytes); // Always obey the maximum - const CAmount max_tx_fee = wallet.chain().maxTxFee(); + const CAmount max_tx_fee = wallet.m_default_max_tx_fee; if (fee_needed > max_tx_fee) { fee_needed = max_tx_fee; if (feeCalc) feeCalc->reason = FeeReason::MAXTXFEE; |