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

Better PoW error from ContextualCheckBlockHeader

Browse Source
This commit is contained in:
Duke Leto
2020-12-06 20:18:21 -05:00
parent 177dd4b65c
commit 5ae912ef03
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.cpp
View File

@@ -5331,10 +5331,8 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
// Check proof of work // Check proof of work
if ( (SMART_CHAIN_SYMBOL[0] != 0 || nHeight < 235300 || nHeight > 236000) && block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams)) if ( (SMART_CHAIN_SYMBOL[0] != 0 || nHeight < 235300 || nHeight > 236000) && block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
{ {
cout << block.nBits << " block.nBits vs. calc " << GetNextWorkRequired(pindexPrev, &block, consensusParams) << cout << block.nBits << " block.nBits vs. calc " << GetNextWorkRequired(pindexPrev, &block, consensusParams) << " for block #" << nHeight << endl;
" for block #" << nHeight << endl; return state.DoS(100, error("%s: Incorrect Proof-of-Work at height %d", __func__, nHeight), REJECT_INVALID, "bad-diffbits");
return state.DoS(100, error("%s: incorrect proof of work", __func__),
REJECT_INVALID, "bad-diffbits");
} }
// Check timestamp against prev // Check timestamp against prev
@@ -5343,25 +5341,20 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast() ) if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast() )
{ {
fprintf(stderr,"ht.%d too early %u vs %u\n",(int32_t)nHeight,(uint32_t)block.GetBlockTime(),(uint32_t)pindexPrev->GetMedianTimePast()); fprintf(stderr,"ht.%d too early %u vs %u\n",(int32_t)nHeight,(uint32_t)block.GetBlockTime(),(uint32_t)pindexPrev->GetMedianTimePast());
return state.Invalid(error("%s: block's timestamp is too early", __func__), return state.Invalid(error("%s: block's timestamp is too early", __func__), REJECT_INVALID, "time-too-old");
REJECT_INVALID, "time-too-old");
} }
} } else {
else
{
if ( block.GetBlockTime() <= pindexPrev->nTime ) if ( block.GetBlockTime() <= pindexPrev->nTime )
{ {
fprintf(stderr,"ht.%d too early2 %u vs %u\n",(int32_t)nHeight,(uint32_t)block.GetBlockTime(),(uint32_t)pindexPrev->nTime); fprintf(stderr,"ht.%d too early2 %u vs %u\n",(int32_t)nHeight,(uint32_t)block.GetBlockTime(),(uint32_t)pindexPrev->nTime);
return state.Invalid(error("%s: block's timestamp is too early2", __func__), return state.Invalid(error("%s: block's timestamp is too early2", __func__), REJECT_INVALID, "time-too-old");
REJECT_INVALID, "time-too-old");
} }
} }
// Check that timestamp is not too far in the future // Check that timestamp is not too far in the future
if (block.GetBlockTime() > GetTime() + consensusParams.nMaxFutureBlockTime) if (block.GetBlockTime() > GetTime() + consensusParams.nMaxFutureBlockTime)
{ {
return state.Invalid(error("%s: block timestamp too far in the future", __func__), return state.Invalid(error("%s: block timestamp too far in the future", __func__), REJECT_INVALID, "time-too-new");
REJECT_INVALID, "time-too-new");
} }
if (fCheckpointsEnabled) if (fCheckpointsEnabled)
@@ -5404,8 +5397,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
} }
// Reject block.nVersion < 4 blocks // Reject block.nVersion < 4 blocks
if (block.nVersion < 4) if (block.nVersion < 4)
return state.Invalid(error("%s : rejected nVersion<4 block", __func__), return state.Invalid(error("%s : rejected nVersion<4 block", __func__), REJECT_OBSOLETE, "bad-version");
REJECT_OBSOLETE, "bad-version");
return true; return true;
} }