DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Track mined blocks to detect and report orphans and mining revenue

Browse Source 
Part of #1713
Closes #1716
This commit is contained in:
Jack Grigg
2016-10-30 14:36:36 -07:00
parent 1feaefac51
commit d793f94b8a
6 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/metrics.cpp
View File

@@ -5,9 +5,11 @@
#include "metrics.h"
#include "chainparams.h"
#include "main.h"
#include "ui_interface.h"
#include "util.h"
#include "utiltime.h"
#include "utilmoneystr.h"
#include <boost/thread.hpp>
#include <boost/thread/synchronized_value.hpp>
@@ -20,10 +22,18 @@ AtomicCounter ehSolverRuns;
AtomicCounter solutionTargetChecks;
AtomicCounter minedBlocks;
boost::synchronized_value<std::list<uint256>> trackedBlocks;
boost::synchronized_value<std::list<std::string>> messageBox;
boost::synchronized_value<std::string> initMessage;
bool loaded = false;
void TrackMinedBlock(uint256 hash)
{
minedBlocks.increment();
trackedBlocks->push_back(hash);
}
static bool metrics_ThreadSafeMessageBox(const std::string& message,
const std::string& caption,
unsigned int style)
@@ -121,8 +131,43 @@ int printMetrics(size_t cols, int64_t nStart, bool mining)
int mined = minedBlocks.get();
if (mined > 0) {
LOCK(cs_main);
boost::strict_lock_ptr<std::list<uint256>> u = trackedBlocks.synchronize();
auto consensusParams = Params().GetConsensus();
auto tipHeight = chainActive.Height();
std::string units = Params().CurrencyUnits();
// Update orphans and calculate subsidies
CAmount immature {0};
CAmount mature {0};
for (std::list<uint256>::iterator it = u->begin(); it != u->end(); it++) {
auto hash = *it;
if (mapBlockIndex.count(hash) > 0 &&
chainActive.Contains(mapBlockIndex[hash])) {
int height = mapBlockIndex[hash]->nHeight;
CAmount subsidy = GetBlockSubsidy(height, consensusParams);
if ((height > 0) && (height <= consensusParams.GetLastFoundersRewardBlockHeight())) {
subsidy -= subsidy/5;
}
if (std::max(0, COINBASE_MATURITY - (tipHeight - height)) > 0) {
immature += subsidy;
} else {
mature += subsidy;
}
} else {
it = u->erase(it);
}
}
int orphaned = mined - u->size();
std::cout << "- " << strprintf(_("You have mined %d blocks!"), mined) << std::endl;
lines++;
std::cout << " "
<< strprintf(_("Orphaned: %d blocks, Immature: %u %s, Mature: %u %s"),
orphaned,
FormatMoney(immature), units,
FormatMoney(mature), units)
<< std::endl;
lines += 2;
}
}
std::cout << std::endl;