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

Fix incorrect fee math in MetaSwapUtils #469

Merged
merged 17 commits into from
Dec 9, 2021
Merged

Fix incorrect fee math in MetaSwapUtils #469

merged 17 commits into from
Dec 9, 2021

Commits on Nov 12, 2021

  1. some tests to break things via inflating baseVirtualPrice

    @ChiTimesChi
    ChiTimesChi committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    03a3a5a View commit details
    Browse the repository at this point in the history

  2. _calculateSwap() proper handling of baseVirtualPrice

    @ChiTimesChi
    ChiTimesChi committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    627cc2d View commit details
    Browse the repository at this point in the history

  3. _calculateWithdrawOneTokenDY() proper handling of baseVirtualPrice

    @ChiTimesChi
    ChiTimesChi committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    38cd9e3 View commit details
    Browse the repository at this point in the history

  4. calculateSwapUnderlying() better estimation from base to meta

    @ChiTimesChi
    ChiTimesChi committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    3b4bd4a View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. fix the dyFee ordering - some tests are now broken though

    @ChiTimesChi
    ChiTimesChi committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    783502f View commit details
    Browse the repository at this point in the history

  2. fix the dyFee ordering again - now tests are passed

    @ChiTimesChi
    ChiTimesChi committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    3be5ba1 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2021

  1. fixed order for adminFee tokenPrecisionMultipliers

    @ChiTimesChi
    ChiTimesChi committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    63f41b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2021

  1. Linting

    @penandlim
    penandlim committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    8bb91d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into vp-exploit

    @penandlim
    penandlim committed Nov 27, 2021
    Configuration menu
    Copy the full SHA
    b00cdec View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. Remove changes made to Swap.sol 

    As base swaps have already been deployed, we cannot modify the current
ones. Although this is more gas-costly, it allows us to keep using the
same base pools.
    @penandlim
    penandlim committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    474d7c1 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. Add admin fee scaling in swapUnderlying for a specific case 

    - When swapping from meta level token to an underlying token in the base
  Swap tokens, scale the dy by the virtual price for correct value
  calculation
    @penandlim
    penandlim committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    30c1bc3 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2021

  1. Add tests for checking adminFee increase when swapping from underlying 

    base pool asset to a meta level asset
    @penandlim
    penandlim committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    93646a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'vp-exploit' of github.com:saddle-finance/saddle-contrac… 

    …t into vp-exploit
    @penandlim
    penandlim committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    d988795 View commit details
    Browse the repository at this point in the history

  3. Linting

    @penandlim
    penandlim committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    439c07a View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Equalize the value of swap between swap and swapUnderlying tests to 

    detect any discrepencies
    @penandlim
    penandlim committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    3c92b55 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. Add a test with high admin fee parameter

    @penandlim
    penandlim committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    7a57139 View commit details
    Browse the repository at this point in the history

  2. Use SafeMath

    @penandlim
    penandlim committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    7b7060e View commit details
    Browse the repository at this point in the history