From a72dd72280a59b1fc10454add027704dc7bdb1a3 Mon Sep 17 00:00:00 2001
From: Daniel Lugo <danlugo92@gmail.com>
Date: Fri, 21 Aug 2020 13:50:15 -0400
Subject: [PATCH] use new wrapper

---
 src/routes.js | 94 ++++++++++++++-------------------------------------
 1 file changed, 26 insertions(+), 68 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index 584d1944..bdd7bdc0 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -29,6 +29,10 @@ const {
 const GunActions = require('../services/gunDB/contact-api/actions')
 const GunGetters = require('../services/gunDB/contact-api/getters')
 const GunKey = require('../services/gunDB/contact-api/key')
+const {
+  sendPaymentV2Keysend,
+  sendPaymentV2Invoice
+} = require('../utils/lightningServices/v2')
 
 const DEFAULT_MAX_NUM_ROUTES_TO_QUERY = 10
 const SESSION_ID = uuid()
@@ -1442,92 +1446,46 @@ module.exports = async (
   })
 
   // sendpayment
-  app.post('/api/lnd/sendpayment', (req, res) => {
-    const { router } = LightningServices.services
+  app.post('/api/lnd/sendpayment', async (req, res) => {
     // this is the recommended value from lightning labs
-    let paymentRequest = {}
     const { keysend, maxParts = 3, timeoutSeconds = 5, feeLimit } = req.body
+
     if (!feeLimit) {
-      return res.status(500).json({
+      return res.status(400).json({
         errorMessage: 'please provide a "feeLimit" to the send payment request'
       })
     }
+
     if (keysend) {
       const { dest, amt, finalCltvDelta = 40 } = req.body
       if (!dest || !amt) {
-        return res.status(500).json({
+        return res.status(400).json({
           errorMessage: 'please provide "dest" and "amt" for keysend payments'
         })
       }
-      const preimage = Crypto.randomBytes(32)
-      const r_hash = Crypto.createHash('sha256')
-        .update(preimage)
-        .digest()
-      //https://github.com/lightningnetwork/lnd/blob/master/record/experimental.go#L5:2
-      //might break in future updates
-      const KeySendType = 5482373484
-      //https://api.lightning.community/#featurebit
-      const TLV_ONION_REQ = 8
-      paymentRequest = {
-        dest: Buffer.from(dest, 'hex'),
+
+      const payment = await sendPaymentV2Keysend({
         amt,
-        final_cltv_delta: finalCltvDelta,
-        dest_features: [TLV_ONION_REQ],
-        dest_custom_records: {
-          [KeySendType]: preimage
-        },
-        payment_hash: r_hash,
-        max_parts: maxParts,
-        timeout_seconds: timeoutSeconds,
-        no_inflight_updates: true,
-        fee_limit_sat: feeLimit
-      }
-    } else {
-      const { payreq } = req.body
+        dest,
+        feeLimit,
+        finalCltvDelta,
+        maxParts,
+        timeoutSeconds
+      })
 
-      paymentRequest = {
-        payment_request: payreq,
-        max_parts: maxParts,
-        timeout_seconds: timeoutSeconds,
-        no_inflight_updates: true,
-        fee_limit_sat: feeLimit
-      }
-
-      if (req.body.amt) {
-        paymentRequest.amt = req.body.amt
-      }
+      return res.status(200).json(payment)
     }
+    const { payreq } = req.body
 
-    logger.info('Sending payment', paymentRequest)
-    const sentPayment = router.sendPaymentV2(paymentRequest)
-    sentPayment.on('data', response => {
-      logger.info('SendPayment Data:', response)
-      if (response.failure_reason !== 'FAILURE_REASON_NONE') {
-        res.status(500).json({
-          errorMessage: response.failure_reason
-        })
-      } else {
-        res.json(response)
-      }
+    const payment = await sendPaymentV2Invoice({
+      feeLimit,
+      payment_request: payreq,
+      amt: req.body.amt,
+      max_parts: maxParts,
+      timeoutSeconds
     })
 
-    sentPayment.on('status', status => {
-      logger.info('SendPayment Status:', status)
-    })
-
-    sentPayment.on('error', async err => {
-      logger.error('SendPayment Error:', err)
-      const health = await checkHealth()
-      if (health.LNDStatus.success) {
-        res.status(500).json({
-          errorMessage: sanitizeLNDError(err.details)
-        })
-      } else {
-        res.status(500)
-        res.json({ errorMessage: 'LND is down' })
-      }
-    })
-    //sentPayment.on('end', () => {})
+    return res.status(200).json(payment)
   })
 
   app.post('/api/lnd/trackpayment', (req, res) => {