diff options
author | luigi1111 <luigi1111w@gmail.com> | 2022-04-06 00:07:36 -0400 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2022-04-06 00:07:36 -0400 |
commit | 88a5606795496e8e55d34ad3783c13dd4df4b520 (patch) | |
tree | 0d4bbf0cf11591e8712d859f170466d94fa839cf | |
parent | Merge pull request #8180 (diff) | |
parent | wallet2: update stagenet rollback blocks (diff) | |
download | monero-88a5606795496e8e55d34ad3783c13dd4df4b520.tar.xz |
Merge pull request #8195
3c82958 wallet2: update stagenet rollback blocks (selsta)
-rw-r--r-- | src/wallet/wallet2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ee56aa61a..bd040cae9 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -12039,10 +12039,10 @@ uint64_t wallet2::get_approximate_blockchain_height() const const int seconds_per_block = DIFFICULTY_TARGET_V2; // Calculated blockchain height 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 = 342100; - if (m_nettype == TESTNET && approx_blockchain_height > approximate_testnet_rolled_back_blocks) - approx_blockchain_height -= approximate_testnet_rolled_back_blocks; + // testnet and stagenet got some huge rollbacks, so the estimation is way off + static const uint64_t approximate_rolled_back_blocks = m_nettype == TESTNET ? 342100 : 30000; + if ((m_nettype == TESTNET || m_nettype == STAGENET) && approx_blockchain_height > approximate_rolled_back_blocks) + approx_blockchain_height -= approximate_rolled_back_blocks; LOG_PRINT_L2("Calculated blockchain height: " << approx_blockchain_height); return approx_blockchain_height; } |