diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-07-03 12:30:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-07-03 12:30:16 +0200 |
| commit | 44e4bbd15cf5a70126b9e31d39be15e97708f232 (patch) | |
| tree | e519caeab780ff7fa891911bb7b60f19c17a6792 /src/simplewallet | |
| parent | Merge pull request #2123 (diff) | |
| parent | wallet2: get current height from the daemon on creation (diff) | |
| download | monero-44e4bbd15cf5a70126b9e31d39be15e97708f232.tar.xz | |
Merge pull request #2124
3b599d2b wallet2: get current height from the daemon on creation (moneromooo-monero)
d3bb72ff wallet2: fix infinite loop on future refresh height (moneromooo-monero)
32754784 wallet: fix refresh_from_height setting on new wallet (moneromooo-monero)
Diffstat (limited to 'src/simplewallet')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 221a66e91..6d5ebc25a 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -929,8 +929,6 @@ static bool might_be_partial_seed(std::string words) //---------------------------------------------------------------------------------------------------- bool simple_wallet::init(const boost::program_options::variables_map& vm) { - bool need_refresh_height = false; - if (!handle_command_line(vm)) return false; @@ -1128,8 +1126,6 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) m_wallet_file = m_generate_new; 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")); - if (!m_restore_deterministic_wallet) - need_refresh_height = true; } if (!m_restore_height && m_restoring) { @@ -1222,14 +1218,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_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; } //---------------------------------------------------------------------------------------------------- |