From faf37c217a408114224f91b7ada3fb6ff29b0c0a Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 22 Mar 2022 11:49:58 +0100 Subject: [PATCH] rpc: Exclude descriptor when address is excluded --- src/core_write.cpp | 4 +++- src/rpc/rawtransaction.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core_write.cpp b/src/core_write.cpp index c4b6b8d27e5..8ec75880fef 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -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> solns; diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 1ef531b293c..0d1b54adaa9 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1121,6 +1121,7 @@ static RPCHelpMan decodepsbt() {RPCResult::Type::OBJ, "scriptPubKey", "", { {RPCResult::Type::STR, "asm", "The asm"}, + {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"}, {RPCResult::Type::STR_HEX, "hex", "The hex"}, {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"}, {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},