diff --git a/configure.ac b/configure.ac index 9ab9e4ce3a..079f81cef4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 1) -define(_CLIENT_VERSION_REVISION, 4) +define(_CLIENT_VERSION_REVISION, 5) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/pow.cpp b/src/pow.cpp index 62b871868a..ad5a47ff2b 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -141,7 +141,7 @@ unsigned int GetNextWorkRequiredPOSV2(const CBlockIndex* pIndexLast) const auto posLimit = consensus.ProofOfStakeLimit(fIsTimeProtocolV2); // Fetch the target block spacing time and timespan - int64_t nTargetSpacing = consensus.nTargetSpacing; + int64_t nTargetSpacing = nHeight > 2255000 ? consensus.nTargetSpacingV2 : consensus.nTargetSpacing; const int nTargetBlocksPerDay = DAY_IN_SECONDS / nTargetSpacing; const int nTargetBlocksPerWeek = WEEK_IN_SECONDS / nTargetSpacing; diff --git a/src/version.h b/src/version.h index 9667019b38..4c4104ff05 100644 --- a/src/version.h +++ b/src/version.h @@ -12,7 +12,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70106; +static const int PROTOCOL_VERSION = 70107; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;