diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-01-29 15:27:53 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-01-29 15:27:56 -0500 |
| commit | 9d9c4185fadaf243bb97c226e2fef16b65299699 (patch) | |
| tree | 8ab757774c6782de6d6fd94101b1d5e4dfaf88e3 | |
| parent | 90d41049f90b7525dee2c629b108f4cf0d1bb2d5 (diff) | |
| parent | c6b6385651d5e78daf9dd27717e47e3a8940694b (diff) | |
| download | bitcoin-9d9c4185fadaf243bb97c226e2fef16b65299699.tar.xz | |
Merge #12293: [rpc] Mention that HD is enabled if hdmasterkeyid is present
c6b6385651 [rpc] Mention that HD is enabled if hdmasterkeyid is present (fanquake)
Pull request description:
Also adds optional flag.
Replaces #12042
Tree-SHA512: 6aded2cf36799f697eacbe4f51dff7c8110281092ca3c4fd73e26f57d788ec95a4fcbaf6976ef144e64f2e52759dbe241ac218a95e5ca2233cae1b98bfa5872e
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index fcee22a14a..9364d18d30 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2768,7 +2768,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request) " \"keypoolsize_hd_internal\": xxxx, (numeric) how many new keys are pre-generated for internal use (used for change outputs, only appears if the wallet is using this feature, otherwise external keys are used)\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" " \"paytxfee\": x.xxxx, (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n" - " \"hdmasterkeyid\": \"<hash160>\" (string) the Hash160 of the HD master pubkey\n" + " \"hdmasterkeyid\": \"<hash160>\" (string, optional) the Hash160 of the HD master pubkey (only present when HD is enabled)\n" "}\n" "\nExamples:\n" + HelpExampleCli("getwalletinfo", "") |