Merge pull request #2724

cb23be8f Wallet API: always use approximate calc of blockchain height (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-10-25 15:26:58 +02:00
commit c328163ffa
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -1387,13 +1387,6 @@ bool WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction
if (!m_wallet->init(daemon_address, m_daemon_login, upper_transaction_size_limit))
return false;
// in case new wallet, this will force fast-refresh (pulling hashes instead of blocks)
// If daemon isn't synced a calculated block height will be used instead
if (isNewWallet() && daemonSynced()) {
LOG_PRINT_L2(__FUNCTION__ << ":New Wallet - fast refresh until " << daemonBlockChainHeight());
m_wallet->set_refresh_from_block_height(daemonBlockChainHeight());
}
if (m_rebuildWalletCache)
LOG_PRINT_L2(__FUNCTION__ << ": Rebuilding wallet cache, fast refresh until block " << m_wallet->get_refresh_from_block_height());