Merge bitcoin#7952: Log invalid block hash to make debugging easier.

laanwj · codablock · commit 03507a720cd5 · 2017-12-20T17:25:03.000+01:00
61c0170 Log invalid block hash to make debugging easier. (Pavel Janík)
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3331,7 +3331,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
             if (ppindex)
                 *ppindex = pindex;
             if (pindex->nStatus & BLOCK_FAILED_MASK)
-                return state.Invalid(error("%s: block is marked invalid", __func__), 0, "duplicate");
+                return state.Invalid(error("%s: block %s is marked invalid", __func__, hash.ToString()), 0, "duplicate");
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3331,7 +3331,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state`
`3331`	`3331`	`if (ppindex)`
`3332`	`3332`	`*ppindex = pindex;`
`3333`	`3333`	`if (pindex->nStatus & BLOCK_FAILED_MASK)`
`3334`		`- return state.Invalid(error("%s: block is marked invalid", __func__), 0, "duplicate");`
	`3334`	`+ return state.Invalid(error("%s: block %s is marked invalid", __func__, hash.ToString()), 0, "duplicate");`
`3335`	`3335`	`return true;`
`3336`	`3336`	`}`
`3337`	`3337`