Merge pull request #230 from SuperNETorg/v0.24

V0.24

genMNZ

@@ -1 +0,0 @@
-curl --url "http://127.0.0.1:7778" --data "{\"conf\":\"MNZ.conf\",\"path\":\"${HOME#"/"}/.komodo/MNZ\",\"unitval\":\"20\",\"zcash\":1,\"RELAY\":1,\"VALIDATE\":1,\"prefetchlag\":-1,\"poll\":100,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":8,\"newcoin\":\"MNZ\",\"name\":\"MNZ\",\"hasheaders\":1,\"useaddmultisig\":0,\"netmagic\":\"53d06fde\",\"p2p\":14336,\"rpc\":14337,\"pubval\":60,\"p2shval\":85,\"wifval\":188,\"txfee_satoshis\":\"10000\",\"isPoS\":0,\"minoutput\":10000,\"minconfirms\":2,\"genesishash\":\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\",\"protover\":170002,\"genesisblock\":\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\",\"debug\":0,\"seedipaddr\":\"78.47.196.146\"}"

gui/startup/index.html

@@ -41,9 +41,9 @@
             onClick="toggleMainWindowHelp()"
             class="close-btn"
             src="../EasyDEX-GUI/assets/mainWindow/img/fa-close.png">
-          <strong>Be aware:</strong> Native mode requires to download the whole blockchain data to a local disk before you can start using it. This may take from <strong>several hours to a day</strong> depending on your connection and hardware. Please <u>try to keep Agama running</u> until the whole process is finished.
+          <strong>Be aware:</strong> <u>Native mode</u> requires to download the whole blockchain data to a local disk before you can start using it. This may take from <strong>several hours to a day</strong> depending on your connection and hardware. Please <u>try to keep Agama running</u> until the whole process is finished.
           <br /><br />
-          If you need a quick and easy access to your funds try SPV mode which doesn't require any blockchain to be loaded locally. All data is requested on demand from Electrum servers.
+          If you need a quick and easy access to your funds try <u>Lite (SPV) mode</u> which doesn't require any blockchain to be loaded locally. All data is requested on demand from Electrum servers. <strong>To gain access to Lite mode toggle "Enable experimental features" in Settings.</strong>
         </div>
         <div class="mode-desc native">Full blockchain mode</div>
         <button

routes/shepherd/dashboardUpdate.js

@@ -70,7 +70,8 @@ module.exports = (shepherd) => {
       .then(result => {
         if (result[0] &&
             result[0].length &&
-            result[0][0]) {
+            result[0][0].length &&
+            result[0][0].length > 10) {
           const calcBalance = (result, json) => {
             if (json &&
                 json.length &&

routes/shepherd/electrum/createtx.js

@@ -65,7 +65,7 @@ module.exports = (shepherd) => {
     const ecl = new shepherd.electrumJSCore(shepherd.electrumServers[network].port, shepherd.electrumServers[network].address, shepherd.electrumServers[network].proto); // tcp or tls
     const outputAddress = req.query.address;
     const changeAddress = req.query.change;
-    const value = Number(req.query.value);
+    let value = Number(req.query.value);
     const push = req.query.push;
     const fee = shepherd.electrumServers[network].txfee;
     let wif = req.query.wif;
@@ -207,8 +207,19 @@ module.exports = (shepherd) => {
             shepherd.log(`estimated fee overhead ${_feeOverhead}`, true);
             shepherd.log(`current change amount ${_change} (${_change * 0.00000001}), boosted change amount ${_change + (totalInterest - _feeOverhead)} (${(_change + (totalInterest - _feeOverhead)) * 0.00000001})`, true);
 
+            if (_maxSpend === value) {
+              _change = totalInterest -_change - _feeOverhead;
+
+              if (outputAddress === changeAddress) {
+                value += _change;
+                _change = 0;
+                shepherd.log(`send to self ${outputAddress} = ${changeAddress}`, true);
+                shepherd.log(`send to self old val ${value}, new val ${value + _change}`, true);
+              }
+            } else {
               _change = _change + (totalInterest - _feeOverhead);
             }
+          }
 
           if (!inputs &&
               !outputs) {
@@ -247,6 +258,8 @@ module.exports = (shepherd) => {
                 result: {
                   utxoSet: inputs,
                   change: _change,
+                  changeAdjusted: _change,
+                  totalInterest,
                   // wif,
                   fee,
                   value,
@@ -275,6 +288,8 @@ module.exports = (shepherd) => {
                     raw: {
                       utxoSet: inputs,
                       change: _change,
+                      changeAdjusted: _change,
+                      totalInterest,
                       fee,
                       value,
                       outputAddress,
@@ -297,6 +312,8 @@ module.exports = (shepherd) => {
                         raw: {
                           utxoSet: inputs,
                           change: _change,
+                          changeAdjusted: _change,
+                          totalInterest,
                           fee,
                           value,
                           outputAddress,
@@ -315,6 +332,8 @@ module.exports = (shepherd) => {
                         result: {
                           utxoSet: inputs,
                           change: _change,
+                          changeAdjusted: _change,
+                          totalInterest,
                           fee,
                           // wif,
                           value,
@@ -338,6 +357,8 @@ module.exports = (shepherd) => {
                         raw: {
                           utxoSet: inputs,
                           change: _change,
+                          changeAdjusted: _change,
+                          totalInterest,
                           fee,
                           value,
                           outputAddress,
@@ -357,6 +378,8 @@ module.exports = (shepherd) => {
                         raw: {
                           utxoSet: inputs,
                           change: _change,
+                          changeAdjusted: _change,
+                          totalInterest,
                           fee,
                           value,
                           outputAddress,

routes/shepherd/electrum/listunspent.js

@@ -59,6 +59,7 @@ module.exports = (shepherd) => {
                               address,
                               amount: Number(_utxoItem.value) * 0.00000001,
                               amountSats: _utxoItem.value,
+                              locktime: decodedTx.format.locktime,
                               interest: interest,
                               interestSats: Math.floor(interest * 100000000),
                               confirmations: Number(_utxoItem.height) === 0 ? 0 : currentHeight - _utxoItem.height,

version

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

version_build

@@ -1 +1 @@
-0.2.0.24d-beta
+0.2.0.24e-beta