From 7902f68adabb26cc7722d5e0c2f938b55d5df9d0 Mon Sep 17 00:00:00 2001 From: Antoni Spaanderman <56turtle56@gmail.com> Date: Mon, 24 Jan 2022 21:35:13 +0100 Subject: [PATCH 01/37] fix 0 sat/vB not displaying --- .../transactions-list/transactions-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 6eb262377..dec95dd36 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -237,7 +237,7 @@
-
+
{{ tx.fee / (tx.weight / 4) | feeRounding }} sat/vB  – {{ tx.fee | number }} sat
From 056a31fc793562a54dc980da9a215411f4043ebb Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 27 Feb 2022 15:54:18 +0300 Subject: [PATCH 02/37] Only return unique address prefix autocomplete fixes #1290 --- backend/src/api/bitcoin/bitcoin-api.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index 9950cdcb3..e6d74ddf0 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -84,19 +84,19 @@ class BitcoinApi implements AbstractBitcoinApi { } $getAddressPrefix(prefix: string): string[] { - const found: string[] = []; + const found: { [address: string]: string } = {}; const mp = mempool.getMempool(); for (const tx in mp) { for (const vout of mp[tx].vout) { if (vout.scriptpubkey_address.indexOf(prefix) === 0) { - found.push(vout.scriptpubkey_address); - if (found.length >= 10) { - return found; + found[vout.scriptpubkey_address] = ''; + if (Object.keys(found).length >= 10) { + return Object.keys(found); } } } } - return found; + return Object.keys(found); } $sendRawTransaction(rawTransaction: string): Promise { From e5b2440b450484be4bdca5929a59eaa2be013617 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 27 Feb 2022 18:53:16 +0300 Subject: [PATCH 03/37] Shorten address search with middle ellipsis --- frontend/src/app/app.module.ts | 2 ++ .../search-form/search-form.component.html | 2 +- .../search-form/search-form.component.scss | 13 ++++++++----- .../components/search-form/search-form.component.ts | 4 ++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 956990f94..dfb64c4bd 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -74,6 +74,7 @@ import { HashrateChartComponent } from './components/hashrate-chart/hashrate-cha 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'; +import { ShortenStringPipe } from './shared/pipes/shorten-string-pipe/shorten-string.pipe'; @NgModule({ declarations: [ @@ -154,6 +155,7 @@ import { AmountShortenerPipe } from './shared/pipes/amount-shortener.pipe'; SeoService, StorageService, LanguageService, + ShortenStringPipe, { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true } ], bootstrap: [AppComponent] diff --git a/frontend/src/app/components/search-form/search-form.component.html b/frontend/src/app/components/search-form/search-form.component.html index f3c70d40b..422dfaa62 100644 --- a/frontend/src/app/components/search-form/search-form.component.html +++ b/frontend/src/app/components/search-form/search-form.component.html @@ -1,7 +1,7 @@
- +
diff --git a/frontend/src/app/components/search-form/search-form.component.scss b/frontend/src/app/components/search-form/search-form.component.scss index 5a72339a3..a2221757f 100644 --- a/frontend/src/app/components/search-form/search-form.component.scss +++ b/frontend/src/app/components/search-form/search-form.component.scss @@ -1,8 +1,11 @@ -:host ::ng-deep .dropdown-item { - white-space: nowrap; - overflow: hidden; - width: 375px; - text-overflow: ellipsis; +:host ::ng-deep { + .dropdown-item { + white-space: nowrap; + width: 410px; + } + .dropdown-menu { + width: 410px; + } } form { diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index 24e8a5b23..be0bead13 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -8,6 +8,7 @@ import { debounceTime, distinctUntilChanged, switchMap, filter, catchError, map import { ElectrsApiService } from 'src/app/services/electrs-api.service'; import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe'; +import { ShortenStringPipe } from 'src/app/shared/pipes/shorten-string-pipe/shorten-string.pipe'; @Component({ selector: 'app-search-form', @@ -33,6 +34,8 @@ export class SearchFormComponent implements OnInit { focus$ = new Subject(); click$ = new Subject(); + formatterFn = (address: string) => this.shortenStringPipe.transform(address, 40); + constructor( private formBuilder: FormBuilder, private router: Router, @@ -40,6 +43,7 @@ export class SearchFormComponent implements OnInit { private stateService: StateService, private electrsApiService: ElectrsApiService, private relativeUrlPipe: RelativeUrlPipe, + private shortenStringPipe: ShortenStringPipe, ) { } ngOnInit() { From 5f6c1c6ccfc74a44992e29ba5dddd663a7094432 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 13:54:07 +0100 Subject: [PATCH 04/37] Only reset hashrate state flag after database migration - Fix weekly hashrate indexing bug --- backend/src/api/mining.ts | 4 ++-- backend/src/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index c0970bf24..09dec32a2 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -142,8 +142,8 @@ class Mining { lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, blockStats.lastBlockHeight); - if (totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate - logger.debug("Indexing weekly hashrates for mining pools"); + if (totalIndexed > 7 && totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate + logger.debug(`Indexing weekly hashrates for mining pools (timestamp: ${fromTimestamp})`); let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp - 604800, fromTimestamp); const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0); pools = pools.map((pool: any) => { diff --git a/backend/src/index.ts b/backend/src/index.ts index 4305d6dac..c3de6fd69 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -96,8 +96,8 @@ class Server { await Common.sleep(5000); await databaseMigration.$truncateIndexedData(tables); } - await this.$resetHashratesIndexingState(); await databaseMigration.$initializeOrMigrateDatabase(); + await this.$resetHashratesIndexingState(); await poolsParser.migratePoolsJson(); } catch (e) { throw new Error(e instanceof Error ? e.message : 'Error'); From daa707933866919673ee868fe85b2aeb90a8afc0 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 5 Mar 2022 14:19:44 +0100 Subject: [PATCH 05/37] Address search with middle ellipsis mobile fix --- .../search-form/search-form.component.scss | 12 ++++++++++-- .../components/search-form/search-form.component.ts | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/search-form/search-form.component.scss b/frontend/src/app/components/search-form/search-form.component.scss index a2221757f..f316c3aa7 100644 --- a/frontend/src/app/components/search-form/search-form.component.scss +++ b/frontend/src/app/components/search-form/search-form.component.scss @@ -1,10 +1,18 @@ :host ::ng-deep { .dropdown-item { white-space: nowrap; - width: 410px; + width: calc(100% - 34px); } .dropdown-menu { - width: 410px; + width: calc(100% - 34px); + } + @media (min-width: 768px) { + .dropdown-item { + width: 410px; + } + .dropdown-menu { + width: 410px; + } } } diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index be0bead13..d83975c50 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -23,6 +23,7 @@ export class SearchFormComponent implements OnInit { typeaheadSearchFn: ((text: Observable) => Observable); searchForm: FormGroup; + isMobile = (window.innerWidth <= 767.98); @Output() searchTriggered = new EventEmitter(); regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100})$/; @@ -34,7 +35,7 @@ export class SearchFormComponent implements OnInit { focus$ = new Subject(); click$ = new Subject(); - formatterFn = (address: string) => this.shortenStringPipe.transform(address, 40); + formatterFn = (address: string) => this.shortenStringPipe.transform(address, this.isMobile ? 33 : 40); constructor( private formBuilder: FormBuilder, From 773ac4d44b4582c9caeebbe3e2420a013fb7eca4 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 15:50:48 +0100 Subject: [PATCH 06/37] Pause block indexing chunk upon error and retry later --- backend/src/api/blocks.ts | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index af25b957b..d6d37b5c4 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -218,31 +218,28 @@ class Blocks { if (blockHeight < lastBlockToIndex) { break; } - try { - ++indexedThisRun; - if (++totaIndexed % 100 === 0 || blockHeight === lastBlockToIndex) { - const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); - const blockPerSeconds = Math.max(1, Math.round(indexedThisRun / elapsedSeconds)); - const progress = Math.round(totaIndexed / indexingBlockAmount * 100); - const timeLeft = Math.round((indexingBlockAmount - totaIndexed) / blockPerSeconds); - logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds} blocks/sec | total: ${totaIndexed}/${indexingBlockAmount} (${progress}%) | elapsed: ${elapsedSeconds} seconds | left: ~${timeLeft} seconds`); - } - const blockHash = await bitcoinApi.$getBlockHash(blockHeight); - const block = await bitcoinApi.$getBlock(blockHash); - const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, true); - const blockExtended = await this.$getBlockExtended(block, transactions); - await blocksRepository.$saveBlockInDatabase(blockExtended); - } catch (e) { - logger.err(`Something went wrong while indexing blocks.` + e); + ++indexedThisRun; + if (++totaIndexed % 100 === 0 || blockHeight === lastBlockToIndex) { + const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); + const blockPerSeconds = Math.max(1, Math.round(indexedThisRun / elapsedSeconds)); + const progress = Math.round(totaIndexed / indexingBlockAmount * 100); + const timeLeft = Math.round((indexingBlockAmount - totaIndexed) / blockPerSeconds); + logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds} blocks/sec | total: ${totaIndexed}/${indexingBlockAmount} (${progress}%) | elapsed: ${elapsedSeconds} seconds | left: ~${timeLeft} seconds`); } + const blockHash = await bitcoinApi.$getBlockHash(blockHeight); + const block = await bitcoinApi.$getBlock(blockHash); + const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, true); + const blockExtended = await this.$getBlockExtended(block, transactions); + await blocksRepository.$saveBlockInDatabase(blockExtended); } currentBlockHeight -= chunkSize; } logger.info('Block indexing completed'); } catch (e) { - logger.err('An error occured in $generateBlockDatabase(). Skipping block indexing. ' + e); - console.log(e); + logger.err('An error occured in $generateBlockDatabase(). Trying again later. ' + e); + this.blockIndexingStarted = false; + return; } this.blockIndexingCompleted = true; From 92dc5a78d86e756a6a215fbb718645a7a5be3fc9 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 16:23:01 +0100 Subject: [PATCH 07/37] Make sure to reset hashrates indexing flags upon error --- backend/src/api/mining.ts | 182 +++++++++--------- backend/src/index.ts | 2 +- .../src/repositories/HashratesRepository.ts | 1 + 3 files changed, 96 insertions(+), 89 deletions(-) diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index 09dec32a2..1d2f47561 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -90,7 +90,7 @@ class Mining { /** * Return the historical hashrates and oldest indexed block timestamp for one or all pools */ - public async $getPoolsHistoricalHashrates(interval: string | null, poolId: number): Promise { + public async $getPoolsHistoricalHashrates(interval: string | null, poolId: number): Promise { return await HashratesRepository.$getPoolsWeeklyHashrate(interval); } @@ -108,106 +108,112 @@ class Mining { if (!blocks.blockIndexingCompleted || this.hashrateIndexingStarted) { return; } - this.hashrateIndexingStarted = true; - logger.info(`Indexing hashrates`); + try { + this.hashrateIndexingStarted = true; - const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; - 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(); - lastMidnight.setUTCHours(0); lastMidnight.setUTCMinutes(0); lastMidnight.setUTCSeconds(0); lastMidnight.setUTCMilliseconds(0); - let toTimestamp = Math.round(lastMidnight.getTime() / 1000); - let indexedThisRun = 0; - let totalIndexed = 0; + logger.info(`Indexing hashrates`); - const hashrates: any[] = []; + const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; + 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(); + lastMidnight.setUTCHours(0); lastMidnight.setUTCMinutes(0); lastMidnight.setUTCSeconds(0); lastMidnight.setUTCMilliseconds(0); + let toTimestamp = Math.round(lastMidnight.getTime() / 1000); + let indexedThisRun = 0; + let totalIndexed = 0; - while (toTimestamp > genesisTimestamp) { - const fromTimestamp = toTimestamp - 86400; - if (indexedTimestamp.includes(fromTimestamp)) { - toTimestamp -= 86400; - ++totalIndexed; - continue; - } + const hashrates: any[] = []; - const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp( - null, fromTimestamp, toTimestamp); - if (blockStats.blockCount === 0) { // We are done indexing, no blocks left - break; - } - - let lastBlockHashrate = 0; - lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, - blockStats.lastBlockHeight); - - if (totalIndexed > 7 && totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate - logger.debug(`Indexing weekly hashrates for mining pools (timestamp: ${fromTimestamp})`); - 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', - }); + while (toTimestamp > genesisTimestamp) { + const fromTimestamp = toTimestamp - 86400; + if (indexedTimestamp.includes(fromTimestamp)) { + toTimestamp -= 86400; + ++totalIndexed; + continue; } + + const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp( + null, fromTimestamp, toTimestamp); + if (blockStats.blockCount === 0) { // We are done indexing, no blocks left + break; + } + + let lastBlockHashrate = 0; + lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, + blockStats.lastBlockHeight); + + if (totalIndexed > 7 && 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 > 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; } - hashrates.push({ - hashrateTimestamp: fromTimestamp, - avgHashrate: lastBlockHashrate, - poolId: null, - share: 1, - type: 'daily', - }); + // Add genesis block manually + if (toTimestamp <= genesisTimestamp && !indexedTimestamp.includes(genesisTimestamp)) { + hashrates.push({ + hashrateTimestamp: genesisTimestamp, + avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1), + poolId: null, + type: 'daily', + }); + } - if (hashrates.length > 10) { + if (hashrates.length > 0) { await HashratesRepository.$saveHashrates(hashrates); - hashrates.length = 0; } + await HashratesRepository.$setLatestRunTimestamp(); + this.hashrateIndexingStarted = false; - 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; + logger.info(`Hashrates indexing completed`); + } catch (e) { + this.hashrateIndexingStarted = false; + throw e; } - - // Add genesis block manually - if (toTimestamp <= genesisTimestamp && !indexedTimestamp.includes(genesisTimestamp)) { - hashrates.push({ - hashrateTimestamp: genesisTimestamp, - avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1), - poolId: null, - type: 'daily', - }); - } - - if (hashrates.length > 0) { - await HashratesRepository.$saveHashrates(hashrates); - } - await HashratesRepository.$setLatestRunTimestamp(); - this.hashrateIndexingStarted = false; - - logger.info(`Hashrates indexing completed`); } } diff --git a/backend/src/index.ts b/backend/src/index.ts index c3de6fd69..51cee34c4 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -167,7 +167,7 @@ class Server { } async $resetHashratesIndexingState() { - return await HashratesRepository.$setLatestRunTimestamp(0); + return await HashratesRepository.$setLatestRunTimestamp(0); } async $runIndexingWhenReady() { diff --git a/backend/src/repositories/HashratesRepository.ts b/backend/src/repositories/HashratesRepository.ts index 212e58327..5a33d7e77 100644 --- a/backend/src/repositories/HashratesRepository.ts +++ b/backend/src/repositories/HashratesRepository.ts @@ -22,6 +22,7 @@ class HashratesRepository { await connection.query(query); } catch (e: any) { logger.err('$saveHashrateInDatabase() error' + (e instanceof Error ? e.message : e)); + throw e; } connection.release(); From 7314582dd191f40714f6469767c34ba8fea4522d Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 12:32:16 +0100 Subject: [PATCH 08/37] Split network daily hashrate indexing and weekly pool hashrate indexing --- backend/src/api/database-migration.ts | 10 +- backend/src/api/mining.ts | 145 +++++++++++++----- backend/src/index.ts | 4 +- .../src/repositories/HashratesRepository.ts | 26 +++- 4 files changed, 139 insertions(+), 46 deletions(-) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index 49e9ef9c4..dd5dea399 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 = 8; + private static currentVersion = 9; private queryTimeout = 120000; private statisticsAddedIndexed = false; @@ -133,6 +133,10 @@ class DatabaseMigration { await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD `type` enum("daily", "weekly") DEFAULT "daily"'); } + if (databaseSchemaVersion < 9) { + await this.$executeQuery(connection, 'ALTER TABLE `state` CHANGE `name` `name` varchar(100)') + } + connection.release(); } catch (e) { connection.release(); @@ -276,6 +280,10 @@ class DatabaseMigration { queries.push(`INSERT INTO state(name, number, string) VALUES ('last_hashrates_indexing', 0, NULL)`); } + if (version < 9) { + queries.push(`INSERT INTO state(name, number, string) VALUES ('last_weekly_hashrates_indexing', 0, NULL)`); + } + return queries; } diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index 1d2f47561..62fa8baca 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -8,6 +8,7 @@ import blocks from './blocks'; class Mining { hashrateIndexingStarted = false; + weeklyHashrateIndexingStarted = false; constructor() { } @@ -95,31 +96,112 @@ class Mining { } /** - * Generate daily hashrate data + * Generate weekly mining pool hashrate history */ - public async $generateNetworkHashrateHistory(): Promise { - // We only run this once a day - const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp(); - const now = new Date().getTime() / 1000; - if (now - latestTimestamp < 86400) { + public async $generatePoolHashrateHistory(): Promise { + if (!blocks.blockIndexingCompleted || this.weeklyHashrateIndexingStarted) { return; } + // We only run this once a week + const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_weekly_hashrates_indexing'); + const now = new Date().getTime() / 1000; + if (now - latestTimestamp < 604800) { + return; + } + + try { + this.weeklyHashrateIndexingStarted = true; + + logger.info(`Indexing mining pools weekly hashrates`); + + const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps(); + const hashrates: any[] = []; + const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f + const lastWeekMidnight = this.getDateMidnight(new Date()); + lastWeekMidnight.setDate(lastWeekMidnight.getDate() - 7); + let toTimestamp = Math.round(lastWeekMidnight.getTime() / 1000); + + while (toTimestamp > genesisTimestamp) { + const fromTimestamp = toTimestamp - 604800; + + // Skip already indexed weeks + if (indexedTimestamp.includes(toTimestamp + 1)) { + toTimestamp -= 604800; + continue; + } + + const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp( + null, fromTimestamp, toTimestamp); + if (blockStats.blockCount === 0) { // We are done indexing, no blocks left + break; + } + + const fromTxt = new Date(1000 * fromTimestamp); + const toTxt = new Date(1000 * toTimestamp); + logger.debug(`Indexing pools hashrate between ${fromTxt.toUTCString()} and ${toTxt.toUTCString()}`) + + const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, + blockStats.lastBlockHeight); + + let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp, toTimestamp); + 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: toTimestamp + 1, + avgHashrate: pool['hashrate'], + poolId: pool.poolId, + share: pool['share'], + type: 'weekly', + }); + } + + await HashratesRepository.$saveHashrates(hashrates); + hashrates.length = 0; + + toTimestamp -= 604800; + } + this.weeklyHashrateIndexingStarted = false; + await HashratesRepository.$setLatestRunTimestamp('last_weekly_hashrates_indexing'); + logger.info(`Weekly pools hashrate indexing completed`); + } catch (e) { + this.weeklyHashrateIndexingStarted = false; + throw e; + } + + } + + /** + * Generate daily hashrate data + */ + public async $generateNetworkHashrateHistory(): Promise { if (!blocks.blockIndexingCompleted || this.hashrateIndexingStarted) { return; } + // We only run this once a day + const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_hashrates_indexing'); + const now = new Date().getTime() / 1000; + if (now - latestTimestamp < 86400) { + return; + } + try { this.hashrateIndexingStarted = true; - logger.info(`Indexing hashrates`); + logger.info(`Indexing network daily hashrate`); const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; 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(); - lastMidnight.setUTCHours(0); lastMidnight.setUTCMinutes(0); lastMidnight.setUTCSeconds(0); lastMidnight.setUTCMilliseconds(0); + const lastMidnight = this.getDateMidnight(new Date()); let toTimestamp = Math.round(lastMidnight.getTime() / 1000); let indexedThisRun = 0; let totalIndexed = 0; @@ -128,6 +210,8 @@ class Mining { while (toTimestamp > genesisTimestamp) { const fromTimestamp = toTimestamp - 86400; + + // Skip already indexed weeks if (indexedTimestamp.includes(fromTimestamp)) { toTimestamp -= 86400; ++totalIndexed; @@ -140,31 +224,9 @@ class Mining { break; } - let lastBlockHashrate = 0; - lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, + const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, blockStats.lastBlockHeight); - if (totalIndexed > 7 && 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, @@ -203,18 +265,25 @@ class Mining { }); } - if (hashrates.length > 0) { - await HashratesRepository.$saveHashrates(hashrates); - } - await HashratesRepository.$setLatestRunTimestamp(); - this.hashrateIndexingStarted = false; + await HashratesRepository.$saveHashrates(hashrates); - logger.info(`Hashrates indexing completed`); + await HashratesRepository.$setLatestRunTimestamp('last_hashrates_indexing'); + this.hashrateIndexingStarted = false; + logger.info(`Daily network hashrate indexing completed`); } catch (e) { this.hashrateIndexingStarted = false; throw e; } } + + private getDateMidnight(date: Date): Date { + date.setUTCHours(0); + date.setUTCMinutes(0); + date.setUTCSeconds(0); + date.setUTCMilliseconds(0); + + return date; + } } export default new Mining(); diff --git a/backend/src/index.ts b/backend/src/index.ts index 51cee34c4..158f2895f 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -167,7 +167,8 @@ class Server { } async $resetHashratesIndexingState() { - return await HashratesRepository.$setLatestRunTimestamp(0); + await HashratesRepository.$setLatestRunTimestamp('last_hashrates_indexing', 0); + await HashratesRepository.$setLatestRunTimestamp('last_week_hashrates_indexing', 0); } async $runIndexingWhenReady() { @@ -178,6 +179,7 @@ class Server { try { await blocks.$generateBlockDatabase(); await mining.$generateNetworkHashrateHistory(); + await mining.$generatePoolHashrateHistory(); } catch (e) { logger.err(`Unable to run indexing right now, trying again later. ` + e); } diff --git a/backend/src/repositories/HashratesRepository.ts b/backend/src/repositories/HashratesRepository.ts index 5a33d7e77..367733cfa 100644 --- a/backend/src/repositories/HashratesRepository.ts +++ b/backend/src/repositories/HashratesRepository.ts @@ -8,6 +8,10 @@ class HashratesRepository { * Save indexed block data in the database */ public async $saveHashrates(hashrates: any) { + if (hashrates.length === 0) { + return; + } + let query = `INSERT INTO hashrates(hashrate_timestamp, avg_hashrate, pool_id, share, type) VALUES`; @@ -53,6 +57,16 @@ class HashratesRepository { return rows; } + public async $getWeeklyHashrateTimestamps(): Promise { + const connection = await DB.pool.getConnection(); + + let query = `SELECT UNIX_TIMESTAMP(hashrate_timestamp) as timestamp FROM hashrates where type = 'weekly' GROUP BY hashrate_timestamp`; + const [rows]: any[] = await connection.query(query); + connection.release(); + + return rows.map(row => row.timestamp); + } + /** * Returns the current biggest pool hashrate history */ @@ -83,18 +97,18 @@ class HashratesRepository { return rows; } - public async $setLatestRunTimestamp(val: any = null) { + public async $setLatestRunTimestamp(key: string, val: any = null) { const connection = await DB.pool.getConnection(); - const query = `UPDATE state SET number = ? WHERE name = 'last_hashrates_indexing'`; + const query = `UPDATE state SET number = ? WHERE name = ?`; - await connection.query(query, (val === null) ? [Math.round(new Date().getTime() / 1000)] : [val]); + await connection.query(query, (val === null) ? [Math.round(new Date().getTime() / 1000), key] : [val, key]); connection.release(); } - public async $getLatestRunTimestamp(): Promise { + public async $getLatestRunTimestamp(key: string): Promise { const connection = await DB.pool.getConnection(); - const query = `SELECT number FROM state WHERE name = 'last_hashrates_indexing'`; - const [rows] = await connection.query(query); + const query = `SELECT number FROM state WHERE name = ?`; + const [rows] = await connection.query(query, [key]); connection.release(); return rows[0]['number']; } From 8532d13a0df7455cad777501c0c232e46c0d52cb Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 12:36:50 +0100 Subject: [PATCH 09/37] Update hashrate indexing logs --- backend/src/api/mining.ts | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index 62fa8baca..a8a8af967 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -122,12 +122,18 @@ class Mining { lastWeekMidnight.setDate(lastWeekMidnight.getDate() - 7); let toTimestamp = Math.round(lastWeekMidnight.getTime() / 1000); + const totalWeekIndexed = (await BlocksRepository.$blockCount(null, null)) / 1008; + let indexedThisRun = 0; + let totalIndexed = 0; + let startedAt = new Date().getTime() / 1000; + while (toTimestamp > genesisTimestamp) { const fromTimestamp = toTimestamp - 604800; // Skip already indexed weeks if (indexedTimestamp.includes(toTimestamp + 1)) { toTimestamp -= 604800; + ++totalIndexed; continue; } @@ -137,10 +143,6 @@ class Mining { break; } - const fromTxt = new Date(1000 * fromTimestamp); - const toTxt = new Date(1000 * toTimestamp); - logger.debug(`Indexing pools hashrate between ${fromTxt.toUTCString()} and ${toTxt.toUTCString()}`) - const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, blockStats.lastBlockHeight); @@ -165,7 +167,19 @@ class Mining { await HashratesRepository.$saveHashrates(hashrates); hashrates.length = 0; + const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); + if (elapsedSeconds > 5) { + const weeksPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2); + const formattedDate = new Date(fromTimestamp * 1000).toUTCString(); + const weeksLeft = Math.round(totalWeekIndexed - totalIndexed); + logger.debug(`Getting weekly pool hashrate for ${formattedDate} | ~${weeksPerSeconds} weeks/sec | ~${weeksLeft} weeks left to index`); + startedAt = new Date().getTime() / 1000; + indexedThisRun = 0; + } + toTimestamp -= 604800; + ++indexedThisRun; + ++totalIndexed; } this.weeklyHashrateIndexingStarted = false; await HashratesRepository.$setLatestRunTimestamp('last_weekly_hashrates_indexing'); @@ -197,16 +211,16 @@ class Mining { logger.info(`Indexing network daily hashrate`); - const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; 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 = this.getDateMidnight(new Date()); let toTimestamp = Math.round(lastMidnight.getTime() / 1000); + const hashrates: any[] = []; + + const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; let indexedThisRun = 0; let totalIndexed = 0; - - const hashrates: any[] = []; + let startedAt = new Date().getTime() / 1000; while (toTimestamp > genesisTimestamp) { const fromTimestamp = toTimestamp - 86400; @@ -245,7 +259,7 @@ class Mining { 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`); + logger.debug(`Getting network daily hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`); startedAt = new Date().getTime() / 1000; indexedThisRun = 0; } From 1ced44d9704ff862c149595e383a91aff72fe207 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 12:47:16 +0100 Subject: [PATCH 10/37] Remove useless mining function wrapper in backend --- backend/src/api/blocks.ts | 2 +- backend/src/api/mining.ts | 25 ++----------------------- backend/src/routes.ts | 9 +++++---- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index d6d37b5c4..f0c04455b 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -171,7 +171,7 @@ class Blocks { } /** - * Index all blocks metadata for the mining dashboard + * [INDEXING] Index all blocks metadata for the mining dashboard */ public async $generateBlockDatabase() { if (this.blockIndexingStarted) { diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index a8a8af967..18d82669f 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -75,28 +75,7 @@ class Mining { } /** - * Return the historical difficulty adjustments and oldest indexed block timestamp - */ - public async $getHistoricalDifficulty(interval: string | null): Promise { - return await BlocksRepository.$getBlocksDifficulty(interval); - } - - /** - * Return the historical hashrates and oldest indexed block timestamp - */ - 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); - } - - /** - * Generate weekly mining pool hashrate history + * [INDEXING] Generate weekly mining pool hashrate history */ public async $generatePoolHashrateHistory(): Promise { if (!blocks.blockIndexingCompleted || this.weeklyHashrateIndexingStarted) { @@ -192,7 +171,7 @@ class Mining { } /** - * Generate daily hashrate data + * [INDEXING] Generate daily hashrate data */ public async $generateNetworkHashrateHistory(): Promise { if (!blocks.blockIndexingCompleted || this.hashrateIndexingStarted) { diff --git a/backend/src/routes.ts b/backend/src/routes.ts index dea9da2f2..6b1a365b6 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -24,6 +24,7 @@ import miningStats from './api/mining'; import axios from 'axios'; import mining from './api/mining'; import BlocksRepository from './repositories/BlocksRepository'; +import HashratesRepository from './repositories/HashratesRepository'; class Routes { constructor() {} @@ -576,7 +577,7 @@ class Routes { public async $getHistoricalDifficulty(req: Request, res: Response) { try { - const stats = await mining.$getHistoricalDifficulty(req.params.interval ?? null); + const stats = await BlocksRepository.$getBlocksDifficulty(req.params.interval ?? null); res.header('Pragma', 'public'); res.header('Cache-control', 'public'); res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString()); @@ -588,7 +589,7 @@ 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 hashrates = await HashratesRepository.$getPoolsWeeklyHashrate(req.params.interval ?? null); const oldestIndexedBlockTimestamp = await BlocksRepository.$oldestBlockTimestamp(); res.header('Pragma', 'public'); res.header('Cache-control', 'public'); @@ -604,8 +605,8 @@ class Routes { public async $getHistoricalHashrate(req: Request, res: Response) { try { - const hashrates = await mining.$getNetworkHistoricalHashrates(req.params.interval ?? null); - const difficulty = await mining.$getHistoricalDifficulty(req.params.interval ?? null); + const hashrates = await HashratesRepository.$getNetworkDailyHashrate(req.params.interval ?? null); + const difficulty = await BlocksRepository.$getBlocksDifficulty(req.params.interval ?? null); const oldestIndexedBlockTimestamp = await BlocksRepository.$oldestBlockTimestamp(); res.header('Pragma', 'public'); res.header('Cache-control', 'public'); From 89411f23d8253fd20bd572fa2873a8a67264806a Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 16:44:09 +0100 Subject: [PATCH 11/37] Set connection pool timezone to UTC - Close mysql connections upon error --- backend/src/api/database-migration.ts | 3 +- backend/src/api/mining.ts | 6 +- backend/src/database.ts | 1 + backend/src/repositories/BlocksRepository.ts | 172 ++++++++++++------ .../src/repositories/HashratesRepository.ts | 65 +++++-- backend/src/repositories/PoolsRepository.ts | 42 +++-- 6 files changed, 196 insertions(+), 93 deletions(-) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index dd5dea399..d072fe496 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -134,7 +134,8 @@ class DatabaseMigration { } if (databaseSchemaVersion < 9) { - await this.$executeQuery(connection, 'ALTER TABLE `state` CHANGE `name` `name` varchar(100)') + await this.$executeQuery(connection, 'ALTER TABLE `state` CHANGE `name` `name` varchar(100)'); + await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD UNIQUE `hashrate_timestamp_pool_id` (`hashrate_timestamp`, `pool_id`)'); } connection.release(); diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index 18d82669f..f15c52c88 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -97,9 +97,8 @@ class Mining { const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps(); const hashrates: any[] = []; const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f - const lastWeekMidnight = this.getDateMidnight(new Date()); - lastWeekMidnight.setDate(lastWeekMidnight.getDate() - 7); - let toTimestamp = Math.round(lastWeekMidnight.getTime() / 1000); + const lastMidnight = this.getDateMidnight(new Date()); + let toTimestamp = Math.round((lastMidnight.getTime() - 604800) / 1000); const totalWeekIndexed = (await BlocksRepository.$blockCount(null, null)) / 1008; let indexedThisRun = 0; @@ -167,7 +166,6 @@ class Mining { this.weeklyHashrateIndexingStarted = false; throw e; } - } /** diff --git a/backend/src/database.ts b/backend/src/database.ts index b0d39b301..9f2655016 100644 --- a/backend/src/database.ts +++ b/backend/src/database.ts @@ -11,6 +11,7 @@ export class DB { password: config.DATABASE.PASSWORD, connectionLimit: 10, supportBigNumbers: true, + timezone: '+00:00', }); } diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index d91777880..844f62bad 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -53,15 +53,17 @@ class BlocksRepository { // logger.debug(query); await connection.query(query, params); + connection.release(); } catch (e: any) { + connection.release(); if (e.errno === 1062) { // ER_DUP_ENTRY logger.debug(`$saveBlockInDatabase() - Block ${block.height} has already been indexed, ignoring`); } else { + connection.release(); logger.err('$saveBlockInDatabase() error' + (e instanceof Error ? e.message : e)); + throw e; } } - - connection.release(); } /** @@ -73,20 +75,26 @@ class BlocksRepository { } const connection = await DB.pool.getConnection(); - const [rows]: any[] = await connection.query(` - SELECT height - FROM blocks - WHERE height <= ? AND height >= ? - ORDER BY height DESC; - `, [startHeight, endHeight]); - connection.release(); + try { + const [rows]: any[] = await connection.query(` + SELECT height + FROM blocks + WHERE height <= ? AND height >= ? + ORDER BY height DESC; + `, [startHeight, endHeight]); + connection.release(); - const indexedBlockHeights: number[] = []; - rows.forEach((row: any) => { indexedBlockHeights.push(row.height); }); - const seekedBlocks: number[] = Array.from(Array(startHeight - endHeight + 1).keys(), n => n + endHeight).reverse(); - const missingBlocksHeights = seekedBlocks.filter(x => indexedBlockHeights.indexOf(x) === -1); + const indexedBlockHeights: number[] = []; + rows.forEach((row: any) => { indexedBlockHeights.push(row.height); }); + const seekedBlocks: number[] = Array.from(Array(startHeight - endHeight + 1).keys(), n => n + endHeight).reverse(); + const missingBlocksHeights = seekedBlocks.filter(x => indexedBlockHeights.indexOf(x) === -1); - return missingBlocksHeights; + return missingBlocksHeights; + } catch (e) { + connection.release(); + logger.err('$getMissingBlocksBetweenHeights() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -111,10 +119,16 @@ class BlocksRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query, params); - connection.release(); + try { + const [rows] = await connection.query(query, params); + connection.release(); - return rows; + return rows; + } catch (e) { + connection.release(); + logger.err('$getEmptyBlocks() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -143,10 +157,16 @@ class BlocksRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query, params); - connection.release(); + try { + const [rows] = await connection.query(query, params); + connection.release(); - return rows[0].blockCount; + return rows[0].blockCount; + } catch (e) { + connection.release(); + logger.err('$blockCount() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -177,10 +197,16 @@ class BlocksRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query, params); - connection.release(); + try { + const [rows] = await connection.query(query, params); + connection.release(); - return rows[0]; + return rows[0]; + } catch (e) { + connection.release(); + logger.err('$blockCountBetweenTimestamp() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -194,23 +220,26 @@ class BlocksRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows]: any[] = await connection.query(query); - connection.release(); + try { + const [rows]: any[] = await connection.query(query); + connection.release(); - if (rows.length <= 0) { - return -1; + if (rows.length <= 0) { + return -1; + } + + return rows[0].blockTimestamp; + } catch (e) { + connection.release(); + logger.err('$oldestBlockTimestamp() error' + (e instanceof Error ? e.message : e)); + throw e; } - - return rows[0].blockTimestamp; } /** * Get blocks mined by a specific mining pool */ - public async $getBlocksByPool( - poolId: number, - startHeight: number | null = null - ): Promise { + public async $getBlocksByPool(poolId: number, startHeight: number | null = null): Promise { const params: any[] = []; let query = `SELECT height, hash as id, tx_count, size, weight, pool_id, UNIX_TIMESTAMP(blockTimestamp) as timestamp, reward FROM blocks @@ -227,14 +256,20 @@ class BlocksRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query, params); - connection.release(); + try { + const [rows] = await connection.query(query, params); + connection.release(); - for (const block of rows) { - delete block['blockTimestamp']; + for (const block of rows) { + delete block['blockTimestamp']; + } + + return rows; + } catch (e) { + connection.release(); + logger.err('$getBlocksByPool() error' + (e instanceof Error ? e.message : e)); + throw e; } - - return rows; } /** @@ -242,19 +277,25 @@ class BlocksRepository { */ public async $getBlockByHeight(height: number): Promise { const connection = await DB.pool.getConnection(); - const [rows]: any[] = await connection.query(` - SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp, pools.id as pool_id, pools.name as pool_name, pools.link as pool_link, pools.addresses as pool_addresses, pools.regexes as pool_regexes - FROM blocks - JOIN pools ON blocks.pool_id = pools.id - WHERE height = ${height}; - `); - connection.release(); + try { + const [rows]: any[] = await connection.query(` + SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp, pools.id as pool_id, pools.name as pool_name, pools.link as pool_link, pools.addresses as pool_addresses, pools.regexes as pool_regexes + FROM blocks + JOIN pools ON blocks.pool_id = pools.id + WHERE height = ${height}; + `); + connection.release(); - if (rows.length <= 0) { - return null; + if (rows.length <= 0) { + return null; + } + + return rows[0]; + } catch (e) { + connection.release(); + logger.err('$getBlockByHeight() error' + (e instanceof Error ? e.message : e)); + throw e; } - - return rows[0]; } /** @@ -297,21 +338,34 @@ class BlocksRepository { ORDER BY t.height `; - const [rows]: any[] = await connection.query(query); - connection.release(); + try { + const [rows]: any[] = await connection.query(query); + connection.release(); - for (let row of rows) { - delete row['rn']; + for (let row of rows) { + delete row['rn']; + } + + return rows; + } catch (e) { + connection.release(); + logger.err('$getBlocksDifficulty() error' + (e instanceof Error ? e.message : e)); + throw e; } - - return rows; } public async $getOldestIndexedBlockHeight(): Promise { const connection = await DB.pool.getConnection(); - const [rows]: any[] = await connection.query(`SELECT MIN(height) as minHeight FROM blocks`); - connection.release(); - return rows[0].minHeight; + try { + const [rows]: any[] = await connection.query(`SELECT MIN(height) as minHeight FROM blocks`); + connection.release(); + + return rows[0].minHeight; + } catch (e) { + connection.release(); + logger.err('$getOldestIndexedBlockHeight() error' + (e instanceof Error ? e.message : e)); + throw e; + } } } diff --git a/backend/src/repositories/HashratesRepository.ts b/backend/src/repositories/HashratesRepository.ts index 367733cfa..3523004d5 100644 --- a/backend/src/repositories/HashratesRepository.ts +++ b/backend/src/repositories/HashratesRepository.ts @@ -24,12 +24,12 @@ class HashratesRepository { try { // logger.debug(query); await connection.query(query); + connection.release(); } catch (e: any) { + connection.release(); logger.err('$saveHashrateInDatabase() error' + (e instanceof Error ? e.message : e)); throw e; } - - connection.release(); } public async $getNetworkDailyHashrate(interval: string | null): Promise { @@ -51,20 +51,33 @@ class HashratesRepository { query += ` ORDER by hashrate_timestamp`; - const [rows]: any[] = await connection.query(query); - connection.release(); + try { + const [rows]: any[] = await connection.query(query); + connection.release(); - return rows; + return rows; + } catch (e) { + connection.release(); + logger.err('$getNetworkDailyHashrate() error' + (e instanceof Error ? e.message : e)); + throw e; + } } public async $getWeeklyHashrateTimestamps(): Promise { const connection = await DB.pool.getConnection(); - let query = `SELECT UNIX_TIMESTAMP(hashrate_timestamp) as timestamp FROM hashrates where type = 'weekly' GROUP BY hashrate_timestamp`; - const [rows]: any[] = await connection.query(query); - connection.release(); + const query = `SELECT UNIX_TIMESTAMP(hashrate_timestamp) as timestamp FROM hashrates where type = 'weekly' GROUP BY hashrate_timestamp`; - return rows.map(row => row.timestamp); + try { + const [rows]: any[] = await connection.query(query); + connection.release(); + + return rows.map(row => row.timestamp); + } catch (e) { + connection.release(); + logger.err('$getWeeklyHashrateTimestamps() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -91,26 +104,44 @@ class HashratesRepository { query += ` ORDER by hashrate_timestamp, FIELD(pool_id, ${topPoolsId})`; - const [rows]: any[] = await connection.query(query); - connection.release(); + try { + const [rows]: any[] = await connection.query(query); + connection.release(); - return rows; + return rows; + } catch (e) { + connection.release(); + logger.err('$getPoolsWeeklyHashrate() error' + (e instanceof Error ? e.message : e)); + throw e; + } } public async $setLatestRunTimestamp(key: string, val: any = null) { const connection = await DB.pool.getConnection(); const query = `UPDATE state SET number = ? WHERE name = ?`; - await connection.query(query, (val === null) ? [Math.round(new Date().getTime() / 1000), key] : [val, key]); - connection.release(); + try { + await connection.query(query, (val === null) ? [Math.round(new Date().getTime() / 1000), key] : [val, key]); + connection.release(); + } catch (e) { + connection.release(); + } } public async $getLatestRunTimestamp(key: string): Promise { const connection = await DB.pool.getConnection(); const query = `SELECT number FROM state WHERE name = ?`; - const [rows] = await connection.query(query, [key]); - connection.release(); - return rows[0]['number']; + + try { + const [rows] = await connection.query(query, [key]); + connection.release(); + + return rows[0]['number']; + } catch (e) { + connection.release(); + logger.err('$setLatestRunTimestamp() error' + (e instanceof Error ? e.message : e)); + throw e; + } } } diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts index ea617322a..3f904888d 100644 --- a/backend/src/repositories/PoolsRepository.ts +++ b/backend/src/repositories/PoolsRepository.ts @@ -43,26 +43,38 @@ class PoolsRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query); - connection.release(); + try { + const [rows] = await connection.query(query); + connection.release(); - return rows; + return rows; + } catch (e) { + connection.release(); + logger.err('$getPoolsInfo() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** * 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 + const 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(); + try { + const [rows] = await connection.query(query, [from, to]); + connection.release(); - return rows; + return rows; + } catch (e) { + connection.release(); + logger.err('$getPoolsInfoBetween() error' + (e instanceof Error ? e.message : e)); + throw e; + } } /** @@ -76,13 +88,19 @@ class PoolsRepository { // logger.debug(query); const connection = await DB.pool.getConnection(); - const [rows] = await connection.query(query, [poolId]); - connection.release(); + try { + const [rows] = await connection.query(query, [poolId]); + connection.release(); - rows[0].regexes = JSON.parse(rows[0].regexes); - rows[0].addresses = JSON.parse(rows[0].addresses); + rows[0].regexes = JSON.parse(rows[0].regexes); + rows[0].addresses = JSON.parse(rows[0].addresses); - return rows[0]; + return rows[0]; + } catch (e) { + connection.release(); + logger.err('$getPool() error' + (e instanceof Error ? e.message : e)); + throw e; + } } } From 4b859eb4f641ac34347d61565679e4fa04e7a49e Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 16:48:14 +0100 Subject: [PATCH 12/37] Re-index hashrates because we have different timestamp handling --- backend/src/api/database-migration.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index d072fe496..c66148fe0 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -134,6 +134,8 @@ class DatabaseMigration { } if (databaseSchemaVersion < 9) { + logger.warn(`'hashrates' table has been truncated. Re-indexing from scratch.'`); + await this.$executeQuery(connection, 'TRUNCATE hashrates;'); // Need to re-index await this.$executeQuery(connection, 'ALTER TABLE `state` CHANGE `name` `name` varchar(100)'); await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD UNIQUE `hashrate_timestamp_pool_id` (`hashrate_timestamp`, `pool_id`)'); } From 2a170c07d11809212d803a88f2ac1825f777a33c Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 16:50:59 +0100 Subject: [PATCH 13/37] Remove unnecessary await --- backend/src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index 158f2895f..029e32c96 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -177,9 +177,9 @@ class Server { } try { - await blocks.$generateBlockDatabase(); - await mining.$generateNetworkHashrateHistory(); - await mining.$generatePoolHashrateHistory(); + blocks.$generateBlockDatabase(); + mining.$generateNetworkHashrateHistory(); + mining.$generatePoolHashrateHistory(); } catch (e) { logger.err(`Unable to run indexing right now, trying again later. ` + e); } From 3d1a10cdfca972c998fe613d9f83b211ecd5e198 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 16:57:40 +0100 Subject: [PATCH 14/37] Use the latest timestamp in hashrate data ticker --- backend/src/api/mining.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts index f15c52c88..4423e5f16 100644 --- a/backend/src/api/mining.ts +++ b/backend/src/api/mining.ts @@ -219,7 +219,7 @@ class Mining { blockStats.lastBlockHeight); hashrates.push({ - hashrateTimestamp: fromTimestamp, + hashrateTimestamp: toTimestamp, avgHashrate: lastBlockHashrate, poolId: null, share: 1, From 2570dbfab45c2a4459fe17df32c1e60911c143dd Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sun, 6 Mar 2022 17:06:55 +0100 Subject: [PATCH 15/37] Fix incorrect state naming --- backend/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index 029e32c96..4ede865a6 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -168,7 +168,7 @@ class Server { async $resetHashratesIndexingState() { await HashratesRepository.$setLatestRunTimestamp('last_hashrates_indexing', 0); - await HashratesRepository.$setLatestRunTimestamp('last_week_hashrates_indexing', 0); + await HashratesRepository.$setLatestRunTimestamp('last_weekly_hashrates_indexing', 0); } async $runIndexingWhenReady() { From 059e82a80516049aa906f6709b25700af6bf530d Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 6 Mar 2022 18:27:13 +0100 Subject: [PATCH 16/37] UTXO spent tracking fixes #1301 --- backend/src/api/websocket-handler.ts | 35 +++++++---- .../transaction/transaction.component.ts | 13 ++-- .../transactions-list.component.html | 12 ++-- .../transactions-list.component.ts | 61 ++++++++++++------- .../src/app/interfaces/websocket.interface.ts | 1 + frontend/src/app/services/state.service.ts | 1 + .../src/app/services/websocket.service.ts | 4 ++ 7 files changed, 78 insertions(+), 49 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 53d74925d..a2ae6d0c9 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -331,21 +331,30 @@ class WebsocketHandler { } } - if (client['track-tx'] && rbfTransactions[client['track-tx']]) { - for (const rbfTransaction in rbfTransactions) { - if (client['track-tx'] === rbfTransaction) { - const rbfTx = rbfTransactions[rbfTransaction]; - if (config.MEMPOOL.BACKEND !== 'esplora') { - try { - const fullTx = await transactionUtils.$getTransactionExtended(rbfTransaction, true); - response['rbfTransaction'] = fullTx; - } catch (e) { - logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e)); + if (client['track-tx']) { + const utxoSpent = newTransactions.some((tx) => { + return tx.vin.some((vin) => vin.txid === client['track-tx']); + }); + if (utxoSpent) { + response['utxoSpent'] = true; + } + + if (rbfTransactions[client['track-tx']]) { + for (const rbfTransaction in rbfTransactions) { + if (client['track-tx'] === rbfTransaction) { + const rbfTx = rbfTransactions[rbfTransaction]; + if (config.MEMPOOL.BACKEND !== 'esplora') { + try { + const fullTx = await transactionUtils.$getTransactionExtended(rbfTransaction, true); + response['rbfTransaction'] = fullTx; + } catch (e) { + logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e)); + } + } else { + response['rbfTransaction'] = rbfTx; } - } else { - response['rbfTransaction'] = rbfTx; + break; } - break; } } } diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index bd77c564f..8b8526336 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -185,15 +185,12 @@ export class TransactionComponent implements OnInit, OnDestroy { this.error = undefined; this.waitingForTransaction = false; this.setMempoolBlocksSubscription(); + this.websocketService.startTrackTransaction(tx.txid); - if (!tx.status.confirmed) { - this.websocketService.startTrackTransaction(tx.txid); - - if (tx.firstSeen) { - this.transactionTime = tx.firstSeen; - } else { - this.getTransactionTime(); - } + if (!tx.status.confirmed && tx.firstSeen) { + this.transactionTime = tx.firstSeen; + } else { + this.getTransactionTime(); } if (this.tx.status.confirmed) { diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index f80953738..85b91cf66 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -82,7 +82,7 @@ - + @@ -183,16 +183,16 @@ - - + -
- + + - + - + @@ -204,7 +204,7 @@
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index 2740075b8..fd3cf0241 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -1,11 +1,11 @@ -import { Component, OnInit, Input, ChangeDetectionStrategy, OnChanges, ChangeDetectorRef, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Input, ChangeDetectionStrategy, OnChanges, Output, EventEmitter } from '@angular/core'; import { StateService } from '../../services/state.service'; -import { Observable, forkJoin } from 'rxjs'; +import { Observable, forkJoin, ReplaySubject, BehaviorSubject, merge } from 'rxjs'; import { Outspend, Transaction } from '../../interfaces/electrs.interface'; import { ElectrsApiService } from '../../services/electrs-api.service'; import { environment } from 'src/environments/environment'; import { AssetsService } from 'src/app/services/assets.service'; -import { map } from 'rxjs/operators'; +import { map, share, switchMap } from 'rxjs/operators'; import { BlockExtended } from 'src/app/interfaces/node-api.interface'; @Component({ @@ -17,7 +17,6 @@ import { BlockExtended } from 'src/app/interfaces/node-api.interface'; export class TransactionsListComponent implements OnInit, OnChanges { network = ''; nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId; - displayDetails = false; @Input() transactions: Transaction[]; @Input() showConfirmations = false; @@ -28,15 +27,41 @@ export class TransactionsListComponent implements OnInit, OnChanges { @Output() loadMore = new EventEmitter(); latestBlock$: Observable; - outspends: Outspend[] = []; + outspends$: Observable; + refreshOutspends$: ReplaySubject = new ReplaySubject(); + showDetails$ = new BehaviorSubject(false); + _outspends: Outspend[] = []; assetsMinimal: any; constructor( public stateService: StateService, private electrsApiService: ElectrsApiService, private assetsService: AssetsService, - private ref: ChangeDetectorRef, - ) { } + ) { + this.outspends$ = merge( + this.refreshOutspends$, + this.stateService.utxoSpent$ + .pipe( + map(() => { + this._outspends = []; + return { 0: this.electrsApiService.getOutspends$(this.transactions[0].txid) }; + }), + ) + ).pipe( + switchMap((observableObject) => forkJoin(observableObject)), + map((outspends: any) => { + const newOutspends = []; + for (const i in outspends) { + if (outspends.hasOwnProperty(i)) { + newOutspends.push(outspends[i]); + } + } + this._outspends = this._outspends.concat(newOutspends); + return this._outspends; + }), + share(), + ); + } ngOnInit() { this.latestBlock$ = this.stateService.blocks$.pipe(map(([block]) => block)); @@ -65,23 +90,12 @@ export class TransactionsListComponent implements OnInit, OnChanges { this.transactions.forEach((tx, i) => { tx['@voutLimit'] = true; tx['@vinLimit'] = true; - if (this.outspends[i]) { + if (this._outspends[i]) { return; } observableObject[i] = this.electrsApiService.getOutspends$(tx.txid); }); - - forkJoin(observableObject) - .subscribe((outspends: any) => { - const newOutspends = []; - for (const i in outspends) { - if (outspends.hasOwnProperty(i)) { - newOutspends.push(outspends[i]); - } - } - this.outspends = this.outspends.concat(newOutspends); - this.ref.markForCheck(); - }); + this.refreshOutspends$.next(observableObject); } onScroll() { @@ -129,7 +143,10 @@ export class TransactionsListComponent implements OnInit, OnChanges { } toggleDetails() { - this.displayDetails = !this.displayDetails; - this.ref.markForCheck(); + if (this.showDetails$.value === true) { + this.showDetails$.next(false); + } else { + this.showDetails$.next(true); + } } } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 1dbaa90af..cb867ffb3 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -16,6 +16,7 @@ export interface WebsocketResponse { data?: string[]; tx?: Transaction; rbfTransaction?: Transaction; + utxoSpent?: boolean; transactions?: TransactionStripped[]; loadingIndicators?: ILoadingIndicators; backendInfo?: IBackendInfo; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 14d67e765..238cf227c 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -81,6 +81,7 @@ export class StateService { mempoolInfo$ = new ReplaySubject(1); mempoolBlocks$ = new ReplaySubject(1); txReplaced$ = new Subject(); + utxoSpent$ = new Subject(); mempoolTransactions$ = new Subject(); blockTransactions$ = new Subject(); isLoadingWebSocket$ = new ReplaySubject(1); diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index b50cbc494..4d294ae2d 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -251,6 +251,10 @@ export class WebsocketService { this.stateService.bsqPrice$.next(response['bsq-price']); } + if (response.utxoSpent) { + this.stateService.utxoSpent$.next(); + } + if (response.backendInfo) { this.stateService.backendInfo$.next(response.backendInfo); From b2dec5e20a3ac2d7aad0ff5161cfdc168c0cffec Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 28 Feb 2022 17:31:10 +0900 Subject: [PATCH 17/37] Mining dashboard layout matches main dashboard layout --- .../difficulty/difficulty.component.html | 2 +- .../difficulty/difficulty.component.ts | 5 ++- .../hashrate-chart.component.scss | 2 +- .../hashrate-chart-pools.component.html | 2 +- .../hashrate-chart-pools.component.scss | 2 +- .../mining-dashboard.component.html | 42 +++++++++++++++---- .../mining-dashboard.component.scss | 4 -- .../pool-ranking/pool-ranking.component.html | 2 +- .../pool-ranking/pool-ranking.component.scss | 2 +- 9 files changed, 43 insertions(+), 20 deletions(-) diff --git a/frontend/src/app/components/difficulty/difficulty.component.html b/frontend/src/app/components/difficulty/difficulty.component.html index fc3030286..bda189eab 100644 --- a/frontend/src/app/components/difficulty/difficulty.component.html +++ b/frontend/src/app/components/difficulty/difficulty.component.html @@ -1,4 +1,4 @@ -
Difficulty Adjustment
+
Difficulty Adjustment
diff --git a/frontend/src/app/components/difficulty/difficulty.component.ts b/frontend/src/app/components/difficulty/difficulty.component.ts index ff44e5aeb..8714ff9f1 100644 --- a/frontend/src/app/components/difficulty/difficulty.component.ts +++ b/frontend/src/app/components/difficulty/difficulty.component.ts @@ -28,8 +28,9 @@ export class DifficultyComponent implements OnInit { isLoadingWebSocket$: Observable; difficultyEpoch$: Observable; - @Input() showProgress: boolean = true; - @Input() showHalving: boolean = false; + @Input() showProgress = true; + @Input() showHalving = false; + @Input() showTitle = true; constructor( public stateService: StateService, diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss index 316f0fc47..eb97dc067 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 275px; + max-height: 325px; } .formRadioGroup { diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html index 93cec63ca..8750caa56 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -27,7 +27,7 @@
-
+
diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss index 06a3eeb25..7c18b0382 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 275px; + max-height: 325px; } .formRadioGroup { diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 4d811fc9a..3652e9e2d 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -3,26 +3,37 @@
-
+
Placeholder
+
+
+
+ + +
+
Difficulty Adjustment
+
+ +
+
+ + +
+
-
Mining Pools Share (1w)
- - -
+
-
+
-
Hashrate (1y) @@ -31,7 +42,22 @@
-
+
+ + +
+
+
+ +
+ + Mining Pools Dominance (1y) + +
+ +
+
+
\ No newline at end of file diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 4c75e9ea6..4f05686a3 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -12,10 +12,6 @@ .card { background-color: #1d1f31; - height: 340px; -} -.card.double { - height: 620px; } .card-title { diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html index 067c61646..5e6068866 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html @@ -2,7 +2,7 @@
-
+
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index a41891a8f..470eaa112 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -7,7 +7,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 275px; + max-height: 325px; } .formRadioGroup { From 6cdd41a8f7ee08deadbf801409084ec0ee26a24d Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 28 Feb 2022 17:52:55 +0900 Subject: [PATCH 18/37] Add difficulty adjustment table in mining dashboard --- .../hashrate-chart/hashrate-chart.component.html | 13 +++++-------- .../hashrate-chart/hashrate-chart.component.ts | 5 +++-- .../mining-dashboard.component.html | 16 ++++++++++++++-- 3 files changed, 22 insertions(+), 12 deletions(-) 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 ea5c5a2a7..9c30a3334 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 @@
-
+
-
- +
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index 7efb83098..db7d79d93 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -22,7 +22,8 @@ import { selectPowerOfTen } from 'src/app/bitcoin.utils'; `], }) export class HashrateChartComponent implements OnInit { - @Input() widget: boolean = false; + @Input() tableOnly = false; + @Input() widget = false; @Input() right: number | string = 45; @Input() left: number | string = 75; @@ -114,7 +115,7 @@ export class HashrateChartComponent implements OnInit { } return { availableTimespanDay: availableTimespanDay, - difficulty: tableData + difficulty: this.tableOnly ? tableData.slice(0, 8) : tableData }; }), ); diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 3652e9e2d..9d0eebe88 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -44,11 +44,10 @@
- +
-
Mining Pools Dominance (1y) @@ -59,5 +58,18 @@
+
+
+
+
+ + Adjusments + +
+ +
+
+
+
\ No newline at end of file From cf4336eb2eb02ff471e3c1412868bea6e33bb717 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Tue, 1 Mar 2022 18:29:02 +0900 Subject: [PATCH 19/37] Move small pie share into "other" - align labels --- .../pool-ranking/pool-ranking.component.html | 2 +- .../pool-ranking/pool-ranking.component.scss | 2 +- .../pool-ranking/pool-ranking.component.ts | 84 ++++++++++++++++--- 3 files changed, 76 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html index 5e6068866..43b71d4c9 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html @@ -59,7 +59,7 @@
- + diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index 470eaa112..4ba007598 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -1,7 +1,7 @@ .chart { max-height: 400px; @media (max-width: 767.98px) { - max-height: 300px; + max-height: 270px; } } .chart-widget { diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index cef04cca5..cd2970660 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -49,7 +49,7 @@ export class PoolRankingComponent implements OnInit { this.poolsWindowPreference = '1w'; } else { this.seoService.setTitle($localize`:@@mining.mining-pools:Mining Pools`); - this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w'; + this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w'; } this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference }); this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference); @@ -105,22 +105,37 @@ export class PoolRankingComponent implements OnInit { } generatePoolsChartSerieData(miningStats) { - const poolShareThreshold = this.isMobile() ? 1 : 0.5; // Do not draw pools which hashrate share is lower than that + const poolShareThreshold = this.isMobile() ? 2 : 1; // Do not draw pools which hashrate share is lower than that const data: object[] = []; + let totalShareOther = 0; + let totalBlockOther = 0; + let totalEstimatedHashrateOther = 0; + + let edgeDistance: any = '20%'; + if (this.isMobile() && this.widget) { + edgeDistance = 0; + } else if (this.isMobile() && !this.widget || this.widget) { + edgeDistance = 20; + } miningStats.pools.forEach((pool) => { if (parseFloat(pool.share) < poolShareThreshold) { + totalShareOther += parseFloat(pool.share); + totalBlockOther += pool.blockCount; + totalEstimatedHashrateOther += pool.lastEstimatedHashrate; return; } data.push({ itemStyle: { - color: poolsColor[pool.name.replace(/[^a-zA-Z0-9]/g, "").toLowerCase()], + color: poolsColor[pool.name.replace(/[^a-zA-Z0-9]/g, '').toLowerCase()], }, value: pool.share, name: pool.name + (this.isMobile() ? `` : ` (${pool.share}%)`), label: { + overflow: 'none', color: '#b1b1b1', - overflow: 'break', + alignTo: 'edge', + edgeDistance: edgeDistance, }, tooltip: { backgroundColor: 'rgba(17, 19, 31, 1)', @@ -144,6 +159,42 @@ export class PoolRankingComponent implements OnInit { data: pool.poolId, } as PieSeriesOption); }); + + // 'Other' + data.push({ + itemStyle: { + color: 'grey', + }, + value: totalShareOther, + name: 'Other' + (this.isMobile() ? `` : ` (${totalShareOther.toFixed(2)}%)`), + label: { + overflow: 'none', + color: '#b1b1b1', + alignTo: 'edge', + edgeDistance: edgeDistance + }, + tooltip: { + backgroundColor: 'rgba(17, 19, 31, 1)', + borderRadius: 4, + shadowColor: 'rgba(0, 0, 0, 0.5)', + textStyle: { + color: '#b1b1b1', + }, + borderColor: '#000', + formatter: () => { + if (this.poolsWindowPreference === '24h') { + return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + + totalEstimatedHashrateOther.toString() + ' PH/s' + + `
` + totalBlockOther.toString() + ` blocks`; + } else { + return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + + totalBlockOther.toString() + ` blocks`; + } + } + }, + data: 9999 as any, + } as PieSeriesOption); + return data; } @@ -154,9 +205,18 @@ export class PoolRankingComponent implements OnInit { } network = network.charAt(0).toUpperCase() + network.slice(1); - let radius: any[] = ['20%', '70%']; - if (this.isMobile() || this.widget) { - radius = ['20%', '60%']; + let radius: any[] = ['20%', '80%']; + let top: any = undefined; let bottom = undefined; let height = undefined; + if (this.isMobile() && this.widget) { + radius = ['10%', '50%']; + } else if (this.isMobile() && !this.widget) { + top = 0; + height = 300; + radius = ['10%', '50%']; + } else if (this.widget) { + radius = ['15%', '60%']; + } else { + top = 35; } this.chartOptions = { @@ -180,14 +240,15 @@ export class PoolRankingComponent implements OnInit { }, series: [ { - top: this.widget ? 0 : 35, + minShowLabelAngle: 3.6, + top: top, + bottom: bottom, + height: height, name: 'Mining pool', type: 'pie', radius: radius, data: this.generatePoolsChartSerieData(miningStats), labelLine: { - length: this.isMobile() ? 10 : 15, - length2: this.isMobile() ? 0 : 15, lineStyle: { width: 2, }, @@ -223,6 +284,9 @@ export class PoolRankingComponent implements OnInit { this.chartInstance = ec; this.chartInstance.on('click', (e) => { + if (e.data.data === 9999) { // "Other" + return; + } this.router.navigate(['/mining/pool/', e.data.data]); }); } From f9e361a9c0a963c20c7179731b65cb6e7a760625 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 17:21:11 +0100 Subject: [PATCH 20/37] "view more" links - placeholders --- .../hashrate-chart.component.html | 12 ++--- .../hashrate-chart.component.scss | 7 ++- .../hashrate-chart.component.ts | 2 +- .../hashrate-chart-pools.component.scss | 2 +- .../mining-dashboard.component.html | 42 ++++++++++----- .../mining-dashboard.component.scss | 53 +++++++++++++++++++ .../pool-ranking/pool-ranking.component.scss | 5 +- .../pool-ranking/pool-ranking.component.ts | 4 ++ 8 files changed, 103 insertions(+), 24 deletions(-) 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 9c30a3334..eaa9fa809 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html @@ -31,22 +31,22 @@ -
-
{{ pool.rank }} {{ pool.name }}{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }} {{ pool['blockText'] }} {{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)
+
+
- - + + - - + +
Timestamp AdjustedDifficultyChangeDifficultyChange
‎{{ diffChange.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }} {{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%{{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss index eb97dc067..4d9e0e5fa 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 293px; } .formRadioGroup { @@ -48,3 +48,8 @@ } } } + +.compact td { + padding: 0 !important; + margin: 0.15rem !important; +} \ No newline at end of file diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index db7d79d93..0ff9115c7 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -115,7 +115,7 @@ export class HashrateChartComponent implements OnInit { } return { availableTimespanDay: availableTimespanDay, - difficulty: this.tableOnly ? tableData.slice(0, 8) : tableData + difficulty: this.tableOnly ? (this.isMobile() ? tableData.slice(0, 12) : tableData.slice(0, 9)) : tableData }; }), ); diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss index 7c18b0382..4f15e51d6 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 293px; } .formRadioGroup { diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 9d0eebe88..f332aec35 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -20,12 +20,29 @@
-
- - Mining Pools Share (1w) - -
+
+
+
Blocks (1w)
+

+ 1082 +

+
+
+
Miners luck (1w)
+

+ 107.25% +

+
+
+
Miners Gini (1w)
+

+ 0.123 +

+
+
+ +
View more »
@@ -35,11 +52,10 @@
- - Hashrate (1y) - + Hashrate (1y)
+
View more »
@@ -49,11 +65,10 @@
- - Mining Pools Dominance (1y) - + Mining Pools Dominance (1y)
+
View more »
@@ -62,11 +77,10 @@
- - Adjusments - + Adjusments
+
View more »
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 4f05686a3..b2e9abde9 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -16,6 +16,7 @@ .card-title { font-size: 1rem; + color: #4a68b9; } .card-title > a { color: #4a68b9; @@ -54,3 +55,55 @@ text-align: center; padding-bottom: 3px; } + +.pool-distribution { + min-height: 56px; + display: block; + @media (min-width: 485px) { + display: flex; + flex-direction: row; + } + h5 { + margin-bottom: 10px; + } + .item { + width: 50%; + margin: 0px auto 10px; + display: inline-block; + @media (min-width: 485px) { + margin: 0px auto 10px; + } + @media (min-width: 785px) { + margin: 0px auto 0px; + } + &:last-child { + margin: 0px auto 0px; + } + &:nth-child(2) { + order: 2; + @media (min-width: 485px) { + order: 3; + } + } + &:nth-child(3) { + order: 3; + @media (min-width: 485px) { + order: 2; + display: block; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: block; + } + } + .card-text { + font-size: 18px; + span { + color: #ffffff66; + font-size: 12px; + } + } + } +} \ No newline at end of file diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index 4ba007598..ee0cf8e85 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -7,7 +7,10 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 270px; + @media (max-width: 767.98px) { + max-height: 200px; + } } .formRadioGroup { diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index cd2970660..ae252330b 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -208,6 +208,8 @@ export class PoolRankingComponent implements OnInit { let radius: any[] = ['20%', '80%']; let top: any = undefined; let bottom = undefined; let height = undefined; if (this.isMobile() && this.widget) { + top = -30; + height = 270; radius = ['10%', '50%']; } else if (this.isMobile() && !this.widget) { top = 0; @@ -215,6 +217,8 @@ export class PoolRankingComponent implements OnInit { radius = ['10%', '50%']; } else if (this.widget) { radius = ['15%', '60%']; + top = -20; + height = 330; } else { top = 35; } From d45f3c32cfbbf9c7b8de2addd16821504436a8c6 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 18:47:21 +0100 Subject: [PATCH 21/37] Show more stats in pool ranking pie widget --- .../hashrate-chart-pools.component.ts | 4 +- .../mining-dashboard.component.html | 21 ------- .../mining-dashboard.component.scss | 52 ----------------- .../pool-ranking/pool-ranking.component.html | 21 +++++++ .../pool-ranking/pool-ranking.component.scss | 56 +++++++++++++++++++ .../pool-ranking/pool-ranking.component.ts | 3 +- .../src/app/interfaces/node-api.interface.ts | 9 +-- frontend/src/app/services/mining.service.ts | 2 +- 8 files changed, 83 insertions(+), 85 deletions(-) diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts index 3d7935e3d..a131cd979 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -78,7 +78,7 @@ export class HashrateChartPoolsComponent implements OnInit { name: name, showSymbol: false, symbol: 'none', - data: grouped[name].map((val) => [val.timestamp * 1000, (val.share * 100).toFixed(2)]), + data: grouped[name].map((val) => [val.timestamp * 1000, val.share * 100]), type: 'line', lineStyle: { width: 0 }, areaStyle: { opacity: 1 }, @@ -149,7 +149,7 @@ export class HashrateChartPoolsComponent implements OnInit { data.sort((a, b) => b.data[1] - a.data[1]); for (const pool of data) { if (pool.data[1] > 0) { - tooltip += `${pool.marker} ${pool.seriesName}: ${pool.data[1]}%
` + tooltip += `${pool.marker} ${pool.seriesName}: ${pool.data[1].toFixed(2)}%
`; } } return tooltip; diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index f332aec35..88406fbf6 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -20,27 +20,6 @@
-
-
-
Blocks (1w)
-

- 1082 -

-
-
-
Miners luck (1w)
-

- 107.25% -

-
-
-
Miners Gini (1w)
-

- 0.123 -

-
-
-
View more »
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index b2e9abde9..dea5e673f 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -55,55 +55,3 @@ text-align: center; padding-bottom: 3px; } - -.pool-distribution { - min-height: 56px; - display: block; - @media (min-width: 485px) { - display: flex; - flex-direction: row; - } - h5 { - margin-bottom: 10px; - } - .item { - width: 50%; - margin: 0px auto 10px; - display: inline-block; - @media (min-width: 485px) { - margin: 0px auto 10px; - } - @media (min-width: 785px) { - margin: 0px auto 0px; - } - &:last-child { - margin: 0px auto 0px; - } - &:nth-child(2) { - order: 2; - @media (min-width: 485px) { - order: 3; - } - } - &:nth-child(3) { - order: 3; - @media (min-width: 485px) { - order: 2; - display: block; - } - @media (min-width: 768px) { - display: none; - } - @media (min-width: 992px) { - display: block; - } - } - .card-text { - font-size: 18px; - span { - color: #ffffff66; - font-size: 12px; - } - } - } -} \ No newline at end of file diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html index 43b71d4c9..6bba39df4 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html @@ -1,5 +1,26 @@
+
+
+
Pools luck (1w)
+

+ {{ miningStats['minersLuck'] }}% +

+
+
+
Blocks (1w)
+

+ {{ miningStats.blockCount }} +

+
+
+
Pools count (1w)
+

+ {{ miningStats.pools.length }} +

+
+
+
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index ee0cf8e85..f73486395 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -47,3 +47,59 @@ .loadingGraphs.widget { top: 25%; } + +.pool-distribution { + min-height: 56px; + display: block; + @media (min-width: 485px) { + display: flex; + flex-direction: row; + } + h5 { + margin-bottom: 10px; + } + .item { + width: 50%; + margin: 0px auto 10px; + display: inline-block; + @media (min-width: 485px) { + margin: 0px auto 10px; + } + @media (min-width: 785px) { + margin: 0px auto 0px; + } + &:last-child { + margin: 0px auto 0px; + } + &:nth-child(2) { + order: 2; + @media (min-width: 485px) { + order: 3; + } + } + &:nth-child(3) { + order: 3; + @media (min-width: 485px) { + order: 2; + display: block; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: block; + } + } + .card-title { + font-size: 1rem; + color: #4a68b9; + } + .card-text { + font-size: 18px; + span { + color: #ffffff66; + font-size: 12px; + } + } + } +} \ No newline at end of file diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index ae252330b..eacf4683f 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -85,6 +85,7 @@ export class PoolRankingComponent implements OnInit { }), map(data => { data.pools = data.pools.map((pool: SinglePoolStats) => this.formatPoolUI(pool)); + data['minersLuck'] = (100 * (data.blockCount / 1008)).toFixed(2); // luck 1w return data; }), tap(data => { @@ -298,7 +299,7 @@ export class PoolRankingComponent implements OnInit { /** * Default mining stats if something goes wrong */ - getEmptyMiningStat() { + getEmptyMiningStat(): MiningStats { return { lastEstimatedHashrate: 'Error', blockCount: 0, diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index d8760d1f0..a05671257 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -64,7 +64,7 @@ export interface SinglePoolStats { blockCount: number; emptyBlocks: number; rank: number; - share: string; + share: number; lastEstimatedHashrate: string; emptyBlockRatio: string; logo: string; @@ -75,13 +75,6 @@ export interface PoolsStats { oldestIndexedBlockTimestamp: number; pools: SinglePoolStats[]; } -export interface MiningStats { - lastEstimatedHashrate: string; - blockCount: number; - totalEmptyBlock: number; - totalEmptyBlockRatio: string; - pools: SinglePoolStats[]; -} /** * Pool component diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts index c216515b0..68f7e9da1 100644 --- a/frontend/src/app/services/mining.service.ts +++ b/frontend/src/app/services/mining.service.ts @@ -73,7 +73,7 @@ export class MiningService { const totalEmptyBlockRatio = (totalEmptyBlock / stats.blockCount * 100).toFixed(2); const poolsStats = stats.pools.map((poolStat) => { return { - share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2), + share: parseFloat((poolStat.blockCount / stats.blockCount * 100).toFixed(2)), lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / hashrateDivider).toFixed(2), emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2), logo: `./resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg', From 84ef4247520600de547c5b1b01eac8dfa15f10ee Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 19:05:19 +0100 Subject: [PATCH 22/37] Fix halving calculation --- frontend/src/app/components/difficulty/difficulty.component.ts | 2 +- .../components/mining-dashboard/mining-dashboard.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/difficulty/difficulty.component.ts b/frontend/src/app/components/difficulty/difficulty.component.ts index 8714ff9f1..b22001ef1 100644 --- a/frontend/src/app/components/difficulty/difficulty.component.ts +++ b/frontend/src/app/components/difficulty/difficulty.component.ts @@ -98,7 +98,7 @@ export class DifficultyComponent implements OnInit { colorPreviousAdjustments = '#ffffff66'; } - const blocksUntilHalving = block.height % 210000; + const blocksUntilHalving = 210000 - (block.height % 210000); const timeUntilHalving = (blocksUntilHalving * timeAvgMins * 60 * 1000) + (now * 1000); return { diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 88406fbf6..cd8330321 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -12,7 +12,7 @@
Difficulty Adjustment
- +
From bc133937784dec2828d77e10dc7121803d062f33 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 11:22:54 +0100 Subject: [PATCH 23/37] Implement temporary reward stats for the mining dashboard --- .../difficulty/difficulty.component.html | 2 +- .../mining-dashboard.component.html | 41 +++++++-- .../mining-dashboard.component.scss | 88 +++++++++++++++++++ .../mining-dashboard.component.ts | 35 +++++++- .../pool-ranking/pool-ranking.component.ts | 4 +- 5 files changed, 159 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/components/difficulty/difficulty.component.html b/frontend/src/app/components/difficulty/difficulty.component.html index bda189eab..3684b8de4 100644 --- a/frontend/src/app/components/difficulty/difficulty.component.html +++ b/frontend/src/app/components/difficulty/difficulty.component.html @@ -47,7 +47,7 @@
-
Next halving
+
Next Halving
{{ i }} blocks diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index cd8330321..6dbb541c3 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -3,8 +3,35 @@
-
Placeholder
+
Reward stats
+
+
+
+
Miners Reward
+
+ +
in the last 8 blocks
+
+
+
+
Reward Per Tx
+
+ {{ rewardStats.rewardPerTx }} + sats/tx +
in the last 8 blocks
+
+
+
+
Average Fee
+
+ {{ rewardStats.feePerTx }} + sats/tx +
in the last 8 blocks
+
+
+
+
@@ -21,7 +48,8 @@
-
View more »
+
View more + »
@@ -34,7 +62,8 @@ Hashrate (1y) -
View more »
+
View more + »
@@ -47,7 +76,8 @@ Mining Pools Dominance (1y) -
View more »
+
View + more »
@@ -59,7 +89,8 @@ Adjusments -
View more »
+
View more + »
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index dea5e673f..828ee7ed0 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -55,3 +55,91 @@ text-align: center; padding-bottom: 3px; } + +.general-stats { + min-height: 56px; + display: block; + @media (min-width: 485px) { + display: flex; + flex-direction: row; + } + h5 { + margin-bottom: 10px; + } + .item { + width: 50%; + margin: 0px auto 10px; + display: inline-block; + @media (min-width: 485px) { + margin: 0px auto 10px; + } + @media (min-width: 785px) { + margin: 0px auto 0px; + } + &:last-child { + margin: 0px auto 0px; + } + &:nth-child(2) { + order: 2; + @media (min-width: 485px) { + order: 3; + } + } + &:nth-child(3) { + order: 3; + @media (min-width: 485px) { + order: 2; + display: block; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: block; + } + } + .card-title { + font-size: 1rem; + color: #4a68b9; + } + .card-text { + font-size: 18px; + span { + color: #ffffff66; + font-size: 12px; + } + } + } +} + +.difficulty-adjustment-container { + display: flex; + flex-direction: row; + justify-content: space-around; + height: 76px; + .shared-block { + color: #ffffff66; + font-size: 12px; + } + .item { + padding: 0 5px; + width: 100%; + &:nth-child(1) { + display: none; + @media (min-width: 485px) { + display: table-cell; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: table-cell; + } + } + } + .card-text { + font-size: 22px; + margin-top: -9px; + position: relative; + } +} diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts index aac546ca1..b4cc95a1e 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts @@ -1,5 +1,10 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnDestroy, OnInit } from '@angular/core'; +import { map } from 'rxjs/operators'; import { SeoService } from 'src/app/services/seo.service'; +import { StateService } from 'src/app/services/state.service'; +import { formatNumber } from '@angular/common'; +import { WebsocketService } from 'src/app/services/websocket.service'; +import { Observable } from 'rxjs'; @Component({ selector: 'app-mining-dashboard', @@ -8,12 +13,36 @@ import { SeoService } from 'src/app/services/seo.service'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class MiningDashboardComponent implements OnInit { + private blocks = []; - constructor(private seoService: SeoService) { + public $rewardStats: Observable; + public totalReward = 0; + public rewardPerTx = '~'; + public feePerTx = '~'; + + constructor(private seoService: SeoService, + public stateService: StateService, + private websocketService: WebsocketService, + @Inject(LOCALE_ID) private locale: string, + ) { this.seoService.setTitle($localize`:@@mining.mining-dashboard:Mining Dashboard`); } ngOnInit(): void { - } + this.$rewardStats = this.stateService.blocks$.pipe( + map(([block]) => { + this.blocks.push(block); + this.blocks = this.blocks.slice(0, 8); + const totalTx = this.blocks.reduce((acc, block) => acc + block.tx_count, 0); + const totalFee = this.blocks.reduce((acc, block) => acc + block.extras?.totalFees ?? 0, 0); + const totalReward = this.blocks.reduce((acc, block) => acc + block.extras?.reward ?? 0, 0); + return { + 'totalReward': totalReward, + 'rewardPerTx': formatNumber(totalReward / totalTx, this.locale, '1.0-0'), + 'feePerTx': formatNumber(totalFee / totalTx, this.locale, '1.0-0'), + } + }) + ); + } } diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index eacf4683f..646cae06b 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -116,7 +116,7 @@ export class PoolRankingComponent implements OnInit { if (this.isMobile() && this.widget) { edgeDistance = 0; } else if (this.isMobile() && !this.widget || this.widget) { - edgeDistance = 20; + edgeDistance = 35; } miningStats.pools.forEach((pool) => { @@ -131,7 +131,7 @@ export class PoolRankingComponent implements OnInit { color: poolsColor[pool.name.replace(/[^a-zA-Z0-9]/g, '').toLowerCase()], }, value: pool.share, - name: pool.name + (this.isMobile() ? `` : ` (${pool.share}%)`), + name: pool.name + ((this.isMobile() || this.widget) ? `` : ` (${pool.share}%)`), label: { overflow: 'none', color: '#b1b1b1', From 05342079b305abbec282f5f3916cadae34d920ba Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 11:41:41 +0100 Subject: [PATCH 24/37] Disable mining charts iteration on mobile widgets --- .../app/components/hashrate-chart/hashrate-chart.component.ts | 1 + .../hashrates-chart-pools/hashrate-chart-pools.component.ts | 1 + .../src/app/components/pool-ranking/pool-ranking.component.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index 0ff9115c7..a5f2b63b8 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -142,6 +142,7 @@ export class HashrateChartComponent implements OnInit { bottom: this.widget ? 30 : 60, }, tooltip: { + show: !this.isMobile() || !this.widget, trigger: 'axis', axisPointer: { type: 'line' diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts index a131cd979..7e3f081a6 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -132,6 +132,7 @@ export class HashrateChartPoolsComponent implements OnInit { top: this.widget ? 10 : 40, }, tooltip: { + show: !this.isMobile() || !this.widget, trigger: 'axis', axisPointer: { type: 'line' diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index 646cae06b..64641c31d 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -139,6 +139,7 @@ export class PoolRankingComponent implements OnInit { edgeDistance: edgeDistance, }, tooltip: { + show: !this.isMobile() || !this.widget, backgroundColor: 'rgba(17, 19, 31, 1)', borderRadius: 4, shadowColor: 'rgba(0, 0, 0, 0.5)', From d188ab3c09d7d54516e43e1f4d8789a294631c2f Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 7 Mar 2022 13:14:34 +0100 Subject: [PATCH 25/37] Handle missing asset registry for inputs refs #1246 --- .../transactions-list/transactions-list.component.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index f80953738..aad157d59 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -73,9 +73,12 @@ 		-
+
+ + {{ vin.prevout.value }} {{ vin.prevout.asset | slice : 0 : 7 }} + From 32d66c03c6bb2a898c0ca23319faac475d4251b6 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 15:56:07 +0100 Subject: [PATCH 26/37] Truncate hashrates table only for bitcoin (db migration v9) --- backend/src/api/database-migration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index c66148fe0..38ceb250b 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -133,7 +133,7 @@ class DatabaseMigration { await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD `type` enum("daily", "weekly") DEFAULT "daily"'); } - if (databaseSchemaVersion < 9) { + if (databaseSchemaVersion < 9 && isBitcoin === true) { logger.warn(`'hashrates' table has been truncated. Re-indexing from scratch.'`); await this.$executeQuery(connection, 'TRUNCATE hashrates;'); // Need to re-index await this.$executeQuery(connection, 'ALTER TABLE `state` CHANGE `name` `name` varchar(100)'); From 8837b8c88217f4f710e2a016ea36b8f98b0dcfdd Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 17:16:26 +0100 Subject: [PATCH 27/37] Actually use the past 8 blocks for reward stats --- .../components/mining-dashboard/mining-dashboard.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts index b4cc95a1e..3931cbc36 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts @@ -31,7 +31,7 @@ export class MiningDashboardComponent implements OnInit { ngOnInit(): void { this.$rewardStats = this.stateService.blocks$.pipe( map(([block]) => { - this.blocks.push(block); + this.blocks.unshift(block); this.blocks = this.blocks.slice(0, 8); const totalTx = this.blocks.reduce((acc, block) => acc + block.tx_count, 0); const totalFee = this.blocks.reduce((acc, block) => acc + block.extras?.totalFees ?? 0, 0); From 2435e7bfe97e6ea8fbe8b4931a32deb2fc6d8398 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 18:19:02 +0100 Subject: [PATCH 28/37] Shorten reward stats --- .../mining-dashboard/mining-dashboard.component.html | 4 ++-- .../mining-dashboard/mining-dashboard.component.ts | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 6dbb541c3..9a820ce76 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -17,7 +17,7 @@
Reward Per Tx
- {{ rewardStats.rewardPerTx }} + {{ rewardStats.rewardPerTx | amountShortener }} sats/tx
in the last 8 blocks
@@ -25,7 +25,7 @@
Average Fee
- {{ rewardStats.feePerTx }} + {{ rewardStats.feePerTx | amountShortener}} sats/tx
in the last 8 blocks
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts index 3931cbc36..606bac5f1 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts @@ -2,8 +2,6 @@ import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnDestroy, OnIni import { map } from 'rxjs/operators'; import { SeoService } from 'src/app/services/seo.service'; import { StateService } from 'src/app/services/state.service'; -import { formatNumber } from '@angular/common'; -import { WebsocketService } from 'src/app/services/websocket.service'; import { Observable } from 'rxjs'; @Component({ @@ -22,7 +20,6 @@ export class MiningDashboardComponent implements OnInit { constructor(private seoService: SeoService, public stateService: StateService, - private websocketService: WebsocketService, @Inject(LOCALE_ID) private locale: string, ) { this.seoService.setTitle($localize`:@@mining.mining-dashboard:Mining Dashboard`); @@ -39,8 +36,8 @@ export class MiningDashboardComponent implements OnInit { return { 'totalReward': totalReward, - 'rewardPerTx': formatNumber(totalReward / totalTx, this.locale, '1.0-0'), - 'feePerTx': formatNumber(totalFee / totalTx, this.locale, '1.0-0'), + 'rewardPerTx': totalReward / totalTx, + 'feePerTx': totalFee / totalTx, } }) ); From 1318c4aa369d9517a4bc2cc30032f5e2d3dd096d Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 18:42:47 +0100 Subject: [PATCH 29/37] Fix broken navigation when clicking on pie chart --- .../app/components/pool-ranking/pool-ranking.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index 64641c31d..01b36ab74 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, NgZone, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Router } from '@angular/router'; import { EChartsOption, PieSeriesOption } from 'echarts'; @@ -41,6 +41,7 @@ export class PoolRankingComponent implements OnInit { private miningService: MiningService, private seoService: SeoService, private router: Router, + private zone: NgZone, ) { } @@ -293,7 +294,9 @@ export class PoolRankingComponent implements OnInit { if (e.data.data === 9999) { // "Other" return; } - this.router.navigate(['/mining/pool/', e.data.data]); + this.zone.run(() => { + this.router.navigate(['/mining/pool/', e.data.data]); + }); }); } From 6f3443faba091a90c3247877b532d120c04add74 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 7 Mar 2022 19:45:09 +0100 Subject: [PATCH 30/37] UTXO spent tracking refactor refs #1301 --- backend/src/api/websocket-handler.ts | 18 +++-- .../transactions-list.component.html | 8 +-- .../transactions-list.component.ts | 71 +++++++++++-------- .../src/app/interfaces/websocket.interface.ts | 2 +- frontend/src/app/services/state.service.ts | 2 +- .../src/app/services/websocket.service.ts | 2 +- 6 files changed, 59 insertions(+), 44 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index a2ae6d0c9..92abaab6d 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -332,11 +332,18 @@ class WebsocketHandler { } if (client['track-tx']) { - const utxoSpent = newTransactions.some((tx) => { - return tx.vin.some((vin) => vin.txid === client['track-tx']); - }); - if (utxoSpent) { - response['utxoSpent'] = true; + const outspends: object = {}; + newTransactions.forEach((tx) => tx.vin.forEach((vin, i) => { + if (vin.txid === client['track-tx']) { + outspends[vin.vout] = { + vin: i, + txid: tx.txid, + }; + } + })); + + if (Object.keys(outspends).length) { + response['utxoSpent'] = outspends; } if (rbfTransactions[client['track-tx']]) { @@ -414,7 +421,6 @@ class WebsocketHandler { } if (client['track-tx'] && txIds.indexOf(client['track-tx']) > -1) { - client['track-tx'] = null; response['txConfirmed'] = true; } diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 200356ffd..1470e6211 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -186,16 +186,16 @@
- + + - + - + diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index fd3cf0241..7d3c5d0e4 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -1,11 +1,11 @@ -import { Component, OnInit, Input, ChangeDetectionStrategy, OnChanges, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Input, ChangeDetectionStrategy, OnChanges, Output, EventEmitter, ChangeDetectorRef } from '@angular/core'; import { StateService } from '../../services/state.service'; -import { Observable, forkJoin, ReplaySubject, BehaviorSubject, merge } from 'rxjs'; +import { Observable, forkJoin, ReplaySubject, BehaviorSubject, merge, of, Subject, Subscription } from 'rxjs'; import { Outspend, Transaction } from '../../interfaces/electrs.interface'; import { ElectrsApiService } from '../../services/electrs-api.service'; import { environment } from 'src/environments/environment'; import { AssetsService } from 'src/app/services/assets.service'; -import { map, share, switchMap } from 'rxjs/operators'; +import { map, share, switchMap, tap } from 'rxjs/operators'; import { BlockExtended } from 'src/app/interfaces/node-api.interface'; @Component({ @@ -27,41 +27,18 @@ export class TransactionsListComponent implements OnInit, OnChanges { @Output() loadMore = new EventEmitter(); latestBlock$: Observable; - outspends$: Observable; + outspendsSubscription: Subscription; refreshOutspends$: ReplaySubject = new ReplaySubject(); showDetails$ = new BehaviorSubject(false); - _outspends: Outspend[] = []; + outspends: Outspend[][] = []; assetsMinimal: any; constructor( public stateService: StateService, private electrsApiService: ElectrsApiService, private assetsService: AssetsService, - ) { - this.outspends$ = merge( - this.refreshOutspends$, - this.stateService.utxoSpent$ - .pipe( - map(() => { - this._outspends = []; - return { 0: this.electrsApiService.getOutspends$(this.transactions[0].txid) }; - }), - ) - ).pipe( - switchMap((observableObject) => forkJoin(observableObject)), - map((outspends: any) => { - const newOutspends = []; - for (const i in outspends) { - if (outspends.hasOwnProperty(i)) { - newOutspends.push(outspends[i]); - } - } - this._outspends = this._outspends.concat(newOutspends); - return this._outspends; - }), - share(), - ); - } + private ref: ChangeDetectorRef, + ) { } ngOnInit() { this.latestBlock$ = this.stateService.blocks$.pipe(map(([block]) => block)); @@ -72,6 +49,34 @@ export class TransactionsListComponent implements OnInit, OnChanges { this.assetsMinimal = assets; }); } + + this.outspendsSubscription = merge( + this.refreshOutspends$ + .pipe( + switchMap((observableObject) => forkJoin(observableObject)), + map((outspends: any) => { + const newOutspends: Outspend[] = []; + for (const i in outspends) { + if (outspends.hasOwnProperty(i)) { + newOutspends.push(outspends[i]); + } + } + this.outspends = this.outspends.concat(newOutspends); + }), + ), + this.stateService.utxoSpent$ + .pipe( + map((utxoSpent) => { + for (const i in utxoSpent) { + this.outspends[0][i] = { + spent: true, + txid: utxoSpent[i].txid, + vin: utxoSpent[i].vin, + }; + } + }), + ) + ).subscribe(() => this.ref.markForCheck()); } ngOnChanges() { @@ -90,7 +95,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { this.transactions.forEach((tx, i) => { tx['@voutLimit'] = true; tx['@vinLimit'] = true; - if (this._outspends[i]) { + if (this.outspends[i]) { return; } observableObject[i] = this.electrsApiService.getOutspends$(tx.txid); @@ -149,4 +154,8 @@ export class TransactionsListComponent implements OnInit, OnChanges { this.showDetails$.next(true); } } + + ngOnDestroy() { + this.outspendsSubscription.unsubscribe(); + } } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index cb867ffb3..d82d9a618 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -16,7 +16,7 @@ export interface WebsocketResponse { data?: string[]; tx?: Transaction; rbfTransaction?: Transaction; - utxoSpent?: boolean; + utxoSpent?: object; transactions?: TransactionStripped[]; loadingIndicators?: ILoadingIndicators; backendInfo?: IBackendInfo; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 238cf227c..85ce7b567 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -81,7 +81,7 @@ export class StateService { mempoolInfo$ = new ReplaySubject(1); mempoolBlocks$ = new ReplaySubject(1); txReplaced$ = new Subject(); - utxoSpent$ = new Subject(); + utxoSpent$ = new Subject(); mempoolTransactions$ = new Subject(); blockTransactions$ = new Subject(); isLoadingWebSocket$ = new ReplaySubject(1); diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index 4d294ae2d..f99524197 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -252,7 +252,7 @@ export class WebsocketService { } if (response.utxoSpent) { - this.stateService.utxoSpent$.next(); + this.stateService.utxoSpent$.next(response.utxoSpent); } if (response.backendInfo) { From 2b91ced4d675f32001711447b77744e46d1d8317 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 19:54:17 +0100 Subject: [PATCH 31/37] Add skeleton in the mining dashboard page --- .../hashrate-chart.component.html | 4 +- .../hashrate-chart.component.ts | 2 +- .../hashrate-chart-pools.component.html | 2 +- .../mining-dashboard.component.html | 30 ++++- .../mining-dashboard.component.scss | 104 +++++++----------- .../pool-ranking/pool-ranking.component.html | 62 ++++++++--- .../pool-ranking/pool-ranking.component.scss | 9 +- 7 files changed, 122 insertions(+), 91 deletions(-) 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 eaa9fa809..c58861d36 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html @@ -25,13 +25,13 @@ -
-
+
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index a5f2b63b8..b5db5bb65 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -15,7 +15,7 @@ import { selectPowerOfTen } from 'src/app/bitcoin.utils'; styles: [` .loadingGraphs { position: absolute; - top: 38%; + top: 50%; left: calc(50% - 15px); z-index: 100; } diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html index 8750caa56..69da008d2 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -25,7 +25,7 @@ -
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 6dbb541c3..38d3284ac 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -2,11 +2,12 @@
+
Reward stats
-
+
Miners Reward
@@ -34,6 +35,31 @@
+ +
+
+
Miners Reward
+
+
+
+
+
+
+
Reward Per Tx
+
+
+
+
+
+
+
Average Fee
+
+
+
+
+
+
+
@@ -96,4 +122,4 @@
-
\ No newline at end of file +
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 828ee7ed0..fb2663812 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -44,7 +44,7 @@ .fade-border { -webkit-mask-image: linear-gradient(to right, transparent 0%, black 10%, black 80%, transparent 100%) } - + .main-title { position: relative; color: #ffffff91; @@ -56,39 +56,22 @@ padding-bottom: 3px; } -.general-stats { - min-height: 56px; - display: block; - @media (min-width: 485px) { - display: flex; +.fee-estimation-container { + display: flex; + justify-content: space-between; + @media (min-width: 376px) { flex-direction: row; } - h5 { - margin-bottom: 10px; - } .item { - width: 50%; - margin: 0px auto 10px; - display: inline-block; - @media (min-width: 485px) { - margin: 0px auto 10px; + max-width: 150px; + margin: 0; + width: -webkit-fill-available; + @media (min-width: 376px) { + margin: 0 auto 0px; } - @media (min-width: 785px) { - margin: 0px auto 0px; - } - &:last-child { - margin: 0px auto 0px; - } - &:nth-child(2) { - order: 2; + &:first-child{ + display: none; @media (min-width: 485px) { - order: 3; - } - } - &:nth-child(3) { - order: 3; - @media (min-width: 485px) { - order: 2; display: block; } @media (min-width: 768px) { @@ -98,48 +81,37 @@ display: block; } } - .card-title { - font-size: 1rem; - color: #4a68b9; + &:last-child { + margin-bottom: 0; } - .card-text { - font-size: 18px; - span { - color: #ffffff66; - font-size: 12px; - } + .card-text span { + color: #ffffff66; + font-size: 12px; + top: 0px; + } + .fee-text{ + border-bottom: 1px solid #ffffff1c; + width: fit-content; + margin: auto; + line-height: 1.45; + padding: 0px 2px; + } + .fiat { + display: block; + font-size: 14px !important; } } } -.difficulty-adjustment-container { - display: flex; - flex-direction: row; - justify-content: space-around; - height: 76px; - .shared-block { - color: #ffffff66; - font-size: 12px; +.skeleton-loader { + width: 100%; + display: block; + &:first-child { + max-width: 90px; + margin: 15px auto 3px; } - .item { - padding: 0 5px; - width: 100%; - &:nth-child(1) { - display: none; - @media (min-width: 485px) { - display: table-cell; - } - @media (min-width: 768px) { - display: none; - } - @media (min-width: 992px) { - display: table-cell; - } - } - } - .card-text { - font-size: 22px; - margin-top: -9px; - position: relative; + &:last-child { + margin: 10px auto 3px; + max-width: 55px; } } diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html index 6bba39df4..9a1dc01b2 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html @@ -1,23 +1,25 @@
-
-
-
Pools luck (1w)
-

- {{ miningStats['minersLuck'] }}% -

-
-
-
Blocks (1w)
-

- {{ miningStats.blockCount }} -

-
-
-
Pools count (1w)
-

- {{ miningStats.pools.length }} -

+
+
+
+
Pools luck (1w)
+

+ {{ miningStats['minersLuck'] }}% +

+
+
+
Blocks (1w)
+

+ {{ miningStats.blockCount }} +

+
+
+
Pools count (1w)
+

+ {{ miningStats.pools.length }} +

+
@@ -96,3 +98,27 @@
+ + + +
+
+
Pools luck (1w)
+

+ +

+
+
+
Blocks (1w)
+

+ +

+
+
+
Pools count (1w)
+

+ +

+
+
+ \ No newline at end of file diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index f73486395..d25148df1 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -102,4 +102,11 @@ } } } -} \ No newline at end of file +} + +.skeleton-loader { + width: 100%; + display: block; + max-width: 80px; + margin: 15px auto 3px; +} From b7254e7acae74388fb6aeb83c36158f17bd685fe Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 7 Mar 2022 18:06:07 +0100 Subject: [PATCH 32/37] Replace difficulty adjustment timestamp with block height --- .../hashrate-chart.component.html | 38 ++++++++-------- .../hashrate-chart.component.scss | 44 +++++++++++++++++-- .../hashrate-chart.component.ts | 2 +- .../mining-dashboard.component.html | 2 +- 4 files changed, 60 insertions(+), 26 deletions(-) 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 c58861d36..79d7a9f1b 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html @@ -31,25 +31,23 @@
-
- - - - - - - - - - - - - - - - - -
TimestampAdjustedDifficultyChange
‎{{ diffChange.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}{{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%
-
+ + + + + + + + + + + + + + + + + +
HeightAdjustedDifficultyChange
{{ diffChange.height }}{{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss index 4d9e0e5fa..c68e2f406 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss @@ -49,7 +49,43 @@ } } -.compact td { - padding: 0 !important; - margin: 0.15rem !important; -} \ No newline at end of file +.latest-transactions { + width: 100%; + text-align: left; + table-layout:fixed; + tr, td, th { + border: 0px; + } + td { + width: 25%; + } + .table-cell-satoshis { + display: none; + text-align: right; + @media (min-width: 576px) { + display: table-cell; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 1100px) { + display: table-cell; + } + } + .table-cell-fiat { + display: none; + text-align: right; + @media (min-width: 485px) { + display: table-cell; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: table-cell; + } + } + .table-cell-fees { + text-align: right; + } +} diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index b5db5bb65..948ffed41 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -115,7 +115,7 @@ export class HashrateChartComponent implements OnInit { } return { availableTimespanDay: availableTimespanDay, - difficulty: this.tableOnly ? (this.isMobile() ? tableData.slice(0, 12) : tableData.slice(0, 9)) : tableData + difficulty: this.tableOnly ? tableData.slice(0, 5) : tableData }; }), ); diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 2fb47427f..dff5436f0 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -112,7 +112,7 @@
- Adjusments + Adjustments
View more From 2ea78566a635fd96c6f086c808da97429a877922 Mon Sep 17 00:00:00 2001 From: bosch Date: Tue, 8 Mar 2022 11:09:43 +0800 Subject: [PATCH 33/37] Added new Zeus logo. --- contributors/bosch-0.txt | 3 +++ frontend/src/resources/profile/zeus.png | Bin 72479 -> 19695 bytes 2 files changed, 3 insertions(+) create mode 100644 contributors/bosch-0.txt diff --git a/contributors/bosch-0.txt b/contributors/bosch-0.txt new file mode 100644 index 000000000..366abbd7b --- /dev/null +++ b/contributors/bosch-0.txt @@ -0,0 +1,3 @@ +I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022. + +Signed: Bosch-0 diff --git a/frontend/src/resources/profile/zeus.png b/frontend/src/resources/profile/zeus.png index 0beb70f76e18ff22a2c905bfca3112f4fcfcdbb8..de7f54f550d2c0e676f68a227b6a19ceb91dbac7 100644 GIT binary patch literal 19695 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 bsGD_s*XNJ&agm$x9PDLkY-NPI?)La!v0CqU From 26ee4204ac68ee718338db0adb4789cce2976112 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Tue, 8 Mar 2022 17:10:29 +0100 Subject: [PATCH 34/37] Index blocks.blockTimestamp --- backend/src/api/database-migration.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index 38ceb250b..36cb68e07 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -140,6 +140,10 @@ class DatabaseMigration { await this.$executeQuery(connection, 'ALTER TABLE `hashrates` ADD UNIQUE `hashrate_timestamp_pool_id` (`hashrate_timestamp`, `pool_id`)'); } + if (databaseSchemaVersion < 10 && isBitcoin === true) { + await this.$executeQuery(connection, 'ALTER TABLE `blocks` ADD INDEX `blockTimestamp` (`blockTimestamp`)'); + } + connection.release(); } catch (e) { connection.release(); From f85771e03fac0929881bb1c4cc5ab69d1507443d Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 8 Mar 2022 14:49:25 +0100 Subject: [PATCH 35/37] Replace by fee storage fixes #1222 --- backend/src/api/mempool.ts | 12 +++++ backend/src/api/rbf-cache.ts | 34 +++++++++++++ backend/src/api/websocket-handler.ts | 48 +++++++++++-------- .../transaction/transaction.component.html | 4 +- .../transaction/transaction.component.ts | 16 +++++-- .../src/app/interfaces/websocket.interface.ts | 6 ++- frontend/src/app/services/state.service.ts | 4 +- .../src/app/services/websocket.service.ts | 4 ++ 8 files changed, 98 insertions(+), 30 deletions(-) create mode 100644 backend/src/api/rbf-cache.ts diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts index 64505ba2b..43aea6059 100644 --- a/backend/src/api/mempool.ts +++ b/backend/src/api/mempool.ts @@ -8,6 +8,7 @@ import { IBitcoinApi } from './bitcoin/bitcoin-api.interface'; import loadingIndicators from './loading-indicators'; import bitcoinClient from './bitcoin/bitcoin-client'; import bitcoinSecondClient from './bitcoin/bitcoin-second-client'; +import rbfCache from './rbf-cache'; class Mempool { private static WEBSOCKET_REFRESH_RATE_MS = 10000; @@ -200,6 +201,17 @@ class Mempool { logger.debug('Mempool updated in ' + time / 1000 + ' seconds'); } + public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended; }) { + for (const rbfTransaction in rbfTransactions) { + if (this.mempoolCache[rbfTransaction]) { + // Store replaced transactions + rbfCache.add(rbfTransaction, rbfTransactions[rbfTransaction].txid); + // Erase the replaced transactions from the local mempool + delete this.mempoolCache[rbfTransaction]; + } + } + } + private updateTxPerSecond() { const nowMinusTimeSpan = new Date().getTime() - (1000 * config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD); this.txPerSecondArray = this.txPerSecondArray.filter((unixTime) => unixTime > nowMinusTimeSpan); diff --git a/backend/src/api/rbf-cache.ts b/backend/src/api/rbf-cache.ts new file mode 100644 index 000000000..3162ad263 --- /dev/null +++ b/backend/src/api/rbf-cache.ts @@ -0,0 +1,34 @@ +export interface CachedRbf { + txid: string; + expires: Date; +} + +class RbfCache { + private cache: { [txid: string]: CachedRbf; } = {}; + + constructor() { + setInterval(this.cleanup.bind(this), 1000 * 60 * 60); + } + + public add(replacedTxId: string, newTxId: string): void { + this.cache[replacedTxId] = { + expires: new Date(Date.now() + 1000 * 604800), // 1 week + txid: newTxId, + }; + } + + public get(txId: string): CachedRbf | undefined { + return this.cache[txId]; + } + + private cleanup(): void { + const currentDate = new Date(); + for (const c in this.cache) { + if (this.cache[c].expires < currentDate) { + delete this.cache[c]; + } + } + } +} + +export default new RbfCache(); diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 92abaab6d..fe43a725f 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -11,6 +11,7 @@ import { Common } from './common'; import loadingIndicators from './loading-indicators'; import config from '../config'; import transactionUtils from './transaction-utils'; +import rbfCache from './rbf-cache'; class WebsocketHandler { private wss: WebSocket.Server | undefined; @@ -48,29 +49,38 @@ class WebsocketHandler { if (parsedMessage && parsedMessage['track-tx']) { if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-tx'])) { client['track-tx'] = parsedMessage['track-tx']; - // Client is telling the transaction wasn't found but it might have appeared before we had the time to start watching for it + // Client is telling the transaction wasn't found if (parsedMessage['watch-mempool']) { - const tx = memPool.getMempool()[client['track-tx']]; - if (tx) { - if (config.MEMPOOL.BACKEND === 'esplora') { - response['tx'] = tx; + const rbfCacheTx = rbfCache.get(client['track-tx']); + if (rbfCacheTx) { + response['txReplaced'] = { + txid: rbfCacheTx.txid, + }; + client['track-tx'] = null; + } else { + // It might have appeared before we had the time to start watching for it + const tx = memPool.getMempool()[client['track-tx']]; + if (tx) { + if (config.MEMPOOL.BACKEND === 'esplora') { + response['tx'] = tx; + } else { + // tx.prevout is missing from transactions when in bitcoind mode + try { + const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true); + response['tx'] = fullTx; + } catch (e) { + logger.debug('Error finding transaction: ' + (e instanceof Error ? e.message : e)); + } + } } else { - // tx.prevouts is missing from transactions when in bitcoind mode try { - const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true); + const fullTx = await transactionUtils.$getTransactionExtended(client['track-tx'], true); response['tx'] = fullTx; } catch (e) { - logger.debug('Error finding transaction: ' + (e instanceof Error ? e.message : e)); + logger.debug('Error finding transaction. ' + (e instanceof Error ? e.message : e)); + client['track-mempool-tx'] = parsedMessage['track-tx']; } } - } else { - try { - const fullTx = await transactionUtils.$getTransactionExtended(client['track-tx'], true); - response['tx'] = fullTx; - } catch (e) { - logger.debug('Error finding transaction. ' + (e instanceof Error ? e.message : e)); - client['track-mempool-tx'] = parsedMessage['track-tx']; - } } } } else { @@ -221,14 +231,10 @@ class WebsocketHandler { mempoolBlocks.updateMempoolBlocks(newMempool); const mBlocks = mempoolBlocks.getMempoolBlocks(); - const mempool = memPool.getMempool(); const mempoolInfo = memPool.getMempoolInfo(); const vBytesPerSecond = memPool.getVBytesPerSecond(); const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions); - - for (const rbfTransaction in rbfTransactions) { - delete mempool[rbfTransaction]; - } + memPool.handleRbfTransactions(rbfTransactions); this.wss.clients.forEach(async (client: WebSocket) => { if (client.readyState !== WebSocket.OPEN) { diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 381c59d29..a0c92cbb4 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -3,13 +3,13 @@
- +

Transaction

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 8b8526336..bc33098db 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -37,6 +37,8 @@ export class TransactionComponent implements OnInit, OnDestroy { transactionTime = -1; subscription: Subscription; fetchCpfpSubscription: Subscription; + txReplacedSubscription: Subscription; + blocksSubscription: Subscription; rbfTransaction: undefined | Transaction; cpfpInfo: CpfpInfo | null; showCpfpDetails = false; @@ -217,7 +219,7 @@ export class TransactionComponent implements OnInit, OnDestroy { } ); - this.stateService.blocks$.subscribe(([block, txConfirmed]) => { + this.blocksSubscription = this.stateService.blocks$.subscribe(([block, txConfirmed]) => { this.latestBlock = block; if (txConfirmed && this.tx) { @@ -232,9 +234,13 @@ export class TransactionComponent implements OnInit, OnDestroy { } }); - this.stateService.txReplaced$.subscribe( - (rbfTransaction) => (this.rbfTransaction = rbfTransaction) - ); + this.txReplacedSubscription = this.stateService.txReplaced$.subscribe((rbfTransaction) => { + if (!rbfTransaction.size) { + this.error = new Error(); + this.waitingForTransaction = false; + } + this.rbfTransaction = rbfTransaction; + }); } handleLoadElectrsTransactionError(error: any): Observable { @@ -302,6 +308,8 @@ export class TransactionComponent implements OnInit, OnDestroy { ngOnDestroy() { this.subscription.unsubscribe(); this.fetchCpfpSubscription.unsubscribe(); + this.txReplacedSubscription.unsubscribe(); + this.blocksSubscription.unsubscribe(); this.leaveTransaction(); } } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index d82d9a618..b0ae27f73 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -15,7 +15,8 @@ export interface WebsocketResponse { action?: string; data?: string[]; tx?: Transaction; - rbfTransaction?: Transaction; + rbfTransaction?: ReplacedTransaction; + txReplaced?: ReplacedTransaction; utxoSpent?: object; transactions?: TransactionStripped[]; loadingIndicators?: ILoadingIndicators; @@ -27,6 +28,9 @@ export interface WebsocketResponse { 'track-bisq-market'?: string; } +export interface ReplacedTransaction extends Transaction { + txid: string; +} export interface MempoolBlock { blink?: boolean; height?: number; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 85ce7b567..98a65d34a 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable } from 'rxjs'; import { Transaction } from '../interfaces/electrs.interface'; -import { IBackendInfo, MempoolBlock, MempoolInfo, TransactionStripped } from '../interfaces/websocket.interface'; +import { IBackendInfo, MempoolBlock, MempoolInfo, ReplacedTransaction, TransactionStripped } from '../interfaces/websocket.interface'; import { BlockExtended, OptimizedMempoolStats } from '../interfaces/node-api.interface'; import { Router, NavigationStart } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; @@ -80,7 +80,7 @@ export class StateService { bsqPrice$ = new ReplaySubject(1); mempoolInfo$ = new ReplaySubject(1); mempoolBlocks$ = new ReplaySubject(1); - txReplaced$ = new Subject(); + txReplaced$ = new Subject(); utxoSpent$ = new Subject(); mempoolTransactions$ = new Subject(); blockTransactions$ = new Subject(); diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index f99524197..ae4c0e381 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -239,6 +239,10 @@ export class WebsocketService { this.stateService.txReplaced$.next(response.rbfTransaction); } + if (response.txReplaced) { + this.stateService.txReplaced$.next(response.txReplaced); + } + if (response['mempool-blocks']) { this.stateService.mempoolBlocks$.next(response['mempool-blocks']); } From b15de021f79d52e373dc2ef3359ed88af8b8b552 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 8 Mar 2022 18:08:53 +0100 Subject: [PATCH 36/37] Fixing bug where RBF wasn't detected when using bitcoind --- backend/src/api/websocket-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index fe43a725f..77b4ef1a1 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -358,7 +358,7 @@ class WebsocketHandler { const rbfTx = rbfTransactions[rbfTransaction]; if (config.MEMPOOL.BACKEND !== 'esplora') { try { - const fullTx = await transactionUtils.$getTransactionExtended(rbfTransaction, true); + const fullTx = await transactionUtils.$getTransactionExtended(rbfTx.txid, true); response['rbfTransaction'] = fullTx; } catch (e) { logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e)); From 8267344cdc0239425a4750cc19ca5c69101d3d91 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 8 Mar 2022 18:54:49 +0100 Subject: [PATCH 37/37] Don't push full RBF-transactions to prevent old states. --- backend/src/api/websocket-handler.ts | 14 +++----------- .../transaction/transaction.component.ts | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 77b4ef1a1..87d1fb59f 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -355,17 +355,9 @@ class WebsocketHandler { if (rbfTransactions[client['track-tx']]) { for (const rbfTransaction in rbfTransactions) { if (client['track-tx'] === rbfTransaction) { - const rbfTx = rbfTransactions[rbfTransaction]; - if (config.MEMPOOL.BACKEND !== 'esplora') { - try { - const fullTx = await transactionUtils.$getTransactionExtended(rbfTx.txid, true); - response['rbfTransaction'] = fullTx; - } catch (e) { - logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e)); - } - } else { - response['rbfTransaction'] = rbfTx; - } + response['rbfTransaction'] = { + txid: rbfTransactions[rbfTransaction].txid, + }; break; } } diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index bc33098db..4788b5657 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -235,7 +235,7 @@ export class TransactionComponent implements OnInit, OnDestroy { }); this.txReplacedSubscription = this.stateService.txReplaced$.subscribe((rbfTransaction) => { - if (!rbfTransaction.size) { + if (!this.tx) { this.error = new Error(); this.waitingForTransaction = false; }