mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
Merge pull request #4806
ac23b10f
blockchain: fix innocuous difficulty cache inconsistency (moneromooo-monero)3b14d972
blockchain: use uint64_t for block height, not size_t (moneromooo-monero)
This commit is contained in:
commit
c37c70f459
@ -831,6 +831,7 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
|
||||
std::vector<uint64_t> timestamps;
|
||||
std::vector<difficulty_type> difficulties;
|
||||
auto height = m_db->height();
|
||||
top_hash = get_tail_id(); // get it again now that we have the lock
|
||||
// ND: Speedup
|
||||
// 1. Keep a list of the last 735 (or less) blocks that is used to compute difficulty,
|
||||
// then when the next block difficulty is queried, push the latest height data and
|
||||
@ -853,7 +854,7 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
|
||||
}
|
||||
else
|
||||
{
|
||||
size_t offset = height - std::min < size_t > (height, static_cast<size_t>(DIFFICULTY_BLOCKS_COUNT));
|
||||
uint64_t offset = height - std::min <uint64_t> (height, static_cast<uint64_t>(DIFFICULTY_BLOCKS_COUNT));
|
||||
if (offset == 0)
|
||||
++offset;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user