Add Economic Model #1716

Tommo-L · 2020-06-20T08:29:42Z

Close #1617 Close #285

The additional GAS allocation is as follows:

10% will be distributed to all NEO holders according to the weight of NEO.
5% divided equally among 21 members.
85% will be allocated to the voters who voted for the top 21 nodes. The voters who voted for a consensus node are assigned 2/28 of this part according to the voting weight, and the voters who voted for a committee member (non-consensus node) are assigned 1/28 of this part according to the voting weight.

The implementation method was originally proposed by @vang1ong7ang and optimized by @Tommo-L @erikzhang

How to test and verify the impact of these changes?

Case 1: claim GAS for neo holders, committee and voters.
Case 2: claim GAS for users across different committee cycles.

Where in the software does this update applies to?

Ledger

src/neo/IO/Caching/CloneCache.cs

vncoelho · 2020-06-28T14:02:16Z

Great to see this moving forwarding, great insights @vang1ong7ang.
Thus, in the current formula we are going to have M + C = 21, where Mare the number of Validators (CN) and C the cardinality of the Committee.
In this this sense, 85% of GAS inflationary generation will be allocated to the votes, in which, 2/(C+N)% will go to the ones who voted for Validators and , 1/(C+N)% for those who elected a committee member.

It is a continuous election, right? Thus, as soon as NEO is transferred it is interested that the new owner should vote for some Validators in order to maximize his rewards, right?

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs

vncoelho · 2020-06-28T14:19:23Z

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs

+                // Keep track of incremental gains of committee voters
+
+                UInt160 committeeAddr = Contract.CreateSignatureContract(committeeVotes[i].Item1).ScriptHash;
+                BigInteger voterRewardPerCommittee = (i < validatorNumber ? 2 : 1) * voterRewardPerBlock * 10000L / committeeVotes[i].Item2;


Is it distributed equally or the number of votes of each committee will affect? If true maybe we need to update description.

The number of votes of each committee will affect, I'll update description.

Good, @Tommo-L,

What I am thinking, @vang1ong7ang, is that voters will change vote quick in order to maximize their gains, no?

We are considering a multiplier 2 if you vote for CN instead of non-CN in the Committee.
If you vote for someone out of the Committee then you will soon change as well, right?

Did you update the description, @Tommo-L ?

We are considering a multiplier 2 if you vote for CN instead of non-CN in the Committee.

Yes

If you vote for someone out of the Committee then you will soon change as well, right?

Yes.

Did you update the description, @Tommo-L ?

Done.

Tommo-L · 2020-06-28T14:46:52Z

It is a continuous election, right? Thus, as soon as NEO is transferred it is interested that the new owner should vote for some Validators in order to maximize his rewards, right?

Yes, it's a continuous election. If NEO transferred, I think in most cases, there is no need to re-vote because the interest gap will not be too large.

src/neo/IO/Caching/DataCache.cs

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs

…nto add_economic_model

shargon · 2020-07-02T18:52:37Z

@Tommo-L conflicts

src/neo/SmartContract/Native/Tokens/NeoToken.cs

Tommo-L · 2020-07-15T02:25:30Z

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs

+                // Keep track of incremental gains for each committee's voters
+
+                UInt160 committeeAddr = Contract.CreateSignatureContract(committeeVotes[i].Item1).ScriptHash;
+                if (committeeVotes[i].Item2 > 0)


StandbyCommittee will initially have no votes. I'm not sure if it is ok. (After confirmed, I will fix UT)

…nto add_economic_model

erikzhang · 2020-08-06T07:26:54Z

@Tommo-L Conflicts.

src/neo/SmartContract/Native/Tokens/NeoToken.cs

…odel

erikzhang · 2020-08-09T08:18:32Z

@Tommo-L Can you combine NeoToken.Economic.cs, NeoToken.Governance.cs and NeoToken.cs into one single file? Or separate them in the master branch first. Otherwise it is hard to review.

Tommo-L · 2020-08-11T01:18:13Z

ok, I'll combine them.

Tommo-L · 2020-08-11T02:49:36Z

@Tommo-L Can you combine NeoToken.Economic.cs, NeoToken.Governance.cs and NeoToken.cs into one single file? Or separate them in the master branch first. Otherwise it is hard to review.

Done

src/neo/SmartContract/Native/Tokens/NeoToken.cs

erikzhang · 2020-08-16T08:45:49Z

10% will be distributed to all NEO holders according to the weight of NEO.

5% divided equally among 21 members.

85% will be allocated to the voters who voted for the top 21 nodes. The voters who voted for a consensus node are assigned 2/28 of this part according to the voting weight, and the voters who voted for a committee member (non-consensus node) are assigned 1/28 of this part according to the voting weight.

@Tommo-L The code looks good. Can you divide this PR into 3, and then I will review them one by one.

Tommo-L · 2020-08-17T01:11:46Z

10% will be distributed to all NEO holders according to the weight of NEO.

5% divided equally among 21 members.

85% will be allocated to the voters who voted for the top 21 nodes. The voters who voted for a consensus node are assigned 2/28 of this part according to the voting weight, and the voters who voted for a committee member (non-consensus node) are assigned 1/28 of this part according to the voting weight.

@Tommo-L The code looks good. Can you divide this PR into 3, and then I will review them one by one.

Ok, I'll split it.

Tommo-L · 2020-08-19T01:42:28Z

Related to #1845 #1847 #1848

Tommo-L added 9 commits June 20, 2020 16:20

add economic model

380efa4

Merge remote-tracking branch 'upstream/master' into add_economic_model

43d0139

fix

8644dbb

fix ut

29d21ac

add mark

d7e212f

fix consensus_ut

397897f

add ut

8d31450

merge

9c09c1d

format

7bdbc4f

Tommo-L marked this pull request as ready for review June 28, 2020 06:58

Tommo-L added 2 commits June 28, 2020 15:02

fix ut

74f9a19

fix

64ede76

erikzhang reviewed Jun 28, 2020

View reviewed changes

src/neo/IO/Caching/CloneCache.cs Outdated Show resolved Hide resolved

fix ut

23aa3c5

vncoelho reviewed Jun 28, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs Outdated Show resolved Hide resolved

vncoelho reviewed Jun 28, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs Outdated Show resolved Hide resolved

vncoelho reviewed Jun 28, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs Outdated Show resolved Hide resolved

vncoelho reviewed Jun 28, 2020

View reviewed changes

Tommo-L and others added 2 commits June 29, 2020 09:54

apply recommedations

88e57b7

Merge branch 'master' into add_economic_model

28d5186

erikzhang reviewed Jun 30, 2020

View reviewed changes

src/neo/IO/Caching/DataCache.cs Outdated Show resolved Hide resolved

shargon reviewed Jun 30, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.Economic.cs Outdated Show resolved Hide resolved

Tommo-L mentioned this pull request Jun 30, 2020

Replace DataCache.Find by DataCache.Seek #1740

Merged

2 tasks

Tommo-L added 2 commits June 30, 2020 23:51

optimize reward ratio

0950567

Merge branch 'add_economic_model' of https://github.com/Tommo-L/neo i…

8a04041

…nto add_economic_model

Tommo-L added 2 commits July 3, 2020 13:31

reset datacache

4b854e1

Merge remote-tracking branch 'upstream/master' into add_economic_model

4e767df

Fix UT

033205c

erikzhang reviewed Jul 14, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.cs Outdated Show resolved Hide resolved

fix conflicts

3d5df3e

Tommo-L commented Jul 15, 2020

View reviewed changes

Tommo-L and others added 6 commits July 15, 2020 10:29

format

ee5e874

Merge branch 'master' into add_economic_model

649be9f

fix vote

32db697

Merge branch 'add_economic_model' of https://github.com/Tommo-L/neo i…

66db3ea

…nto add_economic_model

fix conflicts

2e24381

fix ut later

a2a372f

Tommo-L added 2 commits August 6, 2020 21:24

resolve

b6da509

fix ut

5465f4d

erikzhang reviewed Aug 7, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.cs Outdated Show resolved Hide resolved

shargon added 5 commits August 7, 2020 18:15

Change to pubKey

5ece87f

Merge remote-tracking branch 'neo-project/master' into add_economic_m…

f035479

…odel

Fix Merge

96f8891

Fix merge

174e3f0

Fix keys

17b0d05

combine economic & governance

d851966

shargon reviewed Aug 11, 2020

View reviewed changes

src/neo/SmartContract/Native/Tokens/NeoToken.cs Show resolved Hide resolved

Fix null

a6198d5

Merge branch 'master' into add_economic_model

c44d7df

Tommo-L closed this Aug 19, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Economic Model #1716

Add Economic Model #1716

Tommo-L commented Jun 20, 2020 •

edited

Loading

vncoelho commented Jun 28, 2020

vncoelho Jun 28, 2020

Tommo-L Jun 28, 2020

vncoelho Jun 28, 2020 •

edited

Loading

vncoelho Jun 28, 2020

vncoelho Jul 27, 2020

Tommo-L Jul 28, 2020 •

edited

Loading

Tommo-L Jul 28, 2020

Tommo-L commented Jun 28, 2020

shargon commented Jul 2, 2020

Tommo-L Jul 15, 2020

erikzhang commented Aug 6, 2020

erikzhang commented Aug 9, 2020

Tommo-L commented Aug 11, 2020

Tommo-L commented Aug 11, 2020

erikzhang commented Aug 16, 2020

Tommo-L commented Aug 17, 2020

Tommo-L commented Aug 19, 2020

Add Economic Model #1716

Add Economic Model #1716

Conversation

Tommo-L commented Jun 20, 2020 • edited Loading

vncoelho commented Jun 28, 2020

vncoelho Jun 28, 2020

Choose a reason for hiding this comment

Tommo-L Jun 28, 2020

Choose a reason for hiding this comment

vncoelho Jun 28, 2020 • edited Loading

Choose a reason for hiding this comment

vncoelho Jun 28, 2020

Choose a reason for hiding this comment

vncoelho Jul 27, 2020

Choose a reason for hiding this comment

Tommo-L Jul 28, 2020 • edited Loading

Choose a reason for hiding this comment

Tommo-L Jul 28, 2020

Choose a reason for hiding this comment

Tommo-L commented Jun 28, 2020

shargon commented Jul 2, 2020

Tommo-L Jul 15, 2020

Choose a reason for hiding this comment

erikzhang commented Aug 6, 2020

erikzhang commented Aug 9, 2020

Tommo-L commented Aug 11, 2020

Tommo-L commented Aug 11, 2020

erikzhang commented Aug 16, 2020

Tommo-L commented Aug 17, 2020

Tommo-L commented Aug 19, 2020

Tommo-L commented Jun 20, 2020 •

edited

Loading

vncoelho Jun 28, 2020 •

edited

Loading

Tommo-L Jul 28, 2020 •

edited

Loading