From d36669fd75de38709283f820458f5883f0a93ed7 Mon Sep 17 00:00:00 2001
From: anonimal <anonimal@i2pmail.org>
Date: Sat, 17 Dec 2016 02:52:09 +0000
Subject: simplewallet: hardcode Monero's donation address

Closes #1447
References #1451
---
 src/simplewallet/simplewallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/simplewallet')

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index b46447975..b00d837c8 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
-- 
cgit v1.2.3


From b9a28677e266c0a493ca477202b301c9c7026c45 Mon Sep 17 00:00:00 2001
From: anonimal <anonimal@i2pmail.org>
Date: Sat, 17 Dec 2016 03:37:20 +0000
Subject: simplewallet: add return type for donate function

Resolves -Wreturn-type

References #1447 #1451
---
 src/simplewallet/simplewallet.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/simplewallet')

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index b00d837c8..36c862155 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -2865,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)
-- 
cgit v1.2.3