Add USD serie in block fee/reward charts

backend/src/api/blocks.ts

@@ -17,6 +17,9 @@ import { prepareBlock } from '../utils/blocks-utils';
 import BlocksRepository from '../repositories/BlocksRepository';
 import HashratesRepository from '../repositories/HashratesRepository';
 import indexer from '../indexer';
+import fiatConversion from './fiat-conversion';
+import RatesRepository from '../repositories/RatesRepository';
+import database from '../database';
 import poolsParser from './pools-parser';
 import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository';
 import mining from './mining/mining';
@@ -150,6 +153,7 @@ class Blocks {
     blockExtended.extras.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
     blockExtended.extras.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
     blockExtended.extras.coinbaseRaw = blockExtended.extras.coinbaseTx.vin[0].scriptsig;
+    blockExtended.extras.usd = fiatConversion.getConversionRates().USD;
 
     if (block.height === 0) {
       blockExtended.extras.medianFee = 0; // 50th percentiles

backend/src/api/mining/mining.ts

@@ -31,7 +31,7 @@ class Mining {
    */
   public async $getHistoricalBlockFees(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockFees(
-      this.getTimeRange(interval),
+      this.getTimeRangeForAmounts(interval),
       Common.getSqlInterval(interval)
     );
   }
@@ -41,7 +41,7 @@ class Mining {
    */
   public async $getHistoricalBlockRewards(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockRewards(
-      this.getTimeRange(interval),
+      this.getTimeRangeForAmounts(interval),
       Common.getSqlInterval(interval)
     );
   }
@@ -462,6 +462,21 @@ class Mining {
     return date;
   }
 
+  private getTimeRangeForAmounts(interval: string | null): number {
+    switch (interval) {
+      case '3y': return 1296000;
+      case '2y': return 864000;
+      case '1y': return 432000;
+      case '6m': return 216000;
+      case '3m': return 108000;
+      case '1m': return 36000;
+      case '1w': return 8400;
+      case '3d': return 3600;
+      case '24h': return 1200; 
+      default: return 3888000;
+    }
+  }
+
   private getTimeRange(interval: string | null): number {
     switch (interval) {
       case '3y': return 43200; // 12h
@@ -473,7 +488,7 @@ class Mining {
       case '1w': return 300; // 5min
       case '3d': return 1;
       case '24h': return 1;
-      default: return 86400; // 24h
+      default: return 86400;
     }
   }
 }