mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-01-01 03:04:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1424 from mempool/nymkappa/bugfix/hashrate-native-js-timestamp

Browse Source 
Set weekly hashrates timestamp to midnight
This commit is contained in:
wiz 2022-03-23 18:28:33 +00:00 committed by GitHub
commit 3f58145e7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
backend/src/api/mining.ts
View File

@ -86,9 +86,9 @@ class Mining {
} }
// We only run this once a week // We only run this once a week
const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_weekly_hashrates_indexing'); const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_weekly_hashrates_indexing') * 1000;
const now = new Date(); const now = new Date();
if ((now.getTime() / 1000) - latestTimestamp < 604800) { if (now.getTime() - latestTimestamp < 604800000) {
return; return;
} }
@ -99,23 +99,23 @@ class Mining {
const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps(); const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps();
const hashrates: any[] = []; const hashrates: any[] = [];
const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f const genesisTimestamp = 1231006505000; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
const lastMonday = new Date(now.setDate(now.getDate() - (now.getDay() + 6) % 7)); const lastMonday = new Date(now.setDate(now.getDate() - (now.getDay() + 6) % 7));
const lastMondayMidnight = this.getDateMidnight(lastMonday); const lastMondayMidnight = this.getDateMidnight(lastMonday);
let toTimestamp = Math.round((lastMondayMidnight.getTime() - 604800) / 1000); let toTimestamp = lastMondayMidnight.getTime();
const totalWeekIndexed = (await BlocksRepository.$blockCount(null, null)) / 1008; const totalWeekIndexed = (await BlocksRepository.$blockCount(null, null)) / 1008;
let indexedThisRun = 0; let indexedThisRun = 0;
let totalIndexed = 0; let totalIndexed = 0;
let startedAt = new Date().getTime() / 1000; let startedAt = new Date().getTime();
while (toTimestamp > genesisTimestamp) { while (toTimestamp > genesisTimestamp) {
const fromTimestamp = toTimestamp - 604800; const fromTimestamp = toTimestamp - 604800000;
// Skip already indexed weeks // Skip already indexed weeks
if (indexedTimestamp.includes(toTimestamp)) { if (indexedTimestamp.includes(toTimestamp / 1000)) {
toTimestamp -= 604800; toTimestamp -= 604800000;
++totalIndexed; ++totalIndexed;
continue; continue;
} }
@ -123,17 +123,17 @@ class Mining {
// Check if we have blocks for the previous week (which mean that the week // Check if we have blocks for the previous week (which mean that the week
// we are currently indexing has complete data) // we are currently indexing has complete data)
const blockStatsPreviousWeek: any = await BlocksRepository.$blockCountBetweenTimestamp( const blockStatsPreviousWeek: any = await BlocksRepository.$blockCountBetweenTimestamp(
null, fromTimestamp - 604800, toTimestamp - 604800); null, (fromTimestamp - 604800000) / 1000, (toTimestamp - 604800000) / 1000);
if (blockStatsPreviousWeek.blockCount === 0) { // We are done indexing if (blockStatsPreviousWeek.blockCount === 0) { // We are done indexing
break; break;
} }
const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp( const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp(
null, fromTimestamp, toTimestamp); null, fromTimestamp / 1000, toTimestamp / 1000);
const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount,
blockStats.lastBlockHeight); blockStats.lastBlockHeight);
let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp, toTimestamp); let pools = await PoolsRepository.$getPoolsInfoBetween(fromTimestamp / 1000, toTimestamp / 1000);
const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0); const totalBlocks = pools.reduce((acc, pool) => acc + pool.blockCount, 0);
pools = pools.map((pool: any) => { pools = pools.map((pool: any) => {
pool.hashrate = (pool.blockCount / totalBlocks) * lastBlockHashrate; pool.hashrate = (pool.blockCount / totalBlocks) * lastBlockHashrate;
@ -143,7 +143,7 @@ class Mining {
for (const pool of pools) { for (const pool of pools) {
hashrates.push({ hashrates.push({
hashrateTimestamp: toTimestamp, hashrateTimestamp: toTimestamp / 1000,
avgHashrate: pool['hashrate'], avgHashrate: pool['hashrate'],
poolId: pool.poolId, poolId: pool.poolId,
share: pool['share'], share: pool['share'],
@ -154,17 +154,17 @@ class Mining {
await HashratesRepository.$saveHashrates(hashrates); await HashratesRepository.$saveHashrates(hashrates);
hashrates.length = 0; hashrates.length = 0;
const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); const elapsedSeconds = Math.max(1, Math.round((new Date().getTime()) - startedAt));
if (elapsedSeconds > 1) { if (elapsedSeconds > 1) {
const weeksPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2); const weeksPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2);
const formattedDate = new Date(fromTimestamp * 1000).toUTCString(); const formattedDate = new Date(fromTimestamp).toUTCString();
const weeksLeft = Math.round(totalWeekIndexed - totalIndexed); const weeksLeft = Math.round(totalWeekIndexed - totalIndexed);
logger.debug(`Getting weekly pool hashrate for ${formattedDate} | ~${weeksPerSeconds} weeks/sec | ~${weeksLeft} weeks left to index`); logger.debug(`Getting weekly pool hashrate for ${formattedDate} | ~${weeksPerSeconds} weeks/sec | ~${weeksLeft} weeks left to index`);
startedAt = new Date().getTime() / 1000; startedAt = new Date().getTime();
indexedThisRun = 0; indexedThisRun = 0;
} }
toTimestamp -= 604800; toTimestamp -= 604800000;
++indexedThisRun; ++indexedThisRun;
++totalIndexed; ++totalIndexed;
} }
@ -187,8 +187,8 @@ class Mining {
// We only run this once a day // We only run this once a day
const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_hashrates_indexing'); const latestTimestamp = await HashratesRepository.$getLatestRunTimestamp('last_hashrates_indexing');
const now = new Date().getTime() / 1000; const now = new Date().getTime();
if (now - latestTimestamp < 86400) { if (now - latestTimestamp < 86400000) {
return; return;
} }
@ -198,22 +198,22 @@ class Mining {
logger.info(`Indexing network daily hashrate`); logger.info(`Indexing network daily hashrate`);
const indexedTimestamp = (await HashratesRepository.$getNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp); const indexedTimestamp = (await HashratesRepository.$getNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
const genesisTimestamp = 1231006505; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f const genesisTimestamp = 1231006505000; // bitcoin-cli getblock 000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
const lastMidnight = this.getDateMidnight(new Date()); const lastMidnight = this.getDateMidnight(new Date());
let toTimestamp = Math.round(lastMidnight.getTime() / 1000); let toTimestamp = Math.round(lastMidnight.getTime());
const hashrates: any[] = []; const hashrates: any[] = [];
const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144; const totalDayIndexed = (await BlocksRepository.$blockCount(null, null)) / 144;
let indexedThisRun = 0; let indexedThisRun = 0;
let totalIndexed = 0; let totalIndexed = 0;
let startedAt = new Date().getTime() / 1000; let startedAt = new Date().getTime();
while (toTimestamp > genesisTimestamp) { while (toTimestamp > genesisTimestamp) {
const fromTimestamp = toTimestamp - 86400; const fromTimestamp = toTimestamp - 86400000;
// Skip already indexed weeks // Skip already indexed weeks
if (indexedTimestamp.includes(toTimestamp)) { if (indexedTimestamp.includes(toTimestamp / 1000)) {
toTimestamp -= 86400; toTimestamp -= 86400000;
++totalIndexed; ++totalIndexed;
continue; continue;
} }
@ -221,18 +221,18 @@ class Mining {
// Check if we have blocks for the previous day (which mean that the day // Check if we have blocks for the previous day (which mean that the day
// we are currently indexing has complete data) // we are currently indexing has complete data)
const blockStatsPreviousDay: any = await BlocksRepository.$blockCountBetweenTimestamp( const blockStatsPreviousDay: any = await BlocksRepository.$blockCountBetweenTimestamp(
null, fromTimestamp - 86400, toTimestamp - 86400); null, (fromTimestamp - 86400000) / 1000, (toTimestamp - 86400000) / 1000);
if (blockStatsPreviousDay.blockCount === 0) { // We are done indexing if (blockStatsPreviousDay.blockCount === 0) { // We are done indexing
break; break;
} }
const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp( const blockStats: any = await BlocksRepository.$blockCountBetweenTimestamp(
null, fromTimestamp, toTimestamp); null, fromTimestamp / 1000, toTimestamp / 1000);
const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount, const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(blockStats.blockCount,
blockStats.lastBlockHeight); blockStats.lastBlockHeight);
hashrates.push({ hashrates.push({
hashrateTimestamp: toTimestamp, hashrateTimestamp: toTimestamp / 1000,
avgHashrate: lastBlockHashrate, avgHashrate: lastBlockHashrate,
poolId: 0, poolId: 0,
share: 1, share: 1,
@ -244,17 +244,17 @@ class Mining {
hashrates.length = 0; hashrates.length = 0;
} }
const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt)); const elapsedSeconds = Math.max(1, Math.round(new Date().getTime() - startedAt));
if (elapsedSeconds > 1) { if (elapsedSeconds > 1) {
const daysPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2); const daysPerSeconds = (indexedThisRun / elapsedSeconds).toFixed(2);
const formattedDate = new Date(fromTimestamp * 1000).toUTCString(); const formattedDate = new Date(fromTimestamp).toUTCString();
const daysLeft = Math.round(totalDayIndexed - totalIndexed); const daysLeft = Math.round(totalDayIndexed - totalIndexed);
logger.debug(`Getting network daily hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`); logger.debug(`Getting network daily hashrate for ${formattedDate} | ~${daysPerSeconds} days/sec | ~${daysLeft} days left to index`);
startedAt = new Date().getTime() / 1000; startedAt = new Date().getTime();
indexedThisRun = 0; indexedThisRun = 0;
} }
toTimestamp -= 86400; toTimestamp -= 86400000;
++indexedThisRun; ++indexedThisRun;
++totalIndexed; ++totalIndexed;
} }