Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wallet fixes #94

Merged
merged 1 commit into from Aug 17, 2018
Merged

Wallet fixes #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/crypto/crypto.cpp
View file
Open in desktop
Expand Up @@ -171,11 +171,13 @@ void generate_wallet_secret(secret_key_16 &wallet_secret)

void generate_wallet_keys(public_key &pub, secret_key &sec, const secret_key_16 &wallet_secret, uint32_t key_variant)
{
#pragma pack(push, 1)
struct hash_secret
{
uint32_t variant;
scalar_16 secret;
};
#pragma pack(pop)

tools::scrubbed<hash_secret> hs;
unwrap(hs).secret = unwrap(wallet_secret);
Expand Down
41 changes: 19 additions & 22 deletions src/simplewallet/simplewallet.cpp
View file
Open in desktop
Expand Up @@ -2748,7 +2748,7 @@ bool simple_wallet::init(const boost::program_options::variables_map &vm)
fail_msg_writer() << tr("failed to parse spend key secret key");
return false;
}
bool r = restore_legacy_wallet(vm, recovery_key);
bool r = restore_legacy_wallet(vm, get_mnemonic_language(false), recovery_key);
CHECK_AND_ASSERT_MES(r, false, tr("account creation failed"));
}
else if(!m_generate_from_keys.empty())
Expand Down Expand Up @@ -3023,14 +3023,14 @@ bool simple_wallet::init(const boost::program_options::variables_map &vm)
if(m_electrum_seed.empty())
{
std::string kurz_addr = input_line(tr("Would you like to use a shorter address format without a viewkey? (Y/Yes/N/No): "));
r = new_wallet(vm, nullptr, command_line::is_yes(kurz_addr) ? cryptonote::ACC_OPT_KURZ_ADDRESS : cryptonote::ACC_OPT_LONG_ADDRESS);
r = new_wallet(vm, get_mnemonic_language(false), nullptr, command_line::is_yes(kurz_addr) ? cryptonote::ACC_OPT_KURZ_ADDRESS : cryptonote::ACC_OPT_LONG_ADDRESS);
}
else
{
if(m_restore_multisig_wallet)
r = new_wallet_msig(vm, seed_pass, multisig_keys);
else
r = new_wallet(vm, m_electrum_seed);
r = new_wallet_from_seed(vm, m_electrum_seed);
}
CHECK_AND_ASSERT_MES(r, false, tr("account creation failed"));
}
Expand Down Expand Up @@ -3286,7 +3286,7 @@ boost::optional<tools::password_container> simple_wallet::get_and_verify_passwor
return pwd_container;
}
//----------------------------------------------------------------------------------------------------
bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm, std::string seed)
bool simple_wallet::new_wallet_from_seed(const boost::program_options::variables_map &vm, std::string seed)
{
//Zap any stray newlines in the seed
std::replace(seed.begin(), seed.end(), '\n', ' ');
Expand All @@ -3304,6 +3304,15 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm,
if(wseed.size() == 12 || wseed.size() == 14)
{
decode_14 = crypto::Electrum14Words::words_to_bytes(seed, seed_14, seed_extra, language);

if(wseed.size() == 12)
{
std::string kurz_addr = input_line(tr("Was the wallet created as a kurz address? (Y/Yes/N/No): "));
if(command_line::is_yes(kurz_addr))
seed_extra = cryptonote::ACC_OPT_KURZ_ADDRESS;
else
seed_extra = cryptonote::ACC_OPT_LONG_ADDRESS;
}
}
else if(wseed.size() >= 24 && wseed.size() <= 26)
{
Expand All @@ -3321,12 +3330,10 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm,
return false;
}

m_wallet->set_seed_language(language);

if(decode_14)
return new_wallet(vm, &seed_14, seed_extra);
return new_wallet(vm, language, &seed_14, seed_extra);
else
return restore_legacy_wallet(vm, seed_25);
return restore_legacy_wallet(vm, language, seed_25);
}

std::pair<std::unique_ptr<tools::wallet2>, tools::password_container> simple_wallet::make_new_wrapped(const boost::program_options::variables_map &vm,
Expand All @@ -3344,7 +3351,7 @@ std::pair<std::unique_ptr<tools::wallet2>, tools::password_container> simple_wal
}

//----------------------------------------------------------------------------------------------------
bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm, const crypto::secret_key_16 *seed, uint8_t seed_extra)
bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm, const std::string& seed_lang, const crypto::secret_key_16 *seed, uint8_t seed_extra)
{
auto rc = make_new_wrapped(vm, password_prompter);
m_wallet = std::move(rc.first);
Expand All @@ -3360,12 +3367,7 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm,
m_wallet->set_subaddress_lookahead(lookahead->first, lookahead->second);
}

if(m_wallet->get_seed_language().empty())
{
m_wallet->set_seed_language(get_mnemonic_language(false));
if(m_wallet->get_seed_language().empty())
return false;
}
m_wallet->set_seed_language(seed_lang);

bool create_address_file = command_line::get_arg(vm, arg_create_address_file);

Expand Down Expand Up @@ -3407,7 +3409,7 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map &vm,
return true;
}

bool simple_wallet::restore_legacy_wallet(const boost::program_options::variables_map &vm, const crypto::secret_key &seed_legacy)
bool simple_wallet::restore_legacy_wallet(const boost::program_options::variables_map &vm, const std::string& seed_lang, const crypto::secret_key &seed_legacy)
{
auto rc = make_new_wrapped(vm, password_prompter);
m_wallet = std::move(rc.first);
Expand All @@ -3423,12 +3425,7 @@ bool simple_wallet::restore_legacy_wallet(const boost::program_options::variable
m_wallet->set_subaddress_lookahead(lookahead->first, lookahead->second);
}

if(m_wallet->get_seed_language().empty())
{
m_wallet->set_seed_language(get_mnemonic_language(false));
if(m_wallet->get_seed_language().empty())
return false;
}
m_wallet->set_seed_language(seed_lang);

bool create_address_file = command_line::get_arg(vm, arg_create_address_file);

Expand Down
6 changes: 3 additions & 3 deletions src/simplewallet/simplewallet.h
View file
Open in desktop
Expand Up @@ -110,9 +110,9 @@ class simple_wallet : public tools::i_wallet2_callback
std::pair<std::unique_ptr<tools::wallet2>, tools::password_container> make_new_wrapped(const boost::program_options::variables_map &vm,
const std::function<boost::optional<tools::password_container>(const char *, bool)> &password_prompter);

bool new_wallet(const boost::program_options::variables_map &vm, std::string seed);
bool new_wallet(const boost::program_options::variables_map &vm, const crypto::secret_key_16 *seed = nullptr, uint8_t seed_extra = cryptonote::ACC_OPT_LONG_ADDRESS);
bool restore_legacy_wallet(const boost::program_options::variables_map &vm, const crypto::secret_key &seed_legacy);
bool new_wallet_from_seed(const boost::program_options::variables_map &vm, std::string seed);
bool new_wallet(const boost::program_options::variables_map &vm, const std::string& seed_lang, const crypto::secret_key_16 *seed = nullptr, uint8_t seed_extra = cryptonote::ACC_OPT_LONG_ADDRESS);
bool restore_legacy_wallet(const boost::program_options::variables_map &vm, const std::string& seed_lang, const crypto::secret_key &seed_legacy);

bool new_wallet(const boost::program_options::variables_map &vm, const cryptonote::account_public_address &address,
const boost::optional<crypto::secret_key> &spendkey, const crypto::secret_key &viewkey);
Expand Down