From 8dc8a0214ebba4d84e51ebc69779d2d6bfb3a1c9 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Fri, 24 Nov 2017 18:40:25 +0300
Subject: [PATCH 1/2] spv listunspent interest rounding

---
 routes/shepherd/electrum/listunspent.js | 2 +-
 version                                 | 2 +-
 version_build                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes/shepherd/electrum/listunspent.js b/routes/shepherd/electrum/listunspent.js
index c243573..b0a645b 100644
--- a/routes/shepherd/electrum/listunspent.js
+++ b/routes/shepherd/electrum/listunspent.js
@@ -60,7 +60,7 @@ module.exports = (shepherd) => {
                               amount: Number(_utxoItem.value) * 0.00000001,
                               amountSats: _utxoItem.value,
                               locktime: decodedTx.format.locktime,
-                              interest: interest,
+                              interest: Number(interest.toFixed(8)),
                               interestSats: Math.floor(interest * 100000000),
                               confirmations: Number(_utxoItem.height) === 0 ? 0 : currentHeight - _utxoItem.height,
                               spendable: true,
diff --git a/version b/version
index 1f4f529..96e1496 100644
--- a/version
+++ b/version
@@ -1,3 +1,3 @@
-version=0.2.0.24e
+version=0.2.0.24f
 type=e-beta
 minversion=0.2.0.2
\ No newline at end of file
diff --git a/version_build b/version_build
index 76838a4..445b1f9 100644
--- a/version_build
+++ b/version_build
@@ -1 +1 @@
-0.2.0.24e-beta
\ No newline at end of file
+0.2.0.24f-beta
\ No newline at end of file

From d4953c265e64a5cfecf2426b91ab37db39f4aeea Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Fri, 24 Nov 2017 23:52:45 +0300
Subject: [PATCH 2/2] spv create tx second run fee fix

---
 routes/shepherd/electrum/createtx.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/routes/shepherd/electrum/createtx.js b/routes/shepherd/electrum/createtx.js
index 78a6da9..f312c5f 100644
--- a/routes/shepherd/electrum/createtx.js
+++ b/routes/shepherd/electrum/createtx.js
@@ -137,9 +137,8 @@ module.exports = (shepherd) => {
         shepherd.log('coinselect calculated fee =>', true);
         shepherd.log(fee, true);
 
-        if (!inputs &&
-            !outputs) {
-          targets[0].value = targets[0].value - shepherd.electrumServers[network].txfee;
+        if (!outputs) {
+          targets[0].value = targets[0].value - fee;
           shepherd.log('second run', true);
           shepherd.log('coinselect adjusted targets =>', true);
           shepherd.log(targets, true);
@@ -149,11 +148,11 @@ module.exports = (shepherd) => {
           outputs = secondRun.outputs;
           fee = secondRun.fee;
 
-          shepherd.log('coinselect inputs =>', true);
+          shepherd.log('second run coinselect inputs =>', true);
           shepherd.log(inputs, true);
-          shepherd.log('coinselect outputs =>', true);
+          shepherd.log('second run coinselect outputs =>', true);
           shepherd.log(outputs, true);
-          shepherd.log('coinselect fee =>', true);
+          shepherd.log('second run coinselect fee =>', true);
           shepherd.log(fee, true);
         }