Merge pull request #219 from VerusCoin/dev

v1.1.1-7

.gitlab-ci.yml

@@ -8,8 +8,8 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: release
-  VERUS_VERSION: 1.1.1-6
-  VERUSCOIN_VERSION: 1.1.1-6
+  VERUS_VERSION: 1.1.1-7
+  VERUSCOIN_VERSION: 1.1.1-7
   KOMODO_VERSION: 0.8.0
   KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
   PIRATE_VERSION: 5.7.5

package.json

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

routes/api/daemonControl.js

@@ -58,7 +58,7 @@ module.exports = (api) => {
   api.writeRpcUser = (confFile) => {
     return new Promise((resolve, reject) => {
       api.log(`creating rpcuser for ${confFile}...`, "native.process");
-      fs.appendFile(confFile, '\nrpcuser=verusdesktop')
+      fs.appendFile(confFile, `\nrpcuser=${generateRpcPassword()}`)
       .then(resolve)
       .catch(e => reject(e))
     })
@@ -72,7 +72,22 @@ module.exports = (api) => {
       .catch(e => reject(e))
     })
   }
-
+  api.writeRpcHost = (confFile) => {
+    return new Promise((resolve, reject) => {
+      api.log(`setting rpchost for ${confFile}...`, "native.process");
+      fs.appendFile(confFile, '\nrpchost=127.0.0.1')
+          .then(resolve)
+          .catch(e => reject(e))
+    })
+  }
+  api.writeRpcAllowIP = (confFile) => {
+    return new Promise((resolve, reject) => {
+      api.log(`setting rpcallowip for ${confFile}...`, "native.process");
+      fs.appendFile(confFile, '\nrpcallowip=127.0.0.1')
+          .then(resolve)
+          .catch(e => reject(e))
+    })
+  }
   api.writeRpcPort = (coin, confFile, fallbackPort) => {
     return new Promise((resolve, reject) => {
       api.log(`creating rpcport for ${confFile}...`, "native.process");
@@ -220,13 +235,17 @@ module.exports = (api) => {
                 api.confFileIndex[coin] = confFile;
                 if (coin === 'VRSCTEST') {
                   return Promise.all([
+                    api.writeRpcHost(confFile),
+                    api.writeRpcAllowIP(confFile),
                     api.writeRpcPort(coin, confFile, fallbackPort),
                     api.writeRpcPassword(confFile),
                     api.writeRpcUser(confFile),
                     api.writeAC_Supply(confFile)
                   ]);
                 } else {
                   return Promise.all([
+                    api.writeRpcHost(confFile),
+                    api.writeRpcAllowIP(confFile),
                     api.writeRpcPort(coin, confFile, fallbackPort),
                     api.writeRpcPassword(confFile),
                     api.writeRpcUser(confFile)

routes/api/native/verusbridge/vethconf.js

@@ -3,6 +3,7 @@ const os = require("os");
 const path = require("path");
 var ini = require("ini");
 const fixPath = require("fix-path");
+const {generateRpcPassword} = require("../../utils/auth/rpcAuth");
 
 const INIKeys = {
   rpcuser: "",
@@ -38,24 +39,24 @@ const vethFolder = {
 
 const RPCDefault = {
   VRSCTEST: {
-    rpcuser: "user",
-    rpcpassword: "password",
-    rpcport: 8000,
+    rpcuser: `${generateRpcPassword()}`,
+    rpcpassword: `${generateRpcPassword()}`,
+    rpcport: 8002,
     rpchost: "127.0.0.1",
     delegatorcontractaddress: "empty",
     testnet: true,
     privatekey: "empty",
-    ethnode: "empty",
+    ethnode: "wss://goerli.infura.io/ws/v3/........",
   },
   VRSC: {
-    rpcuser: "username",
-    rpcpassword: "password",
-    rpcport: 8000,
+    rpcuser: `${generateRpcPassword()}`,
+    rpcpassword: `${generateRpcPassword()}`,
+    rpcport: 8002,
     rpchost: "127.0.0.1",
     delegatorcontractaddress: "empty",
     testnet: false,
     privatekey: "empty",
-    ethnode: "wss://rinkeby.infura.io/ws/v3/........",
+    ethnode: "wss://mainnet.infura.io/ws/v3/........",
   },
 };
 

version.json

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

version_build

@@ -1 +1 @@
-1.1.1-6
+1.1.1-7

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#f602a60a93b0b7058931f24c098d28a9271fce01"
+  resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#028ad29b380715c4e41c3840e9ace1a6bf8e3370"
   dependencies:
     axios "0.25.0"
     base58check "^2.0.0"