Update NDK to v2.12.2

lib/nostr.js

@@ -22,10 +22,10 @@ export const RELAYS_BLACKLIST = []
 /**
  * @import {NDKSigner} from '@nostr-dev-kit/ndk'
  * @import { NDK } from '@nostr-dev-kit/ndk'
- * @import {NDKNwc} from '@nostr-dev-kit/ndk'
+ * @import {NDKNWCWallet} from '@nostr-dev-kit/ndk-wallet'
  * @typedef {Object} Nostr
  * @property {NDK} ndk
- * @property {function(string, {logger: Object}): Promise<NDKNwc>} nwc
+ * @property {function(string, {logger: Object}): Promise<NDKNWCWallet>} nwc
  * @property {function(Object, {privKey: string, signer: NDKSigner}): Promise<NDKEvent>} sign
  * @property {function(Object, {relays: Array<string>, privKey: string, signer: NDKSigner}): Promise<NDKEvent>} publish
  */

package.json

@@ -17,10 +17,12 @@
     "@apollo/server": "^4.11.0",
     "@as-integrations/next": "^3.1.0",
     "@auth/prisma-adapter": "^2.7.0",
+    "@cashu/cashu-ts": "^2.4.1",
     "@graphql-tools/schema": "^10.0.6",
     "@lightninglabs/lnc-web": "^0.3.2-alpha",
     "@noble/curves": "^1.6.0",
-    "@nostr-dev-kit/ndk": "^2.10.5",
+    "@nostr-dev-kit/ndk": "^2.12.2",
+    "@nostr-dev-kit/ndk-wallet": "^0.5.0",
     "@opensearch-project/opensearch": "^2.12.0",
     "@prisma/client": "^5.20.0",
     "@slack/web-api": "^7.6.0",

scripts/test-nip57.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+# https://github.com/nostr-protocol/nips/blob/master/57.md
+set -e
+
+# test user with attached wallet
+# TODO: attach wallet to test01 via psql if not already attached?
+USERNAME=test01
+
+# XXX this should match NOSTR_PRIVATE_KEY in .env.development
+NOSTR_PRIVATE_KEY=5f30b7e7714360f51f2be2e30c1d93b7fdf67366e730658e85777dfcc4e4245f
+NOSTR_PUBLIC_KEY=$(nak key public $NOSTR_PRIVATE_KEY)
+
+SINCE=$(date +%s)
+
+function create_event() {
+    nak event -k 9734 \
+        --tag p=$NOSTR_PUBLIC_KEY \
+        --tag 'relays=wss://relay.primal.net' \
+        --tag amount=100000
+}
+
+function url_encode() {
+    cat - | jq -sRr @uri
+}
+
+function test_exit() {
+    if [ $1 -eq 0 ]; then
+        echo "worker publishes nip-57 zap receipts: PASSED"
+    else
+        echo "worker publishes nip-57 zap receipts: FAILED"
+    fi
+    exit $1
+}
+
+create_event | nak verify
+
+# create a zap request event (kind 9734)
+EVENT="$(create_event)"
+
+echo "generated zap request event:"
+echo "$EVENT" | jq
+
+echo $EVENT | nak verify
+
+# XXX make sure amount is higher than dust limit of receiver's wallet
+echo -n "sending zap request event LNURL endpoint ... "
+PR=$(curl -s "http://localhost:3000/api/lnurlp/$USERNAME/pay?amount=100000&nostr=$(echo $EVENT | url_encode)" | jq -r .pr)
+echo "OK"
+
+[ "$PR" == "null" ] && echo "error: LNURL endpoint did not return bolt11" && test_exit 1
+echo $PR
+
+sndev fund --cln $PR
+
+# subscribe to zap receipt event (kind 9735)
+echo -n "waiting for zap receipt event ... "
+sleep 3
+PR2=$(nak -q req -k 9735 -p $NOSTR_PUBLIC_KEY --limit 1 wss://relay.primal.net | jq -r '.tags[] | select(.[0] == "bolt11") | .[1]')
+echo "OK"
+
+[ "$PR" == "$PR2" ] && test_exit 0 || test_exit 1

wallets/nwc/client.js

@@ -9,6 +9,6 @@ export async function testSendPayment ({ nwcUrl }, { signal }) {
 }
 
 export async function sendPayment (bolt11, { nwcUrl }, { signal }) {
-  const result = await nwcTryRun(nwc => nwc.payInvoice(bolt11), { nwcUrl }, { signal })
+  const result = await nwcTryRun(nwc => nwc.lnPay({ pr: bolt11 }), { nwcUrl }, { signal })
   return result.preimage
 }