Merge pull request #6479 from str4d/fix-disable-wallet
Fix builds with `CONFIGURE_FLAGS=--disable-wallet`
This commit is contained in:
commit
d03a507b5a
|
@ -14,6 +14,7 @@
|
|||
// Flags that enable deprecated functionality.
|
||||
bool fEnableGbtOldHashes = true;
|
||||
bool fEnableDeprecationInfoDeprecationHeight = true;
|
||||
bool fEnableAddrTypeField = true;
|
||||
#ifdef ENABLE_WALLET
|
||||
bool fEnableGetNewAddress = true;
|
||||
bool fEnableGetRawChangeAddress = true;
|
||||
|
@ -22,7 +23,6 @@ bool fEnableZGetBalance = true;
|
|||
bool fEnableZGetTotalBalance = true;
|
||||
bool fEnableZListAddresses = true;
|
||||
bool fEnableLegacyPrivacyStrategy = true;
|
||||
bool fEnableAddrTypeField = true;
|
||||
bool fEnableWalletTxVJoinSplit = true;
|
||||
#endif
|
||||
|
||||
|
@ -101,6 +101,7 @@ std::optional<std::string> LoadAllowedDeprecatedFeatures() {
|
|||
|
||||
fEnableGbtOldHashes = allowdeprecated.count("gbt_oldhashes") > 0;
|
||||
fEnableDeprecationInfoDeprecationHeight = allowdeprecated.count("deprecationinfo_deprecationheight") > 0;
|
||||
fEnableAddrTypeField = allowdeprecated.count("addrtype") > 0;
|
||||
#ifdef ENABLE_WALLET
|
||||
fEnableLegacyPrivacyStrategy = allowdeprecated.count("legacy_privacy") > 0;
|
||||
fEnableGetNewAddress = allowdeprecated.count("getnewaddress") > 0;
|
||||
|
@ -109,7 +110,6 @@ std::optional<std::string> LoadAllowedDeprecatedFeatures() {
|
|||
fEnableZGetBalance = allowdeprecated.count("z_getbalance") > 0;
|
||||
fEnableZGetTotalBalance = allowdeprecated.count("z_gettotalbalance") > 0;
|
||||
fEnableZListAddresses = allowdeprecated.count("z_listaddresses") > 0;
|
||||
fEnableAddrTypeField = allowdeprecated.count("addrtype") > 0;
|
||||
fEnableWalletTxVJoinSplit = allowdeprecated.count("wallettxvjoinsplit") > 0;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -52,6 +52,7 @@ static const std::set<std::string> DEFAULT_DENY_DEPRECATED{{
|
|||
// Flags that enable deprecated functionality.
|
||||
extern bool fEnableGbtOldHashes;
|
||||
extern bool fEnableDeprecationInfoDeprecationHeight;
|
||||
extern bool fEnableAddrTypeField;
|
||||
#ifdef ENABLE_WALLET
|
||||
extern bool fEnableGetNewAddress;
|
||||
extern bool fEnableGetRawChangeAddress;
|
||||
|
@ -60,7 +61,6 @@ extern bool fEnableZGetBalance;
|
|||
extern bool fEnableZGetTotalBalance;
|
||||
extern bool fEnableZListAddresses;
|
||||
extern bool fEnableLegacyPrivacyStrategy;
|
||||
extern bool fEnableAddrTypeField;
|
||||
extern bool fEnableWalletTxVJoinSplit;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -334,7 +334,7 @@ std::string HelpMessage(HelpMessageMode mode)
|
|||
|
||||
// When adding new options to the categories, please keep and ensure alphabetical ordering.
|
||||
// Do not translate _(...) -help-debug options, Many technical terms, and only a very small audience, so is unnecessary stress to translators.
|
||||
string strUsage = HelpMessageGroup(_("Options:"));
|
||||
std::string strUsage = HelpMessageGroup(_("Options:"));
|
||||
strUsage += HelpMessageOpt("-?", _("Print this help message and exit"));
|
||||
strUsage += HelpMessageOpt("-version", _("Print version and exit"));
|
||||
strUsage += HelpMessageOpt("-alerts", strprintf(_("Receive and display P2P network alerts (default: %u)"), DEFAULT_ALERTS));
|
||||
|
|
Loading…
Reference in New Issue