Skip to content
Permalink
Browse files

consensus: Emergency fix

  • Loading branch information...
itwysgsl committed Mar 6, 2019
1 parent bf55ddf commit 0657dc213bd5d6deba6eec775bb0be6975d4b390
Showing with 3 additions and 3 deletions.
  1. +1 −1 configure.ac
  2. +1 −1 src/pow.cpp
  3. +1 −1 src/validation.cpp
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 16)
define(_CLIENT_VERSION_REVISION, 4)
define(_CLIENT_VERSION_REVISION, 5)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
@@ -206,7 +206,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
const auto isLwma3 = nHeight >= params.lwma3Height;

const auto mbcWarmUp = (isHardfork && nHeight < (params.mbcHeight + 1) + params.nWarmUpWindow);
const auto rainforestWarmUp = (nHeight > params.rainforestHeight && nHeight < params.rainforestHeight + params.rainforestWarmUpWindow);
const auto rainforestWarmUp = (nHeight >= params.rainforestHeight && nHeight < params.rainforestHeight + params.rainforestWarmUpWindow);

// Pow warm-up window
if (mbcWarmUp || rainforestWarmUp) {
@@ -3185,7 +3185,7 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationSta
}

// Check timestamp
int64_t FTL = nHeight >= consensusParams.rainforestHeight ? consensusParams.lwmaMaxFutureBlockTime : MAX_FUTURE_BLOCK_TIME;
int64_t FTL = nHeight > consensusParams.rainforestHeight ? consensusParams.lwmaMaxFutureBlockTime : MAX_FUTURE_BLOCK_TIME;
if (block.GetBlockTime() > nAdjustedTime + FTL) {
return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
}

0 comments on commit 0657dc2

Please sign in to comment.
You can’t perform that action at this time.