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

[3.4 -> Main] Merge Tokenonmics Updates into Main #96

Merged
merged 56 commits into from
Aug 12, 2024
Merged

[3.4 -> Main] Merge Tokenonmics Updates into Main #96

merged 56 commits into from
Aug 12, 2024

Commits on May 2, 2024

  1. push fees upgrade changes

    @DenisCarriere
    DenisCarriere committed May 2, 2024
    Configuration menu
    Copy the full SHA
    47e44bd View commit details
    Browse the repository at this point in the history

  2. push token upgrade

    @DenisCarriere
    DenisCarriere committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e4c75b8 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Implement rex maturity changes 

    ref: eosnetworkfoundation/eos-system-contracts#132
    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    b694722 View commit details
    Browse the repository at this point in the history

  2. Remove voting requirements for rex 

    ref: eosnetworkfoundation/eos-system-contracts#133
    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a8afcee View commit details
    Browse the repository at this point in the history

  3. Move to savings when buying REX 

    ref: eosnetworkfoundation/eos-system-contracts#135
    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    67c2429 View commit details
    Browse the repository at this point in the history

  4. Move to savings when buying REX & sell REX when matured 

    ref: eosnetworkfoundation/eos-system-contracts#135 & eosnetworkfoundation/eos-system-contracts#134
    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6d791ad View commit details
    Browse the repository at this point in the history

  5. implement unvest action 

    ref: eosnetworkfoundation/eos-system-contracts#131
    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    d664b5a View commit details
    Browse the repository at this point in the history

  6. add supply tests

    @DenisCarriere
    DenisCarriere committed May 3, 2024
    Configuration menu
    Copy the full SHA
    7fb34dd View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Implement schedules 

    ref: eosnetworkfoundation/eos-system-contracts#136
    @DenisCarriere
    DenisCarriere committed May 4, 2024
    Configuration menu
    Copy the full SHA
    812ffa6 View commit details
    Browse the repository at this point in the history

  2. add schedule with 0% annual rate

    @DenisCarriere
    DenisCarriere committed May 4, 2024
    Configuration menu
    Copy the full SHA
    6e79c48 View commit details
    Browse the repository at this point in the history

  3. add no schedule to execute tests

    @DenisCarriere
    DenisCarriere committed May 4, 2024
    Configuration menu
    Copy the full SHA
    669d966 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. rename to "unallocated bucket"

    @DenisCarriere
    DenisCarriere committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5c0256c View commit details
    Browse the repository at this point in the history

  2. a few extra tests

    Nathan James committed May 8, 2024
    Configuration menu
    Copy the full SHA
    32f62ab View commit details
    Browse the repository at this point in the history

  3. Merge pull request #79 from AntelopeIO/tokenomics-token-upgrade 

    Tokenomics - Token upgrade
    @nsjames
    nsjames authored May 8, 2024
    Configuration menu
    Copy the full SHA
    2789fb1 View commit details
    Browse the repository at this point in the history

  4. make rex maturity settings as actions

    @DenisCarriere
    DenisCarriere committed May 8, 2024
    Configuration menu
    Copy the full SHA
    85ef99c View commit details
    Browse the repository at this point in the history

  5. refactor process_sell_matured_rex

    @DenisCarriere
    DenisCarriere committed May 8, 2024
    Configuration menu
    Copy the full SHA
    4358d70 View commit details
    Browse the repository at this point in the history

  6. direct continuous rate modification, extending tests

    Nathan James committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a9a79e1 View commit details
    Browse the repository at this point in the history

  7. year typo in versting schedule test

    Nathan James committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5a9176d View commit details
    Browse the repository at this point in the history

  8. year typo in versting schedule test

    Nathan James committed May 8, 2024
    Configuration menu
    Copy the full SHA
    c550e95 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'tokenomics' into tokenomics-vesting-upgrade

    @nsjames
    nsjames authored May 8, 2024
    Configuration menu
    Copy the full SHA
    bf8f948 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. extend unvest tests, enforce only unvested amount, and allow claiming… 

    … vested remainders
    Nathan James committed May 9, 2024
    Configuration menu
    Copy the full SHA
    ff27f8c View commit details
    Browse the repository at this point in the history

  2. add matured rex tests

    @DenisCarriere
    DenisCarriere committed May 9, 2024
    Configuration menu
    Copy the full SHA
    8028ff7 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. allow setting a schedule in the past or msigs will break

    Nathan James committed May 10, 2024
    Configuration menu
    Copy the full SHA
    4239d20 View commit details
    Browse the repository at this point in the history

  2. expose new action to allow setting pay factors without affecting cont… 

    …inuous_rate
    Nathan James committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9e3ac02 View commit details
    Browse the repository at this point in the history

  3. fixes for setpayfactor tests

    Nathan James committed May 10, 2024
    Configuration menu
    Copy the full SHA
    b188adc View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. update rex tests

    @DenisCarriere
    DenisCarriere committed May 11, 2024
    Configuration menu
    Copy the full SHA
    981608a View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. set global state

    Nathan James committed May 13, 2024
    Configuration menu
    Copy the full SHA
    6a175c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #81 from AntelopeIO/tokenomics-vesting-upgrade 

    Tokenomics - Vesting upgrade
    @nsjames
    nsjames authored May 13, 2024
    Configuration menu
    Copy the full SHA
    046f5a0 View commit details
    Browse the repository at this point in the history

  3. validate rex return in tests

    Nathan James committed May 13, 2024
    Configuration menu
    Copy the full SHA
    dbd2eb4 View commit details
    Browse the repository at this point in the history

  4. merge in tokenomics branch

    Nathan James committed May 13, 2024
    Configuration menu
    Copy the full SHA
    3cfbbda View commit details
    Browse the repository at this point in the history

  5. Merge pull request #78 from AntelopeIO/tokenomics-fees-upgrade 

    Tokenomics - Fees upgrade
    @nsjames
    nsjames authored May 13, 2024
    Configuration menu
    Copy the full SHA
    45473c9 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. fix for setschedule docs

    Nathan James committed May 15, 2024
    Configuration menu
    Copy the full SHA
    33ab294 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge pull request #84 from AntelopeIO/tokenomics-doc-fix 

    Fix for setschedule docs
    @nsjames
    nsjames authored May 16, 2024
    Configuration menu
    Copy the full SHA
    3803fd9 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. add ricardians for unvest and donatetorex

    Nathan James committed May 17, 2024
    Configuration menu
    Copy the full SHA
    ded2d7f View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge pull request #86 from AntelopeIO/tokenomics-ricardians 

    Add ricardians for unvest and donatetorex
    @nsjames
    nsjames authored May 21, 2024
    Configuration menu
    Copy the full SHA
    59736cf View commit details
    Browse the repository at this point in the history

  2. interface test for buyramburn

    @ericpassmore
    ericpassmore committed May 21, 2024
    Configuration menu
    Copy the full SHA
    4dff31f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #87 from AntelopeIO/ehp/interface-test-buyramburn 

    Interface test for buyramburn
    @ericpassmore
    ericpassmore authored May 21, 2024
    Configuration menu
    Copy the full SHA
    917d722 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. merged schedule structs in includes

    @ericpassmore
    ericpassmore committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ca1b6ce View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. preliminary tests and code for eosio.bpay

    Nathan James committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    1741995 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. use headers from contracts instead of duplicating, extend tests

    Nathan James committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    8e469fe View commit details
    Browse the repository at this point in the history

  2. add bpay ricardians to cmakelists

    Nathan James committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9646c7e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge pull request #98 from AntelopeIO/eosio.bpay 

    Tokenomics - eosio.bpay
    @nsjames
    nsjames authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    47599f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'main' into merge-savanna-tokenonmics

    @ericpassmore
    ericpassmore committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    fee936f View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. merge tokenomics into rex updates

    Nathan James committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    60f3683 View commit details
    Browse the repository at this point in the history

  2. Split system_tests into multiple suites such that each of them can fi… 

    …nish CICD testing in time
    @linh2931
    linh2931 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    e21f721 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge remote-tracking branch 'origin/split_system_tests' into merge-s… 

    …avanna-tokenonmics
    @ericpassmore
    ericpassmore committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    1157964 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. rex2 docs update, ricardians, tests, rename maturity setter

    Nathan James committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    2e865e5 View commit details
    Browse the repository at this point in the history

  2. remove unecessary tests

    Nathan James committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    126d5f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Merge pull request #80 from AntelopeIO/tokenomics-rex-upgrade 

    Tokenomics - REX Upgrade
    @nsjames
    nsjames authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    1a603bb View commit details
    Browse the repository at this point in the history

  2. merged main incorporating token split tests

    @ericpassmore
    ericpassmore committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    09e8c4f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin' into merge-savanna-tokenonmics

    @ericpassmore
    ericpassmore committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ea167cf View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. resolved conflict num of blocks to produce for test

    @ericpassmore
    ericpassmore committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    de38a52 View commit details
    Browse the repository at this point in the history

  2. resolve dup test name

    @ericpassmore
    ericpassmore committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c2fac1a View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. use actual producer list to split rewards instead of configured max

    Nathan James committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    551fd9e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge remote-tracking branch 'origin/tokenomics' into merge-savanna-t… 

    …okenonmics
    @ericpassmore
    ericpassmore committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1836e5c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into merge-savanna-tokenon… 

    …mics
    @ericpassmore
    ericpassmore committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    3282ef6 View commit details
    Browse the repository at this point in the history