DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2016-10-18 10:55:43 -03:00
parent 1d095ca0f7
commit fffef49eca
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -2951,8 +2951,6 @@ bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool f
if (block.GetBlockTime() > GetAdjustedTime() + 60) if (block.GetBlockTime() > GetAdjustedTime() + 60)
return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),REJECT_INVALID, "time-too-new"); return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),REJECT_INVALID, "time-too-new");
nBits = block.nBits; nBits = block.nBits;
//if ( bindex != 0 && (bindex->nHeight < NOTARIZED_HEIGHT || (bindex->nHeight == NOTARIZED_HEIGHT && NOTARIZED_HASH != bindex->GetBlockHash())) )
// return(false);
if ( (retval= komodo_blockhdrcheck(&block,&nBits)) == 0 ) if ( (retval= komodo_blockhdrcheck(&block,&nBits)) == 0 )
{ {
// Check Equihash solution is valid // Check Equihash solution is valid

4
src/txdb.cpp
View File

@@ -267,8 +267,6 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
} }
int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp); int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp);
extern int32_t NOTARIZED_HEIGHT;
extern uint256 NOTARIZED_HASH;
bool CBlockTreeDB::LoadBlockIndexGuts() bool CBlockTreeDB::LoadBlockIndexGuts()
{ {
@@ -311,8 +309,6 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
int32_t retval; uint32_t nBits; int32_t retval; uint32_t nBits;
nBits = pindexNew->nBits; nBits = pindexNew->nBits;
if ( pindexNew->nHeight < NOTARIZED_HEIGHT || (pindexNew->nHeight == NOTARIZED_HEIGHT && NOTARIZED_HASH != pindexNew->GetBlockHash()) )
return(false);
if ( (retval= komodo_blockindexcheck(pindexNew,&nBits)) == 0 ) if ( (retval= komodo_blockindexcheck(pindexNew,&nBits)) == 0 )
{ {
if (!CheckProofOfWork(pindexNew->GetBlockHash(), nBits, Params().GetConsensus())) if (!CheckProofOfWork(pindexNew->GetBlockHash(), nBits, Params().GetConsensus()))