Merge pull request #1298 from nymkappa/feature/fix-hashrate-indexing-try-catch
Make sure to reset hashrates indexing flags upon error
This commit is contained in:
commit
e131ec883b
@ -90,7 +90,7 @@ class Mining {
|
|||||||
/**
|
/**
|
||||||
* Return the historical hashrates and oldest indexed block timestamp for one or all pools
|
* Return the historical hashrates and oldest indexed block timestamp for one or all pools
|
||||||
*/
|
*/
|
||||||
public async $getPoolsHistoricalHashrates(interval: string | null, poolId: number): Promise<object> {
|
public async $getPoolsHistoricalHashrates(interval: string | null, poolId: number): Promise<object> {
|
||||||
return await HashratesRepository.$getPoolsWeeklyHashrate(interval);
|
return await HashratesRepository.$getPoolsWeeklyHashrate(interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,106 +108,112 @@ class Mining {
|
|||||||
if (!blocks.blockIndexingCompleted || this.hashrateIndexingStarted) {
|
if (!blocks.blockIndexingCompleted || this.hashrateIndexingStarted) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.hashrateIndexingStarted = true;
|
|
||||||
|
|
||||||
logger.info(`Indexing hashrates`);
|
try {
|
||||||
|
this.hashrateIndexingStarted = true;
|
||||||
|
|
||||||
const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144;
|
logger.info(`Indexing hashrates`);
|
||||||
const indexedTimestamp = (await HashratesRepository.$getNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
|
|
||||||
let startedAt = new Date().getTime() / 1000;
|
|
||||||
const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
|
|
||||||
const lastMidnight = new Date();
|
|
||||||
lastMidnight.setUTCHours(0); lastMidnight.setUTCMinutes(0); lastMidnight.setUTCSeconds(0); lastMidnight.setUTCMilliseconds(0);
|
|
||||||
let toTimestamp = Math.round(lastMidnight.getTime() / 1000);
|
|
||||||
let indexedThisRun = 0;
|
|
||||||
let totalIndexed = 0;
|
|
||||||
|
|
||||||
const hashrates: any[] = [];
|
const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144;
|
||||||
|
const indexedTimestamp = (await HashratesRepository.$getNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
|
||||||
|
let startedAt = new Date().getTime() / 1000;
|
||||||
|
const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
|
||||||
|
const lastMidnight = new Date();
|
||||||
|
lastMidnight.setUTCHours(0); lastMidnight.setUTCMinutes(0); lastMidnight.setUTCSeconds(0); lastMidnight.setUTCMilliseconds(0);
|
||||||
|
let toTimestamp = Math.round(lastMidnight.getTime() / 1000);
|
||||||
|
let indexedThisRun = 0;
|
||||||
|
let totalIndexed = 0;
|
||||||
|
|
||||||
while (toTimestamp > genesisTimestamp) {
|
const hashrates: any[] = [];
|
||||||
const fromTimestamp = toTimestamp - 86400;
|
|
||||||
if (indexedTimestamp.includes(fromTimestamp)) {
|
|
||||||
toTimestamp -= 86400;
|
|
||||||
++totalIndexed;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp(
|
while (toTimestamp > genesisTimestamp) {
|
||||||
null, fromTimestamp, toTimestamp);
|
const fromTimestamp = toTimestamp - 86400;
|
||||||
if (blockStats.blockCount === 0) { // We are done indexing, no blocks left
|
if (indexedTimestamp.includes(fromTimestamp)) {
|
||||||
break;
|
toTimestamp -= 86400;
|
||||||
}
|
++totalIndexed;
|
||||||
|
continue;
|
||||||
let lastBlockHashrate = 0;
|
|
||||||
lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount,
|
|
||||||
blockStats.lastBlockHeight);
|
|
||||||
|
|
||||||
if (totalIndexed > 7 && totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate
|
|
||||||
logger.debug(`Indexing weekly hashrates for mining pools (timestamp: ${fromTimestamp})`);
|
|
||||||
let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp - 604800, fromTimestamp);
|
|
||||||
const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0);
|
|
||||||
pools = pools.map((pool: any) => {
|
|
||||||
pool.hashrate = (pool.blockCount / totalBlocks) * lastBlockHashrate;
|
|
||||||
pool.share = (pool.blockCount / totalBlocks);
|
|
||||||
return pool;
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const pool of pools) {
|
|
||||||
hashrates.push({
|
|
||||||
hashrateTimestamp: fromTimestamp + 1,
|
|
||||||
avgHashrate: pool['hashrate'],
|
|
||||||
poolId: pool.poolId,
|
|
||||||
share: pool['share'],
|
|
||||||
type: 'weekly',
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp(
|
||||||
|
null, fromTimestamp, toTimestamp);
|
||||||
|
if (blockStats.blockCount === 0) { // We are done indexing, no blocks left
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
let lastBlockHashrate = 0;
|
||||||
|
lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount,
|
||||||
|
blockStats.lastBlockHeight);
|
||||||
|
|
||||||
|
if (totalIndexed > 7 && totalIndexed % 7 === 0 && !indexedTimestamp.includes(fromTimestamp + 1)) { // Save weekly pools hashrate
|
||||||
|
logger.debug("Indexing weekly hashrates for mining pools");
|
||||||
|
let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp - 604800, fromTimestamp);
|
||||||
|
const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0);
|
||||||
|
pools = pools.map((pool: any) => {
|
||||||
|
pool.hashrate = (pool.blockCount / totalBlocks) * lastBlockHashrate;
|
||||||
|
pool.share = (pool.blockCount / totalBlocks);
|
||||||
|
return pool;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const pool of pools) {
|
||||||
|
hashrates.push({
|
||||||
|
hashrateTimestamp: fromTimestamp + 1,
|
||||||
|
avgHashrate: pool['hashrate'],
|
||||||
|
poolId: pool.poolId,
|
||||||
|
share: pool['share'],
|
||||||
|
type: 'weekly',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hashrates.push({
|
||||||
|
hashrateTimestamp: fromTimestamp,
|
||||||
|
avgHashrate: lastBlockHashrate,
|
||||||
|
poolId: null,
|
||||||
|
share: 1,
|
||||||
|
type: 'daily',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (hashrates.length > 10) {
|
||||||
|
await HashratesRepository.$saveHashrates(hashrates);
|
||||||
|
hashrates.length = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
|
||||||
|
if (elapsedSeconds > 5) {
|
||||||
|
const daysPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2);
|
||||||
|
const formattedDate = new Date(fromTimestamp * 1000).toUTCString();
|
||||||
|
const daysLeft = Math.round(totalDayIndexed - totalIndexed);
|
||||||
|
logger.debug(`Getting hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`);
|
||||||
|
startedAt = new Date().getTime() / 1000;
|
||||||
|
indexedThisRun = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
toTimestamp -= 86400;
|
||||||
|
++indexedThisRun;
|
||||||
|
++totalIndexed;
|
||||||
}
|
}
|
||||||
|
|
||||||
hashrates.push({
|
// Add genesis block manually
|
||||||
hashrateTimestamp: fromTimestamp,
|
if (toTimestamp <= genesisTimestamp && !indexedTimestamp.includes(genesisTimestamp)) {
|
||||||
avgHashrate: lastBlockHashrate,
|
hashrates.push({
|
||||||
poolId: null,
|
hashrateTimestamp: genesisTimestamp,
|
||||||
share: 1,
|
avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1),
|
||||||
type: 'daily',
|
poolId: null,
|
||||||
});
|
type: 'daily',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (hashrates.length > 10) {
|
if (hashrates.length > 0) {
|
||||||
await HashratesRepository.$saveHashrates(hashrates);
|
await HashratesRepository.$saveHashrates(hashrates);
|
||||||
hashrates.length = 0;
|
|
||||||
}
|
}
|
||||||
|
await HashratesRepository.$setLatestRunTimestamp();
|
||||||
|
this.hashrateIndexingStarted = false;
|
||||||
|
|
||||||
const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
|
logger.info(`Hashrates indexing completed`);
|
||||||
if (elapsedSeconds > 5) {
|
} catch (e) {
|
||||||
const daysPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2);
|
this.hashrateIndexingStarted = false;
|
||||||
const formattedDate = new Date(fromTimestamp * 1000).toUTCString();
|
throw e;
|
||||||
const daysLeft = Math.round(totalDayIndexed - totalIndexed);
|
|
||||||
logger.debug(`Getting hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`);
|
|
||||||
startedAt = new Date().getTime() / 1000;
|
|
||||||
indexedThisRun = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
toTimestamp -= 86400;
|
|
||||||
++indexedThisRun;
|
|
||||||
++totalIndexed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add genesis block manually
|
|
||||||
if (toTimestamp <= genesisTimestamp && !indexedTimestamp.includes(genesisTimestamp)) {
|
|
||||||
hashrates.push({
|
|
||||||
hashrateTimestamp: genesisTimestamp,
|
|
||||||
avgHashrate: await bitcoinClient.getNetworkHashPs(1, 1),
|
|
||||||
poolId: null,
|
|
||||||
type: 'daily',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hashrates.length > 0) {
|
|
||||||
await HashratesRepository.$saveHashrates(hashrates);
|
|
||||||
}
|
|
||||||
await HashratesRepository.$setLatestRunTimestamp();
|
|
||||||
this.hashrateIndexingStarted = false;
|
|
||||||
|
|
||||||
logger.info(`Hashrates indexing completed`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,7 +167,7 @@ class Server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async $resetHashratesIndexingState() {
|
async $resetHashratesIndexingState() {
|
||||||
return await HashratesRepository.$setLatestRunTimestamp(0);
|
return await HashratesRepository.$setLatestRunTimestamp(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
async $runIndexingWhenReady() {
|
async $runIndexingWhenReady() {
|
||||||
|
@ -22,6 +22,7 @@ class HashratesRepository {
|
|||||||
await connection.query(query);
|
await connection.query(query);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
logger.err('$saveHashrateInDatabase() error' + (e instanceof Error ? e.message : e));
|
logger.err('$saveHashrateInDatabase() error' + (e instanceof Error ? e.message : e));
|
||||||
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
connection.release();
|
connection.release();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user