|
|
|
@ -2988,6 +2988,19 @@ bool simple_wallet::set_track_uses(const std::vector<std::string> &args/* = std:
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool simple_wallet::set_show_wallet_name_when_locked(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
|
|
|
|
|
{
|
|
|
|
|
const auto pwd_container = get_and_verify_password();
|
|
|
|
|
if (pwd_container)
|
|
|
|
|
{
|
|
|
|
|
parse_bool_and_use(args[1], [&](bool r) {
|
|
|
|
|
m_wallet->show_wallet_name_when_locked(r);
|
|
|
|
|
m_wallet->rewrite(m_wallet_file, pwd_container->password());
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool simple_wallet::set_inactivity_lock_timeout(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
|
|
|
|
|
{
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
@ -3431,6 +3444,8 @@ simple_wallet::simple_wallet()
|
|
|
|
|
" Whether to automatically start mining for RPC payment if the daemon requires it.\n"
|
|
|
|
|
"credits-target <unsigned int>\n"
|
|
|
|
|
" The RPC payment credits balance to target (0 for default).\n "
|
|
|
|
|
"show-wallet-name-when-locked <1|0>\n "
|
|
|
|
|
" Set this if you would like to display the wallet name when locked.\n "
|
|
|
|
|
"inactivity-lock-timeout <unsigned int>\n "
|
|
|
|
|
" How many seconds to wait before locking the wallet (0 to disable)."));
|
|
|
|
|
m_cmd_binder.set_handler("encrypted_seed",
|
|
|
|
@ -3836,6 +3851,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
|
|
|
|
|
success_msg_writer() << "setup-background-mining = " << setup_background_mining_string;
|
|
|
|
|
success_msg_writer() << "device-name = " << m_wallet->device_name();
|
|
|
|
|
success_msg_writer() << "export-format = " << (m_wallet->export_format() == tools::wallet2::ExportFormat::Ascii ? "ascii" : "binary");
|
|
|
|
|
success_msg_writer() << "show-wallet-name-when-locked = " << m_wallet->show_wallet_name_when_locked();
|
|
|
|
|
success_msg_writer() << "inactivity-lock-timeout = " << m_wallet->inactivity_lock_timeout()
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
<< " (disabled on Windows)"
|
|
|
|
@ -3903,6 +3919,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("ignore-outputs-above", set_ignore_outputs_above, tr("amount"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("ignore-outputs-below", set_ignore_outputs_below, tr("amount"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("track-uses", set_track_uses, tr("0 or 1"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("show-wallet-name-when-locked", set_show_wallet_name_when_locked, tr("1 or 0"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("inactivity-lock-timeout", set_inactivity_lock_timeout, tr("unsigned integer (seconds, 0 to disable)"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("setup-background-mining", set_setup_background_mining, tr("1/yes or 0/no"));
|
|
|
|
|
CHECK_SIMPLE_VARIABLE("device-name", set_device_name, tr("<device_name[:device_spec]>"));
|
|
|
|
@ -6463,6 +6480,16 @@ void simple_wallet::check_for_inactivity_lock(bool user)
|
|
|
|
|
{
|
|
|
|
|
const char *inactivity_msg = user ? "" : tr("Locked due to inactivity.");
|
|
|
|
|
tools::msg_writer() << inactivity_msg << (inactivity_msg[0] ? " " : "") << tr("The wallet password is required to unlock the console.");
|
|
|
|
|
|
|
|
|
|
const bool show_wallet_name = m_wallet->show_wallet_name_when_locked();
|
|
|
|
|
if (show_wallet_name)
|
|
|
|
|
{
|
|
|
|
|
tools::msg_writer() << tr("Filename: ") << m_wallet->get_wallet_file();
|
|
|
|
|
tools::msg_writer() << tr("Network type: ") << (
|
|
|
|
|
m_wallet->nettype() == cryptonote::TESTNET ? tr("Testnet") :
|
|
|
|
|
m_wallet->nettype() == cryptonote::STAGENET ? tr("Stagenet") : tr("Mainnet")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
if (get_and_verify_password())
|
|
|
|
|