rpc: Exclude descriptor when address is excluded

MarcoFalke · jonatack · commit 235b04259414 · 2022-03-31T10:30:10.000+02:00
Github-Pull: #24636 Rebased-From: faf37c2
diff --git 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<std::vector<unsigned char>> solns;
diff --git 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)"},

Original file line number	Diff line number	Diff line change
`@@ -1121,6 +1121,7 @@ static RPCHelpMan decodepsbt()`
`1121`	`1121`	`{RPCResult::Type::OBJ, "scriptPubKey", "",`
`1122`	`1122`	`{`
`1123`	`1123`	`{RPCResult::Type::STR, "asm", "The asm"},`
	`1124`	`+ {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},`
`1124`	`1125`	`{RPCResult::Type::STR_HEX, "hex", "The hex"},`
`1125`	`1126`	`{RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},`
`1126`	`1127`	`{RPCResult::Type::STR, "address", /optional=/true, "The Bitcoin address (only if a well-defined address exists)"},`