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

Fixes to block reward display on Liquid.

Browse Source
This commit is contained in:
softsimon 2020-07-23 12:10:22 +07:00
parent b6b9001406
commit 23f5e229c9
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/api/blocks.ts
View File

@ -98,7 +98,9 @@ class Blocks {
vin: [{ vin: [{
scriptsig: tx.vin[0].scriptsig scriptsig: tx.vin[0].scriptsig
}], }],
vout: tx.vout.map((vout) => ({ scriptpubkey_address: vout.scriptpubkey_address, value: vout.value })) vout: tx.vout
.map((vout) => ({ scriptpubkey_address: vout.scriptpubkey_address, value: vout.value }))
.filter((vout) => vout.value)
}; };
} }
} }

7
frontend/src/app/components/block/block.component.html
View File

@ -48,7 +48,10 @@
<ng-template [ngIf]="fees !== undefined" [ngIfElse]="loadingFees"> <ng-template [ngIf]="fees !== undefined" [ngIfElse]="loadingFees">
<tr> <tr>
<td>Total fees</td> <td>Total fees</td>
<td><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> (<app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat>)</td> <td *ngIf="network !== 'liquid'; else liquidTotalFees"><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> (<app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat>)</td>
<ng-template #liquidTotalFees>
<td>{{ fees | number }} L-sat (<app-fiat [value]="fees * 100000000" digitsInfo="1.2-2"></app-fiat>)</td>
</ng-template>
</tr> </tr>
<tr *ngIf="network !== 'liquid'"> <tr *ngIf="network !== 'liquid'">
<td>Subsidy + fees:</td> <td>Subsidy + fees:</td>
@ -62,7 +65,7 @@
<td>Total fees</td> <td>Total fees</td>
<td style="width: 75%;"><span class="skeleton-loader"></span></td> <td style="width: 75%;"><span class="skeleton-loader"></span></td>
</tr> </tr>
<tr> <tr *ngIf="network !== 'liquid'">
<td>Subsidy + fees:</td> <td>Subsidy + fees:</td>
<td><span class="skeleton-loader"></span></td> <td><span class="skeleton-loader"></span></td>
</tr> </tr>

2
frontend/src/app/components/block/block.component.ts
View File

@ -98,7 +98,7 @@ export class BlockComponent implements OnInit, OnDestroy {
this.coinbaseTx = block.coinbaseTx; this.coinbaseTx = block.coinbaseTx;
} }
this.setBlockSubsidy(); this.setBlockSubsidy();
if (block.reward) { if (block.reward !== undefined) {
this.fees = block.reward / 100000000 - this.blockSubsidy; this.fees = block.reward / 100000000 - this.blockSubsidy;
} }
this.stateService.markBlock$.next({ blockHeight: this.blockHeight }); this.stateService.markBlock$.next({ blockHeight: this.blockHeight });