Merge pull request #236 from VerusCoin/dev

v1.2.1
VerusCoin · Feb 18, 2024 · 466c538 · 466c538
2 parents a6c8bd8 + cf4a01a
commit 466c538
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 136 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: release
-  VERUS_VERSION: 1.2.0-2
-  VERUSCOIN_VERSION: 1.2.0-2
+  VERUS_VERSION: 1.2.1
+  VERUSCOIN_VERSION: 1.2.1
   KOMODO_VERSION: 0.8.1
   KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
   PIRATE_VERSION: 5.7.5
@@ -228,7 +228,7 @@ build:windows:
 ########################################################################################################################
 build:mac:
   stage: build
-  tags: ["Big Sur"]
+  tags: ["Ventura"]
   variables:
     KOMODO_CLI_PACKAGE: komodo_${KOMODO_VERSION}_macos.zip
     PIRATE_CLI_PACKAGE: pirate-cli-MacOS-v${PIRATE_VERSION}.zip

diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI
diff --git a/main.js b/main.js
@@ -95,7 +95,7 @@ if (!hasLock) {
 
   guiapp.use((req, res, next) => {
     if (!appConfig.general.main.dev && !(process.argv.indexOf("devmode") > -1)) {
-      res.header("Access-Control-Allow-Origin", "http://127.0.0.1:3000");
+      res.header("Access-Control-Allow-Origin", "http://localhost:3000");
     } else {
       res.header("Access-Control-Allow-Origin", "*");
     }
@@ -155,7 +155,7 @@ if (!hasLock) {
     cors: {
       origin:
         appConfig.general.main.dev || process.argv.indexOf("devmode") > -1
-          ? "http://127.0.0.1:3000"
+          ? "http://localhost:3000"
           : null,
       methods: ["GET", "POST"],
     },
@@ -455,7 +455,7 @@ if (!hasLock) {
 
     mainWindow.loadURL(
       appConfig.general.main.dev || process.argv.indexOf("devmode") > -1
-        ? "http://127.0.0.1:3000"
+        ? "http://localhost:3000"
         : `file://${__dirname}/gui/Verus-Desktop-GUI/react/build/index.html`
     );
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "1.2.0-2",
+  "version": "1.2.1",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {
@@ -38,7 +38,7 @@
   "license": "MIT",
   "devDependencies": {
     "cross-env": "5.2.1",
-    "electron": "20.3.9",
+    "electron": "22.3.25",
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",
     "tslint": "6.1.3",
@@ -51,7 +51,7 @@
     "agama-wallet-lib": "git+https://github.com/VerusCoin/agama-wallet-lib.git#dev",
     "arch": "2.1.0",
     "async": "2.6.4",
-    "axios": "0.25.0",
+    "axios": "1.6.5",
     "base64url": "https://github.com/michaeltout/base64url.git",
     "bigi": "1.4.2",
     "bitgo-utxo-lib": "git+https://github.com/VerusCoin/bitgo-utxo-lib.git",
@@ -60,7 +60,7 @@
     "buffer-reverse": "1.0.1",
     "coinselect": "github:bitcoinjs/coinselect",
     "create-hash": "git+https://github.com/pbca26/createHash#electron-v4",
-    "crypto-js": "4.0.0",
+    "crypto-js": "4.2.0",
     "csv-writer": "1.6.0",
     "ethers": "5.1.0",
     "ethers-michaeltout": "github:michaeltout/ethersjs-package",
@@ -182,11 +182,15 @@
     "ansi-regex": "5.0.1",
     "qs": "6.2.4",
     "debug": "2.6.9",
-    "follow-redirects": "1.14.8",
+    "follow-redirects": "1.15.4",
     "fresh": "0.5.2",
     "mime": "1.4.1",
     "minimatch": "5.1.0",
     "json-schema": "0.4.0",
-    "got": "11.8.5"
+    "got": "11.8.5",
+    "axios": "1.6.5",
+    "json5": "2.2.2",
+    "semver": "6.3.1",
+    "tough-cookie": "4.1.3"
   }
 }
diff --git a/routes/api/plugin/start.js b/routes/api/plugin/start.js
@@ -118,7 +118,7 @@ module.exports = (api) => {
       });
 
       if (api.appConfig.general.main.dev || process.argv.indexOf('devmode') > -1) {
-        pluginWindow.loadURL(`http://127.0.0.1:${plugin.devPort}`);
+        pluginWindow.loadURL(`http://localhost:${plugin.devPort}`);
       } else {
         pluginWindow.loadFile(plugin.index);
       }

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-2",
+  "version": "1.2.1",
   "minVersion": "1.2.0-2",
   "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 @@
-1.2.0-2
+1.2.1
+30 −26		react/package.json
+31 −37		react/src/components/postAuth/apps/settings/coinSettings/coinSettings.js
+19 −26		react/src/components/postAuth/apps/settings/coinSettings/coinSettings.render.js
+10 −7		react/src/index.js
+0 −2		react/webpack.config.js
+0 −208		react/webpack.prod.config.js
+1,427 −1,541		react/yarn.lock