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

wallet2: get current height from the daemon on creation

Browse Source 
Use current time to estimate current height only if the daemon
cannot be queried.
This commit is contained in:
moneromooo-monero 2017-06-26 08:11:14 +01:00
parent d3bb72fff1
commit 3b599d2b7e
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wallet/wallet2.cpp
View File

@ -2165,14 +2165,23 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
m_account_public_address = m_account.get_keys().m_account_address; m_account_public_address = m_account.get_keys().m_account_address;
m_watch_only = false; m_watch_only = false;
if(m_refresh_from_block_height == 0 && !recover){
// Wallets created offline don't know blockchain height.
// Set blockchain height calculated from current date/time
// -1 month for fluctuations in block time and machine date/time setup. // -1 month for fluctuations in block time and machine date/time setup.
// avg seconds per block // avg seconds per block
const int seconds_per_block = DIFFICULTY_TARGET_V2; const int seconds_per_block = DIFFICULTY_TARGET_V2;
// ~num blocks per month // ~num blocks per month
const uint64_t blocks_per_month = 60*60*24*30/seconds_per_block; const uint64_t blocks_per_month = 60*60*24*30/seconds_per_block;
// try asking the daemon first
if(m_refresh_from_block_height == 0 && !recover){
std::string err;
uint64_t height = get_daemon_blockchain_height(err);
if (err.empty())
m_refresh_from_block_height = height - blocks_per_month;
}
if(m_refresh_from_block_height == 0 && !recover){
// Wallets created offline don't know blockchain height.
// Set blockchain height calculated from current date/time
uint64_t approx_blockchain_height = get_approximate_blockchain_height(); uint64_t approx_blockchain_height = get_approximate_blockchain_height();
if(approx_blockchain_height > 0) { if(approx_blockchain_height > 0) {
m_refresh_from_block_height = approx_blockchain_height - blocks_per_month; m_refresh_from_block_height = approx_blockchain_height - blocks_per_month;