From a7f963a727af787c1c8fa34cc52c3723f3ca6e60 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 20 Oct 2016 07:57:13 -0300 Subject: [PATCH] test --- src/main.cpp | 4 ++-- src/main.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8ff3b7ead..48c920b55 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2973,7 +2973,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo // Check that the header is valid (particularly PoW). This is mostly // redundant with the call in AcceptBlockHeader. - if (!CheckBlockHeader(block, block, state, fCheckPOW)) + if (!CheckBlockHeader(height,block, block, state, fCheckPOW)) return false; // Check the merkle root. @@ -3130,7 +3130,7 @@ bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBloc return true; } - if (!CheckBlockHeader(block, block, state)) + if (!CheckBlockHeader(pindex->nHeight,block, block, state)) return false; // Get prev block index diff --git a/src/main.h b/src/main.h index c7bdb7736..bcf362e57 100644 --- a/src/main.h +++ b/src/main.h @@ -409,7 +409,7 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins, bool fJustCheck = false); /** Context-independent validity checks */ -bool CheckBlockHeader(const CBlock& block, const CBlockHeader& blockhdr, CValidationState& state, bool fCheckPOW = true); +bool CheckBlockHeader(int32_t height,const CBlock& block, const CBlockHeader& blockhdr, CValidationState& state, bool fCheckPOW = true); bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW = true, bool fCheckMerkleRoot = true); /** Context-dependent validity checks */