Merge pull request #231 from SuperNETorg/v0.24

V0.24

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);
         }
 

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,

version

@@ -1,3 +1,3 @@
-version=0.2.0.24e
+version=0.2.0.24f
 type=e-beta
 minversion=0.2.0.2

version_build

@@ -1 +1 @@
-0.2.0.24e-beta
+0.2.0.24f-beta