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.

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

Cleanup: CR Oracle (remove caching, clean deprecated deposits) #923

Merged
merged 31 commits into from
Jun 24, 2022

Conversation

eswak
Copy link
Contributor

@eswak eswak commented Jun 20, 2022

Deprecates the CR Oracle wrapper and cleanup the content of the CR Oracle (there are various PCVDeposits that are empty/deprecated, and roles that are granted to contracts that are not in use anymore)

  • All Tests Passing
  • Proposal Added to ProposalsConfig
  • Fork Block Correct
  • Remove Any .only's on Tests
  • Update Documentation If Needed
  • Update Roles Config
  • Proposal Submitted

addresses.agEurDepositWrapper, // no more agEUR on the timelock
addresses.wethDepositWrapper, // no more WETH on the timelock
addresses.d3poolConvexPCVDeposit, // 0$ left in Convex d3
addresses.d3poolCurvePCVDeposit, // 1034$ left in Curve d3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is also ~$15k FEI that should be withdrawn. tbh I'd include withdrawals for as many of these assets as possible:

  • $15k FEI from d3Curve
  • ~$1k FEI liquidity from d3Curve
  • RAI in RAI psm
  • FEI in RAI psm
  • COMP in compoundETHPCVDepositWrapper

Copy link
Contributor Author

@eswak eswak Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adding calls for all of that.

since we're moving COMP from the deprecated ethCompoundPCVDeposit, I'll also move CRV/CVX from the deprecated convexD3PCVDeposit

TC multisig will have these assets to liquidate (though gnosis safe 1inch plugin?):

  • 800k$ of RAI
  • 800k$ of CRV/CVX
  • 20k$ of COMP

let's not forget to do the permissionless harvests before this proposal's execution

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might as well transfer in the remaining AAVE and COMP from the 2 live deposits too per https://snapshot.fei.money/#/proposal/0xf789539597a01bae85be052405854751737562f0832aab78f8d450d8afcb7bc3

@Joeysantoro Joeysantoro mentioned this pull request Jun 22, 2022
7 tasks
@eswak eswak marked this pull request as ready for review June 24, 2022 12:14
@eswak eswak requested a review from a team as a code owner June 24, 2022 12:14
Copy link
Contributor

@thomas-waite thomas-waite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think we can remove all Tokemak related actions apart from the TOKE withdrawal (already executed on-chain by the Guardian) and there's an action or two in the proposal that we can clean up

proposals/dao/cr_oracle_cleanup.ts Outdated Show resolved Hide resolved
protocol-configuration/proposalsConfig.ts Outdated Show resolved Hide resolved
test/integration/tests/psm.ts Show resolved Hide resolved
proposals/description/cr_oracle_cleanup.ts Outdated Show resolved Hide resolved
proposals/description/cr_oracle_cleanup.ts Outdated Show resolved Hide resolved
proposals/description/cr_oracle_cleanup.ts Outdated Show resolved Hide resolved
proposals/description/cr_oracle_cleanup.ts Outdated Show resolved Hide resolved
addresses.balancerDepositFeiWeth,
addresses.d3poolConvexPCVDeposit,
addresses.d3poolCurvePCVDeposit,
addresses.aaveEthPCVDeposit,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aaveEth should stay safe imo. Its the most convenient way for PCV Guardian to wrap ETH currently

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking of adding to the ERC20HoldingPCVDeposit (Erwan's idea) a method to wrap any ETH the deposit has received. In the future we could use that to wrap ETH and then withdraw it to wherever it's needed

addresses.d3poolCurvePCVDeposit, // 0$ left in Curve d3
addresses.uniswapPCVDeposit, // 0$ left in FEI/ETH Uniswap v2
addresses.compoundEthPCVDepositWrapper, // 0 ETH left in Compound
addresses.aaveEthPCVDepositWrapper, // 0 ETH left in Aave
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should stay in too

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@thomas-waite thomas-waite merged commit a7cd3fa into develop Jun 24, 2022
@thomas-waite thomas-waite deleted the feat/cleanup-cr-oracle branch June 24, 2022 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants