Merge branch 'master' into nymkappa/bugfix/fast-forward-re-org

backend/src/api/common.ts

@@ -77,7 +77,7 @@ export class Common {
     };
   }
 
-  static sleep(ms: number): Promise<void> {
+  static sleep$(ms: number): Promise<void> {
     return new Promise((resolve) => {
        setTimeout(() => {
          resolve();

backend/src/api/database-migration.ts

@@ -1,8 +1,7 @@
 import config from '../config';
 import DB from '../database';
 import logger from '../logger';
-
-const sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
+import { Common } from './common';
 
 class DatabaseMigration {
   private static currentVersion = 17;
@@ -25,7 +24,7 @@ class DatabaseMigration {
         await this.$createMigrationStateTable();
       } catch (e) {
         logger.err('MIGRATIONS: Unable to create `state` table, aborting in 10 seconds. ' + e);
-        await sleep(10000);
+        await Common.sleep$(10000);
         process.exit(-1);
       }
       logger.debug('MIGRATIONS: `state` table initialized.');
@@ -36,7 +35,7 @@ class DatabaseMigration {
       databaseSchemaVersion = await this.$getSchemaVersionFromDatabase();
     } catch (e) {
       logger.err('MIGRATIONS: Unable to get current database migration version, aborting in 10 seconds. ' + e);
-      await sleep(10000);
+      await Common.sleep$(10000);
       process.exit(-1);
     }
 
@@ -52,7 +51,7 @@ class DatabaseMigration {
       await this.$createMissingTablesAndIndexes(databaseSchemaVersion);
     } catch (e) {
       logger.err('MIGRATIONS: Unable to create required tables, aborting in 10 seconds. ' + e);
-      await sleep(10000);
+      await Common.sleep$(10000);
       process.exit(-1);
     }
 

backend/src/api/liquid/icons.ts

@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import config from '../../config';
 import logger from '../../logger';
 
 class Icons {

backend/src/api/mining.ts

@@ -15,7 +15,7 @@ class Mining {
   }
 
   /**
-   * Get historical block reward and total fee
+   * Get historical block total fee
    */
   public async $getHistoricalBlockFees(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockFees(
@@ -34,6 +34,16 @@ class Mining {
     );
   }
 
+  /**
+   * Get historical block fee rates percentiles
+   */
+   public async $getHistoricalBlockFeeRates(interval: string | null = null): Promise<any> {
+    return await BlocksRepository.$getHistoricalBlockFeeRates(
+      this.getTimeRange(interval),
+      Common.getSqlInterval(interval)
+    );
+  }
+
   /**
    * Generate high level overview of the pool ranks and general stats
    */