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

Add incentive for voter #1848

Merged
merged 88 commits into from
Nov 2, 2020
Merged

Add incentive for voter #1848

merged 88 commits into from
Nov 2, 2020

Commits on Aug 18, 2020

  1. add reward key

    Tommo-L committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    bc785f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Aug 21, 2020
    Configuration menu
    Copy the full SHA
    1e8966a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Aug 22, 2020
    Configuration menu
    Copy the full SHA
    25908bc View commit details
    Browse the repository at this point in the history

  2. incentive for voter

    Tommo-L committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    a6e438e View commit details
    Browse the repository at this point in the history

  3. optimize

    Tommo-L committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    4249d07 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2020

  1. optimize

    Tommo-L committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    422f20a View commit details
    Browse the repository at this point in the history

  2. optimize

    Tommo-L committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    df0062b View commit details
    Browse the repository at this point in the history

  3. fix CalculateBonus and add ut

    Tommo-L committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    7c72d41 View commit details
    Browse the repository at this point in the history

  4. format

    Tommo-L committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    0a3d09e View commit details
    Browse the repository at this point in the history

  5. Item2 -> Votes

    @vncoelho
    vncoelho authored Aug 23, 2020
    Configuration menu
    Copy the full SHA
    723f60c View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Aug 25, 2020
    Configuration menu
    Copy the full SHA
    e99a806 View commit details
    Browse the repository at this point in the history

  2. Move fields

    @erikzhang
    erikzhang committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    5b92e05 View commit details
    Browse the repository at this point in the history

  3. Fix GetCommitteeVotes()

    @erikzhang
    erikzhang committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    addfebf View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. specify variable name

    Tommo-L committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    4b753d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. Remove double ToArray

    @shargon
    shargon committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    eb9b728 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2020

  1. fix

    Tommo-L committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    bf1ec79 View commit details
    Browse the repository at this point in the history

  2. fix ut

    Tommo-L committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    ba05800 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. remove

    Tommo-L committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    5e4abe7 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Sep 11, 2020
    Configuration menu
    Copy the full SHA
    03859d8 View commit details
    Browse the repository at this point in the history

  2. fix

    Tommo-L committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    77fe460 View commit details
    Browse the repository at this point in the history

  3. fix

    Tommo-L committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    2a806ef View commit details
    Browse the repository at this point in the history

  4. remove useless code

    Tommo-L committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    67aafdc View commit details
    Browse the repository at this point in the history

  5. optimize

    Tommo-L committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    675fe7a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2020

  1. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Sep 12, 2020
    Configuration menu
    Copy the full SHA
    e062344 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Sep 13, 2020
    Configuration menu
    Copy the full SHA
    ccd4151 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. fix

    Tommo-L committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    6ffc601 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Sep 14, 2020
    Configuration menu
    Copy the full SHA
    b0db8f4 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2020

  1. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Sep 15, 2020
    Configuration menu
    Copy the full SHA
    5d19387 View commit details
    Browse the repository at this point in the history

  2. resolve

    Tommo-L committed Sep 15, 2020
    Configuration menu
    Copy the full SHA
    ed13ad5 View commit details
    Browse the repository at this point in the history

  3. format

    Tommo-L committed Sep 15, 2020
    Configuration menu
    Copy the full SHA
    8b06824 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Sep 15, 2020
    Configuration menu
    Copy the full SHA
    62baa9f View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2020

  1. Add using to dispose enumerators

    @erikzhang
    erikzhang committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    c49a809 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. Update NeoToken.cs

    @erikzhang
    erikzhang committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    bf00ca1 View commit details
    Browse the repository at this point in the history

  2. Update NeoToken.cs

    @erikzhang
    erikzhang committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    fed12df View commit details
    Browse the repository at this point in the history

  3. fix

    Tommo-L committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    87e1d9d View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. fix CalculateBonus

    Tommo-L committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    0570997 View commit details
    Browse the repository at this point in the history

  2. Usng asending order

    Tommo-L committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    4a12748 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into incentive_for_voter

    @erikzhang
    erikzhang authored Sep 18, 2020
    Configuration menu
    Copy the full SHA
    e656049 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Sep 21, 2020
    Configuration menu
    Copy the full SHA
    1dd9ad4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Sep 21, 2020
    Configuration menu
    Copy the full SHA
    3d9b2ff View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. Update NeoToken.cs

    @erikzhang
    erikzhang committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    321f5f8 View commit details
    Browse the repository at this point in the history

  2. fix

    Tommo-L committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    57b6e32 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Sep 24, 2020
    Configuration menu
    Copy the full SHA
    3124024 View commit details
    Browse the repository at this point in the history

  2. optimize findrange

    Tommo-L committed Sep 24, 2020
    Configuration menu
    Copy the full SHA
    9af4bb3 View commit details
    Browse the repository at this point in the history

  3. format

    Tommo-L committed Sep 24, 2020
    Configuration menu
    Copy the full SHA
    40e73de View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Sep 25, 2020
    Configuration menu
    Copy the full SHA
    c5f1458 View commit details
    Browse the repository at this point in the history

  2. optimize

    Tommo-L committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    53950b4 View commit details
    Browse the repository at this point in the history

  3. Update NeoToken.cs

    @erikzhang
    erikzhang committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    849be7c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2020

  1. fix

    Tommo-L committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    94caa53 View commit details
    Browse the repository at this point in the history

  2. format

    Tommo-L committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    c95ff95 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Sep 27, 2020
    Configuration menu
    Copy the full SHA
    6693760 View commit details
    Browse the repository at this point in the history

  4. Use GetCommitteeFromCache

    @erikzhang
    erikzhang committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    d811ce8 View commit details
    Browse the repository at this point in the history

  5. Ensure registered

    @erikzhang
    erikzhang committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    f5f9259 View commit details
    Browse the repository at this point in the history

  6. fix PostPersist

    Tommo-L committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    36ec672 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Update NeoToken.cs

    @erikzhang
    erikzhang committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    251d633 View commit details
    Browse the repository at this point in the history

  2. cache committee votes

    Tommo-L committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    268bc86 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'incentive_for_voter' of https://github.com/Tommo-L/neo … 

    …into incentive_for_voter
    Tommo-L committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    811292b View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. cache committee

    Tommo-L committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    f5c17fd View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Update src/neo/Ledger/StorageItem.cs 

    Co-authored-by: Erik Zhang <erik@neo.org>
    @shargon @erikzhang
    shargon and erikzhang authored Sep 30, 2020
    Configuration menu
    Copy the full SHA
    29e83ad View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Oct 9, 2020
    Configuration menu
    Copy the full SHA
    81cd44a View commit details
    Browse the repository at this point in the history

  2. fix PostPersist

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    e3b2ee6 View commit details
    Browse the repository at this point in the history

  3. fix ShouldRefreshCommittee & optimize PostPersist

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    22f1af9 View commit details
    Browse the repository at this point in the history

  4. add CommitteeEpoch

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    3d5065d View commit details
    Browse the repository at this point in the history

  5. fix CalculateBonus

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    50e1663 View commit details
    Browse the repository at this point in the history

  6. fix PostPersist

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    aa688ca View commit details
    Browse the repository at this point in the history

  7. optimize CalculateBonus

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    6218108 View commit details
    Browse the repository at this point in the history

  8. optimize PostPersist

    Tommo-L committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    4253502 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2020

  1. Update NeoToken.cs

    @erikzhang
    erikzhang committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    d06c1cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Oct 10, 2020
    Configuration menu
    Copy the full SHA
    cd37075 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. fix conflicts

    Tommo-L committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    083412f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'incentive_for_voter' of https://github.com/Tommo-L/neo … 

    …into incentive_for_voter
    Tommo-L committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    875dc76 View commit details
    Browse the repository at this point in the history

  3. add comments for trigger github action

    Tommo-L committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    7ba5e24 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Allow standby can be voted

    Tommo-L committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e8c8044 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. optimize

    Tommo-L committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    95acd30 View commit details
    Browse the repository at this point in the history

  2. rename local variable

    @shargon
    shargon authored Oct 27, 2020
    Configuration menu
    Copy the full SHA
    5d5837e View commit details
    Browse the repository at this point in the history

  3. Optimize Unregister Candidate

    @shargon
    shargon authored Oct 27, 2020
    Configuration menu
    Copy the full SHA
    990d8d5 View commit details
    Browse the repository at this point in the history

  4. Revert

    @shargon
    shargon authored Oct 27, 2020
    Configuration menu
    Copy the full SHA
    898f21c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Oct 27, 2020
    Configuration menu
    Copy the full SHA
    5173eeb View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    15792c2 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. add ut

    Tommo-L committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    44bdd5c View commit details
    Browse the repository at this point in the history

  2. fix ut

    Tommo-L committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    4d4986d View commit details
    Browse the repository at this point in the history

  3. format

    Tommo-L committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    ca174f0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    a96ca80 View commit details
    Browse the repository at this point in the history

  5. Conflicts

    @shargon
    shargon authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    c23c3ba View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2020

  1. Merge branch 'master' into incentive_for_voter

    @Tommo-L
    Tommo-L authored Oct 31, 2020
    Configuration menu
    Copy the full SHA
    387565f View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

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

    Co-authored-by: Erik Zhang <erik@neo.org>
    @Tommo-L @erikzhang
    Tommo-L and erikzhang authored Nov 1, 2020
    Configuration menu
    Copy the full SHA
    5e18673 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Nov 1, 2020
    Configuration menu
    Copy the full SHA
    947882c View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. Merge branch 'master' into incentive_for_voter

    @shargon
    shargon authored Nov 2, 2020
    Configuration menu
    Copy the full SHA
    99522a1 View commit details
    Browse the repository at this point in the history