diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ab78190..39121652 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,8 @@ stages: variables: DOCKER_DRIVER: overlay2 DEFAULT_VERUSCOIN_BRANCH: release - VERUS_VERSION: 1.0.12-4 - VERUSCOIN_VERSION: 1.0.12-4 + VERUS_VERSION: 1.0.12-5 + VERUSCOIN_VERSION: 1.0.12-5 KOMODO_VERSION: 0.8.0 KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download PIRATE_VERSION: 5.7.4 diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI index cade0414..f75fde24 160000 --- a/gui/Verus-Desktop-GUI +++ b/gui/Verus-Desktop-GUI @@ -1 +1 @@ -Subproject commit cade0414ccd5078915101dd1bfaf3c05d6f22f1b +Subproject commit f75fde24237d3bdd98f01c16540d1d3cf10941d5 diff --git a/package.json b/package.json index 54aa6ac0..2cf0c5fd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "verus-desktop", "productName": "Verus-Desktop", - "version": "1.0.12-4", + "version": "1.0.12-5", "description": "Verus Desktop Wallet App", "main": "main.js", "scripts": { diff --git a/routes/api/native/reservetransfers.js b/routes/api/native/reservetransfers.js index 3fc9b654..e1747219 100644 --- a/routes/api/native/reservetransfers.js +++ b/routes/api/native/reservetransfers.js @@ -32,10 +32,12 @@ module.exports = (api) => { let tx = null; try { - tx = await api.native.callDaemon(chainTicker, "getrawtransaction", [ - z_operation.result.txid, - 1, - ]); + if (z_operation.result.txid) { + tx = await api.native.callDaemon(chainTicker, "getrawtransaction", [ + z_operation.result.txid, + 1, + ]); + } } catch (e) {} transfers.push({ diff --git a/routes/api/native/verusbridge/verusbridge.js b/routes/api/native/verusbridge/verusbridge.js index 7a6bd683..b99e654e 100644 --- a/routes/api/native/verusbridge/verusbridge.js +++ b/routes/api/native/verusbridge/verusbridge.js @@ -1,6 +1,7 @@ const server = require("verus_bridgekeeper"); +const confFile = require("verus_bridgekeeper/confFile"); -module.exports = (api) => { +module.exports = (api) => { api.native.start_bridgekeeper = (chainTicker) => { return new Promise((resolve, reject) => { @@ -42,7 +43,7 @@ module.exports = (api) => { if (result) resolve(result); else reject(result); }); - }; + }; api.native.bridgekeeper_setconf = (chainTicker, key, infuraLink, ethContract) => { return new Promise(async (resolve, reject) => { @@ -67,6 +68,18 @@ module.exports = (api) => { }); }; + api.native.bridgekeeper_getconf = (chainTicker) => { + return new Promise(async (resolve, reject) => { + if (chainTicker !== "VRSC") + reject(new Error("bridgekeeper not currently supported outside of VRSC")); + + const result = confFile.loadConfFile(chainTicker); + + if (result) resolve(result); + else reject(result); + }); + }; + api.setPost("/native/start_bridgekeeper", (req, res, next) => { const { chainTicker } = req.body; @@ -134,7 +147,7 @@ module.exports = (api) => { res.send(JSON.stringify(retObj)); }); - }); + }); api.setPost("/native/bridgekeeper_setconf", (req, res, next) => { const { key, infuraLink, ethContract, chainTicker } = req.body; @@ -156,7 +169,29 @@ module.exports = (api) => { res.send(JSON.stringify(retObj)); }); - }, true); + }, true); + + api.setPost("/native/bridgekeeper_getconf", (req, res, next) => { + const { chainTicker } = req.body; + api.native + .bridgekeeper_getconf(chainTicker) + .then((reply) => { + const retObj = { + msg: "success", + result: reply, + }; + + res.send(JSON.stringify(retObj)); + }) + .catch((error) => { + const retObj = { + msg: "error", + result: error, + }; + + res.send(JSON.stringify(retObj)); + }); + }, true); return api; }; diff --git a/routes/workers/openExternalSafe.js b/routes/workers/openExternalSafe.js index 77e63355..1efd33b4 100644 --- a/routes/workers/openExternalSafe.js +++ b/routes/workers/openExternalSafe.js @@ -135,6 +135,7 @@ const allowedOrigins = [ '35.204.174.237:3001/insight/tx/', 'etherscan.io/tx/', 'ropsten.etherscan.io/tx/', + 'www.infura.io' ] function generateOpenExternalSafe(shell, url) { diff --git a/version.json b/version.json index 2877c03c..d603e602 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "1.0.12-4", + "version": "1.0.12-5", "minVersion": "1.0.12-4", "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 index c60f7155..dd04be61 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -1.0.12-4 +1.0.12-5