From 0b0ac95e92331e398add9e07d20b3c3fe7667581 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Thu, 8 Mar 2018 20:56:55 +0300 Subject: [PATCH] version bump --- main.js | 5 ++--- routes/electrumjs/electrumjs.networks.js | 6 +++--- routes/shepherd.js | 2 ++ routes/shepherd/dashboardUpdate.js | 6 +++++- version | 4 ++-- version_build | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/main.js b/main.js index f2a9887..c67022b 100644 --- a/main.js +++ b/main.js @@ -90,7 +90,7 @@ shepherd.log(`app started in ${(appConfig.dev ? 'dev mode' : ' user mode')}`); shepherd.writeLog(`app started in ${(appConfig.dev ? 'dev mode' : ' user mode')}`); shepherd.setConfKMD(); -shepherd.setConfKMD('CHIPS'); +// shepherd.setConfKMD('CHIPS'); guiapp.use((req, res, next) => { res.header('Access-Control-Allow-Origin', appConfig.dev ? '*' : 'http://127.0.0.1:3000'); @@ -116,8 +116,7 @@ process.once('loaded', () => { copyright: 'Released under the MIT license', credits: 'SuperNET Team', }); - } - if (osPlatform === 'linux') { + } else if (osPlatform === 'linux') { process.setFdLimit(appConfig.maxDescriptors.linux); } }); diff --git a/routes/electrumjs/electrumjs.networks.js b/routes/electrumjs/electrumjs.networks.js index b54f0e4..0686d85 100644 --- a/routes/electrumjs/electrumjs.networks.js +++ b/routes/electrumjs/electrumjs.networks.js @@ -15,8 +15,8 @@ networks.litecoin = { pubKeyHash: 0x30, scriptHash: 0x32, wif: 0xb0, - dustThreshold: 0, // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L360-L365 -} + dustThreshold: 0 // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L360-L365 +}; networks.dogecoin = { messagePrefix: '\x19Dogecoin Signed Message:\n', @@ -27,7 +27,7 @@ networks.dogecoin = { pubKeyHash: 0x1e, scriptHash: 0x16, wif: 0x9e, - dustThreshold: 0 // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/core.h#L155-L160 + dustThreshold: 0, // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/core.h#L155-L160 }; // https://github.com/monacoinproject/monacoin/blob/master-0.10/src/chainparams.cpp#L161 diff --git a/routes/shepherd.js b/routes/shepherd.js index 7978257..6e4f612 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -37,6 +37,8 @@ shepherd.rpcConf = {}; shepherd.appRuntimeLog = []; shepherd.appRuntimeSPVLog = []; shepherd.lockDownAddCoin = false; + +// dex cache shepherd.mmupass = null; shepherd.mmRatesInterval = null; shepherd.mmPublic = { diff --git a/routes/shepherd/dashboardUpdate.js b/routes/shepherd/dashboardUpdate.js index f87abd7..2cca1f6 100644 --- a/routes/shepherd/dashboardUpdate.js +++ b/routes/shepherd/dashboardUpdate.js @@ -59,7 +59,8 @@ module.exports = (shepherd) => { coin, _type === 'public' ? 'getaddressesbyaccount' : 'z_listaddresses', [''] - ).then((_json) => { + ) + .then((_json) => { if (_json === 'Work queue depth exceeded' || !_json) { resolve({ error: 'daemon is busy' }); @@ -110,6 +111,7 @@ module.exports = (shepherd) => { return result[0].indexOf(elem) === pos; }); } + if (result[1] && result[1].length) { result[1] = result[1].filter((elem, pos) => { @@ -118,6 +120,7 @@ module.exports = (shepherd) => { } let newAddressArray = []; + for (let a = 0; a < result.length; a++) { newAddressArray[a] = []; @@ -305,6 +308,7 @@ module.exports = (shepherd) => { } else { _returnObj[_call] = JSON.parse(json); } + resolve(json); }); }); diff --git a/version b/version index 34e8395..a28399c 100644 --- a/version +++ b/version @@ -1,3 +1,3 @@ -version=0.2.0.29b -type=b-beta +version=0.2.0.29c +type=c-beta minversion=0.2.0.29 \ No newline at end of file diff --git a/version_build b/version_build index f0877ef..de6ec95 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -0.2.0.29b-beta \ No newline at end of file +0.2.0.29c-beta \ No newline at end of file