Merge pull request #5974

7fcd0b5 blockchain: initialize pow to ff..ff (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-22 10:13:34 -05:00
commit cf2d4d9a16
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -1703,7 +1703,8 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
// Check the block's hash against the difficulty target for its alt chain
difficulty_type current_diff = get_next_difficulty_for_alternative_chain(alt_chain, bei);
CHECK_AND_ASSERT_MES(current_diff, false, "!!!!!!! DIFFICULTY OVERHEAD !!!!!!!");
crypto::hash proof_of_work = null_hash;
crypto::hash proof_of_work;
memset(proof_of_work.data, 0xff, sizeof(proof_of_work.data));
if (b.major_version >= RX_BLOCK_VERSION)
{
crypto::hash seedhash = null_hash;
@ -3734,7 +3735,8 @@ leave:
TIME_MEASURE_START(longhash_calculating_time);
crypto::hash proof_of_work = null_hash;
crypto::hash proof_of_work;
memset(proof_of_work.data, 0xff, sizeof(proof_of_work.data));
// Formerly the code below contained an if loop with the following condition
// !m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height())