mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-26 17:32:33 +00:00
wallet2::load correctly initialize m_blockchain for wallet loaded without bin file
Fix for simplewallet loading a wallet with a keys file but no bin file. - this situation previously required a user to restart simplewallet before it would refresh its blockchain from the server.
This commit is contained in:
parent
efad735145
commit
9b7e0a06b5
1 changed files with 9 additions and 7 deletions
|
@ -686,14 +686,16 @@ void wallet2::load(const std::string& wallet_, const std::string& password)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("file not found: " << m_wallet_file << ", starting with empty blockchain");
|
LOG_PRINT_L0("file not found: " << m_wallet_file << ", starting with empty blockchain");
|
||||||
m_account_public_address = m_account.get_keys().m_account_address;
|
m_account_public_address = m_account.get_keys().m_account_address;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
bool r = tools::unserialize_obj_from_file(*this, m_wallet_file);
|
bool r = tools::unserialize_obj_from_file(*this, m_wallet_file);
|
||||||
THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, m_wallet_file);
|
THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, m_wallet_file);
|
||||||
THROW_WALLET_EXCEPTION_IF(
|
THROW_WALLET_EXCEPTION_IF(
|
||||||
m_account_public_address.m_spend_public_key != m_account.get_keys().m_account_address.m_spend_public_key ||
|
m_account_public_address.m_spend_public_key != m_account.get_keys().m_account_address.m_spend_public_key ||
|
||||||
m_account_public_address.m_view_public_key != m_account.get_keys().m_account_address.m_view_public_key,
|
m_account_public_address.m_view_public_key != m_account.get_keys().m_account_address.m_view_public_key,
|
||||||
error::wallet_files_doesnt_correspond, m_keys_file, m_wallet_file);
|
error::wallet_files_doesnt_correspond, m_keys_file, m_wallet_file);
|
||||||
|
}
|
||||||
|
|
||||||
cryptonote::block genesis;
|
cryptonote::block genesis;
|
||||||
generate_genesis(genesis);
|
generate_genesis(genesis);
|
||||||
|
|
Loading…
Reference in a new issue