From 18dd6a3b58f40dae53221deba96c36c5879ce8e7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 19 Apr 2018 15:12:19 +0300 Subject: [PATCH] Test --- src/main.cpp | 24 ++++++++++++++++++++++-- src/miner.cpp | 4 ++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e7e4a9754..df911fa7d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3773,7 +3773,11 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat { uint8_t pubkey33[33]; uint256 hash; // These are checks that are independent of context. - + hash = block.GetHash(); + for (z=31; z>=0; z--) + fprintf(stderr,"%02x",((uint8_t *)&hash)[z]); + fprintf(stderr," CheckBlock ht.%d\n",height); + // Check that the header is valid (particularly PoW). This is mostly // redundant with the call in AcceptBlockHeader. if (!CheckBlockHeader(height,pindex,block,state,fCheckPOW)) @@ -4152,23 +4156,39 @@ bool TestBlockValidity(CValidationState &state, const CBlock& block, CBlockIndex indexDummy.nHeight = pindexPrev->nHeight + 1; // JoinSplit proofs are verified in ConnectBlock auto verifier = libzcash::ProofVerifier::Disabled(); - + uint256 h; + h = block.GetHash(); + for (z=31; z>=16; z--) + fprintf(stderr,"%02x",((uint8_t *)&h)[z]); + fprintf(stderr," test hash\n"); // NOTE: CheckBlockHeader is called by CheckBlock if (!ContextualCheckBlockHeader(block, state, pindexPrev)) { fprintf(stderr,"TestBlockValidity failure A checkPOW.%d\n",fCheckPOW); return false; } + h = block.GetHash(); + for (z=31; z>=16; z--) + fprintf(stderr,"%02x",((uint8_t *)&h)[z]); + fprintf(stderr," test hash2\n"); if (!CheckBlock(indexDummy.nHeight,0,block, state, verifier, fCheckPOW, fCheckMerkleRoot)) { fprintf(stderr,"TestBlockValidity failure B checkPOW.%d\n",fCheckPOW); return false; } + h = block.GetHash(); + for (z=31; z>=16; z--) + fprintf(stderr,"%02x",((uint8_t *)&h)[z]); + fprintf(stderr," test hash3\n"); if (!ContextualCheckBlock(block, state, pindexPrev)) { fprintf(stderr,"TestBlockValidity failure C checkPOW.%d\n",fCheckPOW); return false; } + h = block.GetHash(); + for (z=31; z>=16; z--) + fprintf(stderr,"%02x",((uint8_t *)&h)[z]); + fprintf(stderr," test hash4\n"); if (!ConnectBlock(block, state, &indexDummy, viewNew, true,fCheckPOW)) { fprintf(stderr,"TestBlockValidity failure D checkPOW.%d\n",fCheckPOW); diff --git a/src/miner.cpp b/src/miner.cpp index 6a72979dd..149f0ea87 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1080,7 +1080,7 @@ void static BitcoinMiner() // Update nNonce and nTime pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1); pblock->nBits = savebits; - if ( NOTARY_PUBKEY33[0] == 0 ) + /*if ( NOTARY_PUBKEY33[0] == 0 ) { int32_t percPoS; UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev); @@ -1090,7 +1090,7 @@ void static BitcoinMiner() HASHTarget.SetCompact(pblock->nBits); HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED); } - } + }*/ } } }