Skip to content
This repository was archived by the owner on Nov 28, 2019. It is now read-only.

validation: change pindexPrev->nHeight + 1 to nHeight #3

Merged
instagibbs merged 1 commit into from
Nov 13, 2018
Merged

validation: change pindexPrev->nHeight + 1 to nHeight #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3984,7 +3984,9 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc

bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)
{
const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
assert(pindexPrev != NULL);
const int nHeight = pindexPrev->nHeight + 1;

// Check proof of work
if (!CheckChallenge(block, *pindexPrev, consensusParams))
return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");
Expand All @@ -3994,7 +3996,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");

// Check height in header against prev
if ((uint32_t)pindexPrev->nHeight + 1 != block.nHeight)
if ((uint32_t)nHeight != block.nHeight)
return state.Invalid(error("%s: block height in header is incorrect", __func__),
REJECT_INVALID, "bad-header-height");

Expand Down