diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 16:36:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 16:41:59 +0200 |
| commit | 5d2c8e524e1024ff562c0f48280f26d8e4e897f7 (patch) | |
| tree | 97554eb23b3839006a8eee8b7fcc9193129a2b21 /src/rpc | |
| parent | 97c7f7362f9b59247753d6e8fa8022a6205f9c09 (diff) | |
| parent | fc146095d20452686efe1944b143452bec394343 (diff) | |
| download | bitcoin-5d2c8e524e1024ff562c0f48280f26d8e4e897f7.tar.xz | |
Merge #7948: RPC: augment getblockchaininfo bip9_softforks data
fc14609 RPC: augment getblockchaininfo bip9_softforks data (mruddy)
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/blockchain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 0c827a1e38..f538ddcc04 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1009,6 +1009,7 @@ static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Conse } rv.push_back(Pair("startTime", consensusParams.vDeployments[id].nStartTime)); rv.push_back(Pair("timeout", consensusParams.vDeployments[id].nTimeout)); + rv.push_back(Pair("since", VersionBitsTipStateSinceHeight(consensusParams, id))); return rv; } @@ -1053,7 +1054,8 @@ UniValue getblockchaininfo(const JSONRPCRequest& request) " \"status\": \"xxxx\", (string) one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\"\n" " \"bit\": xx, (numeric) the bit (0-28) in the block version field used to signal this softfork (only for \"started\" status)\n" " \"startTime\": xx, (numeric) the minimum median time past of a block at which the bit gains its meaning\n" - " \"timeout\": xx (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n" + " \"timeout\": xx, (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n" + " \"since\": xx (numeric) height of the first block to which the status applies\n" " }\n" " }\n" "}\n" |