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

WIP: Generalised AMOs for Curve and Balancer #1806

Closed
wants to merge 176 commits into from
Closed

WIP: Generalised AMOs for Curve and Balancer #1806

wants to merge 176 commits into from

Commits on Jul 12, 2023

  1. Updated ConvexEthMetaStrategy natspec 

    Added Withdrawal event to ConvexEthMetaStrategy.withdrawAll
    @naddison36
    naddison36 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    b7df446 View commit details
    Browse the repository at this point in the history

  2. Deploy 070 OETH AMO upgrade script

    @naddison36
    naddison36 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    670cc5c View commit details
    Browse the repository at this point in the history

  3. Removed debug comments from OETH AMO tests

    @naddison36
    naddison36 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    44e9914 View commit details
    Browse the repository at this point in the history

  4. Added AMO rebalance functions

    @naddison36
    naddison36 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    ff10573 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Gas optimizations to the OETH AMO strategy (#1696) 

    * Coin indexes using constants

* Changed the OETH AMO to use immutables

* Made the immutables and constants public
    @naddison36
    naddison36 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    4a7f68c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    78d58f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    dbc81f8 View commit details
    Browse the repository at this point in the history

  2. Added env vars to .env template

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    2edb42e View commit details
    Browse the repository at this point in the history

  3. Update AMO value flows

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    5766353 View commit details
    Browse the repository at this point in the history

  4. deprecated old storage slots 

    Generated new OETH AMO strategy diagrams
    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    34a55ed View commit details
    Browse the repository at this point in the history

  5. Refactor OETH AMO fork tests

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    2f75d25 View commit details
    Browse the repository at this point in the history

  6. Updated AMO fork tests

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    875d99b View commit details
    Browse the repository at this point in the history

  7. More AMO fork tests

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    606c16f View commit details
    Browse the repository at this point in the history

  8. AMO fork tests

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    c209ed0 View commit details
    Browse the repository at this point in the history

  9. AMO fork testing

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    ac11e48 View commit details
    Browse the repository at this point in the history

  10. removed minAmounts from AMO repeg functions

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    2352d0d View commit details
    Browse the repository at this point in the history

  11. Updated AMO tests

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    e35ab7a View commit details
    Browse the repository at this point in the history

  12. Added improveMetapoolBalance modifier to ETH AMO Strategy

    @naddison36
    naddison36 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    e0d5912 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Added config to OETH AMO fixture to tilt the OETH Metapool 

    Add output config to the curve tasks amoStrat and curvePool to use either console.log or the debugger's log
Reuse the amoStrat subtask in the OETH AMO fork tests
Got the repeg tests working
    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    898099e View commit details
    Browse the repository at this point in the history

  2. Disable slither constable-states

    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    74d9304 View commit details
    Browse the repository at this point in the history

  3. Fix build

    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    03ef96a View commit details
    Browse the repository at this point in the history

  4. Added negative repeg fork tests

    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    559fbd0 View commit details
    Browse the repository at this point in the history

  5. Updated ConvexEthMetaStrategy diagram with new modifier

    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    41dd487 View commit details
    Browse the repository at this point in the history

  6. Fix safeApproveAllTokens on ConvexEthMetaStrategy

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

  7. Added depositAll OETH AMO fork test

    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    9ea511f View commit details
    Browse the repository at this point in the history

  8. Remove WETH approval in ConvexEthMetaStrategy 

    Added missing Deposit event to mintAndAddOTokens
Added to AMO fork tests
    @naddison36
    naddison36 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    1c77ee3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. HH task amoStrat support OUSD AMO

    @naddison36
    naddison36 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    ccf5cf6 View commit details
    Browse the repository at this point in the history

  2. Changed OETH AMO approvals to just approve 

    Fixed fork tests
    @naddison36
    naddison36 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    49f039e View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Added oeth_meta_strat to Brownie

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

  2. Added AMO Hardhat tasks

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

  3. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

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

  4. Disable slither of approve

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

  5. Renamed createFixture to createFixtureLoader 

    Fixed imports in curve util
    @naddison36
    naddison36 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    14c238e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Fix the AMO peg keeping fork test

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

  2. Remove rebase on mintForStrategy and burnForStrategy (#1736) 

    * Remove rebase on mint and burn for AMO strategy
    @naddison36
    naddison36 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    093846e View commit details
    Browse the repository at this point in the history

  3. Added Deposit and Withdrawal events to AMO strat for OETH mints and b… 

    …urns
    @naddison36
    naddison36 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    6f612c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

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

  2. Prettier

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

  3. Moved the deploy AMO peg keeping files to 073

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

Commits on Aug 11, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

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

Commits on Aug 14, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    5845555 View commit details
    Browse the repository at this point in the history

  2. fix: edge case in improveMetapoolBalance modifier when the pool was e… 

    …xactly balanced

chore: Natspec and comment updates
    @naddison36
    naddison36 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b35c9a8 View commit details
    Browse the repository at this point in the history

  3. chore: refactored out the common code in removeAndBurnOTokens and rem… 

    …oveOnlyAssets
    @naddison36
    naddison36 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    22e63d3 View commit details
    Browse the repository at this point in the history

  4. Moved oethWhaleAddress to addresses.mainnet.oethWhaleAddress

    @naddison36
    naddison36 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e0df797 View commit details
    Browse the repository at this point in the history

  5. Fix reduceQueueTime after AMO upgrade

    @naddison36
    naddison36 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b2f9b2f View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    c724c8c View commit details
    Browse the repository at this point in the history

  2. Added proxyUpgrades hardhat task

    @naddison36
    naddison36 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    216d5bd View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    14bc8c5 View commit details
    Browse the repository at this point in the history

  2. Add Maker DSR strategy to possible defaults for DAI

    @naddison36
    naddison36 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    49fa348 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    b9180f1 View commit details
    Browse the repository at this point in the history

  4. fix build as OETH Metapool is imbalanced on mainnet

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

  5. Update OETH AMO fork tests

    @naddison36
    naddison36 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    67647c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    74805a0 View commit details
    Browse the repository at this point in the history

  2. Improved OUSD AMO fork tests

    @naddison36
    naddison36 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    29d6339 View commit details
    Browse the repository at this point in the history

  3. Fix OUSD collateral swap fork test

    @naddison36
    naddison36 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    06b4a67 View commit details
    Browse the repository at this point in the history

  4. temp fix to vault test as this will be fixed after the OUSD upgrade 

    Adjusted Harvest of CRV test as the price has dropped
    @naddison36
    naddison36 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    ef86ac7 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

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

  2. Made the collateral swap fork tests more resilient

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

  3. Fix build

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

  4. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

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

Commits on Aug 31, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-peg-keeping

    @naddison36
    naddison36 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    5551a8c View commit details
    Browse the repository at this point in the history

  2. renamed deploy script to 075

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

  3. Added proposal to 074 deploy script for frxETH Oracle

    @naddison36
    naddison36 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2b1000c View commit details
    Browse the repository at this point in the history

  4. Changed VaultCore and VaultAdmin to inherit from VaultInitializer

    @naddison36
    naddison36 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    4ee26ce View commit details
    Browse the repository at this point in the history

  5. Gas saving to OETH AMO Strategy's checkBalance

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

  6. Check asset is WETH when initializing the ETH AMO

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

Commits on Sep 1, 2023

  1. Added reentry checks on new AMO pre keeping functions

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

  2. Added improveMetapoolBalance checks to existing functions

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

  3. Removed improveMetapoolBalance from existing ETH AMO functions

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

  4. removed 074 proposalId as it hasn't passed voting yet

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

  5. Added AMO peg keeping value flows

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

  6. Changed Metapool to Curve pool in the AMO strategy

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

  7. Create base contract for Convex AMO strategy

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

  8. Added ConvexFrxETHAMOStrategy 

    Moved the AMO strategy contracts into their own folder
    @naddison36
    naddison36 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    16ea456 View commit details
    Browse the repository at this point in the history

  9. Add more Natspec

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

  10. WIP OUSD AMO refactor

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

Commits on Sep 4, 2023

  1. Fixed OUSD AMO unit tests

    @naddison36
    naddison36 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    4ac35dc View commit details
    Browse the repository at this point in the history

  2. Refactoring of AMO strategies

    @naddison36
    naddison36 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    43bae82 View commit details
    Browse the repository at this point in the history

  3. Got OUSD AMO working

    @naddison36
    naddison36 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    27879d7 View commit details
    Browse the repository at this point in the history

  4. Refactor Base AMO 

    Generated contract diagrams
    @naddison36
    naddison36 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    4a7ba7c View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Before splitting out Curve from Base AMO strategy

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

  2. Split Convex stuff out of Base AMO strategy

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

  3. Added Balancer AMO

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

  4. Added new ConvexFrxETHAMOStrategy to OETH contracts diagram

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

Commits on Sep 15, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

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

  2. Fix build

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

  3. Add frxETH deploy script

    @naddison36
    naddison36 committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    bf49e7d View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Added multi asset deposit and withdraw support to base AMO

    @naddison36
    naddison36 committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    53f6a6f View commit details
    Browse the repository at this point in the history

  2. Fix slither

    @naddison36
    naddison36 committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    6d624cd View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. fix deploy of frxETH AMO for OETH Vault

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e215332 View commit details
    Browse the repository at this point in the history

  2. Fix stETH price from OETH Oracle Router

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    6ab09b4 View commit details
    Browse the repository at this point in the history

  3. Handle AMO withdrawAll when there is no liquidity in the pool

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

  4. Rename OETH AMO fixture in prep for other AMOs

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    6f26579 View commit details
    Browse the repository at this point in the history

  5. added frxETH AMO to fixture

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    126d555 View commit details
    Browse the repository at this point in the history

  6. Vault support for multiple AMOs

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    072224e View commit details
    Browse the repository at this point in the history

  7. Fix linter

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    15fef1d View commit details
    Browse the repository at this point in the history

  8. Fix slither

    @naddison36
    naddison36 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    2877dfc View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Updated frxETH AMO config for latest blocks

    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    91eb968 View commit details
    Browse the repository at this point in the history

  2. Fix frxETH AMO withdrawAll test

    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a890a95 View commit details
    Browse the repository at this point in the history

  3. Fix frxETH AMO fork tests

    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    367aa2a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    245eb8a View commit details
    Browse the repository at this point in the history

  5. strategies on Vault now external so tests can get config 

    removed ousdMetaStrategy from Vault interface
    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    e746b3e View commit details
    Browse the repository at this point in the history

  6. fix collateral swap tests

    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a30178a View commit details
    Browse the repository at this point in the history

  7. Finished Vault support got multiple AMO. 

    deprecated netOusdMintedForStrategy and netOusdMintForStrategyThreshold.
    @naddison36
    naddison36 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    f0f64d7 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. fix slither

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    b349635 View commit details
    Browse the repository at this point in the history

  2. Updated frxETH AMO config for latest block

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

  3. Ignore coverage of echidna solidity test files

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    efb424a View commit details
    Browse the repository at this point in the history

  4. Generated latest contract diagrams

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    0eaec97 View commit details
    Browse the repository at this point in the history

  5. Renaming of AMO fork tests and fixtures

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

  6. Update frxETH AMO for latest block 

    Removed unused MAX_INT and MAX_UINT from VaultCore
    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    f56e831 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    b518991 View commit details
    Browse the repository at this point in the history

  8. refactored Curve names

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    773d53c View commit details
    Browse the repository at this point in the history

  9. prettier

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    bceb74d View commit details
    Browse the repository at this point in the history

  10. OUSD AMO Strategy renamed in fixture

    @naddison36
    naddison36 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    9ae0a1d View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    2029fd8 View commit details
    Browse the repository at this point in the history

  2. Update OUSD AMO unit tests

    @naddison36
    naddison36 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    da46964 View commit details
    Browse the repository at this point in the history

  3. Removed external initialize from InitializableAbstractStrategy. Imple… 

    …menting strategies need to call the internal _initialize function.

Generated latest contract diagrams
    @naddison36
    naddison36 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    4ee2bb7 View commit details
    Browse the repository at this point in the history

  4. Updated OUSD AMO unit tests

    @naddison36
    naddison36 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7886394 View commit details
    Browse the repository at this point in the history

  5. fix linter

    @naddison36
    naddison36 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    2aa5db7 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Updated frxETH/OETH deploy now gauge has been added to the Curve gaug… 

    …e controller
    @naddison36
    naddison36 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    7115a7c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    b5903f4 View commit details
    Browse the repository at this point in the history

  3. Fixed Convex OETH/ETH rewards pool address

    @naddison36
    naddison36 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    0560572 View commit details
    Browse the repository at this point in the history

  4. Add final config of Convex frxETH/OETH pool

    @naddison36
    naddison36 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    9364eee View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    32604aa View commit details
    Browse the repository at this point in the history

  2. regenerated all diagrams

    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9013758 View commit details
    Browse the repository at this point in the history

  3. Removed creating frxETH/OETH Convex pool as it has now been done on m… 

    …ainnet
    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    2cecdda View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/nicka/amo-frxeth' into nicka/amo… 

    …-frxeth
    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    153d9c1 View commit details
    Browse the repository at this point in the history

  5. updated deploy numbers for AMOs

    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    cb2135e View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. restored deploy script order

    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    1525f06 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    c2efc49 View commit details
    Browse the repository at this point in the history

  3. Fix collateral swap fork tests

    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    6799b6b 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/amo-frxeth
    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    960fa49 View commit details
    Browse the repository at this point in the history

  5. fix collateral swaps to USDT

    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    5864d6e View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    82b9206 View commit details
    Browse the repository at this point in the history

  2. Updated Balancer reward token comments

    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    a13b181 View commit details
    Browse the repository at this point in the history

  3. Strategy behaviour tests to handle multi asset deposit and withdraws 

    Restored OUSD initialize function to take assets and pTokens so the strategy behaviour can get the platform address
Fixed setting of Convex reward pool when deploying ConvexOUSDMetaStrategy for unit testing
Added behaviour tests to OUSD AMO unit tests
Improved ConvexOUSDMetaStrategy.checkBalance gas usage
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    1849ca7 View commit details
    Browse the repository at this point in the history

  4. Fixed frxETH AMO deploy script

    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    81ca290 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/amo-frxeth
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d2c9948 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Add unit tests for ETH and frxETH AMOs 

    Only emit Withdraw events if there is an asset amount
Renamed Convex constants so its clearer now we have more pools
    @naddison36
    naddison36 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    e2515ab View commit details
    Browse the repository at this point in the history

  2. Moved _fixture.js to help with later merge

    @naddison36
    naddison36 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    ba30372 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth… 

    …-weth-libs
    @naddison36
    naddison36 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    cc2d5cd 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/amo-frxeth
    @naddison36
    naddison36 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    8341dec View commit details
    Browse the repository at this point in the history

  5. Got harvestor behaviour tests working with OETH strategies

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

Commits on Oct 25, 2023

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    0fec111 View commit details
    Browse the repository at this point in the history

  2. prettier

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

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2774dd8 View commit details
    Browse the repository at this point in the history

  4. Added onlyGovernor to safeApproveAllTokens on CompoundStrategy

    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    1362172 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into nicka/amo-frxeth

    @sparrowDom
    sparrowDom committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    baf1052 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    d07c9ca View commit details
    Browse the repository at this point in the history

  2. fix Mock Curve pool remove liquidity

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

  3. No longer collected rewards when withdrawing from Convex pool

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

  4. Fix compound unit test as this is now covered by the strategy behaviour

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

  5. Added ETH support for Curve mocks

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

  6. Fixed ETH/OETH AMO unit tests

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

  7. fixed linter

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

  8. Merge remote-tracking branch 'origin/nicka/amo-frxeth' into nicka/amo… 

    …-frxeth
    @naddison36
    naddison36 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fbadbbd View commit details
    Browse the repository at this point in the history

  9. prettier js

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

  10. Fixed OUSD AMO fork tests

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

Commits on Oct 31, 2023

  1. Fixed ConvexEthMetaStrategy._addLiquidityToPool to include ETH value 

    Added support for ETH deposits to Mock Curve pool's add_liquidity
Started AMO behaviour tests
    @naddison36
    naddison36 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    5920a00 View commit details
    Browse the repository at this point in the history

  2. AMO contracts split asset into vaultAsset and poolAsset 

    Updated AMO behaviour tests
    @naddison36
    naddison36 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    4b132ba View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    fa2ac69 View commit details
    Browse the repository at this point in the history

  2. More AMO behaviour tests 

    Improvements to MockCurveAbstractMetapool
    @naddison36
    naddison36 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    167440c View commit details
    Browse the repository at this point in the history

  3. findBalancesSlot handle edge case of balances in first slot

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

Commits on Nov 2, 2023

  1. Updated AMO behaviour tests

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

Commits on Nov 6, 2023

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

    …nto nicka/amo-frxeth
    @naddison36
    naddison36 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    ad02870 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/amo-frxeth
    @naddison36
    naddison36 committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    bea4b2f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'nicka/convex-frxeth-weth-libs' into nicka/amo-frxeth

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

  2. Fix linter

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

  3. Prettier

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

  4. Fix Slither

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

  5. Fix fork tests

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

  6. Fix OUSD AMO fork test

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

  7. Merge branch 'nicka/convex-frxeth-weth-libs' into nicka/amo-frxeth

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

  8. Skip deploy of Convex Frax strategy

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

  9. Skip Convex frxETH/WETH fork tests

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

  10. fix unit tests

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