Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2025-01-08 19:38:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from wowario/lwma2

Browse Source 
update lwma2
This commit is contained in:
jw 2018-07-28 07:12:37 -07:00 committed by GitHub
commit a53251ceb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cryptonote_basic/difficulty.cpp
View File

@ -243,33 +243,35 @@ namespace cryptonote {
// LWMA-2 difficulty algorithm // LWMA-2 difficulty algorithm
// Copyright (c) 2017-2018 Zawy, MIT License // Copyright (c) 2017-2018 Zawy, MIT License
// See commented version in https://github.com/zawy12/difficulty-algorithms/issues/3 // https://github.com/zawy12/difficulty-algorithms/issues/3
// for required config file changes. // See commented version for required config file changes.
difficulty_type next_difficulty_v3(std::vector<std::uint64_t> timestamps, std::vector<difficulty_type> cumulative_difficulties) { difficulty_type next_difficulty_v3(std::vector<uint64_t> timestamps, std::vector<difficulty_type> cumulative_difficulties) {
int64_t T = DIFFICULTY_TARGET_V2; int64_t T = DIFFICULTY_TARGET_V2;
int64_t N = DIFFICULTY_WINDOW_V2; int64_t N = DIFFICULTY_WINDOW_V2;
int64_t FTL = CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT_V3; int64_t FTL = CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT_V3;
int64_t L(0), ST, sum_3_ST(0), next_D, prev_D; int64_t L(0), ST, sum_3_ST(0), next_D, prev_D;
assert(timestamps.size() == cumulative_difficulties.size() && timestamps.size() <= static_cast<uint64_t>(N+1) );
// TODO: change initial_difficulty_guess before v9 mainnet hard fork // TODO: change initial_difficulty_guess before v9 mainnet hard fork
// if ( height >= fork_height && height <= fork_height+N ) { return difficulty_guess; } // if ( height >= fork_height && height <= fork_height+N ) { return difficulty_guess; }
uint64_t initial_difficulty_guess = 100; uint64_t difficulty_guess = 100;
if (timestamps.size() <= 6 ) { return initial_difficulty_guess; } if (timestamps.size() <= 10 ) { return difficulty_guess; }
else if ( timestamps.size() < static_cast<uint64_t>(N +1) ) { N=timestamps.size()-1; } if ( timestamps.size() < static_cast<uint64_t>(N +1) ) { N = timestamps.size()-1; }
for ( int64_t i = 1; i <= N; i++) { 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)); ST = std::max(-FTL, std::min( static_cast<int64_t>(timestamps[i]) - static_cast<int64_t>(timestamps[i-1]), 6*T));
L += ST * i ; L += ST * i ;
if ( i > N-3 ) { sum_3_ST += ST; } if ( i > N-3 ) { sum_3_ST += ST; }
} }
next_D = ((int64_t)(cumulative_difficulties[N] - cumulative_difficulties[0])*T*(N+1)*99)/(100*2*L); next_D = (static_cast<int64_t>(cumulative_difficulties[N] - cumulative_difficulties[0])*T*(N+1)*99)/(100*2*L);
prev_D = cumulative_difficulties[N] - cumulative_difficulties[N-1]; 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)); 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; } if ( sum_3_ST < (8*T)/10) { next_D = std::max(next_D,(prev_D*110)/100); }
return static_cast<uint64_t>(next_D); return static_cast<uint64_t>(next_D);
} }

2
src/wallet/wallet2.cpp
View File

@ -9141,7 +9141,7 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err)
uint64_t wallet2::get_approximate_blockchain_height() const uint64_t wallet2::get_approximate_blockchain_height() const
{ {
// time of v8 fork // time of v8 fork
const time_t fork_time = m_nettype == TESTNET ? 1530634467 : m_nettype == STAGENET ? 1530635153 : 1524622167; const time_t fork_time = m_nettype == TESTNET ? 1532756009 : m_nettype == STAGENET ? 1530635153 : 1524622167;
// v8 fork block // v8 fork block
const uint64_t fork_block = m_nettype == TESTNET ? 10 : m_nettype == STAGENET ? 10 : 6969; const uint64_t fork_block = m_nettype == TESTNET ? 10 : m_nettype == STAGENET ? 10 : 6969;
// avg seconds per block // avg seconds per block