invoice fixes

2 files changed, 9 insertions, 14 deletions

diff --git a/lib/invoices.js b/lib/invoices.js
index ddb378cf..f64cf409 100644
--- a/lib/invoices.js
+++ b/lib/invoices.js
@@ -29,9 +29,8 @@ export let generate = async ({ invoice, user, sender, memo }) => {
 
   let hash, text;
   if (type === types.lightning) {
-    let amt = amount ? `${amount + tip}sat` : "any";
     let r = await ln.invoice(
-      amt,
+      amount ? `${amount + tip}sat` : "any",
       new Date(),
       memo || "",
       3600,
@@ -54,16 +53,17 @@ export let generate = async ({ invoice, user, sender, memo }) => {
   }
 
   invoice = {
-    ...invoice,
     amount,
-    hash,
-    text,
+      created: Date.now(),
     currency,
+    hash,
     rate,
+    received: 0,
+    request_id,
+    text,
     tip,
+    type,
     uid,
-    received: 0,
-    created: Date.now()
   };
 
   l("creating invoice", user.username, amount, tip, currency, invoice.hash);
diff --git a/lib/webhooks.js b/lib/webhooks.js
index c071eccb..1158fe9d 100644
--- a/lib/webhooks.js
+++ b/lib/webhooks.js
@@ -9,23 +9,18 @@ export const callWebhook = async (invoice, payment) => {
     let { address, received, text, webhook } = invoice;
 
     if (webhook) {
-      let { amount, confirmed, hash, memo, account } = payment;
-      let { asset } = account;
-      let secret = config.webhooks[webhook];
+      let { amount, confirmed, hash, memo } = payment;
 
       l("calling webhook", webhook, amount, hash, address, text);
       let res = await got(webhook, {
-        headers: { "x-webhook": secret },
         json: {
           address,
           amount,
-          asset,
           confirmed,
           hash,
           memo,
           received,
-          text,
-          webhook
+          text
         }
       }).res();
       return res;