Merge pull request #17 from VerusCoin/dev

Dev

.gitlab-ci.yml

@@ -8,12 +8,12 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: master
-  VERUS_VERSION: 0.6.3-beta
-  VERUSCOIN_VERSION: 0.6.3
+  VERUS_VERSION: 0.6.4-beta
+  VERUSCOIN_VERSION: 0.6.4
   KOMODO_VERSION: 0.5.2
   BINARY_SOURCE: VerusCoin
-  EASYDEX_GUI_BUILD: build.tar.gz
-  VERUS_APPIMAGE: Verus-Desktop-Linux-v${VERUS_VERSION}.AppImage
+  VERUS_APPIMAGE_X64: Verus-Desktop-Linux-v${VERUS_VERSION}-x86_64.AppImage
+  VERUS_APPIMAGE_ARM64: Verus-Desktop-Linux-v${VERUS_VERSION}-arm64.AppImage
   VERUS_LINUX_TAR: Verus-Desktop-Linux-v${VERUS_VERSION}-amd64.tar.gz
   VERUS_LINUX_ARM64_TAR: Verus-Desktop-Linux-v${VERUS_VERSION}-arm64.tar.gz
   VERUS_WINDOWS_ZIP: Verus-Desktop-Windows-v${VERUS_VERSION}.zip
@@ -55,16 +55,20 @@ build:linux:
     - gsutil cp $STAGING/$VERUS_CLI_LINUX .
     - tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}-amd64.tar.gz --strip=1 --directory assets/bin/linux64/verusd
     - rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}-amd64.tar.gz
+    - mkdir -p assets/bin/linux64/komodod
     - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/linux64_${KOMODO_VERSION}.tar.gz
-    - tar -xzvf linux64_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64
+    - tar -xzvf linux64_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64/komodod
     - rm linux64_${KOMODO_VERSION}.tar.gz
-    - strip --strip-unneeded  assets/bin/linux64/komodod && strip --strip-unneeded  assets/bin/linux64/komodo-cli
+    - strip --strip-unneeded  assets/bin/linux64/komodod/komodod && strip --strip-unneeded  assets/bin/linux64/komodod/komodo-cli
+    - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-amd64.tar.gz .
+    - tar -xzvf zcashd-linux-amd64.tar.gz --directory assets/bin/linux64/
+    - rm zcashd-linux-amd64.tar.gz
     - yarn install
   script:
     - yarn run dist
     - cd dist
-    - chmod 755 ${VERUS_APPIMAGE}
-    - tar -czvf ${VERUS_LINUX_TAR} ${VERUS_APPIMAGE}
+    - chmod 755 ${VERUS_APPIMAGE_X64}
+    - tar -czvf ${VERUS_LINUX_TAR} ${VERUS_APPIMAGE_X64}
     - sha256sum ${VERUS_LINUX_TAR} > ${VERUS_LINUX_TAR}.sha256
     - mv ${VERUS_LINUX_TAR} ${VERUS_LINUX_TAR}.sha256 ..
   after_script:
@@ -100,12 +104,15 @@ build:linux:arm64:
     - gsutil cp $STAGING/$VERUS_CLI_LINUX .
     - tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}-arm64.tar.gz --strip=1 --directory assets/bin/linux64/verusd
     - rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}-arm64.tar.gz
+    - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-arm64.tar.gz .
+    - tar -xzvf zcashd-linux-arm64.tar.gz --directory assets/bin/linux64/
+    - rm zcashd-linux-arm64.tar.gz
     - yarn install
   script:
     - yarn run dist --arm64
     - cd dist
-    - chmod 755 ${VERUS_APPIMAGE}
-    - tar -czvf ${VERUS_LINUX_ARM64_TAR} ${VERUS_APPIMAGE}
+    - chmod 755 ${VERUS_APPIMAGE_ARM64}
+    - tar -czvf ${VERUS_LINUX_ARM64_TAR} ${VERUS_APPIMAGE_ARM64}
     - sha256sum ${VERUS_LINUX_ARM64_TAR} > ${VERUS_LINUX_ARM64_TAR}.sha256
     - mv ${VERUS_LINUX_ARM64_TAR} ${VERUS_LINUX_ARM64_TAR}.sha256 ..
   after_script:
@@ -142,15 +149,18 @@ build:windows:
     - yarn install
     - yarn run build
     - cd ../../..
-    - mkdir -p assets/bin/
+    - mkdir -p assets/bin/win64/komodod
+    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/win64_${KOMODO_VERSION}.zip
+    - unzip win64_${KOMODO_VERSION}.zip -d assets/bin/komodod
+    - rm win64_${KOMODO_VERSION}.zip
     - gsutil cp $STAGING/$VERUS_CLI_WINDOWS .
     - unzip -qq Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip -d assets/bin/win64
     - mv assets/bin/win64/verus-cli assets/bin/win64/verusd
-    - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/win64_${KOMODO_VERSION}.zip
-    - unzip win64_${KOMODO_VERSION}.zip -d assets/bin
-    - rm win64_${KOMODO_VERSION}.zip
-    - strip --strip-unneeded  assets/bin/win64/komodod.exe && strip --strip-unneeded  assets/bin/win64/komodo-cli.exe && strip --strip-unneeded  assets/bin/win64/komodo-tx.exe
+    - strip --strip-unneeded  assets/bin/win64/komodod/komodod.exe && strip --strip-unneeded  assets/bin/win64/komodod/komodo-cli.exe && strip --strip-unneeded  assets/bin/win64/komodod/komodo-tx.exe
     - rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip
+    - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-win.tar.gz .
+    - tar -xzvf zcashd-win.tar.gz --directory assets/bin/win64/
+    - rm zcashd-win.tar.gz
     - yarn install
   script:
     - yarn run dist-win
@@ -201,10 +211,14 @@ build:mac:
     - gsutil cp $STAGING/$VERUS_CLI_MACOS .
     - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/macos_${KOMODO_VERSION}.tar.gz
     - mkdir -p assets/bin/osx/verusd
+    - mkdir -p assets/bin/osx/komodod
     - tar -xzf Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/osx/verusd
-    - tar -xzvf macos_${KOMODO_VERSION}.tar.gz  --strip=1 --directory assets/bin/osx
+    - tar -xzvf macos_${KOMODO_VERSION}.tar.gz  --strip=1 --directory assets/bin/osx/komodod
     - rm macos_${KOMODO_VERSION}.tar.gz
     - rm Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz
+    - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-macos.tar.gz .
+    - tar -xzvf zcashd-macos.tar.gz --directory assets/bin/osx/
+    - rm zcashd-macos.tar.gz
     - yarn install
   script:
     - export USE_HARD_LINKS=false

package.json

@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "0.6.3-beta",
+  "version": "0.6.4-beta",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "dist-win": "electron-builder --publish=never  --win",
     "test": "mocha",
     "update-agamalib": "rm -rf node_modules/agama-wallet-lib/ && yarn install",
-    "postinstall": "rm -rf node_modules/bitgo-utxo-lib/node_modules/create-hash"
+    "postinstall": "rm -rf node_modules/bitgo-utxo-lib/node_modules/create-hash && electron-builder install-app-deps"
   },
   "engines": {
     "node": ">11"
@@ -99,8 +99,7 @@
       "artifactName": "${productName}-MacOS-v${version}.${ext}",
       "icon": "assets/icons/agama_icons/vrsc.icns",
       "target": [
-        "dmg",
-        "pkg"
+        "dmg"
       ]
     },
     "dmg": {
@@ -119,14 +118,13 @@
       ]
     },
     "linux": {
-      "artifactName": "${productName}-Linux-v${version}.${ext}",
+      "artifactName": "${productName}-Linux-v${version}-${arch}.${ext}",
       "icon": "assets/icons/agama_icons",
       "desktop": {
         "Encoding": "UTF-8"
       },
       "target": [
-        "appimage",
-        "tar.xz"
+        "appimage"
       ]
     },
     "win": {
@@ -142,7 +140,6 @@
       "allowToChangeInstallationDirectory": true,
       "installerIcon": "assets/icons/vrsc.ico"
     }
-
   },
   "resolutions": {
     "lodash": "^4.17.11",

private/mainmenu.js

@@ -127,7 +127,7 @@ const template = [
         }
       },
       {
-        label: 'Show komodo-cli folder',
+        label: 'Show binary folder',
         click (item, focusedWindow) {
           shell.openItem(pathsDaemons().komodocliDir);
         }

routes/api.js

@@ -15,6 +15,8 @@ api.chainParams = require('./chainParams')
 
 api.coinsInitializing = [];
 api.coindInstanceRegistry = {};
+api.confFileIndex = {};
+api.logFileIndex = {};
 api.coindStdout = {};
 api.guiLog = {};
 api.rpcConf = {};
@@ -82,7 +84,12 @@ api.defaultAppConfig = Object.assign({}, api.appConfig);
 api.kmdMainPassiveMode = false;
 api.native = {
   startParams: {},
+  cache: {
+    tx_cache: {},
+    addr_balance_cache: {}
+  }
 };
+
 api.seed = null;
 
 // prices and price APIs
@@ -118,6 +125,7 @@ api = require('./api/electrum/remove')(api);
 api = require('./api/electrum/send.js')(api);
 
 //native
+api = require('./api/native/addrBalance.js')(api);
 api = require('./api/native/coins')(api);
 api = require('./api/native/callDaemon')(api);
 api = require('./api/native/addresses')(api);
@@ -148,17 +156,9 @@ api.coinSupply = {}
 api = require('./api/network/fees/btc/btcFees')(api)
 api = require('./api/network/fees/networkFees')(api)
 api = require('./api/network/supply/vrsc/vrscCoinSupply')(api)
+api = require('./api/network/supply/zec/zecCoinSupply')(api)
 api = require('./api/network/supply/coinSupply')(api)
 
-
-// dex
-/*api = require('./api/dex/coind.js')(api);
-api = require('./api/dex/mmControl.js')(api);
-api = require('./api/dex/mmRequest.js')(api);
-api = require('./api/dex/electrumServersList.js')(api);
-api = require('./api/coins.js')(api);*/
-
-
 // core
 api = require('./api/dashboardUpdate.js')(api);
 api = require('./api/binsUtils.js')(api);
@@ -173,6 +173,7 @@ api = require('./api/kickstart.js')(api);
 api = require('./api/debugLog.js')(api);
 api = require('./api/confMaxconnections.js')(api);
 api = require('./api/appInfo.js')(api);
+api = require('./api/conf.js')(api);
 api = require('./api/daemonControl.js')(api);
 api = require('./api/auth.js')(api);
 api = require('./api/coindWalletKeys.js')(api);

routes/api/appInfo.js

@@ -23,7 +23,7 @@ module.exports = (api) => {
     const releaseInfo = api.appBasicInfo;
     const dirs = {
       agamaDir: api.agamaDir,
-      komodoDir: api.komodoDir,
+      kmdDir: api.kmdDir,
       komododBin: api.komododBin,
       configLocation: `${api.agamaDir}/config.json`,
       cacheLocation: `${api.agamaDir}/spv-cache.json`,

routes/api/binsUtils.js

@@ -5,7 +5,7 @@ const exec = require('child_process').exec;
 
 module.exports = (api) => {
   // osx and linux
-  api.binFixRights = () => {
+  /*api.binFixRights = () => {
     const osPlatform = os.platform();
     const _bins = [
       api.komododBin,
@@ -28,7 +28,7 @@ module.exports = (api) => {
         });
       }
     }
-  }
+  }*/
 
   api.killRogueProcess = (processName) => {
     // kill rogue process copies on start

routes/api/coindWalletKeys.js

@@ -15,7 +15,7 @@ module.exports = (api) => {
       const chain = req.query.chain;
 
       // ref: https://gist.github.com/kendricktan/1e62495150ad236b38616d733aac4eb9
-      let _walletDatLocation = chain === 'komodo' || chain === 'KMD' || chain === 'null' ? `${api.komodoDir}/wallet.dat` : `${api.komodoDir}/${chain}/wallet.dat`;
+      let _walletDatLocation = chain === 'komodo' || chain === 'KMD' || chain === 'null' ? `${api.kmdDir}/wallet.dat` : `${api.kmdDir}/${chain}/wallet.dat`;
       _walletDatLocation = chain === 'CHIPS' ? `${api.chipsDir}/wallet.dat` : _walletDatLocation;
 
       try {