Merge pull request #204 from VerusCoin/dev

v1.0.12-2

.gitlab-ci.yml

@@ -8,11 +8,11 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: release
-  VERUS_VERSION: 1.0.12-1
-  VERUSCOIN_VERSION: 1.0.12-1
+  VERUS_VERSION: 1.0.12-2
+  VERUSCOIN_VERSION: 1.0.12-2
   KOMODO_VERSION: 0.8.0
   KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
-  PIRATE_VERSION: 5.7.2
+  PIRATE_VERSION: 5.7.4
   PIRATE_DOWNLOAD_URL: https://github.com/PirateNetwork/pirate/releases/download
   BINARY_SOURCE: VerusCoin
   VERUS_APPIMAGE_X64: Verus-Desktop-v${VERUS_VERSION}-x86_64.AppImage

package.json

@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "1.0.12-1",
+  "version": "1.0.12-2",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {

routes/api/native/verusbridge/vethconf.js

@@ -9,7 +9,7 @@ const INIKeys = {
   rpcpassword: "",
   rpcport: "",
   rpchost: "",
-  upgrademanageraddress: "",
+  delegatorcontractaddress: "",
   testnet: "",
   privatekey: "",
   ethnode: "",
@@ -42,7 +42,7 @@ const RPCDefault = {
     rpcpassword: "password",
     rpcport: 8000,
     rpchost: "127.0.0.1",
-    upgrademanageraddress: "empty",
+    delegatorcontractaddress: "empty",
     testnet: true,
     privatekey: "empty",
     ethnode: "empty",
@@ -52,7 +52,7 @@ const RPCDefault = {
     rpcpassword: "password",
     rpcport: 8000,
     rpchost: "127.0.0.1",
-    upgrademanageraddress: "empty",
+    delegatorcontractaddress: "empty",
     testnet: false,
     privatekey: "empty",
     ethnode: "wss://rinkeby.infura.io/ws/v3/........",

version.json

@@ -1,6 +1,6 @@
 {
-  "version": "1.0.12-1",
-  "minVersion": "1.0.12",
+  "version": "1.0.12-2",
+  "minVersion": "1.0.12-2",
   "versionUrl": "https://raw.githubusercontent.com/VerusCoin/Verus-Desktop/master/version.json",
   "repository": "https://github.com/VerusCoin/Verus-Desktop/"
 }

version_build

@@ -1 +1 @@
-1.0.12-1
+1.0.12-2

yarn.lock

@@ -7729,7 +7729,7 @@ verror@^1.10.0:
 
 "verus_bridgekeeper@git+https://github.com/VerusCoin/verusbridgekeeper.git":
   version "1.0.6"
-  resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#0a4cfe56451659c8efe969b316324cb3ec2fcac9"
+  resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#9099595a639f7e7eba79b013c750811a307928fe"
   dependencies:
     axios "0.25.0"
     base58check "^2.0.0"