highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: make CanGenerateKeys() const

Browse Source 
This method simply checks if HD is or can be enabled and does not require mutability.
This commit is contained in:
Karl-Johan Alm
2020-03-02 16:23:04 +09:00
parent dc2d0650fd
commit ddc93557ad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/scriptpubkeyman.cpp
View File

@@ -973,7 +973,7 @@ void LegacyScriptPubKeyMan::LoadKeyPool(int64_t nIndex, const CKeyPool &keypool)
mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime); mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime);
} }
bool LegacyScriptPubKeyMan::CanGenerateKeys() bool LegacyScriptPubKeyMan::CanGenerateKeys() const
{ {
// A wallet can generate keys if it has an HD seed (IsHDEnabled) or it is a non-HD wallet (pre FEATURE_HD) // A wallet can generate keys if it has an HD seed (IsHDEnabled) or it is a non-HD wallet (pre FEATURE_HD)
LOCK(cs_KeyStore); LOCK(cs_KeyStore);

2
src/wallet/scriptpubkeyman.h
View File

@@ -410,7 +410,7 @@ public:
bool ImportScriptPubKeys(const std::set<CScript>& script_pub_keys, const bool have_solving_data, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); bool ImportScriptPubKeys(const std::set<CScript>& script_pub_keys, const bool have_solving_data, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore);
/* Returns true if the wallet can generate new keys */ /* Returns true if the wallet can generate new keys */
bool CanGenerateKeys(); bool CanGenerateKeys() const;
/* Generates a new HD seed (will not be activated) */ /* Generates a new HD seed (will not be activated) */
CPubKey GenerateNewSeed(); CPubKey GenerateNewSeed();