Merge pull request #162 from LightningDotSpace/develop

Release: develop -> main

Author: TaprootFreak

e2e/mock-server.js

@@ -62,13 +62,12 @@ function generateBtcHistory(range) {
   for (let i = cfg.count; i >= 0; i--) {
     const ts = new Date(now - i * cfg.step).toISOString();
     const onchain = parseFloat((0.35 + Math.sin(i * 0.2) * 0.02).toFixed(8));
-    const lndOnchain = parseFloat((0.35 + Math.sin(i * 0.25) * 0.01).toFixed(8));
-    const lightning = parseFloat((1.28 + Math.sin(i * 0.3) * 0.03).toFixed(8));
+    const lndMinusCustomer = parseFloat((0.07 + Math.sin(i * 0.25) * 0.02).toFixed(8));
     const citrea = parseFloat((0.60 + Math.sin(i * 0.15) * 0.01).toFixed(8));
     const wbtc = parseFloat((0.004 + Math.sin(i * 0.1) * 0.001).toFixed(8));
     const wbtce = parseFloat((0.001 + Math.sin(i * 0.35) * 0.0005).toFixed(8));
-    const netBalance = parseFloat((onchain + lndOnchain + lightning + citrea + wbtc + wbtce).toFixed(8));
-    points.push({ timestamp: ts, netBalance, onchain, lndOnchain, lightning, citrea, wbtc, wbtce });
+    const netBalance = parseFloat((onchain + lndMinusCustomer + citrea + wbtc + wbtce).toFixed(8));
+    points.push({ timestamp: ts, netBalance, onchain, lndMinusCustomer, citrea, wbtc, wbtce });
   }
   return points;
 }

src/assets/monitoring-btc.html

@@ -57,6 +57,7 @@
     .negative { color: #ef5350; }
     .loading { color: #888; font-style: italic; padding: 20px 0; }
     .error { color: #ef5350; padding: 20px 0; }
+    .note { font-size: 11px; color: #666; font-style: italic; }
     .chart-container { position: relative; width: 100%; height: 300px; margin-bottom: 30px; }
     .range-buttons { margin-bottom: 12px; }
     .range-buttons button {

src/assets/monitoring-btc.js

@@ -132,6 +132,10 @@ function render(data) {
   html += '</table>';
   html += '</div>';
 
+  html += '<div class="section">';
+  html += '<p class="note">In the chart above, "LND Minus Customer" is calculated as LND Wallet + LN Channels - Customer Balance.</p>';
+  html += '</div>';
+
   content.innerHTML = html;
 
   var onchainRow = document.getElementById('onchain-row');
@@ -176,26 +180,23 @@ function renderChart(points) {
 
   var labels = [];
   var onchainData = [];
-  var lndOnchainData = [];
-  var lightningData = [];
+  var lndMinusCustomerData = [];
   var citreaData = [];
   var wbtcData = [];
   var wbtceData = [];
 
   for (var i = 0; i < points.length; i++) {
     labels.push(new Date(points[i].timestamp));
     onchainData.push(points[i].onchain);
-    lndOnchainData.push(points[i].lndOnchain);
-    lightningData.push(points[i].lightning);
+    lndMinusCustomerData.push(points[i].lndMinusCustomer);
     citreaData.push(points[i].citrea);
     wbtcData.push(points[i].wbtc);
     wbtceData.push(points[i].wbtce);
   }
 
   var components = [
     { label: 'Onchain BTC', data: onchainData, color: '#4fc3f7' },
-    { label: 'LND Onchain', data: lndOnchainData, color: '#00e5ff' },
-    { label: 'Lightning', data: lightningData, color: '#fdd835' },
+    { label: 'LND Minus Customer', data: lndMinusCustomerData, color: '#fdd835' },
     { label: 'cBTC (Citrea)', data: citreaData, color: '#ff9800' },
     { label: 'WBTC (Ethereum)', data: wbtcData, color: '#66bb6a' },
     { label: 'WBTCe (Citrea)', data: wbtceData, color: '#ab47bc' },
@@ -249,6 +250,7 @@ function renderChart(points) {
         },
         y: {
           stacked: true,
+          beginAtZero: true,
           grid: { color: '#1a1a1a' },
           ticks: {
             color: '#555',

src/assets/monitoring-usd.js

@@ -183,6 +183,7 @@ function renderChart(points) {
         },
         y: {
           stacked: true,
+          beginAtZero: true,
           grid: { color: '#1a1a1a' },
           ticks: {
             color: '#555',

src/subdomains/monitoring/controllers/monitoring.controller.ts

@@ -151,7 +151,7 @@ export class MonitoringController {
   @ApiExcludeEndpoint()
   async btcHistory(
     @Query('range') range: string,
-  ): Promise<{ points: { timestamp: string; netBalance: number; onchain: number; lndOnchain: number; lightning: number; citrea: number; wbtc: number; wbtce: number }[]; range: string }> {
+  ): Promise<{ points: { timestamp: string; netBalance: number; onchain: number; lndMinusCustomer: number; citrea: number; wbtc: number; wbtce: number }[]; range: string }> {
     const { fromDate, grouping } = this.parseRange(range);
 
     const [balanceHistory, evmHistory, seedBalance, seedEvmBalances] = await Promise.all([
@@ -217,7 +217,7 @@ export class MonitoringController {
     evmHistory: { timestamp: string; blockchain: string; nativeBalance: number; tokenBalances: string }[],
     seedBalance?: { timestamp: string; onchainBalance: number; lndOnchainBalance: number; lightningBalance: number; citreaBalance: number; customerBalance: number },
     seedEvmBalances?: { timestamp: string; blockchain: string; nativeBalance: number; tokenBalances: string }[],
-  ): { timestamp: string; netBalance: number; onchain: number; lndOnchain: number; lightning: number; citrea: number; wbtc: number; wbtce: number }[] {
+  ): { timestamp: string; netBalance: number; onchain: number; lndMinusCustomer: number; citrea: number; wbtc: number; wbtce: number }[] {
     const allTimestamps = new Set<string>();
     for (const b of balanceHistory) allTimestamps.add(new Date(b.timestamp).toISOString());
     for (const e of evmHistory) allTimestamps.add(new Date(e.timestamp).toISOString());
@@ -230,7 +230,7 @@ export class MonitoringController {
     let balIdx = 0;
     let evmIdx = 0;
 
-    const points: { timestamp: string; netBalance: number; onchain: number; lndOnchain: number; lightning: number; citrea: number; wbtc: number; wbtce: number }[] = [];
+    const points: { timestamp: string; netBalance: number; onchain: number; lndMinusCustomer: number; citrea: number; wbtc: number; wbtce: number }[] = [];
 
     for (const ts of sorted) {
       while (balIdx < balanceHistory.length && new Date(balanceHistory[balIdx].timestamp).toISOString() <= ts) {
@@ -244,10 +244,8 @@ export class MonitoringController {
       }
 
       const onchain = lastBalance ? Number(lastBalance.onchainBalance) / 1e8 : 0;
-      const lndOnchain = lastBalance ? Number(lastBalance.lndOnchainBalance) / 1e8 : 0;
-      const lightning = lastBalance ? Number(lastBalance.lightningBalance) / 1e8 : 0;
+      const lndMinusCustomer = lastBalance ? (Number(lastBalance.lndOnchainBalance) + Number(lastBalance.lightningBalance) - Number(lastBalance.customerBalance)) / 1e8 : 0;
       const citrea = lastBalance ? Number(lastBalance.citreaBalance) / 1e8 : 0;
-      const customer = lastBalance ? Number(lastBalance.customerBalance) / 1e8 : 0;
 
       let wbtc = 0;
       let wbtce = 0;
@@ -266,10 +264,9 @@ export class MonitoringController {
 
       points.push({
         timestamp: ts,
-        netBalance: onchain + lndOnchain + lightning + citrea + wbtc + wbtce - customer,
+        netBalance: onchain + lndMinusCustomer + citrea + wbtc + wbtce,
         onchain,
-        lndOnchain,
-        lightning,
+        lndMinusCustomer,
         citrea,
         wbtc,
         wbtce,