mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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 committed 2016-03-14 12:22:40 +01:00
2 parents c87f51e55b a6ee0caa4e
commit c9a1265754
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/blockchain.cpp
+1 -1
View File
@@ -89,7 +89,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))