Merge pull request #1 from KomodoPlatform/v0.25

v0.25-d

main.js

@@ -93,9 +93,8 @@ shepherd.setConfKMD('CHIPS');
 
 guiapp.use((req, res, next) => {
 	res.header('Access-Control-Allow-Origin', appConfig.dev ? '*' : 'http://127.0.0.1:3000');
-	res.header('Access-Control-Allow-Headers', 'X-Requested-With');
+	res.header('Access-Control-Allow-Headers', 'X-Requested-With,content-type');
 	res.header('Access-Control-Allow-Credentials', 'true');
-	res.header('Access-Control-Allow-Headers', 'Content-Type');
 	res.header('Access-Control-Allow-Methods', 'PUT, GET, POST, DELETE, OPTIONS');
 	next();
 });
@@ -407,6 +406,7 @@ function createWindow(status, hideLoadingWindow) {
 		mainWindow.getMMCacheData = shepherd.getMMCacheData;
 		mainWindow.activeSection = 'wallets';
 		mainWindow.argv = process.argv;
+		mainWindow.getAssetChainPorts = shepherd.getAssetChainPorts;
 
 		if (appConfig.dev) {
 			mainWindow.loadURL('http://127.0.0.1:3000');

routes/shepherd.js

@@ -48,8 +48,9 @@ shepherd.mmPublic = {
   isAuth: false,
   rates: {},
   prices: [],
-  coinsHelper: [],
+  coinsHelper: {},
   stats: [],
+  electrumServersList: {},
 };
 
 // spv vars and libs
@@ -102,6 +103,7 @@ shepherd = require('./shepherd/electrum/estimate.js')(shepherd);
 shepherd = require('./shepherd/dex/coind.js')(shepherd);
 shepherd = require('./shepherd/dex/mmControl.js')(shepherd);
 shepherd = require('./shepherd/dex/mmRequest.js')(shepherd);
+shepherd = require('./shepherd/dex/electrumServersList.js')(shepherd);
 
 // core
 shepherd = require('./shepherd/addCoinShortcuts.js')(shepherd);

routes/shepherd/daemonControl.js

@@ -88,6 +88,28 @@ module.exports = (shepherd) => {
     if (flock === 'komodod') {
       let kmdDebugLogLocation = (data.ac_name !== 'komodod' ? `${shepherd.komodoDir}/${data.ac_name}` : shepherd.komodoDir) + '/debug.log';
 
+      // get custom coind port
+      const _coindConf = data.ac_name !== 'komodod' ? `${shepherd.komodoDir}/${data.ac_name}/${data.ac_name}.conf` : `${shepherd.komodoDir}/komodo.conf`;
+
+      try {
+        const _coindConfContents = fs.readFileSync(_coindConf, 'utf8');
+
+        if (_coindConfContents) {
+          const _coindCustomPort = _coindConfContents.match(/rpcport=\s*(.*)/);
+
+          if (_coindCustomPort[1]) {
+            shepherd.assetChainPorts[data.ac_name] = _coindCustomPort[1];
+            shepherd.log(`${data.ac_name} custom port ${_coindCustomPort[1]}`);
+          } else {
+            shepherd.log(`${data.ac_name} port ${shepherd.assetChainPorts[data.ac_name]}`);
+          }
+        } else {
+          shepherd.log(`${data.ac_name} port ${shepherd.assetChainPorts[data.ac_name]}`);
+        }
+      } catch (e) {
+        shepherd.log(`${data.ac_name} port ${shepherd.assetChainPorts[data.ac_name]}`);
+      }
+
       shepherd.log('komodod flock selected...');
       shepherd.log(`selected data: ${JSON.stringify(data, null, '\t')}`);
       shepherd.writeLog('komodod flock selected...');
@@ -904,5 +926,9 @@ module.exports = (shepherd) => {
     });
   }
 
+  shepherd.getAssetChainPorts = () => {
+    return shepherd.assetChainPorts;
+  }
+
   return shepherd;
 };

routes/shepherd/dex/electrumServersList.js

@@ -0,0 +1,39 @@
+// TODO: merge with spv mode
+
+const electrumServersList = {
+  "ARG": [{"173.212.225.176": 50081},{"136.243.45.140": 50081}],
+  "BET": [{"electrum2.cipig.net":10012},{"electrum1.cipig.net":10012}],
+  "BTC": [{"electrum2.cipig.net":10000},{"electrum1.cipig.net":10000}],
+  "BOTS": [{"electrum2.cipig.net":10007},{"electrum1.cipig.net":10007}],
+  "CHIPS": [{"173.212.225.176": 50076},{"136.243.45.140": 50076}],
+  "COQUI": [{"electrum2.cipig.net":10011},{"electrum1.cipig.net":10011}],
+  "CRW": [{"173.212.225.176": 50041},{"136.243.45.140": 50041}],
+  "CRYPTO": [{"electrum2.cipig.net":10008},{"electrum1.cipig.net":10008}],
+  "DASH": [{"173.212.225.176": 50098},{"136.243.45.140": 50098}],
+  "DEX": [{"electrum2.cipig.net":10006},{"electrum1.cipig.net":10006}],
+  "DGB": [{"136.243.45.140": 50022},{"173.212.225.176": 50022}],
+  "DOGE": [{"173.212.225.176": 50015},{"136.243.45.140": 50015}],
+  "EMC2": [{"173.212.225.176": 50079},{"136.243.45.140": 50079}],
+  "FAIR": [{"173.212.225.176": 50005},{"136.243.45.140": 50005}],
+  "HODL": [{"electrum2.cipig.net":10009},{"electrum1.cipig.net":10009}],
+  "HUSH": [{"173.212.225.176": 50013},{"136.243.45.140": 50013}],
+  "JUMBLR": [{"electrum2.cipig.net": 10004},{"electrum1.cipig.net": 10004}],
+  "KMD": [{"electrum2.cipig.net":10001},{"electrum1.cipig.net":10001}],
+  "LTC": [{"173.212.225.176": 50012},{"136.243.45.140": 50012}],
+  "MNZ": [{"electrum2.cipig.net":10002},{"electrum1.cipig.net":10002}],
+  "MONA": [{"173.212.225.176": 50002},{"136.243.45.140": 50002}],
+  "MSHARK": [{"electrum2.cipig.net": 10013},{"electrum1.cipig.net": 10013}],
+  "NMC": [{"173.212.225.176": 50036},{"136.243.45.140": 50036}],
+  "PANGEA": [{"electrum2.cipig.net": 10010},{"electrum1.cipig.net": 10010}],
+  "REVS": [{"electrum2.cipig.net": 10003},{"electrum1.cipig.net": 10003}],
+  "SUPERNET": [{"electrum2.cipig.net": 10005},{"electrum1.cipig.net": 10005}],
+  "VIA": [{"173.212.225.176": 50033},{"136.243.45.140": 50033}],
+  "VTC": [{"173.212.225.176": 50088},{"136.243.45.140": 50088}],
+  "WLC": [{"electrum2.cipig.net": 10014},{"electrum1.cipig.net": 10014}],
+  "ZEC": [{"173.212.225.176": 50032},{"136.243.45.140": 50032}]
+};
+
+module.exports = (shepherd) => {
+  shepherd.electrumServersList = electrumServersList;
+  return shepherd;
+};

routes/shepherd/dex/mmControl.js

@@ -62,7 +62,18 @@ module.exports = (shepherd) => {
 
   shepherd.getCoinsHelper = () => {
     const defaultCoinsListFile = path.join(__dirname, '../dex/coins.json');
-    shepherd.mmPublic.coinsHelper = fs.readJsonSync(defaultCoinsListFile, { throws: false });
+    const _coins = fs.readJsonSync(defaultCoinsListFile, { throws: false });
+    let coins = {};
+
+    for (let i = 0; i < _coins.length; i++) {
+      coins[_coins[i].coin] = _coins[i];
+    }
+    coins.MNZ.name = 'Monaize';
+    coins.KMD =  { coin: 'KMD', name: 'Komodo' };
+    coins.BTC = { coin: 'BTC', name: 'Bitcoin' };
+    coins.IOP.name = 'Internet of People';
+
+    shepherd.mmPublic.coinsHelper = coins;
   }
 
   shepherd.getRates = () => {

version

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

version_build

@@ -1 +1 @@
-0.2.0.25c-beta
+0.2.0.25d-beta