diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-07-27 22:28:24 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-07-27 22:29:09 +1200 |
| commit | dfb7fd60f261ad0aee0d2b70f8b3664826463f3a (patch) | |
| tree | c5b4164d3b45d20204debfbb4830a92144a9ed9c /src/wallet/wallet.cpp | |
| parent | c606e6fc53f7630f82530cffe47900fa2128f27c (diff) | |
| parent | fa4a605a4c611abe9af4c18aab20f4d1d039170f (diff) | |
| download | bitcoin-dfb7fd60f261ad0aee0d2b70f8b3664826463f3a.tar.xz | |
Merge #16402: Remove wallet settings from chainparams
fa4a605a4c611abe9af4c18aab20f4d1d039170f Remove wallet settings from chainparams (MarcoFalke)
Pull request description:
Feels a bit odd to have wallet setting in the chainparams, so remove them from there
ACKs for top commit:
promag:
ACK fa4a605a4c611abe9af4c18aab20f4d1d039170f, missed s/2018/2019?
practicalswift:
utACK fa4a605a4c611abe9af4c18aab20f4d1d039170f
darosior:
ACK fa4a605a4c611abe9af4c18aab20f4d1d039170f
Tree-SHA512: 2b3a5ee85d36af290d7db80bed1339e3c684607f1ce61cc65c906726e9174e40325fb1f67a34d8780f2a61fa39a1785e7c3a1cef5b6d6c364f38db5300cdbe3a
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index eddce2850d..b9eb0d3eed 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4409,7 +4409,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain, walletInstance->m_min_fee = CFeeRate(n); } - walletInstance->m_allow_fallback_fee = Params().IsFallbackFeeEnabled(); + walletInstance->m_allow_fallback_fee = Params().IsTestChain(); if (gArgs.IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0; if (!ParseMoney(gArgs.GetArg("-fallbackfee", ""), nFeePerK)) { |