From 7b5a0756a276176a23c63e5d01c9574a108e8bd4 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Fri, 21 Jul 2023 23:22:05 -0400 Subject: [PATCH] nerdminer stuff --- src/controllers/client/client.controller.ts | 4 ++-- src/models/StratumV1Client.ts | 10 +++++----- src/models/StratumV1ClientStatistics.ts | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controllers/client/client.controller.ts b/src/controllers/client/client.controller.ts index 387f844..9b64132 100644 --- a/src/controllers/client/client.controller.ts +++ b/src/controllers/client/client.controller.ts @@ -27,8 +27,8 @@ export class ClientController { return { sessionId: worker.sessionId, name: worker.clientName, - bestDifficulty: Math.floor(worker.bestDifficulty), - hashRate: Math.floor(await this.clientStatisticsService.getHashRateForSession(worker.address, worker.clientName, worker.sessionId)), + bestDifficulty: worker.bestDifficulty.toFixed(2), + hashRate: (await this.clientStatisticsService.getHashRateForSession(worker.address, worker.clientName, worker.sessionId)).toFixed(2), startTime: worker.startTime }; }) diff --git a/src/models/StratumV1Client.ts b/src/models/StratumV1Client.ts index 1e41b3d..088dba0 100644 --- a/src/models/StratumV1Client.ts +++ b/src/models/StratumV1Client.ts @@ -90,7 +90,7 @@ export class StratumV1Client extends EasyUnsubscribe { parsedMessage = JSON.parse(message); } catch (e) { console.log("Invalid JSON"); - this.promiseSocket.end(); + await this.promiseSocket.end(); return; } @@ -282,7 +282,7 @@ export class StratumV1Client extends EasyUnsubscribe { await this.checkDifficulty(); - // await this.watchdog(); + await this.watchdog(); }) } @@ -295,10 +295,10 @@ export class StratumV1Client extends EasyUnsubscribe { } const now = Date.now(); const diffSeconds = (now - time.getTime()) / 1000; - // two minutes - if (diffSeconds > 120) { + // five minutes + if (diffSeconds > 60 * 5) { console.log('Watchdog ending session'); - this.promiseSocket.end(); + await this.promiseSocket.end(); } } diff --git a/src/models/StratumV1ClientStatistics.ts b/src/models/StratumV1ClientStatistics.ts index 9180323..b7032a9 100644 --- a/src/models/StratumV1ClientStatistics.ts +++ b/src/models/StratumV1ClientStatistics.ts @@ -3,7 +3,7 @@ import { ClientEntity } from '../ORM/client/client.entity'; const CACHE_SIZE = 30; const TARGET_SUBMISSION_PER_SECOND = 10; -const MIN_DIFF = 1e-9; +const MIN_DIFF = 0.000001; export class StratumV1ClientStatistics { private submissionCacheStart: Date;