diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index e2d9b376d..fc937bfcd 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -203,7 +203,7 @@ namespace const char* USAGE_SWEEP_ACCOUNT("sweep_account [index=[,,...] | index=all] [] [] [outputs=]
[]"); const char* USAGE_SWEEP_BELOW("sweep_below [index=[,,...]] [] []
[]"); const char* USAGE_SWEEP_SINGLE("sweep_single [] [] [outputs=]
[]"); - const char* USAGE_DONATE("donate [index=[,,...]] [] [] []"); + const char* USAGE_DONATE("donate [index=[,,...]] [] [] "); const char* USAGE_SIGN_TRANSFER("sign_transfer [export_raw] []"); const char* USAGE_SET_LOG("set_log |{+,-,}"); const char* USAGE_ACCOUNT("account\n" @@ -7389,22 +7389,12 @@ bool simple_wallet::donate(const std::vector &args_) { CHECK_IF_BACKGROUND_SYNCING("cannot donate"); std::vector local_args = args_; - if(local_args.empty() || local_args.size() > 5) + if(local_args.empty() || local_args.size() > 4) { PRINT_USAGE(USAGE_DONATE); return true; } std::string amount_str; - std::string payment_id_str; - // get payment id and pop - crypto::hash payment_id; - crypto::hash8 payment_id8; - if (tools::wallet2::parse_long_payment_id (local_args.back(), payment_id ) || - tools::wallet2::parse_short_payment_id(local_args.back(), payment_id8)) - { - payment_id_str = local_args.back(); - local_args.pop_back(); - } // get amount and pop uint64_t amount; bool ok = cryptonote::parse_amount(amount, local_args.back()); @@ -7418,7 +7408,7 @@ bool simple_wallet::donate(const std::vector &args_) fail_msg_writer() << tr("amount is wrong: ") << local_args.back() << ", " << tr("expected number from 0 to ") << print_money(std::numeric_limits::max()); return true; } - // push back address, amount, payment id + // push back address, amount std::string address_str; if (m_wallet->nettype() != cryptonote::MAINNET) { @@ -7437,8 +7427,6 @@ bool simple_wallet::donate(const std::vector &args_) } local_args.push_back(address_str); local_args.push_back(amount_str); - if (!payment_id_str.empty()) - local_args.push_back(payment_id_str); if (m_wallet->nettype() == cryptonote::MAINNET) message_writer() << (boost::format(tr("Donating %s %s to The Monero Project (donate.getmonero.org or %s).")) % amount_str % cryptonote::get_unit(cryptonote::get_default_decimal_point()) % MONERO_DONATION_ADDR).str(); else