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

Jump to bottom

Recalculate committee every 28 blocks #1907

Merged
merged 9 commits into from
Sep 11, 2020
Merged

Recalculate committee every 28 blocks #1907

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
94bf287
Recalculate committee every 28 blocks
Sep 4, 2020
37add17
Merge branch 'master' into recalculate_committee_every_28_blocks
Qiao-Jin Sep 4, 2020
a094358
Format
Sep 4, 2020
3bdf247
Merge branch 'master' into recalculate_committee_every_28_blocks
Qiao-Jin Sep 7, 2020
5677343
Fix
Sep 7, 2020
738c1e1
Optimize
Sep 8, 2020
edc16a3
Fix format
Sep 8, 2020
ac9706d
Merge branch 'master' into recalculate_committee_every_28_blocks
Qiao-Jin Sep 10, 2020
8a5c001
Format
Sep 10, 2020
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
9 changes: 7 additions & 2 deletions src/neo/SmartContract/Native/Tokens/NeoToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ private BigInteger CalculateBonus(StoreView snapshot, BigInteger value, uint sta
return value * sum * NeoHolderRewardRatio / 100 / TotalAmount;
}

private bool ShouldRefreshCommittee(uint height) => height % (ProtocolSettings.Default.CommitteeMembersCount + ProtocolSettings.Default.ValidatorsCount) == 0;

internal override void Initialize(ApplicationEngine engine)
{
engine.Snapshot.Storages.Add(CreateStorageKey(Prefix_Committee), new StorageItem(Blockchain.StandbyCommittee.ToByteArray()));
Expand All @@ -108,8 +110,11 @@ protected override void OnPersist(ApplicationEngine engine)
{
base.OnPersist(engine);

// Set next validators
engine.Snapshot.Storages[CreateStorageKey(Prefix_Committee)].Value = ComputeCommitteeMembers(engine.Snapshot).ToArray().ToByteArray();
// Set next committee
if (ShouldRefreshCommittee(engine.Snapshot.Height))
{
engine.Snapshot.Storages[CreateStorageKey(Prefix_Committee)].Value = ComputeCommitteeMembers(engine.Snapshot).ToArray().ToByteArray();
}
}

protected override void PostPersist(ApplicationEngine engine)
Expand Down