Merge hashrate and difficulty into one chart

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);
   }
 
   /**

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

backend/src/routes.ts

@@ -588,11 +588,18 @@ 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();
+      console.log(oldestIndexedBlockTimestamp);
       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);
     }