highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-31 19:06:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable wallet fallbackfee by default on mainnet

Browse Source
This commit is contained in:
Jonas Schnelli
2017-12-12 10:32:50 -10:00
parent 67447ba060
commit 8222e057fe
8 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/init.cpp
View File

@@ -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"))
{