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

Miner fixes

Browse Source
This commit is contained in:
jl777
2018-04-16 08:59:42 +03:00
parent 7413e8565f
commit cfefc9211b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -3234,6 +3234,8 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
fprintf(stderr,"CheckBlockHeader error in CheckBlock\n");
return false;
}
if ( fCheckPOW && !CheckEquihashSolution(&block, Params()) )
return state.DoS(100, error("CheckBlockHeader(): Equihash solution invalid"),REJECT_INVALID, "invalid-solution");
komodo_block2pubkey33(pubkey33,(CBlock *)&block);
if ( fCheckPOW && !CheckProofOfWork(height,pubkey33,block.GetHash(), block.nBits, Params().GetConsensus()) )
return state.DoS(50, error("CheckBlock(): proof of work failed"),REJECT_INVALID, "high-hash");

12
src/miner.cpp
View File

@@ -861,6 +861,12 @@ void static BitcoinMiner()
// fprintf(stderr," missed target\n");
return false;
}
CValidationState tmpstate;
if ( !TestBlockValidity(tmpstate, *pblock, pindexPrev, true, false))
{
fprintf(stderr,"formerly valid mining block became invalid\n");
break;
}
if ( /*ASSETCHAINS_SYMBOL[0] == 0 &&*/ Mining_start != 0 && time(NULL) < Mining_start+roundrobin_delay )
{
//printf("Round robin diff sleep %d\n",(int32_t)(Mining_start+roundrobin_delay-time(NULL)));
@@ -1002,12 +1008,6 @@ void static BitcoinMiner()
// Changing pblock->nTime can change work required on testnet:
hashTarget.SetCompact(pblock->nBits);
}
CValidationState tmpstate;
if ( !TestBlockValidity(tmpstate, *pblock, pindexPrev, true, false))
{
fprintf(stderr,"formerly valid mining block became invalid, likely due to tx expiration\n");
break;
}
}
}
}