diff options
| author | Andrew Chow <[email protected]> | 2019-07-08 17:05:05 -0400 |
|---|---|---|
| committer | Andrew Chow <[email protected]> | 2020-04-23 13:59:48 -0400 |
| commit | ec2f9e1178c8e38c0a5ca063fe81adac8f916348 (patch) | |
| tree | f4c22c6985f5133c8d0f48c939fc2789e69a9ddc /src | |
| parent | Implement MarkUnusedAddresses in DescriptorScriptPubKeyMan (diff) | |
| download | discoin-ec2f9e1178c8e38c0a5ca063fe81adac8f916348.tar.xz discoin-ec2f9e1178c8e38c0a5ca063fe81adac8f916348.zip | |
Implement IsHDEnabled in DescriptorScriptPubKeyMan
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 31a87a53f..c28b7fcfa 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -1555,7 +1555,8 @@ void DescriptorScriptPubKeyMan::MarkUnusedAddresses(const CScript& script) bool DescriptorScriptPubKeyMan::IsHDEnabled() const { - return false; + LOCK(cs_desc_man); + return m_wallet_descriptor.descriptor->IsRange(); } bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 098b059a7..8f42d1d75 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1331,9 +1331,10 @@ CAmount CWallet::GetChange(const CTransaction& tx) const bool CWallet::IsHDEnabled() const { + // All Active ScriptPubKeyMans must be HD for this to be true bool result = true; - for (const auto& spk_man_pair : m_spk_managers) { - result &= spk_man_pair.second->IsHDEnabled(); + for (const auto& spk_man : GetActiveScriptPubKeyMans()) { + result &= spk_man->IsHDEnabled(); } return result; } |