diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index 6c06aec2d..dbf3e85e5 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -70,7 +70,7 @@
-
+
diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 85daa10bd..8a072fe10 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -115,7 +115,7 @@
-
+
diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.html b/frontend/src/app/components/latest-blocks/latest-blocks.component.html index ce9496657..7b57a92de 100644 --- a/frontend/src/app/components/latest-blocks/latest-blocks.component.html +++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.html @@ -19,7 +19,7 @@ {{ block.tx_count | number }} -
+
{{ block.size | bytes: 2 }}
@@ -36,7 +36,7 @@ -
+
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index f643992a2..48ff9a292 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -31,7 +31,7 @@ Size -
+
{{ mempoolBlock.blockSize | bytes: 2 }}
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 7b4816361..e78ea957d 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -86,7 +86,7 @@ {{ block.tx_count | number }} -
+
{{ block.size | bytes: 2 }}
@@ -162,21 +162,22 @@ - - -
-
Minimum fee
+
+
Rejecting

- {{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | number : '1.1-1' }} sat/vB () + < {{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | number : '1.1-1' }} sat/vB

+
Mempool size
-

- {{ mempoolBlocksData.size | bytes }} () - {{ i }} block - {{ i }} blocks -

+
+
+
+
{{ mempoolInfoData.value.memPoolInfo.usage | bytes }} / {{ mempoolInfoData.value.memPoolInfo.maxmempool | bytes }}
+
+
+
Unconfirmed

{{ mempoolInfoData.value.memPoolInfo.size | number }} TXs @@ -194,7 +195,8 @@

-
{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} vB/s
+
+
{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} vB/s
@@ -205,9 +207,10 @@
Difficulty adjustment
-
+{{ epochData.change | number: '1.0-2' }}%
+
+
+{{ epochData.change | number: '1.0-2' }}%
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index 662e16437..02c48fb52 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -102,11 +102,20 @@ export class DashboardComponent implements OnInit { progressClass = 'bg-warning'; } + let mempoolSizePercentage = (mempoolInfo.usage / mempoolInfo.maxmempool * 100) + let mempoolSizeProgress = 'bg-danger'; + if (mempoolSizePercentage <= 50) { + mempoolSizeProgress = 'bg-success'; + } else if (mempoolSizePercentage <= 75) { + mempoolSizeProgress = 'bg-warning'; + } + return { memPoolInfo: mempoolInfo, vBytesPerSecond: vbytesPerSecond, progressWidth: percent + '%', progressClass: progressClass, + mempoolSizeProgress: mempoolSizeProgress, }; }) ); diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index e6d21267b..c23c6ec4b 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -35,8 +35,13 @@ export interface MempoolBlock { } export interface MempoolInfo { - size: number; - bytes: number; + loaded: boolean; // (boolean) True if the mempool is fully loaded + size: number; // (numeric) Current tx count + bytes: number; // (numeric) Sum of all virtual transaction sizes as defined in BIP 141. + usage: number; // (numeric) Total memory usage for the mempool + maxmempool: number; // (numeric) Maximum memory usage for the mempool + mempoolminfee: number; // (numeric) Minimum fee rate in BTC/kB for tx to be accepted. + minrelaytxfee: number; // (numeric) Current minimum relay fee for transactions } export interface TransactionStripped { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index ac9b259e1..eafe4799d 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -402,9 +402,13 @@ h1, h2, h3 { font-size: 14px; } +.progress { + position: relative; +} + .progress-text { position: absolute; - top: 8px; + top: 8.5px; width: 100%; text-align: center; }