Add simple_wallet::seed_set_language method
Add simple_wallet::set_variable method to provide top-level "set" command and support "set seed language" command.
This commit is contained in:
parent
26b87dfdc2
commit
cfc8c55036
|
@ -231,6 +231,36 @@ bool simple_wallet::seed(const std::vector<std::string> &args/* = std::vector<st
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool simple_wallet::seed_set_language(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
|
||||||
|
{
|
||||||
|
bool success = false;
|
||||||
|
if (!m_wallet->is_deterministic())
|
||||||
|
{
|
||||||
|
fail_msg_writer() << "This wallet is non-deterministic and doesn't have a seed.";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
tools::password_container pwd_container;
|
||||||
|
success = pwd_container.read_password();
|
||||||
|
if (!success)
|
||||||
|
{
|
||||||
|
fail_msg_writer() << "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() << "invalid password";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string mnemonic_language = get_mnemonic_language();
|
||||||
|
m_wallet->set_seed_language(mnemonic_language);
|
||||||
|
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();
|
||||||
|
@ -255,9 +285,39 @@ simple_wallet::simple_wallet()
|
||||||
m_cmd_binder.set_handler("save", boost::bind(&simple_wallet::save, this, _1), "Save wallet synchronized data");
|
m_cmd_binder.set_handler("save", boost::bind(&simple_wallet::save, this, _1), "Save wallet synchronized data");
|
||||||
m_cmd_binder.set_handler("viewkey", boost::bind(&simple_wallet::viewkey, this, _1), "Get viewkey");
|
m_cmd_binder.set_handler("viewkey", boost::bind(&simple_wallet::viewkey, this, _1), "Get viewkey");
|
||||||
m_cmd_binder.set_handler("seed", boost::bind(&simple_wallet::seed, this, _1), "Get deterministic seed");
|
m_cmd_binder.set_handler("seed", boost::bind(&simple_wallet::seed, this, _1), "Get deterministic seed");
|
||||||
|
m_cmd_binder.set_handler("set", boost::bind(&simple_wallet::set_variable, this, _1), "available options: seed language - Set wallet seed langage");
|
||||||
m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), "Show this help");
|
m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), "Show this help");
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
|
bool simple_wallet::set_variable(const std::vector<std::string> &args)
|
||||||
|
{
|
||||||
|
if (args.empty())
|
||||||
|
{
|
||||||
|
fail_msg_writer() << "set: needs an argument. available options: seed";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (args[0] == "seed")
|
||||||
|
{
|
||||||
|
if (args.size() == 1)
|
||||||
|
{
|
||||||
|
fail_msg_writer() << "set seed: needs an argument. available options: language";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (args[1] == "language")
|
||||||
|
{
|
||||||
|
std::vector<std::string> local_args = args;
|
||||||
|
local_args.erase(local_args.begin(), local_args.begin()+2);
|
||||||
|
seed_set_language(local_args);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fail_msg_writer() << "set: unrecognized argument(s)";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
//----------------------------------------------------------------------------------------------------
|
||||||
bool simple_wallet::set_log(const std::vector<std::string> &args)
|
bool simple_wallet::set_log(const std::vector<std::string> &args)
|
||||||
{
|
{
|
||||||
if(args.size() != 1)
|
if(args.size() != 1)
|
||||||
|
|
|
@ -81,6 +81,17 @@ namespace cryptonote
|
||||||
|
|
||||||
bool viewkey(const std::vector<std::string> &args = std::vector<std::string>());
|
bool viewkey(const std::vector<std::string> &args = std::vector<std::string>());
|
||||||
bool seed(const std::vector<std::string> &args = std::vector<std::string>());
|
bool seed(const std::vector<std::string> &args = std::vector<std::string>());
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Sets seed language.
|
||||||
|
*
|
||||||
|
* interactive
|
||||||
|
* - prompts for password so wallet can be rewritten
|
||||||
|
* - calls get_mnemonic_language() which prompts for language
|
||||||
|
*
|
||||||
|
* \return success status
|
||||||
|
*/
|
||||||
|
bool seed_set_language(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);
|
||||||
|
@ -96,6 +107,7 @@ namespace cryptonote
|
||||||
);
|
);
|
||||||
bool print_address(const std::vector<std::string> &args = std::vector<std::string>());
|
bool print_address(const std::vector<std::string> &args = std::vector<std::string>());
|
||||||
bool save(const std::vector<std::string> &args);
|
bool save(const std::vector<std::string> &args);
|
||||||
|
bool set_variable(const std::vector<std::string> &args);
|
||||||
bool set_log(const std::vector<std::string> &args);
|
bool set_log(const std::vector<std::string> &args);
|
||||||
|
|
||||||
uint64_t get_daemon_blockchain_height(std::string& err);
|
uint64_t get_daemon_blockchain_height(std::string& err);
|
||||||
|
|
Loading…
Reference in New Issue