diff options
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 77 |
1 files changed, 41 insertions, 36 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 39bf169f3..8202ad8ef 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -189,7 +189,7 @@ namespace const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", sw::tr("Generate non-deterministic view and spend keys"), false}; const command_line::arg_descriptor<uint64_t> arg_restore_height = {"restore-height", sw::tr("Restore from specific blockchain height"), 0}; const command_line::arg_descriptor<std::string> arg_restore_date = {"restore-date", sw::tr("Restore from estimated blockchain height on specified date"), ""}; - const command_line::arg_descriptor<bool> arg_do_not_relay = {"do-not-relay", sw::tr("The newly created transaction will not be relayed to the monero network"), false}; + const command_line::arg_descriptor<bool> arg_do_not_relay = {"do-not-relay", sw::tr("The newly created transaction will not be relayed to the Monzero network"), false}; const command_line::arg_descriptor<bool> arg_create_address_file = {"create-address-file", sw::tr("Create an address file for new wallets"), false}; const command_line::arg_descriptor<std::string> arg_subaddress_lookahead = {"subaddress-lookahead", tools::wallet2::tr("Set subaddress lookahead sizes to <major>:<minor>"), ""}; const command_line::arg_descriptor<bool> arg_use_english_language_names = {"use-english-language-names", sw::tr("Display English language names"), false}; @@ -526,7 +526,7 @@ namespace std::stringstream prompt; prompt << sw::tr("For URL: ") << url << ", " << dnssec_str << std::endl - << sw::tr(" Monero Address = ") << addresses[0] + << sw::tr(" Monzero Address = ") << addresses[0] << std::endl << sw::tr("Is this OK?") ; @@ -2361,25 +2361,25 @@ bool simple_wallet::public_nodes(const std::vector<std::string> &args) bool simple_wallet::welcome(const std::vector<std::string> &args) { - message_writer() << tr("Welcome to Monero, the private cryptocurrency."); + message_writer() << tr("Welcome to Monzero, the private cryptocurrency."); message_writer() << ""; - message_writer() << tr("Monero, like Bitcoin, is a cryptocurrency. That is, it is digital money."); - message_writer() << tr("Unlike Bitcoin, your Monero transactions and balance stay private and are not visible to the world by default."); + message_writer() << tr("Monzero, like Bitcoin, is a cryptocurrency. That is, it is digital money."); + message_writer() << tr("Unlike Bitcoin, your Monzero transactions and balance stay private and are not visible to the world by default."); message_writer() << tr("However, you have the option of making those available to select parties if you choose to."); message_writer() << ""; - message_writer() << tr("Monero protects your privacy on the blockchain, and while Monero strives to improve all the time,"); - message_writer() << tr("no privacy technology can be 100% perfect, Monero included."); - message_writer() << tr("Monero cannot protect you from malware, and it may not be as effective as we hope against powerful adversaries."); - message_writer() << tr("Flaws in Monero may be discovered in the future, and attacks may be developed to peek under some"); - message_writer() << tr("of the layers of privacy Monero provides. Be safe and practice defense in depth."); + message_writer() << tr("Monzero protects your privacy on the blockchain, and while Monzero strives to improve all the time,"); + message_writer() << tr("no privacy technology can be 100% perfect, Monzero included."); + message_writer() << tr("Monzero cannot protect you from malware, and it may not be as effective as we hope against powerful adversaries."); + message_writer() << tr("Flaws in Monzero may be discovered in the future, and attacks may be developed to peek under some"); + message_writer() << tr("of the layers of privacy Monzero provides. Be safe and practice defense in depth."); message_writer() << ""; - message_writer() << tr("Welcome to Monero and financial privacy. For more information see https://GetMonero.org"); + message_writer() << tr("Welcome to Monzero and financial privacy. For more information see https://monzero.org"); return true; } bool simple_wallet::version(const std::vector<std::string> &args) { - message_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; + message_writer() << "Monzero '" << MONERO_RELEASE_NAME << "' (core v" << MONERO_VERSION_FULL << ")"; return true; } @@ -2715,15 +2715,15 @@ bool simple_wallet::set_unit(const std::vector<std::string> &args/* = std::vecto const std::string &unit = args[1]; unsigned int decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT; - if (unit == "monero") + if (unit == "monzero" || unit == "XMZ") decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT; - else if (unit == "millinero") + else if (unit == "millizero" || unit == "mXMZ") decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 3; - else if (unit == "micronero") + else if (unit == "microzero" || unit == "uXMZ") decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 6; - else if (unit == "nanonero") + else if (unit == "nanozero" || unit == "nXMZ") decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 9; - else if (unit == "piconero") + else if (unit == "atomic-XMZ") decimal_point = 0; else { @@ -3278,7 +3278,7 @@ bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<st message_writer() << tr("\"show_transfers [in|out|pending|failed|pool]\" - Show transactions."); message_writer() << tr("\"sweep_all <address>\" - Send whole balance to another wallet."); message_writer() << tr("\"seed\" - Show secret 25 words that can be used to recover this wallet."); - message_writer() << tr("\"refresh\" - Synchronize wallet with the Monero network."); + message_writer() << tr("\"refresh\" - Synchronize wallet with the Monzero network."); message_writer() << tr("\"status\" - Check current status of wallet."); message_writer() << tr("\"version\" - Check software version."); message_writer() << tr("\"exit\" - Exit wallet."); @@ -3445,7 +3445,7 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("donate", boost::bind(&simple_wallet::on_command, this, &simple_wallet::donate, _1), tr(USAGE_DONATE), - tr("Donate <amount> to the development team (donate.getmonero.org).")); + tr("Donations are not configured for this Monzero release.")); m_cmd_binder.set_handler("sign_transfer", boost::bind(&simple_wallet::on_command, this, &simple_wallet::sign_transfer, _1), tr(USAGE_SIGN_TRANSFER), @@ -3520,8 +3520,8 @@ simple_wallet::simple_wallet() "ask-password <0|1|2 (or never|action|decrypt)>\n " " action: ask the password before many actions such as transfer, etc\n " " decrypt: same as action, but keeps the spend key encrypted in memory when not needed\n " - "unit <monero|millinero|micronero|nanonero|piconero>\n " - " Set the default monero (sub-)unit.\n " + "unit <monzero|XMZ|millizero|mXMZ|microzero|uXMZ|nanozero|nXMZ|atomic-XMZ>\n " + " Set the default Monzero (sub-)unit.\n " "min-outputs-count [n]\n " " Try to keep at least that many outputs of value at least min-outputs-value.\n " "min-outputs-value [n]\n " @@ -3557,7 +3557,7 @@ simple_wallet::simple_wallet() "background-sync <off|reuse-wallet-password|custom-background-password>\n " " Set this to enable scanning in the background with just the view key while the wallet is locked.\n " "setup-background-mining <1|0>\n " - " Whether to enable background mining. Set this to support the network and to get a chance to receive new monero.\n " + " Whether to enable background mining. Set this to support the network and to get a chance to receive new XMZ.\n " "device-name <device_name[:device_spec]>\n " " Device name for hardware wallet.\n " "export-format <\"binary\"|\"ascii\">\n " @@ -3758,7 +3758,7 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("mms signer", boost::bind(&simple_wallet::on_command, this, &simple_wallet::mms, _1), tr(USAGE_MMS_SIGNER), - tr("Set or modify authorized signer info (single-word label, transport address, Monero address), or list all signers")); + tr("Set or modify authorized signer info (single-word label, transport address, Monzero address), or list all signers")); m_cmd_binder.set_handler("mms list", boost::bind(&simple_wallet::on_command, this, &simple_wallet::mms, _1), tr(USAGE_MMS_LIST), @@ -3883,7 +3883,7 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("welcome", boost::bind(&simple_wallet::on_command, this, &simple_wallet::welcome, _1), tr(USAGE_WELCOME), - tr("Prints basic info about Monero for first time users")); + tr("Prints basic info about Monzero for first time users")); m_cmd_binder.set_handler("version", boost::bind(&simple_wallet::on_command, this, &simple_wallet::version, _1), tr(USAGE_VERSION), @@ -4029,7 +4029,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args) CHECK_SIMPLE_VARIABLE("refresh-type", set_refresh_type, tr("full (slowest, no assumptions); optimize-coinbase (fast, assumes the whole coinbase is paid to a single address); no-coinbase (fastest, assumes we receive no coinbase transaction), default (same as optimize-coinbase)")); CHECK_SIMPLE_VARIABLE("priority", set_default_priority, tr("0, 1, 2, 3, or 4, or one of ") << join_priority_strings(", ")); CHECK_SIMPLE_VARIABLE("ask-password", set_ask_password, tr("0|1|2 (or never|action|decrypt)")); - CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("monero, millinero, micronero, nanonero, piconero")); + CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("monzero, XMZ, millizero, mXMZ, microzero, uXMZ, nanozero, nXMZ, atomic-XMZ")); CHECK_SIMPLE_VARIABLE("max-reorg-depth", set_max_reorg_depth, tr("unsigned integer")); CHECK_SIMPLE_VARIABLE("min-outputs-count", set_min_output_count, tr("unsigned integer")); CHECK_SIMPLE_VARIABLE("min-outputs-value", set_min_output_value, tr("amount")); @@ -4844,7 +4844,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) bool ssl = false; if (m_wallet->check_connection(NULL, &ssl) && !ssl) message_writer(console_color_red, true) << boost::format(tr("Using your own without SSL exposes your RPC traffic to monitoring")); - message_writer(console_color_red, true) << boost::format(tr("You are strongly encouraged to connect to the Monero network using your own daemon")); + message_writer(console_color_red, true) << boost::format(tr("You are strongly encouraged to connect to the Monzero network using your own daemon")); message_writer(console_color_red, true) << boost::format(tr("If you or someone you trust are operating this daemon, you can use --trusted-daemon")); COMMAND_RPC_GET_INFO::request req; @@ -4865,7 +4865,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) check_background_mining(password); if (welcome) - message_writer(console_color_yellow, true) << tr("If you are new to Monero, type \"welcome\" for a brief overview."); + message_writer(console_color_yellow, true) << tr("If you are new to Monzero, type \"welcome\" for a brief overview."); m_last_activity_time = time(NULL); return true; @@ -5099,7 +5099,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr "Use the \"help\" command to see a simplified list of available commands.\n" "Use \"help all\" command to see the list of all available commands.\n" "Use \"help <command>\" to see a command's documentation.\n" - "Always use the \"exit\" command when closing monero-wallet-cli to save \n" + "Always use the \"exit\" command when closing monzero-wallet-cli to save \n" "your current session's state. Otherwise, you might need to synchronize \n" "your wallet again (your wallet keys are NOT at risk in any case).\n") ; @@ -5484,7 +5484,7 @@ void simple_wallet::start_background_mining() return; } } - success_msg_writer() << tr("Background mining enabled. Thank you for supporting the Monero network."); + success_msg_writer() << tr("Background mining enabled. Thank you for supporting the Monzero network."); } //---------------------------------------------------------------------------------------------------- void simple_wallet::stop_background_mining() @@ -5560,7 +5560,7 @@ void simple_wallet::check_background_mining(const epee::wipeable_string &passwor { message_writer() << tr("The daemon is not set up to background mine."); message_writer() << tr("With background mining enabled, the daemon will mine when idle and not on battery."); - message_writer() << tr("Enabling this supports the network you are using, and makes you eligible for receiving new monero"); + message_writer() << tr("Enabling this supports the network you are using, and makes you eligible for receiving new XMZ"); std::string accepted = input_line(tr("Do you want to do it now? (Y/Yes/N/No): ")); if (std::cin.eof() || !command_line::is_yes(accepted)) { m_wallet->setup_background_mining(tools::wallet2::BackgroundMiningNo); @@ -6625,7 +6625,7 @@ void simple_wallet::check_for_inactivity_lock(bool user) m_in_command = true; if (!user) { - const std::string speech = tr("I locked your Monero wallet to protect you while you were away\nsee \"help set\" to configure/disable"); + const std::string speech = tr("I locked your Monzero wallet to protect you while you were away\nsee \"help set\" to configure/disable"); std::vector<std::pair<std::string, size_t>> lines = tools::split_string_by_width(speech, 45); size_t max_len = 0; @@ -7828,6 +7828,10 @@ bool simple_wallet::sweep_below(const std::vector<std::string> &args_) //---------------------------------------------------------------------------------------------------- bool simple_wallet::donate(const std::vector<std::string> &args_) { + (void)args_; + fail_msg_writer() << tr("Donations are not configured for this Monzero release."); + return true; +#if 0 CHECK_IF_BACKGROUND_SYNCING("cannot donate"); std::vector<std::string> local_args = args_; if(local_args.empty() || local_args.size() > 5) @@ -7886,6 +7890,7 @@ bool simple_wallet::donate(const std::vector<std::string> &args_) message_writer() << (boost::format(tr("Donating %s %s to %s.")) % amount_str % cryptonote::get_unit(cryptonote::get_default_decimal_point()) % address_str).str(); transfer(local_args); return true; +#endif } //---------------------------------------------------------------------------------------------------- bool simple_wallet::accept_loaded_tx(const std::function<size_t()> get_num_txes, const std::function<const tools::wallet2::tx_construction_data&(size_t)> &get_tx, const std::string &extra_message) @@ -10808,8 +10813,8 @@ int main(int argc, char* argv[]) bool should_terminate = false; std::tie(vm, should_terminate) = wallet_args::main( argc, argv, - "monero-wallet-cli [--wallet-file=<filename>|--generate-new-wallet=<filename>] [<COMMAND>]", - sw::tr("This is the command line monero wallet. It needs to connect to a monero\ndaemon to work correctly.\nWARNING: Do not reuse your Monero keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy."), + "monzero-wallet-cli [--wallet-file=<filename>|--generate-new-wallet=<filename>] [<COMMAND>]", + sw::tr("This is the command line Monzero wallet. It needs to connect to a Monzero\ndaemon to work correctly.\nWARNING: Do not reuse your Monzero keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy."), desc_params, positional_options, [](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; }, @@ -11000,7 +11005,7 @@ void simple_wallet::list_mms_messages(const std::vector<mms::message> &messages) void simple_wallet::list_signers(const std::vector<mms::authorized_signer> &signers) { message_writer() << boost::format("%2s %-20s %-s") % tr("#") % tr("Label") % tr("Transport Address"); - message_writer() << boost::format("%2s %-20s %-s") % "" % tr("Auto-Config Token") % tr("Monero Address"); + message_writer() << boost::format("%2s %-20s %-s") % "" % tr("Auto-Config Token") % tr("Monzero Address"); for (size_t i = 0; i < signers.size(); ++i) { const mms::authorized_signer &signer = signers[i]; @@ -11225,14 +11230,14 @@ void simple_wallet::mms_signer(const std::vector<std::string> &args) bool ok = cryptonote::get_account_address_from_str_or_url(info, m_wallet->nettype(), args[3], oa_prompter); if (!ok) { - fail_msg_writer() << tr("Invalid Monero address"); + fail_msg_writer() << tr("Invalid Monzero address"); return; } monero_address = info.address; const std::vector<mms::message> &messages = ms.get_all_messages(); if ((messages.size() > 0) || state.multisig) { - fail_msg_writer() << tr("Wallet state does not allow changing Monero addresses anymore"); + fail_msg_writer() << tr("Wallet state does not allow changing Monzero addresses anymore"); return; } } |