From 6cae3256a91fa05ba7ba916c0780d3efd64bc5a4 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 11 May 2023 21:42:19 -0700 Subject: [PATCH 01/21] Update node CI test matrix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ff25b22f..17876df11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - node: ["16.16.0", "18.14.1"] + node: ["16", "17", "18", "19", "20"] flavor: ["dev", "prod"] fail-fast: false runs-on: "ubuntu-latest" @@ -55,7 +55,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - node: ["16.16.0", "18.14.1"] + node: ["16", "17", "18", "19", "20"] flavor: ["dev", "prod"] fail-fast: false runs-on: "ubuntu-latest" From b0478f66045fa90568af4111c74b86e86c310aa1 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 11 May 2023 22:15:29 -0700 Subject: [PATCH 02/21] Remove node 19 and 20 due to Angular incompatibility --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17876df11..54259241b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - node: ["16", "17", "18", "19", "20"] + node: ["16", "17", "18"] flavor: ["dev", "prod"] fail-fast: false runs-on: "ubuntu-latest" @@ -55,7 +55,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" strategy: matrix: - node: ["16", "17", "18", "19", "20"] + node: ["16", "17", "18"] flavor: ["dev", "prod"] fail-fast: false runs-on: "ubuntu-latest" From 73d629d319991d13e02302dc70e2e0a2606e5ede Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 14 Jun 2023 18:58:49 -0400 Subject: [PATCH 03/21] Add luminex as enterprise sponsor on about page --- .../src/app/components/about/about.component.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 2936606ad..b364ca7f3 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -173,6 +173,21 @@ Exodus + + + + + + + + + + Luminex + From 816f410855320df546b0542a4b00a1a3f8290196 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:17:05 -0400 Subject: [PATCH 04/21] Make luminex css class unique --- frontend/src/app/components/about/about.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index b364ca7f3..9b2bdf6c0 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -177,14 +177,14 @@ - - - + + + Luminex From 9bfc2c9413ba1fb002d186160bce2016dd81526e Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Tue, 20 Jun 2023 19:49:58 -0400 Subject: [PATCH 05/21] Update ronindojo link on about page --- frontend/src/app/components/about/about.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 2936606ad..b6fc127d6 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -205,7 +205,7 @@ myNode - + RoninDojo From e18f3800be99a3eeb87443ce822a1dc3d244a6c8 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 21 Jun 2023 19:07:00 -0400 Subject: [PATCH 06/21] Hotfix for undefined cpfp cluster bug --- backend/src/repositories/CpfpRepository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/repositories/CpfpRepository.ts b/backend/src/repositories/CpfpRepository.ts index e712e6009..1ad80864b 100644 --- a/backend/src/repositories/CpfpRepository.ts +++ b/backend/src/repositories/CpfpRepository.ts @@ -120,8 +120,8 @@ class CpfpRepository { [clusterRoot] ); const cluster = clusterRows[0]; - cluster.effectiveFeePerVsize = cluster.fee_rate; if (cluster?.txs) { + cluster.effectiveFeePerVsize = cluster.fee_rate; cluster.txs = this.unpack(cluster.txs); return cluster; } From 329c635da5a0416c573af32502479a29ba2bc9df Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 21 Jun 2023 19:53:35 -0400 Subject: [PATCH 07/21] Fix getCpfpInfo error handling --- backend/src/api/bitcoin/bitcoin.routes.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/api/bitcoin/bitcoin.routes.ts b/backend/src/api/bitcoin/bitcoin.routes.ts index 0a343c376..c31fe1a09 100644 --- a/backend/src/api/bitcoin/bitcoin.routes.ts +++ b/backend/src/api/bitcoin/bitcoin.routes.ts @@ -224,7 +224,12 @@ class BitcoinRoutes { } else { let cpfpInfo; if (config.DATABASE.ENABLED) { - cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId); + try { + cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId); + } catch (e) { + res.status(500).send('failed to get CPFP info'); + return; + } } if (cpfpInfo) { res.json(cpfpInfo); From 9ff5ce0d372c627205e11c107aaa73cb06c22ab2 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 21 Jun 2023 19:54:02 -0400 Subject: [PATCH 08/21] Change order of cpfp db operations --- backend/src/repositories/CpfpRepository.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/src/repositories/CpfpRepository.ts b/backend/src/repositories/CpfpRepository.ts index 1ad80864b..90ba2ac80 100644 --- a/backend/src/repositories/CpfpRepository.ts +++ b/backend/src/repositories/CpfpRepository.ts @@ -78,14 +78,6 @@ class CpfpRepository { const maxChunk = 100; let chunkIndex = 0; - // insert transactions in batches of up to 100 rows - while (chunkIndex < txs.length) { - const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk); - await transactionRepository.$batchSetCluster(chunk); - chunkIndex += maxChunk; - } - - chunkIndex = 0; // insert clusters in batches of up to 100 rows while (chunkIndex < clusterValues.length) { const chunk = clusterValues.slice(chunkIndex, chunkIndex + maxChunk); @@ -103,6 +95,15 @@ class CpfpRepository { ); chunkIndex += maxChunk; } + + chunkIndex = 0; + // insert transactions in batches of up to 100 rows + while (chunkIndex < txs.length) { + const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk); + await transactionRepository.$batchSetCluster(chunk); + chunkIndex += maxChunk; + } + return true; } catch (e: any) { logger.err(`Cannot save cpfp clusters into db. Reason: ` + (e instanceof Error ? e.message : e)); From 1f442b9ea61c0a88911084f6ca4d6f285fff40d8 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 22 Jun 2023 11:52:43 -0400 Subject: [PATCH 09/21] Make cpfp db save operations atomic --- backend/src/api/blocks.ts | 10 +++- backend/src/database.ts | 33 ++++++++++- backend/src/repositories/CpfpRepository.ts | 58 ++++--------------- .../src/repositories/TransactionRepository.ts | 26 ++++++--- 4 files changed, 65 insertions(+), 62 deletions(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index fae1d453b..a91281050 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -1050,9 +1050,13 @@ class Blocks { } public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise { - const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.clusters); - if (!result) { - await cpfpRepository.$insertProgressMarker(height); + try { + const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.clusters); + if (!result) { + await cpfpRepository.$insertProgressMarker(height); + } + } catch (e) { + // not a fatal error, we'll try again next time the indexer runs } } } diff --git a/backend/src/database.ts b/backend/src/database.ts index 070774c92..6ad545fda 100644 --- a/backend/src/database.ts +++ b/backend/src/database.ts @@ -30,7 +30,7 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr } public async query(query, params?): Promise<[T, FieldPacket[]]> + OkPacket[] | ResultSetHeader>(query, params?, connection?: PoolConnection): Promise<[T, FieldPacket[]]> { this.checkDBFlag(); let hardTimeout; @@ -45,7 +45,9 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr reject(new Error(`DB query failed to return, reject or time out within ${hardTimeout / 1000}s - ${query?.sql?.slice(0, 160) || (typeof(query) === 'string' || query instanceof String ? query?.slice(0, 160) : 'unknown query')}`)); }, hardTimeout); - this.getPool().then(pool => { + // Use a specific connection if provided, otherwise delegate to the pool + const connectionPromise = connection ? Promise.resolve(connection) : this.getPool(); + connectionPromise.then((pool: PoolConnection | Pool) => { return pool.query(query, params) as Promise<[T, FieldPacket[]]>; }).then(result => { resolve(result); @@ -61,6 +63,33 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr } } + public async $atomicQuery(queries: { query, params }[]): Promise<[T, FieldPacket[]][]> + { + const pool = await this.getPool(); + const connection = await pool.getConnection(); + try { + await connection.beginTransaction(); + + const results: [T, FieldPacket[]][] = []; + for (const query of queries) { + const result = await this.query(query.query, query.params, connection) as [T, FieldPacket[]]; + results.push(result); + } + + await connection.commit(); + + return results; + } catch (e) { + logger.err('Could not complete db transaction, rolling back: ' + (e instanceof Error ? e.message : e)); + connection.rollback(); + connection.release(); + throw e; + } finally { + connection.release(); + } + } + public async checkDbConnection() { this.checkDBFlag(); try { diff --git a/backend/src/repositories/CpfpRepository.ts b/backend/src/repositories/CpfpRepository.ts index 90ba2ac80..b33ff1e4a 100644 --- a/backend/src/repositories/CpfpRepository.ts +++ b/backend/src/repositories/CpfpRepository.ts @@ -5,52 +5,10 @@ import { Ancestor, CpfpCluster } from '../mempool.interfaces'; import transactionRepository from '../repositories/TransactionRepository'; class CpfpRepository { - public async $saveCluster(clusterRoot: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number): Promise { - if (!txs[0]) { - return false; - } - // skip clusters of transactions with the same fees - const roundedEffectiveFee = Math.round(effectiveFeePerVsize * 100) / 100; - const equalFee = txs.length > 1 && txs.reduce((acc, tx) => { - return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee); - }, true); - if (equalFee) { - return false; - } - - try { - const packedTxs = Buffer.from(this.pack(txs)); - await DB.query( - ` - INSERT INTO compact_cpfp_clusters(root, height, txs, fee_rate) - VALUE (UNHEX(?), ?, ?, ?) - ON DUPLICATE KEY UPDATE - height = ?, - txs = ?, - fee_rate = ? - `, - [clusterRoot, height, packedTxs, effectiveFeePerVsize, height, packedTxs, effectiveFeePerVsize] - ); - const maxChunk = 10; - let chunkIndex = 0; - while (chunkIndex < txs.length) { - const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk).map(tx => { - return { txid: tx.txid, cluster: clusterRoot }; - }); - await transactionRepository.$batchSetCluster(chunk); - chunkIndex += maxChunk; - } - return true; - } catch (e: any) { - logger.err(`Cannot save cpfp cluster into db. Reason: ` + (e instanceof Error ? e.message : e)); - throw e; - } - } - public async $batchSaveClusters(clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[]): Promise { try { - const clusterValues: any[] = []; - const txs: any[] = []; + const clusterValues: [string, number, Buffer, number][] = []; + const txs: { txid: string, cluster: string }[] = []; for (const cluster of clusters) { if (cluster.txs?.length) { @@ -76,6 +34,8 @@ class CpfpRepository { return false; } + const queries: { query, params }[] = []; + const maxChunk = 100; let chunkIndex = 0; // insert clusters in batches of up to 100 rows @@ -89,10 +49,10 @@ class CpfpRepository { return (' (UNHEX(?), ?, ?, ?)'); }) + ';'; const values = chunk.flat(); - await DB.query( + queries.push({ query, - values - ); + params: values, + }); chunkIndex += maxChunk; } @@ -100,10 +60,12 @@ class CpfpRepository { // insert transactions in batches of up to 100 rows while (chunkIndex < txs.length) { const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk); - await transactionRepository.$batchSetCluster(chunk); + queries.push(transactionRepository.buildBatchSetQuery(chunk)); chunkIndex += maxChunk; } + await DB.$atomicQuery(queries); + return true; } catch (e: any) { logger.err(`Cannot save cpfp clusters into db. Reason: ` + (e instanceof Error ? e.message : e)); diff --git a/backend/src/repositories/TransactionRepository.ts b/backend/src/repositories/TransactionRepository.ts index bde95df9b..b5067f790 100644 --- a/backend/src/repositories/TransactionRepository.ts +++ b/backend/src/repositories/TransactionRepository.ts @@ -25,9 +25,8 @@ class TransactionRepository { } } - public async $batchSetCluster(txs): Promise { - try { - let query = ` + public buildBatchSetQuery(txs: { txid: string, cluster: string }[]): { query, params } { + let query = ` INSERT IGNORE INTO compact_transactions ( txid, @@ -35,13 +34,22 @@ class TransactionRepository { ) VALUES `; - query += txs.map(tx => { - return (' (UNHEX(?), UNHEX(?))'); - }) + ';'; - const values = txs.map(tx => [tx.txid, tx.cluster]).flat(); + query += txs.map(tx => { + return (' (UNHEX(?), UNHEX(?))'); + }) + ';'; + const values = txs.map(tx => [tx.txid, tx.cluster]).flat(); + return { + query, + params: values, + }; + } + + public async $batchSetCluster(txs): Promise { + try { + const query = this.buildBatchSetQuery(txs); await DB.query( - query, - values + query.query, + query.params, ); } catch (e: any) { logger.err(`Cannot save cpfp transactions into db. Reason: ` + (e instanceof Error ? e.message : e)); From d9ed02a0331be5d04ee47984bf7830551839220e Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 29 Jun 2023 11:22:33 -0400 Subject: [PATCH 10/21] Fix transaction component ETA --- .../mempool-blocks.component.ts | 5 ++++- .../transaction/transaction.component.html | 2 +- .../transaction/transaction.component.ts | 19 ++++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 561f01585..a72d24899 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -143,6 +143,8 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { this.mempoolBlocksFull = JSON.parse(stringifiedBlocks); this.mempoolBlocks = this.reduceMempoolBlocksToFitScreen(JSON.parse(stringifiedBlocks)); + this.now = Date.now(); + this.updateMempoolBlockStyles(); this.calculateTransactionPosition(); return this.mempoolBlocks; @@ -152,7 +154,8 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { this.difficultyAdjustments$ = this.stateService.difficultyAdjustment$ .pipe( map((da) => { - this.now = new Date().getTime(); + this.now = Date.now(); + this.cd.markForCheck(); return da; }) ); diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index a5a44ee90..216114cd0 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -105,7 +105,7 @@ - + diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index dd32b05e8..e7fbaa913 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -19,7 +19,7 @@ import { WebsocketService } from '../../services/websocket.service'; import { AudioService } from '../../services/audio.service'; import { ApiService } from '../../services/api.service'; import { SeoService } from '../../services/seo.service'; -import { BlockExtended, CpfpInfo, RbfTree, MempoolPosition } from '../../interfaces/node-api.interface'; +import { BlockExtended, CpfpInfo, RbfTree, MempoolPosition, DifficultyAdjustment } from '../../interfaces/node-api.interface'; import { LiquidUnblinding } from './liquid-ublinding'; import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; import { Price, PriceService } from '../../services/price.service'; @@ -65,7 +65,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { fetchCachedTx$ = new Subject(); isCached: boolean = false; now = Date.now(); - timeAvg$: Observable; + da$: Observable; liquidUnblinding = new LiquidUnblinding(); inputIndex: number; outputIndex: number; @@ -117,11 +117,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { this.setFlowEnabled(); }); - this.timeAvg$ = timer(0, 1000) - .pipe( - switchMap(() => this.stateService.difficultyAdjustment$), - map((da) => da.timeAvg) - ); + this.da$ = this.stateService.difficultyAdjustment$.pipe( + tap(() => { + this.now = Date.now(); + }) + ); this.urlFragmentSubscription = this.route.fragment.subscribe((fragment) => { this.fragmentParams = new URLSearchParams(fragment || ''); @@ -236,6 +236,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { }); this.mempoolPositionSubscription = this.stateService.mempoolTxPosition$.subscribe(txPosition => { + this.now = Date.now(); if (txPosition && txPosition.txid === this.txId && txPosition.position) { this.mempoolPosition = txPosition.position; if (this.tx && !this.tx.status.confirmed) { @@ -434,12 +435,12 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { }); this.mempoolBlocksSubscription = this.stateService.mempoolBlocks$.subscribe((mempoolBlocks) => { + this.now = Date.now(); + if (!this.tx || this.mempoolPosition) { return; } - this.now = Date.now(); - const txFeePerVSize = this.tx.effectiveFeePerVsize || this.tx.fee / (this.tx.weight / 4); From e4f3642082721d87901794364049da09e64fa7bd Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 15 Mar 2023 11:43:18 +0900 Subject: [PATCH 11/21] Redesign mempool block fee distribution graph --- .../fee-distribution-graph.component.ts | 74 +++++++++++++++++-- .../mempool-block.component.html | 4 +- .../mempool-block/mempool-block.component.ts | 3 + frontend/src/app/services/state.service.ts | 29 +++++++- frontend/src/styles.scss | 2 +- 5 files changed, 100 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts index 8c90036fd..e75719191 100644 --- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts +++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts @@ -1,5 +1,8 @@ import { OnChanges } from '@angular/core'; import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import { TransactionStripped } from '../../interfaces/websocket.interface'; +import { StateService } from '../../services/state.service'; +import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe'; @Component({ selector: 'app-fee-distribution-graph', @@ -7,41 +10,99 @@ import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core changeDetection: ChangeDetectionStrategy.OnPush, }) export class FeeDistributionGraphComponent implements OnInit, OnChanges { - @Input() data: any; + @Input() transactions: TransactionStripped[]; @Input() height: number | string = 210; @Input() top: number | string = 20; @Input() right: number | string = 22; @Input() left: number | string = 30; + @Input() numSamples: number = 200; + @Input() numLabels: number = 10; + + data: number[][]; + labelInterval: number = 50; mempoolVsizeFeesOptions: any; mempoolVsizeFeesInitOptions = { renderer: 'svg' }; - constructor() { } + constructor( + private stateService: StateService, + private vbytesPipe: VbytesPipe, + ) { } ngOnInit() { this.mountChart(); } ngOnChanges() { + this.prepareChart(); this.mountChart(); } + prepareChart() { + this.data = []; + if (!this.transactions?.length) { + return; + } + const samples = []; + const txs = this.transactions.map(tx => { return { vsize: tx.vsize, rate: tx.rate || (tx.fee / tx.vsize) }; }).sort((a, b) => { return b.rate - a.rate; }); + const maxBlockVSize = this.stateService.env.BLOCK_WEIGHT_UNITS / 4; + const sampleInterval = maxBlockVSize / this.numSamples; + let cumVSize = 0; + let sampleIndex = 0; + let nextSample = 0; + let txIndex = 0; + this.labelInterval = this.numSamples / this.numLabels; + while (nextSample <= maxBlockVSize) { + if (txIndex >= txs.length) { + samples.push([1 - (sampleIndex / this.numSamples), 0]); + nextSample += sampleInterval; + sampleIndex++; + break; + } + + while (txs[txIndex] && nextSample < cumVSize + txs[txIndex].vsize) { + samples.push([1 - (sampleIndex / this.numSamples), txs[txIndex].rate]); + nextSample += sampleInterval; + sampleIndex++; + } + cumVSize += txs[txIndex].vsize; + txIndex++; + } + this.data = samples.reverse(); + } + mountChart() { this.mempoolVsizeFeesOptions = { grid: { height: '210', right: '20', top: '22', - left: '30', + left: '40', }, xAxis: { type: 'category', boundaryGap: false, + name: 'MvB', + nameLocation: 'middle', + nameGap: 0, + nameTextStyle: { + verticalAlign: 'top', + padding: [30, 0, 0, 0], + }, + axisLabel: { + interval: (index: number): boolean => { return index && (index % this.labelInterval === 0); }, + formatter: (value: number): string => { return Number(value).toFixed(1); }, + }, + axisTick: { + interval: (index:number): boolean => { return (index % this.labelInterval === 0); }, + }, }, yAxis: { type: 'value', + // name: 'Effective Fee Rate s/vb', + // nameLocation: 'middle', splitLine: { lineStyle: { type: 'dotted', @@ -58,14 +119,13 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { position: 'top', color: '#ffffff', textShadowBlur: 0, - formatter: (label: any) => { - return Math.floor(label.data); - }, + formatter: (label: any): string => '' + Math.floor(label.data[1]), }, + showAllSymbol: false, smooth: true, lineStyle: { color: '#D81B60', - width: 4, + width: 1, }, itemStyle: { color: '#b71c1c', diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index 3626e6ff5..66d024b8c 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -39,11 +39,11 @@ - +
- +
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.ts b/frontend/src/app/components/mempool-block/mempool-block.component.ts index b9bdc55bb..cb3a38172 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.ts +++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts @@ -17,6 +17,7 @@ export class MempoolBlockComponent implements OnInit, OnDestroy { network$: Observable; mempoolBlockIndex: number; mempoolBlock$: Observable; + mempoolBlockTransactions$: Observable; ordinal$: BehaviorSubject = new BehaviorSubject(''); previewTx: TransactionStripped | void; webGlEnabled: boolean; @@ -62,6 +63,8 @@ export class MempoolBlockComponent implements OnInit, OnDestroy { }) ); + this.mempoolBlockTransactions$ = this.stateService.liveMempoolBlockTransactions$.pipe(map(txMap => Object.values(txMap))); + this.network$ = this.stateService.networkChanged$; } diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 31f5f3aab..fb3b37e05 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -1,11 +1,11 @@ import { Inject, Injectable, PLATFORM_ID, LOCALE_ID } from '@angular/core'; -import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable } from 'rxjs'; +import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable, merge } from 'rxjs'; import { Transaction } from '../interfaces/electrs.interface'; import { IBackendInfo, MempoolBlock, MempoolBlockWithTransactions, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, TransactionStripped } from '../interfaces/websocket.interface'; import { BlockExtended, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree } from '../interfaces/node-api.interface'; import { Router, NavigationStart } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; -import { map, shareReplay } from 'rxjs/operators'; +import { map, scan, shareReplay, tap } from 'rxjs/operators'; import { StorageService } from './storage.service'; interface MarkBlockState { @@ -100,6 +100,7 @@ export class StateService { mempoolBlocks$ = new ReplaySubject(1); mempoolBlockTransactions$ = new Subject(); mempoolBlockDelta$ = new Subject(); + liveMempoolBlockTransactions$: Observable<{ [txid: string]: TransactionStripped}>; txReplaced$ = new Subject(); txRbfInfo$ = new Subject(); rbfLatest$ = new Subject(); @@ -166,6 +167,30 @@ export class StateService { this.blocks$ = new ReplaySubject<[BlockExtended, string]>(this.env.KEEP_BLOCKS_AMOUNT); + this.liveMempoolBlockTransactions$ = merge( + this.mempoolBlockTransactions$.pipe(map(transactions => { return { transactions }; })), + this.mempoolBlockDelta$.pipe(map(delta => { return { delta }; })), + ).pipe(scan((transactions: { [txid: string]: TransactionStripped }, change: any): { [txid: string]: TransactionStripped } => { + if (change.transactions) { + const txMap = {} + change.transactions.forEach(tx => { + txMap[tx.txid] = tx; + }) + return txMap; + } else { + change.delta.changed.forEach(tx => { + transactions[tx.txid].rate = tx.rate; + }) + change.delta.removed.forEach(txid => { + delete transactions[txid]; + }); + change.delta.added.forEach(tx => { + transactions[tx.txid] = tx; + }); + return transactions; + } + }, {})); + if (this.env.BASE_MODULE === 'bisq') { this.network = this.env.BASE_MODULE; this.networkChanged$.next(this.env.BASE_MODULE); diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index b38a60898..aea8e8d6e 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -500,7 +500,7 @@ html:lang(ru) .card-title { } .fee-distribution-chart { - height: 250px; + height: 265px; } .fees-wrapper-tooltip-chart { From 9f2b98b246e184b4cf140fedbe7ccc7741cf3c67 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 7 Jun 2023 13:22:27 -0400 Subject: [PATCH 12/21] Handle stack-of-N-blocks in new fee graph --- backend/src/api/mempool-blocks.ts | 4 ++-- .../fee-distribution-graph.component.ts | 17 +++++++++++++---- .../mempool-block/mempool-block.component.html | 4 ++-- .../mempool-block/mempool-block.component.ts | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/backend/src/api/mempool-blocks.ts b/backend/src/api/mempool-blocks.ts index 224e31744..57d1a393f 100644 --- a/backend/src/api/mempool-blocks.ts +++ b/backend/src/api/mempool-blocks.ts @@ -143,7 +143,7 @@ class MempoolBlocks { const stackWeight = transactionsSorted.slice(index).reduce((total, tx) => total + (tx.weight || 0), 0); if (stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS) { onlineStats = true; - feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5); + feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]); feeStatsCalculator.processNext(tx); } } @@ -334,7 +334,7 @@ class MempoolBlocks { if (hasBlockStack) { stackWeight = blocks[blocks.length - 1].reduce((total, tx) => total + (mempool[tx]?.weight || 0), 0); hasBlockStack = stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS; - feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5); + feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]); } const readyBlocks: { transactionIds, transactions, totalSize, totalWeight, totalFees, feeStats }[] = []; diff --git a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts index e75719191..d20a9612f 100644 --- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts +++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts @@ -10,6 +10,8 @@ import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class FeeDistributionGraphComponent implements OnInit, OnChanges { + @Input() feeRange: number[]; + @Input() vsize: number; @Input() transactions: TransactionStripped[]; @Input() height: number | string = 210; @Input() top: number | string = 20; @@ -18,6 +20,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { @Input() numSamples: number = 200; @Input() numLabels: number = 10; + simple: boolean = false; data: number[][]; labelInterval: number = 50; @@ -36,11 +39,17 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { } ngOnChanges() { + this.simple = !!this.feeRange?.length; this.prepareChart(); this.mountChart(); } prepareChart() { + if (this.simple) { + this.data = this.feeRange.map((rate, index) => [index * 10, rate]); + this.labelInterval = 1; + return; + } this.data = []; if (!this.transactions?.length) { return; @@ -56,14 +65,14 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { this.labelInterval = this.numSamples / this.numLabels; while (nextSample <= maxBlockVSize) { if (txIndex >= txs.length) { - samples.push([1 - (sampleIndex / this.numSamples), 0]); + samples.push([(1 - (sampleIndex / this.numSamples)) * 100, 0]); nextSample += sampleInterval; sampleIndex++; break; } while (txs[txIndex] && nextSample < cumVSize + txs[txIndex].vsize) { - samples.push([1 - (sampleIndex / this.numSamples), txs[txIndex].rate]); + samples.push([(1 - (sampleIndex / this.numSamples)) * 100, txs[txIndex].rate]); nextSample += sampleInterval; sampleIndex++; } @@ -84,7 +93,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { xAxis: { type: 'category', boundaryGap: false, - name: 'MvB', + name: '% Weight', nameLocation: 'middle', nameGap: 0, nameTextStyle: { @@ -93,7 +102,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { }, axisLabel: { interval: (index: number): boolean => { return index && (index % this.labelInterval === 0); }, - formatter: (value: number): string => { return Number(value).toFixed(1); }, + formatter: (value: number): string => { return Number(value).toFixed(0); }, }, axisTick: { interval: (index:number): boolean => { return (index % this.labelInterval === 0); }, diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index 66d024b8c..7d5b18ccb 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -39,11 +39,11 @@ - +
- +
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.ts b/frontend/src/app/components/mempool-block/mempool-block.component.ts index cb3a38172..6e0b21196 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.ts +++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts @@ -54,6 +54,7 @@ export class MempoolBlockComponent implements OnInit, OnDestroy { const ordinal = this.getOrdinal(mempoolBlocks[this.mempoolBlockIndex]); this.ordinal$.next(ordinal); this.seoService.setTitle(ordinal); + mempoolBlocks[this.mempoolBlockIndex].isStack = mempoolBlocks[this.mempoolBlockIndex].blockVSize > this.stateService.blockVSize; return mempoolBlocks[this.mempoolBlockIndex]; }) ); From 86f51e39020401b48a0c8c3195f0153a73ddecef Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 12 Jun 2023 11:54:58 -0400 Subject: [PATCH 13/21] fix fee graph for underfilled blocks --- .../fee-distribution-graph.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts index d20a9612f..d41aa444d 100644 --- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts +++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts @@ -68,7 +68,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { samples.push([(1 - (sampleIndex / this.numSamples)) * 100, 0]); nextSample += sampleInterval; sampleIndex++; - break; + continue; } while (txs[txIndex] && nextSample < cumVSize + txs[txIndex].vsize) { @@ -128,7 +128,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { position: 'top', color: '#ffffff', textShadowBlur: 0, - formatter: (label: any): string => '' + Math.floor(label.data[1]), + formatter: (label: any): string => '' + (label.data[1] > 99.5 ? Math.round(label.data[1]) : label.data[1].toFixed(1)), }, showAllSymbol: false, smooth: true, From eca40f94c9f62dbedf618c306f424f954dae4fa7 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Fri, 30 Jun 2023 19:41:12 -0400 Subject: [PATCH 14/21] use power-of-ten formatting for large fee rates --- .../fee-distribution-graph.component.ts | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts index d41aa444d..823d271a1 100644 --- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts +++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts @@ -3,6 +3,7 @@ import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core import { TransactionStripped } from '../../interfaces/websocket.interface'; import { StateService } from '../../services/state.service'; import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe'; +import { selectPowerOfTen } from '../../bitcoin.utils'; @Component({ selector: 'app-fee-distribution-graph', @@ -34,17 +35,17 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { private vbytesPipe: VbytesPipe, ) { } - ngOnInit() { + ngOnInit(): void { this.mountChart(); } - ngOnChanges() { + ngOnChanges(): void { this.simple = !!this.feeRange?.length; this.prepareChart(); this.mountChart(); } - prepareChart() { + prepareChart(): void { if (this.simple) { this.data = this.feeRange.map((rate, index) => [index * 10, rate]); this.labelInterval = 1; @@ -82,7 +83,7 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { this.data = samples.reverse(); } - mountChart() { + mountChart(): void { this.mempoolVsizeFeesOptions = { grid: { height: '210', @@ -118,6 +119,13 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { color: '#ffffff66', opacity: 0.25, } + }, + axisLabel: { + formatter: (value: number): string => { + const selectedPowerOfTen = selectPowerOfTen(value); + const newVal = Math.round(value / selectedPowerOfTen.divider); + return `${newVal}${selectedPowerOfTen.unit}`; + }, } }, series: [{ @@ -128,7 +136,12 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges { position: 'top', color: '#ffffff', textShadowBlur: 0, - formatter: (label: any): string => '' + (label.data[1] > 99.5 ? Math.round(label.data[1]) : label.data[1].toFixed(1)), + formatter: (label: { data: number[] }): string => { + const value = label.data[1]; + const selectedPowerOfTen = selectPowerOfTen(value); + const newVal = Math.round(value / selectedPowerOfTen.divider); + return `${newVal}${selectedPowerOfTen.unit}`; + }, }, showAllSymbol: false, smooth: true, From ca6ddd609d13fdccf31b1ba36593a25412baf0dc Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 12 Jun 2023 15:31:47 -0400 Subject: [PATCH 15/21] clean up backend websocket logic --- backend/src/api/blocks.ts | 10 +- backend/src/api/websocket-handler.ts | 164 ++++++++++++++++++--------- backend/src/index.ts | 2 +- 3 files changed, 117 insertions(+), 59 deletions(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index fae1d453b..bc6c9638e 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -730,6 +730,11 @@ class Blocks { this.currentDifficulty = block.difficulty; } + // wait for pending async callbacks to finish + this.updateTimerProgress(timer, `waiting for async callbacks to complete for ${this.currentBlockHeight}`); + await Promise.all(callbackPromises); + this.updateTimerProgress(timer, `async callbacks completed for ${this.currentBlockHeight}`); + this.blocks.push(blockExtended); if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) { this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4); @@ -746,11 +751,6 @@ class Blocks { diskCache.$saveCacheToDisk(); } - // wait for pending async callbacks to finish - this.updateTimerProgress(timer, `waiting for async callbacks to complete for ${this.currentBlockHeight}`); - await Promise.all(callbackPromises); - this.updateTimerProgress(timer, `async callbacks completed for ${this.currentBlockHeight}`); - handledBlocks++; } diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 8aaab5ab5..dd7cdc8f2 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -22,6 +22,14 @@ import { deepClone } from '../utils/clone'; import priceUpdater from '../tasks/price-updater'; import { ApiPrice } from '../repositories/PricesRepository'; +// valid 'want' subscriptions +const wantable = [ + 'blocks', + 'mempool-blocks', + 'live-2h-chart', + 'stats', +]; + class WebsocketHandler { private wss: WebSocket.Server | undefined; private extraInitProperties = {}; @@ -30,7 +38,7 @@ class WebsocketHandler { private numConnected = 0; private numDisconnected = 0; - private initData: { [key: string]: string } = {}; + private socketData: { [key: string]: string } = {}; private serializedInitData: string = '{}'; constructor() { } @@ -39,28 +47,28 @@ class WebsocketHandler { this.wss = wss; } - setExtraInitProperties(property: string, value: any) { + setExtraInitData(property: string, value: any) { this.extraInitProperties[property] = value; - this.setInitDataFields(this.extraInitProperties); + this.updateSocketDataFields(this.extraInitProperties); } - private setInitDataFields(data: { [property: string]: any }): void { + private updateSocketDataFields(data: { [property: string]: any }): void { for (const property of Object.keys(data)) { if (data[property] != null) { - this.initData[property] = JSON.stringify(data[property]); + this.socketData[property] = JSON.stringify(data[property]); } else { - delete this.initData[property]; + delete this.socketData[property]; } } this.serializedInitData = '{' - + Object.keys(this.initData).map(key => `"${key}": ${this.initData[key]}`).join(', ') - + '}'; + + Object.keys(this.socketData).map(key => `"${key}": ${this.socketData[key]}`).join(', ') + + '}'; } - private updateInitData(): void { + private updateSocketData(): void { const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT); const da = difficultyAdjustment.getDifficultyAdjustment(); - this.setInitDataFields({ + this.updateSocketDataFields({ 'mempoolInfo': memPool.getMempoolInfo(), 'vBytesPerSecond': memPool.getVBytesPerSecond(), 'blocks': _blocks, @@ -94,11 +102,33 @@ class WebsocketHandler { const parsedMessage: WebsocketResponse = JSON.parse(message); const response = {}; - if (parsedMessage.action === 'want') { - client['want-blocks'] = parsedMessage.data.indexOf('blocks') > -1; - client['want-mempool-blocks'] = parsedMessage.data.indexOf('mempool-blocks') > -1; - client['want-live-2h-chart'] = parsedMessage.data.indexOf('live-2h-chart') > -1; - client['want-stats'] = parsedMessage.data.indexOf('stats') > -1; + const wantNow = {}; + if (parsedMessage && parsedMessage.action === 'want' && Array.isArray(parsedMessage.data)) { + for (const sub of wantable) { + const key = `want-${sub}`; + const wants = parsedMessage.data.includes(sub); + if (wants && client['wants'] && !client[key]) { + wantNow[key] = true; + } + client[key] = wants; + } + client['wants'] = true; + } + + // send initial data when a client first starts a subscription + if (wantNow['want-blocks']) { + response['blocks'] = this.socketData['blocks']; + } + + if (wantNow['want-mempool-blocks']) { + response['mempool-blocks'] = this.socketData['mempool-blocks']; + } + + if (wantNow['want-stats']) { + response['mempoolInfo'] = this.socketData['mempoolInfo']; + response['vBytesPerSecond'] = this.socketData['vBytesPerSecond']; + response['fees'] = this.socketData['fees']; + response['da'] = this.socketData['da']; } if (parsedMessage && parsedMessage['track-tx']) { @@ -109,21 +139,21 @@ class WebsocketHandler { if (parsedMessage['watch-mempool']) { const rbfCacheTxid = rbfCache.getReplacedBy(trackTxid); if (rbfCacheTxid) { - response['txReplaced'] = { + response['txReplaced'] = JSON.stringify({ txid: rbfCacheTxid, - }; + }); client['track-tx'] = null; } else { // It might have appeared before we had the time to start watching for it const tx = memPool.getMempool()[trackTxid]; if (tx) { if (config.MEMPOOL.BACKEND === 'esplora') { - response['tx'] = tx; + response['tx'] = JSON.stringify(tx); } else { // tx.prevout is missing from transactions when in bitcoind mode try { const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true); - response['tx'] = fullTx; + response['tx'] = JSON.stringify(fullTx); } catch (e) { logger.debug('Error finding transaction: ' + (e instanceof Error ? e.message : e)); } @@ -131,7 +161,7 @@ class WebsocketHandler { } else { try { const fullTx = await transactionUtils.$getMempoolTransactionExtended(client['track-tx'], true); - response['tx'] = fullTx; + response['tx'] = JSON.stringify(fullTx); } catch (e) { logger.debug('Error finding transaction. ' + (e instanceof Error ? e.message : e)); client['track-mempool-tx'] = parsedMessage['track-tx']; @@ -141,10 +171,10 @@ class WebsocketHandler { } const tx = memPool.getMempool()[trackTxid]; if (tx && tx.position) { - response['txPosition'] = { + response['txPosition'] = JSON.stringify({ txid: trackTxid, position: tx.position, - }; + }); } } else { client['track-tx'] = null; @@ -177,10 +207,10 @@ class WebsocketHandler { const index = parsedMessage['track-mempool-block']; client['track-mempool-block'] = index; const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions(); - response['projected-block-transactions'] = { + response['projected-block-transactions'] = JSON.stringify({ index: index, blockTransactions: mBlocksWithTransactions[index]?.transactions || [], - }; + }); } else { client['track-mempool-block'] = null; } @@ -189,23 +219,24 @@ class WebsocketHandler { if (parsedMessage && parsedMessage['track-rbf'] !== undefined) { if (['all', 'fullRbf'].includes(parsedMessage['track-rbf'])) { client['track-rbf'] = parsedMessage['track-rbf']; + response['rbfLatest'] = JSON.stringify(rbfCache.getRbfTrees(parsedMessage['track-rbf'] === 'fullRbf')); } else { client['track-rbf'] = false; } } if (parsedMessage.action === 'init') { - if (!this.initData['blocks']?.length || !this.initData['da']) { - this.updateInitData(); + if (!this.socketData['blocks']?.length || !this.socketData['da']) { + this.updateSocketData(); } - if (!this.initData['blocks']?.length) { + if (!this.socketData['blocks']?.length) { return; } client.send(this.serializedInitData); } if (parsedMessage.action === 'ping') { - response['pong'] = true; + response['pong'] = JSON.stringify(true); } if (parsedMessage['track-donation'] && parsedMessage['track-donation'].length === 22) { @@ -221,7 +252,8 @@ class WebsocketHandler { } if (Object.keys(response).length) { - client.send(JSON.stringify(response)); + const serializedResponse = this.serializeResponse(response); + client.send(serializedResponse); } } catch (e) { logger.debug('Error parsing websocket message: ' + (e instanceof Error ? e.message : e)); @@ -250,7 +282,7 @@ class WebsocketHandler { throw new Error('WebSocket.Server is not set'); } - this.setInitDataFields({ 'loadingIndicators': indicators }); + this.updateSocketDataFields({ 'loadingIndicators': indicators }); const response = JSON.stringify({ loadingIndicators: indicators }); this.wss.clients.forEach((client) => { @@ -266,7 +298,7 @@ class WebsocketHandler { throw new Error('WebSocket.Server is not set'); } - this.setInitDataFields({ 'conversions': conversionRates }); + this.updateSocketDataFields({ 'conversions': conversionRates }); const response = JSON.stringify({ conversions: conversionRates }); this.wss.clients.forEach((client) => { @@ -336,11 +368,21 @@ class WebsocketHandler { memPool.addToSpendMap(newTransactions); const recommendedFees = feeApi.getRecommendedFee(); + const latestTransactions = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx)); + // update init data - this.updateInitData(); + this.updateSocketDataFields({ + 'mempoolInfo': mempoolInfo, + 'vBytesPerSecond': vBytesPerSecond, + 'mempool-blocks': mBlocks, + 'transactions': latestTransactions, + 'loadingIndicators': loadingIndicators.getLoadingIndicators(), + 'da': da?.previousTime ? da : undefined, + 'fees': recommendedFees, + }); // cache serialized objects to avoid stringify-ing the same thing for every client - const responseCache = { ...this.initData }; + const responseCache = { ...this.socketData }; function getCachedResponse(key: string, data): string { if (!responseCache[key]) { responseCache[key] = JSON.stringify(data); @@ -371,8 +413,6 @@ class WebsocketHandler { } } - const latestTransactions = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx)); - this.wss.clients.forEach(async (client) => { if (client.readyState !== WebSocket.OPEN) { return; @@ -490,7 +530,7 @@ class WebsocketHandler { if (rbfReplacedBy) { response['rbfTransaction'] = JSON.stringify({ txid: rbfReplacedBy, - }) + }); } const rbfChange = rbfChanges.map[client['track-tx']]; @@ -524,9 +564,7 @@ class WebsocketHandler { } if (Object.keys(response).length) { - const serializedResponse = '{' - + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ') - + '}'; + const serializedResponse = this.serializeResponse(response); client.send(serializedResponse); } }); @@ -633,11 +671,19 @@ class WebsocketHandler { const da = difficultyAdjustment.getDifficultyAdjustment(); const fees = feeApi.getRecommendedFee(); + const mempoolInfo = memPool.getMempoolInfo(); // update init data - this.updateInitData(); + this.updateSocketDataFields({ + 'mempoolInfo': mempoolInfo, + 'blocks': [...blocks.getBlocks(), block].slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT), + 'mempool-blocks': mBlocks, + 'loadingIndicators': loadingIndicators.getLoadingIndicators(), + 'da': da?.previousTime ? da : undefined, + 'fees': fees, + }); - const responseCache = { ...this.initData }; + const responseCache = { ...this.socketData }; function getCachedResponse(key, data): string { if (!responseCache[key]) { responseCache[key] = JSON.stringify(data); @@ -645,22 +691,26 @@ class WebsocketHandler { return responseCache[key]; } - const mempoolInfo = memPool.getMempoolInfo(); - this.wss.clients.forEach((client) => { if (client.readyState !== WebSocket.OPEN) { return; } - if (!client['want-blocks']) { - return; + const response = {}; + + if (client['want-blocks']) { + response['block'] = getCachedResponse('block', block); } - const response = {}; - response['block'] = getCachedResponse('block', block); - response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo); - response['da'] = getCachedResponse('da', da?.previousTime ? da : undefined); - response['fees'] = getCachedResponse('fees', fees); + if (client['want-stats']) { + response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo); + response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', memPool.getVBytesPerSecond()); + response['fees'] = getCachedResponse('fees', fees); + + if (da?.previousTime) { + response['da'] = getCachedResponse('da', da); + } + } if (mBlocks && client['want-mempool-blocks']) { response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks); @@ -755,11 +805,19 @@ class WebsocketHandler { } } - const serializedResponse = '{' + if (Object.keys(response).length) { + const serializedResponse = this.serializeResponse(response); + client.send(serializedResponse); + } + }); + } + + // takes a dictionary of JSON serialized values + // and zips it together into a valid JSON object + private serializeResponse(response): string { + return '{' + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ') + '}'; - client.send(serializedResponse); - }); } private printLogs(): void { diff --git a/backend/src/index.ts b/backend/src/index.ts index 9f543d644..81863a208 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -150,7 +150,7 @@ class Server { if (config.BISQ.ENABLED) { bisq.startBisqService(); - bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price)); + bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price)); blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq)); bisqMarkets.startBisqService(); } From eaad63a082cab89ada5e9eabcabad6fb0cf6f281 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 12 Jun 2023 16:32:04 -0400 Subject: [PATCH 16/21] frontend resync recent blocks when necessary --- backend/src/api/websocket-handler.ts | 2 +- frontend/src/app/interfaces/websocket.interface.ts | 1 + frontend/src/app/services/websocket.service.ts | 10 +++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index dd7cdc8f2..1e2e381c2 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -116,7 +116,7 @@ class WebsocketHandler { } // send initial data when a client first starts a subscription - if (wantNow['want-blocks']) { + if (wantNow['want-blocks'] || (parsedMessage && parsedMessage['refresh-blocks'])) { response['blocks'] = this.socketData['blocks']; } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 83a0c636e..41643fb73 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -31,6 +31,7 @@ export interface WebsocketResponse { 'track-rbf'?: string; 'watch-mempool'?: boolean; 'track-bisq-market'?: string; + 'refresh-blocks'?: boolean; } export interface ReplacedTransaction extends Transaction { diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index af7a465f8..d22717b2a 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -235,6 +235,8 @@ export class WebsocketService { } handleResponse(response: WebsocketResponse) { + let reinitBlocks = false; + if (response.blocks && response.blocks.length) { const blocks = response.blocks; let maxHeight = 0; @@ -256,9 +258,11 @@ export class WebsocketService { } if (response.block) { - if (response.block.height > this.stateService.latestBlockHeight) { + if (response.block.height === this.stateService.latestBlockHeight + 1) { this.stateService.updateChainTip(response.block.height); this.stateService.blocks$.next([response.block, response.txConfirmed || '']); + } else if (response.block.height > this.stateService.latestBlockHeight + 1) { + reinitBlocks = true; } if (response.txConfirmed) { @@ -369,5 +373,9 @@ export class WebsocketService { if (response['git-commit']) { this.stateService.backendInfo$.next(response['git-commit']); } + + if (reinitBlocks) { + this.websocketSubject.next({'refresh-blocks': true}); + } } } From 22baf4186e04c221634aa1ba0d28b4dcb0995d3f Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 19 Jun 2023 12:46:10 -0400 Subject: [PATCH 17/21] Add 'all time' option for mempool graph --- backend/src/api/statistics/statistics-api.ts | 15 +++++++++++++-- backend/src/api/statistics/statistics.routes.ts | 12 +++++++----- .../statistics/statistics.component.html | 3 +++ .../components/statistics/statistics.component.ts | 11 +++++++++-- frontend/src/app/services/api.service.ts | 4 ++++ 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/backend/src/api/statistics/statistics-api.ts b/backend/src/api/statistics/statistics-api.ts index 1e8b0b7bb..77bf66a2c 100644 --- a/backend/src/api/statistics/statistics-api.ts +++ b/backend/src/api/statistics/statistics-api.ts @@ -211,7 +211,7 @@ class StatisticsApi { CAST(avg(vsize_1800) as DOUBLE) as vsize_1800, CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \ FROM statistics \ - WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \ + ${interval === 'ALL TIME' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -259,7 +259,7 @@ class StatisticsApi { vsize_1800, vsize_2000 \ FROM statistics \ - WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \ + ${interval === 'ALL TIME' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -386,6 +386,17 @@ class StatisticsApi { } } + public async $listAll(): Promise { + try { + const query = this.getQueryForDays(43200, 'ALL TIME'); // 12h interval + const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout }); + return this.mapStatisticToOptimizedStatistic(rows as Statistic[]); + } catch (e) { + logger.err('$listAll() error' + (e instanceof Error ? e.message : e)); + return []; + } + } + private mapStatisticToOptimizedStatistic(statistic: Statistic[]): OptimizedStatistic[] { return statistic.map((s) => { return { diff --git a/backend/src/api/statistics/statistics.routes.ts b/backend/src/api/statistics/statistics.routes.ts index 2a5871dd6..31db5198c 100644 --- a/backend/src/api/statistics/statistics.routes.ts +++ b/backend/src/api/statistics/statistics.routes.ts @@ -15,10 +15,11 @@ class StatisticsRoutes { .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', this.$getStatisticsByTime.bind(this, '2y')) .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', this.$getStatisticsByTime.bind(this, '3y')) .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/4y', this.$getStatisticsByTime.bind(this, '4y')) + .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/all', this.$getStatisticsByTime.bind(this, 'all')) ; } - private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y', req: Request, res: Response) { + private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y' | 'all', req: Request, res: Response) { res.header('Pragma', 'public'); res.header('Cache-control', 'public'); res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString()); @@ -26,10 +27,6 @@ class StatisticsRoutes { try { let result; switch (time as string) { - case '2h': - result = await statisticsApi.$list2H(); - res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString()); - break; case '24h': result = await statisticsApi.$list24H(); res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); @@ -58,8 +55,13 @@ class StatisticsRoutes { case '4y': result = await statisticsApi.$list4Y(); break; + case 'all': + result = await statisticsApi.$listAll(); + break; default: result = await statisticsApi.$list2H(); + res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString()); + break; } res.json(result); } catch (e) { diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html index 1b291e978..f36d74963 100644 --- a/frontend/src/app/components/statistics/statistics.component.html +++ b/frontend/src/app/components/statistics/statistics.component.html @@ -53,6 +53,9 @@ +
diff --git a/frontend/src/app/components/statistics/statistics.component.ts b/frontend/src/app/components/statistics/statistics.component.ts index 35137bff1..eebee5bce 100644 --- a/frontend/src/app/components/statistics/statistics.component.ts +++ b/frontend/src/app/components/statistics/statistics.component.ts @@ -72,8 +72,10 @@ export class StatisticsComponent implements OnInit { this.route .fragment .subscribe((fragment) => { - if (['2h', '24h', '1w', '1m', '3m', '6m', '1y', '2y', '3y', '4y'].indexOf(fragment) > -1) { + if (['2h', '24h', '1w', '1m', '3m', '6m', '1y', '2y', '3y', '4y', 'all'].indexOf(fragment) > -1) { this.radioGroupForm.controls.dateSpan.setValue(fragment, { emitEvent: false }); + } else { + this.radioGroupForm.controls.dateSpan.setValue('2h', { emitEvent: false }); } }); @@ -114,7 +116,12 @@ export class StatisticsComponent implements OnInit { if (this.radioGroupForm.controls.dateSpan.value === '3y') { return this.apiService.list3YStatistics$(); } - return this.apiService.list4YStatistics$(); + if (this.radioGroupForm.controls.dateSpan.value === '4y') { + return this.apiService.list4YStatistics$(); + } + if (this.radioGroupForm.controls.dateSpan.value === 'all') { + return this.apiService.listAllTimeStatistics$(); + } }) ) .subscribe((mempoolStats: any) => { diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index 8521ddc83..029d2183c 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -72,6 +72,10 @@ export class ApiService { return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/statistics/4y'); } + listAllTimeStatistics$(): Observable { + return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/statistics/all'); + } + getTransactionTimes$(txIds: string[]): Observable { let params = new HttpParams(); txIds.forEach((txId: string) => { From d4ed238ae176a362d5decf48715a748fad5fd08f Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 21 Jun 2023 09:49:54 -0400 Subject: [PATCH 18/21] Add statistics/all to cache warmer, change query keyword --- backend/src/api/statistics/statistics-api.ts | 6 +++--- production/nginx-cache-warmer | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/api/statistics/statistics-api.ts b/backend/src/api/statistics/statistics-api.ts index 77bf66a2c..837d0ae44 100644 --- a/backend/src/api/statistics/statistics-api.ts +++ b/backend/src/api/statistics/statistics-api.ts @@ -211,7 +211,7 @@ class StatisticsApi { CAST(avg(vsize_1800) as DOUBLE) as vsize_1800, CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \ FROM statistics \ - ${interval === 'ALL TIME' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ + ${interval === 'ALL' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -259,7 +259,7 @@ class StatisticsApi { vsize_1800, vsize_2000 \ FROM statistics \ - ${interval === 'ALL TIME' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ + ${interval === 'ALL' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -388,7 +388,7 @@ class StatisticsApi { public async $listAll(): Promise { try { - const query = this.getQueryForDays(43200, 'ALL TIME'); // 12h interval + const query = this.getQueryForDays(43200, 'ALL'); // 12h interval const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout }); return this.mapStatisticToOptimizedStatistic(rows as Statistic[]); } catch (e) { diff --git a/production/nginx-cache-warmer b/production/nginx-cache-warmer index 6b58e5b78..6a82871a5 100755 --- a/production/nginx-cache-warmer +++ b/production/nginx-cache-warmer @@ -21,6 +21,7 @@ do for url in / \ '/api/v1/statistics/2y' \ '/api/v1/statistics/3y' \ '/api/v1/statistics/4y' \ + '/api/v1/statistics/all' \ '/api/v1/mining/pools/24h' \ '/api/v1/mining/pools/3d' \ '/api/v1/mining/pools/1w' \ From ca1a1228a97f043a6e687816ca596144ef70ded9 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 21 Jun 2023 09:52:06 -0400 Subject: [PATCH 19/21] break graph toggles into two rows on small screens --- .../statistics/statistics.component.html | 76 ++++++++++--------- .../statistics/statistics.component.scss | 40 ++++++++++ 2 files changed, 80 insertions(+), 36 deletions(-) diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html index f36d74963..29089e43d 100644 --- a/frontend/src/app/components/statistics/statistics.component.html +++ b/frontend/src/app/components/statistics/statistics.component.html @@ -20,42 +20,46 @@
-
- - - - - - - - - - - +
+
+ + + + + +
+
+ + + + + + +
diff --git a/frontend/src/app/components/statistics/statistics.component.scss b/frontend/src/app/components/statistics/statistics.component.scss index f7230ce4b..f9e220daa 100644 --- a/frontend/src/app/components/statistics/statistics.component.scss +++ b/frontend/src/app/components/statistics/statistics.component.scss @@ -183,3 +183,43 @@ } } } + +.btn-toggle-rows { + display: flex; + flex-direction: row; + align-items: stretch; + justify-content: stretch; + + .btn-group { + flex-grow: 1; + flex-shrink: 1; + } + + @media (min-width: 500px) { + .btn-group:first-child > .btn:last-child { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .btn-group:last-child > .btn:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + + @media (max-width: 499px) { + flex-direction: column; + + .btn-group:first-child > .btn:first-child { + border-bottom-left-radius: 0; + } + .btn-group:first-child > .btn:last-child { + border-bottom-right-radius: 0; + } + .btn-group:last-child > .btn:first-child { + border-top-left-radius: 0; + } + .btn-group:last-child > .btn:last-child { + border-top-right-radius: 0; + } + } +} \ No newline at end of file From 85e33e689db9bab07c7f34d7d7f48258cb1f4e87 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Wed, 21 Jun 2023 18:06:14 +0200 Subject: [PATCH 20/21] break graph toggles into another line earlier --- .../src/app/components/statistics/statistics.component.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/statistics/statistics.component.scss b/frontend/src/app/components/statistics/statistics.component.scss index f9e220daa..d883e48c3 100644 --- a/frontend/src/app/components/statistics/statistics.component.scss +++ b/frontend/src/app/components/statistics/statistics.component.scss @@ -53,17 +53,17 @@ } } .formRadioGroup.mining { - @media (min-width: 991px) { + @media (min-width: 1035px) { position: relative; top: -100px; } - @media (min-width: 830px) and (max-width: 991px) { + @media (min-width: 830px) and (max-width: 1035px) { position: relative; top: 0px; } } .formRadioGroup.no-menu { - @media (min-width: 991px) { + @media (min-width: 1035px) { position: relative; top: -33px; } From d939391e62a34782768e0229d872a69278a1c09c Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Wed, 21 Jun 2023 18:14:32 +0200 Subject: [PATCH 21/21] ALL -> all (no caps needed, match the url parameters as well) --- backend/src/api/statistics/statistics-api.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/api/statistics/statistics-api.ts b/backend/src/api/statistics/statistics-api.ts index 837d0ae44..9df12d704 100644 --- a/backend/src/api/statistics/statistics-api.ts +++ b/backend/src/api/statistics/statistics-api.ts @@ -211,7 +211,7 @@ class StatisticsApi { CAST(avg(vsize_1800) as DOUBLE) as vsize_1800, CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \ FROM statistics \ - ${interval === 'ALL' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ + ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -259,7 +259,7 @@ class StatisticsApi { vsize_1800, vsize_2000 \ FROM statistics \ - ${interval === 'ALL' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ + ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \ GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \ ORDER BY statistics.added DESC;`; } @@ -388,7 +388,7 @@ class StatisticsApi { public async $listAll(): Promise { try { - const query = this.getQueryForDays(43200, 'ALL'); // 12h interval + const query = this.getQueryForDays(43200, 'all'); // 12h interval const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout }); return this.mapStatisticToOptimizedStatistic(rows as Statistic[]); } catch (e) {