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

Checking and handling for deterministic vs non-deterministic wallet

Browse source 
simple_wallet::seed()

 - Check that wallet is deterministic.

simple_wallet::new_wallet()

 - Prompt for seed language only if it's a non-deterministic wallet,
   along with previous conditions.

simple_wallet::open_wallet()

 - Fixed check for deterministic wallet (flag based on command line
   non-deterministic argument was used before, but it's inapplicable to
   opening an existing wallet).

 - As with deterministic wallet, non-deterministic also included to be
   rewritten to new JSON format file. That's what's done for newly
   generated non-deterministic wallets, so old versions should be
   updated to same format.
This commit is contained in:
warptangent 2014-12-06 01:48:33 -08:00
parent 1beedb9dd4
commit 4c6230d6cf
1 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/simplewallet/simplewallet.cpp
View file

@ -206,16 +206,20 @@ bool simple_wallet::viewkey(const std::vector<std::string> &args/* = std::vector
bool simple_wallet::seed(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::seed(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
bool success = false;
std::string electrum_words; std::string electrum_words;
if (m_wallet->get_seed_language().empty()) if (m_wallet->is_deterministic())
{ {
std::string mnemonic_language = get_mnemonic_language(); if (m_wallet->get_seed_language().empty())
m_wallet->set_seed_language(mnemonic_language); {
std::string mnemonic_language = get_mnemonic_language();
m_wallet->set_seed_language(mnemonic_language);
}
success = m_wallet->get_seed(electrum_words);
} }
bool success = m_wallet->get_seed(electrum_words);
if (success) if (success)
{ {
print_seed(electrum_words); print_seed(electrum_words);
@ -508,9 +512,11 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
crypto::ElectrumWords::get_is_old_style_seed(m_electrum_seed)); crypto::ElectrumWords::get_is_old_style_seed(m_electrum_seed));
std::string mnemonic_language = old_language; std::string mnemonic_language = old_language;
// Ask for seed language if it is not a wallet restore or if it was a deprecated wallet // Ask for seed language if:
// that was earlier used before this restore. // it's a deterministic wallet AND
if (!m_restore_deterministic_wallet || was_deprecated_wallet) // (it is not a wallet restore OR if it was a deprecated wallet
// that was earlier used before this restore)
if ((!two_random) && (!m_restore_deterministic_wallet || was_deprecated_wallet))
{ {
if (was_deprecated_wallet) if (was_deprecated_wallet)
{ {
@ -580,18 +586,28 @@ bool simple_wallet::open_wallet(const string &wallet_file, const std::string& pa
<< m_wallet->get_account().get_public_address_str(m_wallet->testnet()); << m_wallet->get_account().get_public_address_str(m_wallet->testnet());
// If the wallet file is deprecated, we should ask for mnemonic language again and store // If the wallet file is deprecated, we should ask for mnemonic language again and store
// everything in the new format. // everything in the new format.
if (!m_non_deterministic && m_wallet->is_deprecated()) // NOTE: this is_deprecated() refers to the wallet file format before becoming JSON. It does not refer to the "old english" seed words form of "deprecated" used elsewhere.
if (m_wallet->is_deprecated())
{ {
message_writer(epee::log_space::console_color_green, false) << "\nYou had been using " << if (m_wallet->is_deterministic())
"a deprecated version of the wallet. Please proceed to upgrade your wallet.\n"; {
std::string mnemonic_language = get_mnemonic_language(); message_writer(epee::log_space::console_color_green, false) << "\nYou had been using " <<
m_wallet->set_seed_language(mnemonic_language); "a deprecated version of the wallet. Please proceed to upgrade your wallet.\n";
m_wallet->rewrite(m_wallet_file, password); std::string mnemonic_language = get_mnemonic_language();
m_wallet->set_seed_language(mnemonic_language);
m_wallet->rewrite(m_wallet_file, password);
// Display the seed // Display the seed
std::string seed; std::string seed;
m_wallet->get_seed(seed); m_wallet->get_seed(seed);
print_seed(seed); print_seed(seed);
}
else
{
message_writer(epee::log_space::console_color_green, false) << "\nYou had been using " <<
"a deprecated version of the wallet. Your wallet file format is being upgraded now.\n";
m_wallet->rewrite(m_wallet_file, password);
}
} }
} }
catch (const std::exception& e) catch (const std::exception& e)