zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Distinguish between height and current header height on metrics screen

This commit is contained in:
Eirik Ogilvie-Wigley 2019-08-05 14:20:25 -06:00
parent f97b9c5d9f
commit 5a93638981
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/metrics.cpp
View File

@ -109,28 +109,29 @@ double GetLocalSolPS()
return miningTimer.rate(solutionTargetChecks); return miningTimer.rate(solutionTargetChecks);
} }
int EstimateNetHeight(const Consensus::Params& params, int currentBlockHeight, int64_t currentBlockTime) int EstimateNetHeight(const Consensus::Params& params, int currentHeadersHeight, int64_t currentHeadersTime)
{ {
int64_t now = GetAdjustedTime(); int64_t now = GetAdjustedTime();
if (currentBlockTime >= now) { if (currentHeadersTime >= now) {
return currentBlockHeight; return currentHeadersHeight;
} }
int estimatedHeight = currentBlockHeight + (now - currentBlockTime) / params.PoWTargetSpacing(currentBlockHeight); int estimatedHeight = currentHeadersHeight + (now - currentHeadersTime) / params.PoWTargetSpacing(currentHeadersHeight);
int blossomActivationHeight = params.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight; int blossomActivationHeight = params.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
if (currentBlockHeight >= blossomActivationHeight || estimatedHeight <= blossomActivationHeight) { if (currentHeadersHeight >= blossomActivationHeight || estimatedHeight <= blossomActivationHeight) {
return estimatedHeight; return estimatedHeight;
} }
int numPreBlossomBlocks = blossomActivationHeight - currentBlockHeight; int numPreBlossomBlocks = blossomActivationHeight - currentHeadersHeight;
int64_t preBlossomTime = numPreBlossomBlocks * params.PoWTargetSpacing(blossomActivationHeight - 1); int64_t preBlossomTime = numPreBlossomBlocks * params.PoWTargetSpacing(blossomActivationHeight - 1);
int64_t blossomActivationTime = currentBlockTime + preBlossomTime; int64_t blossomActivationTime = currentHeadersTime + preBlossomTime;
if (blossomActivationTime >= now) { if (blossomActivationTime >= now) {
return blossomActivationHeight; return blossomActivationHeight;
} }
return blossomActivationHeight + (now - blossomActivationTime) / params.PoWTargetSpacing(blossomActivationHeight); int netheight = blossomActivationHeight + (now - blossomActivationTime) / params.PoWTargetSpacing(blossomActivationHeight);
return ((netheight + 5) / 10) * 10;
} }
void TriggerRefresh() void TriggerRefresh()
@ -199,20 +200,22 @@ int printStats(bool mining)
int lines = 4; int lines = 4;
int height; int height;
int64_t blockTime; int64_t currentHeadersHeight;
int64_t currentHeadersTime;
size_t connections; size_t connections;
int64_t netsolps; int64_t netsolps;
{ {
LOCK2(cs_main, cs_vNodes); LOCK2(cs_main, cs_vNodes);
height = pindexBestHeader->nHeight; height = chainActive.Tip()->nHeight;
blockTime = pindexBestHeader->nTime; currentHeadersHeight = pindexBestHeader->nHeight;
currentHeadersTime = pindexBestHeader->nTime;
connections = vNodes.size(); connections = vNodes.size();
netsolps = GetNetworkHashPS(120, -1); netsolps = GetNetworkHashPS(120, -1);
} }
auto localsolps = GetLocalSolPS(); auto localsolps = GetLocalSolPS();
if (IsInitialBlockDownload(Params())) { if (IsInitialBlockDownload(Params())) {
int netheight = EstimateNetHeight(Params().GetConsensus(), height, blockTime); int netheight = EstimateNetHeight(Params().GetConsensus(), currentHeadersHeight, currentHeadersTime);
int downloadPercent = height * 100 / netheight; int downloadPercent = height * 100 / netheight;
std::cout << " " << _("Downloading blocks") << " | " << height << " / ~" << netheight << " (" << downloadPercent << "%)" << std::endl; std::cout << " " << _("Downloading blocks") << " | " << height << " / ~" << netheight << " (" << downloadPercent << "%)" << std::endl;
} else { } else {