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

Morpho Vault integration (p3) #68

Merged
merged 63 commits into from
Sep 13, 2024
Merged

Morpho Vault integration (p3) #68

merged 63 commits into from
Sep 13, 2024

Commits on Aug 19, 2024

  1. initial commit on morpho integration

    @cwang25
    cwang25 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ad7ab8a View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Morpho DEFI scripts with tests

    @cwang25
    cwang25 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    b7dd247 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. split morpho out of defi scripts

    Hans Wang committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    3c84509 View commit details
    Browse the repository at this point in the history

  2. add tests for bundle actions

    Hans Wang committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e441352 View commit details
    Browse the repository at this point in the history

  3. address comments

    Hans Wang committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6759c44 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. remove unnecessary if check

    Hans Wang committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    95dffa9 View commit details
    Browse the repository at this point in the history

  2. remove unnecessary if check

    Hans Wang committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    104b7bd View commit details
    Browse the repository at this point in the history

  3. remove unused import

    @cwang25
    cwang25 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    c28d957 View commit details
    Browse the repository at this point in the history

  4. address comments, move MorphoScripts out of defi_integrations folder,… 

    … and update referneces
    @cwang25
    cwang25 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    9d7f486 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. add repay max custom logics to MorphoScripts so client doesn't have t… 

    …o pass in complicated shares conversion amount, and also dropped risky changable receiver+owner address, so that client app can't forge iput of those fields to steal users' fund
    @cwang25
    cwang25 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    687abbc View commit details
    Browse the repository at this point in the history

  2. After some consideration, we can just trim off all other functions as… 

    … builder will only use repayAndwithdraw or supplyandBorrow, builder will never call inidividual supply/withdraw/repay...etc on its own, so trim those functions off to save cost. Also extend the ability to support repayMax and withdrawMax into function for both Morpho and MetaMorpho vault actions
    @cwang25
    cwang25 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    1d88bc8 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. address comments

    @cwang25
    cwang25 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    965d172 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. incorporate SharesMathLib for replacing confusing shares# assertions … 

    …in tests
    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    75cdb39 View commit details
    Browse the repository at this point in the history

  2. abstract shares away from morpho scripts, remove shares repay test

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    dc4d380 View commit details
    Browse the repository at this point in the history

  3. add more assertions to test

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1050105 View commit details
    Browse the repository at this point in the history

  4. morpho stuff

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    c27fca7 View commit details
    Browse the repository at this point in the history

  5. Add MorphoInfo with hardcoded file, and simple test to verify the add… 

    …resses set input in contract with Morpho system
    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0ddbb34 View commit details
    Browse the repository at this point in the history

  6. add known vaults (hand picked)

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9da3c01 View commit details
    Browse the repository at this point in the history

  7. migrated account info, and migrated all the dependencies 😓

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4121683 View commit details
    Browse the repository at this point in the history

  8. repay and borrow

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5940d6b View commit details
    Browse the repository at this point in the history

  9. morpho borrow tests set

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    3f01dff View commit details
    Browse the repository at this point in the history

  10. weird stock too deep error, probably need to split QuarkBuilder.sol i… 

    …nto multiple scripts
    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4ef02bb View commit details
    Browse the repository at this point in the history

  11. add tests

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    525b99e View commit details
    Browse the repository at this point in the history

  12. add withdraw collateral

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    355bb76 View commit details
    Browse the repository at this point in the history

  13. adjust code for moving defiscripts code to p1 pr

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    8e53e39 View commit details
    Browse the repository at this point in the history

  14. since max is handled by the morphoscripts, don't need to pass in shar… 

    …es no more
    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b8280ac View commit details
    Browse the repository at this point in the history

  15. change names to drop Blue, and update tests to reflect the new no-sha… 

    …res approach
    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    bbcd6e9 View commit details
    Browse the repository at this point in the history

  16. rename assetPosition to collateralAssetPosition

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    67c6ec5 View commit details
    Browse the repository at this point in the history

  17. add chainId check on getMorphoAddress

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    215203b View commit details
    Browse the repository at this point in the history

  18. typo

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    764ef10 View commit details
    Browse the repository at this point in the history

  19. typo morphor -> morpho

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4df8d32 View commit details
    Browse the repository at this point in the history

  20. add new action type, cuz builder code need that to distinguish betwee… 

    …n comet and morpho actions without having to store their own flag
    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    a93dcbf View commit details
    Browse the repository at this point in the history

  21. handle morpho action types

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    3bdeba9 View commit details
    Browse the repository at this point in the history

  22. add test net to morphoinfo and intent

    @cwang25
    Hans Wang authored and cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    f8781a8 View commit details
    Browse the repository at this point in the history

  23. fix typo Potential > Potentially

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cd590a3 View commit details
    Browse the repository at this point in the history

  24. add NOTE on renaming generic actions to comet's action

    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4dc55a2 View commit details
    Browse the repository at this point in the history

  25. as no more shares tracking, borrowedBalacnes became borrowed just lik… 

    …e Comet's position
    @cwang25
    cwang25 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    642cc16 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. replace address(0) to PaymentInfo.NON_TOKEN_PAYEMNT

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    8a48c7d View commit details
    Browse the repository at this point in the history

  2. add empty action context MorphoBorrow and MorphoRepay, and added back… 

    … the mistakenly removed empty context
    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2a83d51 View commit details
    Browse the repository at this point in the history

  3. use return instead of named

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    685531b View commit details
    Browse the repository at this point in the history

  4. don't pre-declare as there is no loop to check

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    8a5630f View commit details
    Browse the repository at this point in the history

  5. don't pre-declare as no loop to check, forgot to check in this file a… 

    …s well
    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    208767d View commit details
    Browse the repository at this point in the history

  6. rename tests, and use helper to get script address

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    dd2ea0f View commit details
    Browse the repository at this point in the history

  7. update repay to also ateempt to bridge payment token

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    707a240 View commit details
    Browse the repository at this point in the history

  8. drop TODOs

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    d91604e View commit details
    Browse the repository at this point in the history

  9. add morpho vault fields

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2da0b5f View commit details
    Browse the repository at this point in the history

  10. initial vault supply and withdraw and migrate account layout to accom… 

    …odate new fields for vault positions
    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    1a92f3b View commit details
    Browse the repository at this point in the history

  11. Separate vault action context

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    cbd2f9f View commit details
    Browse the repository at this point in the history

  12. add tests to vault actions

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    73ae6c1 View commit details
    Browse the repository at this point in the history

  13. vault supply test

    @cwang25
    Hans Wang authored and cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c19ae6e View commit details
    Browse the repository at this point in the history

  14. fix morpho test

    @cwang25
    Hans Wang authored and cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4f8160c View commit details
    Browse the repository at this point in the history

  15. test for vault withdraw

    @cwang25
    Hans Wang authored and cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4ddd974 View commit details
    Browse the repository at this point in the history

  16. fix action mistake input on morpho api

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    ed9886f View commit details
    Browse the repository at this point in the history

  17. tests for withdrawal

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    910971a View commit details
    Browse the repository at this point in the history

  18. refactor for MorphoScript changes

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c93d976 View commit details
    Browse the repository at this point in the history

  19. separate action context and action type for vault

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    28c3092 View commit details
    Browse the repository at this point in the history

  20. add empty vault to test

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    7c8fe8e View commit details
    Browse the repository at this point in the history

  21. remove long address coputation

    @cwang25
    cwang25 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    175b254 View commit details
    Browse the repository at this point in the history

  22. fix test

    Hans Wang committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    db4b702 View commit details
    Browse the repository at this point in the history

  23. no more XXX comment, as this is already covered

    Hans Wang committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    ca598a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. fix duplicate context structs

    @cwang25
    cwang25 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    d27d8a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge remote-tracking branch 'origin/main' into hans/morpho-integrati… 

    …on-3-vault
    @cwang25
    cwang25 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    c85e1f4 View commit details
    Browse the repository at this point in the history

  2. remove duplicated test files

    @cwang25
    cwang25 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    2c8f680 View commit details
    Browse the repository at this point in the history