Merge branch 'master' into simon/alias-search-syntax-error

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 52;
+  private static currentVersion = 53;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -468,6 +468,11 @@ class DatabaseMigration {
         logger.warn('' + (e instanceof Error ? e.message : e));
       }
     }
+
+    if (databaseSchemaVersion < 53) {
+      await this.$executeQuery('ALTER TABLE statistics MODIFY mempool_byte_weight bigint(20) UNSIGNED NOT NULL');
+      await this.updateToSchemaVersion(53);
+    }
   }
 
   /**

frontend/src/app/app.constants.ts

@@ -72,7 +72,7 @@ export const chartColors = [
 ];
 
 export const poolsColor = {
-  'unknown': '#9C9C9C',
+  'unknown': '#FDD835',
 };
 
 export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,

frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts

@@ -173,7 +173,7 @@ export class HashrateChartPoolsComponent implements OnInit {
     this.chartOptions = {
       title: title,
       animation: false,
-      color: chartColors,
+      color: chartColors.filter(color => color !== '#FDD835'),
       grid: {
         right: this.right,
         left: this.left,

frontend/src/app/components/pool-ranking/pool-ranking.component.ts

@@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { EChartsOption, PieSeriesOption } from 'echarts';
 import { concat, Observable } from 'rxjs';
 import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
-import { SinglePoolStats } from '../../interfaces/node-api.interface';
 import { SeoService } from '../../services/seo.service';
 import { StorageService } from '../..//services/storage.service';
 import { MiningService, MiningStats } from '../../services/mining.service';
@@ -220,7 +219,7 @@ export class PoolRankingComponent implements OnInit {
 
     this.chartOptions = {
       animation: false,
-      color: chartColors,
+      color: chartColors.filter(color => color !== '#FDD835'),
       tooltip: {
         trigger: 'item',
         textStyle: {

frontend/src/app/services/price.service.ts

@@ -93,6 +93,10 @@ export class PriceService {
    * @param blockTimestamp 
    */
   getPriceForTimestamp(blockTimestamp: number): Price | null {
+    if (!blockTimestamp) {
+      return undefined;
+    }
+
     const priceTimestamps = Object.keys(this.historicalPrice.prices);
     priceTimestamps.push(Number.MAX_SAFE_INTEGER.toString());
     priceTimestamps.sort().reverse();