wallet: Use Descriptor::CanSelfExpand() in CanGetAddresses()

achow101 · achow101 · commit 05ab6bc447ce · 2025-05-13T15:39:20.000-07:00
If a descriptor does not need any caches or private keys in order to
expand, then CanGetAddresses() should return true for that descriptor.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -1180,7 +1180,7 @@ bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const
     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);
+           (HavePrivateKeys() || m_wallet_descriptor.next_index < m_wallet_descriptor.range_end || m_wallet_descriptor.descriptor->CanSelfExpand());
 }
 
 bool DescriptorScriptPubKeyMan::HavePrivateKeys() const

Original file line number	Diff line number	Diff line change
`@@ -1180,7 +1180,7 @@ bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const`
`1180`	`1180`	`LOCK(cs_desc_man);`
`1181`	`1181`	`return m_wallet_descriptor.descriptor->IsSingleType() &&`
`1182`	`1182`	`m_wallet_descriptor.descriptor->IsRange() &&`
`1183`		`- (HavePrivateKeys() \|\| m_wallet_descriptor.next_index < m_wallet_descriptor.range_end);`
	`1183`	`+ (HavePrivateKeys() \|\| m_wallet_descriptor.next_index < m_wallet_descriptor.range_end \|\| m_wallet_descriptor.descriptor->CanSelfExpand());`
`1184`	`1184`	`}`
`1185`	`1185`
`1186`	`1186`	`bool DescriptorScriptPubKeyMan::HavePrivateKeys() const`