nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bitcoind: compare descriptors, not their string representation.

Browse Source 
It's more robust and bitcoind serializes `wsh()` descriptors using `'`
as hardened marker and `tr()` descriptors using `h`..
This commit is contained in:
Antoine Poinsot 2024-02-27 12:14:23 +01:00
parent 602c862118
commit 8596ca76f3
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bitcoin/d/mod.rs
View File

@ -754,13 +754,27 @@ impl BitcoinD {
// Check our main descriptor is imported in this wallet.
let receive_desc = main_descriptor.receive_descriptor();
let change_desc = main_descriptor.change_descriptor();
let desc_list: Vec<String> = self
let desc_list: Vec<_> = self
.list_descriptors()
.into_iter()
.map(|entry| entry.desc)
.filter_map(|entry| {
match descriptor::Descriptor::<descriptor::DescriptorPublicKey>::from_str(
&entry.desc,
) {
Ok(desc) => Some(desc),
Err(e) => {
log::error!(
"Error deserializing descriptor: {}. Descriptor: {}.",
e,
entry.desc
);
None
}
}
})
.collect();
if !desc_list.contains(&receive_desc.to_string())
|| !desc_list.contains(&change_desc.to_string())
if !desc_list.iter().any(|desc| *receive_desc == *desc)
|| !desc_list.iter().any(|desc| *change_desc == *desc)
{
return Err(BitcoindError::Wallet(
self.watchonly_wallet_path.clone(),