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

tweaks

Browse Source
This commit is contained in:
Ben Wilson 2023-08-02 22:49:13 -04:00
parent 978fc7cd1a
commit a7ea61f28f
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/models/stratum-messages/SubscriptionMessage.ts
View File

@ -40,14 +40,14 @@ export class SubscriptionMessage extends StratumBaseMessage {
}
public static refineUserAgent(userAgent: string): string {
return userAgent;
// userAgent = userAgent.split(' ')[0].split('/')[0].split('V')[0];
// if (userAgent.includes('bosminer')) {
// userAgent = 'Braiins OS';
// } else if (userAgent.includes('cpuminer')) {
// userAgent = 'cpuminer';
// }
// return userAgent;
userAgent = userAgent.split(' ')[0].split('/')[0].split('V')[0];
if (userAgent.includes('bosminer')) {
userAgent = 'Braiins OS';
} else if (userAgent.includes('cpuminer')) {
userAgent = 'cpuminer';
}
return userAgent;
}
}

25
src/services/stratum-v1-jobs.service.ts
View File

@ -41,20 +41,21 @@ export class StratumV1JobsService {
constructor(
private readonly bitcoinRpcService: BitcoinRpcService
) {
this.currentBlockTemplate$ = this.bitcoinRpcService.newBlock$.pipe(
switchMap((miningInfo) => {
return from(this.bitcoinRpcService.getBlockTemplate())
.pipe(map(blockTemplate => { return { miningInfo, blockTemplate } }))
}
),
shareReplay({ refCount: true, bufferSize: 1 })
);
this.newMiningJob$ = combineLatest([this.currentBlockTemplate$, interval(60000).pipe(startWith(-1))]).pipe(
map(([{ blockTemplate }, interValCount]) => {
this.newMiningJob$ = combineLatest([this.bitcoinRpcService.newBlock$, interval(60000).pipe(startWith(-1))]).pipe(
switchMap(([miningInfo, interval]) => {
return from(this.bitcoinRpcService.getBlockTemplate()).pipe(map((blockTemplate) => {
return {
blockTemplate,
interval
}
}))
}),
map(({ blockTemplate, interval }) => {
let clearJobs = false;
if (this.lastIntervalCount === interValCount) {
if (this.lastIntervalCount === interval) {
clearJobs = true;
this.skipNext = true;
console.log('new block')
@ -65,7 +66,7 @@ export class StratumV1JobsService {
return null;
}
this.lastIntervalCount = interValCount;
this.lastIntervalCount = interval;
return {
version: blockTemplate.version,