mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
Merge pull request #2342
2e338ca5
wallet2: account for huge testnet reorgs for estimating height (moneromooo-monero)
This commit is contained in:
commit
2560948f69
@ -5098,6 +5098,9 @@ uint64_t wallet2::get_approximate_blockchain_height() const
|
|||||||
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
|
||||||
|
if (m_testnet && approx_blockchain_height > 105000)
|
||||||
|
approx_blockchain_height -= 105000;
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user