gravatite/public-pool
1
0
Fork 0
mirror of https://github.com/benjamin-wilson/public-pool.git synced 2026-09-29 09:05:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use completed share rollups for pool accounting

Browse Source
This commit is contained in:
Ben
2026-06-08 18:17:49 -04:00
parent d847e2666a
commit 0acc1910db
2 changed files with 41 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ORM/share-accounting/share-accounting.service.spec.ts
+14 -23
View File
@@ -249,7 +249,7 @@ describe('ShareAccountingService', () => {
); );
}); });
it('should overlay live pool data and best share from the current round', async () => { it('should refresh pool summaries from completed rollup buckets and current round rollups', async () => {
const redis = { const redis = {
getJsonCache: jest.fn().mockResolvedValue(null), getJsonCache: jest.fn().mockResolvedValue(null),
setJsonCache: jest.fn().mockResolvedValue(undefined), setJsonCache: jest.fn().mockResolvedValue(undefined),
@@ -259,27 +259,19 @@ describe('ShareAccountingService', () => {
.mockResolvedValueOnce([{ .mockResolvedValueOnce([{
totalAcceptedShares: '3', totalAcceptedShares: '3',
totalCreditedDifficulty: '96', totalCreditedDifficulty: '96',
acceptedSharesLast10Minutes: '0', acceptedSharesLast10Minutes: '2',
creditedDifficultyLast10Minutes: '0', creditedDifficultyLast10Minutes: '64',
acceptedSharesLastHour: '3', acceptedSharesLastHour: '3',
creditedDifficultyLastHour: '96', creditedDifficultyLastHour: '96',
acceptedSharesLastDay: '3', acceptedSharesLastDay: '3',
creditedDifficultyLastDay: '96', creditedDifficultyLastDay: '96',
hashRateLast10Minutes: '0', hashRateLast10Minutes: '458129844.9',
hashRateLastHour: '114532461.2', hashRateLastHour: '114532461.2',
latestShareAt: new Date('2026-06-07T12:10:00Z'), latestShareAt: new Date('2026-06-07T12:10:00Z'),
}]) }])
.mockResolvedValueOnce([{
acceptedSharesLast10Minutes: '7',
creditedDifficultyLast10Minutes: '224',
hashRateLast10Minutes: '1603451170.77',
latestShareAt: new Date('2026-06-07T12:20:00Z'),
}])
.mockResolvedValueOnce([{ .mockResolvedValueOnce([{
bestSubmissionDifficulty: '4096', bestSubmissionDifficulty: '4096',
bestSubmissionDifficultyAt: new Date('2026-06-07T12:19:00Z'), bestSubmissionDifficultyAt: new Date('2026-06-07T12:10:00Z'),
}])
.mockResolvedValueOnce([{
currentRoundAcceptedShares: '11', currentRoundAcceptedShares: '11',
workSinceLastBlock: '352', workSinceLastBlock: '352',
currentRoundNetworkDifficulty: '1000', currentRoundNetworkDifficulty: '1000',
@@ -288,25 +280,24 @@ describe('ShareAccountingService', () => {
const service = new ShareAccountingService(repository as any, redis as any); const service = new ShareAccountingService(repository as any, redis as any);
await expect(service.refreshPoolSummary()).resolves.toEqual(expect.objectContaining({ await expect(service.refreshPoolSummary()).resolves.toEqual(expect.objectContaining({
acceptedSharesLast10Minutes: 7, acceptedSharesLast10Minutes: 2,
creditedDifficultyLast10Minutes: 224, creditedDifficultyLast10Minutes: 64,
hashRateLast10Minutes: 1603451170.77, hashRateLast10Minutes: 458129844.9,
bestSubmissionDifficulty: 4096, bestSubmissionDifficulty: 4096,
bestSubmissionDifficultyAt: '2026-06-07T12:19:00.000Z', bestSubmissionDifficultyAt: '2026-06-07T12:10:00.000Z',
workSinceLastBlock: 352, workSinceLastBlock: 352,
currentRoundAcceptedShares: 11, currentRoundAcceptedShares: 11,
currentRoundNetworkDifficulty: 1000, currentRoundNetworkDifficulty: 1000,
networkDifficultyPercent: 35.2, networkDifficultyPercent: 35.2,
latestShareAt: '2026-06-07T12:20:00.000Z', latestShareAt: '2026-06-07T12:10:00.000Z',
})); }));
expect(repository.query).toHaveBeenNthCalledWith( expect(repository.query).toHaveBeenNthCalledWith(
3, 2,
expect.stringContaining('WHERE "blockHeight" > latest_found_block."height"'),
);
expect(repository.query).toHaveBeenNthCalledWith(
4,
expect.stringContaining('FROM "accepted_share_block_10m"'), expect.stringContaining('FROM "accepted_share_block_10m"'),
); );
expect(repository.query).not.toHaveBeenCalledWith(
expect.stringContaining('FROM "accepted_share_entity"'),
);
}); });
it('should cache accounting summaries briefly to protect hot dashboard endpoints', async () => { it('should cache accounting summaries briefly to protect hot dashboard endpoints', async () => {
src/ORM/share-accounting/share-accounting.service.ts
+25 -39
View File
@@ -156,7 +156,7 @@ export class ShareAccountingService implements OnModuleDestroy {
} }
public async refreshPoolSummary(): Promise<ShareAccountingSummary> { public async refreshPoolSummary(): Promise<ShareAccountingSummary> {
const summary = await this.withPoolLiveOverlay(await this.getSummary({})); const summary = await this.withPoolRollupOverlay(await this.getSummary({}));
await this.redisMessagingService await this.redisMessagingService
?.setJsonCache(this.poolSummaryCacheKey, summary, 10 * 60 * 1000) ?.setJsonCache(this.poolSummaryCacheKey, summary, 10 * 60 * 1000)
.catch(error => { .catch(error => {
@@ -165,68 +165,52 @@ export class ShareAccountingService implements OnModuleDestroy {
return summary; return summary;
} }
private async withPoolLiveOverlay(summary: ShareAccountingSummary): Promise<ShareAccountingSummary> { private async withPoolRollupOverlay(summary: ShareAccountingSummary): Promise<ShareAccountingSummary> {
if (process.env.API_ONLY === 'true') { if (process.env.API_ONLY === 'true') {
return summary; return summary;
} }
const [[liveWindow], [bestDifficultyRow], [currentRoundRow]] = await Promise.all([ const [currentRoundRow] = await this.acceptedShareRepository.query(`
this.acceptedShareRepository.query(`
SELECT
COUNT(*)::int AS "acceptedSharesLast10Minutes",
COALESCE(SUM("creditedDifficulty"), 0)::float AS "creditedDifficultyLast10Minutes",
COALESCE((SUM("creditedDifficulty") * ${HASHES_PER_DIFFICULTY}) / 600, 0)::float AS "hashRateLast10Minutes",
MAX("acceptedAt") AS "latestShareAt"
FROM "accepted_share_entity"
WHERE "acceptedAt" > NOW() - INTERVAL '10 minutes'
`),
this.acceptedShareRepository.query(`
WITH latest_found_block AS ( WITH latest_found_block AS (
SELECT COALESCE(MAX("height"), 0) AS "height" SELECT COALESCE(MAX("height"), 0) AS "height"
FROM "blocks_entity" FROM "blocks_entity"
) ),
SELECT filtered_rows AS (
COALESCE("submissionDifficulty", 0)::float AS "bestSubmissionDifficulty", SELECT "accepted_share_block_10m".*
"acceptedAt" AS "bestSubmissionDifficultyAt" FROM "accepted_share_block_10m", latest_found_block
FROM "accepted_share_entity", latest_found_block
WHERE "blockHeight" > latest_found_block."height" WHERE "blockHeight" > latest_found_block."height"
ORDER BY "submissionDifficulty" DESC, "acceptedAt" DESC ),
best_share AS (
SELECT
"bestSubmissionDifficulty",
"bucket"
FROM filtered_rows
ORDER BY "bestSubmissionDifficulty" DESC, "bucket" DESC
LIMIT 1 LIMIT 1
`),
this.acceptedShareRepository.query(`
WITH latest_found_block AS (
SELECT COALESCE(MAX("height"), 0) AS "height"
FROM "blocks_entity"
) )
SELECT SELECT
COALESCE(SUM("acceptedCount"), 0)::int AS "currentRoundAcceptedShares", COALESCE(SUM("acceptedCount"), 0)::int AS "currentRoundAcceptedShares",
COALESCE(SUM("shares"), 0)::float AS "workSinceLastBlock", COALESCE(SUM("shares"), 0)::float AS "workSinceLastBlock",
COALESCE(MAX("networkDifficulty"), 0)::float AS "currentRoundNetworkDifficulty" COALESCE(MAX("networkDifficulty"), 0)::float AS "currentRoundNetworkDifficulty",
FROM "accepted_share_block_10m", latest_found_block COALESCE((SELECT "bestSubmissionDifficulty" FROM best_share), 0)::float AS "bestSubmissionDifficulty",
WHERE "blockHeight" > latest_found_block."height" (SELECT "bucket" FROM best_share) AS "bestSubmissionDifficultyAt"
`), FROM filtered_rows
]); `);
const currentRoundNetworkDifficulty = this.toNumber(currentRoundRow?.currentRoundNetworkDifficulty); const currentRoundNetworkDifficulty = this.toNumber(currentRoundRow?.currentRoundNetworkDifficulty);
const workSinceLastBlock = this.toNumber(currentRoundRow?.workSinceLastBlock); const workSinceLastBlock = this.toNumber(currentRoundRow?.workSinceLastBlock);
return { return {
...summary, ...summary,
acceptedSharesLast10Minutes: this.toNumber(liveWindow?.acceptedSharesLast10Minutes), bestSubmissionDifficulty: this.toNumber(currentRoundRow?.bestSubmissionDifficulty),
creditedDifficultyLast10Minutes: this.toNumber(liveWindow?.creditedDifficultyLast10Minutes), bestSubmissionDifficultyAt: currentRoundRow?.bestSubmissionDifficultyAt == null
hashRateLast10Minutes: this.toNumber(liveWindow?.hashRateLast10Minutes),
bestSubmissionDifficulty: this.toNumber(bestDifficultyRow?.bestSubmissionDifficulty),
bestSubmissionDifficultyAt: bestDifficultyRow?.bestSubmissionDifficultyAt == null
? null ? null
: new Date(bestDifficultyRow.bestSubmissionDifficultyAt).toISOString(), : new Date(currentRoundRow.bestSubmissionDifficultyAt).toISOString(),
workSinceLastBlock, workSinceLastBlock,
currentRoundAcceptedShares: this.toNumber(currentRoundRow?.currentRoundAcceptedShares), currentRoundAcceptedShares: this.toNumber(currentRoundRow?.currentRoundAcceptedShares),
currentRoundNetworkDifficulty, currentRoundNetworkDifficulty,
networkDifficultyPercent: currentRoundNetworkDifficulty > 0 networkDifficultyPercent: currentRoundNetworkDifficulty > 0
? this.roundPercent((workSinceLastBlock / currentRoundNetworkDifficulty) * 100) ? this.roundPercent((workSinceLastBlock / currentRoundNetworkDifficulty) * 100)
: 0, : 0,
latestShareAt: liveWindow?.latestShareAt == null
? summary.latestShareAt
: new Date(liveWindow.latestShareAt).toISOString(),
}; };
} }
@@ -365,7 +349,9 @@ export class ShareAccountingService implements OnModuleDestroy {
filtered_rows AS ( filtered_rows AS (
SELECT "accepted_share_10m".*, bounds."currentBucket", bounds."lastCompletedBucket" SELECT "accepted_share_10m".*, bounds."currentBucket", bounds."lastCompletedBucket"
FROM "accepted_share_10m", bounds FROM "accepted_share_10m", bounds
${whereSql} ${whereSql.length > 0
? `${whereSql} AND "accepted_share_10m"."bucket" < bounds."currentBucket"`
: `WHERE "accepted_share_10m"."bucket" < bounds."currentBucket"`}
) )
SELECT SELECT
COALESCE(SUM("acceptedCount"), 0)::int AS "totalAcceptedShares", COALESCE(SUM("acceptedCount"), 0)::int AS "totalAcceptedShares",