Merge pull request #249 from VerusCoin/dev

v1.2.3-3
VerusCoin · Jun 30, 2024 · 4a06067 · 4a06067
2 parents e8ee616 + 342c2e6
commit 4a06067
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 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.3-2
-  VERUSCOIN_VERSION: 1.2.3-2
+  VERUS_VERSION: 1.2.3-3
+  VERUSCOIN_VERSION: 1.2.3-3
   KOMODO_VERSION: 0.8.1
   KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
   PIRATE_VERSION: 5.8.2

diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "1.2.3-2",
+  "version": "1.2.3-3",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {

diff --git a/routes/api/daemonControl.js b/routes/api/daemonControl.js
@@ -544,6 +544,13 @@ module.exports = (api) => {
             acOptions.push("-bootstrap");
           }
 
+          if (daemon === "verusd" && 
+              !api.appConfig.coin.native.noFastLoad[coin] && 
+              !acOptions.includes("-fastload")
+            ) {
+            acOptions.push("-fastload");
+          }
+
           api.log(
             `selected data: ${JSON.stringify(acOptions, null, "\t")}`,
             "native.confd"

diff --git a/routes/appConfig.js b/routes/appConfig.js
@@ -3,6 +3,7 @@ const zcashParamsSources = require('./zcashParamsSources')
 
 let nonZCoins = {}
 let nativeCoinStrings = {}
+let nativeCoinBools = {}
 
 const coinObjArray = coinDataTranslated.getSimpleCoinArray().map(simpleCoinObj => {
   const coinObj = coinDataTranslated.getCoinObj(simpleCoinObj.id)
@@ -11,7 +12,8 @@ const coinObjArray = coinDataTranslated.getSimpleCoinArray().map(simpleCoinObj =
   else nonZCoins[coinObj.id] = true
 
   if (coinObj.available_modes.native === true) {
-    nativeCoinStrings[coinObj.id] = ''
+    nativeCoinStrings[coinObj.id] = '',
+    nativeCoinBools[coinObj.id] = false
   }
 
   return coinObj
@@ -97,7 +99,8 @@ const appConfig = {
         stakeGuard: nativeCoinStrings,
         refundAddress: nativeCoinStrings,
         refundFromSource: nonZCoins,
-        dataDir: nativeCoinStrings
+        dataDir: nativeCoinStrings,
+        noFastLoad: nativeCoinBools
       }
     },
     pubkey: "",
@@ -240,6 +243,12 @@ const appConfig = {
           info:
             "Sapling address for Verus StakeGuard. (Will be used when Verus is started)"
         },
+        noFastLoad: {
+          type: "checkbox",
+          displayName: "Memory optimization",
+          info:
+            "Reduce memory usage for this coin in native mode. May increase loading times on coin startup."
+        },
         refundAddress: {
           type: "text_input",
           displayName: "Refund address",

diff --git a/routes/chainParams.js b/routes/chainParams.js
@@ -3,15 +3,13 @@ const chainParams = {
 		daemon: 0
 	},
   VRSC: {
-		ac_name: "VRSC",
-	    fastload: 1
+		ac_name: "VRSC"
   },
 	ZEC: {
 		addnode: ['mainnet.z.cash']
 	},
   VRSCTEST: {
-		ac_name: "VRSCTEST",
-	    fastload: 1
+		ac_name: "VRSCTEST"
   },
 	SUPERNET: {
 		ac_name: "SUPERNET",

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.3-2",
+  "version": "1.2.3-3",
   "minVersion": "1.2.3",
   "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.3-2
+1.2.3-3