resolved merge conflicts

AgamaApp-windows.md

@@ -0,0 +1,12 @@
+# Agama application build summary is here:
+
+Platform: windows
+
+Version:  0.2.0.1a-beta
+
+Date: Mon Jun 12 11:57:21 CEST 2017
+
+
+Download link:
+* [https://f001.backblazeb2.com/file/supernet/files/AgamaApp-0.2.0.1a-beta-windows-installer.zip](https://f001.backblazeb2.com/file/supernet/files/AgamaApp-0.2.0.1a-beta-windows-installer.zip)
+* [checksum](https://f001.backblazeb2.com/file/supernet/files/AgamaApp-0.2.0.1a-beta-windows.checksum)

assets/bin/win64/genkmdconf.bat

@@ -1,19 +0,0 @@
-mkdir %AppData%\Komodo
-
-@echo off
-
-IF NOT EXIST %AppData%\Komodo\komodo.conf (
-   (
-    echo rpcuser=kmdusr%random%%random%
-    echo rpcpassword=kmdpass%random%%random%
-    echo rpcbind=127.0.0.1
-	echo txindex=1
-	echo server=1
-	echo addnode=5.9.102.210
-	echo addnode=78.47.196.146
-	echo addnode=178.63.69.164
-	echo addnode=88.198.65.74
-	echo addnode=5.9.122.241
-	echo addnode=144.76.94.38
-    ) > %AppData%\Komodo\komodo.conf
-)

binary_artifacts.sh

@@ -1,58 +1,52 @@
 echo Refreshing binaries from artifacts.supernet.org
 echo =========================================
 echo Step: Removing old binaries
-mkdir -p build
+pwd
-cd build
+[ ! -d assets ] && \
-rm -rvf artifacts.supernet.org
+  mkdir -p assets
+cd assets
+[ -d artifacts.supernet.org ] && \
+  echo Removing old artifacts. && \
+  rm -rvf artifacts.supernet.org
 echo
 echo Step: Cloning latest binaries for build
 wget --recursive --no-parent https://artifacts.supernet.org/latest/
-chmod -R +x artifacts.supernet.org/latest/
 cd ..
 echo =========================================
-echo 
+echo
-echo =========================================
+pwd
-echo Step: Moving osx binaries from artifacts to assets/bin/osx/
-echo 
-mv -fv build/artifacts.supernet.org/latest/osx/iguana assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/komodo-cli assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/komodod assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/libgcc_s.1.dylib assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/libgomp.1.dylib assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/libnanomsg.5.0.0.dylib assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/osx/libstdc++.6.dylib assets/bin/osx/
-echo 
 echo =========================================
-echo Step: Moving Win64 binaries from artifacts to assets/bin/win64/
+echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/
-echo 
+echo
-mv -fv build/artifacts.supernet.org/latest/windows/genkmdconf.bat assets/bin/win64/
+chmod +x assets/artifacts.supernet.org/latest/osx/iguana \
-mv -fv build/artifacts.supernet.org/latest/windows/iguana.exe assets/bin/win64/
+  assets/artifacts.supernet.org/latest/osx/komodo*
-mv -fv build/artifacts.supernet.org/latest/windows/index.html assets/bin/win64/
+
-mv -fv build/artifacts.supernet.org/latest/windows/komodo-cli.exe assets/bin/win64/
+#cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/
-mv -fv build/artifacts.supernet.org/latest/windows/komodo-tx.exe assets/bin/win64/
+mkdir assets/bin
-mv -fv build/artifacts.supernet.org/latest/windows/komodod.exe assets/bin/win64/
+echo Moving OSX bins to assets/bin
-mv -fv build/artifacts.supernet.org/latest/windows/libcrypto-1_1.dll assets/bin/win64/
+wget https://supernetorg.bintray.com/binaries/komodo_OSX_latest.zip
-mv -fv build/artifacts.supernet.org/latest/windows/libcurl-4.dll assets/bin/win64/
+checksum=`shasum -a 256 komodo_OSX_latest.zip | awk '{ print $1 }'`
-mv -fv build/artifacts.supernet.org/latest/windows/libcurl.dll assets/bin/win64/
+if [ "$checksum" = "c20a1b7268dd0d9bbc8984a0e76cc868d8b4479af18cd1dde4406f63b7f12255" ]; then
-mv -fv build/artifacts.supernet.org/latest/windows/libgcc_s_sjlj-1.dll assets/bin/win64/
+    echo "Checksum is correct."
-mv -fv build/artifacts.supernet.org/latest/windows/libnanomsg.dll assets/bin/win64/
+    unzip komodo_OSX_latest.zip
-mv -fv build/artifacts.supernet.org/latest/windows/libssl-1_1.dll assets/bin/win64/
+    mv komodo_OSX_latest assets/bin/osx
-mv -fv build/artifacts.supernet.org/latest/windows/libwinpthread-1.dll assets/bin/win64/
+  else
-mv -fv build/artifacts.supernet.org/latest/windows/nanomsg.dll assets/bin/win64/
+    echo "Checksum is incorrect!"
-mv -fv build/artifacts.supernet.org/latest/windows/pthreadvc2.dll assets/bin/win64/
+    exit 0
-echo 
+fi
 echo =========================================
-echo Step: Moving linux64 binaries from artifacts to assets/bin/linux64
+echo Step: Moving Windows binaries from artifacts to assets/bin/win64/
-echo 
+#echo
-mv -fv build/artifacts.supernet.org/latest/linux/iguana assets/bin/linux64/
+mv assets/artifacts.supernet.org/latest/windows assets/bin/win64
-mv -fv build/artifacts.supernet.org/latest/linux/komodo-cli assets/bin/linux64/
+echo
-mv -fv build/artifacts.supernet.org/latest/linux/komodod assets/bin/linux64/
-echo 
 echo =========================================
-echo Step: Cleaning artifacts data
+echo Step: Permissions +x for linux64 binaries from artifacts to assets/bin/linux64
-echo 
+echo
-rm -rf build/
+chmod +x assets/artifacts.supernet.org/latest/linux/iguana \
-echo 
+  assets/artifacts.supernet.org/latest/linux/komodo*
+echo Moving Linux bins to assets/bin
+mv assets/artifacts.supernet.org/latest/linux assets/bin/linux64/
+echo
 echo =========================================
 echo Step: Finished Updating binaries from artifacts
-echo 
+echo

buildscripts/easydex-build.sh

@@ -12,10 +12,12 @@ echo "Checkout to redux branch."
 git checkout redux
 git pull origin redux
 
+[ -d react ] && cd react || echo "!!! I can't find react"
+echo "Actual directory is: ${PWD}"
 echo "Installing nodejs modules."
 npm install 
 npm install webpack
 
 echo "Building EasyDEX-GUI app."
 npm run build 
-echo "EasyDEX-GUI is built!"
+echo "EasyDEX-GUI is built!"

buildscripts/electron-build-linux.sh

@@ -3,25 +3,16 @@
 ### Created by mmaxian, 3/2017
 
 [ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0
+[ ! -d build ] && mkdir build
 
 echo
-echo =========================================
-echo Step: Removing old binaries
-rm -rvf artifacts.supernet.org
-echo
-echo Step: Cloning latest binaries for build
-wget --recursive --no-parent -q https://artifacts.supernet.org/latest/linux/
-find artifacts.supernet.org/latest/linux/ -exec ls -l {} \;
-cd ..
-echo =========================================
-echo
-
 echo "Build script for Iguana application for Linux x64 platform."
 echo "Preparing electron package $AGAMA_VERSION"
 
 electron-packager . --platform=linux --arch=x64 \
   --icon=assets/icons/agama_icons/128x128.png \
-  --out=build/ --buildVersion=$AGAMA_VERSION \
+  --out=build/ \
-  --ignore=build/artifacts.supernet.org/latest/windows \
+  --buildVersion=$AGAMA_VERSION \
-  --ignore=build/artifacts.supernet.org/latest/osx \
+  --ignore=assets/bin/win64 \
+  --ignore=assets/bin/osx \
   --overwrite

buildscripts/electron-build-osx.sh

@@ -3,25 +3,15 @@
 ### Created by mmaxian, 3/2017
 
 [ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0
+[ ! -d build ] && mkdir build
 
 echo
-echo =========================================
-echo Step: Removing old binaries
-rm -rvf artifacts.supernet.org
-echo
-echo Step: Cloning latest binaries for build
-wget --recursive --no-parent -q https://artifacts.supernet.org/latest/osx/
-find artifacts.supernet.org/latest/osx/ -exec ls -l {} \;
-cd ..
-echo =========================================
-echo
-
 echo "Build script for Iguana application for MacOS platform."
 echo "Preparing electron package $AGAMA_VERSION"
 
 electron-packager . --platform=darwin --arch=x64 \
   --icon=assets/icons/agama_app_icon.icns \
   --out=build/ --buildVersion=$AGAMA_VERSION \
-  --ignore=build/artifacts.supernet.org/latest/windows \
+  --ignore=assets/bin/win64 \
-  --ignore=build/artifacts.supernet.org/latest/linux \
+  --ignore=assets/bin/linux64 \
-  --overwrite
+  --overwrite

buildscripts/electron-build-windows.sh

@@ -3,29 +3,19 @@
 ### Created by mmaxian, 3/2017
 
 [ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0
+[ ! -d build ] && mkdir build
 
 echo
-echo =========================================
-echo Step: Removing old binaries
-rm -rvf artifacts.supernet.org
-echo
-echo Step: Cloning latest binaries for build
-wget --recursive --no-parent -q https://artifacts.supernet.org/latest/windows/
-find artifacts.supernet.org/latest/windows/ -exec ls -l {} \;
-cd ..
-echo =========================================
-echo
-
 echo "Build script for Iguana application for Windows x64 platform."
 echo "Preparing electron package $AGAMA_VERSION"
 
 electron-packager . --platform=win32 \
   --arch=ia32 \
   --icon=assets/icons/agama_app_icon.ico \
-  --out=build \
+  --out=build/ \
   --buildVersion=$AGAMA_VERSION \
-  --ignore=build/artifacts.supernet.org/latest/osx \
+  --ignore=assets/bin/osx \
-  --ignore=build/artifacts.supernet.org/latest/linux \
+  --ignore=assets/bin/linux64 \
   --overwrite \
   --version-string.CompanyName="SuperNET" \
   --version-string.FileDescription="Agama" \

main.js

@@ -7,7 +7,8 @@ const electron = require('electron'),
 			path = require('path'),
 			url = require('url'),
 			os = require('os'),
-			md5 = require('./routes/md5.js'),
+			md5 = require('./routes/md5'),
+			exec = require('child_process').exec,
 			{ Menu } = require('electron'),
 			portscanner = require('portscanner'),
 			osPlatform = os.platform(),

private/kmdcli.js

@@ -116,11 +116,11 @@ function parse_kmdcli_commands(callback) {
  *     "notaryid" : -1,
  *     "pubkey" : "000000000000000000000000000000000000000000000000000000000000000000"
  * }
- * 
+ *
  */
 function command(kmd_command, callback) {
   if (callback) {
     return this.exec(komodocliBin + " " + kmd_command,
-      parse_kmdcli_commands(callback));  
+      parse_kmdcli_commands(callback));
   }
 }