diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-08-17 09:23:36 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-08-17 09:23:52 +1200 |
| commit | 7a960ba775a60ebcc2e830356693e3ed702b22f1 (patch) | |
| tree | ce69f538a5dc487602264e6a8eda889d4d104dc9 /src/rpc | |
| parent | b80cdfec9a079b841194c7026faddbd496e1dfc0 (diff) | |
| parent | 26d3fad1093dfc697048313be7a96c9adf723654 (diff) | |
| download | bitcoin-7a960ba775a60ebcc2e830356693e3ed702b22f1.tar.xz | |
Merge #15986: Add checksum to getdescriptorinfo
26d3fad1093dfc697048313be7a96c9adf723654 Add unmodified-but-with-checksum to getdescriptorinfo (Pieter Wuille)
104b3a5069c937383e6f88f2f3fb804ef61b208f Factor out checksum checking from descriptor parsing (Pieter Wuille)
Pull request description:
ACKs for top commit:
achow101:
Code Review ACK 26d3fad1093dfc697048313be7a96c9adf723654
meshcollider:
re-Code Review ACK 26d3fad1093dfc697048313be7a96c9adf723654
Sjors:
ACK 26d3fad1093dfc697048313be7a96c9adf723654
Tree-SHA512: b7a7f89b64a184927d6f9a0c183a087609983f0c5d5593f78e12db4714e930a4af655db9da4b0c407ea2e24d3b926cef6e1f2a15de502d0d1290a6e046826b99
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/misc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 6be4057366..d1e9682416 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -136,6 +136,7 @@ UniValue getdescriptorinfo(const JSONRPCRequest& request) RPCResult{ "{\n" " \"descriptor\" : \"desc\", (string) The descriptor in canonical form, without private keys\n" + " \"checksum\" : \"chksum\", (string) The checksum for the input descriptor\n" " \"isrange\" : true|false, (boolean) Whether the descriptor is ranged\n" " \"issolvable\" : true|false, (boolean) Whether the descriptor is solvable\n" " \"hasprivatekeys\" : true|false, (boolean) Whether the input descriptor contained at least one private key\n" @@ -156,6 +157,7 @@ UniValue getdescriptorinfo(const JSONRPCRequest& request) UniValue result(UniValue::VOBJ); result.pushKV("descriptor", desc->ToString()); + result.pushKV("checksum", GetDescriptorChecksum(request.params[0].get_str())); result.pushKV("isrange", desc->IsRange()); result.pushKV("issolvable", desc->IsSolvable()); result.pushKV("hasprivatekeys", provider.keys.size() > 0); |