Merge pull request #7682

bbdb612 Wallet2: Update 'approximate_testnet_rolled_back_blocks' (rbrunner7)
This commit is contained in:
luigi1111 2021-05-12 15:30:34 -05:00
commit 628c04499b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -12228,7 +12228,7 @@ uint64_t wallet2::get_approximate_blockchain_height() const
// 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 // testnet got some huge rollbacks, so the estimation is way off
static const uint64_t approximate_testnet_rolled_back_blocks = 303967; static const uint64_t approximate_testnet_rolled_back_blocks = 342100;
if (m_nettype == TESTNET && approx_blockchain_height > approximate_testnet_rolled_back_blocks) if (m_nettype == TESTNET && approx_blockchain_height > approximate_testnet_rolled_back_blocks)
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);