wallet2: adapt get_approximate_blockchain_height

This commit is contained in:
wowario 2018-06-09 14:30:59 +03:00
parent b101ac4f7b
commit 0e61004d0b
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111

View file

@ -9168,18 +9168,14 @@ 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 v2 fork // time of v8 fork
const time_t fork_time = m_nettype == TESTNET ? 1448285909 : m_nettype == STAGENET ? 1520937818 : 1458748658; const time_t fork_time = m_nettype == TESTNET ? 1523255371 : 1524214739;
// v2 fork block // v8 fork block
const uint64_t fork_block = m_nettype == TESTNET ? 624634 : m_nettype == STAGENET ? 32000 : 1009827; const uint64_t fork_block = m_nettype == TESTNET ? 10 : 6969;
// avg seconds per block // avg seconds per block
const int seconds_per_block = DIFFICULTY_TARGET_V2; const int seconds_per_block = DIFFICULTY_TARGET_V2;
// Calculated blockchain height // Calculated blockchain height
uint64_t approx_blockchain_height = fork_block + (time(NULL) - fork_time)/seconds_per_block; uint64_t approx_blockchain_height = fork_block + (time(NULL) - fork_time)/seconds_per_block;
// testnet got some huge rollbacks, so the estimation is way off
static const uint64_t approximate_testnet_rolled_back_blocks = 148540;
if (m_nettype == TESTNET && approx_blockchain_height > approximate_testnet_rolled_back_blocks)
approx_blockchain_height -= approximate_testnet_rolled_back_blocks;
LOG_PRINT_L2("Calculated blockchain height: " << approx_blockchain_height); LOG_PRINT_L2("Calculated blockchain height: " << approx_blockchain_height);
return approx_blockchain_height; return approx_blockchain_height;
} }