mirror of
https://github.com/monero-project/monero.git
synced 2025-08-19 16:28:00 -04:00
Merge pull request #3057
9ffa97fe
Factor the monero donation address (Maxithi)
This commit is contained in:
commit
ede4e1c54c
3 changed files with 6 additions and 5 deletions
|
@ -4557,8 +4557,6 @@ bool simple_wallet::donate(const std::vector<std::string> &args_)
|
|||
fail_msg_writer() << tr("usage: donate [index=<N1>[,<N2>,...]] [<priority>] [<ring_size>] <amount> [<payment_id>]");
|
||||
return true;
|
||||
}
|
||||
// Hardcode Monero's donation address (see #1447)
|
||||
const std::string address_str = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
|
||||
std::string amount_str;
|
||||
std::string payment_id_str;
|
||||
// get payment id and pop
|
||||
|
@ -4574,11 +4572,11 @@ bool simple_wallet::donate(const std::vector<std::string> &args_)
|
|||
amount_str = local_args.back();
|
||||
local_args.pop_back();
|
||||
// push back address, amount, payment id
|
||||
local_args.push_back(address_str);
|
||||
local_args.push_back(MONERO_DONATION_ADDR);
|
||||
local_args.push_back(amount_str);
|
||||
if (!payment_id_str.empty())
|
||||
local_args.push_back(payment_id_str);
|
||||
message_writer() << tr("Donating ") << amount_str << " to The Monero Project (donate.getmonero.org/44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A).";
|
||||
message_writer() << tr("Donating ") << amount_str << " to The Monero Project (donate.getmonero.org/"<< MONERO_DONATION_ADDR <<").";
|
||||
transfer_new(local_args);
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue