2020117-agent 0.6.8 → 0.6.10

package/dist/agent.js

@@ -79,7 +79,7 @@ for (const arg of process.argv.slice(2)) {
             break;
     }
 }
-import { randomBytes } from 'crypto';
+import { randomBytes, createHash } from 'crypto';
 import { createConnection } from 'net';
 import { SwarmNode, topicFromKind } from './swarm.js';
 import { createProcessor } from './processor.js';
@@ -827,21 +827,91 @@ function markSeen(eventId) {
     }
     return true;
 }
+/**
+ * Decode payment_hash from a bolt11 invoice (bech32, tagged field type 1).
+ * Returns hex string or undefined if decoding fails.
+ */
+function decodeBolt11PaymentHash(bolt11) {
+    try {
+        // Strip prefix (lnbc/lntb/lnbcrt + amount)
+        const lower = bolt11.toLowerCase();
+        const sepIdx = lower.lastIndexOf('1');
+        if (sepIdx < 0)
+            return undefined;
+        const data5 = lower.slice(sepIdx + 1, -6); // strip checksum
+        // Bech32 charset
+        const CHARSET = 'qpzry9x8gf2tvdw0s3jn54khce6mua7l';
+        const decoded5 = [];
+        for (const c of data5) {
+            const v = CHARSET.indexOf(c);
+            if (v < 0)
+                return undefined;
+            decoded5.push(v);
+        }
+        // Convert 5-bit groups to 8-bit bytes
+        let acc = 0, bits = 0;
+        const bytes = [];
+        for (const v of decoded5) {
+            acc = (acc << 5) | v;
+            bits += 5;
+            while (bits >= 8) {
+                bits -= 8;
+                bytes.push((acc >> bits) & 0xff);
+            }
+        }
+        // Skip timestamp (35 bits = 7 x 5-bit groups at start, already in bytes[0..4])
+        // Parse tagged fields: type(5b) len(10b) data
+        let i = 7; // bytes 0-4 = timestamp, skip
+        while (i < bytes.length - 32) {
+            const type = bytes[i];
+            const len = (bytes[i + 1] << 5) | bytes[i + 2];
+            i += 3;
+            if (type === 1 && len === 52) {
+                // payment_hash: 52 x 5-bit = 260 bits → 32 bytes
+                const hash5 = decoded5.slice(/* recalculate offset */ 0);
+                // Simpler: just look for the 32-byte hash in the byte stream at this position
+                const hashBytes = bytes.slice(i, i + 32);
+                if (hashBytes.length === 32)
+                    return Buffer.from(hashBytes).toString('hex');
+            }
+            i += len;
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Verify Lightning payment preimage: SHA256(preimage_hex) should equal payment_hash_hex */
+function verifyPreimage(preimageHex, paymentHashHex) {
+    try {
+        const preimageBytes = Buffer.from(preimageHex, 'hex');
+        const computed = createHash('sha256').update(preimageBytes).digest('hex');
+        return computed === paymentHashHex.toLowerCase();
+    }
+    catch {
+        return false;
+    }
+}
 /** Send a billing tick to the customer — generate Lightning invoice.
  *  Prefers NWC make_invoice (if nwc_uri configured), falls back to LNURL-pay. */
 async function sendBillingTick(node, session, amount, label) {
     const tickId = randomBytes(4).toString('hex');
     try {
         let bolt11;
+        let paymentHash;
         if (state.nwcParsed) {
             // NWC make_invoice: wallet generates invoice directly — no lightning address needed
             const result = await nwcMakeInvoice(state.nwcParsed, amount * 1000, `2020117 session ${session.sessionId}`);
             bolt11 = result.bolt11;
+            paymentHash = result.payment_hash;
         }
         else {
             // Fallback: LNURL-pay via lightning address
             bolt11 = await generateInvoice(LIGHTNING_ADDRESS, amount);
+            paymentHash = decodeBolt11PaymentHash(bolt11);
         }
+        session.pendingPaymentHash = paymentHash;
         node.send(session.socket, {
             type: 'session_tick',
             id: tickId,
@@ -946,10 +1016,32 @@ async function startSwarmListener(label) {
             if (!session)
                 return;
             if (msg.preimage) {
+                // Verify preimage: SHA256(preimage) must equal the invoice's payment_hash.
+                // If payment_hash is missing (bolt11 decode failed), reject — fail secure.
+                if (!session.pendingPaymentHash) {
+                    console.log(`[${label}] Session ${session.sessionId}: cannot verify payment (no payment_hash) — ending session`);
+                    node.send(session.socket, { type: 'error', id: msg.id, message: 'Provider cannot verify payment' });
+                    endSession(node, session, label);
+                    return;
+                }
+                if (!verifyPreimage(msg.preimage, session.pendingPaymentHash)) {
+                    console.log(`[${label}] Session ${session.sessionId}: invalid preimage — ending session`);
+                    node.send(session.socket, { type: 'error', id: msg.id, message: 'Invalid payment preimage' });
+                    endSession(node, session, label);
+                    return;
+                }
+                session.pendingPaymentHash = undefined;
                 const amount = msg.amount || 0;
                 session.totalEarned += amount;
                 session.lastPaidAt = Date.now();
-                console.log(`[${label}] Session ${session.sessionId}: invoice payment received (+${amount}, total: ${session.totalEarned} sats)`);
+                console.log(`[${label}] Session ${session.sessionId}: payment verified (+${amount}, total: ${session.totalEarned} sats)`);
+            }
+            else {
+                // No preimage provided — reject
+                console.log(`[${label}] Session ${session.sessionId}: session_tick_ack missing preimage — ending session`);
+                node.send(session.socket, { type: 'error', id: msg.id, message: 'Payment preimage required' });
+                endSession(node, session, label);
+                return;
             }
             // Proxy mode: switch to raw TCP pipe after first payment confirmed
             if (session.proxyMode && !session.proxyStarted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Lightning payments",
   "type": "module",
   "bin": {