From 5cb18359b5ff0c75c672369624fc48d85f5b9d1c Mon Sep 17 00:00:00 2001 From: gulden Date: Sat, 3 Feb 2018 17:43:08 +0200 Subject: [PATCH] v1.6.4.10 --- configure.ac | 2 +- src/clientversion.h | 2 +- src/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6c307c7b4c..39b2ce6774 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 6) define(_CLIENT_VERSION_REVISION, 4) -define(_CLIENT_VERSION_BUILD, 9) +define(_CLIENT_VERSION_BUILD, 10) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2016) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/src/clientversion.h b/src/clientversion.h index 13e7ac4cb7..37e2bd6fde 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 6 #define CLIENT_VERSION_REVISION 4 -#define CLIENT_VERSION_BUILD 9 +#define CLIENT_VERSION_BUILD 10 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false diff --git a/src/main.cpp b/src/main.cpp index 702a96e2a6..d3cae31a01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3237,7 +3237,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state assert(pindexPrev); if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams, hash)) - return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, FormatStateMessage(state)); + return state.DoS(5, error("%s: block invalidated by checkpoint", __func__), REJECT_INVALID, "bad-blk-fork"); if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime())) return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));