Merge pull request #346

8fe180a wallet: add boolean to always confirm transactions with the user (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-07-18 23:56:44 +02:00
commit 107eeaf6c5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 82 additions and 6 deletions

View file

@ -37,6 +37,7 @@
#include <thread> #include <thread>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <ctype.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@ -193,6 +194,20 @@ namespace
{ {
return message_writer(epee::log_space::console_color_red, true, sw::tr("Error: "), LOG_LEVEL_0); return message_writer(epee::log_space::console_color_red, true, sw::tr("Error: "), LOG_LEVEL_0);
} }
bool is_it_true(std::string s)
{
std::transform(s.begin(), s.end(), s.begin(), ::tolower);
if (s == "true")
return true;
if (s == "1")
return true;
if (s == "y" || s == "yes")
return true;
if (s == sw::tr("yes"))
return true;
return false;
}
} }
@ -290,6 +305,35 @@ bool simple_wallet::seed_set_language(const std::vector<std::string> &args/* = s
return true; return true;
} }
bool simple_wallet::set_always_confirm_transfers(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{
bool success = false;
if (m_wallet->watch_only())
{
fail_msg_writer() << tr("This wallet is watch-only and cannot transfer.");
return true;
}
tools::password_container pwd_container;
success = pwd_container.read_password();
if (!success)
{
fail_msg_writer() << tr("failed to read wallet password");
return true;
}
/* verify password before using so user doesn't accidentally set a new password for rewritten wallet */
success = m_wallet->verify_password(pwd_container.password());
if (!success)
{
fail_msg_writer() << tr("invalid password");
return true;
}
m_wallet->always_confirm_transfers(is_it_true(args[1]));
m_wallet->rewrite(m_wallet_file, pwd_container.password());
return true;
}
bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
success_msg_writer() << get_commands_str(); success_msg_writer() << get_commands_str();
@ -318,7 +362,7 @@ simple_wallet::simple_wallet()
m_cmd_binder.set_handler("viewkey", boost::bind(&simple_wallet::viewkey, this, _1), tr("Get viewkey")); m_cmd_binder.set_handler("viewkey", boost::bind(&simple_wallet::viewkey, this, _1), tr("Get viewkey"));
m_cmd_binder.set_handler("spendkey", boost::bind(&simple_wallet::spendkey, this, _1), tr("Get spendkey")); m_cmd_binder.set_handler("spendkey", boost::bind(&simple_wallet::spendkey, this, _1), tr("Get spendkey"));
m_cmd_binder.set_handler("seed", boost::bind(&simple_wallet::seed, this, _1), tr("Get deterministic seed")); m_cmd_binder.set_handler("seed", boost::bind(&simple_wallet::seed, this, _1), tr("Get deterministic seed"));
m_cmd_binder.set_handler("set", boost::bind(&simple_wallet::set_variable, this, _1), tr("available options: seed language - Set wallet seed langage")); m_cmd_binder.set_handler("set", boost::bind(&simple_wallet::set_variable, this, _1), tr("available options: seed language - Set wallet seed langage; always-confirm-transfers <1|0> - whether to confirm unsplit txes"));
m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), tr("Show this help")); m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), tr("Show this help"));
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
@ -326,7 +370,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
{ {
if (args.empty()) if (args.empty())
{ {
fail_msg_writer() << tr("set: needs an argument. available options: seed"); fail_msg_writer() << tr("set: needs an argument. available options: seed, always-confirm-transfers");
return true; return true;
} }
else else
@ -346,6 +390,21 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
return true; return true;
} }
} }
else if (args[0] == "always-confirm-transfers")
{
if (args.size() <= 1)
{
fail_msg_writer() << tr("set always-confirm-transfers: needs an argument (0 or 1)");
return true;
}
else
{
std::vector<std::string> local_args = args;
local_args.erase(local_args.begin(), local_args.begin()+2);
set_always_confirm_transfers(local_args);
return true;
}
}
} }
fail_msg_writer() << tr("set: unrecognized argument(s)"); fail_msg_writer() << tr("set: unrecognized argument(s)");
return true; return true;
@ -1354,11 +1413,17 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
auto ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra); auto ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra);
// if more than one tx necessary, prompt user to confirm // if more than one tx necessary, prompt user to confirm
if (ptx_vector.size() > 1) if (m_wallet->always_confirm_transfers() || ptx_vector.size() > 1)
{ {
uint64_t total_fee = 0;
for (size_t n = 0; n < ptx_vector.size(); ++n)
{
total_fee += ptx_vector[n].fee;
}
std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. " std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. "
"This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No)")) % "This will result in a transaction fee being applied to each transaction, for a total fee of %s. Is this okay? (Y/Yes/N/No)")) %
ptx_vector.size()).str(); ptx_vector.size() % print_money(total_fee)).str();
std::string accepted = command_line::input_line(prompt_str); std::string accepted = command_line::input_line(prompt_str);
if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes") if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes")
{ {

View file

@ -98,6 +98,7 @@ namespace cryptonote
* \return success status * \return success status
*/ */
bool seed_set_language(const std::vector<std::string> &args = std::vector<std::string>()); bool seed_set_language(const std::vector<std::string> &args = std::vector<std::string>());
bool set_always_confirm_transfers(const std::vector<std::string> &args = std::vector<std::string>());
bool help(const std::vector<std::string> &args = std::vector<std::string>()); bool help(const std::vector<std::string> &args = std::vector<std::string>());
bool start_mining(const std::vector<std::string> &args); bool start_mining(const std::vector<std::string> &args);
bool stop_mining(const std::vector<std::string> &args); bool stop_mining(const std::vector<std::string> &args);

View file

@ -502,6 +502,9 @@ bool wallet2::store_keys(const std::string& keys_file_name, const std::string& p
value2.SetInt(watch_only ? 1 :0); // WTF ? JSON has different true and false types, and not boolean ?? value2.SetInt(watch_only ? 1 :0); // WTF ? JSON has different true and false types, and not boolean ??
json.AddMember("watch_only", value2, json.GetAllocator()); json.AddMember("watch_only", value2, json.GetAllocator());
value2.SetInt(m_always_confirm_transfers ? 1 :0);
json.AddMember("always_confirm_transfers", value2, json.GetAllocator());
// Serialize the JSON object // Serialize the JSON object
rapidjson::StringBuffer buffer; rapidjson::StringBuffer buffer;
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer); rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
@ -562,6 +565,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
{ {
is_old_file_format = true; is_old_file_format = true;
m_watch_only = false; m_watch_only = false;
m_always_confirm_transfers = false;
} }
else else
{ {
@ -580,6 +584,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
{ {
m_watch_only = false; m_watch_only = false;
} }
m_always_confirm_transfers = json.HasMember("always_confirm_transfers") && (json["always_confirm_transfers"].GetInt() != 0);
} }
const cryptonote::account_keys& keys = m_account.get_keys(); const cryptonote::account_keys& keys = m_account.get_keys();

View file

@ -80,7 +80,7 @@ namespace tools
class wallet2 class wallet2
{ {
wallet2(const wallet2&) : m_run(true), m_callback(0), m_testnet(false) {}; wallet2(const wallet2&) : m_run(true), m_callback(0), m_testnet(false), m_always_confirm_transfers (false) {};
public: public:
wallet2(bool testnet = false, bool restricted = false) : m_run(true), m_callback(0), m_testnet(testnet), m_restricted(restricted), is_old_file_format(false) {}; wallet2(bool testnet = false, bool restricted = false) : m_run(true), m_callback(0), m_testnet(testnet), m_restricted(restricted), is_old_file_format(false) {};
struct transfer_details struct transfer_details
@ -266,6 +266,10 @@ namespace tools
static std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec_valid); static std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec_valid);
static std::string address_from_txt_record(const std::string& s); static std::string address_from_txt_record(const std::string& s);
bool always_confirm_transfers() const { return m_always_confirm_transfers; }
void always_confirm_transfers(bool always) { m_always_confirm_transfers = always; }
private: private:
/*! /*!
* \brief Stores wallet information to wallet file. * \brief Stores wallet information to wallet file.
@ -319,6 +323,7 @@ namespace tools
std::string seed_language; /*!< Language of the mnemonics (seed). */ std::string seed_language; /*!< Language of the mnemonics (seed). */
bool is_old_file_format; /*!< Whether the wallet file is of an old file format */ bool is_old_file_format; /*!< Whether the wallet file is of an old file format */
bool m_watch_only; /*!< no spend key */ bool m_watch_only; /*!< no spend key */
bool m_always_confirm_transfers;
}; };
} }
BOOST_CLASS_VERSION(tools::wallet2, 7) BOOST_CLASS_VERSION(tools::wallet2, 7)