nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2813

Browse Source 
29cee4ec Fix 383ff4f689 (Howard Chu)
b85e82bf Fix e89994e98f (Howard Chu)
95e784ad Fix 437421ce42 (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-11-14 22:40:04 +02:00
commit e35162b366
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View File

@ -1270,7 +1270,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
{ {
m_wallet_file = m_generate_from_spend_key; m_wallet_file = m_generate_from_spend_key;
// parse spend secret key // parse spend secret key
std::string spendkey_string = command_line::input_line("Secret spend key: "); std::string spendkey_string = input_line("Secret spend key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (spendkey_string.empty()) { if (spendkey_string.empty()) {
@ -3752,7 +3752,7 @@ bool simple_wallet::get_tx_proof(const std::vector<std::string> &args)
// fetch tx pubkey // fetch tx pubkey
crypto::public_key tx_pub_key = get_tx_pub_key_from_extra(tx); crypto::public_key tx_pub_key = get_tx_pub_key_from_extra(tx);
if (tx_pub_key == null_pkey) if (tx_pub_key == crypto::null_pkey)
{ {
fail_msg_writer() << tr("Tx pubkey was not found"); fail_msg_writer() << tr("Tx pubkey was not found");
return true; return true;

2
src/wallet/wallet2.cpp
View File

@ -296,7 +296,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
// compatibility checks // compatibility checks
if (!field_seed_found && !field_viewkey_found && !field_spendkey_found) if (!field_seed_found && !field_viewkey_found && !field_spendkey_found)
{ {
THROW_WALLET_EXCEPTION(tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified")); THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified"));
} }
if (field_seed_found && (field_viewkey_found || field_spendkey_found)) if (field_seed_found && (field_viewkey_found || field_spendkey_found))
{ {