Add incentive for voter #1848

Tommo-L · 2020-08-18T00:46:37Z

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. (Implemented by this PR)

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

Tommo-L · 2020-08-22T14:51:46Z

I'll add more ut later.

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

cloud8little · 2020-08-25T05:51:43Z

when sync with the latest block index=160,with pre-configured with four committee members.
protocol.json:

{
  "ProtocolConfiguration": {
    "Magic": 5195086,
    "MillisecondsPerBlock": 15000,
    "ValidatorsCount": 1,
    "StandbyCommittee": [
      "026a59b03f981a5dfded185472f4f19409cd229b5cfd11721e70f2b1d16079376a",
      "024fa7faf85240822cbf6b665f58fcdf6d03ed0e62d18bd2db22216682f2b53147",
      "0273a5ed740acaf17f11ba70d2a9b1c950e86dc320a6efd88d532d087f94fe275b",
      "027a4c687d168044dfb37ad32a51830f0c86b068084914f2373702393b1923ae5e" 
    ],
    "SeedList": [
"localhost:10011"
    ]
  }
}

corresponding to the committee member account:

Nc56Zrq72VN9Xr6wo3HyFn3oFZUvoYQJtj 10 gas
NQ5zGxfYWfu6KEpmcEgZquXRiKowW6ckXK 10 gas
NafiUTPg5zWyNmTJRhk9Q271UbKnRdZ9Z6 10 gas
Nb4z5KTAqgavWKZ7RemRS73RGkY8Qc68mm 10 gas

the consensus wallet asset as below:

neo> open wallet wallet_1.json
password: ********
neo> list asset
Nc56Zrq72VN9Xr6wo3HyFn3oFZUvoYQJtj
NEO: 0
GAS: 10

Ncu47NyTJLJPEFi859gmuqQ8fPPt1AVwHX
NEO: 100000000
GAS: 30000000

NQ9PeXXbNREmHTqyBjjhPKcpZp97kdj1PK
NEO: 0
GAS: 0

NU7NPQHYFLvZV13R5SmSD4u8sDHYsHE2Yj
NEO: 0
GAS: 0

Ne3rapDVHrT7aHdFBwcq42skzgc3hgrYzd
NEO: 0
GAS: 0

----------------------------------------------------
Total:   NEO: 100000000    GAS: 30000010

NEO hash: 0xde5f57d430d3dece511cf975a8d37848cb9e0525
GAS hash: 0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc
neo> show gas
Unclaimed gas: 80.5

Result
Finally four committee members reward totally 10gas * 4 = 40 gas, while there is total 161 blocks, which should be 161 blocks * 5 gas/block * 5% = 40.25 gas, right? @Tommo-L
while the unclaimed gas 80.5 is correct, which should be 161 blocks * 5 gas/block * 10% = 80.5

shargon · 2020-08-25T08:13:06Z

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

            var pubkey = committee[engine.Snapshot.PersistingBlock.Index % ProtocolSettings.Default.CommitteeMembersCount];
            var account = Contract.CreateSignatureRedeemScript(pubkey).ToScriptHash();
            GAS.Mint(engine, account, gasPerBlock * CommitteeRewardRatio / 100);

+            // Record the cumulative reward of the voters of each committee
+
+            var voterRewardPerCommittee = gasPerBlock * VoterRewardRatio / 100 / (ProtocolSettings.Default.CommitteeMembersCount + ProtocolSettings.Default.ValidatorsCount);


Validators are included inside the Committee, they will be rewarded twice as committee and as validator?

I think so, as dictated in the description:

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. (Implemented by this PR)

It is mainly used to ensure that the validators' votes are concentrated and not too scattered.

Correct me if I'm wrong, but we've got rounding error even here:

> 500000000.0*85/100/(21+7) => 15178571.42857143

Then it only gets worse with votes/neo amount.

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

Tommo-L · 2020-08-25T14:17:39Z

while there is total 161 blocks, which should be 161 blocks * 5 gas/block * 5% = 40.25 gas, right? @Tommo-L

That's right. @cloud8little

Tommo-L · 2020-08-27T02:41:05Z

@erikzhang @Tommo-L will the genesis block(index=0) generate gas? if yes, will it also be used to reward the committees/neo holders? #1845 (comment)

Currently, the genesis block will only reward neo holders but not committee. I think it's okay. What do you think? And this is why

Finally four committee members reward totally 10gas * 4 = 40 gas, while there is total 161 blocks, which should be 161 blocks * 5 gas/block * 5% = 40.25 gas, right?

shargon

@Tommo-L did you tested this lines ?
https://coveralls.io/builds/34525125/source?filename=src%2Fneo%2FSmartContract%2FNative%2FTokens%2FNeoToken.cs#L113

I am not sure if it could throw a Collection was modified exception when the entry was added in the same execution.

neo/src/neo/IO/Caching/DataCache.cs

Lines 121 to 122 in 7d3a4a2

    
           dictionary.Remove(key); 
        
           changeSet.Remove(key);

Tommo-L · 2020-10-29T02:33:51Z

I am not sure if it could throw a Collection was modified exception when the entry was added in the same execution.

It'll not happen. As Prefix_VoterRewardPerCommittee was added in PostPersist after CheckCandidate. I'll add ut for it.

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

Co-authored-by: Erik Zhang <erik@neo.org>

Tommo-L · 2020-11-02T07:12:12Z

Merge?

Was changed in neo-project/neo#1848. Affects storage dumps.

* add reward key * incentive for voter * optimize * optimize * optimize * fix CalculateBonus and add ut * format * Item2 -> Votes * Move fields * Fix GetCommitteeVotes() * specify variable name * Remove double ToArray * fix ut * remove * fix * fix * remove useless code * optimize * fix * format * Add using to dispose enumerators * Update NeoToken.cs * Update NeoToken.cs * fix * fix CalculateBonus * Usng asending order * Update NeoToken.cs * fix * optimize findrange * format * optimize * Update NeoToken.cs * fix * format * Use GetCommitteeFromCache * Ensure registered * fix PostPersist * Update NeoToken.cs * cache committee votes * cache committee * Update src/neo/Ledger/StorageItem.cs Co-authored-by: Erik Zhang <erik@neo.org> * fix PostPersist * fix ShouldRefreshCommittee & optimize PostPersist * add CommitteeEpoch * fix CalculateBonus * fix PostPersist * optimize CalculateBonus * optimize PostPersist * Update NeoToken.cs * add comments for trigger github action * Allow standby can be voted * optimize * rename local variable * Optimize Unregister Candidate * Revert * add ut * fix ut * format * Conflicts * Update src/neo/SmartContract/Native/Tokens/NeoToken.cs Co-authored-by: Erik Zhang <erik@neo.org> Co-authored-by: Tommo-L <luchuan@neo.org> Co-authored-by: Erik Zhang <erik@neo.org> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Shargon <shargon@gmail.com>

add reward key

bc785f3

erikzhang added this to the NEO 3.0 milestone Aug 18, 2020

Tommo-L mentioned this pull request Aug 19, 2020

Add Economic Model #1716

Closed

erikzhang and others added 4 commits August 21, 2020 14:33

Merge branch 'master' into incentive_for_voter

1e8966a

Merge branch 'master' into incentive_for_voter

25908bc

incentive for voter

a6e438e

optimize

4249d07

Tommo-L marked this pull request as ready for review August 22, 2020 14:50

Tommo-L commented Aug 22, 2020

View reviewed changes

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

vncoelho reviewed Aug 22, 2020

View reviewed changes

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

vncoelho reviewed Aug 22, 2020

View reviewed changes

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

vncoelho reviewed Aug 22, 2020

View reviewed changes

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

vncoelho reviewed Aug 22, 2020

View reviewed changes

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

vncoelho reviewed Aug 22, 2020

View reviewed changes

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

Tommo-L and others added 5 commits August 23, 2020 08:13

optimize

422f20a

optimize

df0062b

fix CalculateBonus and add ut

7c72d41

format

0a3d09e

Item2 -> Votes

723f60c

vncoelho reviewed Aug 23, 2020

View reviewed changes

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

roman-khimov mentioned this pull request Aug 23, 2020

Rework GAS distribution scheme, follow economic model updates nspcc-dev/neo-go#1348

Closed

shargon reviewed Aug 25, 2020

View reviewed changes

erikzhang added 3 commits August 25, 2020 17:40

Merge branch 'master' into incentive_for_voter

e99a806

Move fields

5b92e05

Fix GetCommitteeVotes()

addfebf

erikzhang reviewed Aug 25, 2020

View reviewed changes

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

shargon reviewed Oct 28, 2020

View reviewed changes

add ut

44bdd5c

Tommo-L dismissed erikzhang’s stale review via 44bdd5c October 29, 2020 03:18

Tommo-L and others added 4 commits October 29, 2020 11:52

fix ut

4d4986d

format

ca174f0

Merge branch 'master' into incentive_for_voter

a96ca80

Conflicts

c23c3ba

shargon previously approved these changes Oct 29, 2020

View reviewed changes

roman-khimov mentioned this pull request Oct 30, 2020

auto-claim gas if it's needed #2008

Closed

Merge branch 'master' into incentive_for_voter

387565f

erikzhang reviewed Oct 31, 2020

View reviewed changes

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

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

5e18673

Co-authored-by: Erik Zhang <erik@neo.org>

Tommo-L dismissed shargon’s stale review via 5e18673 November 1, 2020 01:40

erikzhang approved these changes Nov 1, 2020

View reviewed changes

Merge branch 'master' into incentive_for_voter

947882c

shargon approved these changes Nov 1, 2020

View reviewed changes

Merge branch 'master' into incentive_for_voter

99522a1

shargon merged commit 5800cf2 into neo-project:master Nov 2, 2020

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Nov 16, 2020

core: update committee every [committee length] blocks

410dbf6

Was changed in neo-project/neo#1848. Affects storage dumps.

AnnaShaleva mentioned this pull request Nov 16, 2020

core: update committee every [committee length] blocks nspcc-dev/neo-go#1549

Merged

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Nov 17, 2020

core: update committee every [committee length] blocks

933bb4c

Was changed in neo-project/neo#1848. Affects storage dumps.

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Dec 3, 2020

core: update committee every [committee length] blocks

1b3f598

Was changed in neo-project/neo#1848. Affects storage dumps.

danwbyrne mentioned this pull request Dec 18, 2020

Update to Neo3-preview4 neo-one-suite/neo-one#2267

Closed

45 tasks

danwbyrne mentioned this pull request Dec 29, 2020

Update NativeContract models for Preview4 changes neo-one-suite/neo-one#2273

Closed

17 tasks

ixje added a commit to CityOfZion/neo-mamba that referenced this pull request Feb 2, 2021

https://github.com/neo-project/neo/pull/1848

b5084c8

roman-khimov mentioned this pull request Feb 25, 2021

3.0 GAS distribution and rounding effects #2364

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add incentive for voter #1848

Add incentive for voter #1848

Tommo-L commented Aug 18, 2020

Tommo-L commented Aug 22, 2020

cloud8little commented Aug 25, 2020 •

edited

Loading

shargon Aug 25, 2020

cloud8little Aug 25, 2020

Tommo-L Aug 25, 2020

Tommo-L Aug 25, 2020

roman-khimov Aug 27, 2020

Tommo-L commented Aug 25, 2020

Tommo-L commented Aug 27, 2020

shargon left a comment

Tommo-L commented Oct 29, 2020

Tommo-L commented Nov 2, 2020

Add incentive for voter #1848

Add incentive for voter #1848

Conversation

Tommo-L commented Aug 18, 2020

Tommo-L commented Aug 22, 2020

cloud8little commented Aug 25, 2020 • edited Loading

shargon Aug 25, 2020

Choose a reason for hiding this comment

cloud8little Aug 25, 2020

Choose a reason for hiding this comment

Tommo-L Aug 25, 2020

Choose a reason for hiding this comment

Tommo-L Aug 25, 2020

Choose a reason for hiding this comment

roman-khimov Aug 27, 2020

Choose a reason for hiding this comment

Tommo-L commented Aug 25, 2020

Tommo-L commented Aug 27, 2020

shargon left a comment

Choose a reason for hiding this comment

Tommo-L commented Oct 29, 2020

Tommo-L commented Nov 2, 2020

cloud8little commented Aug 25, 2020 •

edited

Loading