This commit is contained in:
jl777
2018-04-19 15:53:28 +03:00
parent 997ddd92c7
commit bf30e02d79
3 changed files with 4 additions and 21 deletions

View File

@@ -4156,39 +4156,22 @@ bool TestBlockValidity(CValidationState &state, const CBlock& block, CBlockIndex
indexDummy.nHeight = pindexPrev->nHeight + 1; indexDummy.nHeight = pindexPrev->nHeight + 1;
// JoinSplit proofs are verified in ConnectBlock // JoinSplit proofs are verified in ConnectBlock
auto verifier = libzcash::ProofVerifier::Disabled(); auto verifier = libzcash::ProofVerifier::Disabled();
int32_t z; 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 // NOTE: CheckBlockHeader is called by CheckBlock
if (!ContextualCheckBlockHeader(block, state, pindexPrev)) if (!ContextualCheckBlockHeader(block, state, pindexPrev))
{ {
fprintf(stderr,"TestBlockValidity failure A checkPOW.%d\n",fCheckPOW); fprintf(stderr,"TestBlockValidity failure A checkPOW.%d\n",fCheckPOW);
return false; 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)) if (!CheckBlock(indexDummy.nHeight,0,block, state, verifier, fCheckPOW, fCheckMerkleRoot))
{ {
fprintf(stderr,"TestBlockValidity failure B checkPOW.%d\n",fCheckPOW); fprintf(stderr,"TestBlockValidity failure B checkPOW.%d\n",fCheckPOW);
return false; 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)) if (!ContextualCheckBlock(block, state, pindexPrev))
{ {
fprintf(stderr,"TestBlockValidity failure C checkPOW.%d\n",fCheckPOW); fprintf(stderr,"TestBlockValidity failure C checkPOW.%d\n",fCheckPOW);
return false; 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)) if (!ConnectBlock(block, state, &indexDummy, viewNew, true,fCheckPOW))
{ {
fprintf(stderr,"TestBlockValidity failure D checkPOW.%d\n",fCheckPOW); fprintf(stderr,"TestBlockValidity failure D checkPOW.%d\n",fCheckPOW);

View File

@@ -854,7 +854,7 @@ void static BitcoinMiner()
HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED); HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
for (z=31; z>=0; z--) for (z=31; z>=0; z--)
fprintf(stderr,"%02x",((uint8_t *)&HASHTarget_POW)[z]); fprintf(stderr,"%02x",((uint8_t *)&HASHTarget_POW)[z]);
fprintf(stderr," PoW for staked coin %p\n",&HASHTarget_POW); fprintf(stderr," PoW for staked coin PoS %d%%\n",&HASHTarget_POW,percPoS);
} }
while (true) while (true)
{ {

View File

@@ -136,9 +136,9 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
extern int32_t KOMODO_REWIND; extern int32_t KOMODO_REWIND;
bool fNegative,fOverflow; uint8_t origpubkey33[33]; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,flag = 0, mids[66]; uint32_t tiptime,blocktimes[66]; bool fNegative,fOverflow; uint8_t origpubkey33[33]; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,flag = 0, mids[66]; uint32_t tiptime,blocktimes[66];
arith_uint256 bnTarget; uint8_t pubkeys[66][33]; arith_uint256 bnTarget; uint8_t pubkeys[66][33];
for (i=31; i>=0; i--) //for (i=31; i>=0; i--)
fprintf(stderr,"%02x",((uint8_t *)&hash)[i]); // fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
fprintf(stderr," checkpow\n"); //fprintf(stderr," checkpow\n");
memcpy(origpubkey33,pubkey33,33); memcpy(origpubkey33,pubkey33,33);
memset(blocktimes,0,sizeof(blocktimes)); memset(blocktimes,0,sizeof(blocktimes));
tiptime = komodo_chainactive_timestamp(); tiptime = komodo_chainactive_timestamp();