From 8222e057fe60934a57b1d8226b0e1bd071f8dac2 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Tue, 12 Dec 2017 10:32:50 -1000 Subject: Disable wallet fallbackfee by default on mainnet --- src/wallet/fees.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/wallet/fees.cpp') 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); -- cgit v1.2.3