Merge branch 'master' into difficulty

backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts

@@ -2,7 +2,7 @@ import { IEsploraApi } from './esplora-api.interface';
 
 export interface AbstractBitcoinApi {
   $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]>;
-  $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean): Promise<IEsploraApi.Transaction>;
+  $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean, blockHash?: string): Promise<IEsploraApi.Transaction>;
   $getBlockHeightTip(): Promise<number>;
   $getTxIdsForBlock(hash: string): Promise<string[]>;
   $getBlockHash(height: number): Promise<string>;

backend/src/api/bitcoin/bitcoin-api.ts

@@ -14,14 +14,14 @@ class BitcoinApi implements AbstractBitcoinApi {
     this.bitcoindClient = bitcoinClient;
   }
 
-  $getRawTransaction(txId: string, skipConversion = false, addPrevout = false): Promise<IEsploraApi.Transaction> {
+  $getRawTransaction(txId: string, skipConversion = false, addPrevout = false, blockHash?: string): Promise<IEsploraApi.Transaction> {
     // If the transaction is in the mempool we already converted and fetched the fee. Only prevouts are missing
     const txInMempool = mempool.getMempool()[txId];
     if (txInMempool && addPrevout) {
       return this.$addPrevouts(txInMempool);
     }
 
-    return this.bitcoindClient.getRawTransaction(txId, true)
+    return this.bitcoindClient.getRawTransaction(txId, true, blockHash)
       .then((transaction: IBitcoinApi.Transaction) => {
         if (skipConversion) {
           transaction.vout.forEach((vout) => {

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[] = [];
@@ -108,9 +109,7 @@ class Blocks {
     const blockExtended: BlockExtended = Object.assign({ extras: {} }, block);
     blockExtended.extras.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
     blockExtended.extras.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
-
-    const coinbaseRaw: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
-    blockExtended.extras.coinbaseRaw = coinbaseRaw.hex;
+    blockExtended.extras.coinbaseRaw = blockExtended.extras.coinbaseTx.vin[0].scriptsig;
 
     if (block.height === 0) {
       blockExtended.extras.medianFee = 0; // 50th percentiles
@@ -119,7 +118,9 @@ class Blocks {
       blockExtended.extras.avgFee = 0;
       blockExtended.extras.avgFeeRate = 0;
     } else {
-      const stats = await bitcoinClient.getBlockStats(block.id);
+      const stats = await bitcoinClient.getBlockStats(block.id, [
+        'feerate_percentiles', 'minfeerate', 'maxfeerate', 'totalfee', 'avgfee', 'avgfeerate'
+      ]);
       blockExtended.extras.medianFee = stats.feerate_percentiles[2]; // 50th percentiles
       blockExtended.extras.feeRange = [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat();
       blockExtended.extras.totalFees = stats.totalfee;
@@ -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,17 +347,17 @@ 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): 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
     try {
       loadingIndicators.setProgress('blocks', 0);
 
-      let currentHeight = fromHeight ? fromHeight : this.getCurrentBlockHeight();
+      let currentHeight = fromHeight !== undefined ? fromHeight : this.getCurrentBlockHeight();
       const returnBlocks: BlockExtended[] = [];
 
       if (currentHeight < 0) {
@@ -378,7 +379,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,33 +394,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: {
-        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/api/database-migration.ts

@@ -6,7 +6,7 @@ import logger from '../logger';
 const sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
 
 class DatabaseMigration {
-  private static currentVersion = 14;
+  private static currentVersion = 15;
   private queryTimeout = 120000;
   private statisticsAddedIndexed = false;
 

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 {
   /**
@@ -56,7 +57,7 @@ class BlocksRepository {
         logger.debug(`$saveBlockInDatabase() - Block ${block.height} has already been indexed, ignoring`);
       } else {
         connection.release();
-        logger.err('$saveBlockInDatabase() error' + (e instanceof Error ? e.message : e));
+        logger.err('$saveBlockInDatabase() error: ' + (e instanceof Error ? e.message : e));
         throw e;
       }
     }
@@ -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);
@@ -237,14 +235,15 @@ class BlocksRepository {
   /**
    * Get blocks mined by a specific mining pool
    */
-  public async $getBlocksByPool(poolId: number, startHeight: number | null = null): Promise<object[]> {
+  public async $getBlocksByPool(poolId: number, startHeight: number | undefined = undefined): 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);
 
-    if (startHeight) {
+    if (startHeight !== undefined) {
       query += ` AND height < ?`;
       params.push(startHeight);
     }
@@ -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/routes.ts

@@ -553,7 +553,7 @@ class Routes {
     try {
       const poolBlocks = await BlocksRepository.$getBlocksByPool(
         parseInt(req.params.poolId, 10),
-        parseInt(req.params.height, 10) ?? null,
+        req.params.height === undefined ? undefined : parseInt(req.params.height, 10),
       );
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
@@ -659,7 +659,8 @@ class Routes {
 
   public async getBlocksExtras(req: Request, res: Response) {
     try {
-      res.json(await blocks.$getBlocksExtras(parseInt(req.params.height, 10), 15));
+      const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
+      res.json(await blocks.$getBlocksExtras(height, 15));
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }

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),
+    }
+  };
+}