Backend config fix

.github/README.md

@@ -95,15 +95,15 @@ Example RTL-Config.json:
       "index": 1,
       "lnNode": "LND Testnet",
       "lnImplementation": "LND",
-      "Authentication": {
+      "authentication": {
         "macaroonPath": "<Complete path of the folder containing LND admin.macaroon for the node>",
         "runePath": "<Complete path including filename for CLN rune for the node, rune format 'LIGHTNING_RUNE="your-rune"'>",
         "lnApiPassword": "<Can be used to provide password in ECL implementation>",
         "swapMacaroonPath": "<Complete path of the folder containing Loop's loop.macaroon for the node>",
         "boltzMacaroonPath": "<Complete path of the folder containing Boltz admin.macaroon for the node>",
         "configPath": "<Optional:Path of the .conf if present locally or empty>",
       },
-      "Settings": {
+      "settings": {
         "userPersona": "OPERATOR",
         "themeMode": "DAY",
         "themeColor": "PURPLE",

.github/docs/Application_configurations.md

@@ -20,15 +20,15 @@ parameters have `default` values for initial setup and can be updated after RTL
       "index": <Incremental node indices starting from 1, Required>,
       "lnNode": "<Node name to uniquely identify the node in the UI, Required>",
       "lnImplementation": "<LNP implementation, Allowed values LND/CLN/ECL, Required>",
-      "Authentication": {
+      "authentication": {
         "macaroonPath": "<Path for the folder containing 'admin.macaroon' for LND node, Required for LND>",
         "runePath": "<Complete path including filename for CLN rune for the node, Required for CLN>",
         "lnApiPassword": "<Password to be used for ECL API authentication. Mandatory only for ECL if the configPath is missing>"
         "swapMacaroonPath": "<Path for the folder containing 'loop.macaroon' (LND), Required for LND Loop>",
         "boltzMacaroonPath": "<Path for the folder containing 'admin.macaroon' (Boltz), Required for Boltz Swaps>",
         "configPath": "<Full path of the lnd.conf/core lightning config/eclair.conf file including the file name, if present locally, Optional, only mandatory for ECL if the lnApiPassword is missing>",
       },
-      "Settings": {
+      "settings": {
         "userPersona": "<User persona to tailor the data on UI. Allowed values MERCHANT/OPERATOR. Default MERCHANT, Optional>",
         "themeMode": "<Theme modes, Allowed values DAY, NIGHT. Default DAY, Optional>",
         "themeColor": "<Theme colors, Allowed values PURPLE, TEAL, INDIGO, PINK, YELLOW. Default PURPLE, Optional>",

.github/docs/Core_lightning_setup.md

@@ -77,11 +77,11 @@ Ensure that the follow values are correct per your config:
       "index": 1,
       "lnNode": "Core Lightning Testnet # 1",
       "lnImplementation": "CLN",
-      "Authentication": {
+      "authentication": {
         "runePath": "<Modify to include the path of the folder including filename which contains `rune`>",
         "configPath": "<Optional - Config file path for core lightning>"
       },
-      "Settings": {
+      "settings": {
         "userPersona": "OPERATOR",
         "themeMode": "DAY",
         "themeColor": "PURPLE",

.github/docs/Eclair_setup.md

@@ -71,11 +71,11 @@ Ensure that the follow values are correct per your config:
       "index": 1,
       "lnNode": "Eclair Testnet # 1",
       "lnImplementation": "ECL",
-      "Authentication": {
+      "authentication": {
         "configPath": "<Optional - Config file path, including .conf file>",
         "lnApiPassword": "<Mandatory if the configPath is missing - Password used for API authentication>",
       },
-      "Settings": {
+      "settings": {
         "userPersona": "OPERATOR",
         "themeMode": "DAY",
         "themeColor": "PURPLE",

.github/docs/RTL_setups.md

@@ -26,13 +26,13 @@ If your running RTL and LND on different devices on your local LAN, certain conf
       "index": 1,
       "lnNode": "LND Testnet",
       "lnImplementation": "LND",
-      "Authentication": {
+      "authentication": {
         "macaroonPath": "<Path of the folder containing 'admin.macaroon' on the device running RTL>",
         "swapMacaroonPath": "<Path of the folder containing 'loop.macaroon' on the device running RTL>",
         "boltzMacaroonPath": "<Path of the folder containing 'admin.macaroon' on the device running RTL>",
         "configPath": "<Optional:Path of the lnd.conf if present locally or empty>"
       },
-      "Settings": {
+      "settings": {
         "userPersona": "OPERATOR",
         "themeMode": "DAY",
         "themeColor": "PURPLE",

Sample-RTL-Config.json

@@ -13,13 +13,13 @@
       "index": 1,
       "lnNode": "Node 1",
       "lnImplementation": "LND",
-      "Authentication": {
+      "authentication": {
         "macaroonPath": "C:\\Users\\xyz\\AppData\\Local\\Lnd\\data\\chain\\bitcoin\\mainnet",
         "configPath": "C:\\Users\\xyz\\AppData\\Local\\Lnd\\lnd.conf",
         "swapMacaroonPath": "C:\\Users\\xyz\\AppData\\Local\\Loop\\mainnet",
         "boltzMacaroonPath": "C:\\Users\\xyz\\AppData\\Boltz\\mainnet"
       },
-      "Settings": {
+      "settings": {
         "userPersona": "MERCHANT",
         "themeMode": "DAY",
         "themeColor": "PURPLE",

backend/controllers/cln/channels.js

@@ -11,7 +11,7 @@ export const listPeerChannels = (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/listpeerchannels';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listpeerchannels';
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Peer Channels List Received', data: body.channels });
         return Promise.all(body.channels?.map((channel) => {
@@ -33,7 +33,7 @@ export const openChannel = (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/fundchannel';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/fundchannel';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Open Channel Options', data: options.body });
     request.post(options).then((body) => {
@@ -50,7 +50,7 @@ export const setChannelFee = (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/setchannel';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/setchannel';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Update Channel Policy Options', data: options.body });
     request.post(options).then((body) => {
@@ -68,7 +68,7 @@ export const closeChannel = (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/close';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/close';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Closing Channel', data: options.url });
     request.post(options).then((body) => {
@@ -86,7 +86,7 @@ export const listForwards = (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/listforwards';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listforwards';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Forwarding History Received For Status ' + status, data: body });
@@ -103,7 +103,7 @@ export const funderUpdatePolicy = (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/funderupdate';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/funderupdate';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Funder Update Body', data: options.body });
     request.post(options).then((body) => {

backend/controllers/cln/getInfo.js

@@ -16,8 +16,8 @@ export const getInfo = (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/getinfo';
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Selected Node ' + req.session.selectedNode.ln_node });
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/getinfo';
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Selected Node ' + req.session.selectedNode.lnNode });
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Calling Info from Core Lightning server url ' + options.url });
     if (!options.headers || !options.headers.rune) {
         const errMsg = 'Core lightning get info failed due to missing rune!';
@@ -48,7 +48,7 @@ export const getInfo = (req, res, next) => {
                     body.uris.push(body.id + '@' + addr.address + ':' + addr.port);
                 });
             }
-            req.session.selectedNode.ln_version = body.version || '';
+            req.session.selectedNode.lnVersion = body.version || '';
             req.session.selectedNode.api_version = body.api_version || '';
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Connecting to the Core Lightning\'s Websocket Server.' });
             clWsClient.updateSelectedNode(req.session.selectedNode);

backend/controllers/cln/invoices.js

@@ -10,7 +10,7 @@ export const deleteExpiredInvoice = (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/delexpiredinvoice';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/delexpiredinvoice';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoices Deleted', data: body });
@@ -26,7 +26,7 @@ export const listInvoices = (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/listinvoices';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listinvoices';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Invoice', msg: 'Invoices List URL', data: options.url });
     request.post(options).then((body) => {
@@ -43,7 +43,7 @@ export const addInvoice = (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/invoice';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/invoice';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoice Created', data: body });

backend/controllers/cln/network.js

@@ -10,7 +10,7 @@ export const getRoute = (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/getroute';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/getroute';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Routes Received', data: body });
@@ -29,7 +29,7 @@ export const listChannels = (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/listchannels';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listchannels';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Channel Lookup Finished', data: body });
@@ -46,7 +46,7 @@ export const feeRates = (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/feerates';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/feerates';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Fee Rates Received for ' + style, data: body });
@@ -64,7 +64,7 @@ export const listNodes = (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/listnodes';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listnodes';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Network', msg: 'List Nodes URL' + options.url });
     request.post(options).then((body) => {
@@ -80,7 +80,7 @@ export const listNodes = (req, res, next) => {
     });
 };
 export const getAlias = (selNode, peer, id) => {
-    options.url = selNode.ln_server_url + '/v1/listnodes';
+    options.url = selNode.settings.lnServerUrl + '/v1/listnodes';
     if (!peer[id]) {
         logger.log({ selectedNode: selNode, level: 'ERROR', fileName: 'Network', msg: 'Empty Peer ID' });
         peer.alias = '';

backend/controllers/cln/offers.js

@@ -34,7 +34,7 @@ export const listOffers = (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/listoffers';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listoffers';
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Offers', msg: 'Offers List URL', data: options.url });
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offers List Received', data: body });
@@ -50,7 +50,7 @@ export const createOffer = (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/offer';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/offer';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Created', data: body });
@@ -66,7 +66,7 @@ export const fetchOfferInvoice = (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/fetchinvoice';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/fetchinvoice';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Offers', msg: 'Offer Invoice Body', data: options.body });
     request.post(options).then((body) => {
@@ -83,7 +83,7 @@ export const disableOffer = (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/disableOffer';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/disableOffer';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Disabled', data: body });

backend/controllers/cln/onchain.js

@@ -10,7 +10,7 @@ export const getNewAddress = (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/newaddr';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/newaddr';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'OnChain', msg: 'New Address Generated', data: body });
@@ -26,7 +26,7 @@ export const onChainWithdraw = (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/withdraw';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/withdraw';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'OnChain', msg: 'OnChain Withdraw Options', data: options.body });
     request.post(options).then((body) => {
@@ -43,7 +43,7 @@ export const getUTXOs = (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/listfunds';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/listfunds';
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'OnChain', msg: 'Funds List Received', data: body });
         // Local Remote Balance Calculation