From 6a7f8777a0b193fae4f976196f3464ffac01bf1b Mon Sep 17 00:00:00 2001 From: Suhas Daftuar Date: Tue, 16 Apr 2019 12:38:14 -0400 Subject: [PATCH] Ban all peers for all block script failures This eliminates a discrepancy between block validation with multiple script check threads, versus a single script check thread. --- src/validation.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/validation.cpp b/src/validation.cpp index 37082d3b0..0951b3cf9 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1998,9 +1998,13 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl { std::vector vChecks; bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */ - if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, fCacheResults, txdata[i], nScriptCheckThreads ? &vChecks : nullptr)) + if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, fCacheResults, txdata[i], nScriptCheckThreads ? &vChecks : nullptr)) { + // With parallel script checks, we always set DoS to 100; do + // that here as well for simplicity (for now). + state.DoS(100, false, state.GetRejectCode(), state.GetRejectReason(), state.CorruptionPossible(), state.GetDebugMessage()); return error("ConnectBlock(): CheckInputs on %s failed with %s", tx.GetHash().ToString(), FormatStateMessage(state)); + } control.Add(vChecks); }