Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more data to the "superblocks" RPC output #1599

Merged
merged 2 commits into from
Nov 19, 2019
Merged

Add more data to the "superblocks" RPC output #1599

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
798cbf5
Add more data to the "superblocks" RPC output
cyrossignol Nov 13, 2019
2ba144b
Remove header object from output of "superblocks" RPC output
cyrossignol Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions src/rpcblockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,12 +1985,6 @@ UniValue execute(const UniValue& params, bool fHelp)
UniValue SuperblockReport(int lookback, bool displaycontract, std::string cpid)
{
UniValue results(UniValue::VARR);
UniValue c(UniValue::VOBJ);
std::string Narr = ToString(GetAdjustedTime());
c.pushKV("SuperBlock Report (14 days)",Narr);
if (!cpid.empty()) c.pushKV("CPID",cpid);

results.push_back(c);

int nMaxDepth = nBestHeight;
int nLookback = BLOCKS_PER_DAY * lookback;
Expand All @@ -2003,6 +1997,8 @@ UniValue SuperblockReport(int lookback, bool displaycontract, std::string cpid)
pblockindex = pblockindex->pprev;
}

const NN::CpidOption cpid_parsed = NN::MiningId::Parse(cpid).TryCpid();

while (pblockindex->nHeight > nMinDepth)
{
if (!pblockindex || !pblockindex->pprev) return results;
Expand All @@ -2018,12 +2014,21 @@ UniValue SuperblockReport(int lookback, bool displaycontract, std::string cpid)
const NN::Superblock& superblock = claim->m_superblock;

UniValue c(UniValue::VOBJ);
c.pushKV("Block #" + ToString(pblockindex->nHeight),pblockindex->GetBlockHash().GetHex());
c.pushKV("Date",TimestampToHRDate(pblockindex->nTime));
c.pushKV("Average Mag", superblock.m_cpids.AverageMagnitude());
c.pushKV("Wallet Version", claim->m_client_version);
c.pushKV("height", ToString(pblockindex->nHeight));
c.pushKV("block", pblockindex->GetBlockHash().GetHex());
c.pushKV("date", TimestampToHRDate(pblockindex->nTime));
c.pushKV("wallet_version", claim->m_client_version);

c.pushKV("total_cpids", (int)superblock.m_cpids.TotalCount());
c.pushKV("active_beacons", (int)superblock.m_cpids.size());
c.pushKV("inactive_beacons", (int)superblock.m_cpids.Zeros());

c.pushKV("total_magnitude", superblock.m_cpids.TotalMagnitude());
c.pushKV("average_magnitude", superblock.m_cpids.AverageMagnitude());

c.pushKV("total_projects", (int)superblock.m_projects.size());

if (const NN::CpidOption cpid_parsed = NN::MiningId::Parse(cpid).TryCpid())
if (cpid_parsed)
{
c.pushKV("Magnitude", superblock.m_cpids.MagnitudeOf(*cpid_parsed));
}
Expand Down