|
|
@ -751,7 +751,7 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
|
|
|
|
m_timestamps = timestamps;
|
|
|
|
m_timestamps = timestamps;
|
|
|
|
m_difficulties = difficulties;
|
|
|
|
m_difficulties = difficulties;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
size_t target = get_current_hard_fork_version() < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
|
|
|
|
size_t target = get_difficulty_target();
|
|
|
|
return next_difficulty(timestamps, difficulties, target);
|
|
|
|
return next_difficulty(timestamps, difficulties, target);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------
|
|
|
@ -4075,6 +4075,11 @@ bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, ui
|
|
|
|
return m_hardfork->get_voting_info(version, window, votes, threshold, earliest_height, voting);
|
|
|
|
return m_hardfork->get_voting_info(version, window, votes, threshold, earliest_height, voting);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t Blockchain::get_difficulty_target() const
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return get_current_hard_fork_version() < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff) const
|
|
|
|
std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return m_db->get_output_histogram(amounts, unlocked, recent_cutoff);
|
|
|
|
return m_db->get_output_histogram(amounts, unlocked, recent_cutoff);
|
|
|
|