Merge pull request #2 from KomodoPlatform/dev

Dev

README.md

@@ -78,3 +78,11 @@ change architecture build parameter to ```--arch=x64``` for 64 bit build
 On Windows it's noticed iguana.exe complains about `VCRUNTIME140D.DLL` and `ucrtbased.dll` file.
 
 Please see **windeps** directory and README file for instructions to install the required DLL files on Windows, and then try again running Agama App.
+
+## Optional packages to make rpm and deb distros
+
+electron-installer-debian
+
+electron-installer-redhat
+
+refer to ./make-deb.js and ./make-rpm.js

main.js

@@ -7,6 +7,7 @@ const BrowserWindow = electron.BrowserWindow;
 const path = require('path');
 const url = require('url');
 const os = require('os');
+const { randomBytes } = require('crypto');
 const md5 = require('./routes/md5');
 const exec = require('child_process').exec;
 const { Menu } = require('electron');
@@ -54,7 +55,7 @@ app.setVersion(appBasicInfo.version);
 
 shepherd.createAgamaDirs();
 
-const appSessionHash = md5(Date.now().toString());
+const appSessionHash = randomBytes(32).toString('hex');
 const _spvFees = shepherd.getSpvFees();
 
 shepherd.writeLog(`app info: ${appBasicInfo.name} ${appBasicInfo.version}`);
@@ -70,6 +71,7 @@ shepherd.writeLog(`os_type: ${os.type()}`);
 if (process.argv.indexOf('devmode') > -1) {
 	shepherd.log(`app init ${appSessionHash}`);
 }
+
 shepherd.log(`app info: ${appBasicInfo.name} ${appBasicInfo.version}`);
 shepherd.log('sys info:');
 shepherd.log(`totalmem_readable: ${formatBytes(os.totalmem())}`);
@@ -100,7 +102,7 @@ guiapp.use((req, res, next) => {
 	next();
 });
 
-// preload.js
+// preload js
 const _setImmediate = setImmediate;
 const _clearImmediate = clearImmediate;
 
@@ -462,8 +464,6 @@ app.on('quit', (event) => {
 	}
 });
 
-app.commandLine.appendSwitch('ignore-certificate-errors'); // dirty hack
-
 function formatBytes(bytes, decimals) {
   if (bytes === 0) {
     return '0 Bytes';
@@ -485,4 +485,4 @@ function formatBytes(bytes, decimals) {
 	const i = Math.floor(Math.log(bytes) / Math.log(k));
 
   return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "agama-app",
   "productName": "Agama",
-  "version": "0.2.29",
+  "version": "0.2.30",
   "description": "Agama Wallet Desktop App",
   "main": "main.js",
   "scripts": {
@@ -11,21 +11,20 @@
     "make-deb": "node make-deb.js"
   },
   "repository": "https://github.com/KomodoPlatform/Agama/",
-  "homepage": "http://supernet.org",
+  "homepage": "http://komodoplatform.com",
   "keywords": [
     "agama",
     "SuperNET",
     "komodo",
     "multicoin",
     "wallet",
-    "spv"
+    "spv",
+    "jumblr"
   ],
   "author": "SuperNET Team",
   "license": "MIT",
   "devDependencies": {
-    "electron": "1.7.10",
-    "electron-installer-debian": "^0.6.0",
-    "electron-installer-redhat": "^0.5.0"
+    "electron": "1.8.4"
   },
   "dependencies": {
     "adm-zip": "^0.4.7",
@@ -41,7 +40,7 @@
     "body-parser": "^1.15.2",
     "buffer-reverse": "^1.0.1",
     "coinselect": "github:bitcoinjs/coinselect",
-    "electron": "1.8.2",
+    "electron": "1.8.4",
     "express": "^4.14.0",
     "fix-path": "^2.1.0",
     "fs-extra": "^4.0.2",

routes/electrumjs/electrumServers.js

@@ -214,12 +214,15 @@ let electrumServers = {
     ],
   },
   ninja: { // !estimatefee
-    address: 'electrum.fund.ninja',
+    address: 'electrum1.fund.ninja',
     port: 50001,
     proto: 'tcp',
     txfee: 10000,
     abbr: 'NINJA',
-    serverList: 'none',
+    serverList: [
+      'electrum1.fund.ninja:50001',
+      'electrum2.fund.ninja:50001'
+    ],
   },
   jumblr: { // !estimatefee
     address: 'electrum1.cipig.net',
@@ -457,6 +460,17 @@ let electrumServers = {
       '136.243.45.140:50013'
     ],
   },
+  sng: { // ssl 50002
+    address: 'electrumsvr.snowgem.org',
+    port: 50001,
+    proto: 'tcp',
+    txfee: 10000,
+    abbr: 'SNG',
+    serverList: [
+      'electrumsvr.snowgem.org:50001',
+      'electrumsvr.snowgem.org:50001'
+    ],
+  },
   xmy: {
     address: 'cetus.cryptap.us',
     port: 50004,
@@ -534,6 +548,39 @@ let electrumServers = {
       's2.qtum.info:50001'
     ],
   },
+  // insight
+  aby: {
+    address: 'http://explorer.artbyte.me/api/',
+    proto: 'insight',
+    insightRawApi: false,
+    txfee: 100000,
+    abbr: 'ABY',
+    serverList: 'none',
+  },
+  mac: { // cloudfare captcha :(
+    address: 'https://explorer.machinecoin.org/api/',
+    proto: 'insight',
+    insightRawApi: false,
+    txfee: 100000,
+    abbr: 'MAC',
+    serverList: 'none',
+  },
+  vot: {
+    address: 'http://explorer.votecoin.site/insight-api-zcash/',
+    proto: 'insight',
+    insightRawApi: false,
+    txfee: 10000,
+    abbr: 'VOT',
+    serverList: 'none',
+  },
+  bdl: {
+    address: 'https://explorer.bitdeal.co.in/api/',
+    proto: 'insight',
+    insightRawApi: false,
+    txfee: 10000,
+    abbr: 'BDL',
+    serverList: 'none',
+  },
 };
 
 electrumServers.crw = electrumServers.crown;
@@ -546,4 +593,4 @@ electrumServers.vtc = electrumServers.vertcoin;
 electrumServers.via = electrumServers.viacoin;
 electrumServers.doge = electrumServers.dogecoin;
 
-module.exports = electrumServers;
+module.exports = electrumServers;