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 candidate events #2754

Merged
merged 9 commits into from
May 26, 2022
Merged

Add candidate events #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9eef2ca
Add events
shargon May 23, 2022
f040db1
Unify
shargon May 24, 2022
703d704
Distribute gas after notification
erikzhang May 24, 2022
a80fa80
Erik's feedback
shargon May 26, 2022
de0412e
Optimize without neo
shargon May 26, 2022
744a1d7
Update src/neo/SmartContract/Native/NeoToken.cs
shargon May 26, 2022
23f55c5
Merge branch 'master' into candidate-events
shargon May 26, 2022
08c8605
Fix UT
erikzhang May 26, 2022
f495f20
Merge branch 'master' into candidate-events
erikzhang May 26, 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
66 changes: 66 additions & 0 deletions src/neo/SmartContract/Native/NeoToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Neo.IO;
using Neo.Persistence;
using Neo.SmartContract.Iterators;
using Neo.SmartContract.Manifest;
using Neo.VM;
using Neo.VM.Types;
using System;
Expand Down Expand Up @@ -56,6 +57,61 @@ public sealed class NeoToken : FungibleToken<NeoToken.NeoAccountState>
internal NeoToken()
{
this.TotalAmount = 100000000 * Factor;

var events = new List<ContractEventDescriptor>(Manifest.Abi.Events)
{
new ContractEventDescriptor
{
Name = "CandidateStateChanged",
Parameters = new ContractParameterDefinition[]
{
new ContractParameterDefinition()
{
Name = "pubkey",
Type = ContractParameterType.PublicKey
},
new ContractParameterDefinition()
{
Name = "registered",
Type = ContractParameterType.Boolean
},
new ContractParameterDefinition()
{
Name = "votes",
Type = ContractParameterType.Integer
}
}
},
new ContractEventDescriptor
{
Name = "Vote",
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
Parameters = new ContractParameterDefinition[]
{
new ContractParameterDefinition()
{
Name = "account",
Type = ContractParameterType.Hash160
},
new ContractParameterDefinition()
{
Name = "from",
Type = ContractParameterType.PublicKey
},
new ContractParameterDefinition()
{
Name = "to",
Type = ContractParameterType.PublicKey
},
new ContractParameterDefinition()
{
Name = "amount",
Type = ContractParameterType.Integer
}
}
}
};

Manifest.Abi.Events = events.ToArray();
}

public override BigInteger TotalSupply(DataCache snapshot)
Expand Down Expand Up @@ -295,7 +351,10 @@ private bool RegisterCandidate(ApplicationEngine engine, ECPoint pubkey)
StorageKey key = CreateStorageKey(Prefix_Candidate).Add(pubkey);
StorageItem item = engine.Snapshot.GetAndChange(key, () => new StorageItem(new CandidateState()));
CandidateState state = item.GetInteroperable<CandidateState>();
if (state.Registered) return true;
state.Registered = true;
engine.SendNotification(Hash, "CandidateStateChanged",
new VM.Types.Array(engine.ReferenceCounter) { pubkey.ToArray(), true, state.Votes });
return true;
}

Expand All @@ -308,8 +367,11 @@ private bool UnregisterCandidate(ApplicationEngine engine, ECPoint pubkey)
if (engine.Snapshot.TryGet(key) is null) return true;
StorageItem item = engine.Snapshot.GetAndChange(key);
CandidateState state = item.GetInteroperable<CandidateState>();
if (!state.Registered) return true;
state.Registered = false;
CheckCandidate(engine.Snapshot, pubkey, state);
engine.SendNotification(Hash, "CandidateStateChanged",
new VM.Types.Array(engine.ReferenceCounter) { pubkey.ToArray(), false, state.Votes });
return true;
}

Expand All @@ -319,6 +381,7 @@ private async ContractTask<bool> Vote(ApplicationEngine engine, UInt160 account,
if (!engine.CheckWitnessInternal(account)) return false;
NeoAccountState state_account = engine.Snapshot.GetAndChange(CreateStorageKey(Prefix_Account).Add(account))?.GetInteroperable<NeoAccountState>();
if (state_account is null) return false;
if (state_account.Balance == 0) return false;
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
CandidateState validator_new = null;
if (voteTo != null)
{
Expand All @@ -343,11 +406,14 @@ private async ContractTask<bool> Vote(ApplicationEngine engine, UInt160 account,
state_validator.Votes -= state_account.Balance;
CheckCandidate(engine.Snapshot, state_account.VoteTo, state_validator);
}
ECPoint from = state_account.VoteTo;
state_account.VoteTo = voteTo;
if (validator_new != null)
{
validator_new.Votes += state_account.Balance;
}
engine.SendNotification(Hash, "Vote",
new VM.Types.Array(engine.ReferenceCounter) { account.ToArray(), from?.ToArray() ?? StackItem.Null, voteTo?.ToArray() ?? StackItem.Null, state_account.Balance });
if (gasDistribution is not null)
await GAS.Mint(engine, gasDistribution.Account, gasDistribution.Amount, true);
return true;
Expand Down
1 change: 1 addition & 0 deletions tests/neo.UnitTests/SmartContract/Native/UT_NeoToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,7 @@ public void TestVote()
snapshot.Delete(keyAccount);
snapshot.GetAndChange(keyAccount, () => new StorageItem(new NeoAccountState
{
Balance = 1,
VoteTo = ECCurve.Secp256r1.G
}));
snapshot.Add(keyValidator, new StorageItem(new CandidateState()));
Expand Down