Add scoreboard 🏆

components/stratum/include/stratum_api.h

@@ -91,9 +91,9 @@ int STRATUM_V1_suggest_difficulty(int socket, int send_uid, uint32_t difficulty)
 
 int STRATUM_V1_extranonce_subscribe(int socket, int send_uid);
 
-int STRATUM_V1_submit_share(int socket, int send_uid, const char *username, const char *jobid,
+int STRATUM_V1_submit_share(int socket, int id, const char *username, const char *job_id,
                             const char *extranonce_2, const uint32_t ntime, const uint32_t nonce,
-                            const uint32_t version);
+                            const uint32_t version_bits);
 
 double STRATUM_V1_get_response_time_ms(int request_id);
 

components/stratum/stratum_api.c

@@ -415,19 +415,21 @@ int STRATUM_V1_authorize(int socket, int send_uid, const char * username, const
 }
 
 /// @param socket Socket to write to
+/// @param id Message ID
 /// @param username The client’s user name.
-/// @param jobid The job ID for the work being submitted.
-/// @param ntime The hex-encoded time value use in the block header.
+/// @param job_id The job ID for the work being submitted.
 /// @param extranonce_2 The hex-encoded value of extra nonce 2.
+/// @param ntime The hex-encoded time value use in the block header.
 /// @param nonce The hex-encoded nonce value to use in the block header.
-int STRATUM_V1_submit_share(int socket, int send_uid, const char * username, const char * jobid,
+/// @param version_bits The hex-encoded version bits set by miner (BIP310).
+int STRATUM_V1_submit_share(int socket, int id, const char * username, const char * job_id,
                             const char * extranonce_2, const uint32_t ntime,
-                            const uint32_t nonce, const uint32_t version)
+                            const uint32_t nonce, const uint32_t version_bits)
 {
     char submit_msg[BUFFER_SIZE];
     sprintf(submit_msg,
             "{\"id\": %d, \"method\": \"mining.submit\", \"params\": [\"%s\", \"%s\", \"%s\", \"%08lx\", \"%08lx\", \"%08lx\"]}\n",
-            send_uid, username, jobid, extranonce_2, ntime, nonce, version);
+            id, username, job_id, extranonce_2, ntime, nonce, version_bits);
     debug_stratum_tx(submit_msg);
 
     return write(socket, submit_msg, strlen(submit_msg));

main/CMakeLists.txt

@@ -29,6 +29,7 @@ SRCS
     "./tasks/asic_result_task.c"
     "./tasks/power_management_task.c"
     "./tasks/statistics_task.c"
+    "./tasks/scoreboard.c"
     "./thermal/EMC2101.c"
     "./thermal/EMC2103.c"
     "./thermal/TMP1075.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
@@ -72,6 +73,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

@@ -21,12 +21,13 @@ 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';
 import { ANSIPipe } from './pipes/ansi.pipe';
 import { DateAgoPipe } from './pipes/date-ago.pipe';
-import { HashSuffixPipe } from './pipes/hash-suffix.pipe';
+import { SuffixPipe } from './pipes/suffix.pipe';
 import { PrimeNGModule } from './prime-ng.module';
 import { MessageModule } from 'primeng/message';
 import { TooltipModule } from 'primeng/tooltip';
@@ -55,8 +56,9 @@ const components = [
     ANSIPipe,
     DateAgoPipe,
     SwarmComponent,
+    ScoreboardComponent,
     SettingsComponent,
-    HashSuffixPipe,
+    SuffixPipe,
     ThemeConfigComponent,
     DesignComponent,
     PoolComponent,

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

@@ -30,7 +30,7 @@
                         <span class="block text-500 font-medium mb-3">Hashrate</span>
                         <div class="text-900 font-medium text-2xl flex align-items-center gap-2">
                             <span *ngIf="!info.power_fault">
-                                {{info.hashRate * 1000000000 | hashSuffix}}
+                                {{info.hashRate * 1000000000 | suffix}}H/s
                             </span>
                             <span *ngIf="info.power_fault" class="text-red-500">
                                 Not available - Power fault
@@ -42,12 +42,12 @@
                 <ng-container *ngIf="!info.power_fault">
                     Average:
                     <span class="text-green-500 font-medium">
-                        {{calculateAverage(hashrateData) | hashSuffix}}
+                        {{calculateAverage(hashrateData) | suffix}}H/s
                     </span>
                 </ng-container>
 
                 <div class="text-500 text-xs" *ngIf="!info.power_fault && info.expectedHashrate">
-                    Expected: {{info.expectedHashrate * 1000000000 | hashSuffix}}
+                    Expected: {{info.expectedHashrate * 1000000000 | suffix}}H/s
                 </div>
             </div>
         </div>

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

@@ -30,8 +30,3 @@
         flex-shrink: 0;
     }
 }
-
-.code {
-    line-break: anywhere;
-    font-family: 'Courier New', Courier, monospace;
-}

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

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { interval, map, Observable, shareReplay, startWith, switchMap, tap, first, Subject, takeUntil } from 'rxjs';
-import { HashSuffixPipe } from 'src/app/pipes/hash-suffix.pipe';
+import { SuffixPipe } from 'src/app/pipes/suffix.pipe';
 import { QuicklinkService } from 'src/app/services/quicklink.service';
 import { ShareRejectionExplanationService } from 'src/app/services/share-rejection-explanation.service';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -163,7 +163,7 @@ export class HomeComponent implements OnInit, OnDestroy {
               if (tooltipItem.dataset.label === 'ASIC Temp') {
                 label += tooltipItem.raw + ' °C';
               } else {
-                label += HashSuffixPipe.transform(tooltipItem.raw);
+                label += SuffixPipe.transform(tooltipItem.raw) + 'H/s';
               }
               return label;
             }
@@ -188,7 +188,7 @@ export class HomeComponent implements OnInit, OnDestroy {
         y: {
           ticks: {
             color: primaryColor,
-            callback: (value: number) => HashSuffixPipe.transform(value)
+            callback: (value: number) => SuffixPipe.transform(value) + 'H/s'
           },
           grid: {
             color: surfaceBorder,
@@ -318,7 +318,7 @@ export class HomeComponent implements OnInit, OnDestroy {
           [
             this.pageDefaultTitle,
             info.hostname,
-            (info.hashRate ? HashSuffixPipe.transform(info.hashRate * 1000000000) : false),
+            (info.hashRate ? SuffixPipe.transform(info.hashRate * 1000000000) + 'H/s' : false),
             (info.temp ? `${info.temp}${info.temp2 > -1 ? `/${info.temp2}` : ''}${info.vrTemp ? `/${info.vrTemp}` : ''} °C` : false),
             (!info.power_fault ? `${info.power} W` : false),
             (info.bestDiff ? info.bestDiff : false),

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

@@ -0,0 +1,36 @@
+<div class="card" *ngIf="scoreboard$ | async as scoreboard">
+    <h2>Scoreboard</h2>
+
+    <div class="card scoreboard-card">
+        <table class="scoreboard-table">
+            <thead>
+                <tr>
+                    <th>Rank</th>
+                    <th>Difficulty</th>
+                    <th>Job ID</th>
+                    <th>ExtraNonce2</th>
+                    <th>Time</th>
+                    <th>Nonce</th>
+                    <th>Version Bits</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr *ngFor="let entry of scoreboard; let i = index">
+                    <td class="trophy-column">
+                        <i class="pi pi-trophy" [ngClass]="{
+                            'gold': i === 0,
+                            'silver': i === 1,
+                            'bronze': i === 2
+                        }" *ngIf="i < 3"></i>
+                    </td>
+                    <td class="font-bold text-900">{{ entry.difficulty | suffix }}</td>
+                    <td class="code">{{ entry.job_id }}</td>
+                    <td class="code">{{ entry.extranonce2 }}</td>
+                    <td>{{ 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>
+</div>

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

@@ -0,0 +1,36 @@
+.scoreboard-card {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.scoreboard-table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.scoreboard-table th,
+.scoreboard-table td {
+    padding: 0.5rem;
+    text-align: left;
+}
+
+.scoreboard-table th {
+    font-weight: bold;
+}
+
+.trophy-column {
+    width: 50px;
+    text-align: center;
+}
+
+.pi-trophy.gold {
+    color: #FFD700;
+}
+
+.pi-trophy.silver {
+    color: #C0C0C0;
+}
+
+.pi-trophy.bronze {
+    color: #CD7F32;
+}

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,30 @@
+import { Component, OnDestroy } from '@angular/core';
+import { Observable, Subject, switchMap, shareReplay, timer, takeUntil } from 'rxjs';
+import { SystemService } from 'src/app/services/system.service';
+import { ISystemScoreboardEntry } from 'src/models/ISystemScoreboard';
+
+@Component({
+  selector: 'app-scoreboard',
+  templateUrl: './scoreboard.component.html',
+  styleUrls: ['./scoreboard.component.scss']
+})
+export class ScoreboardComponent implements OnDestroy {
+  public scoreboard$: Observable<ISystemScoreboardEntry[]>;
+
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private systemService: SystemService,
+  ) {
+    this.scoreboard$ = timer(0, 5000).pipe(
+      switchMap(() => this.systemService.getScoreboard()),
+      shareReplay({refCount: true, bufferSize: 1}),
+      takeUntil(this.destroy$)
+    );
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}

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

@@ -43,7 +43,7 @@
             },
             {
                 label: 'Total Hashrate',
-                value: totals.hashRate * 1000000000 | hashSuffix
+                value: (totals.hashRate * 1000000000 | suffix) + 'H/s'
             },
             {
                 label: 'Total Power',
@@ -128,7 +128,7 @@
                        tooltipPosition="top">{{axe.IP}}</a>
                 </td>
                 <td>{{axe.hostname}}</td>
-                <td>{{axe.hashRate * 1000000000 | hashSuffix}}</td>
+                <td>{{axe.hashRate * 1000000000 | suffix}}H/s</td>
                 <td>
                     <div class="w-min cursor-pointer"
                          pTooltip="Shares Accepted"

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

@@ -28,6 +28,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/suffix.pipe.spec.ts

@@ -0,0 +1,8 @@
+import { SuffixPipe } from './suffix.pipe';
+
+describe('SuffixPipe', () => {
+  it('create an instance', () => {
+    const pipe = new SuffixPipe();
+    expect(pipe).toBeTruthy();
+  });
+});

main/http_server/axe-os/src/app/pipes/hash-suffix.pipe.ts → main/http_server/axe-os/src/app/pipes/suffix.pipe.ts

@@ -1,11 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: 'hashSuffix'
+  name: 'suffix'
 })
-export class HashSuffixPipe implements PipeTransform {
+export class SuffixPipe implements PipeTransform {
 
-  private static _this = new HashSuffixPipe();
+  private static _this = new SuffixPipe();
 
   public static transform(value: number): string {
     return this._this.transform(value);
@@ -17,7 +17,7 @@ export class HashSuffixPipe implements PipeTransform {
       return '0';
     }
 
-    const suffixes = [' H/s', ' Kh/s', ' Mh/s', ' Gh/s', ' Th/s', ' Ph/s', ' Eh/s'];
+    const suffixes = [' ', ' k', ' M', ' G', ' T', ' P', ' E', ' Z', ' Y'];
 
     let power = Math.floor(Math.log10(value) / 3);
     if (power < 0) {
@@ -34,6 +34,4 @@ export class HashSuffixPipe implements PipeTransform {
 
     return scaledValue.toFixed(0) + suffix;
   }
-
-
 }