DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Set CBlockIndex.hashAnchor correctly in ConnectBlock

Browse Source
This commit is contained in:
Jack Grigg
2016-10-17 11:09:24 -05:00
parent 85457ddec1
commit 6a7acc29a1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -2033,8 +2033,12 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
// Special case for the genesis block, skipping connection of its transactions // Special case for the genesis block, skipping connection of its transactions
// (its coinbase is unspendable) // (its coinbase is unspendable)
if (block.GetHash() == chainparams.GetConsensus().hashGenesisBlock) { if (block.GetHash() == chainparams.GetConsensus().hashGenesisBlock) {
if (!fJustCheck) if (!fJustCheck) {
view.SetBestBlock(pindex->GetBlockHash()); view.SetBestBlock(pindex->GetBlockHash());
// Before the genesis block, there was an empty tree
ZCIncrementalMerkleTree tree;
pindex->hashAnchor = tree.root();
}
return true; return true;
} }
@@ -2080,7 +2084,9 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
// block position, // block position,
auto old_tree_root = view.GetBestAnchor(); auto old_tree_root = view.GetBestAnchor();
// saving the top anchor in the block index as we go. // saving the top anchor in the block index as we go.
pindex->hashAnchor = old_tree_root; if (!fJustCheck) {
pindex->hashAnchor = old_tree_root;
}
ZCIncrementalMerkleTree tree; ZCIncrementalMerkleTree tree;
// This should never fail: we should always be able to get the root // This should never fail: we should always be able to get the root
// that is on the tip of our chain // that is on the tip of our chain