sendinvoice support

3 files changed, 26 insertions, 15 deletions

diff --git a/lib/invoices.ts b/lib/invoices.ts
index 45987ae1..1800b859 100644
--- a/lib/invoices.ts
+++ b/lib/invoices.ts
@@ -16,6 +16,7 @@ export const generate = async ({ invoice, user }) => {
   let {
     address_type,
     bolt11,
+    bolt12,
     aid,
     currency,
     expiry,
@@ -35,8 +36,8 @@ export const generate = async ({ invoice, user }) => {
     secret,
   } = invoice;
 
-  amount = parseInt(amount || 0);
-  tip = tip == null ? null : parseInt(tip);
+  amount = Number.parseInt(amount || 0);
+  tip = tip == null ? null : Number.parseInt(tip);
 
   if (user) user = await getUser(user.username);
   if (!user) fail("user not provided");
@@ -95,18 +96,26 @@ export const generate = async ({ invoice, user }) => {
     text = r.bolt11;
     paymentHash = r.payment_hash;
   } else if (type === PaymentType.bolt12) {
-    const r = await ln.offer({
-      amount: amount ? `${amount + tip}sat` : "any",
-      label: `${id} ${user.username} ${new Date()}`,
-      description: memo || id,
-    });
+    let r;
+    if (bolt12) {
+      const { id: nodeid } = await ln.getinfo();
+      r = await ln.decode(bolt12);
+      if (r.invoice_node_id !== nodeid) fail("invalid invoice");
+      amount = Math.round(r.invoice_amount_msat / 1000);
+      r.bolt12 = bolt12;
+    } else {
+      const r = await ln.offer({
+        amount: amount ? `${amount + tip}sat` : "any",
+        label: `${id} ${user.username} ${new Date()}`,
+        description: memo || id,
+      });
 
-    if (await getInvoice(r.offer_id)) fail("Duplicate offer exists");
+      if (await getInvoice(r.offer_id)) fail("Duplicate offer exists");
+      await s(`invoice:${r.offer_id}`, id);
+    }
 
     hash = r.bolt12;
     text = r.bolt12;
-
-    await s(`invoice:${r.offer_id}`, id);
   } else if (type === PaymentType.bitcoin) {
     address_type ||= "bech32";
     hash = await bc.getNewAddress({ address_type });
diff --git a/lib/lightning.ts b/lib/lightning.ts
index 8f5f44bc..f8d0f6a4 100644
--- a/lib/lightning.ts
+++ b/lib/lightning.ts
@@ -27,7 +27,7 @@ export async function listenForLightning() {
   try {
     if (!preimage) return;
 
-    const invoice = await getInvoice(bolt11 ?? local_offer_id);
+    const invoice = await getInvoice(bolt11 ?? local_offer_id ?? bolt12);
     if (!invoice) return warn("received lightning with no invoice", bolt11);
 
     const p = await getPayment(bolt11 || bolt12);
@@ -75,10 +75,10 @@ export async function replay(index) {
   try {
     if (!preimage) return;
 
-    const invoice = await getInvoice(bolt11 ?? local_offer_id);
+    const invoice = await getInvoice(bolt11 ?? local_offer_id ?? bolt12);
     if (!invoice) return warn("received lightning with no invoice", bolt11);
 
-    const p = await getPayment(bolt11 || bolt12);
+    let p = await getPayment(bolt11 || bolt12);
     if (p) return warn("already processed", bolt11 || bolt12);
 
     if (invoice?.memo) {
@@ -93,13 +93,15 @@ export async function replay(index) {
       }
     }
 
-    await credit({
+    p = await credit({
       hash: bolt11 || bolt12,
       amount: received,
       memo: invoice.memo,
       ref: preimage,
       type: bolt12 ? PaymentType.bolt12 : PaymentType.lightning,
     });
+
+    return p;
   } catch (e) {
     console.log(e);
     err("problem receiving lightning payment", e.message);
diff --git a/lib/payments.ts b/lib/payments.ts
index 807c87fa..9b7c807b 100644
--- a/lib/payments.ts
+++ b/lib/payments.ts
@@ -185,7 +185,7 @@ export const credit = async ({
   amount = parseInt(amount) || 0;
 
   let inv;
-  if (type === PaymentType.bolt12) {
+  if (type === PaymentType.bolt12 && !hash.startsWith("lni")) {
     const { invoices } = await ln.listinvoices({ invstring: hash });
     const { local_offer_id } = invoices[0];
     inv = await getInvoice(local_offer_id);