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

Merge pull request #10744

Browse Source 
f1ea616 fix signed unsigned comparison (SNeedlewoods)

ACKs: selsta, tobtoht
This commit is contained in:
tobtoht
2026-06-14 15:59:40 +00:00
parent 184cd8e519 f1ea6167b3
commit 757679bb6a
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
@@ -12742,13 +12742,20 @@ uint64_t wallet2::get_approximate_blockchain_height() const
uint64_t approx_blockchain_height = fork_block;
const time_t now = time(NULL);
if (now > fork_time)
approx_blockchain_height += (now - fork_time) / seconds_per_block;
else if (approx_blockchain_height > (fork_time - now) / seconds_per_block)
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 += blocks_since_last_fork;
}
else
{
LOG_ERROR("Failed to approximate blockchain height from future fork block: " << approx_blockchain_height);
return 0;
const uint64_t blocks_until_next_fork = static_cast<uint64_t>((fork_time - now) / seconds_per_block);
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
const uint64_t approximate_rolled_back_blocks = m_nettype == TESTNET ? 26600 : m_nettype == STAGENET ? 48600 : 33600;