diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index c3b26a454..5c03a7d5e 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -8,6 +8,7 @@ "DB_DISABLED": false, "API_ENDPOINT": "/api/v1/", "ELECTRS_POLL_RATE_MS": 2000, + "LIQUID": true, "MEMPOOL_REFRESH_RATE_MS": 2000, "DEFAULT_PROJECTED_BLOCKS_AMOUNT": 8, "KEEP_BLOCK_AMOUNT": 24, diff --git a/backend/src/api/fee-api.ts b/backend/src/api/fee-api.ts index 523664fbc..a5d88bbe5 100644 --- a/backend/src/api/fee-api.ts +++ b/backend/src/api/fee-api.ts @@ -1,8 +1,11 @@ +const config = require('../../mempool-config.json'); import projectedBlocks from './mempool-blocks'; class FeeApi { constructor() { } + defaultFee = config.LIQUID ? 0.1 : 1; + public getRecommendedFee() { const pBlocks = projectedBlocks.getMempoolBlocks(); if (!pBlocks.length) { @@ -15,11 +18,11 @@ class FeeApi { let firstMedianFee = Math.ceil(pBlocks[0].medianFee); if (pBlocks.length === 1 && pBlocks[0].blockVSize <= 500000) { - firstMedianFee = 1; + firstMedianFee = this.defaultFee; } - const secondMedianFee = pBlocks[1] ? Math.ceil(pBlocks[1].medianFee) : 1; - const thirdMedianFee = pBlocks[2] ? Math.ceil(pBlocks[2].medianFee) : 1; + const secondMedianFee = pBlocks[1] ? Math.ceil(pBlocks[1].medianFee) : this.defaultFee; + const thirdMedianFee = pBlocks[2] ? Math.ceil(pBlocks[2].medianFee) : this.defaultFee; return { 'fastestFee': firstMedianFee, diff --git a/frontend/src/app/components/fees-box/fees-box.component.ts b/frontend/src/app/components/fees-box/fees-box.component.ts index 3010daa0f..72d137ccb 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.ts +++ b/frontend/src/app/components/fees-box/fees-box.component.ts @@ -24,6 +24,8 @@ export class FeesBoxComponent implements OnInit { ) { } ngOnInit(): void { + const defaultFee = this.stateService.network === 'liquid' ? 0.1 : 1; + this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$; this.feeEstimations$ = this.stateService.mempoolBlocks$ .pipe( @@ -32,11 +34,11 @@ export class FeesBoxComponent implements OnInit { let firstMedianFee = Math.ceil(pBlocks[0].medianFee); if (pBlocks.length === 1 && pBlocks[0].blockVSize <= 500000) { - firstMedianFee = 1; + firstMedianFee = defaultFee; } - const secondMedianFee = pBlocks[1] ? Math.ceil(pBlocks[1].medianFee) : 1; - const thirdMedianFee = pBlocks[2] ? Math.ceil(pBlocks[2].medianFee) : 1; + const secondMedianFee = pBlocks[1] ? Math.ceil(pBlocks[1].medianFee) : defaultFee; + const thirdMedianFee = pBlocks[2] ? Math.ceil(pBlocks[2].medianFee) : defaultFee; return { 'fastestFee': firstMedianFee, diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 1efd71a2d..e9d0de27e 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -5,7 +5,7 @@
- +