From b8a395859b54fd749286e2a2e6cb9f30bd75b185 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 1 Oct 2022 23:41:09 +0000
Subject: fix liquid receipts

---
 index.js                 | 5 +++++
 lib/webhooks.js          | 7 ++++---
 routes/liquid/receive.js | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index 5a7a44bc..c96abe5f 100644
--- a/index.js
+++ b/index.js
@@ -28,6 +28,11 @@ if (config.lna) store.networks.push("lightning");
 let host = process.env.HOST || "0.0.0.0";
 let port = process.env.PORT || 3119;
 
+app.post('/echo', async (req, res) => {
+  console.log(req.body)
+  res.send(req.body);
+}); 
+
 app.listen({ host, port }, (e, address) => {
   e && err(e) && process.exit(1);
   l(`CoinOS Server listening on ${address}`);
diff --git a/lib/webhooks.js b/lib/webhooks.js
index 9964bb94..901bd264 100644
--- a/lib/webhooks.js
+++ b/lib/webhooks.js
@@ -5,7 +5,7 @@ import { l } from "$lib/logging";
 export const callWebhook = (invoice, payment) => {
   if (!invoice || !payment) return;
 
-  let { address, text, webhook } = invoice;
+  let { address, received, text, webhook } = invoice;
 
   if (webhook) {
     let { amount, confirmed, hash, memo, account } = payment;
@@ -18,11 +18,12 @@ export const callWebhook = (invoice, payment) => {
       .url(webhook)
       .post({
         address,
-        asset,
         amount,
+        asset,
+        confirmed,
         hash,
         memo,
-        confirmed,
+        received,
         text,
         webhook
       })
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 4ad4c7dc..cb5c5444 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -117,11 +117,11 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
   Promise.all(
     tx.vout.map(async o => {
       try {
-        if (!(o.scriptPubKey && o.scriptPubKey.addresses)) return;
+        if (!(o.scriptPubKey && o.scriptPubKey.address)) return;
 
         const { asset } = o;
         const value = toSats(o.value);
-        const address = o.scriptPubKey.addresses[0];
+        const { address } = o.scriptPubKey;
 
         if (
           Object.keys(store.addresses).includes(address) &&
-- 
cgit v1.2.3