diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index 31884518..604700b4 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -205,39 +205,41 @@
Performance
-
-
Pool Information
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
Pool Information ({{info.isUsingFallbackStratum ? 'Fallback' : 'Primary' }})
+
Quick Link: - {{quickLink}} -
URL:{{info.stratumURL}}
Port:{{info.stratumPort}}
User:{{info.stratumUser}}
Fallback URL:{{info.fallbackStratumURL}}
Fallback Port:{{info.fallbackStratumPort}}
Fallback User:{{info.fallbackStratumUser}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
URL: + {{info.stratumURL}} +
Port:{{info.stratumPort}}
User:{{info.stratumUser}}
URL: + {{info.fallbackStratumURL}} +
Port:{{info.fallbackStratumPort}}
User:{{info.fallbackStratumUser}}
diff --git a/main/http_server/axe-os/src/app/components/home/home.component.scss b/main/http_server/axe-os/src/app/components/home/home.component.scss index 05c1ae97..b35057d5 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.scss +++ b/main/http_server/axe-os/src/app/components/home/home.component.scss @@ -5,4 +5,4 @@ .card { min-height: 100%; -} \ No newline at end of file +} diff --git a/main/http_server/axe-os/src/app/components/home/home.component.ts b/main/http_server/axe-os/src/app/components/home/home.component.ts index 1a152ec5..5db7d65d 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.ts +++ b/main/http_server/axe-os/src/app/components/home/home.component.ts @@ -15,6 +15,7 @@ export class HomeComponent { public info$: Observable; public quickLink$: Observable; + public fallbackQuickLink$: Observable; public expectedHashRate$: Observable; @@ -186,6 +187,26 @@ export class HomeComponent { }) ) + this.fallbackQuickLink$ = this.info$.pipe( + map(info => { + if (info.fallbackStratumURL.includes('public-pool.io')) { + const address = info.fallbackStratumUser.split('.')[0] + return `https://web.public-pool.io/#/app/${address}`; + } else if (info.fallbackStratumURL.includes('ocean.xyz')) { + const address = info.fallbackStratumUser.split('.')[0] + return `https://ocean.xyz/stats/${address}`; + } else if (info.fallbackStratumURL.includes('solo.d-central.tech')) { + const address = info.fallbackStratumUser.split('.')[0] + return `https://solo.d-central.tech/#/app/${address}`; + } else if (/solo[46]?.ckpool.org/.test(info.fallbackStratumURL)) { + const address = info.fallbackStratumUser.split('.')[0] + return `https://solo.ckpool.org/users/${address}`; + } else { + return undefined; + } + }) + ) + } private calculateAverage(data: number[]): number { diff --git a/main/http_server/axe-os/src/app/services/system.service.ts b/main/http_server/axe-os/src/app/services/system.service.ts index 500e43b9..a863f687 100644 --- a/main/http_server/axe-os/src/app/services/system.service.ts +++ b/main/http_server/axe-os/src/app/services/system.service.ts @@ -49,6 +49,7 @@ export class SystemService { fallbackStratumPort: 21497, stratumUser: "bc1q99n3pu025yyu0jlywpmwzalyhm36tg5u37w20d.bitaxe-U1", fallbackStratumUser: "bc1q99n3pu025yyu0jlywpmwzalyhm36tg5u37w20d.bitaxe-U1", + isUsingFallbackStratum: true, frequency: 485, version: "2.0", boardVersion: "204", diff --git a/main/http_server/axe-os/src/models/ISystemInfo.ts b/main/http_server/axe-os/src/models/ISystemInfo.ts index 25e37208..8209f06b 100644 --- a/main/http_server/axe-os/src/models/ISystemInfo.ts +++ b/main/http_server/axe-os/src/models/ISystemInfo.ts @@ -28,6 +28,7 @@ export interface ISystemInfo { stratumPort: number, fallbackStratumURL: string, fallbackStratumPort: number, + isUsingFallbackStratum: boolean, stratumUser: string, fallbackStratumUser: string, frequency: number,