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

achow101 · achow101 · commit c26bbec817e7 · 2025-06-02T12:38:41.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
@@ -1174,7 +1174,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
`@@ -1174,7 +1174,7 @@ bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const`
`1174`	`1174`	`LOCK(cs_desc_man);`
`1175`	`1175`	`return m_wallet_descriptor.descriptor->IsSingleType() &&`
`1176`	`1176`	`m_wallet_descriptor.descriptor->IsRange() &&`
`1177`		`- (HavePrivateKeys() \|\| m_wallet_descriptor.next_index < m_wallet_descriptor.range_end);`
	`1177`	`+ (HavePrivateKeys() \|\| m_wallet_descriptor.next_index < m_wallet_descriptor.range_end \|\| m_wallet_descriptor.descriptor->CanSelfExpand());`
`1178`	`1178`	`}`
`1179`	`1179`
`1180`	`1180`	`bool DescriptorScriptPubKeyMan::HavePrivateKeys() const`