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

Convex frxETH/WETH strategy #1846

Closed
wants to merge 159 commits into from
Closed

Convex frxETH/WETH strategy #1846

wants to merge 159 commits into from

Commits on Sep 26, 2023

  1. Removed external initialize function from InitializableAbstractStrategy 

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

  2. Merge remote-tracking branch 'origin/master' into nicka/strategy-init… 

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

Commits on Sep 27, 2023

  1. Deploy script to upgrade frxETH strategy

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

  2. Added explicit _initialize calls

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

Commits on Sep 28, 2023

  1. Proxy initialize gas saving by using calldata instead of memory

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

  2. BaseCurveStrategy using CURVE_BASE_ASSETS constant for the number of … 

    …assets
    @naddison36
    naddison36 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    b7de7df View commit details
    Browse the repository at this point in the history

  3. Added new ConvexTwoAssetStrategy contract

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

  4. Added frxETH/WETH Curve strategy

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

  5. Add more frxETH/WETH fork tests

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

  6. remove liquidity from Curve pool directly to the recipient

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

  7. prettier

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

  8. BaseCurveStrategy make to work with Curve pools with 2 or 3 coins 

    Deploy support for linking to libraries
    @naddison36
    naddison36 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    71c2269 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Gas improvements to BaseCurveStrategy

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

  2. More BaseCurve and ConvexStrategy cleanup

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

Commits on Oct 3, 2023

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

    …-weth-minimal
    @naddison36
    naddison36 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    51f9c41 View commit details
    Browse the repository at this point in the history

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

    …' into nicka/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    9acb342 View commit details
    Browse the repository at this point in the history

  3. convexFrxEthFixture can mint when frxETH below peg

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

  4. Fix OETH AMO fork tests now there is more ETH and OETH in the pool

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

  5. minor fix to comment

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

  6. Add ConvexStrategy diagrams

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

  7. fix OUSD collateral swaps

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

  8. Added governable behaviours to strategy unit tests

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

  9. Merge remote-tracking branch 'origin/nicka/frax-strategy-upgrade' int… 

    …o nicka/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    89db87f View commit details
    Browse the repository at this point in the history

  10. fix OUSD AMO fork test

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

  11. Added harvestable behaviour tests

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

  12. wip strategy behaviour tests

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

  13. Add .VSCodeCounter to gitignore

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

  14. refactor harvester behaviour

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

Commits on Oct 4, 2023

  1. Got strategy withdraw tests working with Curve and Convex mocks

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

  2. Fix lint errors in mock

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

  3. fix collateral swap fork tests

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

  4. Updated strategy behaviour tests

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

  5. Added Withdrawal event to AaveStrategy in withdrawAll

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

  6. added mint and burn of shares to MocksfrxETH 

    Added the strategy behaviour tests to frxETH
    @naddison36
    naddison36 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    d27ce2a View commit details
    Browse the repository at this point in the history

  7. remove Balancer MEV tests for now

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

Commits on Oct 5, 2023

  1. Added Convex frxETH/WETH strategy unit tests 

    Moved replacement of unit test WETH with MockWETH to 000_mock

Updated Curve Metapool mock

Moved replaceContractAt and hardhatSetBalance out into their own utils file
    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d4321cd View commit details
    Browse the repository at this point in the history

  2. Removed unused imports from Harvester contracts

    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    7f0f22e 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 5, 2023
    Configuration menu
    Copy the full SHA
    e9178d7 View commit details
    Browse the repository at this point in the history

  4. Test removePToken can't be called on convexFrxEthWethStrategy

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

  5. Restored the Balancer MEV test after merge from master

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

  6. fix HarvesterAddressesUpdated event 

    Added more strategy behaviour tests
    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    6733fb3 View commit details
    Browse the repository at this point in the history

  7. Fix convexFrxEthFixture

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

  8. avoid zero transfers on BaseCurveStrategy.withdrawAll 

    Standardised the zero amount error in BaseCurveStrategy

Only emit Withdrawal event in Generalized4626Strategy if there was a non-zero amount

fix fraxETH unit tests

Added more strategy tests
    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    5d30578 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into nicka/convex-frxeth-weth-libs

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

  10. Fix withdraw on MocksfrxETH

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

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

    …nto nicka/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    4b64655 View commit details
    Browse the repository at this point in the history

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

    …-weth-libs
    @naddison36
    naddison36 committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    602135d View commit details
    Browse the repository at this point in the history

  13. Update MocksfrxETH to match master

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

Commits on Oct 6, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    d84b34a View commit details
    Browse the repository at this point in the history

  2. Updated OETH contract diagram

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

  3. Added frxETH and WETH deposits to frxETH/WETH strategy to value flow … 

    …diagram
    @naddison36
    naddison36 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    9dd4483 View commit details
    Browse the repository at this point in the history

  4. Added more access tests to strategy behaviour tests

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

  5. initialize contracts via proxy directly to governor instead of transf… 

    …erring governance
    @naddison36
    naddison36 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    0bf6118 View commit details
    Browse the repository at this point in the history

  6. fix js linter

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

  7. Prevent setPTokenAddress being called for Curve strategies

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

  8. Fix assignment of 3rd coin's decimals in BaseCurveStrategy

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

  9. Updated ConvexStrategy document

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

Commits on Oct 7, 2023

  1. Fix maths execution order in Matapool mock

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

  2. Simplify the virtual price in the Curve mocks

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

Commits on Oct 11, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    bb37a8c 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/convex-frxeth… 

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

  2. Fix OETH AMO fork tests now there is less invested

    @naddison36
    naddison36 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    21e850c 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 16, 2023
    Configuration menu
    Copy the full SHA
    1e9a1cb View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Removed unused imports from Harvester contracts

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

  2. Fixes to Convex mock contracts

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

  3. Fix withdraw on sfrxETH mock contract

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

  4. Fixes to Curve mock contracts

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

  5. Added Withdrawal event to Aave and Compound withdrawAll

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

  6. Generalized4626Strategy to not emit Withdrawal event when no assets w… 

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

  7. Fix HarvesterAddressesUpdated event in setHarvesterAddress

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

  8. Added IERC20Metadata which is used by the resolveAsset function

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

  9. Moved replacing of WETH contract to 000_mock 

    Added support deploying contracts with linked libraries
Moved replaceContractAt from deploy.js to utils/hardhat.js
Moved hardhatSetBalance from _fixture.js to utils/hardhat.js
    @naddison36
    naddison36 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    d6391ca View commit details
    Browse the repository at this point in the history

  10. Minor layout and comment changes

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

  11. Added behaviour tests

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

  12. fix linter

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

  13. Fix collateral swap fork tests

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

  14. Updated code comments

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

  15. Fix collateral swap fork tests

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

  16. Updated behaviour tests

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

  17. fix collateral swaps to USDT

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

  18. frxETH strategy behaviour tests now includes weth

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

Commits on Oct 18, 2023

  1. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  2. Fixed merge issues 

    Changed frxETH whale account
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    9d5c77c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    e0f4d1a View commit details
    Browse the repository at this point in the history

  4. Move calc of Curve LP tokens to Curve library (#1863) 

    * Added more comments to BaseCurveStrategy.withdraw
Added external view function calcCurveLpAmount to BaseCurveStrategy
Added fork tests for calcCurveLpAmount

* Moved calc of Curve LP tokens on withdraw to lib no calc_token_amount includes fees
    @naddison36
    naddison36 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    2eeb240 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Convex frxETH/WETH Strategy - Hot Fix 01 (#1878) 

    * add script that plots how weighted pools behave differently with different weight cnofigurations (#1870)

* Add reallocation runlog (#1871)

* Fixed OETH AMO now more liquidity has been moved from the strategy (#1875)

---------

Co-authored-by: Domen Grabec <grabec@gmail.com>
Co-authored-by: Shahul Hameed <10547529+shahthepro@users.noreply.github.com>
    @naddison36 @sparrowDom @shahthepro
    3 people committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9111479 View commit details
    Browse the repository at this point in the history

  2. Convex frxETH/WETH Strategy - OZ L-01 (#1880) 

    * Renamed CURVE_BASE_ASSETS to CURVE_POOL_ASSETS_COUNT
* Renamed curveBaseAssets to curvePoolAssetsCount
* Renamed _deprecated* to _deprecated_*
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    57c7a9d View commit details
    Browse the repository at this point in the history

  3. Convex frxETH/WETH Strategy - OZ L-02 (#1881) 

    * Simplify BaseCurveStrategy constructor check of Curve LP decimals
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    11958ac View commit details
    Browse the repository at this point in the history

  4. Update BaseCurveStrategy._getAsset Natspec

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

  5. Update ConvexStrategy Natspec

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

  6. Convex frxETH/WETH Strategy - OZ L-03 (#1882) 

    * ConvexStrategy no longer claiming Convex rewards on withdraw
* Update ConvexStrategy withdraw Natspec and comments
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    f154127 View commit details
    Browse the repository at this point in the history

  7. Improved gas and precision of BaseCurveStrategy.depositAll (#1883)

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

  8. Convex frxETH/WETH Strategy - OZ N-02 (#1884) 

    * Fix typographical errors

* Changed amount var in Curve libs to amounts as they are an array of amounts
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    f7f0cf8 View commit details
    Browse the repository at this point in the history

  9. Improve documentation (#1885)

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

  10. Added Natspec for CURVE_POOL and CURVE_LP_TOKEN in BaseCurveStrategy (#… 

    …1886)
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    ffad007 View commit details
    Browse the repository at this point in the history

  11. Convex frxETH/WETH Strategy - N-03 (#1887) 

    * Removed safeApprove from BaseCurveStrategy and ConvexStrategy
    @naddison36
    naddison36 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    4f8d6aa View commit details
    Browse the repository at this point in the history

  12. Added Natspec for ConvexStrategy._approveBase() (#1888)

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

Commits on Oct 24, 2023

  1. Simplified ConvexStrategy constructor by getting cvxRewardStaker from… 

    … the Convex Booster (#1893)
    @naddison36
    naddison36 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    2fd1578 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Prevent transferring of supported assets from strategies (#1869) 

    * Prevent transferring of supported assets from strategies

* change from external to public

* Fixed behaviour tests for gov transfer of tokens from strategies

* fix linter

---------

Co-authored-by: Domen Grabec <grabec@gmail.com>
Co-authored-by: Nicholas Addison <nick@addisonbrown.com.au>
    @shahthepro @sparrowDom @naddison36
    3 people committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    aa546e7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  3. Increased coverage of behaviour tests

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

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

    …-weth-libs
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    ed1f838 View commit details
    Browse the repository at this point in the history

  5. Remove forkOnlyDescribe in new fork test

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

  6. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    96e8855 View commit details
    Browse the repository at this point in the history

  7. Fix tests and cleanup funding

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

  8. More cleanup

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

  9. More cleanup

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

  10. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  11. Try multiple slots

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

  12. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8e7bf4c View commit details
    Browse the repository at this point in the history

  13. Fix Vyper slots

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

  14. Convex frxETH/WETH Strategy - OZ M-01 (#1879) 

    * Added Convex frxETH/WETH fork tests for more initial params

* Added Convex frxETH/WETH fork tests for safeApproveAllTokens

* Harvester behaviour tests now support OETH
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    e4801ab View commit details
    Browse the repository at this point in the history

  15. Minor tweaks

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

  16. Fix MEV tests

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

  17. Few more fixes

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

  18. Fix fraxETH

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

  19. Fix 3CRV

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

  20. More tweaks

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

  21. Increase tolerance

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

  22. Increase tolerance

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

  23. prettify

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

  24. Merge remote-tracking branch 'origin/shah/funding-fixes' into nicka/b… 

    …ehaviour-tests
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    d33ceab View commit details
    Browse the repository at this point in the history

  25. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2205019 View commit details
    Browse the repository at this point in the history

  26. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  27. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    b0aff22 View commit details
    Browse the repository at this point in the history

  28. Most merge fixes

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

  29. Fix MockCurvePool math order

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

Commits on Oct 26, 2023

  1. Removed unused return from CurveTwoCoinLib.remove_liquidity

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

Commits on Oct 30, 2023

  1. Updated BaseCurveStrategy Natspec (#1901)

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

  2. Fix typo in Natspec (#1902)

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

  3. Removed StableMath from CurveTwoCoinLib (#1903)

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

Commits on Oct 31, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    643f1db View commit details
    Browse the repository at this point in the history

  2. Reduce queue times in 076_upgrade_fraxeth_strategy

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

  3. Convex frxETH/WETH Strategy - OZ L-04 using function types (#1899) 

    * Replaced external libraries with inheritance and functions types

* Removed curve pool to immutable in Curve Functions contracts

* Regenerated strategy docs

* Update Curve Functions diagrams
    @naddison36
    naddison36 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    db0e0ef View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Convex frxETH/WETH Strategy - OZ M-01 fork tests (#1906) 

    * Remove awaits from context in strategy behaviours

* Added more Convex frxETH/WETH fork tests
    @naddison36
    naddison36 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    451e0bf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  3. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    909a6b3 View commit details
    Browse the repository at this point in the history

  4. Generated latest contract diagrams

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

Commits on Nov 3, 2023

  1. Removed unreached checkBalance function in BaseCurveStrategy as its a… 

    …lways overridden
    @naddison36
    naddison36 committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    ee324d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. chore: updated BaseCurveStrategy Natspec and code comments

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

  2. Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

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

  3. Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nick… 

    …a/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    e3bf74a View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Updated BaseCurveStrategy Natspec and code comments

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

  2. Remove reference to unused library

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

Commits on Nov 8, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    cf8c3e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Do not run hot deploy for unit tests

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

  2. Removed console.log

    @naddison36
    naddison36 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    2fcbfc4 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 Nov 9, 2023
    Configuration menu
    Copy the full SHA
    e5d9234 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    5389268 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Added harvestable behaviour for strategies 

    shouldBehaveLikeHarvester context includes fixture properties
    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    a05ad25 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/nicka/harvester-behaviour' into … 

    …nicka/convex-frxeth-weth-libs
    @naddison36
    naddison36 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    56db659 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 Nov 30, 2023
    Configuration menu
    Copy the full SHA
    fd6ea14 View commit details
    Browse the repository at this point in the history

  4. Fix fork tests

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

  5. Fix slither

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

Commits on Dec 1, 2023

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

    …-weth-libs
    @naddison36
    naddison36 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    a4510bb View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Added Balancer deposit 

    Update Convex AMO harvest
Added Balancer harvest
    @naddison36
    naddison36 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    35e11c3 View commit details
    Browse the repository at this point in the history

  2. Updated Convex AMO and Balancer harvests value flows 

    Updated buyback value flows
    @naddison36
    naddison36 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    7de9ac3 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge remote-tracking branch 'origin/nicka/value-flows' into nicka/co… 

    …nvex-frxeth-weth-libs
    @naddison36
    naddison36 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f98accd View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

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

    …-weth-libs
    @sparrowDom
    sparrowDom committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    d65c9c5 View commit details
    Browse the repository at this point in the history