Compare commits
3 Commits
master
...
nymkappa/b
Author | SHA1 | Date | |
---|---|---|---|
|
2b79fd438d | ||
|
b5d5231bc1 | ||
|
79339c0589 |
@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
|
|||||||
import { RowDataPacket } from 'mysql2';
|
import { RowDataPacket } from 'mysql2';
|
||||||
|
|
||||||
class DatabaseMigration {
|
class DatabaseMigration {
|
||||||
private static currentVersion = 95;
|
private static currentVersion = 96;
|
||||||
private queryTimeout = 3600_000;
|
private queryTimeout = 3600_000;
|
||||||
private statisticsAddedIndexed = false;
|
private statisticsAddedIndexed = false;
|
||||||
private uniqueLogs: string[] = [];
|
private uniqueLogs: string[] = [];
|
||||||
@ -1121,7 +1121,7 @@ class DatabaseMigration {
|
|||||||
|
|
||||||
// blocks pools-v2.json hash
|
// blocks pools-v2.json hash
|
||||||
if (databaseSchemaVersion < 95) {
|
if (databaseSchemaVersion < 95) {
|
||||||
let poolJsonSha = 'f737d86571d190cf1a1a3cf5fd86b33ba9624254';
|
let poolJsonSha = 'f737d86571d190cf1a1a3cf5fd86b33ba9624254'; // https://github.com/mempool/mining-pools/commit/f737d86571d190cf1a1a3cf5fd86b33ba9624254
|
||||||
const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
|
const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
|
||||||
if (poolJsonShaDb?.length > 0) {
|
if (poolJsonShaDb?.length > 0) {
|
||||||
poolJsonSha = poolJsonShaDb[0].string;
|
poolJsonSha = poolJsonShaDb[0].string;
|
||||||
@ -1130,6 +1130,17 @@ class DatabaseMigration {
|
|||||||
await this.$executeQuery('ALTER TABLE blocks ADD INDEX `definition_hash` (`definition_hash`)');
|
await this.$executeQuery('ALTER TABLE blocks ADD INDEX `definition_hash` (`definition_hash`)');
|
||||||
await this.updateToSchemaVersion(95);
|
await this.updateToSchemaVersion(95);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make definition_hash nullable
|
||||||
|
if (databaseSchemaVersion < 96) {
|
||||||
|
let poolJsonSha = '0138019f39e0f6033db576be15a4880a216c1dd0'; // https://github.com/mempool/mining-pools/commit/0138019f39e0f6033db576be15a4880a216c1dd0
|
||||||
|
const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
|
||||||
|
if (poolJsonShaDb?.length > 0) {
|
||||||
|
poolJsonSha = poolJsonShaDb[0].string;
|
||||||
|
}
|
||||||
|
await this.$executeQuery(`ALTER TABLE blocks MODIFY COLUMN definition_hash varchar(255) NULL DEFAULT "${poolJsonSha}"`);
|
||||||
|
await this.updateToSchemaVersion(96);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -152,6 +152,11 @@ class Server {
|
|||||||
this.setUpWebsocketHandling();
|
this.setUpWebsocketHandling();
|
||||||
|
|
||||||
await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
|
await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
|
||||||
|
if (config.DATABASE.ENABLED === true && config.MEMPOOL.ENABLED && ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) && !poolsUpdater.currentSha) {
|
||||||
|
logger.err(`Failed to retreive pools-v2.json sha, cannot run block indexing. Please make sure you've set valid urls in your mempool-config.json::MEMPOOL::POOLS_JSON_URL and mempool-config.json::MEMPOOL::POOLS_JSON_TREE_UR, aborting now`);
|
||||||
|
return process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
await syncAssets.syncAssets$();
|
await syncAssets.syncAssets$();
|
||||||
await mempoolBlocks.updatePools$();
|
await mempoolBlocks.updatePools$();
|
||||||
if (config.MEMPOOL.ENABLED) {
|
if (config.MEMPOOL.ENABLED) {
|
||||||
|
@ -45,15 +45,15 @@ class PoolsUpdater {
|
|||||||
this.lastRun = now;
|
this.lastRun = now;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
if (config.DATABASE.ENABLED === true) {
|
||||||
|
this.currentSha = await this.getShaFromDb();
|
||||||
|
}
|
||||||
|
|
||||||
const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github
|
const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github
|
||||||
if (githubSha === null) {
|
if (githubSha === null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.DATABASE.ENABLED === true) {
|
|
||||||
this.currentSha = await this.getShaFromDb();
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(`pools-v2.json sha | Current: ${this.currentSha} | Github: ${githubSha}`, this.tag);
|
logger.debug(`pools-v2.json sha | Current: ${this.currentSha} | Github: ${githubSha}`, this.tag);
|
||||||
if (this.currentSha !== null && this.currentSha === githubSha) {
|
if (this.currentSha !== null && this.currentSha === githubSha) {
|
||||||
return;
|
return;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user