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

VIP-14 Morpho PCV Deposit #128

Merged
merged 88 commits into from
Oct 27, 2022
Merged

VIP-14 Morpho PCV Deposit #128

merged 88 commits into from
Oct 27, 2022

Commits on Oct 2, 2022

  1. add mock maple contract

    @ElliotFriedman
    ElliotFriedman committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    5ba0def View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Add harvest event to the PCV Deposit Interface

    @ElliotFriedman
    ElliotFriedman committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    344cbc0 View commit details
    Browse the repository at this point in the history

  2. Morpho PCV Deposit and integration tests

    @ElliotFriedman
    ElliotFriedman committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    95368fe View commit details
    Browse the repository at this point in the history

  3. Maple PCV Deposit, harvest functionality, COMP Token

    @ElliotFriedman
    ElliotFriedman committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    85e18d2 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Update comment in Compound PCV router to correctly label PCV deposit … 

    …denominations
    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    fc92e6b View commit details
    Browse the repository at this point in the history

  2. VIP-14 Integration Test Skeleton

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    86ea05e View commit details
    Browse the repository at this point in the history

  3. Update TODO PCV Guard Verification

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    43ac3fb View commit details
    Browse the repository at this point in the history

  4. VIP-14 Proposal, Deploys Router, Deploys Deposits, Deploys Oracle, Di… 

    …sconnect compound deposits from ERC20 allocator, connect new morpho deposits to ERC20 allocator
    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    c9ff1b1 View commit details
    Browse the repository at this point in the history

  5. Add skeleton of VIP-14 integration tests

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    38f7cdb View commit details
    Browse the repository at this point in the history

  6. VIP-14 typescript implementation

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    cf6c21a View commit details
    Browse the repository at this point in the history

  7. Morpho router swap integration tests

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    c0ddda9 View commit details
    Browse the repository at this point in the history

  8. add arbitrum proposal to set volt price increases to 0

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    96c3b93 View commit details
    Browse the repository at this point in the history

  9. Disable mint tests on arbitrum, pause minting on arbitrum

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    09a11e5 View commit details
    Browse the repository at this point in the history

  10. Pause minting on Arbitrum PSM's

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    1b11bda View commit details
    Browse the repository at this point in the history

  11. remove newline in mintredeemverification

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    3a927a5 View commit details
    Browse the repository at this point in the history

  12. VIP-14 Arbitrum deployment and governance scripts in typescript

    @ElliotFriedman
    ElliotFriedman committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    288fb42 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. remove vm.warp from morpho integration test

    @ElliotFriedman
    ElliotFriedman committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    6323a8e View commit details
    Browse the repository at this point in the history

  2. Morpho and Maple PCV Deposit refactor and integration tests

    @ElliotFriedman
    ElliotFriedman committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    f86be20 View commit details
    Browse the repository at this point in the history

  3. assertEq

    @ElliotFriedman
    ElliotFriedman committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    d72ddea View commit details
    Browse the repository at this point in the history

  4. add deposit call on maple deposit to vip 14

    @ElliotFriedman
    ElliotFriedman committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    175b45c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. remove arbitrum typescript deployment, arbitrary execution as pcv con… 

    …troller
    @ElliotFriedman
    ElliotFriedman committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    02453fa View commit details
    Browse the repository at this point in the history

  2. Add pcv deposit pausing

    @ElliotFriedman
    ElliotFriedman committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    64177bb View commit details
    Browse the repository at this point in the history

  3. update description with deployment steps

    @ElliotFriedman
    ElliotFriedman committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    41b1496 View commit details
    Browse the repository at this point in the history

  4. deployment script gov description fix

    @ElliotFriedman
    ElliotFriedman committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    513d872 View commit details
    Browse the repository at this point in the history

  5. Clarifying comments Maple Deposit

    @ElliotFriedman
    ElliotFriedman committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    c231877 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. update maple deposit to accurately track interest and losses

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    72101fa View commit details
    Browse the repository at this point in the history

  2. update comment

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    979ce31 View commit details
    Browse the repository at this point in the history

  3. update comment pcv guardian ts

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    376e7d4 View commit details
    Browse the repository at this point in the history

  4. warn comment on maple deposit

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    b3a1843 View commit details
    Browse the repository at this point in the history

  5. add assertion

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    101415e View commit details
    Browse the repository at this point in the history

  6. pause old pcv deposits assertions

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    729fc01 View commit details
    Browse the repository at this point in the history

  7. Remove new oracle deployment and depositing of pcv into maple

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    64a50dd View commit details
    Browse the repository at this point in the history

  8. VIP-14 Integration tests

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    4c0e890 View commit details
    Browse the repository at this point in the history

  9. typescript proposal update

    @ElliotFriedman
    ElliotFriedman committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    6619e94 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Add dev comments to Morpho and Maple PCV Deposits

    @ElliotFriedman
    ElliotFriedman committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    21d0bf7 View commit details
    Browse the repository at this point in the history

  2. license

    @ElliotFriedman
    ElliotFriedman committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    1ce3129 View commit details
    Browse the repository at this point in the history

  3. import visual cleanup

    @ElliotFriedman
    ElliotFriedman committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    248a693 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. PCV Deposit harvest emits amount harvested

    @ElliotFriedman
    ElliotFriedman committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    97b9255 View commit details
    Browse the repository at this point in the history

  2. Add amount emitted from harvest in deposits

    @ElliotFriedman
    ElliotFriedman committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    3358ab0 View commit details
    Browse the repository at this point in the history

  3. attribution to MakerDAO multicall

    @ElliotFriedman
    ElliotFriedman committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    c56434f View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. If rewards contract paused, do not stake

    @ElliotFriedman
    ElliotFriedman committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    649ec46 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Morpho 🦋 & Maple 🍁 Slither Run

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    6de5056 View commit details
    Browse the repository at this point in the history

  2. Update contracts/pcv/morpho/ILens.sol 

    Co-authored-by: Romain Milon <rmilon@gmail.com>
    @ElliotFriedman @Rubilmax
    ElliotFriedman and Rubilmax authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    e83c195 View commit details
    Browse the repository at this point in the history

  3. Update contracts/pcv/morpho/ILens.sol 

    Co-authored-by: Romain Milon <rmilon@gmail.com>
    @ElliotFriedman @Rubilmax
    ElliotFriedman and Rubilmax authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    6ca9cc5 View commit details
    Browse the repository at this point in the history

  4. Update comment and constructor params to allow PCV deposit to hold ceth

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    4999583 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/morpho-maple-rate-upgrade' of github.com:volt-prot… 

    …ocol/volt-protocol-core into feat/morpho-maple-rate-upgrade
    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    d2a78e0 View commit details
    Browse the repository at this point in the history

  6. fix integration tests and governance proposal

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    cb8ccd0 View commit details
    Browse the repository at this point in the history

  7. typescript deployment script upgraded to pass 3rd parameter into morp… 

    …ho compound pcv deposits
    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    1c06df3 View commit details
    Browse the repository at this point in the history

  8. remove pausing logic from maple smart contracts

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    79a6981 View commit details
    Browse the repository at this point in the history

  9. scalingFactor snakecase, emit withdrawal event in sad path api, add a… 

    …dditional comments in mpl deposit
    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    91a817b View commit details
    Browse the repository at this point in the history

  10. remove withdrawAll function from maple pcv deposit

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    8f6b3d6 View commit details
    Browse the repository at this point in the history

  11. remove unnecessary cast

    @ElliotFriedman
    ElliotFriedman committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    397642b View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. merge develop and fix merge conflicts

    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    28a501a View commit details
    Browse the repository at this point in the history

  2. remove Maple from PR

    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    a2fcf0a View commit details
    Browse the repository at this point in the history

  3. typescript vip-14 updates to only handling Morpho deposits

    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    49e18cd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:volt-protocol/volt-protocol-core… 

    … into feat/morpho-maple-rate-upgrade
    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    5a03f63 View commit details
    Browse the repository at this point in the history

  5. Update contracts/pcv/morpho/MorphoCompoundPCVDeposit.sol 

    Co-authored-by: Erwan Beauvois <eswak@users.noreply.github.com>
    @ElliotFriedman @eswak
    ElliotFriedman and eswak authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    1a6b664 View commit details
    Browse the repository at this point in the history

  6. Update contracts/pcv/morpho/MorphoCompoundPCVDeposit.sol 

    Co-authored-by: Erwan Beauvois <eswak@users.noreply.github.com>
    @ElliotFriedman @eswak
    ElliotFriedman and eswak authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    a71e3b3 View commit details
    Browse the repository at this point in the history

  7. Update contracts/pcv/morpho/MorphoCompoundPCVDeposit.sol 

    Co-authored-by: Erwan Beauvois <eswak@users.noreply.github.com>
    @ElliotFriedman @eswak
    ElliotFriedman and eswak authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    bc52fa4 View commit details
    Browse the repository at this point in the history

  8. remove revert in mint redeem verification

    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    a96025a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feat/morpho-maple-rate-upgrade' of github.com:volt-prot… 

    …ocol/volt-protocol-core into feat/morpho-maple-rate-upgrade
    @ElliotFriedman
    ElliotFriedman committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    2073f25 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Add profit tracking to Morpho PCV Deposit, fuzz tests, security tests… 

    … with reentrancy suite
    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    024edd3 View commit details
    Browse the repository at this point in the history

  2. update ts deployment script

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    3056222 View commit details
    Browse the repository at this point in the history

  3. remove console.log

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    457613d View commit details
    Browse the repository at this point in the history

  4. update comments on how fast interest accrues at current rates, fix ex… 

    …pectEmit assertion, remove console logs
    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    42d92da View commit details
    Browse the repository at this point in the history

  5. invariant tests Morpho

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    26be8a2 View commit details
    Browse the repository at this point in the history

  6. add additional comments around depositedAmount

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    81cba10 View commit details
    Browse the repository at this point in the history

  7. invariant tests for morpho compound pcv deposit

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    0a90a64 View commit details
    Browse the repository at this point in the history

  8. fix unit tests assertions around events being emitted

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    ab9c93e View commit details
    Browse the repository at this point in the history

  9. add underlying mismatch test

    @ElliotFriedman
    ElliotFriedman committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    1fc86aa View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. slither run 10-21

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    72a4567 View commit details
    Browse the repository at this point in the history

  2. add depositedAmount check equal 0 in recordPNL function

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    c8ca5d7 View commit details
    Browse the repository at this point in the history

  3. address Erwan feedback

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    414b443 View commit details
    Browse the repository at this point in the history

  4. add vip14 to runner, remove vip14a

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    4d59814 View commit details
    Browse the repository at this point in the history

  5. change name of depositedAmount to lastRecordedBalance, update tests t… 

    …o accomodate this, and update comments
    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    52f3ef6 View commit details
    Browse the repository at this point in the history

  6. update comments in MorphoPCVDeposit

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    d1e2632 View commit details
    Browse the repository at this point in the history

  7. add unit test that checks implcit balance check in _withdraw function

    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    513e3a9 View commit details
    Browse the repository at this point in the history

  8. organize functions based on type and permission, add large block comm… 

    …ents for organization
    @ElliotFriedman
    ElliotFriedman committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    9c14d09 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2022

  1. slither 22 run

    @ElliotFriedman
    ElliotFriedman committed Oct 22, 2022
    Configuration menu
    Copy the full SHA
    072b88d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Add PCV Oracle callback to morpho PCV Deposit

    @ElliotFriedman
    ElliotFriedman committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    a1e9b2f View commit details
    Browse the repository at this point in the history

  2. update deposit endingRecordedBalance to be exact amount pcv deposit o… 

    …wns after deposit
    @ElliotFriedman
    ElliotFriedman committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    8519129 View commit details
    Browse the repository at this point in the history

  3. remove amount == 0 check in _withdraw, setPCVOracle records pnl and u… 

    …pdates the liquid balance on the oracle, move balance cache to after supply
    @ElliotFriedman
    ElliotFriedman committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    d7c9f6c View commit details
    Browse the repository at this point in the history

  4. add unit/fuzz tests around calling setPCVOracle

    @ElliotFriedman
    ElliotFriedman committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    ab72cd2 View commit details
    Browse the repository at this point in the history

  5. add additional invariant tests for updateLiquidBalance hook

    @ElliotFriedman
    ElliotFriedman committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    6cd4317 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. slither run 10/24

    @ElliotFriedman
    ElliotFriedman committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    d2c285e View commit details
    Browse the repository at this point in the history

  2. Deploy MorphoCompound PCV Depsosits, add addresses to mainnet address… 

    … file, point vip14 solidity simulation to newly deployed smart contracts
    @ElliotFriedman
    ElliotFriedman committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    7fa0d40 View commit details
    Browse the repository at this point in the history

  3. remove compound pcv deposits from pcv guard verification

    @ElliotFriedman
    ElliotFriedman committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    0101e8d View commit details
    Browse the repository at this point in the history

  4. remove todo comment on adding morpho deposits in pcv guard verification

    @ElliotFriedman
    ElliotFriedman committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    f867262 View commit details
    Browse the repository at this point in the history