highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-13 07:14:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet, rpc: Push the normalized parent descriptor

Browse Source 
Instead of providing the descriptor string as stored in the db, use the
normalized descriptor as is done for getaddressinfo's parent_desc field.
This commit is contained in:
Ava Chow
2025-05-12 16:19:31 -07:00
parent 2df824f4e6
commit 3fc9d9f241
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/rpc/util.cpp
View File

@ -109,7 +109,10 @@ void PushParentDescriptors(const CWallet& wallet, const CScript& script_pubkey,
{ {
UniValue parent_descs(UniValue::VARR); UniValue parent_descs(UniValue::VARR);
for (const auto& desc: wallet.GetWalletDescriptors(script_pubkey)) { for (const auto& desc: wallet.GetWalletDescriptors(script_pubkey)) {
parent_descs.push_back(desc.descriptor->ToString()); std::string desc_str;
FlatSigningProvider dummy_provider;
if (!CHECK_NONFATAL(desc.descriptor->ToNormalizedString(dummy_provider, desc_str, &desc.cache))) continue;
parent_descs.push_back(desc_str);
} }
entry.pushKV("parent_descs", std::move(parent_descs)); entry.pushKV("parent_descs", std::move(parent_descs));
} }