highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-25 16:31:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement several simple functions in DescriptorScriptPubKeyMan

Browse Source 
Implements a bunch of one liners: UpgradeKeyMetadata, IsFirstRun, HavePrivateKeys,
KeypoolCountExternalKeys, GetKeypoolSize, GetTimeFirstKey, CanGetAddresses,
RewriteDB
This commit is contained in:
Andrew Chow 2019-07-09 19:34:39 -04:00
parent d1ec3e4f19
commit 4cb9b69be0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wallet/scriptpubkeyman.cpp
View File

@ -1561,12 +1561,18 @@ bool DescriptorScriptPubKeyMan::IsHDEnabled() const
bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const
{ {
return false; // We can only give out addresses from descriptors that are single type (not combo), ranged,
// and either have cached keys or can generate more keys (ignoring encryption)
LOCK(cs_desc_man);
return m_wallet_descriptor.descriptor->IsSingleType() &&
m_wallet_descriptor.descriptor->IsRange() &&
(HavePrivateKeys() || m_wallet_descriptor.next_index < m_wallet_descriptor.range_end);
} }
bool DescriptorScriptPubKeyMan::HavePrivateKeys() const bool DescriptorScriptPubKeyMan::HavePrivateKeys() const
{ {
return false; LOCK(cs_desc_man);
return m_map_keys.size() > 0 || m_map_crypted_keys.size() > 0;
} }
int64_t DescriptorScriptPubKeyMan::GetOldestKeyPoolTime() const int64_t DescriptorScriptPubKeyMan::GetOldestKeyPoolTime() const
@ -1576,17 +1582,22 @@ int64_t DescriptorScriptPubKeyMan::GetOldestKeyPoolTime() const
size_t DescriptorScriptPubKeyMan::KeypoolCountExternalKeys() const size_t DescriptorScriptPubKeyMan::KeypoolCountExternalKeys() const
{ {
return 0; if (m_internal) {
return 0;
}
return GetKeyPoolSize();
} }
unsigned int DescriptorScriptPubKeyMan::GetKeyPoolSize() const unsigned int DescriptorScriptPubKeyMan::GetKeyPoolSize() const
{ {
return 0; LOCK(cs_desc_man);
return m_wallet_descriptor.range_end - m_wallet_descriptor.next_index;
} }
int64_t DescriptorScriptPubKeyMan::GetTimeFirstKey() const int64_t DescriptorScriptPubKeyMan::GetTimeFirstKey() const
{ {
return 0; LOCK(cs_desc_man);
return m_wallet_descriptor.creation_time;
} }
std::unique_ptr<SigningProvider> DescriptorScriptPubKeyMan::GetSolvingProvider(const CScript& script) const std::unique_ptr<SigningProvider> DescriptorScriptPubKeyMan::GetSolvingProvider(const CScript& script) const