|
|
@ -1,5 +1,6 @@ |
|
|
|
// Copyright (c) 2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin Core developers
|
|
|
|
// Copyright (c) 2017-2018 The Hush developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
@ -89,7 +90,7 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex) |
|
|
|
result.push_back(Pair("height", blockindex->nHeight)); |
|
|
|
result.push_back(Pair("version", blockindex->nVersion)); |
|
|
|
result.push_back(Pair("merkleroot", blockindex->hashMerkleRoot.GetHex())); |
|
|
|
result.push_back(Pair("hashReserved", blockindex->hashReserved.GetHex())); |
|
|
|
result.push_back(Pair("hashreserved", blockindex->hashReserved.GetHex())); |
|
|
|
result.push_back(Pair("time", (int64_t)blockindex->nTime)); |
|
|
|
result.push_back(Pair("nonce", blockindex->nNonce.GetHex())); |
|
|
|
result.push_back(Pair("solution", HexStr(blockindex->nSolution))); |
|
|
@ -109,6 +110,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx |
|
|
|
{ |
|
|
|
UniValue result(UniValue::VOBJ); |
|
|
|
result.push_back(Pair("hash", block.GetHash().GetHex())); |
|
|
|
result.push_back(Pair("hashreserved", blockindex->hashReserved.GetHex())); |
|
|
|
int confirmations = -1; |
|
|
|
// Only report confirmations if the block is on the main chain
|
|
|
|
if (chainActive.Contains(blockindex)) |
|
|
|