From 26be30cbed718790f06a92beb2789b67898750b9 Mon Sep 17 00:00:00 2001 From: Mothana Date: Mon, 30 Sep 2024 20:20:16 +0400 Subject: [PATCH] ndebitEncode pointer instead of pointerId --- package-lock.json | 7 +++---- package.json | 2 +- src/services/main/appUserManager.ts | 2 +- src/services/main/applicationManager.ts | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e62c22fc..18d6503a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "grpc-tools": "^1.12.4", "jsonwebtoken": "^9.0.2", "lodash": "^4.17.21", - "nostr-tools": "github:shocknet/nostr-tools#b0cc4a0763352c6c0e16a22d4b4bb4e2f9a06ed9", + "nostr-tools": "github:shocknet/nostr-tools#ef16463592e2f7b5bf18abc86ff974615d64bb7d", "pg": "^8.4.0", "reflect-metadata": "^0.2.2", "rimraf": "^3.0.2", @@ -3802,9 +3802,8 @@ }, "node_modules/nostr-tools": { "version": "2.8.0", - "resolved": "git+ssh://git@github.com/shocknet/nostr-tools.git#b0cc4a0763352c6c0e16a22d4b4bb4e2f9a06ed9", - "integrity": "sha512-PvgkpUeMffZRGqdzAXU+uOuK9UNWBQ6Dosr8Ie53P0DsVduZGvtChMcaidpczu0gjST33II8anpvbbdluh0+gg==", - "license": "Unlicense", + "resolved": "git+ssh://git@github.com/shocknet/nostr-tools.git#ef16463592e2f7b5bf18abc86ff974615d64bb7d", + "integrity": "sha512-PSBLCTv5ruThR2uS4CRIFgqU6kySxPpDWiqit2Lkc3c1RbTeyhKMr9pRnLSoulkdRZGtDYSTgmoBxvqPkqO8XQ==", "dependencies": { "@noble/ciphers": "^0.5.1", "@noble/curves": "1.2.0", diff --git a/package.json b/package.json index 0887cf1b..b86d0558 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "grpc-tools": "^1.12.4", "jsonwebtoken": "^9.0.2", "lodash": "^4.17.21", - "nostr-tools": "github:shocknet/nostr-tools#b0cc4a0763352c6c0e16a22d4b4bb4e2f9a06ed9", + "nostr-tools": "github:shocknet/nostr-tools#ef16463592e2f7b5bf18abc86ff974615d64bb7d", "pg": "^8.4.0", "reflect-metadata": "^0.2.2", "rimraf": "^3.0.2", diff --git a/src/services/main/appUserManager.ts b/src/services/main/appUserManager.ts index db2c32f1..89f25494 100644 --- a/src/services/main/appUserManager.ts +++ b/src/services/main/appUserManager.ts @@ -68,7 +68,7 @@ export default class { network_max_fee_fixed: this.settings.lndSettings.feeFixedLimit, service_fee_bps: this.settings.outgoingAppUserInvoiceFeeBps, noffer: nofferEncode({ pubkey: app.nostr_public_key!, offer: appUser.identifier, priceType: OfferPriceType.Spontaneous, relay: nostrSettings.relays[0] }), - ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointerId: appUser.identifier, relay: nostrSettings.relays[0] }), + ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: appUser.identifier, relay: nostrSettings.relays[0] }), callback_url: appUser.callback_url, bridge_url: this.settings.bridgeUrl } diff --git a/src/services/main/applicationManager.ts b/src/services/main/applicationManager.ts index a7244b8e..97fa8448 100644 --- a/src/services/main/applicationManager.ts +++ b/src/services/main/applicationManager.ts @@ -163,7 +163,7 @@ export default class { network_max_fee_fixed: this.settings.lndSettings.feeFixedLimit, service_fee_bps: this.settings.outgoingAppUserInvoiceFeeBps, noffer: nofferEncode({ pubkey: app.nostr_public_key!, offer: u.identifier, priceType: OfferPriceType.Spontaneous, relay: nostrSettings.relays[0] }), - ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointerId: u.identifier, relay: nostrSettings.relays[0] }), + ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: u.identifier, relay: nostrSettings.relays[0] }), callback_url: u.callback_url, bridge_url: this.settings.bridgeUrl @@ -208,7 +208,7 @@ export default class { network_max_fee_fixed: this.settings.lndSettings.feeFixedLimit, service_fee_bps: this.settings.outgoingAppUserInvoiceFeeBps, noffer: nofferEncode({ pubkey: app.nostr_public_key!, offer: user.identifier, priceType: OfferPriceType.Spontaneous, relay: nostrSettings.relays[0] }), - ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointerId: user.identifier, relay: nostrSettings.relays[0] }), + ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: user.identifier, relay: nostrSettings.relays[0] }), callback_url: user.callback_url, bridge_url: this.settings.bridgeUrl },