diff --git a/AgamaApp-windows.md b/AgamaApp-windows.md new file mode 100644 index 0000000..b5c3a21 --- /dev/null +++ b/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) diff --git a/README.md b/README.md index dafcb25..dc0a57e 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,20 @@ You must have `node.js` and `npm` installed on your machine. Clone Agama Desktop App with EasyDEX-GUI submodule ```shell -git clone --recursive https://github.com/SuperNETorg/Agama.git -cd gui/EasyDEX-GUI/ -git checkout master -git pull -cd ../../ +1) git clone https://github.com/supernetorg/agama --recursive --branch pkg_automation_electrum --single-branch +with this command you git clone agama - but explicitly just the pkg_automation_electrum branch (therefore --single-branch) which we also use for the release packages. +2) cd agama && cd gui/EasyDEX-GUI/ +3) git checkout electrum && git pull origin electrum +4) npm install && npm install webpack +5) ./binary_artifacts.sh +6) npm start in projects' root folder +7) cd gui/EasyDEX-GUI/react/src +8) npm start +8) toggle dev and debug options in settings +9) restart the app +10) sync komodod and/or asset chains + +You're ready to dev ``` Install Agama App @@ -25,34 +34,6 @@ npm start ``` ### Important dev notes -#### Use the following config.json for dev -Place it in ./iguana folder. -``` -{ -"edexGuiOnly": true, -"iguanaGuiOnly": false, -"manualIguanaStart": false, -"skipBasiliskNetworkCheck": true, -"minNotaries": 8, -"host": "127.0.0.1", -"agamaPort": 17777, -"iguanaCorePort": 7778, -"maxDescriptors": { -"darwin": 90000, -"linux": 1000000 -}, -"killIguanaOnStart": true, -"dev": true, -"v2": true, -"useBasiliskInstance": true, -"debug": true, -"iguanaAppPort": 17777, -"forks": { -"basilisk": false, -"all": false -} -} -``` #### Sockets.io In dev mode backend is configured to send/receive messages from/to http://127.0.0.1:3000 address. If you open it as http://localhost:3000 sockets server will reject any messages. diff --git a/assets/bin/linux64/iguana b/assets/bin/linux64/iguana deleted file mode 100755 index d415468..0000000 Binary files a/assets/bin/linux64/iguana and /dev/null differ diff --git a/assets/bin/linux64/komodo-cli b/assets/bin/linux64/komodo-cli deleted file mode 100755 index c374e86..0000000 Binary files a/assets/bin/linux64/komodo-cli and /dev/null differ diff --git a/assets/bin/linux64/komodod b/assets/bin/linux64/komodod deleted file mode 100755 index c7f7816..0000000 Binary files a/assets/bin/linux64/komodod and /dev/null differ diff --git a/assets/bin/osx/iguana b/assets/bin/osx/iguana deleted file mode 100755 index 8fec2b9..0000000 Binary files a/assets/bin/osx/iguana and /dev/null differ diff --git a/assets/bin/osx/komodo-cli b/assets/bin/osx/komodo-cli deleted file mode 100755 index f54422a..0000000 Binary files a/assets/bin/osx/komodo-cli and /dev/null differ diff --git a/assets/bin/osx/komodod b/assets/bin/osx/komodod deleted file mode 100755 index dd61c7e..0000000 Binary files a/assets/bin/osx/komodod and /dev/null differ diff --git a/assets/bin/osx/libgcc_s.1.dylib b/assets/bin/osx/libgcc_s.1.dylib deleted file mode 100644 index 91345fc..0000000 Binary files a/assets/bin/osx/libgcc_s.1.dylib and /dev/null differ diff --git a/assets/bin/osx/libgomp.1.dylib b/assets/bin/osx/libgomp.1.dylib deleted file mode 100644 index 5facb01..0000000 Binary files a/assets/bin/osx/libgomp.1.dylib and /dev/null differ diff --git a/assets/bin/osx/libnanomsg.5.0.0.dylib b/assets/bin/osx/libnanomsg.5.0.0.dylib deleted file mode 100644 index 42ab613..0000000 Binary files a/assets/bin/osx/libnanomsg.5.0.0.dylib and /dev/null differ diff --git a/assets/bin/osx/libstdc++.6.dylib b/assets/bin/osx/libstdc++.6.dylib deleted file mode 100644 index 9175aa5..0000000 Binary files a/assets/bin/osx/libstdc++.6.dylib and /dev/null differ diff --git a/assets/bin/win64/genkmdconf.bat b/assets/bin/win64/genkmdconf.bat deleted file mode 100644 index 6ffc9e9..0000000 --- a/assets/bin/win64/genkmdconf.bat +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/assets/bin/win64/iguana.exe b/assets/bin/win64/iguana.exe deleted file mode 100644 index 375a6f9..0000000 Binary files a/assets/bin/win64/iguana.exe and /dev/null differ diff --git a/assets/bin/win64/komodo-cli.exe b/assets/bin/win64/komodo-cli.exe deleted file mode 100644 index 81e8d9d..0000000 Binary files a/assets/bin/win64/komodo-cli.exe and /dev/null differ diff --git a/assets/bin/win64/komodod.exe b/assets/bin/win64/komodod.exe deleted file mode 100644 index e11a760..0000000 Binary files a/assets/bin/win64/komodod.exe and /dev/null differ diff --git a/assets/bin/win64/libcrypto-1_1.dll b/assets/bin/win64/libcrypto-1_1.dll deleted file mode 100755 index 4b16b67..0000000 Binary files a/assets/bin/win64/libcrypto-1_1.dll and /dev/null differ diff --git a/assets/bin/win64/libcurl-4.dll b/assets/bin/win64/libcurl-4.dll deleted file mode 100755 index 6a73485..0000000 Binary files a/assets/bin/win64/libcurl-4.dll and /dev/null differ diff --git a/assets/bin/win64/libcurl.dll b/assets/bin/win64/libcurl.dll deleted file mode 100755 index 8c80e23..0000000 Binary files a/assets/bin/win64/libcurl.dll and /dev/null differ diff --git a/assets/bin/win64/libgcc_s_sjlj-1.dll b/assets/bin/win64/libgcc_s_sjlj-1.dll deleted file mode 100755 index 5f5b6a7..0000000 Binary files a/assets/bin/win64/libgcc_s_sjlj-1.dll and /dev/null differ diff --git a/assets/bin/win64/libnanomsg.dll b/assets/bin/win64/libnanomsg.dll deleted file mode 100755 index 5d5dc7e..0000000 Binary files a/assets/bin/win64/libnanomsg.dll and /dev/null differ diff --git a/assets/bin/win64/libssl-1_1.dll b/assets/bin/win64/libssl-1_1.dll deleted file mode 100755 index dee3878..0000000 Binary files a/assets/bin/win64/libssl-1_1.dll and /dev/null differ diff --git a/assets/bin/win64/libwinpthread-1.dll b/assets/bin/win64/libwinpthread-1.dll deleted file mode 100755 index 67b9289..0000000 Binary files a/assets/bin/win64/libwinpthread-1.dll and /dev/null differ diff --git a/assets/bin/win64/nanomsg.dll b/assets/bin/win64/nanomsg.dll deleted file mode 100644 index 5d5dc7e..0000000 Binary files a/assets/bin/win64/nanomsg.dll and /dev/null differ diff --git a/assets/bin/win64/pthreadvc2.dll b/assets/bin/win64/pthreadvc2.dll deleted file mode 100644 index 93f562b..0000000 Binary files a/assets/bin/win64/pthreadvc2.dll and /dev/null differ diff --git a/binary_artifacts.sh b/binary_artifacts.sh index 569b657..e1be581 100755 --- a/binary_artifacts.sh +++ b/binary_artifacts.sh @@ -1,58 +1,54 @@ echo Refreshing binaries from artifacts.supernet.org echo ========================================= echo Step: Removing old binaries -mkdir -p build -cd build -rm -rvf artifacts.supernet.org +pwd +[ ! -d assets ] && \ + 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 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 +pwd echo ========================================= -echo Step: Moving Win64 binaries from artifacts to assets/bin/win64/ -echo -mv -fv build/artifacts.supernet.org/latest/windows/genkmdconf.bat assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/iguana.exe assets/bin/win64/ -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/ -mv -fv build/artifacts.supernet.org/latest/windows/komodo-tx.exe assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/komodod.exe assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libcrypto-1_1.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libcurl-4.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libcurl.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libgcc_s_sjlj-1.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libnanomsg.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libssl-1_1.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/libwinpthread-1.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/nanomsg.dll assets/bin/win64/ -mv -fv build/artifacts.supernet.org/latest/windows/pthreadvc2.dll assets/bin/win64/ -echo +echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/ +echo +rm assets/artifacts.supernet.org/latest/osx/iguana +chmod +x assets/artifacts.supernet.org/latest/osx/komodo* + +mkdir assets/bin +mv assets/artifacts.supernet.org/latest/osx assets/bin/osx + +echo Moving legacy libs to assets/bin +wget https://supernetorg.bintray.com/misc/libs_legacy_osx.zip +checksum=`shasum -a 256 libs_legacy_osx.zip | awk '{ print $1 }'` +if [ "$checksum" = "e9474aa243694a2d4c87fccc443e4b16a9a5172a24da76af9e5ecddd006649bb" ]; then + echo "Checksum is correct." + unzip libs_legacy_osx.zip + cp -rvf libs_legacy_osx/* assets/bin/osx/. + else + echo "Checksum is incorrect!" + exit 0 +fi echo ========================================= -echo Step: Moving linux64 binaries from artifacts to assets/bin/linux64 -echo -mv -fv build/artifacts.supernet.org/latest/linux/iguana assets/bin/linux64/ -mv -fv build/artifacts.supernet.org/latest/linux/komodo-cli assets/bin/linux64/ -mv -fv build/artifacts.supernet.org/latest/linux/komodod assets/bin/linux64/ -echo +echo Step: Moving Windows binaries from artifacts to assets/bin/win64/ +#echo +rm assets/artifacts.supernet.org/latest/windows/iguana +mv assets/artifacts.supernet.org/latest/windows assets/bin/win64 +echo echo ========================================= -echo Step: Cleaning artifacts data -echo -rm -rf build/ -echo +echo Step: Permissions +x for linux64 binaries from artifacts to assets/bin/linux64 +echo +rm assets/artifacts.supernet.org/latest/linux/iguana +chmod +x 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 \ No newline at end of file +echo \ No newline at end of file diff --git a/buildscripts/easydex-build.sh b/buildscripts/easydex-build.sh index 05df38a..164e21a 100755 --- a/buildscripts/easydex-build.sh +++ b/buildscripts/easydex-build.sh @@ -9,13 +9,15 @@ echo "Building EasyDEX-GUI" echo "Actual directory is: ${PWD}" echo "Checkout to redux branch." -git checkout redux -git pull origin redux +git checkout electrum +git pull origin electrum +[ -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!" \ No newline at end of file +echo "EasyDEX-GUI is built!" diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index 15463ed..f906e50 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -3,25 +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/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 \ - --ignore=build/artifacts.supernet.org/latest/windows \ - --ignore=build/artifacts.supernet.org/latest/osx \ - --overwrite \ No newline at end of file + --out=build/ \ + --buildVersion=$AGAMA_VERSION \ + --ignore=assets/bin/win64 \ + --ignore=assets/bin/osx \ + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ + --overwrite diff --git a/buildscripts/electron-build-osx.sh b/buildscripts/electron-build-osx.sh index eeba0fe..08765cb 100755 --- a/buildscripts/electron-build-osx.sh +++ b/buildscripts/electron-build-osx.sh @@ -3,25 +3,18 @@ ### 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=build/artifacts.supernet.org/latest/linux \ - --overwrite \ No newline at end of file + --ignore=assets/bin/win64 \ + --ignore=assets/bin/linux64 \ + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ + --overwrite diff --git a/buildscripts/electron-build-windows.sh b/buildscripts/electron-build-windows.sh index e9be400..f767aaf 100755 --- a/buildscripts/electron-build-windows.sh +++ b/buildscripts/electron-build-windows.sh @@ -3,33 +3,26 @@ ### 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=build/artifacts.supernet.org/latest/linux \ + --ignore=assets/bin/osx \ + --ignore=assets/bin/linux64 \ + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ --overwrite \ --version-string.CompanyName="SuperNET" \ --version-string.FileDescription="Agama" \ --version-string.OriginalFilename="Agama" \ --version-string.ProductName="Agama" \ --version-string.InternalName="Agama" \ - --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved." \ No newline at end of file + --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved." diff --git a/gui/startup/agama-instance-error.html b/gui/startup/agama-instance-error.html index 0fda6ba..e16f766 100644 --- a/gui/startup/agama-instance-error.html +++ b/gui/startup/agama-instance-error.html @@ -3,14 +3,12 @@
- - @@ -30,6 +28,5 @@ class="btn btn-primary btn-close-app">Quit -