|
|
|
@ -2211,8 +2211,7 @@ bool CBlock::AcceptBlock(CValidationState &state, CDiskBlockPos *dbp)
@@ -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)
@@ -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++) |
|
|
|
|
{ |
|
|
|
|