neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #7670: use cached block hash in blockToJSON()

Browse Source 
a6ee0ca use cached block hash in blockToJSON() (Pavel Vasin)
This commit is contained in:
Wladimir J. van der Laan 2016-03-14 12:01:09 +01:00 committed by Alexander Block
parent fb4ec255c6
commit 5f9bfa0b6d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/blockchain.cpp
View File

@ -94,7 +94,7 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false) UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false)
{ {
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
result.push_back(Pair("hash", block.GetHash().GetHex())); result.push_back(Pair("hash", blockindex->GetBlockHash().GetHex()));
int confirmations = -1; int confirmations = -1;
// Only report confirmations if the block is on the main chain // Only report confirmations if the block is on the main chain
if (chainActive.Contains(blockindex)) if (chainActive.Contains(blockindex))