[wallet] Introduce DEFAULT_DISABLE_WALLET

MarcoFalke · random-zebra · commit d8d723b7a3d5 · 2021-05-07T16:49:40.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -873,7 +873,7 @@ bool AppInitBasicSetup()
 #ifndef WIN32
     if (gArgs.GetBoolArg("-sysperms", false)) {
 #ifdef ENABLE_WALLET
-        if (!gArgs.GetBoolArg("-disablewallet", false))
+        if (!gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
             return UIError("Error: -sysperms is not allowed in combination with enabled wallet functionality");
 #endif
     } else {
diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivx/pivxgui.cpp
@@ -59,7 +59,7 @@ PIVXGUI::PIVXGUI(const NetworkStyle* networkStyle, QWidget* parent) :
 
 #ifdef ENABLE_WALLET
     /* if compiled with wallet support, -disablewallet can still disable the wallet */
-    enableWallet = !gArgs.GetBoolArg("-disablewallet", false);
+    enableWallet = !gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
 #else
     enableWallet = false;
 #endif // ENABLE_WALLET
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -646,7 +646,7 @@ void CWallet::SyncMetaData(std::pair<typename TxSpendMap<T>::iterator, typename
 
 bool CWallet::ParameterInteraction()
 {
-    if (gArgs.GetBoolArg("-disablewallet", false)) {
+    if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
         return true;
     }
 
@@ -2067,7 +2067,7 @@ std::set<uint256> CWalletTx::GetConflicts() const
 
 bool CWallet::Verify()
 {
-    if (gArgs.GetBoolArg("-disablewallet", false)) {
+    if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
         return true;
     }
 
@@ -4090,7 +4090,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     strUsage += HelpMessageOpt("-backuppath=<dir|file>", _("Specify custom backup path to add a copy of any wallet backup. If set as dir, every backup generates a timestamped file. If set as file, will rewrite to that file every backup."));
     strUsage += HelpMessageOpt("-createwalletbackups=<n>", strprintf(_("Number of automatic wallet backups (default: %d)"), DEFAULT_CREATEWALLETBACKUPS));
     strUsage += HelpMessageOpt("-custombackupthreshold=<n>", strprintf(_("Number of custom location backups to retain (default: %d)"), DEFAULT_CUSTOMBACKUPTHRESHOLD));
-    strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls"));
+    strUsage += HelpMessageOpt("-disablewallet", strprintf(_("Do not load the wallet and disable wallet RPC calls (default: %u)"), DEFAULT_DISABLE_WALLET));
     strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), DEFAULT_KEYPOOL_SIZE));
     strUsage += HelpMessageOpt("-legacywallet", _("On first run, create a legacy wallet instead of a HD wallet"));
     strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees to use in a single wallet transaction, setting too low may abort large transactions (default: %s)"), FormatMoney(maxTxFee)));

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ void CWallet::SyncMetaData(std::pair<typename TxSpendMap<T>::iterator, typename`
`646`	`646`
`647`	`647`	`bool CWallet::ParameterInteraction()`
`648`	`648`	`{`
`649`		`- if (gArgs.GetBoolArg("-disablewallet", false)) {`
	`649`	`+ if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {`
`650`	`650`	`return true;`
`651`	`651`	`}`
`652`	`652`
`@@ -2067,7 +2067,7 @@ std::set<uint256> CWalletTx::GetConflicts() const`
`2067`	`2067`
`2068`	`2068`	`bool CWallet::Verify()`
`2069`	`2069`	`{`
`2070`		`- if (gArgs.GetBoolArg("-disablewallet", false)) {`
	`2070`	`+ if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {`
`2071`	`2071`	`return true;`
`2072`	`2072`	`}`
`2073`	`2073`
`@@ -4090,7 +4090,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)`
`4090`	`4090`	`strUsage += HelpMessageOpt("-backuppath=<dir\|file>", _("Specify custom backup path to add a copy of any wallet backup. If set as dir, every backup generates a timestamped file. If set as file, will rewrite to that file every backup."));`
`4091`	`4091`	`strUsage += HelpMessageOpt("-createwalletbackups=<n>", strprintf(_("Number of automatic wallet backups (default: %d)"), DEFAULT_CREATEWALLETBACKUPS));`
`4092`	`4092`	`strUsage += HelpMessageOpt("-custombackupthreshold=<n>", strprintf(_("Number of custom location backups to retain (default: %d)"), DEFAULT_CUSTOMBACKUPTHRESHOLD));`
`4093`		`- strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls"));`
	`4093`	`+ strUsage += HelpMessageOpt("-disablewallet", strprintf(_("Do not load the wallet and disable wallet RPC calls (default: %u)"), DEFAULT_DISABLE_WALLET));`
`4094`	`4094`	`strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), DEFAULT_KEYPOOL_SIZE));`
`4095`	`4095`	`strUsage += HelpMessageOpt("-legacywallet", _("On first run, create a legacy wallet instead of a HD wallet"));`
`4096`	`4096`	`strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees to use in a single wallet transaction, setting too low may abort large transactions (default: %s)"), FormatMoney(maxTxFee)));`