X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.cpp;h=ff6f2bdfa03bc053e0743e286634d940b133015f;hb=b22972d5277a280f79a1c4bbf212a3871741fa3c;hp=a14bf4630a6eef3af9b646e572ce074e1fd9d556;hpb=82afa858be3517ba477b4448809d3f7a3355ec01;p=novacoin.git diff --git a/src/main.cpp b/src/main.cpp index a14bf46..ff6f2bd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -925,10 +925,15 @@ unsigned int static GetNextTargetRequired(const CBlockIndex* pindexLast, bool fP if(fProofOfStake) { // Proof-of-Stake blocks has own target limit since nVersion=3 supermajority on mainNet and always on testNet - if(fTestNet || (pindexLast->nHeight + 1 > 15000)) - bnTargetLimit = bnProofOfStakeLimit; - else if(pindexLast->nHeight + 1 > 14060) + if(fTestNet) bnTargetLimit = bnProofOfStakeHardLimit; + else + { + if(pindexLast->nHeight + 1 > 15000) + bnTargetLimit = bnProofOfStakeLimit; + else if(pindexLast->nHeight + 1 > 14060) + bnTargetLimit = bnProofOfStakeHardLimit; + } } if (pindexLast == NULL) @@ -1972,7 +1977,7 @@ bool CBlock::AcceptBlock() return error("AcceptBlock() : rejected by synchronized checkpoint"); // Reject block.nVersion < 3 blocks since 95% threshold on mainNet and always on testNet: - if (nVersion < 3 && ((!fTestNet && nHeight > 14060) || (fTestNet && nHeight > 0))) + if (nVersion < 3 && (nHeight > 14060)) return error("CheckBlock() : rejected nVersion < 3 block"); CScript expect = CScript() << nHeight;