machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show tor+clearnet node series in chart

Browse Source
This commit is contained in:
nymkappa 2022-09-06 12:05:23 +02:00
parent 2e0afefe63
commit 1ead34d42d
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/api/explorer/statistics.api.ts
View File

@ -6,7 +6,8 @@ class StatisticsApi {
public async $getStatistics(interval: string | null = null): Promise<any> { public async $getStatistics(interval: string | null = null): Promise<any> {
interval = Common.getSqlInterval(interval); interval = Common.getSqlInterval(interval);
let query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, total_capacity, tor_nodes, clearnet_nodes, unannounced_nodes let query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, total_capacity,
tor_nodes, clearnet_nodes, unannounced_nodes, clearnet_tor_nodes
FROM lightning_stats`; FROM lightning_stats`;
if (interval) { if (interval) {

37
frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
View File

@ -89,10 +89,11 @@ export class NodesNetworksChartComponent implements OnInit {
tor_nodes: data.map(val => [val.added * 1000, val.tor_nodes]), tor_nodes: data.map(val => [val.added * 1000, val.tor_nodes]),
clearnet_nodes: data.map(val => [val.added * 1000, val.clearnet_nodes]), clearnet_nodes: data.map(val => [val.added * 1000, val.clearnet_nodes]),
unannounced_nodes: data.map(val => [val.added * 1000, val.unannounced_nodes]), unannounced_nodes: data.map(val => [val.added * 1000, val.unannounced_nodes]),
clearnet_tor_nodes: data.map(val => [val.added * 1000, val.clearnet_tor_nodes]),
}; };
let maxYAxis = 0; let maxYAxis = 0;
for (const day of data) { for (const day of data) {
maxYAxis = Math.max(maxYAxis, day.tor_nodes + day.clearnet_nodes + day.unannounced_nodes); maxYAxis = Math.max(maxYAxis, day.tor_nodes + day.clearnet_nodes + day.unannounced_nodes + day.clearnet_tor_nodes);
} }
maxYAxis = Math.ceil(maxYAxis / 3000) * 3000; maxYAxis = Math.ceil(maxYAxis / 3000) * 3000;
this.prepareChartOptions(chartData, maxYAxis); this.prepareChartOptions(chartData, maxYAxis);
@ -163,13 +164,16 @@ export class NodesNetworksChartComponent implements OnInit {
const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' }); const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
let tooltip = `<b style="color: white; margin-left: 2px">${date}</b><br>`; let tooltip = `<b style="color: white; margin-left: 2px">${date}</b><br>`;
for (const tick of ticks.reverse()) { console.log(ticks);
for (const tick of ticks) {
if (tick.seriesIndex === 0) { // Tor if (tick.seriesIndex === 0) { // Tor
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`; tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`;
} else if (tick.seriesIndex === 1) { // Clearnet } else if (tick.seriesIndex === 1) { // Clearnet
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`; tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`;
} else if (tick.seriesIndex === 2) { // Unannounced } else if (tick.seriesIndex === 2) { // Unannounced
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`; tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`;
} else if (tick.seriesIndex === 3) { // Tor + Clearnet
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}`;
} }
tooltip += `<br>`; tooltip += `<br>`;
total += tick.data[1]; total += tick.data[1];
@ -189,14 +193,6 @@ export class NodesNetworksChartComponent implements OnInit {
legend: this.widget || data.tor_nodes.length === 0 ? undefined : { legend: this.widget || data.tor_nodes.length === 0 ? undefined : {
padding: 10, padding: 10,
data: [ data: [
{
name: $localize`Total`,
inactiveColor: 'rgb(110, 112, 121)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{ {
name: $localize`Tor`, name: $localize`Tor`,
inactiveColor: 'rgb(110, 112, 121)', inactiveColor: 'rgb(110, 112, 121)',
@ -323,6 +319,27 @@ export class NodesNetworksChartComponent implements OnInit {
]), ]),
smooth: false, smooth: false,
}, },
{
zlevel: 1,
yAxisIndex: 1,
name: $localize`Clearnet & Tor`,
showSymbol: false,
symbol: 'none',
data: data.clearnet_tor_nodes,
type: 'line',
lineStyle: {
width: 2,
},
areaStyle: {
opacity: 0.5,
},
stack: 'Total',
color: new graphic.LinearGradient(0, 0.75, 0, 1, [
{ offset: 0, color: '#be7d4c' },
{ offset: 1, color: '#be7d4cAA' },
]),
smooth: false,
},
{ {
zlevel: 1, zlevel: 1,
yAxisIndex: 1, yAxisIndex: 1,