From 4f5e03dbde4630667c0737c11528c6623fb63cb2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 20 Oct 2016 16:29:56 -0300 Subject: [PATCH] test --- src/main.cpp | 4 ++-- src/miner.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9c1eaa056..16effd6e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3137,8 +3137,8 @@ bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBloc return true; } - //if (!CheckBlockHeader((*ppindex)->nHeight,*ppindex, block, state)) - // return false; + if (!CheckBlockHeader(*ppindex!=0?(*ppindex)->nHeight:0,*ppindex, block, state)) + return false; // Get prev block index CBlockIndex* pindexPrev = NULL; diff --git a/src/miner.cpp b/src/miner.cpp index 2d90c40c4..d6243684d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -352,14 +352,12 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblock->hashPrevBlock = pindexPrev->GetBlockHash(); pblock->hashReserved = uint256(); UpdateTime(pblock, Params().GetConsensus(), pindexPrev); - extern int32_t IS_KOMODO_NOTARY; - if ( 0 && IS_KOMODO_NOTARY != 0 ) - pblock->nBits = KOMODO_MINDIFF_NBITS; - else pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus()); + pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus()); pblock->nSolution.clear(); pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); CValidationState state; +//need to fix this and also ht specific notarized ht if ( 0 && !TestBlockValidity(state, *pblock, pindexPrev, false, false)) throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed"); }