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

Token Merger Deploy Script #418

Merged
merged 27 commits into from
May 22, 2024
Merged

Token Merger Deploy Script #418

merged 27 commits into from
May 22, 2024

Commits on Apr 17, 2024

  1. Add OGNRewardsSource contract

    @shahthepro
    shahthepro committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    4f205b0 View commit details
    Browse the repository at this point in the history

  2. Make collectRewards only callable by RewardsTarget

    @shahthepro
    shahthepro committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    8e45acc View commit details
    Browse the repository at this point in the history

  3. Draft xOGN staking contract

    @DanielVF
    DanielVF committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    ef72063 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Correct maxStakeDuration

    @DanielVF
    DanielVF committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1126cf2 View commit details
    Browse the repository at this point in the history

  2. Add penalty event

    @DanielVF
    DanielVF committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    cd1bfda View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. Change names

    @shahthepro
    shahthepro committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    ff30762 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'DanielVF/xogn2' into shah/ogn-rewards-source

    @shahthepro
    shahthepro committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    7997625 View commit details
    Browse the repository at this point in the history

  3. Fix lockup ID

    @shahthepro
    shahthepro committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    3f51c2d View commit details
    Browse the repository at this point in the history

  4. Revert change and cast properly

    @shahthepro
    shahthepro committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    c02d6b5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'DanielVF/xogn2' into shah/ogn-rewards-source

    @shahthepro
    shahthepro committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    f3db15a View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Gas opts

    @shahthepro
    shahthepro committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    7e0daae View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Remove casting

    @shahthepro
    shahthepro committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    db52be3 View commit details
    Browse the repository at this point in the history

  2. Add getLockupsCount method (#411)

    @shahthepro
    shahthepro authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    820fccf View commit details
    Browse the repository at this point in the history

  3. Allow non-duration change amount increase staking extends

    @DanielVF
    DanielVF committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3784333 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Add tests, add move lockupid code

    @DanielVF
    DanielVF committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1864b68 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge branch 'DanielVF/xogn2' into shah/ogn-rewards-source

    @shahthepro
    shahthepro committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    50a0021 View commit details
    Browse the repository at this point in the history

  2. Add Migrator (#410) 

    * Add Migrator contract

* Fix some tests

* Code review changes

* Update OgvStaking tests

* Disable delegation tests

* Allow just unstakes

* Fix comment

* More cleanup

* Fix brownie tests
    @shahthepro
    shahthepro authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3c3b799 View commit details
    Browse the repository at this point in the history

  3. Return excess OGN rather than burn

    @DanielVF
    DanielVF committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    230755a View commit details
    Browse the repository at this point in the history

  4. Simplify calculation

    @DanielVF
    DanielVF committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d0fd40f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Return 0 if uninitialized (#415)

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

  2. Check available balance in previewRewards (#413) 

    * Check available balance in `previewRewards`

* Chore: forge fmt

---------

Co-authored-by: Daniel Von Fange <daniel@leancoder.com>
    @shahthepro @DanielVF
    shahthepro and DanielVF authored May 8, 2024
    Configuration menu
    Copy the full SHA
    2a51241 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Fix: Remove unused errors (#416)

    @DanielVF
    DanielVF authored May 14, 2024
    Configuration menu
    Copy the full SHA
    c747eea View commit details
    Browse the repository at this point in the history

  2. First draft of deploy file

    @DanielVF
    DanielVF committed May 14, 2024
    Configuration menu
    Copy the full SHA
    dabb3b0 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'shah/ogn-rewards-source' into DanielVF/reclaimAfter

    @shahthepro
    shahthepro authored May 16, 2024
    Configuration menu
    Copy the full SHA
    1f69918 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'DanielVF/reclaimAfter' into DanielVF/DeployFiles

    @shahthepro
    shahthepro authored May 16, 2024
    Configuration menu
    Copy the full SHA
    ca6eac0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Add fork test tooling (#419)

    @shahthepro
    shahthepro authored May 22, 2024
    Configuration menu
    Copy the full SHA
    a699776 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into DanielVF/DeployFiles

    @shahthepro
    shahthepro committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8ee098a View commit details
    Browse the repository at this point in the history