Merge pull request #176 from SuperNETorg/master

update pkg
7 years ago · 87cb8c167e
37 changed files with 82 additions and 62 deletions
--- a/assets/icons/agama_app_icon.icns
+++ b/assets/icons/agama_app_icon.icns
--- a/assets/icons/agama_app_icon.ico
+++ b/assets/icons/agama_app_icon.ico
--- a/assets/icons/agama_icons/128x128.png
+++ b/assets/icons/agama_icons/128x128.png
--- a/assets/icons/agama_icons/16x16.png
+++ b/assets/icons/agama_icons/16x16.png
--- a/assets/icons/agama_icons/24x24.png
+++ b/assets/icons/agama_icons/24x24.png
--- a/assets/icons/agama_icons/256x256.png
+++ b/assets/icons/agama_icons/256x256.png
--- a/assets/icons/agama_icons/32x32.png
+++ b/assets/icons/agama_icons/32x32.png
--- a/assets/icons/agama_icons/48x48.png
+++ b/assets/icons/agama_icons/48x48.png
--- a/assets/icons/agama_icons/64x64.png
+++ b/assets/icons/agama_icons/64x64.png
--- a/assets/icons/agama_icons/96x96.png
+++ b/assets/icons/agama_icons/96x96.png
--- a/assets/icons/agama_icons/agama_app_icon.icns
+++ b/assets/icons/agama_icons/agama_app_icon.icns
--- a/assets/icons/agama_icons/agama_app_icon.ico
+++ b/assets/icons/agama_icons/agama_app_icon.ico
--- a/assets/icons/iguana_app_icon.icns
+++ b/assets/icons/iguana_app_icon.icns
--- a/assets/icons/iguana_app_icon.ico
+++ b/assets/icons/iguana_app_icon.ico
--- a/assets/icons/iguana_app_icon_png/128x128.png
+++ b/assets/icons/iguana_app_icon_png/128x128.png
--- a/assets/icons/iguana_app_icon_png/16x16.png
+++ b/assets/icons/iguana_app_icon_png/16x16.png
--- a/assets/icons/iguana_app_icon_png/24x24.png
+++ b/assets/icons/iguana_app_icon_png/24x24.png
--- a/assets/icons/iguana_app_icon_png/256x256.png
+++ b/assets/icons/iguana_app_icon_png/256x256.png
--- a/assets/icons/iguana_app_icon_png/32x32.png
+++ b/assets/icons/iguana_app_icon_png/32x32.png
--- a/assets/icons/iguana_app_icon_png/48x48.png
+++ b/assets/icons/iguana_app_icon_png/48x48.png
--- a/assets/icons/iguana_app_icon_png/512x512.png
+++ b/assets/icons/iguana_app_icon_png/512x512.png
--- a/assets/icons/iguana_app_icon_png/64x64.png
+++ b/assets/icons/iguana_app_icon_png/64x64.png
--- a/assets/icons/iguana_app_icon_png/96x96.png
+++ b/assets/icons/iguana_app_icon_png/96x96.png
--- a/assets/icons/komodo.icns
+++ b/assets/icons/komodo.icns
--- a/assets/icons/komodo.ico
+++ b/assets/icons/komodo.ico
--- a/assets/icons/komodo_png/128x128.png
+++ b/assets/icons/komodo_png/128x128.png
--- a/assets/icons/komodo_png/16x16.png
+++ b/assets/icons/komodo_png/16x16.png
--- a/assets/icons/komodo_png/24x24.png
+++ b/assets/icons/komodo_png/24x24.png
--- a/assets/icons/komodo_png/256x256.png
+++ b/assets/icons/komodo_png/256x256.png
--- a/assets/icons/komodo_png/32x32.png
+++ b/assets/icons/komodo_png/32x32.png
--- a/assets/icons/komodo_png/48x48.png
+++ b/assets/icons/komodo_png/48x48.png
--- a/assets/icons/komodo_png/512x512.png
+++ b/assets/icons/komodo_png/512x512.png
--- a/assets/icons/komodo_png/64x64.png
+++ b/assets/icons/komodo_png/64x64.png
--- a/assets/icons/komodo_png/96x96.png
+++ b/assets/icons/komodo_png/96x96.png
--- a/gui/startup/index.html
+++ b/gui/startup/index.html
@ -13,7 +13,7 @@
    <script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script>
    <script>if (window.module) module = window.module;</script>
  </head>
-  <body class="agamaMode">
+  <body class="agamaMode loading-window">
    <div class="text-center">
      <div id="agamaMode">
        <div
@ -47,6 +47,9 @@
          <li onClick="closeMainWindow(null, true)">
            <a>Custom</a>
          </li>
+          <li onClick="startKMDPassive()">
+            <a>KMD (passive)</a>
+          </li>
        </ul>
        <button
          id="normalStartBtn"
--- a/main.js
+++ b/main.js
@ -148,7 +148,7 @@ if (os.platform() === 'linux') {
 	iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png');
 }
 if (os.platform() === 'win32') {
-	iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico');
+	iguanaIcon = path.join(__dirname, '/assets/icons/agama_app_icon.ico');
 }

 function createLoadingWindow() {
@ -158,7 +158,7 @@ function createLoadingWindow() {
 	try {
 		loadingWindow = new BrowserWindow({
 			width: 500,
-			height: 335,
+			height: 355,
 			frame: false,
 			icon: iguanaIcon,
 			show: false,
--- a/routes/shepherd.js
+++ b/routes/shepherd.js
@ -98,14 +98,15 @@ shepherd.defaultAppConfig = Object.assign({}, shepherd.appConfig);

 shepherd.coindInstanceRegistry = coindInstanceRegistry;

-shepherd.startKMDNative = function(selection) {
+shepherd.startKMDNative = function(selection, isManual) {
  if (selection === 'KMD') {
    const herdData = {
      'ac_name': 'komodod',
      'ac_options': [
        '-daemon=0',
        '-addnode=78.47.196.146',
-      ]
+      ],
+      'manualStart': isManual,
    };

    const options = {
@ -1568,7 +1569,7 @@ shepherd.quitKomodod = function(timeout = 100) {
 }

 shepherd.getConf = function(chain) {
-  const _confLocation = chain === 'komodod' ? (os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`) : `${komodoDir}/${chain}/${chain}.conf`;
+  const _confLocation = chain === 'komodod' ? `${komodoDir}/komodo.conf` : `${komodoDir}/${chain}/${chain}.conf`;
  // komodoDir

  if (fs.existsSync(_confLocation)) {
@ -2312,6 +2313,7 @@ shepherd.post('/herd', function(req, res) {
  console.log('======= req.body =======');
  console.log(req.body);

+  if (!req.body.options.manualStart) {
    function testCoindPort() {
      if (!lockDownAddCoin) {
        const _port = assetChainPorts[req.body.options.ac_name];
@ -2362,6 +2364,16 @@ shepherd.post('/herd', function(req, res) {
        result: 'result',
      };

+      res.end(JSON.stringify(obj));
+    }
+  } else {
+    herder(req.body.herd, req.body.options);
+
+    const obj = {
+      msg: 'success',
+      result: 'result',
+    };
+
    res.end(JSON.stringify(obj));
  }
 });
@ -2790,10 +2802,11 @@ function herder(flock, data) {
          console.log(`daemon param ${data.ac_custom_param}`);

          coindInstanceRegistry[data.ac_name] = true;
+          if (!data.manualStart) {
            let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
            _arg = _arg.trim().split(' ');
            execFile(`${komododBin}`, _arg, {
-            maxBuffer: 1024 * 10000 // 10 mb
+              maxBuffer: 1024 * 500000 // 500 mb
            }, function(error, stdout, stderr) {
              shepherd.writeLog(`stdout: ${stdout}`);
              shepherd.writeLog(`stderr: ${stderr}`);
@ -2806,12 +2819,16 @@ function herder(flock, data) {
                  cache.io.emit('service', {
                    komodod: {
                      error: 'run -reindex',
-                  }
+                    },
                  });
                }
              }
            });
+          }
        } else {
+          if (data.manualStart) {
+            coindInstanceRegistry[data.ac_name] = true;
+          }
          console.log(`port ${_port} (${data.ac_name}) is already in use`);
          shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`);
        }
@ -2885,7 +2902,7 @@ shepherd.setConfKMD = function() {
  }

  // check if kmd conf exists
-  _fs.access(os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) {
+  _fs.access(`${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) {
    if (err) {
      console.log('creating komodo conf');
      shepherd.writeLog(`creating komodo conf in ${komodoDir}/komodo.conf`);
@ -2922,7 +2939,7 @@ function setConf(flock) {
  let DaemonConfPath;
  switch (flock) {
    case 'komodod':
-      DaemonConfPath = os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`;
+      DaemonConfPath = `${komodoDir}/komodo.conf`;

      if (os.platform() === 'win32') {
        DaemonConfPath = path.normalize(DaemonConfPath);