From 384c8d17cf367630c1dca45756f21f9892f30437 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Mon, 25 Apr 2022 15:50:26 +0900 Subject: [PATCH] Only process mining pools on Bitcoin networks --- backend/src/api/blocks.ts | 34 ++++++++++--------- backend/src/api/common.ts | 4 +-- .../app/components/block/block.component.html | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index 9d2e91c78..1f27d8c0e 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -134,24 +134,26 @@ class Blocks { blockExtended.extras.avgFeeRate = stats.avgfeerate; } - let pool: PoolTag; - if (blockExtended.extras?.coinbaseTx !== undefined) { - pool = await this.$findBlockMiner(blockExtended.extras?.coinbaseTx); - } else { - pool = await poolsRepository.$getUnknownPool(); - } + if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) { + let pool: PoolTag; + if (blockExtended.extras?.coinbaseTx !== undefined) { + pool = await this.$findBlockMiner(blockExtended.extras?.coinbaseTx); + } else { + pool = await poolsRepository.$getUnknownPool(); + } - if (!pool) { // We should never have this situation in practise - logger.warn(`Cannot assign pool to block ${blockExtended.height} and 'unknown' pool does not exist. ` + - `Check your "pools" table entries`); - return blockExtended; - } + if (!pool) { // We should never have this situation in practise + logger.warn(`Cannot assign pool to block ${blockExtended.height} and 'unknown' pool does not exist. ` + + `Check your "pools" table entries`); + return blockExtended; + } - blockExtended.extras.pool = { - id: pool.id, - name: pool.name, - slug: pool.slug, - }; + blockExtended.extras.pool = { + id: pool.id, + name: pool.name, + slug: pool.slug, + }; + } return blockExtended; } diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index bebc6c58b..d4b57f204 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -169,10 +169,10 @@ export class Common { default: return null; } } - + static indexingEnabled(): boolean { return ( - ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) && + ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) && config.DATABASE.ENABLED === true && config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0 ); diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 569abdec2..87e45e088 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -122,7 +122,7 @@ {{ block.extras.pool.name }} - + {{ block.extras.pool.name }}