From 42534e45bb248a9e5bc8890571af8581ad835f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:46:59 -0500 Subject: [PATCH 01/10] chore(deps): bump elliptic from 6.5.7 to 6.6.0 (#2152) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0) --- updated-dependencies: - dependency-name: elliptic dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3d412333..3c66fbcea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "dotenv-flow": "3.2.0", "duckdb": "0.9.2", "ecpair": "2.1.0", - "elliptic": "6.5.7", + "elliptic": "6.6.0", "escape-goat": "3.0.0", "evt": "1.10.1", "express": "4.19.2", @@ -6805,9 +6805,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index 8fd46275c..5fef91a05 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "dotenv-flow": "3.2.0", "duckdb": "0.9.2", "ecpair": "2.1.0", - "elliptic": "6.5.7", + "elliptic": "6.6.0", "escape-goat": "3.0.0", "evt": "1.10.1", "express": "4.19.2", From c87ebf17c10b2ba5d083e3f910a971fc2cc546d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:48:11 -0500 Subject: [PATCH 02/10] chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 (#2170) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3c66fbcea..ea943ad11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6266,9 +6266,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6629,18 +6629,6 @@ "node": ">= 6.0.0" } }, - "node_modules/docker-compose/node_modules/yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", - "dev": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", From 26a2b44481807473a4e46bd08753a2aab019f33f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:48:58 -0500 Subject: [PATCH 03/10] chore(deps): bump path-to-regexp and express (#2185) Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.12 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.7 to 0.1.12 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.7...v0.1.12) Updates `express` from 4.19.2 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 107 ++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 66 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea943ad11..75e96537d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "elliptic": "6.6.0", "escape-goat": "3.0.0", "evt": "1.10.1", - "express": "4.19.2", + "express": "4.21.2", "fastify": "4.28.1", "fastify-metrics": "11.0.0", "getopts": "2.3.0", @@ -5157,9 +5157,9 @@ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -5169,7 +5169,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -6824,9 +6824,9 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -7910,36 +7910,36 @@ "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -7948,6 +7948,18 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "engines": { + "node": ">= 0.6" } }, "node_modules/express/node_modules/debug": { @@ -8276,12 +8288,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -12155,9 +12167,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -13707,9 +13722,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "node_modules/path-type": { "version": "4.0.0", @@ -14508,11 +14523,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -15294,9 +15309,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -15329,20 +15344,28 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" diff --git a/package.json b/package.json index 5fef91a05..07664000e 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "elliptic": "6.6.0", "escape-goat": "3.0.0", "evt": "1.10.1", - "express": "4.19.2", + "express": "4.21.2", "fastify": "4.28.1", "fastify-metrics": "11.0.0", "getopts": "2.3.0", From 5dfbe4800bfe9b12eca74bd1503a70e2679b35ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:49:44 -0500 Subject: [PATCH 04/10] chore(deps): bump http-proxy-middleware from 2.0.1 to 2.0.7 (#2142) Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.1 to 2.0.7. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md) - [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.1...v2.0.7) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 38 +++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75e96537d..cb58aaa00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "fastify": "4.28.1", "fastify-metrics": "11.0.0", "getopts": "2.3.0", - "http-proxy-middleware": "2.0.1", + "http-proxy-middleware": "2.0.7", "jsonc-parser": "3.0.0", "jsonrpc-lite": "2.2.0", "lru-cache": "6.0.0", @@ -3594,7 +3594,7 @@ "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", - "dev": true, + "devOptional": true, "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -3609,7 +3609,7 @@ "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", - "dev": true, + "devOptional": true, "dependencies": { "@types/node": "*" } @@ -3659,7 +3659,7 @@ "version": "4.17.13", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", - "dev": true, + "devOptional": true, "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.18", @@ -3671,7 +3671,7 @@ "version": "4.19.5", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", - "dev": true, + "devOptional": true, "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -3692,7 +3692,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true + "devOptional": true }, "node_modules/@types/http-proxy": { "version": "1.17.15", @@ -3770,7 +3770,7 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true + "devOptional": true }, "node_modules/@types/node": { "version": "20.11.4", @@ -3835,13 +3835,13 @@ "version": "6.9.15", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", - "dev": true + "devOptional": true }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true + "devOptional": true }, "node_modules/@types/request": { "version": "2.48.12", @@ -3885,7 +3885,7 @@ "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", - "dev": true, + "devOptional": true, "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -3895,7 +3895,7 @@ "version": "1.15.7", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", - "dev": true, + "devOptional": true, "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -9146,11 +9146,11 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", - "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dependencies": { - "@types/http-proxy": "^1.17.5", + "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", "is-glob": "^4.0.1", "is-plain-obj": "^3.0.0", @@ -9158,6 +9158,14 @@ }, "engines": { "node": ">=12.0.0" + }, + "peerDependencies": { + "@types/express": "^4.17.13" + }, + "peerDependenciesMeta": { + "@types/express": { + "optional": true + } } }, "node_modules/http-reasons": { diff --git a/package.json b/package.json index 07664000e..87f3a79a4 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "fastify": "4.28.1", "fastify-metrics": "11.0.0", "getopts": "2.3.0", - "http-proxy-middleware": "2.0.1", + "http-proxy-middleware": "2.0.7", "jsonc-parser": "3.0.0", "jsonrpc-lite": "2.2.0", "lru-cache": "6.0.0", From 4b3c22d99793b219db5f4c4c7c2e4b152d91e549 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:55:09 -0500 Subject: [PATCH 05/10] chore(deps): bump find-my-way from 8.2.0 to 8.2.2 (#2078) Bumps [find-my-way](https://github.com/delvedor/find-my-way) from 8.2.0 to 8.2.2. - [Release notes](https://github.com/delvedor/find-my-way/releases) - [Commits](https://github.com/delvedor/find-my-way/compare/v8.2.0...v8.2.2) --- updated-dependencies: - dependency-name: find-my-way dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb58aaa00..21243566b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8318,9 +8318,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/find-my-way": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.2.0.tgz", - "integrity": "sha512-HdWXgFYc6b1BJcOBDBwjqWuHJj1WYiqrxSh25qtU4DabpMFdj/gSunNBQb83t+8Zt67D7CXEzJWTkxaShMTMOA==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.2.2.tgz", + "integrity": "sha512-Dobi7gcTEq8yszimcfp/R7+owiT4WncAJ7VTTgFH1jYJ5GaG1FbhjwDG820hptN0QDFvzVY3RfCzdInvGPGzjA==", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-querystring": "^1.0.0", From 35eec3b8b11cb5efeb9227bed560ec55045cfc7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:55:43 -0500 Subject: [PATCH 06/10] chore(deps): bump micromatch from 4.0.7 to 4.0.8 (#2074) Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.7 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.7...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21243566b..15e43c6c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12211,9 +12211,9 @@ "integrity": "sha512-iwqAmg66VjB2LA3BcUxyrOyqck4HLLtSzKnx2VQSnN5piQji598N15P8RRx2d6lPvJ98B1b0cl2VbvQeFeWdig==" }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" From 8e3f288ec8680ebf5b32974b6897ad56c6c87995 Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:53:17 -0500 Subject: [PATCH 07/10] feat: change tbtc faucet default, allow user to request more than default --- src/api/routes/faucets.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/api/routes/faucets.ts b/src/api/routes/faucets.ts index c9b2b04e8..a0e154bc6 100644 --- a/src/api/routes/faucets.ts +++ b/src/api/routes/faucets.ts @@ -75,7 +75,7 @@ export const FaucetRoutes: FastifyPluginAsync< schema: { operationId: 'run_faucet_btc', summary: 'Add testnet BTC tokens to address', - description: `Add 1 BTC token to the specified testnet BTC address. + description: `Add 0.01 BTC token to the specified testnet BTC address. The endpoint returns the transaction ID, which you can use to view the transaction in a testnet Bitcoin block explorer. The tokens are delivered once the transaction has been included in a block. @@ -89,6 +89,13 @@ export const FaucetRoutes: FastifyPluginAsync< examples: ['2N4M94S1ZPt8HfxydXzL2P7qyzgVq7MHWts'], }) ), + large: Type.Optional( + Type.Boolean({ + description: + 'Request a larger amount of testnet BTC than the default', + default: false, + }) + ), }), body: OptionalNullable( Type.Object({ @@ -125,6 +132,7 @@ export const FaucetRoutes: FastifyPluginAsync< async (req, reply) => { await btcFaucetRequestQueue.add(async () => { const address = req.query.address || req.body?.address; + const tbtcAmount = req.query.large ? 0.5 : 0.01; if (!address) { return await reply.status(400).send({ error: 'address required', @@ -156,7 +164,7 @@ export const FaucetRoutes: FastifyPluginAsync< }); } - const tx = await makeBtcFaucetPayment(btc.networks.regtest, address, 0.5); + const tx = await makeBtcFaucetPayment(btc.networks.regtest, address, tbtcAmount); await fastify.writeDb?.insertFaucetRequest({ ip: `${ip}`, address: address, From ced8242f3cb3670d5f84405cfceb408e696fa286 Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:02:29 -0500 Subject: [PATCH 08/10] fix: update BTC faucet comments to use regtest instead of testnet --- src/api/routes/faucets.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/routes/faucets.ts b/src/api/routes/faucets.ts index a0e154bc6..507532fed 100644 --- a/src/api/routes/faucets.ts +++ b/src/api/routes/faucets.ts @@ -74,25 +74,25 @@ export const FaucetRoutes: FastifyPluginAsync< preHandler: missingBtcConfigMiddleware, schema: { operationId: 'run_faucet_btc', - summary: 'Add testnet BTC tokens to address', - description: `Add 0.01 BTC token to the specified testnet BTC address. + summary: 'Add regtest BTC tokens to address', + description: `Add 0.01 BTC token to the specified regtest BTC address. - The endpoint returns the transaction ID, which you can use to view the transaction in a testnet Bitcoin block + The endpoint returns the transaction ID, which you can use to view the transaction in a regtest Bitcoin block explorer. The tokens are delivered once the transaction has been included in a block. - **Note:** This is a testnet only endpoint. This endpoint will not work on the mainnet.`, + **Note:** This is a Bitcoin regtest-only endpoint. This endpoint will not work on the Bitcoin mainnet.`, tags: ['Faucets'], querystring: Type.Object({ address: Type.Optional( Type.String({ - description: 'A valid testnet BTC address', + description: 'A valid regtest BTC address', examples: ['2N4M94S1ZPt8HfxydXzL2P7qyzgVq7MHWts'], }) ), large: Type.Optional( Type.Boolean({ description: - 'Request a larger amount of testnet BTC than the default', + 'Request a larger amount of regtest BTC than the default', default: false, }) ), @@ -101,7 +101,7 @@ export const FaucetRoutes: FastifyPluginAsync< Type.Object({ address: Type.Optional( Type.String({ - description: 'A valid testnet BTC address', + description: 'A valid regtest BTC address', examples: ['2N4M94S1ZPt8HfxydXzL2P7qyzgVq7MHWts'], }) ), @@ -119,7 +119,7 @@ export const FaucetRoutes: FastifyPluginAsync< { title: 'RunFaucetResponse', description: - 'POST request that initiates a transfer of tokens to a specified testnet address', + 'POST request that initiates a transfer of tokens to a specified Bitcoin regtest address', } ), '4xx': Type.Object({ @@ -132,7 +132,7 @@ export const FaucetRoutes: FastifyPluginAsync< async (req, reply) => { await btcFaucetRequestQueue.add(async () => { const address = req.query.address || req.body?.address; - const tbtcAmount = req.query.large ? 0.5 : 0.01; + const btcAmount = req.query.large ? 0.5 : 0.01; if (!address) { return await reply.status(400).send({ error: 'address required', @@ -164,7 +164,7 @@ export const FaucetRoutes: FastifyPluginAsync< }); } - const tx = await makeBtcFaucetPayment(btc.networks.regtest, address, tbtcAmount); + const tx = await makeBtcFaucetPayment(btc.networks.regtest, address, btcAmount); await fastify.writeDb?.insertFaucetRequest({ ip: `${ip}`, address: address, @@ -191,7 +191,7 @@ export const FaucetRoutes: FastifyPluginAsync< tags: ['Faucets'], params: Type.Object({ address: Type.String({ - description: 'A valid testnet BTC address', + description: 'A valid regtest BTC address', examples: ['2N4M94S1ZPt8HfxydXzL2P7qyzgVq7MHWts'], }), }), From b30f16ac5ab7f3c3cd1e1a66e815013a268bfc4f Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:27:26 -0500 Subject: [PATCH 09/10] feat: adjust rBTC default amount, add xlarge url param, add tests --- src/api/routes/faucets.ts | 25 +++++++++++++++++++-- tests/btc-faucet/faucet-btc.test.ts | 34 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/api/routes/faucets.ts b/src/api/routes/faucets.ts index 507532fed..5d7b55016 100644 --- a/src/api/routes/faucets.ts +++ b/src/api/routes/faucets.ts @@ -92,7 +92,14 @@ export const FaucetRoutes: FastifyPluginAsync< large: Type.Optional( Type.Boolean({ description: - 'Request a larger amount of regtest BTC than the default', + 'Request a large amount of regtest BTC than the default', + default: false, + }) + ), + xlarge: Type.Optional( + Type.Boolean({ + description: + 'Request an extra large amount of regtest BTC than the default', default: false, }) ), @@ -132,7 +139,21 @@ export const FaucetRoutes: FastifyPluginAsync< async (req, reply) => { await btcFaucetRequestQueue.add(async () => { const address = req.query.address || req.body?.address; - const btcAmount = req.query.large ? 0.5 : 0.01; + let btcAmount = 0.0001; + + if (req.query.large && req.query.xlarge) { + return await reply.status(400).send({ + error: 'cannot simultaneously request a large and xlarge amount', + success: false, + }); + } + + if (req.query.large) { + btcAmount = 0.01; + } else if (req.query.xlarge) { + btcAmount = 0.5; + } + if (!address) { return await reply.status(400).send({ error: 'address required', diff --git a/tests/btc-faucet/faucet-btc.test.ts b/tests/btc-faucet/faucet-btc.test.ts index 5d2ae10d0..60e000255 100644 --- a/tests/btc-faucet/faucet-btc.test.ts +++ b/tests/btc-faucet/faucet-btc.test.ts @@ -156,6 +156,40 @@ describe('btc faucet', () => { `/extended/v1/faucets/btc/${addr}` ); expect(balanceResponse.status).toBe(200); + expect(JSON.parse(balanceResponse.text)).toEqual({ balance: 0.0001 }); + }); + + test('faucet http balance endpoint large', async () => { + const addr = getKeyAddress(ECPair.makeRandom({ network: regtest })); + const response = await supertest(apiServer.server).post( + `/extended/v1/faucets/btc?address=${addr}&large=true` + ); + expect(response.status).toBe(200); + await getRpcClient().generatetoaddress({ + address: getKeyAddress(ECPair.makeRandom({ network: regtest })), + nblocks: 1, + }); + const balanceResponse = await supertest(apiServer.server).get( + `/extended/v1/faucets/btc/${addr}` + ); + expect(balanceResponse.status).toBe(200); + expect(JSON.parse(balanceResponse.text)).toEqual({ balance: 0.01 }); + }); + + test('faucet http balance endpoint xlarge', async () => { + const addr = getKeyAddress(ECPair.makeRandom({ network: regtest })); + const response = await supertest(apiServer.server).post( + `/extended/v1/faucets/btc?address=${addr}&xlarge=true` + ); + expect(response.status).toBe(200); + await getRpcClient().generatetoaddress({ + address: getKeyAddress(ECPair.makeRandom({ network: regtest })), + nblocks: 1, + }); + const balanceResponse = await supertest(apiServer.server).get( + `/extended/v1/faucets/btc/${addr}` + ); + expect(balanceResponse.status).toBe(200); expect(JSON.parse(balanceResponse.text)).toEqual({ balance: 0.5 }); }); From 1632698e6d9f79c37a3c960aff017e18ef895806 Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:54:02 -0500 Subject: [PATCH 10/10] chore: fix lint --- src/api/routes/faucets.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/api/routes/faucets.ts b/src/api/routes/faucets.ts index 5d7b55016..0f736d70b 100644 --- a/src/api/routes/faucets.ts +++ b/src/api/routes/faucets.ts @@ -91,15 +91,13 @@ export const FaucetRoutes: FastifyPluginAsync< ), large: Type.Optional( Type.Boolean({ - description: - 'Request a large amount of regtest BTC than the default', + description: 'Request a large amount of regtest BTC than the default', default: false, }) ), xlarge: Type.Optional( Type.Boolean({ - description: - 'Request an extra large amount of regtest BTC than the default', + description: 'Request an extra large amount of regtest BTC than the default', default: false, }) ),