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

Frax Convex Strategy with locked Frax Staked Convex LP tokens #1917

Closed
wants to merge 44 commits into from
Closed

Frax Convex Strategy with locked Frax Staked Convex LP tokens #1917

wants to merge 44 commits into from

Commits on Nov 7, 2023

  1. Fix Natspec of old Convex and ThreePool strategies

    @naddison36
    naddison36 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b92b96e View commit details
    Browse the repository at this point in the history

  2. WIP ConvexFraxLockingStrategy

    @naddison36
    naddison36 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    31aa809 View commit details
    Browse the repository at this point in the history

  3. Locked Frax Staked Convex deploy script

    @naddison36
    naddison36 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    339d415 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    c7b71dc View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Fix findBalancesSlot for FXS

    @naddison36
    naddison36 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    185bd20 View commit details
    Browse the repository at this point in the history

  2. Added FraxConvexStrategy to hot deploy

    @naddison36
    naddison36 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    6eb4817 View commit details
    Browse the repository at this point in the history

  3. removed Balancer vault, wstETH and Curve frxETH/WETH from WhaleAddresses 

    Added fraxConvexWethFixture
Added fxs to default fixture
Added fork tests for FraxConvex strategy using the frxETH/WETH Curve pool
    @naddison36
    naddison36 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    cd60c74 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    2f29886 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Refactor of FraxConvexStrategy

    @naddison36
    naddison36 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    48625da View commit details
    Browse the repository at this point in the history

  2. Fix lint and slither

    @naddison36
    naddison36 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    e8e0806 View commit details
    Browse the repository at this point in the history

  3. Generated new contract diagrams

    @naddison36
    naddison36 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    02e986a View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Update comments

    @naddison36
    naddison36 committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    9f3482e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    e78d5ff View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Updated FraxConvexStrategy code comments

    @naddison36
    naddison36 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    7b6dc6f View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8ae4702 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    fa86a9f View commit details
    Browse the repository at this point in the history

  3. Updated Frax Convex deploy file

    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    86643d4 View commit details
    Browse the repository at this point in the history

  4. fix storage variables visibility

    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    a5ad85e View commit details
    Browse the repository at this point in the history

  5. Frax Convex Strategy simplification (#1951) 

    * Removed locking logic from deposit and withdraw

* Frax Convex happy path fork tests

* Fix Slither

* Add FXS to stkcvxfrxeth-ng-f-frax pool for the fork tests
    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c2ba94b View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Added check that all assets have the same number of decimals 

    Collect FXS rewards from locking contract
    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    04db36e View commit details
    Browse the repository at this point in the history

  2. Fix slither

    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    e77f6e8 View commit details
    Browse the repository at this point in the history

  3. Generated latest FraxConvexStrategy diagrams

    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f0551f4 View commit details
    Browse the repository at this point in the history

  4. Polish Frax Convex Strategy comments 

    Updated OETH contracts diagram
    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    71a8bf8 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    d8d635e View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Added Frax Convex deposit 

    Removed Convex Strategy for frxETH/WETH
Added Balancer deposit
Update Convex AMO harvest
Added Balancer harvest
    @naddison36
    naddison36 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    4b90c23 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Skip Convex frxETH/WETH strategy as its no longer being used

    @naddison36
    naddison36 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    caa92ce View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Enable FXS harvesting (#1954) 

    * Added CRV, CVX, BAL and Aura prices to OETH Oracle contract dependencies diagram

* Added FXS/ETH feed to OETH Oracle contract dependencies diagram

* Added link from Harvester to Oracle Router to OETH contract dependencies diagram

---------

Co-authored-by: Nick Addison <nick@addisonbrown.com.au>
    @sparrowDom @naddison36
    sparrowDom and naddison36 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    6353dd8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' i… 

    …nto nicka/convex-frax-locking
    @naddison36
    naddison36 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    b397370 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/nicka/convex-frax-locking' into … 

    …nicka/convex-frax-locking
    @naddison36
    naddison36 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    421320c View commit details
    Browse the repository at this point in the history

  4. Added harvest of FXS to value flow

    @naddison36
    naddison36 committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    230d15e View commit details
    Browse the repository at this point in the history

  5. add comment regarding stacking of errors

    @sparrowDom
    sparrowDom committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    40f4853 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'refs/remotes/origin/nicka/convex-frax-l… 

    …ocking' into nicka/convex-frax-locking
    @sparrowDom
    sparrowDom committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    5870d1d View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Removed MIN_LOCK_AMOUNT 

    Lock event emitted if only time was added. The amount is zero.
Small gas optimization to updateLock to avoid second SLOAD
    @naddison36
    naddison36 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3c5fd03 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/nicka/convex-frax-locking' into … 

    …nicka/convex-frax-locking
    @naddison36
    naddison36 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    ff38071 View commit details
    Browse the repository at this point in the history

  3. Generated new contract diagrams

    @naddison36
    naddison36 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    883b06b View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Small gas optimization

    @naddison36
    naddison36 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    cc4c40a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Update value flow diagrams (#1953) 

    * Added Balancer deposit
Update Convex AMO harvest
Added Balancer harvest

* Updated Convex AMO and Balancer harvests value flows
Updated buyback value flows

* Added vote locked CVX to buyback
    @naddison36
    naddison36 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    dcb83d1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/convex-frax-l… 

    …ocking
    @naddison36
    naddison36 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    34fde41 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Fix AMO tests (#1977) 

    * Fix some tests

* Fix some more

* A couple more fixes

* Fix balanced metapool fixture

* Fix collateral swaps
    @shahthepro
    shahthepro committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    1d6e3de View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/convex-frax-l… 

    …ocking
    @naddison36
    naddison36 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    7fb738f View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Changes from yAudit review (#1976) 

    * Added extra fork test to measure Frax Convex strategy's checkBalance gas usage

* exit _lock function earlier if target and locked balances are both zero

* Changed checkBalance on FraxConvexStrategy to external to make it clear it is not used internally.
    @naddison36
    naddison36 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    717f72d View commit details
    Browse the repository at this point in the history

  2. N-01 Lack of Indexed Event Parameters (#1973) 

    * N-01 added indexed to Lock and Unlock events

* Restore prettier format
    @naddison36
    naddison36 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    f0e747b View commit details
    Browse the repository at this point in the history

  3. N-05 Added CURVE_VIRTUAL_PRICE_SCALE constant (#1974)

    @naddison36
    naddison36 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a1bda8e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Merge branch 'nicka/convex-frxeth-weth-libs' into nicka/convex-frax-l… 

    …ocking
    @sparrowDom
    sparrowDom committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    826735c View commit details
    Browse the repository at this point in the history