aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-12-20 17:43:37 +0200
committerRiccardo Spagni <ric@spagni.net>2016-12-20 17:43:38 +0200
commit1551ce98f24e80fe9d1c94149bb564e898b4d14e (patch)
tree4f4f8eb8fa982b8a89ac855c599d5b6f3f7f324b
parentMerge pull request #1462 (diff)
parentREADME: add note about the donate command (diff)
downloadmonero-1551ce98f24e80fe9d1c94149bb564e898b4d14e.tar.xz
Merge pull request #1466
c367d7df README: add note about the donate command (anonimal) b9a28677 simplewallet: add return type for donate function (anonimal) d36669fd simplewallet: hardcode Monero's donation address (anonimal)
-rw-r--r--README.md2
-rw-r--r--src/simplewallet/simplewallet.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 6cf5c4e52..a6a57da2b 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,8 @@ The Monero donation address is: `44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft
The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`
+*Note: you can easily donate XMR to the Monero donation address by using the `donate` command. Type `help` in the command-line wallet for details.*
+
Core development funding and/or some supporting services are also graciously provided by sponsors:
[<img width="80" src="https://static.getmonero.org/images/sponsors/mymonero.png"/>](https://mymonero.com)
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 251f9c231..dfd4bd561 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -2836,7 +2836,8 @@ bool simple_wallet::donate(const std::vector<std::string> &args_)
return true;
}
std::string mixin_str;
- std::string address_str = "donate.getmonero.org";
+ // Hardcode Monero's donation address (see #1447)
+ const std::string address_str = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
std::string amount_str;
std::string payment_id_str;
// check payment id
@@ -2864,6 +2865,7 @@ bool simple_wallet::donate(const std::vector<std::string> &args_)
if (!payment_id_str.empty())
local_args.push_back(payment_id_str);
transfer_new(local_args);
+ return true;
}
//----------------------------------------------------------------------------------------------------
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)