From 126c92b60a50e58e3badd431269317e5e0dfe4cf Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 17 Oct 2016 16:09:06 -0300 Subject: [PATCH] test --- src/komodo.h | 2 +- src/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 26026e332..a3a3b850f 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -59,7 +59,7 @@ int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp) int32_t komodo_blockcheck(CBlock *block,uint32_t *nBitsp) { CBlockIndex *bindex = new CBlockIndex(block->GetBlockHeader()); - if ( bindex->nHeight <= NOTARIZED_HEIGHT ) + if ( bindex != 0 && bindex->nHeight <= NOTARIZED_HEIGHT ) return(-1); // 1 -> valid notary block, change nBits to KOMODO_MINDIFF_NBITS // -1 -> invalid, ie, prior to notarized block diff --git a/src/main.cpp b/src/main.cpp index 14cffc68e..3f41363c1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2946,13 +2946,13 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool fCheckPOW) { - int32_t retval; uint32_t nBits; CBlockIndex *bindex = new CBlockIndex(block); + int32_t retval; uint32_t nBits; //CBlockIndex *bindex = new CBlockIndex(block); // Check timestamp if (block.GetBlockTime() > GetAdjustedTime() + 60) return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),REJECT_INVALID, "time-too-new"); nBits = block.nBits; - if ( bindex != 0 && (bindex->nHeight < NOTARIZED_HEIGHT || (bindex->nHeight == NOTARIZED_HEIGHT && NOTARIZED_HASH != bindex->GetBlockHash())) ) - return(false); + //if ( bindex != 0 && (bindex->nHeight < NOTARIZED_HEIGHT || (bindex->nHeight == NOTARIZED_HEIGHT && NOTARIZED_HASH != bindex->GetBlockHash())) ) + // return(false); if ( (retval= komodo_blockhdrcheck(&block,&nBits)) == 0 ) { // Check Equihash solution is valid