monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: fix refresh_from_height setting on new wallet

Browse source 
The previous patch was based on a wrong premise (that the
daemon height was 0 because the daemon calling code wasn't
yet initialized). In fact, current height approximation
was not setup for testnet. Fix this.
This commit is contained in:
moneromooo-monero 2017-06-26 06:54:53 +01:00
parent 0c6ea4f8a6
commit 32754784db
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/simplewallet/simplewallet.cpp
View file

@ -920,8 +920,6 @@ static bool might_be_partial_seed(std::string words)
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::init(const boost::program_options::variables_map& vm) bool simple_wallet::init(const boost::program_options::variables_map& vm)
{ {
bool need_refresh_height = false;
if (!handle_command_line(vm)) if (!handle_command_line(vm))
return false; return false;
@ -1119,8 +1117,6 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
m_wallet_file = m_generate_new; m_wallet_file = m_generate_new;
bool r = new_wallet(vm, m_recovery_key, m_restore_deterministic_wallet, m_non_deterministic, old_language); bool r = new_wallet(vm, m_recovery_key, m_restore_deterministic_wallet, m_non_deterministic, old_language);
CHECK_AND_ASSERT_MES(r, false, tr("account creation failed")); CHECK_AND_ASSERT_MES(r, false, tr("account creation failed"));
if (!m_restore_deterministic_wallet)
need_refresh_height = true;
} }
if (!m_restore_height && m_restoring) if (!m_restore_height && m_restoring)
{ {
@ -1213,14 +1209,6 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
m_http_client.set_server(m_wallet->get_daemon_address(), m_wallet->get_daemon_login()); m_http_client.set_server(m_wallet->get_daemon_address(), m_wallet->get_daemon_login());
m_wallet->callback(this); m_wallet->callback(this);
if (need_refresh_height)
{
// for a totally new account, we don't care about older blocks.
MDEBUG("Calling daemon to set refresh height");
std::string err;
m_wallet->set_refresh_from_block_height(get_daemon_blockchain_height(err));
}
return true; return true;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

5
src/wallet/wallet2.cpp
View file

@ -5010,11 +5010,10 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err)
uint64_t wallet2::get_approximate_blockchain_height() const uint64_t wallet2::get_approximate_blockchain_height() const
{ {
if (m_testnet) return 0;
// time of v2 fork // time of v2 fork
const time_t fork_time = 1458748658; const time_t fork_time = m_testnet ? 1448285909 : 1458748658;
// v2 fork block // v2 fork block
const uint64_t fork_block = 1009827; const uint64_t fork_block = m_testnet ? 624634 : 1009827;
// avg seconds per block // avg seconds per block
const int seconds_per_block = DIFFICULTY_TARGET_V2; const int seconds_per_block = DIFFICULTY_TARGET_V2;
// Calculated blockchain height // Calculated blockchain height