clink types

package.json

@@ -30,6 +30,7 @@
     "@protobuf-ts/grpc-transport": "^2.9.4",
     "@protobuf-ts/plugin": "^2.5.0",
     "@protobuf-ts/runtime": "^2.5.0",
+    "@shocknet/clink-sdk": "^1.0.4",
     "@stablelib/xchacha20": "^1.0.1",
     "@types/express": "^4.17.21",
     "@types/node": "^17.0.31",
@@ -49,7 +50,7 @@
     "grpc-tools": "^1.12.4",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
-    "nostr-tools": "github:shocknet/nostr-tools#27575ffb69d615691242df433a0ccc063f6b8346",
+    "nostr-tools": "^2.13.0",
     "pg": "^8.4.0",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^3.0.2",

src/nostrMiddleware.ts

@@ -4,8 +4,7 @@ import { NostrEvent, NostrSend, NostrSettings } from "./services/nostr/handler.j
 import * as Types from '../proto/autogenerated/ts/types.js'
 import NewNostrTransport, { NostrRequest } from '../proto/autogenerated/ts/nostr_transport.js';
 import { ERROR, getLogger } from "./services/helpers/logger.js";
-import { NdebitData } from "nostr-tools/lib/types/nip68.js";
+import { NdebitData, NofferData } from "@shocknet/clink-sdk";
-import { NofferData } from "nostr-tools/lib/types/nip69.js";
 
 export default (serverMethods: Types.ServerMethods, mainHandler: Main, nostrSettings: NostrSettings, onClientEvent: (e: { requestId: string }, fromPub: string) => void): { Stop: () => void, Send: NostrSend, Ping: () => Promise<void> } => {
     const log = getLogger({})

src/services/main/appUserManager.ts

@@ -4,9 +4,8 @@ import * as Types from '../../../proto/autogenerated/ts/types.js'
 
 import { MainSettings } from './settings.js'
 import ApplicationManager from './applicationManager.js'
-import { nip19 } from 'nostr-tools'
 import { LoadNosrtSettingsFromEnv } from '../nostr/index.js'
-const { ndebitEncode, nofferEncode, OfferPriceType } = nip19
+import { OfferPriceType, ndebitEncode, nofferEncode } from '@shocknet/clink-sdk'
 export default class {
 
     storage: Storage

src/services/main/applicationManager.ts

@@ -8,11 +8,9 @@ import { ApplicationUser } from '../storage/entity/ApplicationUser.js'
 import { PubLogger, getLogger } from '../helpers/logger.js'
 import crypto from 'crypto'
 import { Application } from '../storage/entity/Application.js'
-import { nip69, nip19 } from 'nostr-tools'
 import { LoadNosrtSettingsFromEnv } from '../nostr/index.js'
 import { ZapInfo } from '../storage/entity/UserReceivingInvoice.js'
-const { SendNofferRequest } = nip69
+import { nofferEncode, ndebitEncode, OfferPriceType } from '@shocknet/clink-sdk'
-const { nofferEncode, ndebitEncode, OfferPriceType } = nip19
 const TOKEN_EXPIRY_TIME = 2 * 60 * 1000 // 2 minutes, in milliseconds
 
 type NsecLinkingData = {

src/services/main/debitManager.ts

@@ -1,16 +1,15 @@
-import crypto from 'crypto';
 import * as Types from "../../../proto/autogenerated/ts/types.js";
 import ApplicationManager from "./applicationManager.js";
 import Storage from '../storage/index.js'
 import LND from "../lnd/lnd.js"
 import { ERROR, getLogger } from "../helpers/logger.js";
 import { DebitAccess, DebitAccessRules } from '../storage/entity/DebitAccess.js';
-import paymentManager from './paymentManager.js';
 import { Application } from '../storage/entity/Application.js';
 import { ApplicationUser } from '../storage/entity/ApplicationUser.js';
 import { NostrEvent, NostrSend, SendData, SendInitiator } from '../nostr/handler.js';
 import { UnsignedEvent } from 'nostr-tools';
-import { BudgetFrequency, NdebitData, NdebitFailure, NdebitSuccess, NdebitSuccessPayment, RecurringDebitTimeUnit } from 'nostr-tools/lib/types/nip68.js';
+import { NdebitData, NdebitFailure, NdebitSuccess, NdebitSuccessPayment, RecurringDebitTimeUnit } from "@shocknet/clink-sdk";
+
 export const expirationRuleName = 'expiration'
 export const frequencyRuleName = 'frequency'
 const unitToIntervalType = (unit: RecurringDebitTimeUnit) => {

src/services/main/index.ts

@@ -23,7 +23,6 @@ import { AdminManager } from "./adminManager.js"
 import { Unlocker } from "./unlocker.js"
 import { defaultInvoiceExpiry } from "../storage/paymentStorage.js"
 import { DebitManager } from "./debitManager.js"
-import { NofferData } from "nostr-tools/lib/types/nip69.js"
 import { OfferManager } from "./offerManager.js"
 import webRTC from "../webRTC/index.js"
 

src/services/main/offerManager.ts

@@ -1,23 +1,15 @@
-import crypto from 'crypto';
 import * as Types from "../../../proto/autogenerated/ts/types.js";
 import ApplicationManager from "./applicationManager.js";
 import ProductManager from "./productManager.js";
 import Storage from '../storage/index.js'
 import LND from "../lnd/lnd.js"
 import { ERROR, getLogger } from "../helpers/logger.js";
-import { DebitAccess, DebitAccessRules } from '../storage/entity/DebitAccess.js';
-import paymentManager from './paymentManager.js';
-import { Application } from '../storage/entity/Application.js';
-import { ApplicationUser } from '../storage/entity/ApplicationUser.js';
 import { NostrEvent, NostrSend, SendData, SendInitiator } from '../nostr/handler.js';
 import { UnsignedEvent } from 'nostr-tools';
-import { BudgetFrequency, NdebitData, NdebitFailure, NdebitSuccess, NdebitSuccessPayment, RecurringDebitTimeUnit } from 'nostr-tools/lib/types/nip68.js';
-import { NofferData } from "nostr-tools/lib/types/nip69.js"
 import { UserOffer } from '../storage/entity/UserOffer.js';
-import { DeepPartial } from 'typeorm';
-import { nip19 } from 'nostr-tools';
 import { LoadNosrtSettingsFromEnv } from '../nostr/index.js';
 import { LiquidityManager } from "./liquidityManager.js"
+import { NofferData, OfferPriceType, nofferEncode } from '@shocknet/clink-sdk';
 
 const mapToOfferConfig = (appUserId: string, offer: UserOffer, { pubkey, relay }: { pubkey: string, relay: string }): Types.OfferConfig => {
     if (offer.expected_data) {
@@ -30,8 +22,8 @@ const mapToOfferConfig = (appUserId: string, offer: UserOffer, { pubkey, relay }
         }
     }
     const offerStr = offer.offer_id
-    const priceType: nip19.OfferPriceType = offer.price_sats === 0 ? nip19.OfferPriceType.Spontaneous : nip19.OfferPriceType.Fixed
+    const priceType: OfferPriceType = offer.price_sats === 0 ? OfferPriceType.Spontaneous : OfferPriceType.Fixed
-    const noffer = nip19.nofferEncode({ pubkey, offer: offerStr, priceType, relay, price: offer.price_sats || undefined })
+    const noffer = nofferEncode({ pubkey, offer: offerStr, priceType, relay, price: offer.price_sats || undefined })
     return {
         label: offer.label,
         price_sats: offer.price_sats,

src/services/main/paymentManager.ts

@@ -7,15 +7,13 @@ import { InboundOptionals, defaultInvoiceExpiry } from '../storage/paymentStorag
 import LND from '../lnd/lnd.js'
 import { Application } from '../storage/entity/Application.js'
 import { ERROR, getLogger, PubLogger } from '../helpers/logger.js'
-import { UserReceivingAddress } from '../storage/entity/UserReceivingAddress.js'
+import { AddressPaidCb, InvoicePaidCb } from '../lnd/settings.js'
-import { AddressPaidCb, InvoicePaidCb, PaidInvoice } from '../lnd/settings.js'
 import { UserReceivingInvoice, ZapInfo } from '../storage/entity/UserReceivingInvoice.js'
-import { Payment_PaymentStatus, SendCoinsResponse } from '../../../proto/lnd/lightning.js'
+import { Payment_PaymentStatus } from '../../../proto/lnd/lightning.js'
 import { Event, verifiedSymbol, verifyEvent } from 'nostr-tools'
 import { AddressReceivingTransaction } from '../storage/entity/AddressReceivingTransaction.js'
 import { UserTransactionPayment } from '../storage/entity/UserTransactionPayment.js'
 import { Watchdog } from './watchdog.js'
-import { LiquidityProvider } from './liquidityProvider.js'
 import { LiquidityManager } from './liquidityManager.js'
 import { Utils } from '../helpers/utilsWrapper.js'
 import { UserInvoicePayment } from '../storage/entity/UserInvoicePayment.js'

src/services/main/productManager.ts

@@ -5,8 +5,7 @@ import * as Types from '../../../proto/autogenerated/ts/types.js'
 import { MainSettings } from './settings.js'
 import PaymentManager from './paymentManager.js'
 import { defaultInvoiceExpiry } from '../storage/paymentStorage.js'
-import { nip19 } from 'nostr-tools'
+import { nofferEncode, OfferPriceType } from '@shocknet/clink-sdk'
-const { nofferEncode, OfferPriceType } = nip19
 
 export default class {
     storage: Storage

src/services/nostr/handler.ts

@@ -1,8 +1,7 @@
 //import { SimplePool, Sub, Event, UnsignedEvent, getEventHash, signEvent } from 'nostr-tools'
 import WebSocket from 'ws'
 Object.assign(global, { WebSocket: WebSocket });
-import { SimplePool, Event, UnsignedEvent, getEventHash, finalizeEvent, Relay, nip44 } from 'nostr-tools'
+import { SimplePool, Event, UnsignedEvent, finalizeEvent, Relay, nip44 } from 'nostr-tools'
-//import { encryptData, decryptData, getSharedSecret, decodePayload, encodePayload, EncryptedData, nip44 } from 'nostr-tools'
 import { ERROR, getLogger } from '../helpers/logger.js'
 import { nip19 } from 'nostr-tools'
 import { encrypt as encryptV1, decrypt as decryptV1, getSharedSecret as getConversationKeyV1 } from './nip44v1.js'