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;
   }

backend/src/repositories/BlocksRepository.ts

@@ -2,6 +2,7 @@ import { BlockExtended, PoolTag } from '../mempool.interfaces';
 import { DB } from '../database';
 import logger from '../logger';
 import { Common } from '../api/common';
+import { prepareBlock } from '../utils/blocks-utils';
 
 class BlocksRepository {
   /**
@@ -153,7 +154,6 @@ class BlocksRepository {
       query += ` blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`;
     }
 
-    // logger.debug(query);
     const connection = await DB.getConnection();
     try {
       const [rows] = await connection.query(query, params);
@@ -169,10 +169,10 @@ class BlocksRepository {
 
   /**
    * Get blocks count between two dates
-   * @param poolId 
+   * @param poolId
    * @param from - The oldest timestamp
    * @param to - The newest timestamp
-   * @returns 
+   * @returns
    */
   public async $blockCountBetweenTimestamp(poolId: number | null, from: number, to: number): Promise<number> {
     const params: any[] = [];
@@ -193,7 +193,6 @@ class BlocksRepository {
     }
     query += ` blockTimestamp BETWEEN FROM_UNIXTIME('${from}') AND FROM_UNIXTIME('${to}')`;
 
-    // logger.debug(query);
     const connection = await DB.getConnection();
     try {
       const [rows] = await connection.query(query, params);
@@ -216,7 +215,6 @@ class BlocksRepository {
       ORDER BY height
       LIMIT 1;`;
 
-    // logger.debug(query);
     const connection = await DB.getConnection();
     try {
       const [rows]: any[] = await connection.query(query);
@@ -239,7 +237,8 @@ class BlocksRepository {
    */
   public async $getBlocksByPool(poolId: number, startHeight: number | null = null): Promise<object[]> {
     const params: any[] = [];
-    let query = `SELECT height, hash as id, tx_count, size, weight, pool_id, UNIX_TIMESTAMP(blockTimestamp) as timestamp, reward
+    let query = ` SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
+      previous_block_hash as previousblockhash
       FROM blocks
       WHERE pool_id = ?`;
     params.push(poolId);
@@ -252,17 +251,17 @@ class BlocksRepository {
     query += ` ORDER BY height DESC
       LIMIT 10`;
 
-    // logger.debug(query);
     const connection = await DB.getConnection();
     try {
       const [rows] = await connection.query(query, params);
       connection.release();
 
-      for (const block of <object[]>rows) {
-        delete block['blockTimestamp'];
+      const blocks: BlockExtended[] = [];
+      for (let block of <object[]>rows) {
+        blocks.push(prepareBlock(block));
       }
 
-      return <object[]>rows;
+      return blocks;
     } catch (e) {
       connection.release();
       logger.err('$getBlocksByPool() error' + (e instanceof Error ? e.message : e));
@@ -314,7 +313,7 @@ class BlocksRepository {
     let query = `
       SELECT
       *
-      FROM 
+      FROM
       (
         SELECT
         UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty, height,
@@ -322,7 +321,7 @@ class BlocksRepository {
           IF(@prevStatus := YT.difficulty, @rn := 1, @rn := 1)
         ) AS rn
         FROM blocks YT
-        CROSS JOIN 
+        CROSS JOIN
         (
           SELECT @prevStatus := -1, @rn := 1
         ) AS var

backend/src/utils/blocks-utils.ts

@@ -0,0 +1,29 @@
+import { BlockExtended } from "../mempool.interfaces";
+
+export function 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),
+    }
+  };
+}