highperfocused/public-pool
1
0
Fork 0
mirror of https://github.com/benjamin-wilson/public-pool.git synced 2025-03-17 21:31:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed extra

Browse Source
This commit is contained in:
Ben Wilson 2023-07-12 20:24:04 -04:00
parent ebe45ef46f
commit 06e86953b6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/models/MiningJob.ts
View File

@ -50,8 +50,9 @@ export class MiningJob {
// 39th byte onwards: Optional data with no consensus meaning
coinbaseTransaction.ins[0].script = Buffer.concat([Buffer.from([littleEndianBlockHeight.byteLength]), littleEndianBlockHeight, Buffer.alloc(8, 0)]);
const extra = Buffer.from('\\public-pool\\');
coinbaseTransaction.addOutput(bitcoinjs.script.compile([bitcoinjs.opcodes.OP_RETURN, Buffer.concat([segwitMagicBits, this.block.witnessCommit, extra])]), 0);
//const extra = Buffer.from('\\public-pool\\');
//coinbaseTransaction.addOutput(bitcoinjs.script.compile([bitcoinjs.opcodes.OP_RETURN, Buffer.concat([segwitMagicBits, this.block.witnessCommit, extra])]), 0);
coinbaseTransaction.addOutput(bitcoinjs.script.compile([bitcoinjs.opcodes.OP_RETURN, Buffer.concat([segwitMagicBits, this.block.witnessCommit])]), 0);
// get the non-witness coinbase tx
//@ts-ignore

14
src/models/StratumV1Client.ts
View File

@ -353,9 +353,9 @@ export class StratumV1Client extends EasyUnsubscribe {
console.log(`DIFF: ${submissionDifficulty} of ${this.sessionDifficulty} from ${this.clientAuthorization.worker + '.' + this.extraNonce}`);
console.log(`Header: ${header.toString('hex')}`);
if (submissionDifficulty.gte(this.sessionDifficulty)) {
if (submissionDifficulty >= this.sessionDifficulty) {
if (submissionDifficulty.gte(job.networkDifficulty)) {
if (submissionDifficulty >= job.networkDifficulty) {
console.log('!!! BLOCK FOUND !!!');
const blockHex = updatedJobBlock.toHex(false);
const result = await this.bitcoinRpcService.SUBMIT_BLOCK(blockHex);
@ -373,9 +373,9 @@ export class StratumV1Client extends EasyUnsubscribe {
return false;
}
if (submissionDifficulty.gt(this.entity.bestDifficulty)) {
await this.clientService.updateBestDifficulty(this.extraNonce, submissionDifficulty.toNumber());
this.entity.bestDifficulty = submissionDifficulty.toNumber();
if (submissionDifficulty > this.entity.bestDifficulty) {
await this.clientService.updateBestDifficulty(this.extraNonce, submissionDifficulty);
this.entity.bestDifficulty = submissionDifficulty;
}
} else {
@ -418,7 +418,7 @@ export class StratumV1Client extends EasyUnsubscribe {
}
}
public calculateDifficulty(header: Buffer): { submissionDifficulty: Big, submissionHash: string } {
public calculateDifficulty(header: Buffer): { submissionDifficulty: number, submissionHash: string } {
const hashResult = bitcoinjs.crypto.hash256(header);
@ -426,7 +426,7 @@ export class StratumV1Client extends EasyUnsubscribe {
const truediffone = Big('26959535291011309493156476344723991336010898738574164086137773096960');
const difficulty = truediffone.div(s64.toString());
return { submissionDifficulty: difficulty, submissionHash: hashResult.toString('hex') };
return { submissionDifficulty: difficulty.toNumber(), submissionHash: hashResult.toString('hex') };
}