Update block API to use indexing if available

backend/src/api/blocks.ts

@@ -134,26 +134,25 @@ class Blocks {
       blockExtended.extras.avgFeeRate = stats.avgfeerate;
     }
 
-    if (Common.indexingEnabled()) {
-      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;
-      }
-
-      blockExtended.extras.pool = {
-        id: pool.id,
-        name: pool.name,
-        slug: pool.slug,
-      };
+    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;
+    }
+
+    blockExtended.extras.pool = {
+      id: pool.id,
+      name: pool.name,
+      slug: pool.slug,
+    };
+
     return blockExtended;
   }
 
@@ -389,6 +388,39 @@ class Blocks {
     return prepareBlock(blockExtended);
   }
 
+  /**
+   * Index a block by hash if it's missing from the database. Returns the block after indexing
+   */
+  public async $getBlock(hash: string): Promise<BlockExtended | IEsploraApi.Block> {
+    // Block has already been indexed
+    if (Common.indexingEnabled()) {
+      const dbBlock = await blocksRepository.$getBlockByHash(hash);
+      if (dbBlock != null) {
+        logger.info('GET BLOCK: already indexed');
+        return prepareBlock(dbBlock);
+      }
+    }
+
+    const block = await bitcoinApi.$getBlock(hash);
+
+    // Not Bitcoin network, return the block as it
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
+      logger.info('GET BLOCK: using bitcoin backend');
+      return block;
+    }
+
+    // Bitcoin network, add our custom data on top
+    logger.info('GET BLOCK: index block on the fly');
+    const transactions = await this.$getTransactionsExtended(hash, block.height, true);
+    const blockExtended = await this.$getBlockExtended(block, transactions);
+    if (Common.indexingEnabled()) {
+      delete(blockExtended['coinbaseTx']);
+      await blocksRepository.$saveBlockInDatabase(blockExtended);
+    }
+
+    return blockExtended;
+  }
+
   public async $getBlocksExtras(fromHeight?: number, limit: number = 15): 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.

backend/src/api/common.ts

@@ -174,7 +174,7 @@ export class Common {
     return (
       ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) &&
       config.DATABASE.ENABLED === true &&
-      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT != 0
+      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0
     );
   }
 }

backend/src/repositories/BlocksRepository.ts

@@ -287,6 +287,7 @@ class BlocksRepository {
         return null;
       }
 
+      rows[0].fee_span = JSON.parse(rows[0].fee_span);
       return rows[0];
     } catch (e) {
       logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
@@ -294,6 +295,34 @@ class BlocksRepository {
     }
   }
 
+  /**
+   * Get one block by hash
+   */
+  public async $getBlockByHash(hash: string): Promise<object | null> {
+    try {
+      const query = `
+        SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp, hash as id,
+        pools.id as pool_id, pools.name as pool_name, pools.link as pool_link, pools.slug as pool_slug,
+        pools.addresses as pool_addresses, pools.regexes as pool_regexes,
+        previous_block_hash as previousblockhash
+        FROM blocks
+        JOIN pools ON blocks.pool_id = pools.id
+        WHERE hash = '${hash}';
+      `;
+      const [rows]: any[] = await DB.query(query);
+
+      if (rows.length <= 0) {
+        return null;
+      }
+
+      rows[0].fee_span = JSON.parse(rows[0].fee_span);
+      return rows[0];
+    } catch (e) {
+      logger.err(`Cannot get indexed block ${hash}. Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
   /**
    * Return blocks difficulty
    */
@@ -457,7 +486,7 @@ class BlocksRepository {
   /**
    * Get the historical averaged block rewards
    */
-   public async $getHistoricalBlockRewards(div: number, interval: string | null): Promise<any> {
+  public async $getHistoricalBlockRewards(div: number, interval: string | null): Promise<any> {
     try {
       let query = `SELECT
         CAST(AVG(height) as INT) as avg_height,

backend/src/routes.ts

@@ -702,8 +702,8 @@ class Routes {
 
   public async getBlock(req: Request, res: Response) {
     try {
-      const result = await bitcoinApi.$getBlock(req.params.hash);
-      res.json(result);
+      const block = await blocks.$getBlock(req.params.hash);
+      res.json(block);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -727,7 +727,7 @@ class Routes {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
-  
+
   public async getBlocks(req: Request, res: Response) {
     try {
       loadingIndicators.setProgress('blocks', 0);

backend/src/utils/blocks-utils.ts

@@ -1,4 +1,4 @@
-import { BlockExtended } from "../mempool.interfaces";
+import { BlockExtended } from '../mempool.interfaces';
 
 export function prepareBlock(block: any): BlockExtended {
   return <BlockExtended>{
@@ -17,9 +17,11 @@ export function prepareBlock(block: any): BlockExtended {
     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,
+      feeRange: block.feeRange ?? block.fee_span,
       reward: block.reward ?? block?.extras?.reward,
-      totalFees: block.totalFees ?? block?.fees ?? block?.extras.totalFees,
+      totalFees: block.totalFees ?? block?.fees ?? block?.extras?.totalFees,
+      avgFee: block?.extras?.avgFee ?? block.avg_fee,
+      avgFeeRate: block?.avgFeeRate ?? block.avg_fee_rate,
       pool: block?.extras?.pool ?? (block?.pool_id ? {
         id: block.pool_id,
         name: block.pool_name,