Version update

This commit is contained in:
TrianglesDev
2014-07-21 20:07:07 -07:00
parent 0a5f2a5cb5
commit ba6b557f39
144 changed files with 210365 additions and 1009 deletions
+2 -4
View File
@@ -2029,10 +2029,8 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
if (IsProofOfStake() && !CheckCoinStakeTimestamp(GetBlockTime(), (int64)vtx[1].nTime))
return DoS(50, error("CheckBlock() : coinstake timestamp violation nTimeBlock=%"PRI64d" nTimeTx=%u", GetBlockTime(), vtx[1].nTime));
CBlockIndex* pindexPrev = pindexBest;
if ((pindexPrev->nHeight >= (int) CUTOFF_POW_BLOCK) && (IsProofOfWork()))
return DoS(100, error("CheckBlock() : Proof of work (%f XST) on or after block %d.\n",
((double) vtx[0].GetValueOut() / (double) COIN), (int) CUTOFF_POW_BLOCK));
if ((nTime >= CUTOFF_POW_TIME) && (IsProofOfWork()))
return DoS(100, error("CheckBlock() : Proof of work (%f TRI) at t=%d on or after %d.\n", ((double) vtx[0].GetValueOut() / (double) COIN), (int) nTime, (int) CUTOFF_POW_TIME));
// Check transactions
BOOST_FOREACH(const CTransaction& tx, vtx)