Merge pull request #71 from pbca26/master

added iguana port override

gui/index.html

@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="loading.css">
     <script type="text/javascript" src="module-hack.js"></script>
     <script type="text/javascript" src="EasyDEX-GUI/assets/global/vendor/jquery/jquery.min.js"></script>
+    <script type="text/javascript" src="EasyDEX-GUI/assets/scripts/config.js"></script>
     <script type="text/javascript" src="bluebird.min.js"></script>
     <script type="text/javascript" src="loading.js"></script>
     <script type="text/javascript" src="jRoll.min.js"></script>

gui/init.js

@@ -17,7 +17,7 @@ $(document).ready(function() {
 
   var portcheck;
 
-  function sartcheck() {
+  function startcheck() {
     portcheck = setInterval(function(){
       Iguana_activehandle().then(function(result){
         console.log(result);
@@ -37,5 +37,5 @@ $(document).ready(function() {
     clearInterval(portcheck);
   }
 
-  sartcheck();
+  startcheck();
 });

gui/loading.js

@@ -4,6 +4,7 @@ function IguanaAJAX(url, ajax_data) {
     url: url,
     type: 'POST',
     dataType: 'json',
+    timeout: 120000
     //beforeSend: showLoadingImgFn
   })
   .fail(function(xhr, textStatus, error) {
@@ -17,7 +18,7 @@ function Iguana_activehandle(callback) {
           'agent': 'SuperNET',
           'method': 'activehandle'
         },
-        AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+        AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
           //console.log(AjaxOutputData.responseText);
           AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
           //console.log(AjaxOutputData);
@@ -95,7 +96,7 @@ function EDEX_DEXnotarychains() {
       'agent': 'dpow',
       'method': 'notarychains'
     },
-    AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+    AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
       //console.log(AjaxOutputData.responseText);
       AjaxOutputData = JSON.parse(AjaxOutputData.responseText);
       //console.log(AjaxOutputData);
@@ -124,7 +125,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
           'method': 'notarychains'
         },
         tmp_index = 0,
-        get_dex_notarychains = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+        get_dex_notarychains = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
           get_dex_notarychains = JSON.parse(get_dex_notarychains.responseText);
           if (minNotaries > get_dex_notarychains.length) { // if config value exceeds total num of notaries
             minNotaries = get_dex_notarychains.length;
@@ -144,7 +145,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
             console.log(ajax_data);
 
             if (coin_value !== 'MESH' || coin_value !== 'CEAL') {
-              var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+              var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
                 getinfo_each_chain = JSON.parse(getinfo_each_chain.responseText);
                 console.log(getinfo_each_chain);
 

main.js

@@ -101,7 +101,7 @@ server.listen(appConfig.iguanaAppPort, function() {
 	console.log('guiapp and sockets.io are listening on port ' + appConfig.iguanaAppPort + '!');
 });
 
-io.set('origins', 'http://127.0.0.1:17777'); // set origin
+io.set('origins', 'http://127.0.0.1:' + appConfig.iguanaAppPort); // set origin
 
 io.on('connection', function(client) {
 	console.log('EDEX GUI is connected...');

routes/cache.js

@@ -561,7 +561,14 @@ cache.one = function(req, res, next) {
           getAddresses(coin);
         }
       } else {
-        callStack[coin] = callStack[coin] + (coin === 'BTC' ? callsArray.length : callsArray.length - 2);
+        var callsArrayBTC = callsArray.length; // restrict BTC and SYS only to listunspent and listtransactions calls
+        if (callsArray.indexOf('getbalance') > - 1) {
+          callsArrayBTC--;
+        }
+        if (callsArray.indexOf('refresh') > - 1) {
+          callsArrayBTC--;
+        }        
+        callStack[coin] = callStack[coin] + (coin === 'BTC' || coin === 'SYS' ? callsArrayBTC : callsArray.length);
         console.log(coin + ' stack len ' + callStack[coin]);
 
         execDEXRequests(coin, address);

routes/shepherd.js

@@ -87,6 +87,49 @@ shepherd.appConfig = {
   }
 };
 
+shepherd.loadLocalConfig = function() {
+  if (fs.existsSync(iguanaDir + '/config.json')) {
+    var localAppConfig = fs.readFileSync(iguanaDir + '/config.json', 'utf8');
+    console.log('app config set from local file');
+
+    // find diff between local and hardcoded configs
+    // append diff to local config
+    var compareJSON = function(obj1, obj2) {
+      var result = {};
+
+      for (var i in obj1) {
+        if (!obj2.hasOwnProperty(i)) {
+          result[i] = obj1[i];
+        }
+      }
+
+      return result;
+    };
+
+    var compareConfigs = compareJSON(shepherd.appConfig, JSON.parse(localAppConfig));
+    if (Object.keys(compareConfigs).length) {
+      var newConfig = Object.assign(JSON.parse(localAppConfig), compareConfigs);
+
+      console.log('config diff is found, updating local config');
+      console.log('config diff:');
+      console.log(compareConfigs);
+
+      shepherd.saveLocalAppConf(newConfig);
+      return newConfig;
+    } else {
+      return JSON.parse(localAppConfig);
+    }
+
+  } else {
+    console.log('local config file is not found!');
+    shepherd.saveLocalAppConf(shepherd.appConfig);
+
+    return shepherd.appConfig;
+  }
+};
+
+shepherd.appConfig = shepherd.loadLocalConfig();
+
 console.log('iguana dir: ' + iguanaDir);
 console.log('iguana bin: ' + iguanaBin);
 console.log('--------------------------')
@@ -465,47 +508,6 @@ shepherd.get('/kick', function(req, res, next) {
   }
 });
 
-shepherd.loadLocalConfig = function() {
-  if (fs.existsSync(iguanaDir + '/config.json')) {
-    var localAppConfig = fs.readFileSync(iguanaDir + '/config.json', 'utf8');
-    console.log('app config set from local file');
-
-    // find diff between local and hardcoded configs
-    // append diff to local config
-    var compareJSON = function(obj1, obj2) {
-      var result = {};
-
-      for (var i in obj1) {
-        if (!obj2.hasOwnProperty(i)) {
-          result[i] = obj1[i];
-        }
-      }
-
-      return result;
-    };
-
-    var compareConfigs = compareJSON(shepherd.appConfig, JSON.parse(localAppConfig));
-    if (Object.keys(compareConfigs).length) {
-      var newConfig = Object.assign(JSON.parse(localAppConfig), compareConfigs);
-
-      console.log('config diff is found, updating local config');
-      console.log('config diff:');
-      console.log(compareConfigs);
-
-      shepherd.saveLocalAppConf(newConfig);
-      return newConfig;
-    } else {
-      return JSON.parse(localAppConfig);
-    }
-
-  } else {
-    console.log('local config file is not found!');
-    shepherd.saveLocalAppConf(shepherd.appConfig);
-
-    return shepherd.appConfig;
-  }
-};
-
 shepherd.readDebugLog = function(fileLocation, lastNLines) {
   return new Promise(
     function(resolve, reject) {
@@ -609,10 +611,12 @@ function herder(flock, data) {
         process.exit(2);
       }
 
+      console.log('iguana core port ' + shepherd.appConfig.iguanaCorePort);
       pm2.start({
         script: iguanaBin, // path to binary
         name: 'IGUANA',
         exec_mode : 'fork',
+        args: ['-port=' + shepherd.appConfig.iguanaCorePort],
         cwd: iguanaDir //set correct iguana directory
       }, function(err, apps) {
         pm2.disconnect(); // Disconnect from PM2