diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-12-12 10:32:50 -1000 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-02-25 09:33:46 +0800 |
| commit | 8222e057fe60934a57b1d8226b0e1bd071f8dac2 (patch) | |
| tree | 8439061439ed2cb0ee480b8246243ee91f4f70e9 /src/wallet/fees.cpp | |
| parent | 67447ba06057b8e83f962c82491d2fe6c5211f50 (diff) | |
| download | bitcoin-8222e057fe60934a57b1d8226b0e1bd071f8dac2.tar.xz | |
Disable wallet fallbackfee by default on mainnet
Diffstat (limited to 'src/wallet/fees.cpp')
| -rw-r--r-- | src/wallet/fees.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp index 73985dcf25..385fdc963a 100644 --- a/src/wallet/fees.cpp +++ b/src/wallet/fees.cpp @@ -53,6 +53,9 @@ CAmount GetMinimumFee(unsigned int nTxBytes, const CCoinControl& coin_control, c // if we don't have enough data for estimateSmartFee, then use fallbackFee fee_needed = CWallet::fallbackFee.GetFee(nTxBytes); if (feeCalc) feeCalc->reason = FeeReason::FALLBACK; + + // directly return if fallback fee is disabled (feerate 0 == disabled) + if (CWallet::fallbackFee.GetFee(1000) == 0) return fee_needed; } // Obey mempool min fee when using smart fee estimation CAmount min_mempool_fee = pool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nTxBytes); |