From 10de1571947a6b2cd4311bf50d1963e5a7b94e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 15:28:35 +0000 Subject: [PATCH 1/7] Bump path-to-regexp and express 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.10 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.10...v0.1.12) Updates `express` from 4.21.1 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.21.1...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] --- package-lock.json | 22 ++++++++++++++-------- package.json | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ac4afbe..930257b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "csv": "^6.3.8", "dotenv": "^16.4.5", "eccrypto": "^1.1.6", - "express": "^4.21.1", + "express": "^4.21.2", "globby": "^13.1.2", "grpc-tools": "^1.12.4", "jsonwebtoken": "^9.0.2", @@ -2648,9 +2648,10 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -2671,7 +2672,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -2686,6 +2687,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/encodeurl": { @@ -4554,9 +4559,10 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", diff --git a/package.json b/package.json index 27c06028..14f3ed91 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "csv": "^6.3.8", "dotenv": "^16.4.5", "eccrypto": "^1.1.6", - "express": "^4.21.1", + "express": "^4.21.2", "globby": "^13.1.2", "grpc-tools": "^1.12.4", "jsonwebtoken": "^9.0.2", From 8d711e0b6d2fd81c4f27a1b39aa6ff2367117bd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 15:28:57 +0000 Subject: [PATCH 2/7] Bump secp256k1 from 4.0.3 to 5.0.1 Bumps [secp256k1](https://github.com/cryptocoinjs/secp256k1-node) from 4.0.3 to 5.0.1. - [Release notes](https://github.com/cryptocoinjs/secp256k1-node/releases) - [Commits](https://github.com/cryptocoinjs/secp256k1-node/compare/v4.0.3...v5.0.1) --- updated-dependencies: - dependency-name: secp256k1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ac4afbe..f2a5be2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "reflect-metadata": "^0.2.2", "rimraf": "^3.0.2", "rxjs": "^7.5.5", - "secp256k1": "^4.0.4", + "secp256k1": "^5.0.1", "sqlite3": "^5.1.7", "ts-node": "^10.7.0", "ts-proto": "^1.131.2", @@ -5129,10 +5129,11 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/secp256k1": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.4.tgz", - "integrity": "sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-5.0.1.tgz", + "integrity": "sha512-lDFs9AAIaWP9UCdtWrotXWWF9t8PWgQDcxqgAnpM9rMqxb3Oaq2J0thzPVSxBwdJgyQtkU/sYtFtbM1RSt/iYA==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "elliptic": "^6.5.7", "node-addon-api": "^5.0.0", diff --git a/package.json b/package.json index 27c06028..7aa1110c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "reflect-metadata": "^0.2.2", "rimraf": "^3.0.2", "rxjs": "^7.5.5", - "secp256k1": "^4.0.4", + "secp256k1": "^5.0.1", "sqlite3": "^5.1.7", "ts-node": "^10.7.0", "ts-proto": "^1.131.2", From 4c0f8fa782903a2c27589c0d2e7ccae916ad938b Mon Sep 17 00:00:00 2001 From: boufni95 Date: Mon, 19 May 2025 17:50:19 +0000 Subject: [PATCH 3/7] fix stop --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 3dd3db76..49ffa1f4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -28,7 +28,7 @@ const start = async () => { { ...nostrSettings, apps, clients: [liquidityProviderInfo] }, (e, p) => mainHandler.liquidityProvider.onEvent(e, p) ) - exitHandler(() => { Stop() }) + exitHandler(() => { Stop(); mainHandler.Stop() }) log("starting server") mainHandler.attachNostrSend(Send) mainHandler.attachNostrProcessPing(Ping) From e3793e905c19bac414118f030be33990259dbc47 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Wed, 21 May 2025 14:37:46 +0000 Subject: [PATCH 4/7] deb offer error --- src/services/main/offerManager.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/main/offerManager.ts b/src/services/main/offerManager.ts index 0e91caba..7ab91e7f 100644 --- a/src/services/main/offerManager.ts +++ b/src/services/main/offerManager.ts @@ -208,6 +208,7 @@ export class OfferManager { } const { passed, validated } = this.ValidateExpectedData(userOffer, offerReq.payer_data) if (!passed) { + console.log("Invalid expected data", validated) return { success: false, code: 1, max: remote } } const res = await this.applicationManager.AddAppUserInvoice(appId, { From 4b87a1363286c9efb670dd37d8c810130484e89a Mon Sep 17 00:00:00 2001 From: boufni95 Date: Wed, 21 May 2025 14:54:04 +0000 Subject: [PATCH 5/7] delete default offer --- src/services/main/offerManager.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/services/main/offerManager.ts b/src/services/main/offerManager.ts index 7ab91e7f..bafc4f5d 100644 --- a/src/services/main/offerManager.ts +++ b/src/services/main/offerManager.ts @@ -199,6 +199,11 @@ export class OfferManager { if (!userOffer) { return this.HandleDefaultUserOffer(offerReq, appId, remote) } + if (userOffer.app_user_id === userOffer.offer_id) { + this.logger("default user offer has db entry, deleting") + await this.storage.offerStorage.DeleteUserOffer(userOffer.app_user_id, userOffer.offer_id) + return this.HandleDefaultUserOffer(offerReq, appId, remote) + } let amt = userOffer.price_sats if (userOffer.price_sats === 0) { if (!amount || isNaN(amount) || amount < 10 || amount > remote) { From cf4d519a41f376e6b788450122bbf32a8def2b7a Mon Sep 17 00:00:00 2001 From: boufni95 Date: Wed, 21 May 2025 15:48:54 +0000 Subject: [PATCH 6/7] reset defult offer price and custom --- src/services/main/offerManager.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/services/main/offerManager.ts b/src/services/main/offerManager.ts index bafc4f5d..a9045598 100644 --- a/src/services/main/offerManager.ts +++ b/src/services/main/offerManager.ts @@ -200,9 +200,12 @@ export class OfferManager { return this.HandleDefaultUserOffer(offerReq, appId, remote) } if (userOffer.app_user_id === userOffer.offer_id) { - this.logger("default user offer has db entry, deleting") - await this.storage.offerStorage.DeleteUserOffer(userOffer.app_user_id, userOffer.offer_id) - return this.HandleDefaultUserOffer(offerReq, appId, remote) + if (userOffer.price_sats !== 0 || userOffer.expected_data) { + this.logger("default offer has custom price or expected data, resetting") + await this.storage.offerStorage.UpdateUserOffer(userOffer.app_user_id, userOffer.offer_id, { price_sats: 0, expected_data: null }) + userOffer.price_sats = 0 + userOffer.expected_data = null + } } let amt = userOffer.price_sats if (userOffer.price_sats === 0) { From 4c505a2777a5e967704687ea09c426edc473228c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 16:54:42 +0000 Subject: [PATCH 7/7] Bump websocket and @types/websocket Bumps [websocket](https://github.com/theturtle32/WebSocket-Node) and [@types/websocket](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/websocket). These dependencies needed to be updated together. Updates `websocket` from 1.0.34 to 1.0.35 - [Changelog](https://github.com/theturtle32/WebSocket-Node/blob/v1.0.35/CHANGELOG.md) - [Commits](https://github.com/theturtle32/WebSocket-Node/compare/v1.0.34...v1.0.35) Updates `@types/websocket` from 1.0.6 to 1.0.10 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/websocket) --- updated-dependencies: - dependency-name: websocket dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: "@types/websocket" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 20 +++++++++++--------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f67b1b4..7d10ca2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "typeorm": "0.3.15", "typescript": "^5.5.4", "uuid": "^8.3.2", - "websocket": "^1.0.34", + "websocket": "^1.0.35", "websocket-polyfill": "^0.0.3", "why-is-node-running": "^3.2.0", "wrtc": "^0.4.7", @@ -61,7 +61,7 @@ "@types/node": "^16.11.10", "@types/node-fetch": "^2.6.3", "@types/uuid": "^8.3.4", - "@types/websocket": "^1.0.6", + "@types/websocket": "^1.0.10", "@types/ws": "^8.5.12", "nodemon": "^2.0.20", "ts-node": "10.7.0", @@ -860,10 +860,11 @@ "dev": true }, "node_modules/@types/websocket": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.6.tgz", - "integrity": "sha512-JXkliwz93B2cMWOI1ukElQBPN88vMg3CruvW4KVSKpflt3NyNCJImnhIuB/f97rG7kakqRJGFiwkA895Kn02Dg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.10.tgz", + "integrity": "sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -6393,13 +6394,14 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/websocket": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", - "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==", + "version": "1.0.35", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz", + "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==", + "license": "Apache-2.0", "dependencies": { "bufferutil": "^4.0.1", "debug": "^2.2.0", - "es5-ext": "^0.10.50", + "es5-ext": "^0.10.63", "typedarray-to-buffer": "^3.1.5", "utf-8-validate": "^5.0.2", "yaeti": "^0.0.6" diff --git a/package.json b/package.json index 34e71ed4..e08010ac 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "typeorm": "0.3.15", "typescript": "^5.5.4", "uuid": "^8.3.2", - "websocket": "^1.0.34", + "websocket": "^1.0.35", "websocket-polyfill": "^0.0.3", "why-is-node-running": "^3.2.0", "wrtc": "^0.4.7", @@ -78,7 +78,7 @@ "@types/node": "^16.11.10", "@types/node-fetch": "^2.6.3", "@types/uuid": "^8.3.4", - "@types/websocket": "^1.0.6", + "@types/websocket": "^1.0.10", "@types/ws": "^8.5.12", "nodemon": "^2.0.20", "ts-node": "10.7.0",