Add scoreboard 🏆

main/CMakeLists.txt

@@ -28,6 +28,7 @@ SRCS
     "./tasks/asic_result_task.c"
     "./tasks/power_management_task.c"
     "./tasks/statistics_task.c"
+    "./tasks/scoreboard.c"
     "./tasks/hashrate_monitor_task.c"
     "./thermal/EMC2101.c"
     "./thermal/EMC2103.c"

main/global_state.h

@@ -12,6 +12,7 @@
 #include "work_queue.h"
 #include "device_config.h"
 #include "display.h"
+#include "scoreboard.h"
 
 #define STRATUM_USER CONFIG_STRATUM_USER
 #define FALLBACK_STRATUM_USER CONFIG_FALLBACK_STRATUM_USER
@@ -70,6 +71,7 @@ typedef struct
     char firmware_update_filename[20];
     char firmware_update_status[20];
     char * asic_status;
+    Scoreboard scoreboard;
 } SystemModule;
 
 typedef struct

main/http_server/axe-os/src/app/app-routing.module.ts

@@ -8,6 +8,7 @@ import { UpdateComponent } from './components/update/update.component';
 import { SettingsComponent } from './components/settings/settings.component';
 import { NetworkComponent } from './components/network/network.component';
 import { SwarmComponent } from './components/swarm/swarm.component';
+import { ScoreboardComponent } from './components/scoreboard/scoreboard.component';
 import { DesignComponent } from './components/design/design.component';
 import { PoolComponent } from './components/pool/pool.component';
 import { AppLayoutComponent } from './layout/app.layout.component';
@@ -67,6 +68,11 @@ const routes: Routes = [
         component: SwarmComponent,
         title: `${TITLE_PREFIX} Swarm`,
       },
+      {
+        path: 'scoreboard',
+        component: ScoreboardComponent,
+        title: `${TITLE_PREFIX} Scoreboard`,
+      },
       {
         path: 'design',
         component: DesignComponent,

main/http_server/axe-os/src/app/app.module.ts

@@ -24,6 +24,7 @@ import { UpdateComponent } from './components/update/update.component';
 import { NetworkComponent } from './components/network/network.component';
 import { SettingsComponent } from './components/settings/settings.component';
 import { SwarmComponent } from './components/swarm/swarm.component';
+import { ScoreboardComponent } from './components/scoreboard/scoreboard.component';
 import { ThemeConfigComponent } from './components/design/theme-config.component';
 import { DesignComponent } from './components/design/design.component';
 import { AppLayoutModule } from './layout/app.layout.module';
@@ -62,6 +63,7 @@ const components = [
     ANSIPipe,
     DateAgoPipe,
     SwarmComponent,
+    ScoreboardComponent,
     SettingsComponent,
     HashSuffixPipe,
     DiffSuffixPipe,

main/http_server/axe-os/src/app/components/home/home.component.scss

@@ -31,11 +31,6 @@
     }
 }
 
-.code {
-    line-break: anywhere;
-    font-family: 'Courier New', Courier, monospace;
-}
-
 .heatmap {
     width: 100%;
     border-collapse: separate;

main/http_server/axe-os/src/app/components/scoreboard/scoreboard.component.html

@@ -0,0 +1,48 @@
+<div class="card">
+    <h2>Scoreboard</h2>
+
+    <ng-container *ngIf="scoreboard$ | async as scoreboard">
+        <div class="card mt-2 overflow-x-auto">
+            <table class="w-full">
+                <thead>
+                    <tr>
+                        <th *ngFor="let field of [
+                            { label: 'Rank', name: 'rank' },
+                            { label: 'Difficulty', name: 'difficulty' },
+                            { label: 'Job ID', name: 'job_id' },
+                            { label: 'ExtraNonce2', name: 'extranonce2' },
+                            { label: 'Time', name: 'ntime' },
+                            { label: 'Nonce', name: 'nonce' },
+                            { label: 'Version Bits', name: 'version_bits' }
+                        ]" class="text-500 font-medium">
+                            <div class="flex align-items-center cursor-pointer select-none relative" (click)="sortBy(field.name)">
+                                <span class="pr-3">{{field.label}}</span>
+                                <i class="pi text-xs ml-2 absolute right-0" [ngClass]="{
+                                    'pi-sort-up-fill': sortField === field.name && sortDirection === 'asc',
+                                    'pi-sort-down-fill': sortField === field.name && sortDirection === 'desc'
+                                }"></i>
+                            </div>
+                        </th>
+                        <th></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr *ngFor="let entry of scoreboard">
+                        <td>
+                            <i class="pi pi-trophy" *ngIf="entry.rank < 3" [ngStyle]="{
+                                'color': entry.rank === 0 ? 'gold' : entry.rank === 1 ? 'silver' : 'peru'
+                            }"></i>
+                            <span *ngIf="entry.rank >= 3" class="text-500 text-xs">{{ entry.rank + 1 }}</span>
+                        </td>
+                        <td pTooltip="{{ entry.difficulty }}" tooltipPosition="top" class="text-900">{{ entry.difficulty | diffSuffix }}</td>
+                        <td class="code">{{ entry.job_id }}</td>
+                        <td class="code">{{ entry.extranonce2 }}</td>
+                        <td pTooltip="{{ entry.since | dateAgo: {intervals: 2} }} ago" tooltipPosition="top">{{ entry.ntime * 1000 | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                        <td class="code">{{ entry.nonce }}</td>
+                        <td class="code">{{ entry.version_bits }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </ng-container>
+</div>

main/http_server/axe-os/src/app/components/scoreboard/scoreboard.component.scss

@@ -0,0 +1,26 @@
+table {
+    border-collapse: collapse;
+}
+th,
+td {
+    padding: 0 0.5rem 0.5rem;
+    white-space: nowrap;
+    text-align: left;
+
+    &:first-child {
+        padding-left: 0;
+    }
+    &:last-child {
+        padding-right: 0;
+    }
+}
+td {
+    padding-top: 0.5rem;
+}
+tbody tr {
+    border-top: 1px solid var(--surface-border);
+
+    &:last-child td {
+        padding-bottom: 0;
+    }
+}

main/http_server/axe-os/src/app/components/scoreboard/scoreboard.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ScoreboardComponent } from './scoreboard.component';
+
+describe('SystemComponent', () => {
+  let component: ScoreboardComponent;
+  let fixture: ComponentFixture<ScoreboardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ScoreboardComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ScoreboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

main/http_server/axe-os/src/app/components/scoreboard/scoreboard.component.ts

@@ -0,0 +1,89 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Observable, Subject, merge, switchMap, map, shareReplay, timer, takeUntil, finalize } from 'rxjs';
+import { SystemService } from 'src/app/services/system.service';
+import { LoadingService } from 'src/app/services/loading.service';
+import { LocalStorageService } from 'src/app/local-storage.service';
+import { ISystemScoreboardEntry } from 'src/models/ISystemScoreboard';
+
+const SWARM_SORTING = 'SCOREBOARD_SORTING';
+
+@Component({
+  selector: 'app-scoreboard',
+  templateUrl: './scoreboard.component.html',
+  styleUrls: ['./scoreboard.component.scss']
+})
+export class ScoreboardComponent implements OnInit, OnDestroy {
+  public scoreboard$: Observable<ISystemScoreboardEntry[]>;
+  public sortField: string = '';
+  public sortDirection: 'asc' | 'desc' = 'asc';
+
+  private refresh$ = new Subject<void>();
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private systemService: SystemService,
+    private loadingService: LoadingService,
+    private localStorageService: LocalStorageService,
+  ) {
+    const storedSorting = this.localStorageService.getObject(SWARM_SORTING) ?? {
+      sortField: 'rank',
+      sortDirection: 'asc'
+    };
+    this.sortField = storedSorting.sortField;
+    this.sortDirection = storedSorting.sortDirection;
+
+    this.scoreboard$ = merge(timer(0, 5000), this.refresh$).pipe(
+      switchMap(() => this.systemService.getScoreboard().pipe(
+        map(data => data.map((entry, index) => ({
+          ...entry,
+          rank: index,
+          since: (Date.now() / 1000) - entry.ntime
+        }))),
+        map(data => this.sortData(data, this.sortField, this.sortDirection)),
+        finalize(() => this.loadingService.loading$.next(false))
+      )),
+      shareReplay({refCount: true, bufferSize: 1}),
+      takeUntil(this.destroy$)
+    );
+  }
+
+  sortBy(field: string) {
+    this.sortDirection = this.sortField === field
+      ? this.sortDirection === 'asc' ? 'desc' : 'asc'
+      : 'asc';
+    this.sortField = field;
+
+    this.localStorageService.setObject(SWARM_SORTING, {
+      sortField: this.sortField,
+      sortDirection: this.sortDirection
+    });
+    this.refresh$.next();
+  }
+
+  private sortData(data: ISystemScoreboardEntry[], field: string, direction: 'asc' | 'desc'): ISystemScoreboardEntry[] {
+    if (!data || !field) {
+      return data;
+    }
+
+    return data.sort((a, b) => {
+      let valueA = a[field as keyof ISystemScoreboardEntry];
+      let valueB = b[field as keyof ISystemScoreboardEntry];
+
+      if (valueA < valueB) {
+        return direction === 'asc' ? -1 : 1;
+      } else if (valueA > valueB) {
+        return direction === 'asc' ? 1 : -1;
+      }
+      return 0;
+    });
+  }
+
+  ngOnInit() {
+    this.loadingService.loading$.next(true);
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}

main/http_server/axe-os/src/app/layout/app.menu.component.ts

@@ -25,6 +25,7 @@ export class AppMenuComponent implements OnInit {
         label: 'Menu',
         items: [
           { label: 'Dashboard', icon: 'pi pi-fw pi-home', routerLink: ['/'] },
+          { label: 'Scoreboard', icon: 'pi pi-fw pi-trophy', routerLink: ['scoreboard'] },
           { label: 'Swarm', icon: 'pi pi-fw pi-sitemap', routerLink: ['swarm'] },
           { label: 'Logs', icon: 'pi pi-fw pi-list', routerLink: ['logs'] },
           { label: 'System', icon: 'pi pi-fw pi-wave-pulse', routerLink: ['system'] },

main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts

@@ -41,12 +41,11 @@ export class DateAgoPipe implements PipeTransform {
             result += counter + ' ' + i + 's'; // plural (2 days ago)
             seconds -= intervals[i] * counter
           }
-          shownIntervals++;
         }
+        if (result) shownIntervals++;
       }
       return result;
     }
     return value;
   }
-
-}
+}

main/http_server/axe-os/src/app/services/system.service.ts

@@ -7,6 +7,7 @@ import { chartLabelValue } from 'src/models/enum/eChartLabel';
 import { ISystemInfo } from 'src/models/ISystemInfo';
 import { ISystemStatistics } from 'src/models/ISystemStatistics';
 import { ISystemASIC } from 'src/models/ISystemASIC';
+import { ISystemScoreboardEntry } from 'src/models/ISystemScoreboard';
 
 import { environment } from '../../environments/environment';
 
@@ -179,6 +180,35 @@ export class SystemService {
     });
   }
 
+  public getScoreboard(uri: string = ''): Observable<ISystemScoreboardEntry[]> {
+    if (environment.production) {
+      return this.httpClient.get(`${uri}/api/system/scoreboard`) as Observable<ISystemScoreboardEntry[]>;
+    }
+
+    // Mock data for development
+    return of([
+      {
+        rank: 0,
+        since: 3606,
+        difficulty: 2000,
+        job_id: "123456",
+        extranonce2: "000000",
+        ntime: 61125,
+        nonce: "00000000",
+        version_bits: "20000000"
+      },
+      {
+        rank: 1,
+        since: 3605,
+        difficulty: 1000,
+        job_id: "123457",
+        extranonce2: "000001",
+        ntime: 61126,
+        nonce: "00000001",
+        version_bits: "20000000"
+      }]).pipe(delay(1000));
+  }
+
   public restart(uri: string = '') {
     return this.httpClient.post(`${uri}/api/system/restart`, {}, {responseType: 'text'});
   }

main/http_server/axe-os/src/models/ISystemScoreboard.ts

@@ -0,0 +1,10 @@
+export interface ISystemScoreboardEntry {
+    rank: number;
+    since: number;
+    difficulty: number;
+    job_id: string;
+    extranonce2: string;
+    ntime: number;
+    nonce: string;
+    version_bits: string;
+}

main/http_server/axe-os/src/styles.scss

@@ -251,6 +251,11 @@ button.color-dot {
     }
 }
 
+.code {
+    line-break: anywhere;
+    font-family: 'Courier New', Courier, monospace;
+}
+
 .line-break-anywhere {
     line-break: anywhere;
-}
+}