GlcoinCore/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2026-08-18 13:08:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix and improve block time predictions

Browse source
This commit is contained in:
Antoni Spaanderman 2022-03-09 00:01:59 +01:00
parent 0cc82bbf1d
commit dce775e498
No known key found for this signature in database
GPG key ID: AE0B68E552E5DF8C
3 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/app/components/difficulty/difficulty.component.ts
View file

@ -66,14 +66,7 @@ export class DifficultyComponent implements OnInit {
}
}
const timeAvgDiff = change * 0.1;
let timeAvgMins = 10;
if (timeAvgDiff > 0) {
timeAvgMins -= Math.abs(timeAvgDiff);
} else {
timeAvgMins += Math.abs(timeAvgDiff);
}
const timeAvgMins = blocksInEpoch ? diff / blocksInEpoch / 60 : 10;
const timeAvg = timeAvgMins.toFixed(0);
const remainingTime = (remainingBlocks * timeAvgMins * 60 * 1000) + (now * 1000);

2
frontend/src/app/components/mempool-blocks/mempool-blocks.component.html
View file

@ -26,7 +26,7 @@
<app-time-until [time]="(1 * i) + now + 61000" [fastRender]="false" [fixedRender]="true"></app-time-until>
</ng-template>
<ng-template #timeDiffMainnet>
<app-time-until [time]="(timeAvg * i) + now + timeAvg" [fastRender]="false" [fixedRender]="true" [forceFloorOnTimeIntervals]="['hour']"></app-time-until>
<app-time-until [time]="(timeAvg * i) + lastBlockTime + timeAvg" [fastRender]="false" [fixedRender]="true" [forceFloorOnTimeIntervals]="['hour']"></app-time-until>
</ng-template>
</div>
<ng-template #mergedBlock>

21
frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
View file

@ -33,6 +33,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
networkSubscription: Subscription;
network = '';
now = new Date().getTime();
lastBlockTime: number;
showMiningInfo = false;
blockWidth = 125;
@ -129,24 +130,22 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
this.stateService.lastDifficultyAdjustment$
])),
map(([block, DATime]) => {
this.lastBlockTime = block.timestamp * 1000;
this.now = new Date().getTime();
const now = new Date().getTime() / 1000;
const diff = now - DATime;
const blocksInEpoch = block.height % 2016;
let difficultyChange = 0;
if (blocksInEpoch > 0) {
difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100;
}
const timeAvgDiff = difficultyChange * 0.1;
let timeAvgMins = 10;
if (timeAvgDiff > 0 ){
timeAvgMins -= Math.abs(timeAvgDiff);
} else {
timeAvgMins += Math.abs(timeAvgDiff);
let timeAvg = blocksInEpoch ? diff / blocksInEpoch : 600;
// testnet difficulty is set to 1 after 20 minutes of no blockSize
// therefore the time between blocks will always be below 20 minutes (1200s)
if (this.stateService.network === 'testnet' && now - block.timestamp + timeAvg > 1200) {
timeAvg = 1200;
}
return timeAvgMins * 60 * 1000;
return timeAvg * 1000;
})
);