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

Handle 0.1 sat/vB base fee on the dashboard and backend.

Browse Source
This commit is contained in:
softsimon 2021-08-05 02:03:52 +03:00
parent d841933b21
commit 0bb9247609
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces'; import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
import config from '../config';
export class Common { export class Common {
static median(numbers: number[]) { static median(numbers: number[]) {
let medianNr = 0; let medianNr = 0;
@ -105,7 +105,7 @@ export class Common {
totalFees += tx.bestDescendant.fee; totalFees += tx.bestDescendant.fee;
} }
tx.effectiveFeePerVsize = Math.max(1, totalFees / (totalWeight / 4)); tx.effectiveFeePerVsize = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, totalFees / (totalWeight / 4));
tx.cpfpChecked = true; tx.cpfpChecked = true;
return { return {

4
backend/src/api/transaction-utils.ts
View File

@ -1,7 +1,7 @@
import bitcoinApi from './bitcoin/bitcoin-api-factory'; import bitcoinApi from './bitcoin/bitcoin-api-factory';
import logger from '../logger';
import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces'; import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
import { IEsploraApi } from './bitcoin/esplora-api.interface'; import { IEsploraApi } from './bitcoin/esplora-api.interface';
import config from '../config';
class TransactionUtils { class TransactionUtils {
constructor() { } constructor() { }
@ -31,7 +31,7 @@ class TransactionUtils {
// @ts-ignore // @ts-ignore
return transaction; return transaction;
} }
const feePerVbytes = Math.max(1, (transaction.fee || 0) / (transaction.weight / 4)); const feePerVbytes = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, (transaction.fee || 0) / (transaction.weight / 4));
const transactionExtended: TransactionExtended = Object.assign({ const transactionExtended: TransactionExtended = Object.assign({
vsize: Math.round(transaction.weight / 4), vsize: Math.round(transaction.weight / 4),
feePerVsize: feePerVbytes, feePerVsize: feePerVbytes,

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

@ -165,7 +165,7 @@
<ng-template #mempoolTable let-mempoolInfoData> <ng-template #mempoolTable let-mempoolInfoData>
<div class="mempool-info-data"> <div class="mempool-info-data">
<div class="item"> <div class="item">
<h5 *ngIf="!mempoolInfoData.value || mempoolInfoData.value.memPoolInfo.mempoolminfee === 0.00001 else purgingText" class="card-title" i18n="dashboard.minimum-fee|Minimum mempool fee">Minimum fee</h5> <h5 *ngIf="!mempoolInfoData.value || mempoolInfoData.value.memPoolInfo.mempoolminfee === 0.00001 || (stateService.env.BASE_MODULE === 'liquid' && mempoolInfoData.value.memPoolInfo.mempoolminfee === 0.000001) else purgingText" class="card-title" i18n="dashboard.minimum-fee|Minimum mempool fee">Minimum fee</h5>
<ng-template #purgingText><h5 class="card-title" i18n="dashboard.purging|Purgin below fee">Purging</h5></ng-template> <ng-template #purgingText><h5 class="card-title" i18n="dashboard.purging|Purgin below fee">Purging</h5></ng-template>
<p class="card-text" *ngIf="(isLoadingWebSocket$ | async) === false && mempoolInfoData.value; else loading"> <p class="card-text" *ngIf="(isLoadingWebSocket$ | async) === false && mempoolInfoData.value; else loading">
<ng-template [ngIf]="mempoolInfoData.value.memPoolInfo.mempoolminfee > 0.00001">&lt; </ng-template>{{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | number : '1.1-1' }} <span><ng-container i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container></span> <ng-template [ngIf]="mempoolInfoData.value.memPoolInfo.mempoolminfee > 0.00001">&lt; </ng-template>{{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | number : '1.1-1' }} <span><ng-container i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container></span>

2
frontend/src/app/dashboard/dashboard.component.ts
View File

@ -66,7 +66,7 @@ export class DashboardComponent implements OnInit {
constructor( constructor(
@Inject(LOCALE_ID) private locale: string, @Inject(LOCALE_ID) private locale: string,
private stateService: StateService, public stateService: StateService,
private apiService: ApiService, private apiService: ApiService,
private websocketService: WebsocketService, private websocketService: WebsocketService,
private seoService: SeoService, private seoService: SeoService,