From 0a8565bbf8b0fb8e521ba2779735990391494e11 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Fri, 31 May 2019 12:04:06 -0400 Subject: [PATCH] ReadBlockFromDisk: do genesis block check before block proof check --- src/validation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index 52bedeead2..6aa7afb9cd 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1148,8 +1148,8 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos, const Consensus: // Check the header const uint256 block_hash = block.GetHash(); - if (!CheckProof(block, consensusParams) && - block_hash != consensusParams.hashGenesisBlock) { + if (block_hash != consensusParams.hashGenesisBlock && + !CheckProof(block, consensusParams)) { return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString()); }