Updated blocks list in /pool/{id} page

backend/src/api/blocks.ts

@@ -12,6 +12,7 @@ import poolsRepository from '../repositories/PoolsRepository';
 import blocksRepository from '../repositories/BlocksRepository';
 import loadingIndicators from './loading-indicators';
 import BitcoinApi from './bitcoin/bitcoin-api';
+import { prepareBlock } from '../utils/blocks-utils';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -336,7 +337,7 @@ class Blocks {
   public async $indexBlock(height: number): Promise<BlockExtended> {
     const dbBlock = await blocksRepository.$getBlockByHeight(height);
     if (dbBlock != null) {
-      return this.prepareBlock(dbBlock);
+      return prepareBlock(dbBlock);
     }
 
     const blockHash = await bitcoinApi.$getBlockHash(height);
@@ -346,10 +347,11 @@ class Blocks {
 
     await blocksRepository.$saveBlockInDatabase(blockExtended);
 
-    return this.prepareBlock(blockExtended);
+    return prepareBlock(blockExtended);
   }
 
-  public async $getBlocksExtras(fromHeight: number, limit: number = 15): Promise<BlockExtended[]> {
+  public async $getBlocksExtras(fromHeight: number, limit: number = 15,
+    poolId: number | undefined= undefined): Promise<BlockExtended[]> {
     // Note - This API is breaking if indexing is not available. For now it is okay because we only
     // use it for the mining pages, and mining pages should not be available if indexing is turned off.
     // I'll need to fix it before we refactor the block(s) related pages
@@ -378,7 +380,7 @@ class Blocks {
         if (!block && Common.indexingEnabled()) {
           block = await this.$indexBlock(currentHeight);
         } else if (!block) {
-          block = this.prepareBlock(await bitcoinApi.$getBlock(nextHash));
+          block = prepareBlock(await bitcoinApi.$getBlock(nextHash));
         }
         returnBlocks.push(block);
         nextHash = block.previousblockhash;
@@ -393,34 +395,6 @@ class Blocks {
     }
   }
 
-  private prepareBlock(block: any): BlockExtended {
-    return <BlockExtended>{
-      id: block.id ?? block.hash, // hash for indexed block
-      timestamp: block.timestamp ?? block.blockTimestamp, // blockTimestamp for indexed block
-      height: block.height,
-      version: block.version,
-      bits: block.bits,
-      nonce: block.nonce,
-      difficulty: block.difficulty,
-      merkle_root: block.merkle_root,
-      tx_count: block.tx_count,
-      size: block.size,
-      weight: block.weight,
-      previousblockhash: block.previousblockhash,
-      extras: {
-        coinbaseRaw: block.coinbase_raw ?? block.extras.coinbaseRaw,
-        medianFee: block.medianFee ?? block.median_fee ?? block.extras?.medianFee,
-        feeRange: block.feeRange ?? block.fee_range ?? block?.extras?.feeSpan,
-        reward: block.reward ?? block?.extras?.reward,
-        totalFees: block.totalFees ?? block?.fees ?? block?.extras.totalFees,
-        pool: block?.extras?.pool ?? (block?.pool_id ? {
-          id: block.pool_id,
-          name: block.pool_name,
-        } : undefined),
-      }
-    };
-  }
-
   public getLastDifficultyAdjustmentTime(): number {
     return this.lastDifficultyAdjustmentTime;
   }