diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-22 11:49:58 +0100 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2022-03-31 10:30:10 +0200 |
| commit | 235b04259414fd708c31bbe0cab28ba09bcd25f1 (patch) | |
| tree | ad4f7b4997c45c7578c2b7b29a1862ffd59310ff | |
| parent | b05a59b69fd51dd6a7ebc79dc0d11dc2af47a006 (diff) | |
| download | bitcoin-235b04259414fd708c31bbe0cab28ba09bcd25f1.tar.xz | |
rpc: Exclude descriptor when address is excluded
Github-Pull: bitcoin#24636
Rebased-From: faf37c2
| -rw-r--r-- | src/core_write.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core_write.cpp b/src/core_write.cpp index c4b6b8d27e..8ec75880fe 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<std::vector<unsigned char>> solns; diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 6272a7c8cf..d2f817d56e 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)"}, |