Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 12:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

wallet2: improve refresh height determination

Browse Source 
As reported by jaquee, the calculation could underflow for very
low heights.
Additionally, we now use the target height too.
This commit is contained in:
moneromooo-monero 2017-08-06 16:56:51 +01:00
parent ab594cfee9
commit 74597bd15a
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wallet/wallet2.cpp
View File

@ -2174,9 +2174,26 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
// try asking the daemon first // try asking the daemon first
if(m_refresh_from_block_height == 0 && !recover){ if(m_refresh_from_block_height == 0 && !recover){
std::string err; std::string err;
uint64_t height = get_daemon_blockchain_height(err); uint64_t height = 0;
if (err.empty())
m_refresh_from_block_height = height - blocks_per_month; // we get the max of approximated height and known height
// approximated height is the least of daemon target height
// (the max of what the other daemons are claiming is their
// height) and the theoretical height based on the local
// clock. This will be wrong only if both the local clock
// is bad *and* a peer daemon claims a highest height than
// the real chain.
// known height is the height the local daemon is currently
// synced to, it will be lower than the real chain height if
// the daemon is currently syncing.
height = get_approximate_blockchain_height();
uint64_t target_height = get_daemon_blockchain_target_height(err);
if (err.empty() && target_height < height)
height = target_height;
uint64_t local_height = get_daemon_blockchain_height(err);
if (err.empty() && local_height > height)
height = local_height;
m_refresh_from_block_height = height >= blocks_per_month ? height - blocks_per_month : 0;
} }
if(m_refresh_from_block_height == 0 && !recover){ if(m_refresh_from_block_height == 0 && !recover){