diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss
index f1e835d9c..884ba1027 100644
--- a/frontend/src/app/dashboard/dashboard.component.scss
+++ b/frontend/src/app/dashboard/dashboard.component.scss
@@ -175,6 +175,43 @@
height: 18px;
}
+.lastest-blocks-table {
+ width: 100%;
+ text-align: left;
+ tr, td, th {
+ border: 0px;
+ padding-top: 0.65rem !important;
+ padding-bottom: 0.7rem !important;
+ }
+ .table-cell-height {
+ width: 15%;
+ }
+ .table-cell-mined {
+ width: 35%;
+ text-align: left;
+ }
+ .table-cell-transaction-count {
+ display: none;
+ text-align: right;
+ width: 20%;
+ display: table-cell;
+ }
+ .table-cell-size {
+ display: none;
+ text-align: center;
+ width: 30%;
+ @media (min-width: 485px) {
+ display: table-cell;
+ }
+ @media (min-width: 768px) {
+ display: none;
+ }
+ @media (min-width: 992px) {
+ display: table-cell;
+ }
+ }
+}
+
.lastest-replacements-table {
width: 100%;
text-align: left;
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index bf9816a69..aca3593d7 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { combineLatest, merge, Observable, of, Subscription } from 'rxjs';
-import { filter, map, scan, share, switchMap } from 'rxjs/operators';
+import { filter, map, scan, share, switchMap, tap } from 'rxjs/operators';
import { BlockExtended, OptimizedMempoolStats, RbfTree } from '../interfaces/node-api.interface';
import { MempoolInfo, TransactionStripped, ReplacementInfo } from '../interfaces/websocket.interface';
import { ApiService } from '../services/api.service';
@@ -39,6 +39,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
mempoolLoadingStatus$: Observable;
vBytesPerSecondLimit = 1667;
transactions$: Observable;
+ blocks$: Observable;
replacements$: Observable;
latestBlockHeight: number;
mempoolTransactionsWeightPerSecondData: any;
@@ -144,6 +145,23 @@ export class DashboardComponent implements OnInit, OnDestroy {
}, []),
);
+ this.blocks$ = this.stateService.blocks$
+ .pipe(
+ tap((blocks) => {
+ this.latestBlockHeight = blocks[0].height;
+ }),
+ switchMap((blocks) => {
+ if (this.stateService.env.MINING_DASHBOARD === true) {
+ for (const block of blocks) {
+ // @ts-ignore: Need to add an extra field for the template
+ block.extras.pool.logo = `/resources/mining-pools/` +
+ block.extras.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
+ }
+ }
+ return of(blocks.slice(0, 6));
+ })
+ );
+
this.replacements$ = this.stateService.rbfLatestSummary$;
this.mempoolStats$ = this.stateService.connectionState$
From 9a2ab7fe2165bc30e958fa62167b5c8805f53a3b Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Thu, 20 Jul 2023 09:56:52 +0900
Subject: [PATCH 10/12] [search bar] chrome - fix flex-auto
---
.../src/app/components/master-page/master-page.component.scss | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss
index fc8b4eb5a..95b9474b9 100644
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -64,7 +64,9 @@ li.nav-item {
.navbar-collapse {
- flex-basis: auto;
+ @media (min-width: 564px) {
+ flex-basis: auto;
+ }
justify-content: flex-end;
}
From ade790822962fa97663a39beecb1d543a51daf85 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Thu, 20 Jul 2023 10:36:26 +0900
Subject: [PATCH 11/12] [mining] add missing empty col at the bottom of pool
ranking
---
.../src/app/components/pool-ranking/pool-ranking.component.html | 2 ++
1 file changed, 2 insertions(+)
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 6ffcbf485..d5cf08aa5 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -139,6 +139,8 @@
{{ miningStats.lastEstimatedHashrate}} {{
miningStats.miningUnits.hashrateUnit }} |
{{ miningStats.blockCount }} |
+ |
+ |
{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio
}}%) |
From b1345038bde68a51be91a4913022c85ff7bccca0 Mon Sep 17 00:00:00 2001
From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com>
Date: Thu, 20 Jul 2023 18:09:36 -0700
Subject: [PATCH 12/12] Tweak dependabot settings
---
.github/dependabot.yml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9f7f6caeb..e0aee68c5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,7 +7,8 @@ updates:
open-pull-requests-limit: 10
ignore:
- dependency-name: "*"
- update-types: ["version-update:semver-major"]
+ update-types:
+ ["version-update:semver-major", "version-update:semver-patch"]
allow:
- dependency-type: "production"
@@ -18,7 +19,8 @@ updates:
open-pull-requests-limit: 10
ignore:
- dependency-name: "*"
- update-types: ["version-update:semver-major"]
+ update-types:
+ ["version-update:semver-major", "version-update:semver-patch"]
allow:
- dependency-type: "production"
@@ -28,7 +30,8 @@ updates:
interval: weekly
ignore:
- dependency-name: "*"
- update-types: ["version-update:semver-major"]
+ update-types:
+ ["version-update:semver-major", "version-update:semver-patch"]
- package-ecosystem: docker
directory: "/docker/frontend"
@@ -36,7 +39,8 @@ updates:
interval: weekly
ignore:
- dependency-name: "*"
- update-types: ["version-update:semver-major"]
+ update-types:
+ ["version-update:semver-major", "version-update:semver-patch"]
- package-ecosystem: "github-actions"
directory: "/"
@@ -44,4 +48,5 @@ updates:
interval: weekly
ignore:
- dependency-name: "*"
- update-types: ["version-update:semver-major"]
+ update-types:
+ ["version-update:semver-major", "version-update:semver-patch"]