diff --git a/src/ORM/address-settings/address-settings.entity.ts b/src/ORM/address-settings/address-settings.entity.ts new file mode 100644 index 0000000..ec97b11 --- /dev/null +++ b/src/ORM/address-settings/address-settings.entity.ts @@ -0,0 +1,15 @@ +import { Column, Entity, PrimaryColumn } from 'typeorm'; + +import { TrackedEntity } from '../utils/TrackedEntity.entity'; + +@Entity() +export class AddressSettingsEntity extends TrackedEntity { + + @PrimaryColumn({ length: 62, type: 'varchar' }) + address: string; + + @Column() + miscCoinbaseScriptData: string; + +} + diff --git a/src/ORM/address-settings/address-settings.module.ts b/src/ORM/address-settings/address-settings.module.ts new file mode 100644 index 0000000..40d457d --- /dev/null +++ b/src/ORM/address-settings/address-settings.module.ts @@ -0,0 +1,15 @@ +import { Global, Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; + +import { AddressSettingsEntity } from './address-settings.entity'; +import { AddressSettingsService } from './address-settings.service'; + + + +@Global() +@Module({ + imports: [TypeOrmModule.forFeature([AddressSettingsEntity])], + providers: [AddressSettingsService], + exports: [TypeOrmModule, AddressSettingsService], +}) +export class AddressSettingsModule { } diff --git a/src/ORM/address-settings/address-settings.service.ts b/src/ORM/address-settings/address-settings.service.ts new file mode 100644 index 0000000..9640a4a --- /dev/null +++ b/src/ORM/address-settings/address-settings.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; + +import { AddressSettingsEntity } from './address-settings.entity'; + +@Injectable() +export class AddressSettingsService { + + constructor( + @InjectRepository(AddressSettingsEntity) + private addressSettingsRepository: Repository + ) { + + } + +} \ No newline at end of file diff --git a/src/app.controller.ts b/src/app.controller.ts index 093587c..a889df0 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -1,6 +1,5 @@ -import { Controller, Get, NotFoundException, Param } from '@nestjs/common'; +import { Controller, Get } from '@nestjs/common'; -import { ClientStatisticsService } from './ORM/client-statistics/client-statistics.service'; import { ClientService } from './ORM/client/client.service'; @@ -8,72 +7,12 @@ import { ClientService } from './ORM/client/client.service'; @Controller() export class AppController { constructor( - private readonly clientService: ClientService, - private readonly clientStatisticsService: ClientStatisticsService + private clientService: ClientService ) { } + @Get('info') + public info() { - @Get('client/:address') - async getClientInfo(@Param('address') address: string) { - - const workers = await this.clientService.getByAddress(address); - - const chartData = await this.clientStatisticsService.getChartDataForAddress(address); - - return { - workersCount: workers.length, - workers: await Promise.all( - workers.map(async (worker) => { - 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)), - startTime: worker.startTime - }; - }) - ), - chartData - } } - @Get('client/:address/:workerName') - async getWorkerGroupInfo(@Param('address') address: string, @Param('workerName') workerName: string) { - - const workers = await this.clientService.getByName(address, workerName); - - const bestDifficulty = workers.reduce((pre, cur, idx, arr) => { - if (cur.bestDifficulty > pre) { - return cur.bestDifficulty; - } - return pre; - }, 0); - - const chartData = await this.clientStatisticsService.getChartDataForGroup(address, workerName); - return { - - name: workerName, - bestDifficulty: Math.floor(bestDifficulty), - chartData: chartData, - - } - } - - @Get('client/:address/:workerName/:sessionId') - async getWorkerInfo(@Param('address') address: string, @Param('workerName') workerName: string, @Param('sessionId') sessionId: string) { - - const worker = await this.clientService.getBySessionId(address, workerName, sessionId); - if (worker == null) { - return new NotFoundException(); - } - const chartData = await this.clientStatisticsService.getChartDataForSession(worker.address, worker.clientName, worker.sessionId); - - return { - sessionId: worker.sessionId, - name: worker.clientName, - bestDifficulty: Math.floor(worker.bestDifficulty), - chartData: chartData, - startTime: worker.startTime - } - } } diff --git a/src/app.module.ts b/src/app.module.ts index 675e6bd..c113952 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -4,6 +4,9 @@ import { ScheduleModule } from '@nestjs/schedule'; import { TypeOrmModule } from '@nestjs/typeorm'; import { AppController } from './app.controller'; +import { AddressController } from './controllers/address/address.controller'; +import { ClientController } from './controllers/client/client.controller'; +import { AddressSettingsModule } from './ORM/address-settings/address-settings.module'; import { ClientStatisticsModule } from './ORM/client-statistics/client-statistics.module'; import { ClientModule } from './ORM/client/client.module'; import { BitcoinRpcService } from './services/bitcoin-rpc.service'; @@ -11,10 +14,10 @@ import { BlockTemplateService } from './services/block-template.service'; import { CleanupService } from './services/cleanup.service'; import { StratumV1Service } from './services/stratum-v1.service'; - const ORMModules = [ ClientStatisticsModule, - ClientModule + ClientModule, + AddressSettingsModule ] @Module({ @@ -30,7 +33,11 @@ const ORMModules = [ ScheduleModule.forRoot(), ...ORMModules ], - controllers: [AppController], + controllers: [ + AppController, + ClientController, + AddressController + ], providers: [ CleanupService, diff --git a/src/controllers/address/address.controller.spec.ts b/src/controllers/address/address.controller.spec.ts new file mode 100644 index 0000000..a57fd7a --- /dev/null +++ b/src/controllers/address/address.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { AddressController } from './address.controller'; + +describe('AddressController', () => { + let controller: AddressController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [AddressController], + }).compile(); + + controller = module.get(AddressController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/controllers/address/address.controller.ts b/src/controllers/address/address.controller.ts new file mode 100644 index 0000000..b262f79 --- /dev/null +++ b/src/controllers/address/address.controller.ts @@ -0,0 +1,4 @@ +import { Controller } from '@nestjs/common'; + +@Controller('address') +export class AddressController {} diff --git a/src/controllers/client/client.controller.spec.ts b/src/controllers/client/client.controller.spec.ts new file mode 100644 index 0000000..a4174cf --- /dev/null +++ b/src/controllers/client/client.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { ClientController } from './client.controller'; + +describe('ClientController', () => { + let controller: ClientController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [ClientController], + }).compile(); + + controller = module.get(ClientController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/controllers/client/client.controller.ts b/src/controllers/client/client.controller.ts new file mode 100644 index 0000000..95490cf --- /dev/null +++ b/src/controllers/client/client.controller.ts @@ -0,0 +1,77 @@ +import { Controller, Get, NotFoundException, Param } from '@nestjs/common'; +import { ClientStatisticsService } from 'src/ORM/client-statistics/client-statistics.service'; +import { ClientService } from 'src/ORM/client/client.service'; + +@Controller('client') +export class ClientController { + + constructor( + private readonly clientService: ClientService, + private readonly clientStatisticsService: ClientStatisticsService + ) { } + + + @Get(':address') + async getClientInfo(@Param('address') address: string) { + + const workers = await this.clientService.getByAddress(address); + + const chartData = await this.clientStatisticsService.getChartDataForAddress(address); + + return { + workersCount: workers.length, + workers: await Promise.all( + workers.map(async (worker) => { + 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)), + startTime: worker.startTime + }; + }) + ), + chartData + } + } + + @Get(':address/:workerName') + async getWorkerGroupInfo(@Param('address') address: string, @Param('workerName') workerName: string) { + + const workers = await this.clientService.getByName(address, workerName); + + const bestDifficulty = workers.reduce((pre, cur, idx, arr) => { + if (cur.bestDifficulty > pre) { + return cur.bestDifficulty; + } + return pre; + }, 0); + + const chartData = await this.clientStatisticsService.getChartDataForGroup(address, workerName); + return { + + name: workerName, + bestDifficulty: Math.floor(bestDifficulty), + chartData: chartData, + + } + } + + @Get(':address/:workerName/:sessionId') + async getWorkerInfo(@Param('address') address: string, @Param('workerName') workerName: string, @Param('sessionId') sessionId: string) { + + const worker = await this.clientService.getBySessionId(address, workerName, sessionId); + if (worker == null) { + return new NotFoundException(); + } + const chartData = await this.clientStatisticsService.getChartDataForSession(worker.address, worker.clientName, worker.sessionId); + + return { + sessionId: worker.sessionId, + name: worker.clientName, + bestDifficulty: Math.floor(worker.bestDifficulty), + chartData: chartData, + startTime: worker.startTime + } + } +} diff --git a/src/models/MiningJob.ts b/src/models/MiningJob.ts index a7160db..c94c11d 100644 --- a/src/models/MiningJob.ts +++ b/src/models/MiningJob.ts @@ -79,7 +79,7 @@ export class MiningJob { const merkleBranches: Buffer[] = merkleProof(merkleTree, transactionBuffers[0]).filter(h => h != null); this.block.merkleRoot = merkleBranches.pop(); - this.merkle_branch = merkleBranches.map(b => b.toString('hex')) + this.merkle_branch = merkleBranches.slice(1, merkleBranches.length).map(b => b.toString('hex')) this.block.transactions[0] = coinbaseTransaction; @@ -101,22 +101,19 @@ export class MiningJob { testBlock.transactions[0].ins[0].script = Buffer.from(`${nonceFreeScript.substring(0, nonceFreeScript.length - 16)}${extraNonce}${extraNonce2}`, 'hex'); - //@ts-ignore - //recompute the root - testBlock.merkleRoot = this.calculateMerkleRootHash(testBlock.transactions[0].__toBuffer(), this.merkle_branch); + //recompute the roots + testBlock.merkleRoot = this.calculateMerkleRootHash(testBlock.transactions[0].getHash(false), this.merkle_branch); + testBlock.witnessCommit = bitcoinjs.Block.calculateMerkleRoot(this.block.transactions, true); - testBlock.timestamp = timestamp + testBlock.timestamp = timestamp; return testBlock; } - private calculateMerkleRootHash(coinbaseTx: string, merkleBranches: string[]): Buffer { - - let coinbaseTxBuf = Buffer.from(coinbaseTx, 'hex'); + private calculateMerkleRootHash(newRoot: Buffer, merkleBranches: string[]): Buffer { const bothMerkles = Buffer.alloc(64); - let test = this.sha256(coinbaseTxBuf) - let newRoot = this.sha256(test); + bothMerkles.set(newRoot); for (let i = 0; i < merkleBranches.length; i++) { diff --git a/src/models/StratumV1Client.ts b/src/models/StratumV1Client.ts index f8c170b..dfae9bd 100644 --- a/src/models/StratumV1Client.ts +++ b/src/models/StratumV1Client.ts @@ -306,7 +306,7 @@ export class StratumV1Client extends EasyUnsubscribe { const job = new MiningJob(this.stratumV1JobsService.getNextId(), payoutInformation, blockTemplate, clearJobs); this.stratumV1JobsService.addJob(job, clearJobs); - ; + await this.promiseSocket.write(job.response());