Enhancement/voting #130
Enhancement/voting #130
Conversation
1. Add `StateTransaction` 2. Remove `Neo.Account.SetVotes` and `Neo.Validator.Register`
|
Conflicts currently need resolving since the other merges to |
| { | ||
| AccountState account = accounts.GetAndChange(output.ScriptHash, () => new AccountState(output.ScriptHash)); | ||
| if (account.Balances.ContainsKey(output.AssetId)) | ||
| account.Balances[output.AssetId] += output.Value; |
There was a problem hiding this comment.
Maybe is faster use TryGetValue
With this way, you call internally get method with ContainsKey then call the get method for += and then the set method
IF([call GET]!=0) { [set][call GET]+[value] }
With TryGetValue only one get is called because don't need the +=
if[call GET to x]!=0) { [set][x]+[value] }
| foreach (var group in tx.Inputs.GroupBy(p => p.PrevHash)) | ||
| { | ||
| Transaction tx_prev = GetTransaction(group.Key, out int height); | ||
| foreach (CoinReference input in group) |
There was a problem hiding this comment.
There is no need to check because these transactions have been validated before.
| { | ||
| foreach (ECPoint pubkey in account.Votes) | ||
| validators.GetAndChange(pubkey, () => new ValidatorState(pubkey)).Votes += output.Value; | ||
| validators_count.GetAndChange().Votes[account.Votes.Length - 1] += output.Value; |
There was a problem hiding this comment.
account.Votes ever have the same length than GetAndChange().Votes ?
There was a problem hiding this comment.
The length is always equals to Blockchain.MaxValidators.
| if (!validator.Registered && validator.Votes.Equals(Fixed8.Zero)) | ||
| validators.Delete(pubkey); | ||
| } | ||
| validators_count.GetAndChange().Votes[account.Votes.Length - 1] -= out_prev.Value; |
There was a problem hiding this comment.
account.Votes ever have the same length than GetAndChange().Votes ?
| HashSet<ECPoint> sv = new HashSet<ECPoint>(Blockchain.StandbyValidators); | ||
| DataCache<ECPoint, ValidatorState> validators = Blockchain.Default.GetStates<ECPoint, ValidatorState>(); | ||
| foreach (ECPoint pubkey in pubkeys) | ||
| if (!sv.Contains(pubkey) && validators.TryGet(pubkey)?.Registered != true) |
There was a problem hiding this comment.
maybe this should be or ?
if (!sv.Contains(pubkey) || validators.TryGet(pubkey)?.Registered != true)
|
Another merge conflict needs resolving after recent commits to master. |
| Fixed8 balance = account.GetBalance(GoverningToken.Hash); | ||
| foreach (ECPoint pubkey in account.Votes) | ||
| { | ||
| ValidatorState validator = validators.GetAndChange(pubkey); |
There was a problem hiding this comment.
Maybe a good option would be to check null before, if (validator == null)
There was a problem hiding this comment.
It can't be null if it has been voted.
|
Restarted CI build that failed, it looked like just a temporary failure. |
| @@ -38,7 +38,7 @@ public LevelDBBlockchain(string path) | |||
| Version version; | |||
| Slice value; | |||
| db = DB.Open(path, new Options { CreateIfMissing = true }); | |||
| if (db.TryGet(ReadOptions.Default, SliceBuilder.Begin(DataEntryPrefix.SYS_Version), out value) && Version.TryParse(value.ToString(), out version) && version >= Version.Parse("1.5")) | |||
| if (db.TryGet(ReadOptions.Default, SliceBuilder.Begin(DataEntryPrefix.SYS_Version), out value) && Version.TryParse(value.ToString(), out version) && version >= Version.Parse("2.6.0")) | |||
| { | |||
There was a problem hiding this comment.
Does this change require all clients to resync the chain?
There was a problem hiding this comment.
Yes. They can use chain.acc.
No description provided.