mempool links for onchain information

Ride-The-Lightning · May 7, 2024 · 3f53136 · 3f53136
1 parent 062e386
commit 3f53136
Show file tree

Hide file tree

Showing 75 changed files with 337 additions and 344 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -114,7 +114,8 @@ Example RTL-Config.json:
         "unannouncedChannels": false,
         "lnServerUrl": "<url for LND REST APIs for node #1 e.g. https://192.168.0.1:8080>",
         "swapServerUrl": "<url for swap server REST APIs for the node. e.g. https://127.0.0.1:8081>",
-        "boltzServerUrl": "<url for boltz server REST APIs for the node. e.g. https://127.0.0.1:9003>"
+        "boltzServerUrl": "<url for boltz server REST APIs for the node. e.g. https://127.0.0.1:9003>",
+        "blockExplorerUrl": "<url for local or centralized block explorer. e.g. https://mempool.space>"
       }
     }
   ]

diff --git a/.github/docs/Application_configurations.md b/.github/docs/Application_configurations.md
@@ -40,7 +40,8 @@ parameters have `default` values for initial setup and can be updated after RTL
         "unannouncedChannels": <parameter to turn off/on setting for opening announced Channels, default false, Optional>
         "lnServerUrl": "<Service url for LND/Core Lightning REST APIs for the node, e.g. https://192.168.0.1:8080 OR https://192.168.0.1:3001 OR http://192.168.0.1:8080. Default 'https://127.0.0.1:8080', Optional>
         "swapServerUrl": "<Service url for swap server REST APIs for the node, e.g. https://127.0.0.1:8081, Optional>",
-        "boltzServerUrl": "<Service url for boltz server REST APIs for the node, e.g. https://127.0.0.1:9003, Optional>"
+        "boltzServerUrl": "<Service url for boltz server REST APIs for the node, e.g. https://127.0.0.1:9003, Optional>",
+        "blockExplorerUrl": "<url for local or centralized block explorer. e.g. https://mempool.space>"
       }
     }
   ]

diff --git a/.github/docs/Core_lightning_setup.md b/.github/docs/Core_lightning_setup.md
@@ -89,7 +89,8 @@ Ensure that the follow values are correct per your config:
         "logLevel": "INFO",
         "fiatConversion": false,
         "unannouncedChannels": false,
-        "lnServerUrl": "https://<CLNRest api server ip address>:3001"
+        "lnServerUrl": "https://<CLNRest api server ip address>:3001",
+        "blockExplorerUrl": "<Default: https://mempool.space>"
       }
     }
   ]

diff --git a/.github/docs/Eclair_setup.md b/.github/docs/Eclair_setup.md
@@ -83,7 +83,8 @@ Ensure that the follow values are correct per your config:
         "logLevel": "INFO",
         "fiatConversion": false,
         "unannouncedChannels": false,
-        "lnServerUrl": "http://<eclair api server ip address>:port"
+        "lnServerUrl": "http://<eclair api server ip address>:port",
+        "blockExplorerUrl": "<Default: https://mempool.space>"
       }
     }
   ]

diff --git a/.github/docs/RTL_setups.md b/.github/docs/RTL_setups.md
@@ -43,7 +43,8 @@ If your running RTL and LND on different devices on your local LAN, certain conf
         "unannouncedChannels": false,
         "lnServerUrl": "<https://<ip-address-of-device-running-lnd>:8080; e.g. https://192.168.0.1:8080>",
         "swapServerUrl": "<https://<localhost>:8081>",
-        "boltzServerUrl": "<https://<localhost>:9003>"
+        "boltzServerUrl": "<https://<localhost>:9003>",
+        "blockExplorerUrl": "<Default: https://mempool.space>"
       }
     }
   ]

diff --git a/Sample-RTL-Config.json b/Sample-RTL-Config.json
@@ -29,7 +29,8 @@
         "swapServerUrl": "https://127.0.0.1:8081",
         "boltzServerUrl": "https://127.0.0.1:9003",
         "fiatConversion": false,
-        "unannouncedChannels": false
+        "unannouncedChannels": false,
+        "blockExplorerUrl": "https://mempool.space"
       }
     }
   ]

diff --git a/backend/controllers/shared/RTLConf.js b/backend/controllers/shared/RTLConf.js
@@ -14,65 +14,6 @@ const logger = Logger;
 const common = Common;
 const wsServer = WSServer;
 const databaseService = Database;
-export const maskPasswords = (obj) => {
-    const keys = Object.keys(obj);
-    const length = keys.length;
-    if (length !== 0) {
-        for (let i = 0; i < length; i++) {
-            if (typeof obj[keys[i]] === 'object') {
-                keys[keys[i]] = maskPasswords(obj[keys[i]]);
-            }
-            if (typeof keys[i] === 'string' &&
-                ((keys[i].toLowerCase().includes('password') && keys[i] !== 'allowPasswordUpdate') || keys[i].toLowerCase().includes('multipass') ||
-                    keys[i].toLowerCase().includes('rpcpass') || keys[i].toLowerCase().includes('rpcpassword') ||
-                    keys[i].toLowerCase().includes('rpcuser'))) {
-                obj[keys[i]] = '*'.repeat(20);
-            }
-        }
-    }
-    return obj;
-};
-export const removeAuthSecureData = (node) => {
-    delete node.authentication.macaroonPath;
-    delete node.authentication.runePath;
-    delete node.authentication.lnApiPassword;
-    delete node.authentication.options;
-    return node;
-};
-export const removeSecureData = (config) => {
-    delete config.rtlConfFilePath;
-    delete config.rtlPass;
-    delete config.multiPass;
-    delete config.multiPassHashed;
-    delete config.secret2FA;
-    config.nodes.map((node) => removeAuthSecureData(node));
-    return config;
-};
-export const addSecureData = (config) => {
-    config.rtlConfFilePath = common.appConfig.rtlConfFilePath;
-    config.rtlPass = common.appConfig.rtlPass;
-    config.multiPassHashed = common.appConfig.multiPassHashed;
-    config.SSO.rtlCookiePath = common.appConfig.SSO.rtlCookiePath;
-    if (common.appConfig.multiPass) {
-        config.multiPass = common.appConfig.multiPass;
-    }
-    if (config.secret2FA === common.appConfig.secret2FA) {
-        config.secret2FA = common.appConfig.secret2FA;
-    }
-    config.nodes.map((node, i) => {
-        if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].authentication && common.appConfig.nodes[i].authentication.macaroonPath) {
-            node.authentication.macaroonPath = common.appConfig.nodes[i].authentication.macaroonPath;
-        }
-        if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].authentication && common.appConfig.nodes[i].authentication.runePath) {
-            node.authentication.runePath = common.appConfig.nodes[i].authentication.runePath;
-        }
-        if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].authentication && common.appConfig.nodes[i].authentication.lnApiPassword) {
-            node.authentication.lnApiPassword = common.appConfig.nodes[i].authentication.lnApiPassword;
-        }
-        return node;
-    });
-    return config;
-};
 export const getCurrencyRates = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Getting Currency Rates..' });
     options.url = 'https://blockchain.info/ticker';
@@ -115,7 +56,7 @@ export const getApplicationSettings = (req, res, next) => {
             return res.status(err.statusCode).json({ message: err.error, error: err.error });
         }
         else {
-            const appConfData = removeSecureData(JSON.parse(data));
+            const appConfData = common.removeSecureData(JSON.parse(data));
             appConfData.allowPasswordUpdate = common.appConfig.allowPasswordUpdate;
             appConfData.enable2FA = common.appConfig.enable2FA;
             appConfData.selectedNodeIndex = (req.session.selectedNode && req.session.selectedNode.index ? req.session.selectedNode.index : common.selectedNode.index);
@@ -157,9 +98,8 @@ export const updateSelectedNode = (req, res, next) => {
             databaseService.loadDatabase(req.session);
         }
     }
-    const responseVal = !req.session.selectedNode.lnNode ? '' : req.session.selectedNode.lnNode;
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Selected Node Updated To ' + responseVal });
-    res.status(200).json({ status: 'Selected Node Updated To: ' + JSON.stringify(responseVal) + '!' });
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Selected Node Updated To ' + req.session.selectedNode.lnNode || '' });
+    res.status(200).json(common.removeAuthSecureData(JSON.parse(JSON.stringify(req.session.selectedNode))));
 };
 export const getConfig = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Reading Configuration File..' });
@@ -205,7 +145,7 @@ export const getConfig = (req, res, next) => {
                     jsonConfig = parseHocon(data);
                 }
             }
-            jsonConfig = maskPasswords(jsonConfig);
+            jsonConfig = common.maskPasswords(jsonConfig);
             const responseJSON = (fileFormat === 'JSON') ? jsonConfig : ini.stringify(jsonConfig)?.replace('color=\\#', 'color=#');
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Configuration File Data Received', data: responseJSON });
             res.status(200).json({ format: fileFormat, data: responseJSON });
@@ -242,7 +182,7 @@ export const updateNodeSettings = (req, res, next) => {
             common.replaceNode(req, selectedNode);
         }
         let responseNode = JSON.parse(JSON.stringify(common.selectedNode));
-        responseNode = removeAuthSecureData(responseNode);
+        responseNode = common.removeAuthSecureData(responseNode);
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Node Settings Updated', data: responseNode });
         res.status(201).json(responseNode);
     }
@@ -256,7 +196,7 @@ export const updateApplicationSettings = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Updating Application Settings..' });
     const RTLConfFile = common.appConfig.rtlConfFilePath + sep + 'RTL-Config.json';
     try {
-        const config = addSecureData(req.body);
+        const config = common.addSecureData(req.body);
         common.appConfig = JSON.parse(JSON.stringify(config));
         delete config.selectedNodeIndex;
         delete config.enable2FA;
@@ -265,8 +205,8 @@ export const updateApplicationSettings = (req, res, next) => {
         delete config.rtlPass;
         fs.writeFileSync(RTLConfFile, JSON.stringify(config, null, 2), 'utf-8');
         const newConfig = JSON.parse(JSON.stringify(common.appConfig));
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Application Settings Updated', data: maskPasswords(newConfig) });
-        res.status(201).json(removeSecureData(newConfig));
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Application Settings Updated', data: common.maskPasswords(newConfig) });
+        res.status(201).json(common.removeSecureData(newConfig));
     }
     catch (errRes) {
         const errMsg = 'Update Default Node Error';

diff --git a/backend/models/config.model.js b/backend/models/config.model.js
@@ -7,7 +7,8 @@ export class SSO {
     }
 }
 export class Settings {
-    constructor(lnServerUrl, swapServerUrl, boltzServerUrl, bitcoindConfigPath, channelBackupPath, logLevel, logFile, userPersona, themeMode, themeColor, unannouncedChannels, fiatConversion, currencyUnit, enableOffers, enablePeerswap) {
+    constructor(blockExplorerUrl, lnServerUrl, swapServerUrl, boltzServerUrl, bitcoindConfigPath, channelBackupPath, logLevel, logFile, userPersona, themeMode, themeColor, unannouncedChannels, fiatConversion, currencyUnit, enableOffers, enablePeerswap) {
+        this.blockExplorerUrl = blockExplorerUrl;
         this.lnServerUrl = lnServerUrl;
         this.swapServerUrl = swapServerUrl;
         this.boltzServerUrl = boltzServerUrl;

diff --git a/backend/utils/common.js b/backend/utils/common.js
@@ -21,6 +21,68 @@ export class CommonService {
             { name: 'JAN', days: 31 }, { name: 'FEB', days: 28 }, { name: 'MAR', days: 31 }, { name: 'APR', days: 30 }, { name: 'MAY', days: 31 }, { name: 'JUN', days: 30 },
             { name: 'JUL', days: 31 }, { name: 'AUG', days: 31 }, { name: 'SEP', days: 30 }, { name: 'OCT', days: 31 }, { name: 'NOV', days: 30 }, { name: 'DEC', days: 31 }
         ];
+        this.maskPasswords = (obj) => {
+            const keys = Object.keys(obj);
+            const length = keys.length;
+            if (length !== 0) {
+                for (let i = 0; i < length; i++) {
+                    if (typeof obj[keys[i]] === 'object') {
+                        keys[keys[i]] = this.maskPasswords(obj[keys[i]]);
+                    }
+                    if (typeof keys[i] === 'string' &&
+                        ((keys[i].toLowerCase().includes('password') && keys[i] !== 'allowPasswordUpdate') || keys[i].toLowerCase().includes('multipass') ||
+                            keys[i].toLowerCase().includes('rpcpass') || keys[i].toLowerCase().includes('rpcpassword') ||
+                            keys[i].toLowerCase().includes('rpcuser'))) {
+                        obj[keys[i]] = '*'.repeat(20);
+                    }
+                }
+            }
+            return obj;
+        };
+        this.removeAuthSecureData = (node) => {
+            delete node.authentication.macaroonPath;
+            delete node.authentication.runePath;
+            delete node.authentication.runeValue;
+            delete node.authentication.lnApiPassword;
+            delete node.authentication.options;
+            return node;
+        };
+        this.removeSecureData = (config) => {
+            delete config.rtlConfFilePath;
+            delete config.rtlPass;
+            delete config.multiPass;
+            delete config.multiPassHashed;
+            delete config.secret2FA;
+            config.nodes?.map((node) => this.removeAuthSecureData(node));
+            return config;
+        };
+        this.addSecureData = (config) => {
+            config.rtlConfFilePath = this.appConfig.rtlConfFilePath;
+            config.rtlPass = this.appConfig.rtlPass;
+            config.multiPassHashed = this.appConfig.multiPassHashed;
+            config.SSO.rtlCookiePath = this.appConfig.SSO.rtlCookiePath;
+            if (this.appConfig.multiPass) {
+                config.multiPass = this.appConfig.multiPass;
+            }
+            if (config.secret2FA === this.appConfig.secret2FA) {
+                config.secret2FA = this.appConfig.secret2FA;
+            }
+            config.nodes.map((node, i) => {
+                if (this.appConfig && this.appConfig.nodes && this.appConfig.nodes.length > i && this.appConfig.nodes[i].authentication) {
+                    if (this.appConfig.nodes[i].authentication.macaroonPath) {
+                        node.authentication.macaroonPath = this.appConfig.nodes[i].authentication.macaroonPath;
+                    }
+                    if (this.appConfig.nodes[i].authentication.runePath) {
+                        node.authentication.runePath = this.appConfig.nodes[i].authentication.runePath;
+                    }
+                    if (this.appConfig.nodes[i].authentication.lnApiPassword) {
+                        node.authentication.lnApiPassword = this.appConfig.nodes[i].authentication.lnApiPassword;
+                    }
+                }
+                return node;
+            });
+            return config;
+        };
         this.setSwapServerOptions = (req) => {
             const swapOptions = {
                 baseUrl: req.session.selectedNode.settings.swapServerUrl,
@@ -470,18 +532,8 @@ export class CommonService {
         this.logEnvVariables = (req) => {
             const selNode = req.session.selectedNode;
             if (selNode && selNode.index) {
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'PORT: ' + this.port });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'HOST: ' + this.host });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'DB_DIRECTORY_PATH: ' + this.appConfig.dbDirectoryPath });
+                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup:', msg: JSON.stringify(this.removeSecureData(JSON.parse(JSON.stringify(this.appConfig)))) });
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'SSO: ' + this.appConfig.SSO.rtlSso });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'DEFAULT NODE INDEX: ' + selNode.index });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'INDEX: ' + selNode.index });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'LN NODE: ' + selNode.lnNode });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'LN IMPLEMENTATION: ' + selNode.lnImplementation });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'FIAT CONVERSION: ' + selNode.settings.fiatConversion });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'CURRENCY UNIT: ' + selNode.settings.currencyUnit });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'LN SERVER URL: ' + selNode.settings.lnServerUrl });
-                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'LOGOUT REDIRECT LINK: ' + this.appConfig.SSO.logoutRedirectLink + '\r\n' });
             }
         };
         this.filterData = (dataKey, lnImplementation) => {

diff --git a/backend/utils/config.js b/backend/utils/config.js
@@ -73,7 +73,8 @@ export class ConfigService {
                             logLevel: 'ERROR',
                             lnServerUrl: 'https://127.0.0.1:8080',
                             fiatConversion: false,
-                            unannouncedChannels: false
+                            unannouncedChannels: false,
+                            blockExplorerUrl: 'https://mempool.space'
                         }
                     }
                 ]
@@ -142,7 +143,7 @@ export class ConfigService {
             config.dbDirectoryPath = (process?.env?.DB_DIRECTORY_PATH) ? process?.env?.DB_DIRECTORY_PATH : (config.dbDirectoryPath) ? config.dbDirectoryPath : join(dirname(fileURLToPath(import.meta.url)), '..', '..');
             if (config.nodes && config.nodes.length > 0) {
                 config.nodes.forEach((node, idx) => {
-                    this.common.nodes[idx] = { settings: {}, authentication: {} };
+                    this.common.nodes[idx] = { settings: { blockExplorerUrl: '' }, authentication: {} };
                     this.common.nodes[idx].index = node.index;
                     this.common.nodes[idx].lnNode = node.lnNode;
                     this.common.nodes[idx].lnImplementation = (process?.env?.lnImplementation) ? process?.env?.lnImplementation : node.lnImplementation ? node.lnImplementation : 'LND';
@@ -269,6 +270,7 @@ export class ConfigService {
                     this.common.nodes[idx].settings.enablePeerswap = process?.env?.ENABLE_PEERSWAP ? process?.env?.ENABLE_PEERSWAP : (node.settings.enablePeerswap) ? node.settings.enablePeerswap : false;
                     this.common.nodes[idx].settings.bitcoindConfigPath = process?.env?.BITCOIND_CONFIG_PATH ? process?.env?.BITCOIND_CONFIG_PATH : (node.settings.bitcoindConfigPath) ? node.settings.bitcoindConfigPath : '';
                     this.common.nodes[idx].settings.channelBackupPath = process?.env?.CHANNEL_BACKUP_PATH ? process?.env?.CHANNEL_BACKUP_PATH : (node.settings.channelBackupPath) ? node.settings.channelBackupPath : this.common.appConfig.rtlConfFilePath + sep + 'channels-backup' + sep + 'node-' + node.index;
+                    this.common.nodes[idx].settings.blockExplorerUrl = process?.env?.BLOCK_EXPLORER_URL ? process.env.BLOCK_EXPLORER_URL : (node.settings.blockExplorerUrl) ? node.settings.blockExplorerUrl : 'https://mempool.space';
                     try {
                         this.common.createDirectory(this.common.nodes[idx].settings.channelBackupPath);
                         const exists = fs.existsSync(this.common.nodes[idx].settings.channelBackupPath + sep + 'channel-all.bak');

diff --git a/frontend/125.05cbc1feb7174532.js b/frontend/125.05cbc1feb7174532.js
diff --git a/frontend/125.cb20f4b15dc644e7.js b/frontend/125.cb20f4b15dc644e7.js
diff --git a/frontend/456.4e5a06b45d3c8f64.js b/frontend/456.4e5a06b45d3c8f64.js
diff --git a/frontend/456.a7433b9c5b34e0df.js b/frontend/456.a7433b9c5b34e0df.js
diff --git a/frontend/570.255349a168f6c523.js → frontend/570.a97682bb2ea30f3d.js b/frontend/570.255349a168f6c523.js → frontend/570.a97682bb2ea30f3d.js
diff --git a/frontend/758.b6dcd2f2b36dacf0.js b/frontend/758.b6dcd2f2b36dacf0.js
diff --git a/frontend/758.db0aa17832e6073d.js b/frontend/758.db0aa17832e6073d.js
diff --git a/frontend/index.html b/frontend/index.html
diff --git a/frontend/main.8b675cfcbcee9061.js b/frontend/main.8b675cfcbcee9061.js
diff --git a/frontend/main.c41155646131a0e1.js b/frontend/main.c41155646131a0e1.js