diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-20 10:46:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-20 10:49:02 +0200 |
| commit | 3c923e897538b9d8d55956b981d5540f0fdbf0b2 (patch) | |
| tree | 8263888fdff7763fd6b9227739ef40218b862083 | |
| parent | dcc495e011ff09e54f7c8ddebfc5b73f084de1ea (diff) | |
| parent | 0ef9858707093053f45469d8f7cef20be4930f64 (diff) | |
| download | bitcoin-3c923e897538b9d8d55956b981d5540f0fdbf0b2.tar.xz | |
Merge pull request #6457
0ef9858 Documenting pruned, pruneheight and softforks in getblockchaininfo (Simon Males)
0c89579 Include pruned state in chaininfo.json (Simon Males)
| -rw-r--r-- | doc/REST-interface.md | 3 | ||||
| -rw-r--r-- | src/rpcblockchain.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 3268ade7a5..ac7cd45f70 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -40,6 +40,9 @@ Only supports JSON as output format. * difficulty : (numeric) the current difficulty * verificationprogress : (numeric) estimate of verification progress [0..1] * chainwork : (string) total amount of work in active chain, in hexadecimal +* pruned : (boolean) if the blocks are subject to pruning +* pruneheight : (numeric) heighest block available +* softforks : (array) status of softforks in progress ####Query UTXO set `GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>/.../<txid>-<n>.<bin|hex|json>` diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index c2de6cb244..f1c5ffe050 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -594,6 +594,8 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp) " \"difficulty\": xxxxxx, (numeric) the current difficulty\n" " \"verificationprogress\": xxxx, (numeric) estimate of verification progress [0..1]\n" " \"chainwork\": \"xxxx\" (string) total amount of work in active chain, in hexadecimal\n" + " \"pruned\": xx, (boolean) if the blocks are subject to pruning\n" + " \"pruneheight\": xxxxxx, (numeric) heighest block available\n" " \"softforks\": [ (array) status of softforks in progress\n" " {\n" " \"id\": \"xxxx\", (string) name of softfork\n" |