diff options
author | Andrew Chow <achow101-github@achow101.com> | 2019-03-25 17:00:00 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2020-01-30 23:55:36 -0500 |
commit | 19a354b11f85a3c6c81ff83bf702bf7a40cf5046 (patch) | |
tree | 92498c0bc6745e0eb18f2b41cbc5f7f0256f737a /src/rpc/misc.cpp | |
parent | 3e1bf71064ccb98d0684753e844c80d6da421287 (diff) |
Output a descriptor in createmultisig and addmultisigaddress
Diffstat (limited to 'src/rpc/misc.cpp')
-rw-r--r-- | src/rpc/misc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 56bd33b0ec..f360cb7525 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -83,6 +83,7 @@ static UniValue createmultisig(const JSONRPCRequest& request) "{\n" " \"address\":\"multisigaddress\", (string) The value of the new multisig address.\n" " \"redeemScript\":\"script\" (string) The string value of the hex-encoded redemption script.\n" + " \"descriptor\":\"descriptor\" (string) The descriptor for this multisig\n" "}\n" }, RPCExamples{ @@ -119,9 +120,13 @@ static UniValue createmultisig(const JSONRPCRequest& request) CScript inner; const CTxDestination dest = AddAndGetMultisigDestination(required, pubkeys, output_type, keystore, inner); + // Make the descriptor + std::unique_ptr<Descriptor> descriptor = InferDescriptor(GetScriptForDestination(dest), keystore); + UniValue result(UniValue::VOBJ); result.pushKV("address", EncodeDestination(dest)); result.pushKV("redeemScript", HexStr(inner.begin(), inner.end())); + result.pushKV("descriptor", descriptor->ToString()); return result; } |