From 0719b2011069f824fa661c979cc92c9f7c57a035 Mon Sep 17 00:00:00 2001 From: softsimon Date: Thu, 20 Jun 2024 12:22:54 +0900 Subject: [PATCH] Deprecate pool_unique_id --- backend/src/api/services/acceleration.ts | 5 +---- backend/src/repositories/AccelerationRepository.ts | 4 ++-- frontend/src/app/components/block/block.component.ts | 2 +- frontend/src/app/components/tracker/tracker.component.ts | 2 +- .../src/app/components/transaction/transaction.component.ts | 2 +- frontend/src/app/docs/api-docs/api-docs-data.ts | 6 +----- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/backend/src/api/services/acceleration.ts b/backend/src/api/services/acceleration.ts index eba5ab7e6..7debe7119 100644 --- a/backend/src/api/services/acceleration.ts +++ b/backend/src/api/services/acceleration.ts @@ -31,10 +31,7 @@ export interface AccelerationHistory { feeDelta: number, blockHash: string, blockHeight: number, - pools: { - pool_unique_id: number, - username: string, - }[], + pools: number[]; }; class AccelerationApi { diff --git a/backend/src/repositories/AccelerationRepository.ts b/backend/src/repositories/AccelerationRepository.ts index eea60fcff..c08e256b6 100644 --- a/backend/src/repositories/AccelerationRepository.ts +++ b/backend/src/repositories/AccelerationRepository.ts @@ -308,10 +308,10 @@ class AccelerationRepository { } const accelerationSummaries = accelerations.map(acc => ({ ...acc, - pools: acc.pools.map(pool => pool.pool_unique_id), + pools: acc.pools, })) for (const acc of accelerations) { - if (blockTxs[acc.txid] && acc.pools.some(pool => pool.pool_unique_id === block.extras.pool.id)) { + if (blockTxs[acc.txid] && acc.pools.some(pool => pool === block.extras.pool.id)) { const tx = blockTxs[acc.txid]; const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions); accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost)); diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index d762a879e..471c1dfca 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -313,7 +313,7 @@ export class BlockComponent implements OnInit, OnDestroy { const acceleratedInBlock = {}; for (const acc of accelerations) { - if (acc.pools?.some(pool => pool === this.block?.extras?.pool.id || pool?.['pool_unique_id'] === this.block?.extras?.pool.id)) { + if (acc.pools?.some(pool => pool === this.block?.extras?.pool.id)) { acceleratedInBlock[acc.txid] = acc; } } diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts index 1685ee530..7de851c6e 100644 --- a/frontend/src/app/components/tracker/tracker.component.ts +++ b/frontend/src/app/components/tracker/tracker.component.ts @@ -665,7 +665,7 @@ export class TrackerComponent implements OnInit, OnDestroy { } setIsAccelerated(initialState: boolean = false) { - this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id || pool?.['pool_unique_id'] === this.pool.id)))); + this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id)))); } dismissAccelAlert(): void { diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 9f7e2aa40..d03a8a9cc 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -726,7 +726,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } setIsAccelerated(initialState: boolean = false) { - this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id || pool?.['pool_unique_id'] === this.pool.id)))); + this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id)))); if (this.isAcceleration && initialState) { this.showAccelerationSummary = false; } diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index c337b7520..b799d79a2 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -9126,11 +9126,7 @@ export const restApiDocsData = [ "blockHash": "00000000000000000000482f0746d62141694b9210a813b97eb8445780a32003", "blockHeight": 829559, "bidBoost": 6102, - "pools": [ - { - "pool_unique_id": 111 - } - ] + "pools": [111] } ]`, },