From 8ab38b4d79b8e8e671892cc16ef2f450a790de6b Mon Sep 17 00:00:00 2001
From: Alexander Blair <alex@snipanet.com>
Date: Sat, 25 Feb 2017 08:13:32 -0800
Subject: [PATCH] trusted_daemon is now a config var upstream in the wallet,
 not in the other systems.

---
 README.md              |  2 +-
 deployment/deploy.bash |  2 +-
 deployment/leaf.bash   |  2 +-
 lib/payments.js        | 15 +++++----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 48433a1..92c7426 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ The pool is designed to have a dual-wallet design, one which is a fee wallet, on
 2. Make sure to save your regeneration stuff!
 3. For the pool wallet, store the password in a file, the suggestion is `~/wallet_pass`
 4. Change the mode of the file with chmod to 0400: `chmod 0400 ~/wallet_pass`
-5. Start the wallet using PM2: `pm2 start /usr/local/src/monero/build/release/bin/monero-wallet-rpc -- --rpc-bind-port 18082 --password-file ~/wallet_pass --wallet-file <Your wallet name here> --disable-rpc-login`
+5. Start the wallet using PM2: `pm2 start /usr/local/src/monero/build/release/bin/monero-wallet-rpc -- --rpc-bind-port 18082 --password-file ~/wallet_pass --wallet-file <Your wallet name here> --disable-rpc-login --trusted-daemon`
 6. If you don't use PM2, then throw the wallet into a screen and have fun.
 
 Manual Setup
diff --git a/deployment/deploy.bash b/deployment/deploy.bash
index 00ca863..b8b8fc4 100644
--- a/deployment/deploy.bash
+++ b/deployment/deploy.bash
@@ -29,7 +29,7 @@ sudo systemctl enable ntp
 cd /usr/local/src
 sudo git clone https://github.com/monero-project/monero.git
 cd monero
-sudo git checkout 1e7f783f6901dc46e90da13926c725d477f4f443
+sudo git checkout 0.10.2.1
 sudo make -j$(nproc)
 sudo cp ~/nodejs-pool/deployment/monero.service /lib/systemd/system/
 sudo useradd -m monerodaemon -d /home/monerodaemon
diff --git a/deployment/leaf.bash b/deployment/leaf.bash
index 23a7462..ab67d87 100644
--- a/deployment/leaf.bash
+++ b/deployment/leaf.bash
@@ -25,7 +25,7 @@ sudo systemctl enable ntp
 cd /usr/local/src
 sudo git clone https://github.com/monero-project/monero.git
 cd monero
-sudo git checkout 1e7f783f6901dc46e90da13926c725d477f4f443
+sudo git checkout 0.10.2.1
 sudo make -j$(nproc)
 sudo cp ~/nodejs-pool/deployment/monero.service /lib/systemd/system/
 sudo useradd -m monerodaemon -d /home/monerodaemon
diff --git a/lib/payments.js b/lib/payments.js
index 41cf4d3..72c0288 100644
--- a/lib/payments.js
+++ b/lib/payments.js
@@ -105,8 +105,7 @@ let shapeshiftQueue = async.queue(function (task, callback) {
                     }
                 ],
                 mixin: global.config.payout.mixIn,
-                payment_id: shapeshiftTxnData.deposit,
-                trusted_daemon: true
+                payment_id: shapeshiftTxnData.deposit
             };
             debug("Payment Details: " + JSON.stringify(paymentDetails));
             paymentQueue.push(paymentDetails, function (body) {
@@ -256,8 +255,7 @@ let xmrToQueue = async.queue(function (task, callback) {
                     }
                 ],
                 mixin: global.config.payout.mixIn,
-                payment_id: orderStatus.xmr_required_payment_id,
-                trusted_daemon: true
+                payment_id: orderStatus.xmr_required_payment_id
             };
             debug("Payment Details: " + JSON.stringify(paymentDetails));
             paymentQueue.push(paymentDetails, function (body) {
@@ -500,8 +498,7 @@ function Payee(amount, address, paymentID, bitcoin) {
                 }
             ],
             mixin: global.config.payout.mixIn,
-            payment_id: this.paymentID,
-            trusted_daemon: true
+            payment_id: this.paymentID
         };
         let identifier = this.id;
         let amount = this.amount;
@@ -531,8 +528,7 @@ function Payee(amount, address, paymentID, bitcoin) {
                     address: this.address
                 }
             ],
-            mixin: global.config.payout.mixIn,
-            trusted_daemon: true
+            mixin: global.config.payout.mixIn
         };
         let identifier = this.id;
         let amount = this.amount;
@@ -639,8 +635,7 @@ function makePayments() {
                     while (paymentDestinations.length > 0) {
                         let paymentDetails = {
                             destinations: paymentDestinations.splice(0, global.config.payout.maxPaymentTxns),
-                            mixin: global.config.payout.mixIn,
-                            trusted_daemon: true
+                            mixin: global.config.payout.mixIn
                         };
                         console.log("Paying out: " + paymentDetails.destinations.length + " people");
                         paymentQueue.push(paymentDetails, function (body) {