From d977f01cfe9b5ea5e88530b23c6d0c80f26c721b Mon Sep 17 00:00:00 2001 From: Ahmed Hilali Date: Fri, 10 Jul 2020 12:19:22 +0700 Subject: [PATCH 1/2] wallet: turn on default fallback fee in mainnet --- src/wallet/wallet.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ca7340e654f..d92dab5b559 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4434,7 +4434,8 @@ std::shared_ptr CWallet::CreateWalletFromFile(interfaces::Chain& chain, walletInstance->m_min_fee = CFeeRate(n); } - walletInstance->m_allow_fallback_fee = Params().IsTestChain(); +// turned off by customer request: +// walletInstance->m_allow_fallback_fee = Params().IsTestChain(); if (gArgs.IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0; if (!ParseMoney(gArgs.GetArg("-fallbackfee", ""), nFeePerK)) { From 9d7976264590766b6afa3ae2f36c3d02d11f2ff9 Mon Sep 17 00:00:00 2001 From: Ahmed Hilali Date: Fri, 17 Jul 2020 16:27:36 +0800 Subject: [PATCH 2/2] Update wallet.cpp Fixed comment --- src/wallet/wallet.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d92dab5b559..7d9e593eab9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4434,7 +4434,6 @@ std::shared_ptr CWallet::CreateWalletFromFile(interfaces::Chain& chain, walletInstance->m_min_fee = CFeeRate(n); } -// turned off by customer request: // walletInstance->m_allow_fallback_fee = Params().IsTestChain(); if (gArgs.IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0;