From 234342e51c86eac3acdfaf71dc2aa7ff9c1cd9f4 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Wed, 15 Nov 2023 23:22:53 +0100 Subject: [PATCH 1/9] Add estimateconversion API --- routes/api.js | 1 + routes/api/native/estimateConversion.js | 35 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 routes/api/native/estimateConversion.js diff --git a/routes/api.js b/routes/api.js index d24a0381..921a2362 100644 --- a/routes/api.js +++ b/routes/api.js @@ -147,6 +147,7 @@ api = require('./api/native/idUpdate.js')(api); api = require('./api/native/idInformation.js')(api); api = require('./api/native/getCurrencies.js')(api); api = require('./api/native/getCurrency.js')(api); +api = require('./api/native/estimateConversion.js')(api); api = require('./api/native/getConversionPaths.js')(api); api = require('./api/native/currencyGraylist.js')(api); api = require('./api/native/idRecovery.js')(api); diff --git a/routes/api/native/estimateConversion.js b/routes/api/native/estimateConversion.js new file mode 100644 index 00000000..65512656 --- /dev/null +++ b/routes/api/native/estimateConversion.js @@ -0,0 +1,35 @@ +module.exports = (api) => { + /** + * @param {string} chain + * @param {{currency: string, amount: number, convertto: string, preconvert: boolean, via: string}} params + */ + api.native.estimate_conversion = async (chain, params) => { + try { + return await api.native.callDaemon(chain, 'estimateconversion', [params]); + } catch(e) { + throw e + } + }; + + api.setPost('/native/estimate_conversion', async (req, res, next) => { + const { chainTicker, params } = req.body + + try { + const retObj = { + msg: 'success', + result: await api.native.estimate_conversion(chainTicker, params), + }; + + res.send(JSON.stringify(retObj)); + } catch(e) { + const retObj = { + msg: 'error', + result: e.message, + }; + + res.send(JSON.stringify(retObj)); + } + }); + + return api; +}; \ No newline at end of file From 8ee576c7cf0c4b8873efb43a31a149c201eb19f6 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Tue, 23 Jan 2024 15:14:26 +0100 Subject: [PATCH 2/9] Update dependencies --- package.json | 9 +++++---- yarn.lock | 33 ++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 2b154d03..3a85a685 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "agama-wallet-lib": "git+https://github.com/VerusCoin/agama-wallet-lib.git#dev", "arch": "2.1.0", "async": "2.6.4", - "axios": "0.25.0", + "axios": "1.6.5", "base64url": "https://github.com/michaeltout/base64url.git", "bigi": "1.4.2", "bitgo-utxo-lib": "git+https://github.com/VerusCoin/bitgo-utxo-lib.git", @@ -60,7 +60,7 @@ "buffer-reverse": "1.0.1", "coinselect": "github:bitcoinjs/coinselect", "create-hash": "git+https://github.com/pbca26/createHash#electron-v4", - "crypto-js": "4.0.0", + "crypto-js": "4.2.0", "csv-writer": "1.6.0", "ethers": "5.1.0", "ethers-michaeltout": "github:michaeltout/ethersjs-package", @@ -182,11 +182,12 @@ "ansi-regex": "5.0.1", "qs": "6.2.4", "debug": "2.6.9", - "follow-redirects": "1.14.8", + "follow-redirects": "1.15.4", "fresh": "0.5.2", "mime": "1.4.1", "minimatch": "5.1.0", "json-schema": "0.4.0", - "got": "11.8.5" + "got": "11.8.5", + "axios": "1.6.5" } } diff --git a/yarn.lock b/yarn.lock index e462decd..814aea2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1263,12 +1263,14 @@ aws4@^1.6.0, aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -axios@0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" - integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== +axios@0.25.0, axios@1.6.5: + version "1.6.5" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.5.tgz#2c090da14aeeab3770ad30c3a1461bc970fb0cd8" + integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg== dependencies: - follow-redirects "^1.14.7" + follow-redirects "^1.15.4" + form-data "^4.0.0" + proxy-from-env "^1.1.0" balanced-match@^1.0.0: version "1.0.0" @@ -2379,10 +2381,10 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-js@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc" - integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg== +crypto-js@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== crypto-random-string@^1.0.0: version "1.0.0" @@ -3369,10 +3371,10 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@1.14.8, follow-redirects@^1.14.7: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@1.15.4, follow-redirects@^1.15.4: + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-each@^0.3.3: version "0.3.3" @@ -5983,6 +5985,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" From 0ea7eed5f8901a470b251bac36aaf74e3b8ca556 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Wed, 14 Feb 2024 13:42:40 +0100 Subject: [PATCH 3/9] Change "127.0.0.1" to "localhost" to allow OS to do own routing for dev mode --- main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index dcb03f79..fc676709 100644 --- a/main.js +++ b/main.js @@ -95,7 +95,7 @@ if (!hasLock) { guiapp.use((req, res, next) => { if (!appConfig.general.main.dev && !(process.argv.indexOf("devmode") > -1)) { - res.header("Access-Control-Allow-Origin", "http://127.0.0.1:3000"); + res.header("Access-Control-Allow-Origin", "http://localhost:3000"); } else { res.header("Access-Control-Allow-Origin", "*"); } @@ -155,7 +155,7 @@ if (!hasLock) { cors: { origin: appConfig.general.main.dev || process.argv.indexOf("devmode") > -1 - ? "http://127.0.0.1:3000" + ? "http://localhost:3000" : null, methods: ["GET", "POST"], }, @@ -455,7 +455,7 @@ if (!hasLock) { mainWindow.loadURL( appConfig.general.main.dev || process.argv.indexOf("devmode") > -1 - ? "http://127.0.0.1:3000" + ? "http://localhost:3000" : `file://${__dirname}/gui/Verus-Desktop-GUI/react/build/index.html` ); From 69a6451c0665f68617de3d40b051918e8adfb098 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Wed, 14 Feb 2024 14:33:34 +0100 Subject: [PATCH 4/9] Update deps --- package.json | 7 ++- yarn.lock | 159 +++++++++++++++++---------------------------------- 2 files changed, 58 insertions(+), 108 deletions(-) diff --git a/package.json b/package.json index 3a85a685..388b0236 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "license": "MIT", "devDependencies": { "cross-env": "5.2.1", - "electron": "20.3.9", + "electron": "22.3.25", "electron-builder": "23.6.0", "electron-devtools-installer": "3.2.0", "tslint": "6.1.3", @@ -188,6 +188,9 @@ "minimatch": "5.1.0", "json-schema": "0.4.0", "got": "11.8.5", - "axios": "1.6.5" + "axios": "1.6.5", + "json5": "2.2.2", + "semver": "6.3.1", + "tough-cookie": "4.1.3" } } diff --git a/yarn.lock b/yarn.lock index 814aea2b..9938de33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,21 +36,20 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== +"@electron/get@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960" + integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" - got "^9.6.0" + got "^11.8.5" progress "^2.0.3" semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" "@electron/remote@1.1.0": version "1.1.0" @@ -2184,7 +2183,7 @@ concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -config-chain@^1.1.11, config-chain@^1.1.12: +config-chain@^1.1.12: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== @@ -2724,12 +2723,12 @@ electron-publish@23.6.0: lazy-val "^1.0.5" mime "^2.5.2" -electron@20.3.9: - version "20.3.9" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.3.9.tgz#a2f53087658b3523825a7e21a969a61d8419e25b" - integrity sha512-CPThZ0Q0otIsFgwh2K6fMfrMX/3jsWt+fdjl1tiZh08MD8f74Az+dFB4NKpDHzqr4RFuRqh/W5CdGyGtvXXtFQ== +electron@22.3.25: + version "22.3.25" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.25.tgz#a9a70b63a6712c658cd7fab343129b2a78450f80" + integrity sha512-AjrP7bebMs/IPsgmyowptbA7jycTkrJC7jLZTb5JoH30PkBC6pZx/7XQ0aDok82SsmSiF4UJDOg+HoLrEBiqmg== dependencies: - "@electron/get" "^1.14.1" + "@electron/get" "^2.0.0" "@types/node" "^16.11.26" extract-zip "^2.0.1" @@ -2756,7 +2755,7 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -encodeurl@^1.0.2, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= @@ -3715,16 +3714,6 @@ global-dirs@^0.1.0: dependencies: ini "^1.3.4" -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - global@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -3740,7 +3729,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@11.8.5, got@12.1.0, got@^6.7.1, got@^7.1.0, got@^9.6.0: +got@11.8.5, got@12.1.0, got@^11.8.5, got@^6.7.1, got@^7.1.0: version "11.8.5" resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== @@ -4474,10 +4463,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@2.2.2, json5@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonfile@^4.0.0: version "4.0.0" @@ -4796,7 +4785,7 @@ lodash.without@~4.4.0: resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= -lodash@4.17.21, lodash@=3.10.1, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15: +lodash@4.17.21, lodash@=3.10.1, lodash@^4.17.14, lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5311,14 +5300,6 @@ npm-cache-filename@~1.0.2: resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11" integrity sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE= -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - npm-install-checks@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz#ab2e32ad27baa46720706908e5b14c1852de44d9" @@ -6000,12 +5981,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.24: - version "1.4.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2" - integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw== - -psl@^1.1.28: +psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -6040,11 +6016,6 @@ punycode@2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA== -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -6085,6 +6056,11 @@ query-string@^6.8.2: split-on-first "^1.0.0" strict-uri-encode "^2.0.0" +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -6422,6 +6398,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve-alpn@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -6610,39 +6591,10 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1: - version "7.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" - integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - -semver@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@6.3.1, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1, semver@^6.2.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.7, semver@~7.0.0: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== send@0.17.2: version "0.17.2" @@ -7328,28 +7280,15 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -tough-cookie@~2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA== - dependencies: - punycode "^1.4.1" - -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== +tough-cookie@4.1.3, tough-cookie@~2.3.3, tough-cookie@~2.4.3, tough-cookie@~2.5.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: - psl "^1.1.24" - punycode "^1.4.1" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" tr46@~0.0.3: version "0.0.3" @@ -7411,11 +7350,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" @@ -7528,6 +7462,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" @@ -7596,6 +7535,14 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-set-query@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339" From 805b3884c38cbafd9f2687f9e5bf74f75e4f5ed9 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Sat, 17 Feb 2024 15:35:19 +0100 Subject: [PATCH 5/9] Change 127.0.0.1 to localhost for testing plugins --- routes/api/plugin/start.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/api/plugin/start.js b/routes/api/plugin/start.js index 79833879..b83c6c8c 100644 --- a/routes/api/plugin/start.js +++ b/routes/api/plugin/start.js @@ -118,7 +118,7 @@ module.exports = (api) => { }); if (api.appConfig.general.main.dev || process.argv.indexOf('devmode') > -1) { - pluginWindow.loadURL(`http://127.0.0.1:${plugin.devPort}`); + pluginWindow.loadURL(`http://localhost:${plugin.devPort}`); } else { pluginWindow.loadFile(plugin.index); } From 7195b3ce88cb5775c9cd8c927b1141fba8b14596 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 17 Feb 2024 17:56:51 -0800 Subject: [PATCH 6/9] update submodule --- gui/Verus-Desktop-GUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI index 3f8ffe95..aa67843d 160000 --- a/gui/Verus-Desktop-GUI +++ b/gui/Verus-Desktop-GUI @@ -1 +1 @@ -Subproject commit 3f8ffe95bce4160e2185d2b110ca665ac5d002cc +Subproject commit aa67843d1d0651fb57a984dfe658bef4b0cc4015 From 14c4974f74ec568e8759103e19ed0f49f53f487c Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 17 Feb 2024 16:54:14 -0800 Subject: [PATCH 7/9] update Mac builder --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a46ffe2..49a5a14c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ build:windows: ######################################################################################################################## build:mac: stage: build - tags: ["Big Sur"] + tags: ["Ventura"] variables: KOMODO_CLI_PACKAGE: komodo_${KOMODO_VERSION}_macos.zip PIRATE_CLI_PACKAGE: pirate-cli-MacOS-v${PIRATE_VERSION}.zip From 1d3d71b87abd0b1316e7cd9de110c0d71be1709b Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 17 Feb 2024 16:54:59 -0800 Subject: [PATCH 8/9] update bridgekeeper --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 454eaba9..8ec96a73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7683,7 +7683,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#df7f70f3cbb2434de11f4bfa71e353ac26ce6d3a" + resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#4d718ad7d9aa8ea4e9597314c29d2410a5f24291" dependencies: async "^3.2.4" axios "0.25.0" From cf4a01a7f57d90b1a6172d79c3a9b0433fb9ceb2 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 17 Feb 2024 17:58:00 -0800 Subject: [PATCH 9/9] update version --- .gitlab-ci.yml | 4 ++-- package.json | 2 +- version.json | 2 +- version_build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49a5a14c..9f8cd715 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.2.0-2 - VERUSCOIN_VERSION: 1.2.0-2 + VERUS_VERSION: 1.2.1 + VERUSCOIN_VERSION: 1.2.1 KOMODO_VERSION: 0.8.1 KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download PIRATE_VERSION: 5.7.5 diff --git a/package.json b/package.json index 1d6b9cfd..13b35c58 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "verus-desktop", "productName": "Verus-Desktop", - "version": "1.2.0-2", + "version": "1.2.1", "description": "Verus Desktop Wallet App", "main": "main.js", "scripts": { diff --git a/version.json b/version.json index 2bb11f54..b6ea40eb 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-2", + "version": "1.2.1", "minVersion": "1.2.0-2", "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 d4d9d669..cb174d58 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -1.2.0-2 \ No newline at end of file +1.2.1 \ No newline at end of file