Merge pull request #111 from VerusCoin/dev

Dev
VerusCoin · Jun 11, 2021 · fd62370 · fd62370
2 parents 51a62b0 + 832952f
commit fd62370
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 92 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,9 +8,10 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: release
-  VERUS_VERSION: 0.7.3-5
-  VERUSCOIN_VERSION: 0.7.3-5
+  VERUS_VERSION: 0.7.3-6
+  VERUSCOIN_VERSION: 0.7.3-6
   KOMODO_VERSION: 0.7.0
+  PIRATE_VERSION: 5.1.1-1
   BINARY_SOURCE: VerusCoin
   VERUS_APPIMAGE_X64: Verus-Desktop-v${VERUS_VERSION}-x86_64.AppImage
   VERUS_APPIMAGE_ARM64: Verus-Desktop-v${VERUS_VERSION}-arm64.AppImage
@@ -62,9 +63,9 @@ build:linux:
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-x86_64.tar.gz .
     - tar -xzvf zcashd-linux-x86_64.tar.gz --directory assets/bin/linux64/
     - rm zcashd-linux-x86_64.tar.gz
-    - wget https://github.com/PirateNetwork/pirate/releases/download/v5.1.1-1/pirate-cli-ubuntu1804-v5.1.1-1.zip
-    - unzip pirate-cli-ubuntu1804-v5.1.1-1.zip -d assets/bin/linux64/pirated
-    - rm pirate-cli-ubuntu1804-v5.1.1-1.zip
+    - wget https://github.com/PirateNetwork/pirate/releases/download/v${PIRATE_VERSION}/pirate-cli-ubuntu1804-v${PIRATE_VERSION}.zip
+    - unzip pirate-cli-ubuntu1804-v${PIRATE_VERSION}.zip -d assets/bin/linux64/pirated
+    - rm pirate-cli-ubuntu1804-v${PIRATE_VERSION}.zip
     - sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
     - sed -i "s/process.env.ETHERSCAN_API_KEY/'${ETHERSCAN_KEY}'/g" keys/etherscan.js
     - yarn install
@@ -105,9 +106,9 @@ build:linux:arm64:
     - 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
-    - wget https://github.com/PirateNetwork/pirate/releases/download/v5.1.1-1/pirate-cli-aarch64-v5.1.1-1.zip
-    - unzip pirate-cli-aarch64-v5.1.1-1.zip -d assets/bin/linux64/pirated
-    - rm  pirate-cli-aarch64-v5.1.1-1.zip
+    - wget https://github.com/PirateNetwork/pirate/releases/download/v${PIRATE_VERSION}/pirate-cli-aarch64-v${PIRATE_VERSION}.zip
+    - unzip pirate-cli-aarch64-v${PIRATE_VERSION}.zip -d assets/bin/linux64/pirated
+    - rm  pirate-cli-aarch64-v${PIRATE_VERSION}.zip
     - sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
     - sed -i "s/process.env.ETHERSCAN_API_KEY/'${ETHERSCAN_KEY}'/g" keys/etherscan.js
     - yarn install
@@ -159,9 +160,9 @@ build:windows:
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-win.tar.gz .
     - tar -xzvf zcashd-win.tar.gz --directory assets/bin/win64/
     - rm zcashd-win.tar.gz
-    - wget https://github.com/PirateNetwork/pirate/releases/download/v5.1.1-1/pirate-cli-windows-v5.1.1-1.zip
-    - unzip pirate-cli-windows-v5.1.1-1.zip -d assets/bin/win64/pirated
-    - rm  pirate-cli-windows-v5.1.1-1.zip
+    - wget https://github.com/PirateNetwork/pirate/releases/download/v${PIRATE_VERSION}/pirate-cli-windows-v${PIRATE_VERSION}.zip
+    - unzip pirate-cli-windows-v${PIRATE_VERSION}.zip -d assets/bin/win64/pirated
+    - rm  pirate-cli-windows-v${PIRATE_VERSION}.zip
     - sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
     - sed -i "s/process.env.ETHERSCAN_API_KEY/'${ETHERSCAN_KEY}'/g" keys/etherscan.js
     - yarn install
@@ -210,9 +211,9 @@ build:mac:
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-macos.tar.gz .
     - tar -xzvf zcashd-macos.tar.gz --directory assets/bin/osx/
     - rm zcashd-macos.tar.gz
-    - wget https://github.com/PirateNetwork/pirate/releases/download/v5.1.1-1/pirate-cli-MacOS-v5.1.1-1.zip
-    - unzip pirate-cli-MacOS-v5.1.1-1.zip -d assets/bin/osx/pirated
-    - rm pirate-cli-MacOS-v5.1.1-1.zip
+    - wget https://github.com/PirateNetwork/pirate/releases/download/v${PIRATE_VERSION}/pirate-cli-MacOS-v${PIRATE_VERSION}.zip
+    - unzip pirate-cli-MacOS-v${PIRATE_VERSION}.zip -d assets/bin/osx/pirated
+    - rm pirate-cli-MacOS-v${PIRATE_VERSION}.zip
     - sed -i -e "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
     - sed -i -e "s/process.env.ETHERSCAN_API_KEY/'${ETHERSCAN_KEY}'/g" keys/etherscan.js
     - yarn install

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "0.7.3-5",
+  "version": "0.7.3-6",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {
@@ -38,7 +38,7 @@
   "license": "MIT",
   "devDependencies": {
     "cross-env": "^5.2.1",
-    "electron": "^12.0.6",
+    "electron": "^12.0.11",
     "electron-builder": "22.9.1",
     "electron-devtools-installer": "^2.2.4",
     "electron-rebuild": "^1.11.0"
@@ -165,6 +165,8 @@
     "ssri": "8.0.1",
     "y18n": "5.0.5",
     "hosted-git-info": "3.0.8",
-    "ajv": "6.12.3"
+    "ajv": "6.12.3",
+    "ws": "7.4.6",
+    "normalize-url": "4.5.1"
   }
 }
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
-  "version": "0.7.3-5",
-  "minVersion": "0.7.3-3",
+  "version": "0.7.3-6",
+  "minVersion": "0.7.3-6",
   "versionUrl": "https://raw.githubusercontent.com/VerusCoin/Verus-Desktop/master/version.json",
   "repository": "https://github.com/VerusCoin/Verus-Desktop/"
 }
diff --git a/version_build b/version_build
@@ -1 +1 @@
-0.7.3-5
+0.7.3-6