Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -9,9 +9,9 @@ variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME}
   DEFAULT_EASYDEXGUI_BRANCH: ${CI_COMMIT_REF_NAME}
-  AGAMA_VERSION: 0.5.7
-  VERUSCOIN_VERSION: 0.5.7
-  KOMODO_VERSION: 0.3.3b-beta
+  AGAMA_VERSION: 0.5.7-1
+  VERUSCOIN_VERSION: 0.5.7-1
+  KOMODO_VERSION: 0.3.3b-2-beta
   BINARY_SOURCE: VerusCoin
   EASYDEX_GUI_BUILD: build.tar.gz
   AGAMA_APPIMAGE: Agama-Linux-v${AGAMA_VERSION}.AppImage
@@ -56,7 +56,6 @@ build:linux:
     - tar -xzvf linux64.tar.gz --strip=1 --directory assets/bin/linux64
     - rm linux64.tar.gz
     - strip -g  assets/bin/linux64/komodod && strip -g  assets/bin/linux64/komodo-cli
-    - strip -g  assets/bin/linux64/verusd/verusd && strip -g  assets/bin/linux64/verusd/verus
     - yarn install
   script:
     - yarn run dist
@@ -109,7 +108,6 @@ build:windows:
     - rm -rf win64
     - rm win64.zip
     - strip -g  assets/bin/win64/komodod.exe && strip -g  assets/bin/win64/komodo-cli.exe && strip -g  assets/bin/win64/komodo-tx.exe
-    - strip -g  assets/bin/win64/verusd/verusd.exe && strip -g  assets/bin/win64/verusd/verus.exe
     - rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip
     - yarn install
   script:

README.md

@@ -34,8 +34,8 @@ From within `agama/` the structure will be `assets/bin/linux64` (for example on
 #### Start Agama App (electron)
 
 ```shell
-cd agama
-yarn update && yarn install
+cd Agama
+yarn install
 yarn start
 ```
 To use debug/dev mode please stop Agama App (electron) and either set `dev: true` and `debug: true` in `~/.agama/config.json` and then restart the app or replace step 4) from above with the start command below:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Agama",
   "productName": "Agama",
-  "version": "0.5.7",
+  "version": "0.5.7-1",
   "description": "Agama Wallet Desktop App",
   "main": "main.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "dist": "electron-builder --publish=never --x64 ",
     "dist-win": "electron-builder --publish=never  --win --x64",
     "test": "mocha",
-    "update-agamalib": "rm -rf node_modules/agama-wallet-lib/ && npm install",
+    "update-agamalib": "rm -rf node_modules/agama-wallet-lib/ && yarn install",
     "postinstall": "rm -rf node_modules/bitcoinforksjs-lib/node_modules/create-hash && rm -rf node_modules/bitcoinjs-lib/node_modules/create-hash && rm -rf node_modules/bitcoinjs-lib-pos/node_modules/create-hash && rm -rf node_modules/bitcoinjs-lib-zcash/node_modules/create-hash && rm -rf node_modules/bitgo-utxo-lib/node_modules/create-hash"
   },
   "repository": "https://github.com/VerusCoin/Agama/",

routes/api/config.js

@@ -83,13 +83,15 @@ module.exports = (api) => {
           api.saveLocalAppConf(_localAppConfig);
         }
 
-        if (_localAppConfig.hasOwnProperty('enableVrsctest') && 
-          _localAppConfig.enableVrsctest !== defaultConf.enableVrsctest) {
-          _localAppConfig.enableVrsctest = defaultConf.enableVrsctest
-          api.log('Changed PBaaS enableVrsctest to ' + defaultConf.enableVrsctest, 'settings');
+        //This block of code forces the enabling or disabling of verustest.
+        //Use for releases that do not support either normal verus or verustest
+        /*if (_localAppConfig.verus.hasOwnProperty('enableVrsctest') && 
+          _localAppConfig.verus.enableVrsctest !== defaultConf.verus.enableVrsctest) {
+          _localAppConfig.verus.enableVrsctest = defaultConf.verus.enableVrsctest
+          api.log('Changed PBaaS enableVrsctest to ' + defaultConf.verus.enableVrsctest, 'settings');
           localAppConfig = JSON.stringify(_localAppConfig);
           api.saveLocalAppConf(_localAppConfig);
-        }
+        }*/
 
         const compareConfigs = compareJSON(defaultConf, JSON.parse(localAppConfig));
 

routes/appConfig.js

@@ -1,5 +1,5 @@
 const fiatList = require('./fiatList');
-const chainParams = require('./chainParams')
+const coins = require('../gui/EasyDEX-GUI/react/src/translate/coins.js')
 
 const appConfig = {
   config: { // default config
@@ -48,10 +48,10 @@ const appConfig = {
       stakeGuard: '',
       autoStakeVRSC: false,
       pbaasTestmode: false,
+      enableVrsctest: false,
     },
-    enableVrsctest: false,
     pbaasChains: [],
-    reservedChains: Object.keys(chainParams).concat(["KMD", "KOMODO", "zcashd", "komodod", "chipsd", "CHIPS"]),
+    reservedChains: Object.keys(coins.CRYPTO).concat(Object.keys(coins.ASSETCHAINS)).concat(["KOMODO", "zcashd", "komodod", "chipsd"]),
     pubkey: '',
     exchanges: {
       coinswitchKey: '',
@@ -293,9 +293,12 @@ const appConfig = {
         displayName: 'PBaaS Test Mode',
         type: 'boolean',
       },
-    },
-    enableVrsctest: {
-      display: false,
+      enableVrsctest: {
+        display: true,
+        info: 'Enables VRSCTEST as an option in the Add Coin menu (includes PBaaS testnet features)',
+        displayName: 'Enable Verus Testnet',
+        type: 'boolean',
+      },
     },
     pbaasChains: {
       display: false,

routes/chainParams.js

@@ -202,14 +202,6 @@ const chainParams = {
 		addnode: '142.11.199.63',
 		genproclimit: true,
 	},
-	ZEX: {
-		ac_reward: 13000000000,
-		ac_halving: 525600,
-		ac_pubkey: '039d4a50cc70d1184e462a22edb3b66385da97cc8059196f8305c184a3e21440af',
-		ac_cc: 2,
-		ac_founders: 1,
-		addnode: '5.9.102.210',
-	},
 	SPLTEST: {
 		ac_supply: 5555555,
 		ac_reward: 10000000000000,

routes/ports.js

@@ -45,7 +45,6 @@ const assetChainPorts = {
   KOIN: 10702,
   DION: 23895,
   PTX: 61939,
-  ZEX: 26476,
   LUMBER: 26301,
   KSB: 21066,
   OUR: 45672,

version

@@ -1,3 +1,3 @@
-version=0.5.7
+version=0.5.7-1
 type=beta
-minversion=0.5.7
+minversion=0.5.7-1

version_build

@@ -1 +1 @@
-0.5.7
+0.5.7-1