Merge pull request #6753

4ff2074c7 cryptonote_protocol: don't synced pruned blocks before v11 (cohcho)
This commit is contained in:
Alexander Blair 2020-08-27 02:58:44 -07:00
commit dd7fd2ef80
No known key found for this signature in database
GPG Key ID: C64552D877C32479

View File

@ -1937,8 +1937,8 @@ skip:
if (local_stripe == 0) if (local_stripe == 0)
return false; return false;
// don't request pre-bulletprooof pruned blocks, we can't reconstruct their weight (yet) // don't request pre-bulletprooof pruned blocks, we can't reconstruct their weight (yet)
static const uint64_t bp_fork_height = m_core.get_earliest_ideal_height_for_version(8); static const uint64_t bp_fork_height = m_core.get_earliest_ideal_height_for_version(HF_VERSION_SMALLER_BP);
if (first_block_height + nblocks - 1 < bp_fork_height) if (first_block_height < bp_fork_height)
return false; return false;
// assumes the span size is less or equal to the stripe size // assumes the span size is less or equal to the stripe size
bool full_data_needed = tools::get_pruning_stripe(first_block_height, context.m_remote_blockchain_height, CRYPTONOTE_PRUNING_LOG_STRIPES) == local_stripe bool full_data_needed = tools::get_pruning_stripe(first_block_height, context.m_remote_blockchain_height, CRYPTONOTE_PRUNING_LOG_STRIPES) == local_stripe