From 385f5c56ef90ecb54af3311f5aaf165f507f19b8 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Fri, 30 Jun 2023 09:06:39 -0400 Subject: [PATCH] update submitted ntime! --- src/models/MiningJob.ts | 6 ++++-- src/models/StratumV1Client.ts | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/models/MiningJob.ts b/src/models/MiningJob.ts index 6f3179d..041556a 100644 --- a/src/models/MiningJob.ts +++ b/src/models/MiningJob.ts @@ -76,7 +76,7 @@ export class MiningJob { } - public copyAndUpdateBlock(versionMaskString: number, nonce: number, extraNonce: string, extraNonce2: string): bitcoinjs.Block { + public copyAndUpdateBlock(versionMaskString: number, nonce: number, extraNonce: string, extraNonce2: string, timestamp: number): bitcoinjs.Block { const testBlock = bitcoinjs.Block.fromBuffer(this.block.toBuffer()); @@ -93,7 +93,9 @@ export class MiningJob { //@ts-ignore //recompute the root - testBlock.merkleRoot = this.calculateMerkleRootHash(testBlock.transactions[0].__toBuffer(), this.merkle_branch);; + testBlock.merkleRoot = this.calculateMerkleRootHash(testBlock.transactions[0].__toBuffer(), this.merkle_branch); + + testBlock.timestamp = timestamp return testBlock; } diff --git a/src/models/StratumV1Client.ts b/src/models/StratumV1Client.ts index 5cba2e8..935190f 100644 --- a/src/models/StratumV1Client.ts +++ b/src/models/StratumV1Client.ts @@ -299,7 +299,8 @@ export class StratumV1Client extends EasyUnsubscribe { parseInt(submission.versionMask, 16), parseInt(submission.nonce, 16), this.extraNonce, - submission.extraNonce2 + submission.extraNonce2, + parseInt(submission.ntime, 16) ); const submissionDifficulty = this.calculateDifficulty(updatedJobBlock.toBuffer(true)); @@ -308,7 +309,7 @@ export class StratumV1Client extends EasyUnsubscribe { if (submissionDifficulty >= this.sessionDifficulty) { if (submissionDifficulty >= (job.networkDifficulty / 2)) { - console.log('!!! BOCK FOUND !!!'); + console.log('!!! BLOCK FOUND !!!'); const blockHex = updatedJobBlock.toHex(false); this.bitcoinRpcService.SUBMIT_BLOCK(blockHex); }