From c6b1979391f1c574742f660afd9db7254f9bd56d Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 7 Aug 2021 04:24:46 +0300 Subject: [PATCH] Support Liquid 0.1 sat/vB fees on blocks. --- .../blockchain-blocks/blockchain-blocks.component.html | 4 ++-- .../blockchain-blocks/blockchain-blocks.component.ts | 4 ++++ .../components/mempool-blocks/mempool-blocks.component.html | 4 ++-- .../app/components/mempool-blocks/mempool-blocks.component.ts | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index dd74114c2..d56e77a87 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -7,10 +7,10 @@
- ~{{ block.medianFee | number:'1.0-0' }} sat/vB + ~{{ block.medianFee | number:feeRounding }} sat/vB
- {{ block.feeRange[1] | number:'1.0-0' }} - {{ block.feeRange[block.feeRange.length - 1] | number:'1.0-0' }} sat/vB + {{ block.feeRange[1] | number:feeRounding }} - {{ block.feeRange[block.feeRange.length - 1] | number:feeRounding }} sat/vB
diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index acf9a5f23..04575121b 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -23,6 +23,7 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { interval: any; tabHidden = false; loadingBlocks = false; + feeRounding = '1.0-0'; arrowVisible = false; arrowLeftPx = 30; @@ -44,6 +45,9 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { ) { } ngOnInit() { + if (this.stateService.network === 'liquid') { + this.feeRounding = '1.0-1'; + } this.blocks.forEach((b) => this.blockStyles.push(this.getStyleForBlock(b))); this.networkSubscriotion = this.stateService.networkChanged$.subscribe((network) => this.network = network); this.tabHiddenSubscription = this.stateService.isTabHidden$.subscribe((tabHidden) => this.tabHidden = tabHidden); diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index a06b5acc1..e1d55d0d1 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -5,10 +5,10 @@  
- ~{{ projectedBlock.medianFee | number:'1.0-0' }} sat/vB + ~{{ projectedBlock.medianFee | number:feeRounding }} sat/vB
- {{ projectedBlock.feeRange[0] | number:'1.0-0' }} - {{ projectedBlock.feeRange[projectedBlock.feeRange.length - 1] | number:'1.0-0' }} sat/vB + {{ projectedBlock.feeRange[0] | number:feeRounding }} - {{ projectedBlock.feeRange[projectedBlock.feeRange.length - 1] | number:feeRounding }} sat/vB
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 5e288d004..1d7a02f06 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -31,6 +31,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { arrowVisible = false; tabHidden = false; loadingMempoolBlocks = true; + feeRounding = '1.0-0'; rightPosition = 0; transition = '2s'; @@ -49,6 +50,9 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { ) { } ngOnInit() { + if (this.stateService.network === 'liquid') { + this.feeRounding = '1.0-1'; + } this.mempoolBlocks.map(() => { this.updateMempoolBlockStyles(); this.calculateTransactionPosition();