diff options
author | Antoine Poinsot <darosior@protonmail.com> | 2023-02-03 17:44:22 +0100 |
---|---|---|
committer | Antoine Poinsot <darosior@protonmail.com> | 2023-02-03 18:15:42 +0100 |
commit | dfc9acbf0170bde6f2abb879b5584dabd1266531 (patch) | |
tree | b48e36e113db1f3d97ae1746c4bfb51f335e25cc /src/core_write.cpp | |
parent | aaa55971f6af3f19b22c28103630b856df266ebb (diff) |
rpc: decode Miniscript descriptor when possible in decodescript
The descriptor inference logic would previously always use a dummy
signing provider and would never analyze the witness script of a P2WSH
scriptPubKey.
Note even a valid Miniscript might not always be decodable from Script
without more contextual information (for instance the key preimage for a
pk_h).
Diffstat (limited to 'src/core_write.cpp')
-rw-r--r-- | src/core_write.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core_write.cpp b/src/core_write.cpp index 300bd30e43..b0e3b0b3c4 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -147,13 +147,13 @@ std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags) return HexStr(ssTx); } -void ScriptToUniv(const CScript& script, UniValue& out, bool include_hex, bool include_address) +void ScriptToUniv(const CScript& script, UniValue& out, bool include_hex, bool include_address, const SigningProvider* provider) { CTxDestination address; out.pushKV("asm", ScriptToAsmStr(script)); if (include_address) { - out.pushKV("desc", InferDescriptor(script, DUMMY_SIGNING_PROVIDER)->ToString()); + out.pushKV("desc", InferDescriptor(script, provider ? *provider : DUMMY_SIGNING_PROVIDER)->ToString()); } if (include_hex) { out.pushKV("hex", HexStr(script)); |