gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-28 22:51:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix signed unsigned comparison

Browse Source
This commit is contained in:
SNeedlewoods
2026-06-10 21:03:56 +02:00
parent a8478d21b2
commit f1ea6167b3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+12 -5
View File
@@ -12799,13 +12799,20 @@ uint64_t wallet2::get_approximate_blockchain_height() const
uint64_t approx_blockchain_height = fork_block; uint64_t approx_blockchain_height = fork_block;
const time_t now = time(NULL); const time_t now = time(NULL);
if (now > fork_time) if (now > fork_time)
approx_blockchain_height += (now - fork_time) / seconds_per_block; {
else if (approx_blockchain_height > (fork_time - now) / seconds_per_block) const uint64_t blocks_since_last_fork = static_cast<uint64_t>((now - fork_time) / seconds_per_block);
approx_blockchain_height -= (fork_time - now) / seconds_per_block; approx_blockchain_height += blocks_since_last_fork;
}
else else
{ {
LOG_ERROR("Failed to approximate blockchain height from future fork block: " << approx_blockchain_height); const uint64_t blocks_until_next_fork = static_cast<uint64_t>((fork_time - now) / seconds_per_block);
return 0; if (approx_blockchain_height > blocks_until_next_fork)
approx_blockchain_height -= blocks_until_next_fork;
else
{
LOG_ERROR("Failed to approximate blockchain height from future fork block: " << approx_blockchain_height);
return 0;
}
} }
// testnet and stagenet got some huge rollbacks, so the estimation is way off // testnet and stagenet got some huge rollbacks, so the estimation is way off
const uint64_t approximate_rolled_back_blocks = m_nettype == TESTNET ? 26600 : m_nettype == STAGENET ? 48600 : 33600; const uint64_t approximate_rolled_back_blocks = m_nettype == TESTNET ? 26600 : m_nettype == STAGENET ? 48600 : 33600;