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

Node and Channel pages improvements

Browse Source
This commit is contained in:
softsimon 2022-05-15 19:22:14 +04:00
parent ac10aafc07
commit 9ebc8813e3
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
16 changed files with 239 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/app/components/search-form/search-form.component.ts
View File

@ -66,9 +66,9 @@ export class SearchFormComponent implements OnInit {
if (this.network === 'bisq' && text.match(/^(b)[^c]/i)) { if (this.network === 'bisq' && text.match(/^(b)[^c]/i)) {
return text.substr(1); return text.substr(1);
} }
return text; return text.trim();
}), }),
debounceTime(300), debounceTime(250),
distinctUntilChanged(), distinctUntilChanged(),
switchMap((text) => { switchMap((text) => {
if (!text.length) { if (!text.length) {
@ -82,7 +82,10 @@ export class SearchFormComponent implements OnInit {
} }
return zip( return zip(
this.electrsApiService.getAddressesByPrefix$(text).pipe(catchError(() => of([]))), this.electrsApiService.getAddressesByPrefix$(text).pipe(catchError(() => of([]))),
this.apiService.lightningSearch$(text), this.apiService.lightningSearch$(text).pipe(catchError(() => of({
nodes: [],
channels: [],
}))),
); );
}), }),
map((result: any[]) => { map((result: any[]) => {

4
frontend/src/app/components/search-form/search-results/search-results.component.html
View File

@ -17,8 +17,8 @@
</ng-template> </ng-template>
<ng-template [ngIf]="results.channels.length"> <ng-template [ngIf]="results.channels.length">
<div class="card-title">Lightning Channels</div> <div class="card-title">Lightning Channels</div>
<ng-template [class.active]="results.addresses.length + results.nodes.length + i === activeIdx" ngFor [ngForOf]="results.channels" let-channel let-i="index"> <ng-template ngFor [ngForOf]="results.channels" let-channel let-i="index">
<button (click)="clickItem(results.addresses.length + results.nodes.length + i)" type="button" role="option" class="dropdown-item"> <button (click)="clickItem(results.addresses.length + results.nodes.length + i)" [class.active]="results.addresses.length + results.nodes.length + i === activeIdx" type="button" role="option" class="dropdown-item">
<ngb-highlight [result]="channel.short_id" [term]="searchTerm"></ngb-highlight> &nbsp;<span class="symbol">{{ channel.id }}</span> <ngb-highlight [result]="channel.short_id" [term]="searchTerm"></ngb-highlight> &nbsp;<span class="symbol">{{ channel.id }}</span>
</button> </button>
</ng-template> </ng-template>

40
frontend/src/app/lightning/channel/channel-box/channel-box.component.html Normal file
View File

@ -0,0 +1,40 @@
<div class="mb-2">
<h2 class="mb-0">{{ channel.alias || '?' }}</h2>
<a [routerLink]="['/lightning/node' | relativeUrl, channel.public_key]" >
{{ channel.public_key | shortenString : 12 }}
</a>
<app-clipboard [text]="channel.node1_public_key"></app-clipboard>
</div>
<div class="box">
<div class="col-md">
<table class="table table-borderless table-striped">
<tbody>
<tr>
<td i18n="address.total-sent">Fee rate</td>
<td>
{{ channel.fee_rate }} <span class="symbol">ppm ({{ channel.fee_rate / 10000 | number }}%)</span>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Base fee</td>
<td>
<app-sats [satoshis]="channel.base_fee_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Min HTLC</td>
<td>
<app-sats [satoshis]="channel.min_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Max HTLC</td>
<td>
<app-sats [satoshis]="channel.max_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
</tbody>
</table>
</div>
</div>

0
frontend/src/app/lightning/channel/channel-box/channel-box.component.scss Normal file
View File

14
frontend/src/app/lightning/channel/channel-box/channel-box.component.ts Normal file
View File

@ -0,0 +1,14 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
@Component({
selector: 'app-channel-box',
templateUrl: './channel-box.component.html',
styleUrls: ['./channel-box.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ChannelBoxComponent {
@Input() channel: any;
constructor() { }
}

104
frontend/src/app/lightning/channel/channel.component.html
View File

@ -1,11 +1,15 @@
<div class="container-xl" *ngIf="(channel$ | async) as channel"> <div class="container-xl" *ngIf="(channel$ | async) as channel">
<div class="mb-2"> <div class="title-container">
<h1 i18n="shared.address" class="mb-0">Channel <a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.short_id }}</a> <app-clipboard [text]="channel.id"></app-clipboard></h1> <h1 class="mb-0">{{ channel.short_id }}</h1>
<div class="badges"> <span class="tx-link">
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0">Inactive</span> <a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.id }}</a>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1">Active</span> <app-clipboard [text]="channel.id"></app-clipboard>
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2">Closed</span> </span>
</div> </div>
<div class="badges mb-2">
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0">Inactive</span>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1">Active</span>
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2">Closed</span>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -42,7 +46,7 @@
<tbody> <tbody>
<tr> <tr>
<td i18n="address.total-received">Capacity</td> <td i18n="address.total-received">Capacity</td>
<td><app-sats [satoshis]="channel.capacity"></app-sats>&nbsp; <app-fiat [value]="channel.capacity" digitsInfo="1.2-2"></app-fiat></td> <td><app-sats [satoshis]="channel.capacity"></app-sats><app-fiat [value]="channel.capacity" digitsInfo="1.0-0"></app-fiat></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -55,90 +59,10 @@
<div class="row row-cols-1 row-cols-md-2"> <div class="row row-cols-1 row-cols-md-2">
<div class="col"> <div class="col">
<div class="mb-2"> <app-channel-box [channel]="channel.node_left"></app-channel-box>
<h2 class="mb-0">{{ channel.alias_left || '?' }}</h2>
<a [routerLink]="['/lightning/node' | relativeUrl, channel.node1_public_key]" >
{{ channel.node1_public_key | shortenString : 18 }}
</a>
<app-clipboard [text]="channel.node1_public_key"></app-clipboard>
</div>
<div class="box">
<div class="row">
<div class="col-md">
<table class="table table-borderless table-striped">
<tbody>
<tr>
<td i18n="address.total-sent">Fee rate</td>
<td>
{{ channel.node1_fee_rate / 10000 | number }}%
</td>
</tr>
<tr>
<td i18n="address.total-sent">Base fee</td>
<td>
<app-sats [satoshis]="channel.node1_base_fee_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Min HTLC</td>
<td>
<app-sats [satoshis]="channel.node1_min_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Max HTLC</td>
<td>
<app-sats [satoshis]="channel.node1_max_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div> </div>
<div class="col"> <div class="col">
<div class="mb-2"> <app-channel-box [channel]="channel.node_right"></app-channel-box>
<h2 class="mb-0">{{ channel.alias_right || '?' }}</h2>
<a [routerLink]="['/lightning/node' | relativeUrl, channel.node2_public_key]" >
{{ channel.node2_public_key | shortenString : 18 }}
</a>
<app-clipboard [text]="channel.node1_public_key"></app-clipboard>
</div>
<div class="box">
<div class="col-md">
<table class="table table-borderless table-striped">
<tbody>
<tr>
<td i18n="address.total-sent">Fee rate</td>
<td>
{{ channel.node2_fee_rate / 10000 | number }}%
</td>
</tr>
<tr>
<td i18n="address.total-sent">Base fee</td>
<td>
<app-sats [satoshis]="channel.node2_base_fee_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Min HTLC</td>
<td>
<app-sats [satoshis]="channel.node2_min_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
<tr>
<td i18n="address.total-sent">Max HTLC</td>
<td>
<app-sats [satoshis]="channel.node2_max_htlc_mtokens / 1000"></app-sats>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div> </div>
</div> </div>

40
frontend/src/app/lightning/channel/channel.component.scss
View File

@ -1,3 +1,41 @@
.title-container {
display: flex;
flex-direction: row;
@media (max-width: 768px) {
flex-direction: column;
}
}
.tx-link {
display: flex;
flex-grow: 1;
@media (min-width: 650px) {
align-self: end;
margin-left: 15px;
margin-top: 0px;
margin-bottom: -3px;
}
@media (min-width: 768px) {
margin-bottom: 4px;
top: 1px;
position: relative;
}
@media (max-width: 768px) {
order: 2;
}
}
.badges { .badges {
font-size: 20px; font-size: 20px;
} }
app-fiat {
display: block;
font-size: 13px;
@media (min-width: 768px) {
font-size: 14px;
display: inline-block;
margin-left: 10px;
}
}

3
frontend/src/app/lightning/channel/channel.component.ts
View File

@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ActivatedRoute, ParamMap } from '@angular/router'; import { ActivatedRoute, ParamMap } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { switchMap } from 'rxjs/operators'; import { switchMap } from 'rxjs/operators';
import { SeoService } from 'src/app/services/seo.service';
import { LightningApiService } from '../lightning-api.service'; import { LightningApiService } from '../lightning-api.service';
@Component({ @Component({
@ -16,12 +17,14 @@ export class ChannelComponent implements OnInit {
constructor( constructor(
private lightningApiService: LightningApiService, private lightningApiService: LightningApiService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private seoService: SeoService,
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
this.channel$ = this.activatedRoute.paramMap this.channel$ = this.activatedRoute.paramMap
.pipe( .pipe(
switchMap((params: ParamMap) => { switchMap((params: ParamMap) => {
this.seoService.setTitle(`Channel: ${params.get('short_id')}`);
return this.lightningApiService.getChannel$(params.get('short_id')); return this.lightningApiService.getChannel$(params.get('short_id'));
}) })
); );

79
frontend/src/app/lightning/channels-list/channels-list.component.html
View File

@ -1,60 +1,16 @@
<div> <div>
<table class="table table-borderless"> <table class="table table-borderless">
<thead> <thead>
<th class="alias text-left" i18n="nodes.alias">Node Alias</th> <th class="alias text-left" i18n="nodes.alias">Node Alias</th>
<th class="alias text-left d-none d-md-table-cell" i18n="channels.transaction">Node ID</th> <th class="alias text-left d-none d-md-table-cell" i18n="channels.transaction">Node ID</th>
<th class="alias text-left d-none d-md-table-cell" i18n="nodes.alias">Status</th> <th class="alias text-left d-none d-md-table-cell" i18n="nodes.alias">Status</th>
<th class="channels text-right d-none d-md-table-cell" i18n="channels.rate">Fee Rate</th> <th class="channels text-left d-none d-md-table-cell" i18n="channels.rate">Fee Rate</th>
<th class="capacity text-right d-none d-md-table-cell" i18n="nodes.capacity">Capacity</th> <th class="capacity text-right d-none d-md-table-cell" i18n="nodes.capacity">Capacity</th>
<th class="capacity text-right" i18n="channels.id">Channel ID</th> <th class="capacity text-left" i18n="channels.id">Channel ID</th>
</thead> </thead>
<tbody *ngIf="channels$ | async as channels; else skeleton"> <tbody *ngIf="channels$ | async as channels; else skeleton">
<tr *ngFor="let channel of channels; let i = index;"> <tr *ngFor="let channel of channels; let i = index;">
<ng-template [ngIf]="channel.node2_public_key === publicKey" [ngIfElse]="right"> <ng-container *ngTemplateOutlet="tableTemplate; context: { $implicit: channel, node: channel.node_left.public_key === publicKey ? channel.node_right : channel.node_left }"></ng-container>
<td class="alias text-left">
{{ channel.alias_left || '?' }}
</td>
<td class="text-left d-none d-md-table-cell">
<a [routerLink]="['/lightning/node' | relativeUrl, channel.node1_public_key]">
<span>{{ channel.node1_public_key | shortenString : 10 }}</span>
</a>
<app-clipboard [text]="channel.node1_public_key"></app-clipboard>
</td>
<td class="d-none d-md-table-cell">
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0">Inactive</span>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1">Active</span>
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2">Closed</span>
</td>
<td class="capacity text-right d-none d-md-table-cell">
{{ channel.node1_fee_rate / 10000 | number }}%
</td>
</ng-template>
<ng-template #right>
<td class="alias text-left">
{{ channel.alias_right || '?' }}
</td>
<td class="text-left d-none d-md-table-cell">
<a [routerLink]="['/lightning/node' | relativeUrl, channel.node2_public_key]">
<span>{{ channel.node2_public_key | shortenString : 10 }}</span>
</a>
<app-clipboard [text]="channel.node2_public_key"></app-clipboard>
</td>
<td class="d-none d-md-table-cell">
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0">Inactive</span>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1">Active</span>
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2">Closed</span>
</td>
<td class="capacity text-right d-none d-md-table-cell">
{{ channel.node2_fee_rate / 10000 | number }}%
</td>
</ng-template>
<td class="capacity text-right d-none d-md-table-cell">
<app-amount [satoshis]="channel.capacity" digitsInfo="1.2-2"></app-amount>
</td>
<td class="capacity text-right">
<a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.short_id }}</a>
</td>
</tr> </tr>
</tbody> </tbody>
<ng-template #skeleton> <ng-template #skeleton>
@ -75,12 +31,37 @@
<td class="channels text-right d-none d-md-table-cell"> <td class="channels text-right d-none d-md-table-cell">
<span class="skeleton-loader"></span> <span class="skeleton-loader"></span>
</td> </td>
<td class="channels text-right"> <td class="channels text-left">
<span class="skeleton-loader"></span> <span class="skeleton-loader"></span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</ng-template> </ng-template>
</table> </table>
</div>
</div> <ng-template #tableTemplate let-channel let-node="node">
<td class="alias text-left">
{{ node.alias || '?' }}
</td>
<td class="text-left d-none d-md-table-cell">
<a [routerLink]="['/lightning/node' | relativeUrl, node.public_key]">
<span>{{ node.public_key | shortenString : 10 }}</span>
</a>
<app-clipboard [text]="node.public_key"></app-clipboard>
</td>
<td class="d-none d-md-table-cell">
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0">Inactive</span>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1">Active</span>
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2">Closed</span>
</td>
<td class="capacity text-left d-none d-md-table-cell">
{{ node.fee_rate }} <span class="symbol">ppm ({{ node.fee_rate / 10000 | number }}%)</span>
</td>
<td class="capacity text-right d-none d-md-table-cell">
<app-amount [satoshis]="channel.capacity" digitsInfo="1.2-2"></app-amount>
</td>
<td class="capacity text-left">
<a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.short_id }}</a>
</td>
</ng-template>

2
frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
View File

@ -4,7 +4,7 @@
<div class="col"> <div class="col">
<div class="main-title"> <div class="main-title">
<span i18n="lightning.statistics-title">Nodes Statistics</span>&nbsp; <span i18n="lightning.statistics-title">Network Statistics</span>&nbsp;
</div> </div>
<div class="card-wrapper"> <div class="card-wrapper">
<div class="card" style="height: 123px"> <div class="card" style="height: 123px">

2
frontend/src/app/lightning/lightning.module.ts
View File

@ -11,6 +11,7 @@ import { LightningRoutingModule } from './lightning.routing.module';
import { ChannelsListComponent } from './channels-list/channels-list.component'; import { ChannelsListComponent } from './channels-list/channels-list.component';
import { ChannelComponent } from './channel/channel.component'; import { ChannelComponent } from './channel/channel.component';
import { LightningWrapperComponent } from './lightning-wrapper/lightning-wrapper.component'; import { LightningWrapperComponent } from './lightning-wrapper/lightning-wrapper.component';
import { ChannelBoxComponent } from './channel/channel-box/channel-box.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
LightningDashboardComponent, LightningDashboardComponent,
@ -20,6 +21,7 @@ import { LightningWrapperComponent } from './lightning-wrapper/lightning-wrapper
ChannelsListComponent, ChannelsListComponent,
ChannelComponent, ChannelComponent,
LightningWrapperComponent, LightningWrapperComponent,
ChannelBoxComponent,
], ],
imports: [ imports: [
CommonModule, CommonModule,

11
frontend/src/app/lightning/node/node.component.html
View File

@ -1,10 +1,8 @@
<div class="container-xl" *ngIf="(node$ | async) as node"> <div class="container-xl" *ngIf="(node$ | async) as node">
<div class="title-container mb-2"> <div class="title-container mb-2">
<h1 i18n="shared.address" class="mb-0">{{ node.alias }}</h1> <h1 class="mb-0">{{ node.alias }}</h1>
<span class="tx-link"> <span class="tx-link">
<a [routerLink]="['/lightning/node' | relativeUrl, node.public_key]" > <a [routerLink]="['/lightning/node' | relativeUrl, node.public_key]">{{ node.public_key | shortenString : 12 }}</a>
<span class="d-inline">{{ node.public_key | shortenString : 18 }}</span>
</a>
<app-clipboard [text]="node.public_key"></app-clipboard> <app-clipboard [text]="node.public_key"></app-clipboard>
</span> </span>
</div> </div>
@ -20,7 +18,7 @@
<tr> <tr>
<td i18n="address.total-received">Total capacity</td> <td i18n="address.total-received">Total capacity</td>
<td> <td>
<app-sats [satoshis]="node.capacity"></app-sats>&nbsp; <app-fiat [value]="node.capacity" digitsInfo="1.0-0"></app-fiat> <app-sats [satoshis]="node.capacity"></app-sats><app-fiat [value]="node.capacity" digitsInfo="1.0-0"></app-fiat>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -32,12 +30,13 @@
<tr> <tr>
<td i18n="address.total-received">Average channel size</td> <td i18n="address.total-received">Average channel size</td>
<td> <td>
<app-sats [satoshis]="node.channels_capacity_avg"></app-sats>&nbsp; <app-fiat [value]="node.channels_capacity_avg" digitsInfo="1.0-0"></app-fiat> <app-sats [satoshis]="node.channels_capacity_avg"></app-sats><app-fiat [value]="node.channels_capacity_avg" digitsInfo="1.0-0"></app-fiat>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="w-100 d-block d-md-none"></div>
<div class="col-md"> <div class="col-md">
<table class="table table-borderless table-striped"> <table class="table table-borderless table-striped">
<tbody> <tbody>

63
frontend/src/app/lightning/node/node.component.scss
View File

@ -1,3 +1,31 @@
.title-container {
display: flex;
flex-direction: row;
@media (max-width: 768px) {
flex-direction: column;
}
}
.tx-link {
display: flex;
flex-grow: 1;
@media (min-width: 650px) {
align-self: end;
margin-left: 15px;
margin-top: 0px;
margin-bottom: -3px;
}
@media (min-width: 768px) {
margin-bottom: 4px;
top: 1px;
position: relative;
}
@media (max-width: 768px) {
order: 2;
}
}
.qr-wrapper { .qr-wrapper {
background-color: #FFF; background-color: #FFF;
padding: 10px; padding: 10px;
@ -20,34 +48,13 @@
position: relative; position: relative;
} }
.qrcode-col { app-fiat {
margin: 20px auto 10px; display: block;
text-align: center; font-size: 13px;
@media (min-width: 992px){ @media (min-width: 768px) {
margin: 0px auto 0px; font-size: 14px;
display: inline-block;
margin-left: 10px;
} }
} }
.tx-link {
display: flex;
flex-grow: 1;
@media (min-width: 650px) {
align-self: end;
margin-left: 15px;
margin-top: 0px;
margin-bottom: -3px;
}
@media (min-width: 768px) {
margin-bottom: 4px;
top: 1px;
position: relative;
}
@media (max-width: 768px) {
order: 3;
}
}
.title-container {
display: flex;
flex-direction: row;
}

4
frontend/src/app/lightning/node/node.component.ts
View File

@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ActivatedRoute, ParamMap } from '@angular/router'; import { ActivatedRoute, ParamMap } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map, switchMap } from 'rxjs/operators'; import { map, switchMap } from 'rxjs/operators';
import { SeoService } from 'src/app/services/seo.service';
import { LightningApiService } from '../lightning-api.service'; import { LightningApiService } from '../lightning-api.service';
@Component({ @Component({
@ -20,6 +21,7 @@ export class NodeComponent implements OnInit {
constructor( constructor(
private lightningApiService: LightningApiService, private lightningApiService: LightningApiService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private seoService: SeoService,
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
@ -29,6 +31,8 @@ export class NodeComponent implements OnInit {
return this.lightningApiService.getNode$(params.get('public_key')); return this.lightningApiService.getNode$(params.get('public_key'));
}), }),
map((node) => { map((node) => {
this.seoService.setTitle(`Node: ${node.alias}`);
const socketsObject = []; const socketsObject = [];
for (const socket of node.sockets.split(',')) { for (const socket of node.sockets.split(',')) {
if (socket === '') { if (socket === '') {

47
lightning-backend/src/api/explorer/channels.api.ts
View File

@ -51,7 +51,9 @@ class ChannelsApi {
try { try {
const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE channels.id = ?`; const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE channels.id = ?`;
const [rows]: any = await DB.query(query, [shortId]); const [rows]: any = await DB.query(query, [shortId]);
return rows[0]; if (rows[0]) {
return this.convertChannel(rows[0]);
}
} catch (e) { } catch (e) {
logger.err('$getChannel error: ' + (e instanceof Error ? e.message : e)); logger.err('$getChannel error: ' + (e instanceof Error ? e.message : e));
throw e; throw e;
@ -63,7 +65,8 @@ class ChannelsApi {
transactionIds = transactionIds.map((id) => '\'' + id + '\''); transactionIds = transactionIds.map((id) => '\'' + id + '\'');
const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE channels.transaction_id IN (${transactionIds.join(', ')})`; const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE channels.transaction_id IN (${transactionIds.join(', ')})`;
const [rows]: any = await DB.query(query); const [rows]: any = await DB.query(query);
return rows; const channels = rows.map((row) => this.convertChannel(row));
return channels;
} catch (e) { } catch (e) {
logger.err('$getChannelByTransactionId error: ' + (e instanceof Error ? e.message : e)); logger.err('$getChannelByTransactionId error: ' + (e instanceof Error ? e.message : e));
throw e; throw e;
@ -72,14 +75,50 @@ class ChannelsApi {
public async $getChannelsForNode(public_key: string): Promise<any> { public async $getChannelsForNode(public_key: string): Promise<any> {
try { try {
const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE node1_public_key = ? OR node2_public_key = ?`; const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE node1_public_key = ? OR node2_public_key = ? ORDER BY channels.capacity DESC`;
const [rows]: any = await DB.query(query, [public_key, public_key]); const [rows]: any = await DB.query(query, [public_key, public_key]);
return rows; const channels = rows.map((row) => this.convertChannel(row));
return channels;
} catch (e) { } catch (e) {
logger.err('$getChannelsForNode error: ' + (e instanceof Error ? e.message : e)); logger.err('$getChannelsForNode error: ' + (e instanceof Error ? e.message : e));
throw e; throw e;
} }
} }
private convertChannel(channel: any): any {
return {
'id': channel.id,
'short_id': channel.short_id,
'capacity': channel.capacity,
'transaction_id': channel.transaction_id,
'transaction_vout': channel.void,
'updated_at': channel.updated_at,
'created': channel.created,
'status': channel.status,
'node_left': {
'alias': channel.alias_left,
'public_key': channel.node1_public_key,
'base_fee_mtokens': channel.node1_base_fee_mtokens,
'cltv_delta': channel.node1_cltv_delta,
'fee_rate': channel.node1_fee_rate,
'is_disabled': channel.node1_is_disabled,
'max_htlc_mtokens': channel.node1_max_htlc_mtokens,
'min_htlc_mtokens': channel.node1_min_htlc_mtokens,
'updated_at': channel.node1_updated_at,
},
'node_right': {
'alias': channel.alias_right,
'public_key': channel.node2_public_key,
'base_fee_mtokens': channel.node2_base_fee_mtokens,
'cltv_delta': channel.node2_cltv_delta,
'fee_rate': channel.node2_fee_rate,
'is_disabled': channel.node2_is_disabled,
'max_htlc_mtokens': channel.node2_max_htlc_mtokens,
'min_htlc_mtokens': channel.node2_min_htlc_mtokens,
'updated_at': channel.node2_updated_at,
},
};
}
} }
export default new ChannelsApi(); export default new ChannelsApi();

2
lightning-backend/src/api/explorer/nodes.api.ts
View File

@ -63,7 +63,7 @@ class NodesApi {
public async $searchNodeByPublicKeyOrAlias(search: string) { public async $searchNodeByPublicKeyOrAlias(search: string) {
try { try {
const searchStripped = search.replace('%', '') + '%'; const searchStripped = search.replace('%', '') + '%';
const query = `SELECT public_key, alias, color FROM nodes WHERE public_key LIKE ? OR alias LIKE ? LIMIT 10`; const query = `SELECT nodes.public_key, nodes.alias, node_stats.capacity FROM nodes LEFT JOIN node_stats ON node_stats.public_key = nodes.public_key WHERE nodes.public_key LIKE ? OR nodes.alias LIKE ? GROUP BY nodes.public_key ORDER BY node_stats.capacity DESC LIMIT 10`;
const [rows]: any = await DB.query(query, [searchStripped, searchStripped]); const [rows]: any = await DB.query(query, [searchStripped, searchStripped]);
return rows; return rows;
} catch (e) { } catch (e) {