machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wiz 2023-02-23 13:20:35 +09:00 committed by GitHub
commit 03be3ab561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/api/database-migration.ts
View File

@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
import { RowDataPacket } from 'mysql2'; import { RowDataPacket } from 'mysql2';
class DatabaseMigration { class DatabaseMigration {
private static currentVersion = 52; private static currentVersion = 53;
private queryTimeout = 3600_000; private queryTimeout = 3600_000;
private statisticsAddedIndexed = false; private statisticsAddedIndexed = false;
private uniqueLogs: string[] = []; private uniqueLogs: string[] = [];
@ -468,6 +468,11 @@ class DatabaseMigration {
logger.warn('' + (e instanceof Error ? e.message : e)); 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);
}
} }
/** /**

2
frontend/src/app/app.constants.ts
View File

@ -72,7 +72,7 @@ export const chartColors = [
]; ];
export const poolsColor = { 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, 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,

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

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

3
frontend/src/app/components/pool-ranking/pool-ranking.component.ts
View File

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

4
frontend/src/app/services/price.service.ts
View File

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