Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.2.3-3 #249

Merged
merged 4 commits into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
7 changes: 7 additions & 0 deletions routes/api/daemonControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 11 additions & 2 deletions routes/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -97,7 +99,8 @@ const appConfig = {
stakeGuard: nativeCoinStrings,
refundAddress: nativeCoinStrings,
refundFromSource: nonZCoins,
dataDir: nativeCoinStrings
dataDir: nativeCoinStrings,
noFastLoad: nativeCoinBools
}
},
pubkey: "",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions routes/chainParams.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion version_build
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.3-2
1.2.3-3