diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index a560bfdfe..5c59582a1 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -1,5 +1,5 @@ import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces'; - +import config from '../config'; export class Common { static median(numbers: number[]) { let medianNr = 0; @@ -105,7 +105,7 @@ export class Common { 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; return { diff --git a/backend/src/api/transaction-utils.ts b/backend/src/api/transaction-utils.ts index 2a5d3a9ad..04d6f3259 100644 --- a/backend/src/api/transaction-utils.ts +++ b/backend/src/api/transaction-utils.ts @@ -1,7 +1,7 @@ import bitcoinApi from './bitcoin/bitcoin-api-factory'; -import logger from '../logger'; import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces'; import { IEsploraApi } from './bitcoin/esplora-api.interface'; +import config from '../config'; class TransactionUtils { constructor() { } @@ -31,7 +31,7 @@ class TransactionUtils { // @ts-ignore 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({ vsize: Math.round(transaction.weight / 4), feePerVsize: feePerVbytes, diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index a2fdd80b5..e05d09094 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -165,7 +165,7 @@
-
Minimum fee
+
Minimum fee
Purging

< {{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | number : '1.1-1' }} sat/vB diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index ab84f75b9..ea606add7 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -66,7 +66,7 @@ export class DashboardComponent implements OnInit { constructor( @Inject(LOCALE_ID) private locale: string, - private stateService: StateService, + public stateService: StateService, private apiService: ApiService, private websocketService: WebsocketService, private seoService: SeoService,