Merge branch 'master' into feature/mempool-show-only-fees

backend/src/api/mining.ts

@@ -42,9 +42,7 @@ class Mining {
     });
 
     poolsStatistics['pools'] = poolsStats;
-
-    const oldestBlock = new Date(await BlocksRepository.$oldestBlockTimestamp());
-    poolsStatistics['oldestIndexedBlockTimestamp'] = oldestBlock.getTime();
+    poolsStatistics['oldestIndexedBlockTimestamp'] = await BlocksRepository.$oldestBlockTimestamp();
 
     const blockCount: number = await BlocksRepository.$blockCount(null, interval);
     poolsStatistics['blockCount'] = blockCount;
@@ -79,26 +77,14 @@ class Mining {
    * Return the historical difficulty adjustments and oldest indexed block timestamp
    */
   public async $getHistoricalDifficulty(interval: string | null): Promise<object> {
-    const difficultyAdjustments = await BlocksRepository.$getBlocksDifficulty(interval);
-    const oldestBlock = new Date(await BlocksRepository.$oldestBlockTimestamp());
-
-    return {
-      adjustments: difficultyAdjustments,
-      oldestIndexedBlockTimestamp: oldestBlock.getTime(),
-    };
+    return await BlocksRepository.$getBlocksDifficulty(interval);
   }
 
   /**
    * Return the historical hashrates and oldest indexed block timestamp
    */
   public async $getHistoricalHashrates(interval: string | null): Promise<object> {
-    const hashrates = await HashratesRepository.$get(interval);
-    const oldestBlock = new Date(await BlocksRepository.$oldestBlockTimestamp());
-
-    return {
-      hashrates: hashrates,
-      oldestIndexedBlockTimestamp: oldestBlock.getTime(),
-    };
+    return await HashratesRepository.$get(interval);
   }
 
   /**
@@ -175,7 +161,18 @@ class Mining {
       ++totalIndexed;
     }
 
-    await HashratesRepository.$saveHashrates(hashrates);
+    // Add genesis block manually
+    if (!indexedTimestamp.includes(genesisTimestamp)) {
+      hashrates.push({
+        hashrateTimestamp: genesisTimestamp,
+        avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1),
+        poolId: null
+      });
+    }
+
+    if (hashrates.length > 0) {
+      await HashratesRepository.$saveHashrates(hashrates);
+    }
     await HashratesRepository.$setLatestRunTimestamp();
     this.hashrateIndexingStarted = false;
 

backend/src/repositories/BlocksRepository.ts

@@ -187,12 +187,11 @@ class BlocksRepository {
    * Get the oldest indexed block
    */
   public async $oldestBlockTimestamp(): Promise<number> {
-    const query = `SELECT blockTimestamp
+    const query = `SELECT UNIX_TIMESTAMP(blockTimestamp) as blockTimestamp
       FROM blocks
       ORDER BY height
       LIMIT 1;`;
 
-
     // logger.debug(query);
     const connection = await DB.pool.getConnection();
     const [rows]: any[] = await connection.query(query);
@@ -266,15 +265,37 @@ class BlocksRepository {
 
     const connection = await DB.pool.getConnection();
 
-    let query = `SELECT MIN(UNIX_TIMESTAMP(blockTimestamp)) as timestamp, difficulty, height
-      FROM blocks`;
+    // :D ... Yeah don't ask me about this one https://stackoverflow.com/a/40303162
+    // Basically, using temporary user defined fields, we are able to extract all
+    // difficulty adjustments from the blocks tables.
+    // This allow use to avoid indexing it in another table.
+    let query = `
+      SELECT
+      *
+      FROM 
+      (
+        SELECT
+        UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty, height,
+        IF(@prevStatus = YT.difficulty, @rn := @rn + 1,
+          IF(@prevStatus := YT.difficulty, @rn := 1, @rn := 1)
+        ) AS rn
+        FROM blocks YT
+        CROSS JOIN 
+        (
+          SELECT @prevStatus := -1, @rn := 1
+        ) AS var
+    `;
 
     if (interval) {
       query += ` WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`;
     }
 
-    query += ` GROUP BY difficulty
-      ORDER BY blockTimestamp`;
+    query += `
+        ORDER BY YT.height
+      ) AS t
+      WHERE t.rn = 1
+      ORDER BY t.height
+    `;
 
     const [rows]: any[] = await connection.query(query);
     connection.release();

backend/src/routes.ts

@@ -588,11 +588,17 @@ class Routes {
 
   public async $getHistoricalHashrate(req: Request, res: Response) {
     try {
-      const stats = await mining.$getHistoricalHashrates(req.params.interval ?? null);
+      const hashrates = await mining.$getHistoricalHashrates(req.params.interval ?? null);
+      const difficulty = await mining.$getHistoricalDifficulty(req.params.interval ?? null);
+      const oldestIndexedBlockTimestamp = await BlocksRepository.$oldestBlockTimestamp();
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
-      res.json(stats);
+      res.json({
+        oldestIndexedBlockTimestamp: oldestIndexedBlockTimestamp,
+        hashrates: hashrates,
+        difficulty: difficulty,
+      });
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }