GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 35bf426e02 into merged_master (Bitcoin PR bitcoin/bitcoin#28724)

Browse source
This commit is contained in:
Tom Trevethan 2026-04-09 23:08:37 +01:00
commit 759f93db75
7 changed files with 106 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/wallet/scriptpubkeyman.cpp
View file

@ -531,6 +531,12 @@ bool LegacyScriptPubKeyMan::HavePrivateKeys() const
return !mapKeys.empty() || !mapCryptedKeys.empty();
}
bool LegacyScriptPubKeyMan::HaveCryptedKeys() const
{
LOCK(cs_KeyStore);
return !mapCryptedKeys.empty();
}
void LegacyScriptPubKeyMan::RewriteDB()
{
LOCK(cs_KeyStore);
@ -2416,6 +2422,12 @@ bool DescriptorScriptPubKeyMan::HavePrivateKeys() const
return m_map_keys.size() > 0 || m_map_crypted_keys.size() > 0;
}
bool DescriptorScriptPubKeyMan::HaveCryptedKeys() const
{
LOCK(cs_desc_man);
return !m_map_crypted_keys.empty();
}
std::optional<int64_t> DescriptorScriptPubKeyMan::GetOldestKeyPoolTime() const
{
// This is only used for getwalletinfo output and isn't relevant to descriptor wallets.