From 95e784ad00adadc858858f4ddba8047994ac1f17 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 14 Nov 2017 20:29:05 +0000 Subject: [PATCH 1/3] Fix 437421ce42f1deaa7ec3f28c0c17aff519f1230d Missing an error argument for an exception --- src/wallet/wallet2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f6361ee37..c6db45dc9 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -296,7 +296,7 @@ std::unique_ptr generate_from_json(const std::string& json_file, // compatibility checks 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)) { From b85e82bf6a0c4e0598e29b92a9cc9437bb666360 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 14 Nov 2017 20:34:32 +0000 Subject: [PATCH 2/3] Fix e89994e98f85be95d68c7bf471fcadf9aabbc93a Missed an input_line() change --- src/simplewallet/simplewallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 19a0614ec..699690ac3 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1270,7 +1270,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) { m_wallet_file = m_generate_from_spend_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()) return false; if (spendkey_string.empty()) { From 29cee4ec4fade9e7a60b18c6d1ba2984d624a2f0 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 14 Nov 2017 20:35:30 +0000 Subject: [PATCH 3/3] Fix 383ff4f68943c5d998fba8caa20aee481583f214 Missed a crypto::null_pkey in PR#2629 --- src/simplewallet/simplewallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 699690ac3..abf2f2aef 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3752,7 +3752,7 @@ bool simple_wallet::get_tx_proof(const std::vector &args) // fetch tx pubkey 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"); return true;