diff --git a/main.js b/main.js index c67022b..1379e64 100644 --- a/main.js +++ b/main.js @@ -280,19 +280,21 @@ function createWindow(status, hideLoadingWindow) { mainWindow.startKMDNative = shepherd.startKMDNative; mainWindow.addressVersionCheck = shepherd.addressVersionCheck; mainWindow.getCoinByPub = shepherd.getCoinByPub; - mainWindow.resetSettings = function() { shepherd.saveLocalAppConf(__defaultAppSettings) }; + mainWindow.resetSettings = () => { shepherd.saveLocalAppConf(__defaultAppSettings) }; mainWindow.createSeed = { triggered: false, firstLoginPH: null, secondaryLoginPH: null, }; - for (let i = 0; i < process.argv.length; i++) { + mainWindow.nnVoteChain = 'VOTE2018'; + + /*for (let i = 0; i < process.argv.length; i++) { if (process.argv[i].indexOf('nvote') > -1) { console.log(`notary node elections chain ${process.argv[i].replace('nvote=', '')}`); mainWindow.nnVoteChain = process.argv[i].replace('nvote=', ''); } - } + }*/ } else { mainWindow = new BrowserWindow({ width: 500, diff --git a/routes/electrumjs/electrumServers.js b/routes/electrumjs/electrumServers.js index 0548596..9270a3d 100644 --- a/routes/electrumjs/electrumServers.js +++ b/routes/electrumjs/electrumServers.js @@ -65,6 +65,17 @@ let electrumServers = { 'electrum2.cipig.net:10008' ], }, + dnr: { // !estimatefee + address: 'denarius.tech', + port: 50001, + proto: 'tcp', + txfee: 10000, + abbr: 'DNR', + serverList: [ + '173.254.244.119:50001', + '173.254.244.122:50001' + ], + }, hodl: { // !estimatefee address: 'electrum1.cipig.net', port: 10009, @@ -180,17 +191,25 @@ let electrumServers = { 'electrum2.cipig.net:10024' ], }, - vote: { // !estimatefee + vote2018: { // !estimatefee address: 'electrum1.cipig.net', port: 10021, proto: 'tcp', txfee: 10000, - abbr: 'VOTE', + abbr: 'VOTE2018', serverList: [ 'electrum1.cipig.net:10021', 'electrum2.cipig.net:10021' ], }, + ninja: { // !estimatefee + address: 'electrum.fund.ninja', + port: 50001, + proto: 'tcp', + txfee: 10000, + abbr: 'NINJA', + serverList: 'none', + }, jumblr: { // !estimatefee address: 'electrum1.cipig.net', port: 10004, diff --git a/routes/electrumjs/electrumjs.networks.js b/routes/electrumjs/electrumjs.networks.js index 0686d85..54272d4 100644 --- a/routes/electrumjs/electrumjs.networks.js +++ b/routes/electrumjs/electrumjs.networks.js @@ -18,6 +18,19 @@ networks.litecoin = { dustThreshold: 0 // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L360-L365 }; +networks.dnr = { + messagePrefix: '\x19Denarius Signed Message:\n', + bip32: { + public: 0x0488b21e, + private: 0x0488ade4, + }, + pubKeyHash: 0x1e, + scriptHash: 0x5a, + wif: 0x9e, + dustThreshold: 1000, + isPoS: true, +}; + networks.dogecoin = { messagePrefix: '\x19Dogecoin Signed Message:\n', bip32: { diff --git a/routes/ports.js b/routes/ports.js index 9364db0..11e9a19 100644 --- a/routes/ports.js +++ b/routes/ports.js @@ -26,7 +26,8 @@ const assetChainPorts = { 'MESH': '9455', 'AXO': '12927', 'ETOMIC': '10271', - 'VOTE': '8012', + 'VOTE2018': '15488', + 'NINJA': '8427', 'BTCH': '8800', }; diff --git a/routes/shepherd/electrum/network.js b/routes/shepherd/electrum/network.js index 4a02652..9e53853 100644 --- a/routes/shepherd/electrum/network.js +++ b/routes/shepherd/electrum/network.js @@ -22,7 +22,9 @@ module.exports = (shepherd) => { shepherd.isPos = (network) => { if (network === 'BLK' || - network === 'blk') { + network === 'blk' || + network === 'DNR' || + network === 'dnr') { return true; } }; @@ -65,7 +67,8 @@ module.exports = (shepherd) => { coin === 'KMD' || coin === 'BEER' || coin === 'PIZZA' || - coin === 'VOTE' || + coin === 'VOTE2018' || + coin === 'NINJA' || coin === 'KOMODO' || coinUC === 'SUPERNET' || coinUC === 'REVS' || @@ -90,7 +93,8 @@ module.exports = (shepherd) => { coinUC === 'BTCH' || coinUC === 'BEER' || coinUC === 'PIZZA' || - coinUC === 'VOTE' || + coinUC === 'VOTE2018' || + coinUC === 'NINJA' || coinUC === 'KMD' || coinUC === 'KOMODO') { return shepherd.electrumJSNetworks.komodo; diff --git a/version b/version index a28399c..68a1adc 100644 --- a/version +++ b/version @@ -1,3 +1,3 @@ -version=0.2.0.29c -type=c-beta -minversion=0.2.0.29 \ No newline at end of file +version=0.2.0.30a +type=a-beta +minversion=0.2.0.30 \ No newline at end of file diff --git a/version_build b/version_build index de6ec95..611a2fd 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -0.2.0.29c-beta \ No newline at end of file +0.2.0.30a-beta \ No newline at end of file