From ea4717af7449e35654e64e6f03463021ce930d5b Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Thu, 11 Sep 2014 15:06:24 -1000 Subject: [PATCH] Litecoin: Lock in v2 blocks at height 700000 --- src/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e8ddfbd2e..975ebb5ed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2211,8 +2211,7 @@ bool CBlock::AcceptBlock(CValidationState &state, CDiskBlockPos *dbp) // Reject block.nVersion=1 blocks when 95% (75% on testnet) of the network has upgraded: if (nVersion < 2) { - if ((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 950, 1000)) || - (fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 75, 100))) + if (!fTestNet && nHeight >= 700000) { return state.Invalid(error("AcceptBlock() : rejected nVersion=1 block")); } @@ -2264,8 +2263,6 @@ bool CBlock::AcceptBlock(CValidationState &state, CDiskBlockPos *dbp) bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRequired, unsigned int nToCheck) { - // Litecoin: temporarily disable v2 block lockin until we are ready for v2 transition - return false; unsigned int nFound = 0; for (unsigned int i = 0; i < nToCheck && nFound < nRequired && pstart != NULL; i++) {