diff --git a/backend/controllers/lnd/channels.js b/backend/controllers/lnd/channels.js index 23fa9103..e9b0ae76 100644 --- a/backend/controllers/lnd/channels.js +++ b/backend/controllers/lnd/channels.js @@ -9,11 +9,11 @@ export const getAliasForChannel = (selNode, channel) => { options.url = selNode.ln_server_url + '/v1/graph/node/' + pubkey; return request(options).then((aliasBody) => { logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Channels', msg: 'Alias Received', data: aliasBody.node.alias }); - channel.remote_alias = aliasBody.node.alias; - return aliasBody.node.alias; + channel.remote_alias = aliasBody.node.alias && aliasBody.node.alias !== '' ? aliasBody.node.alias : aliasBody.node.pub_key.slice(0, 20); + return channel; }).catch((err) => { channel.remote_alias = pubkey.slice(0, 20); - return pubkey; + return channel; }); }; export const getAllChannels = (req, res, next) => { @@ -159,7 +159,7 @@ export const postTransactions = (req, res, next) => { if (options.error) { return res.status(options.statusCode).json({ message: options.message, error: options.error }); } - options.url = req.session.selectedNode.ln_server_url + '/v1/channels/transactions'; + options.url = req.session.selectedNode.ln_server_url + '/v1/channels/transaction-stream'; options.form = { payment_request: req.body.paymentReq }; if (req.body.paymentAmount) { options.form.amt = req.body.paymentAmount; diff --git a/server/controllers/lnd/channels.ts b/server/controllers/lnd/channels.ts index df7c83e5..c9dd27a7 100644 --- a/server/controllers/lnd/channels.ts +++ b/server/controllers/lnd/channels.ts @@ -11,11 +11,11 @@ export const getAliasForChannel = (selNode: CommonSelectedNode, channel) => { options.url = selNode.ln_server_url + '/v1/graph/node/' + pubkey; return request(options).then((aliasBody) => { logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Channels', msg: 'Alias Received', data: aliasBody.node.alias }); - channel.remote_alias = aliasBody.node.alias; - return aliasBody.node.alias; + channel.remote_alias = aliasBody.node.alias && aliasBody.node.alias !== '' ? aliasBody.node.alias : aliasBody.node.pub_key.slice(0, 20); + return channel; }).catch((err) => { channel.remote_alias = pubkey.slice(0, 20); - return pubkey; + return channel; }); }; @@ -154,7 +154,7 @@ export const postTransactions = (req, res, next) => { 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.ln_server_url + '/v1/channels/transactions'; + options.url = req.session.selectedNode.ln_server_url + '/v1/channels/transaction-stream'; options.form = { payment_request: req.body.paymentReq }; if (req.body.paymentAmount) { options.form.amt = req.body.paymentAmount;