Add AMP toggle for LND Send Payments (#1466)

Ride-The-Lightning · Nov 10, 2024 · 667aad8 · 667aad8
1 parent 417fbb3
commit 667aad8
Show file tree

Hide file tree

Showing 26 changed files with 154 additions and 136 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -116,7 +116,6 @@
         "no-label-var": "error",
         "no-restricted-globals": "error",
         "no-undef-init": "error",
-        "no-undefined": "error",
         "block-spacing": "error",
         "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
         "comma-style": "error",

diff --git a/backend/controllers/lnd/channels.js b/backend/controllers/lnd/channels.js
@@ -155,47 +155,6 @@ export const postChannel = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-export const postTransactions = (req, res, next) => {
-    const { paymentReq, paymentAmount, feeLimit, outgoingChannel, allowSelfPayment, lastHopPubkey } = req.body;
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Sending Payment..' });
-    options = common.getOptions(req);
-    if (options.error) {
-        return res.status(options.statusCode).json({ message: options.message, error: options.error });
-    }
-    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/channels/transaction-stream';
-    options.form = { payment_request: paymentReq };
-    if (paymentAmount) {
-        options.form.amt = paymentAmount;
-    }
-    if (feeLimit) {
-        options.form.fee_limit = feeLimit;
-    }
-    if (outgoingChannel) {
-        options.form.outgoing_chan_id = outgoingChannel;
-    }
-    if (allowSelfPayment) {
-        options.form.allow_self_payment = allowSelfPayment;
-    }
-    if (lastHopPubkey) {
-        options.form.last_hop_pubkey = Buffer.from(lastHopPubkey, 'hex').toString('base64');
-    }
-    options.form = JSON.stringify(options.form);
-    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Send Payment Options', data: options.form });
-    request.post(options).then((body) => {
-        body = body.result ? body.result : body;
-        if (body.payment_error) {
-            const err = common.handleError(body.payment_error, 'Channels', 'Send Payment Error', req.session.selectedNode);
-            return res.status(err.statusCode).json({ message: err.message, error: err.error });
-        }
-        else {
-            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Payment Sent', data: body });
-            res.status(201).json(body);
-        }
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Channels', 'Send Payment Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};
 export const closeChannel = (req, res, next) => {
     try {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Closing Channel..' });

diff --git a/backend/controllers/lnd/payments.js b/backend/controllers/lnd/payments.js
@@ -97,3 +97,33 @@ export const paymentLookup = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const sendPayment = (req, res, next) => {
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Payment..' });
+    options = common.getOptions(req);
+    if (options.error) {
+        return res.status(options.statusCode).json({ message: options.message, error: options.error });
+    }
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v2/router/send';
+    if (req.body.last_hop_pubkey) {
+        req.body.last_hop_pubkey = Buffer.from(req.body.last_hop_pubkey, 'hex').toString('base64');
+    }
+    req.body.amp = req.body.amp ?? false;
+    req.body.timeout_seconds = req.body.timeout_seconds || 600;
+    options.form = JSON.stringify(req.body);
+    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Send Payment Options', data: options.form });
+    request.post(options).then((body) => {
+        const results = body.split('\n').filter(Boolean).map((jsonString) => JSON.parse(jsonString));
+        body = results.length > 0 ? results[results.length - 1] : { result: { status: 'UNKNOWN' } };
+        if (body.result.status === 'FAILED') {
+            const err = common.handleError(common.titleCase(body.result.failure_reason.replace(/_/g, ' ').replace('FAILURE REASON ', '')), 'Payments', 'Send Payment Error', req.session.selectedNode);
+            return res.status(err.statusCode).json({ message: err.message, error: err.error });
+        }
+        if (body.result.status === 'SUCCEEDED') {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body.result });
+            res.status(201).json(body.result);
+        }
+    }).catch((errRes) => {
+        const err = common.handleError(errRes, 'Payments', 'Send Payment Error', req.session.selectedNode);
+        return res.status(err.statusCode).json({ message: err.message, error: err.error });
+    });
+};
diff --git a/backend/routes/lnd/channels.js b/backend/routes/lnd/channels.js
@@ -1,13 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, postTransactions, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
+import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
 const router = Router();
 router.get('/', isAuthenticated, getAllChannels);
 router.get('/pending', isAuthenticated, getPendingChannels);
 router.get('/closed', isAuthenticated, getClosedChannels);
 router.post('/', isAuthenticated, postChannel);
-router.post('/transactions', isAuthenticated, postTransactions);
 router.delete('/:channelPoint', isAuthenticated, closeChannel);
 router.post('/chanPolicy', isAuthenticated, postChanPolicy);
 export default router;
diff --git a/backend/routes/lnd/payments.js b/backend/routes/lnd/payments.js
@@ -1,11 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup } from '../../controllers/lnd/payments.js';
+import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup, sendPayment } from '../../controllers/lnd/payments.js';
 const router = Router();
 router.get('/', isAuthenticated, getPayments);
 router.get('/alltransactions', isAuthenticated, getAllLightningTransactions);
 router.get('/decode/:payRequest', isAuthenticated, decodePayment);
 router.get('/lookup/:paymentHash', isAuthenticated, paymentLookup);
 router.post('/', isAuthenticated, decodePayments);
+router.post('/send', isAuthenticated, sendPayment);
 export default router;
diff --git a/frontend/190.03f035c34a56c8be.js b/frontend/190.03f035c34a56c8be.js
diff --git a/frontend/190.8009411a512731e5.js b/frontend/190.8009411a512731e5.js
diff --git a/frontend/index.html b/frontend/index.html
diff --git a/frontend/main.1294c6b5636d0ec0.js b/frontend/main.1294c6b5636d0ec0.js
diff --git a/frontend/main.6e2567250e1fcca3.js b/frontend/main.6e2567250e1fcca3.js
diff --git a/frontend/runtime.8f43557e02af97f0.js b/frontend/runtime.8f43557e02af97f0.js
diff --git a/frontend/runtime.b1e58c34e8ddc916.js b/frontend/runtime.b1e58c34e8ddc916.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rtl",
-  "version": "0.15.2-beta",
+  "version": "0.15.3-beta",
   "license": "MIT",
   "type": "module",
   "scripts": {

diff --git a/server/controllers/lnd/channels.ts b/server/controllers/lnd/channels.ts
@@ -155,37 +155,6 @@ export const postChannel = (req, res, next) => {
   });
 };
 
-export const postTransactions = (req, res, next) => {
-  const { paymentReq, paymentAmount, feeLimit, outgoingChannel, allowSelfPayment, lastHopPubkey } = req.body;
-  logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Sending Payment..' });
-  options = common.getOptions(req);
-  if (options.error) { return res.status(options.statusCode).json({ message: options.message, error: options.error }); }
-  options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/channels/transaction-stream';
-  options.form = { payment_request: paymentReq };
-  if (paymentAmount) {
-    options.form.amt = paymentAmount;
-  }
-  if (feeLimit) { options.form.fee_limit = feeLimit; }
-  if (outgoingChannel) { options.form.outgoing_chan_id = outgoingChannel; }
-  if (allowSelfPayment) { options.form.allow_self_payment = allowSelfPayment; }
-  if (lastHopPubkey) { options.form.last_hop_pubkey = Buffer.from(lastHopPubkey, 'hex').toString('base64'); }
-  options.form = JSON.stringify(options.form);
-  logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Send Payment Options', data: options.form });
-  request.post(options).then((body) => {
-    body = body.result ? body.result : body;
-    if (body.payment_error) {
-      const err = common.handleError(body.payment_error, 'Channels', 'Send Payment Error', req.session.selectedNode);
-      return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    } else {
-      logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Payment Sent', data: body });
-      res.status(201).json(body);
-    }
-  }).catch((errRes) => {
-    const err = common.handleError(errRes, 'Channels', 'Send Payment Error', req.session.selectedNode);
-    return res.status(err.statusCode).json({ message: err.message, error: err.error });
-  });
-};
-
 export const closeChannel = (req, res, next) => {
   try {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Closing Channel..' });

diff --git a/server/controllers/lnd/payments.ts b/server/controllers/lnd/payments.ts
@@ -96,3 +96,32 @@ export const paymentLookup = (req, res, next) => {
     return res.status(err.statusCode).json({ message: err.message, error: err.error });
   });
 };
+
+export const sendPayment = (req, res, next) => {
+  logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Payment..' });
+  options = common.getOptions(req);
+  if (options.error) { return res.status(options.statusCode).json({ message: options.message, error: options.error }); }
+  options.url = req.session.selectedNode.settings.lnServerUrl + '/v2/router/send';
+  if (req.body.last_hop_pubkey) {
+    req.body.last_hop_pubkey = Buffer.from(req.body.last_hop_pubkey, 'hex').toString('base64');
+  }
+  req.body.amp = req.body.amp ?? false;
+  req.body.timeout_seconds = req.body.timeout_seconds || 600;
+  options.form = JSON.stringify(req.body);
+  logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Send Payment Options', data: options.form });
+  request.post(options).then((body) => {
+    const results = body.split('\n').filter(Boolean).map((jsonString) => JSON.parse(jsonString));
+    body = results.length > 0 ? results[results.length - 1] : { result: { status: 'UNKNOWN' } };
+    if (body.result.status === 'FAILED') {
+      const err = common.handleError(common.titleCase(body.result.failure_reason.replace(/_/g, ' ').replace('FAILURE REASON ', '')), 'Payments', 'Send Payment Error', req.session.selectedNode);
+      return res.status(err.statusCode).json({ message: err.message, error: err.error });
+    }
+    if (body.result.status === 'SUCCEEDED') {
+      logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body.result });
+      res.status(201).json(body.result);
+    }
+  }).catch((errRes) => {
+    const err = common.handleError(errRes, 'Payments', 'Send Payment Error', req.session.selectedNode);
+    return res.status(err.statusCode).json({ message: err.message, error: err.error });
+  });
+};
diff --git a/server/routes/lnd/channels.ts b/server/routes/lnd/channels.ts
@@ -1,15 +1,14 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, postTransactions, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
+import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
 
 const router = Router();
 
 router.get('/', isAuthenticated, getAllChannels);
 router.get('/pending', isAuthenticated, getPendingChannels);
 router.get('/closed', isAuthenticated, getClosedChannels);
 router.post('/', isAuthenticated, postChannel);
-router.post('/transactions', isAuthenticated, postTransactions);
 router.delete('/:channelPoint', isAuthenticated, closeChannel);
 router.post('/chanPolicy', isAuthenticated, postChanPolicy);
 

diff --git a/server/routes/lnd/payments.ts b/server/routes/lnd/payments.ts
@@ -1,7 +1,7 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup } from '../../controllers/lnd/payments.js';
+import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup, sendPayment } from '../../controllers/lnd/payments.js';
 
 const router = Router();
 
@@ -10,5 +10,6 @@ router.get('/alltransactions', isAuthenticated, getAllLightningTransactions);
 router.get('/decode/:payRequest', isAuthenticated, decodePayment);
 router.get('/lookup/:paymentHash', isAuthenticated, paymentLookup);
 router.post('/', isAuthenticated, decodePayments);
+router.post('/send', isAuthenticated, sendPayment);
 
 export default router;