From 2da1edf9248f6b7644c6158bd26ffdf960fd39f9 Mon Sep 17 00:00:00 2001 From: wowario <38101080+wowario@users.noreply.github.com> Date: Tue, 3 Jul 2018 11:41:22 +0300 Subject: [PATCH] Update difficulty --- src/cryptonote_basic/difficulty.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cryptonote_basic/difficulty.cpp b/src/cryptonote_basic/difficulty.cpp index 9b188f4d3..f3ff538c8 100644 --- a/src/cryptonote_basic/difficulty.cpp +++ b/src/cryptonote_basic/difficulty.cpp @@ -256,9 +256,8 @@ difficulty_type next_difficulty_v3(std::vector timestamps, std::v // TODO: change initial_difficulty_guess before v9 mainnet hard fork // if ( height >= fork_height && height <= fork_height+N ) { return difficulty_guess; } uint64_t initial_difficulty_guess = 100; - if (timestamps.size() <= static_cast(N)) { - return initial_difficulty_guess; - } + if (timestamps.size() <= 6 ) { return initial_difficulty_guess; } + else if ( timestamps.size() < static_cast(N +1) ) { N=timestamps.size()-1; } for ( int64_t i = 1; i <= N; i++) { ST = std::max(-FTL, std::min( (int64_t)(timestamps[i]) - (int64_t)(timestamps[i-1]), 6*T)); @@ -266,9 +265,10 @@ difficulty_type next_difficulty_v3(std::vector timestamps, std::v if ( i > N-3 ) { sum_3_ST += ST; } } - next_D = ((cumulative_difficulties[N] - cumulative_difficulties[0])*T*(N+1)*99)/(100*2*L); + next_D = ((int64_t)(cumulative_difficulties[N] - cumulative_difficulties[0])*T*(N+1)*99)/(100*2*L); prev_D = cumulative_difficulties[N] - cumulative_difficulties[N-1]; + next_D = std::max((prev_D*67)/100, std::min( next_D, (prev_D*150)/100)); if ( sum_3_ST < (8*T)/10) { next_D = (prev_D*110)/100; } return static_cast(next_D);