ReadBlockFromDisk: do genesis block check before block proof check

instagibbs · instagibbs · commit 1f470d3201f9 · 2019-09-06T10:06:44.000-04:00
diff --git 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());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1148,8 +1148,8 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos, const Consensus:`
`1148`	`1148`
`1149`	`1149`	`// Check the header`
`1150`	`1150`	`const uint256 block_hash = block.GetHash();`
`1151`		`- if (!CheckProof(block, consensusParams) &&`
`1152`		`- block_hash != consensusParams.hashGenesisBlock) {`
	`1151`	`+ if (block_hash != consensusParams.hashGenesisBlock &&`
	`1152`	`+ !CheckProof(block, consensusParams)) {`
`1153`	`1153`	`return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString());`
`1154`	`1154`	`}`
`1155`	`1155`