From b411c2a12ab3896840a4c6334336ddc46afee8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Thu, 2 Nov 2017 00:39:23 +0000 Subject: [PATCH 1/2] Improve -disablewallet parameter interaction --- src/wallet/init.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index c984df1df..6af655232 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -53,12 +53,17 @@ std::string GetWalletHelpString(bool showDebug) bool WalletParameterInteraction() { + if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) { + for (const std::string& wallet : gArgs.GetArgs("-wallet")) { + LogPrintf("%s: parameter interaction: -disablewallet -> ignoring -wallet=%s\n", __func__, wallet); + } + + return true; + } + gArgs.SoftSetArg("-wallet", DEFAULT_WALLET_DAT); const bool is_multiwallet = gArgs.GetArgs("-wallet").size() > 1; - if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) - return true; - if (gArgs.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && gArgs.SoftSetBoolArg("-walletbroadcast", false)) { LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); } From 7963335d2512deea1f286d9c0b94bfaef5d9c14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Thu, 2 Nov 2017 00:41:29 +0000 Subject: [PATCH 2/2] Fix -disablewallet default value --- src/wallet/init.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 6af655232..6b5d4cc66 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -178,15 +178,18 @@ bool WalletParameterInteraction() void RegisterWalletRPC(CRPCTable &t) { - if (gArgs.GetBoolArg("-disablewallet", false)) return; + if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) { + return; + } RegisterWalletRPCCommands(t); } bool VerifyWallets() { - if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) + if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) { return true; + } uiInterface.InitMessage(_("Verifying wallet(s)..."));