Skip to content

Simplify mining stats #831

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

Merged
fassadlr merged 7 commits into from
Jan 5, 2022
Merged

Simplify mining stats #831

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa7fecc
Simplify mining stats
quantumagi Jan 4, 2022
fc2cb64
Update src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
quantumagi Jan 5, 2022
64ce2d2
Update src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
quantumagi Jan 5, 2022
02abf7a
Update src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
quantumagi Jan 5, 2022
d419257
Update src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
quantumagi Jan 5, 2022
b73234d
Changes based on feedback
quantumagi Jan 5, 2022
437e0a6
Refactor
quantumagi Jan 5, 2022
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
90 changes: 44 additions & 46 deletions src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,27 @@ public virtual void InitializeMining()
startAfter: TimeSpans.TenSeconds);
}

private IFederationMember DetermineExpectedMinerForTimestamp(uint headerTime)
{
// When blocks are missing for given timestamps we have to determine whom was supposed to mine
// by looking at the federation make-up at the time and whom mined last.

ChainedHeader prevBlockMined = this.consensusManager.Tip;
while (prevBlockMined.Header.Time > headerTime)
prevBlockMined = prevBlockMined.Previous;

IFederationMember minerForBlock = this.federationHistory.GetFederationMemberForBlock(prevBlockMined);
List<IFederationMember> federationAtBlock = this.federationHistory.GetFederationForBlock(prevBlockMined);

int offset = (int)((headerTime - prevBlockMined.Header.Time) / this.network.ConsensusOptions.TargetSpacingSeconds);

int minerForBlockIndex = federationAtBlock.TakeWhile(m => m.PubKey != minerForBlock.PubKey).Count();

int expectedIndex = (minerForBlockIndex + offset) % federationAtBlock.Count;

return federationAtBlock[expectedIndex];
}

private void GatherMiningStatistics()
{
var log = new StringBuilder();
Expand Down Expand Up @@ -220,69 +241,46 @@ private void GatherMiningStatistics()

uint currentSlotTime = (uint)this.dateTimeProvider.GetAdjustedTimeAsUnixTimestamp();
currentSlotTime -= currentSlotTime % this.network.ConsensusOptions.TargetSpacingSeconds;
if (currentHeader.Header.Time > currentSlotTime)
currentSlotTime = currentHeader.Header.Time;

// Determine the number of slots before this node will mine.
uint slotOffset = (this.slotsManager.GetMiningTimestamp(currentSlotTime) - currentSlotTime) / this.network.ConsensusOptions.TargetSpacingSeconds;

// Determine the current slot from that.
int mySlotIndex = modifiedFederation.FindIndex(m => m.PubKey == this.federationManager.CurrentFederationKey?.PubKey);
int currentSlot = (int)(mySlotIndex - slotOffset) % modifiedFederation.Count;
while (currentSlot < 0)
currentSlot += modifiedFederation.Count;

// Determine the public key of the current slot.
PubKey pubKey = modifiedFederation[currentSlot].PubKey;

string pubKeyRepresentation;
// Iterate mining slots.
for (int i = 0; i < maxDepth; i++)
for (int i = 0; i < maxDepth; i++, currentSlotTime -= this.network.ConsensusOptions.TargetSpacingSeconds)
{
string pubKeyRepresentation = pubKey.ToString().Substring(0, pubKeyTakeCharacters);

if (pubKey == this.federationManager.CurrentFederationKey?.PubKey)
pubKeyRepresentation = "█████";
// Find the chained header for this slot.
while (currentHeader.Header.Time > currentSlotTime)
currentHeader = currentHeader.Previous;

// Mined in this slot?
if (currentHeader.Header.Time == currentSlotTime)
{
if (includeHeight)
log.Append($"{currentHeader.Height.ToString().PadLeft(7)}:{ pubKeyRepresentation } ");
else
log.Append($"[{pubKeyRepresentation}] ");
bool minedInThisSlot = currentHeader.Header.Time == currentSlotTime;

currentHeader = currentHeader.Previous;
hitCount++;
PubKey pubKey = (minedInThisSlot ?
this.federationHistory.GetFederationMemberForBlock(currentHeader) :
DetermineExpectedMinerForTimestamp(currentSlotTime)).PubKey;

modifiedFederation = this.federationHistory.GetFederationForBlock(currentHeader);

if (pubKey == this.federationManager.CurrentFederationKey?.PubKey)
this.miningStatistics.ProducedBlockInLastRound = true;
if (pubKey == this.federationManager.CurrentFederationKey?.PubKey)
{
pubKeyRepresentation = "█████";
this.miningStatistics.ProducedBlockInLastRound = minedInThisSlot;
}
else
{
if (includeHeight)
log.Append($"---MISS:{ pubKeyRepresentation } ");
else
log.Append($"<{pubKeyRepresentation}> ");

if (pubKey == this.federationManager.CurrentFederationKey?.PubKey)
this.miningStatistics.ProducedBlockInLastRound = false;
pubKeyRepresentation = pubKey.ToHex().Substring(0, pubKeyTakeCharacters);
}

// Determine previous miner.
int index = modifiedFederation.FindIndex(m => m.PubKey.ToHex() == pubKey.ToHex());
if (index < 0)
if (includeHeight)
{
// Federation changed.
log.Append($"(Federation changed)");
break;
string strHeight = minedInThisSlot ? currentHeader.Height.ToString().PadLeft(7) : "---MISS";
log.Append($"{strHeight}:{ pubKeyRepresentation } ");
}
else
{
log.Append(minedInThisSlot ? $"[{pubKeyRepresentation}] " : $"<{pubKeyRepresentation}> ");
}

index = (index > 0) ? (index - 1) : (modifiedFederation.Count - 1);
pubKey = modifiedFederation[index].PubKey;

currentSlotTime -= this.network.ConsensusOptions.TargetSpacingSeconds;
if (minedInThisSlot)
hitCount++;

if (((i + 1) % (includeHeight ? 10 : 20)) == 0)
log.AppendLine();
Expand Down