diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index 179c56110..931c9ec6d 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -6,7 +6,7 @@ import logger from '../logger'; const sleep = (ms: number) => new Promise(res => setTimeout(res, ms)); class DatabaseMigration { - private static currentVersion = 7; + private static currentVersion = 8; private queryTimeout = 120000; private statisticsAddedIndexed = false; @@ -122,6 +122,14 @@ class DatabaseMigration { await this.$executeQuery(connection, this.getCreateDailyStatsTableQuery(), await this.$checkIfTableExists('hashrates')); } + if (databaseSchemaVersion < 8 && isBitcoin === true) { + await this.$executeQuery(connection, 'TRUNCATE hashrates;'); + await this.$executeQuery(connection, 'ALTER TABLE `hashrates` DROP INDEX `PRIMARY`'); + await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD `id` int NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'); + await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD `share` float NOT NULL DEFAULT "0"'); + await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD `type` enum("daily", "weekly") DEFAULT "daily"'); + } + connection.release(); } catch (e) { connection.release(); diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index edd782e0c..c0970bf24 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -83,8 +83,15 @@ class Mining { /** * Return the historical hashrates and oldest indexed block timestamp */ - public async $getHistoricalHashrates(interval: string | null): Promise { - return await HashratesRepository.$get(interval); + public async $getNetworkHistoricalHashrates(interval: string | null): Promise { + return await HashratesRepository.$getNetworkDailyHashrate(interval); + } + + /** + * Return the historical hashrates and oldest indexed block timestamp for one or all pools + */ + public async $getPoolsHistoricalHashrates(interval: string | null, poolId: number): Promise { + return await HashratesRepository.$getPoolsWeeklyHashrate(interval); } /** @@ -106,7 +113,7 @@ class Mining { logger.info(`Indexing hashrates`); const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; - const indexedTimestamp = (await HashratesRepository.$get(null)).map(hashrate => hashrate.timestamp); + const indexedTimestamp = (await HashratesRepository.$getNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp); let startedAt = new Date().getTime() / 1000; const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f const lastMidnight = new Date(); @@ -135,27 +142,50 @@ class Mining { lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, blockStats.lastBlockHeight); - const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); - if (elapsedSeconds > 10) { - const daysPerSeconds = Math.max(1, Math.round(indexedThisRun / elapsedSeconds)); - const formattedDate = new Date(fromTimestamp * 1000).toUTCString(); - const daysLeft = Math.round(totalDayIndexed - totalIndexed); - logger.debug(`Getting hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`); - startedAt = new Date().getTime() / 1000; - indexedThisRun = 0; + if (totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate + logger.debug("Indexing weekly hashrates for mining pools"); + let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp - 604800, fromTimestamp); + const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0); + pools = pools.map((pool: any) => { + pool.hashrate = (pool.blockCount / totalBlocks) * lastBlockHashrate; + pool.share = (pool.blockCount / totalBlocks); + return pool; + }); + + for (const pool of pools) { + hashrates.push({ + hashrateTimestamp: fromTimestamp + 1, + avgHashrate: pool['hashrate'], + poolId: pool.poolId, + share: pool['share'], + type: 'weekly', + }); + } } hashrates.push({ hashrateTimestamp: fromTimestamp, avgHashrate: lastBlockHashrate, poolId: null, + share: 1, + type: 'daily', }); - if (hashrates.length > 100) { + if (hashrates.length > 10) { await HashratesRepository.$saveHashrates(hashrates); hashrates.length = 0; } + const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); + if (elapsedSeconds > 5) { + const daysPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2); + const formattedDate = new Date(fromTimestamp * 1000).toUTCString(); + const daysLeft = Math.round(totalDayIndexed - totalIndexed); + logger.debug(`Getting hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`); + startedAt = new Date().getTime() / 1000; + indexedThisRun = 0; + } + toTimestamp -= 86400; ++indexedThisRun; ++totalIndexed; @@ -166,7 +196,8 @@ class Mining { hashrates.push({ hashrateTimestamp: genesisTimestamp, avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1), - poolId: null + poolId: null, + type: 'daily', }); } diff --git a/backend/src/index.ts b/backend/src/index.ts index 65d453859..5702ee032 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -297,8 +297,11 @@ class Server { .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pool/:poolId/:interval', routes.$getPool) .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty', routes.$getHistoricalDifficulty) .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty/:interval', routes.$getHistoricalDifficulty) + .get(config.MEMPOOL.API_URL_PREFIX + 'mining/hashrate/pools', routes.$getPoolsHistoricalHashrate) + .get(config.MEMPOOL.API_URL_PREFIX + 'mining/hashrate/pools/:interval', routes.$getPoolsHistoricalHashrate) .get(config.MEMPOOL.API_URL_PREFIX + 'mining/hashrate', routes.$getHistoricalHashrate) - .get(config.MEMPOOL.API_URL_PREFIX + 'mining/hashrate/:interval', routes.$getHistoricalHashrate); + .get(config.MEMPOOL.API_URL_PREFIX + 'mining/hashrate/:interval', routes.$getHistoricalHashrate) + ; } if (config.BISQ.ENABLED) { diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index a2b0b2f95..d91777880 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -173,7 +173,7 @@ class BlocksRepository { } else { query += ` WHERE`; } - query += ` UNIX_TIMESTAMP(blockTimestamp) BETWEEN '${from}' AND '${to}'`; + query += ` blockTimestamp BETWEEN FROM_UNIXTIME('${from}') AND FROM_UNIXTIME('${to}')`; // logger.debug(query); const connection = await DB.pool.getConnection(); @@ -300,6 +300,10 @@ class BlocksRepository { const [rows]: any[] = await connection.query(query); connection.release(); + for (let row of rows) { + delete row['rn']; + } + return rows; } diff --git a/backend/src/repositories/HashratesRepository.ts b/backend/src/repositories/HashratesRepository.ts index fd4340d4e..d11c444d5 100644 --- a/backend/src/repositories/HashratesRepository.ts +++ b/backend/src/repositories/HashratesRepository.ts @@ -1,6 +1,7 @@ import { Common } from '../api/common'; import { DB } from '../database'; import logger from '../logger'; +import PoolsRepository from './PoolsRepository'; class HashratesRepository { /** @@ -8,10 +9,10 @@ class HashratesRepository { */ public async $saveHashrates(hashrates: any) { let query = `INSERT INTO - hashrates(hashrate_timestamp, avg_hashrate, pool_id) VALUES`; + hashrates(hashrate_timestamp, avg_hashrate, pool_id, share, type) VALUES`; for (const hashrate of hashrates) { - query += ` (FROM_UNIXTIME(${hashrate.hashrateTimestamp}), ${hashrate.avgHashrate}, ${hashrate.poolId}),`; + query += ` (FROM_UNIXTIME(${hashrate.hashrateTimestamp}), ${hashrate.avgHashrate}, ${hashrate.poolId}, ${hashrate.share}, "${hashrate.type}"),`; } query = query.slice(0, -1); @@ -26,10 +27,7 @@ class HashratesRepository { connection.release(); } - /** - * Returns an array of all timestamp we've already indexed - */ - public async $get(interval: string | null): Promise { + public async $getNetworkDailyHashrate(interval: string | null): Promise { interval = Common.getSqlInterval(interval); const connection = await DB.pool.getConnection(); @@ -38,7 +36,12 @@ class HashratesRepository { FROM hashrates`; if (interval) { - query += ` WHERE hashrate_timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`; + query += ` WHERE hashrate_timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() + AND hashrates.type = 'daily' + AND pool_id IS NULL`; + } else { + query += ` WHERE hashrates.type = 'daily' + AND pool_id IS NULL`; } query += ` ORDER by hashrate_timestamp`; @@ -49,6 +52,38 @@ class HashratesRepository { return rows; } + /** + * Returns the current biggest pool hashrate history + */ + public async $getPoolsWeeklyHashrate(interval: string | null): Promise { + interval = Common.getSqlInterval(interval); + + const connection = await DB.pool.getConnection(); + const topPoolsId = (await PoolsRepository.$getPoolsInfo('1w')).map((pool) => pool.poolId); + + let query = `SELECT UNIX_TIMESTAMP(hashrate_timestamp) as timestamp, avg_hashrate as avgHashrate, share, pools.name as poolName + FROM hashrates + JOIN pools on pools.id = pool_id`; + + if (interval) { + query += ` WHERE hashrate_timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() + AND hashrates.type = 'weekly' + AND pool_id IN (${topPoolsId})`; + } else { + query += ` WHERE hashrates.type = 'weekly' + AND pool_id IN (${topPoolsId})`; + } + + query += ` ORDER by hashrate_timestamp, FIELD(pool_id, ${topPoolsId})`; + + console.log(query); + + const [rows]: any[] = await connection.query(query); + connection.release(); + + return rows; + } + public async $setLatestRunTimestamp() { const connection = await DB.pool.getConnection(); const query = `UPDATE state SET number = ? WHERE name = 'last_hashrates_indexing'`; diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts index a7b716da7..ea617322a 100644 --- a/backend/src/repositories/PoolsRepository.ts +++ b/backend/src/repositories/PoolsRepository.ts @@ -49,6 +49,22 @@ class PoolsRepository { return rows; } + /** + * Get basic pool info and block count between two timestamp + */ + public async $getPoolsInfoBetween(from: number, to: number): Promise { + let query = `SELECT COUNT(height) as blockCount, pools.id as poolId, pools.name as poolName + FROM pools + LEFT JOIN blocks on pools.id = blocks.pool_id AND blocks.blockTimestamp BETWEEN FROM_UNIXTIME(?) AND FROM_UNIXTIME(?) + GROUP BY pools.id`; + + const connection = await DB.pool.getConnection(); + const [rows] = await connection.query(query, [from, to]); + connection.release(); + + return rows; + } + /** * Get mining pool statistics for one pool */ diff --git a/backend/src/routes.ts b/backend/src/routes.ts index 7fba2e66b..dea9da2f2 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -586,9 +586,25 @@ class Routes { } } + public async $getPoolsHistoricalHashrate(req: Request, res: Response) { + try { + const hashrates = await mining.$getPoolsHistoricalHashrates(req.params.interval ?? null, parseInt(req.params.poolId, 10)); + const oldestIndexedBlockTimestamp = await BlocksRepository.$oldestBlockTimestamp(); + res.header('Pragma', 'public'); + res.header('Cache-control', 'public'); + res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString()); + res.json({ + oldestIndexedBlockTimestamp: oldestIndexedBlockTimestamp, + hashrates: hashrates, + }); + } catch (e) { + res.status(500).send(e instanceof Error ? e.message : e); + } + } + public async $getHistoricalHashrate(req: Request, res: Response) { try { - const hashrates = await mining.$getHistoricalHashrates(req.params.interval ?? null); + const hashrates = await mining.$getNetworkHistoricalHashrates(req.params.interval ?? null); const difficulty = await mining.$getHistoricalDifficulty(req.params.interval ?? null); const oldestIndexedBlockTimestamp = await BlocksRepository.$oldestBlockTimestamp(); res.header('Pragma', 'public'); diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index bd7d2d516..19285fc8f 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -29,6 +29,7 @@ import { AssetsComponent } from './components/assets/assets.component'; import { PoolComponent } from './components/pool/pool.component'; import { MiningDashboardComponent } from './components/mining-dashboard/mining-dashboard.component'; import { HashrateChartComponent } from './components/hashrate-chart/hashrate-chart.component'; +import { HashrateChartPoolsComponent } from './components/hashrates-chart-pools/hashrate-chart-pools.component'; import { MiningStartComponent } from './components/mining-start/mining-start.component'; let routes: Routes = [ @@ -78,6 +79,10 @@ let routes: Routes = [ path: 'hashrate', component: HashrateChartComponent, }, + { + path: 'hashrate/pools', + component: HashrateChartPoolsComponent, + }, { path: 'pools', component: PoolRankingComponent, @@ -89,10 +94,6 @@ let routes: Routes = [ path: ':poolId', component: PoolComponent, }, - { - path: ':poolId/hashrate', - component: HashrateChartComponent, - }, ] }, ] @@ -193,6 +194,10 @@ let routes: Routes = [ path: 'hashrate', component: HashrateChartComponent, }, + { + path: 'hashrate/pools', + component: HashrateChartPoolsComponent, + }, { path: 'pools', component: PoolRankingComponent, @@ -204,10 +209,6 @@ let routes: Routes = [ path: ':poolId', component: PoolComponent, }, - { - path: ':poolId/hashrate', - component: HashrateChartComponent, - }, ] }, ] @@ -302,6 +303,10 @@ let routes: Routes = [ path: 'hashrate', component: HashrateChartComponent, }, + { + path: 'hashrate/pools', + component: HashrateChartPoolsComponent, + }, { path: 'pools', component: PoolRankingComponent, @@ -313,10 +318,6 @@ let routes: Routes = [ path: ':poolId', component: PoolComponent, }, - { - path: ':poolId/hashrate', - component: HashrateChartComponent, - }, ] }, ] diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts index dc89748ad..1dfdce00e 100644 --- a/frontend/src/app/app.constants.ts +++ b/frontend/src/app/app.constants.ts @@ -71,7 +71,23 @@ export const chartColors = [ "#263238", ]; -export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200, +export const poolsColor = { + 'foundryusa': '#D81B60', + 'antpool': '#8E24AA', + 'f2pool': '#5E35B1', + 'poolin': '#3949AB', + 'binancepool': '#1E88E5', + 'viabtc': '#039BE5', + 'btccom': '#00ACC1', + 'slushpool': '#00897B', + 'sbicrypto': '#43A047', + 'marapool': '#7CB342', + 'luxor': '#C0CA33', + 'unknown': '#FDD835', + 'okkong': '#FFB300', +} + + export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200, 250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000]; export interface Language { diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index c161e24dc..956990f94 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -71,6 +71,7 @@ import { AssetGroupComponent } from './components/assets/asset-group/asset-group import { AssetCirculationComponent } from './components/asset-circulation/asset-circulation.component'; import { MiningDashboardComponent } from './components/mining-dashboard/mining-dashboard.component'; import { HashrateChartComponent } from './components/hashrate-chart/hashrate-chart.component'; +import { HashrateChartPoolsComponent } from './components/hashrates-chart-pools/hashrate-chart-pools.component'; import { MiningStartComponent } from './components/mining-start/mining-start.component'; import { AmountShortenerPipe } from './shared/pipes/amount-shortener.pipe'; @@ -126,6 +127,7 @@ import { AmountShortenerPipe } from './shared/pipes/amount-shortener.pipe'; AssetCirculationComponent, MiningDashboardComponent, HashrateChartComponent, + HashrateChartPoolsComponent, MiningStartComponent, AmountShortenerPipe, ], diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html index f4b8b8b2a..ea5c5a2a7 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html @@ -1,6 +1,6 @@
-
+
+ +
+
+
+
+ + Pools Hashrate Share (1y) + +
+ +
+
+
+
\ No newline at end of file diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index cf0ebd414..5548780b1 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -163,4 +163,11 @@ export class ApiService { (interval !== undefined ? `/${interval}` : '') ); } + + getHistoricalPoolsHashrate$(interval: string | undefined): Observable { + return this.httpClient.get( + this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/hashrate/pools` + + (interval !== undefined ? `/${interval}` : '') + ); + } }