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

Add UniswapV3 strategy #26

Open
wants to merge 60 commits into
base: dev
Choose a base branch
from
Open

Add UniswapV3 strategy #26

wants to merge 60 commits into from

Commits on Oct 20, 2023

  1. Add UniswapV3 strategy

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

  2. Fix checkInterestEarned

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

Commits on Oct 23, 2023

  1. Split and Send Reward only when amount is greater than 0

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

  2. Collect tokens after decreasing liquidity

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

  3. Add _validateTickRange check

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

  4. Add starter tests

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

  5. Fix custom errors

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

  6. Improve tests

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

Commits on Oct 25, 2023

  1. Merge remote-tracking branch 'origin/dev' into wip/uniswap-strategy

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

  2. Merge remote-tracking branch 'origin/dev' into wip/uniswap-strategy

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

  3. Fix removePToken to delete both pair tokens and uniswapPoolData

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

  4. Incremental tests

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

  5. Update contracts/strategies/uniswap/UniswapStrategy.sol 

    Fix bug

Co-authored-by: arcantheon <140178288+arcantheon@users.noreply.github.com>
    @parv3213 @arcantheon
    parv3213 and arcantheon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    f8f39cb View commit details
    Browse the repository at this point in the history

  6. Optimize _withdraw

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

Commits on Oct 26, 2023

  1. Use safeIncreaseAllowance in place of safeApprove 

    - As safeApprove reverts if allowance is not 0
    @parv3213
    parv3213 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ebf23e9 View commit details
    Browse the repository at this point in the history

  2. Incremental tests

    @parv3213
    parv3213 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    8e1b67a View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Modifications- 

    1. Move nfpm, uniV3Factory and lpTokenId to UniswapPoolData
2. Remove setPTokenAddress and removePToken
3. Calling _setPTokenAddress inside initialize
4. Had to make `poolData` inside `allocate` as storage because updating `lpTokenId`
    @parv3213
    parv3213 committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    e134538 View commit details
    Browse the repository at this point in the history

  2. Update tests as per modifications

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

Commits on Oct 30, 2023

  1. Use liquidity to calculate allocated amount

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

  2. Merge remote-tracking branch 'origin/dev' into wip/uniswap-strategy

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

Commits on Oct 31, 2023

  1. Use getAmountsForLiquidity

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

  2. Use external UniswapUtils

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

  3. Fix edge cases

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

  4. Add incremental tests

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

Commits on Nov 1, 2023

  1. Add link to contract addresses

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

  2. Update contracts/strategies/uniswap/UniswapStrategy.sol 

    Co-authored-by: arcantheon <140178288+arcantheon@users.noreply.github.com>
    @parv3213 @arcantheon
    parv3213 and arcantheon committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    a546f57 View commit details
    Browse the repository at this point in the history

  3. Add incomplete tests for CollectInterest

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

  4. Update contracts/strategies/uniswap/UniswapStrategy.sol 

    Co-authored-by: arcantheon <140178288+arcantheon@users.noreply.github.com>
    @parv3213 @arcantheon
    parv3213 and arcantheon committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    f8ea968 View commit details
    Browse the repository at this point in the history

  5. Remove virtual keyword

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

  6. Add incremental tests

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

  7. Push failing collectInterest test

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

  8. Fix collectInterest tests

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

  9. Optimizations

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

  10. Optimization

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

  11. Fix stack-too-deep on forge-coverage-minimum

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

Commits on Nov 2, 2023

  1. Update Solhint config

    @parv3213
    parv3213 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    03a09d0 View commit details
    Browse the repository at this point in the history

  2. Add custom error and resolve all solhint warnings

    @parv3213
    parv3213 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    268ba17 View commit details
    Browse the repository at this point in the history

  3. Rename all test contract to have .t.sol

    @parv3213
    parv3213 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    02d7bdc View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Add solhint check in CI

    @parv3213
    parv3213 committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    acbc67f View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Added slippage while initialization and allocation

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

  2. Updated test cases

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

  3. Refactor UniswapStrategy initialization and 

    balance checking
    @parv3213
    parv3213 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    a902940 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Rename redeem function parameters.

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

  2. Removed unused assertion

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

  3. Merge branch 'wip/uniswap-strategy' of github.com:Sperax/USDs-v2 into… 

    … wip/uniswap-strategy
    @arcantheon
    arcantheon committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    9b470d9 View commit details
    Browse the repository at this point in the history

  4. Remove onlyOwner modifier from allocate function

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

  5. Added redeem test cases

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

  6. Refactor UniswapStrategy to use 

    getAmountsForLiquidity function.
    @parv3213
    parv3213 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    f7c56c6 View commit details
    Browse the repository at this point in the history

  7. Fix Natspec

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

  8. Added redeem assertions

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

  9. Added uniswap strategy test cases

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

  10. removed unused function

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

  11. Added slippage check for redeem

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

Commits on Nov 9, 2023

  1. Fixed Uniswap strategy test cases

    @arcantheon
    arcantheon committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    359bfe6 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Convert public function to external that were not used inside the con… 

    …tract
    @parv3213
    parv3213 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    c3a97fc View commit details
    Browse the repository at this point in the history

  2. Fix stack-too-deep error by adding NonfungiblePositionManagerUtils 

    - Sperax/Utility#2
    @parv3213
    parv3213 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    a0c0da1 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge remote-tracking branch 'origin/dev' into wip/uniswap-strategy

    @parv3213
    parv3213 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    dc1122c View commit details
    Browse the repository at this point in the history

  2. Fix solidity version for new files

    @parv3213
    parv3213 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    0e72831 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into wip/uniswap-strategy

    @parv3213
    parv3213 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    bb9c70a View commit details
    Browse the repository at this point in the history

  4. Remove forge-coverage-minimum script

    @parv3213
    parv3213 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c1bd2ce View commit details
    Browse the repository at this point in the history