wallet: Add utility method for CanSupportFeature

This commit is contained in:
Andrew Chow committed 2020-10-19 00:14:38 -04:00
1 parent a1e0359618
commit 842ae3842d
3 files changed
+7 -2

No files matched your search

+1 -1
View File
@@ -801,7 +801,7 @@ public:
bool IsTrusted(const CWalletTx& wtx, std::set<uint256>& trusted_parents) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
//! check whether we are allowed to upgrade (or already support) to the named feature
bool CanSupportFeature(enum WalletFeature wf) const override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet) { AssertLockHeld(cs_wallet); return nWalletMaxVersion >= wf; }
bool CanSupportFeature(enum WalletFeature wf) const override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet) { AssertLockHeld(cs_wallet); return IsFeatureSupported(nWalletMaxVersion, wf); }
/**
* populate vCoins with vector of available COutputs.
+5
View File
@@ -70,3 +70,8 @@ std::vector<fs::path> ListWalletDir()
return paths;
}
bool IsFeatureSupported(int wallet_version, int feature_version)
{
return wallet_version >= feature_version;
}
+1 -1
View File
@@ -29,7 +29,7 @@ enum WalletFeature
FEATURE_LATEST = FEATURE_PRE_SPLIT_KEYPOOL
};
bool IsFeatureSupported(int wallet_version, int feature_version);
enum WalletFlags : uint64_t {
// wallet flags in the upper section (> 1 << 31) will lead to not opening the wallet if flag is unknown