highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-09 08:43:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Exclude descriptor when address is excluded

Browse Source 
Github-Pull: bitcoin#24636
Rebased-From: faf37c2
This commit is contained in:
MarcoFalke
2022-03-22 11:49:58 +01:00
committed by Jon Atack
parent b05a59b69f
commit 235b042594
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core_write.cpp
View File

@@ -153,7 +153,9 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool include
CTxDestination address;
out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
out.pushKV("desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
if (include_address) {
out.pushKV("desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
}
if (include_hex) out.pushKV("hex", HexStr(scriptPubKey));
std::vector<std::vector<unsigned char>> solns;