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/init.cpp | |
| parent | 67447ba06057b8e83f962c82491d2fe6c5211f50 (diff) | |
| download | bitcoin-8222e057fe60934a57b1d8226b0e1bd071f8dac2.tar.xz | |
Disable wallet fallbackfee by default on mainnet
Diffstat (limited to 'src/wallet/init.cpp')
| -rw-r--r-- | src/wallet/init.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 74036f4f0f..9ac48bff77 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -5,6 +5,7 @@ #include <wallet/init.h> +#include <chainparams.h> #include <net.h> #include <util.h> #include <utilmoneystr.h> @@ -123,6 +124,8 @@ bool WalletParameterInteraction() _("This is the minimum transaction fee you pay on every transaction.")); CWallet::minTxFee = CFeeRate(n); } + + g_wallet_allow_fallback_fee = Params().IsFallbackFeeEnabled(); if (gArgs.IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0; @@ -132,6 +135,7 @@ bool WalletParameterInteraction() InitWarning(AmountHighWarn("-fallbackfee") + " " + _("This is the transaction fee you may pay when fee estimates are not available.")); CWallet::fallbackFee = CFeeRate(nFeePerK); + g_wallet_allow_fallback_fee = nFeePerK != 0; //disable fallback fee in case value was set to 0, enable if non-null value } if (gArgs.IsArgSet("-discardfee")) { |