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

TIP_123: Revoke governance #1097

Open
wants to merge 37 commits into
base: develop
Choose a base branch
from
Open

Conversation

thomas-waite
Copy link
Contributor

TIP_123: Revoke governance

@thomas-waite thomas-waite self-assigned this Oct 5, 2022
@thomas-waite thomas-waite changed the base branch from develop to feat/vebal-helper October 5, 2022 14:35
@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from 69d5d5f to 16cea85 Compare October 5, 2022 14:44
@thomas-waite thomas-waite changed the title [WIP] TIP_123: Revoke governance TIP_123: Revoke governance Oct 5, 2022
@thomas-waite thomas-waite marked this pull request as ready for review October 5, 2022 15:23
@thomas-waite thomas-waite requested a review from a team as a code owner October 5, 2022 15:23
Base automatically changed from feat/vebal-helper to develop October 5, 2022 18:12
const tip_123: TemplatedProposalDescription = {
title: 'TIP_123',
commands: [
// 1. Transfer beneficiary of deprecated Rari FEI timelock to burner timelock
Copy link
Contributor Author

@thomas-waite thomas-waite Oct 5, 2022

Choose a reason for hiding this comment

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

TODO: Check everything for which ProxyAdmin is a dependency
TODO: Check all roles Core has ever granted out

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update: Have checked all roles Core has ever granted out by querying events. Look as expected - permissions.ts config is an exhaustive representation of on-chain state

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update: Checked all ProxyAdmin dependents. Appears that there were 5 contracts which the proxyAdmin had control over. 2 have since been transferred to Aave's control.

Remaining 3 live are:

  • collateralizationOracleWrapper
  • tribalChief
  • vlAuraDelegatorPCVDeposit

All are fine to deprecate along with the ProxyAdmin. The 2 which have been transferred to Aave are:

  • aaveTribeIncentivesController
  • balancerGaugeStaker

@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from b783861 to 8e8516c Compare October 5, 2022 20:13
@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from 8e8516c to 75940a9 Compare October 5, 2022 20:26
proposals/dao/tip_123.ts Outdated Show resolved Hide resolved
// expect(await contracts.collateralizationOracle.isOvercollateralized()).to.be.true;

// 1. Verify Fei DAO timelock admin burned
expect(await contracts.feiDAOTimelock.admin()).to.equal(addresses.daoTimelockBurner);
Copy link
Contributor

Choose a reason for hiding this comment

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

to be extra safe, would be good to verify that even succeeded votes on the DAO can't be executed. They probably can't even be queued.

Also good to verify that the number of addresses with governor role is 0, there is a method on the OZ AccessControlEnumerated which can check this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Verified num GOVERNORs is 0, and also verified num of addresses with other major roles is as expected

Copy link
Contributor Author

@thomas-waite thomas-waite Oct 10, 2022

Choose a reason for hiding this comment

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

Added test to verify can not queue successful proposals, and therefore can not execute

},

// 2. Transfer beneficiary of deprecated Rari TRIBE timelock to burner timelock
{
Copy link
Contributor

Choose a reason for hiding this comment

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

The one side effect here is that the TRIBE will remain delegated to Rari Infra multisig as it unlocks. Probably best to do a "delegate(address)(0x0) call" beforehand

Copy link
Contributor Author

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 force-pushed the feat/revoke-governance branch from 52a775f to cf9d4a8 Compare October 12, 2022 15:22
@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from c4e0561 to 4abd6f5 Compare October 12, 2022 16:23
@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from 4abd6f5 to 391da85 Compare October 12, 2022 16:32
@thomas-waite thomas-waite force-pushed the feat/revoke-governance branch from f06d561 to 71a5c13 Compare October 17, 2022 15:47
@@ -112,172 +69,14 @@ export const MainnetContractsConfig = {
category: AddressCategory.PCV
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO: Deprecate escrowedAaveDaiPCVDeposit after governance removed and Aave has sent funds to the PSM?

Copy link
Contributor

Choose a reason for hiding this comment

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

yes after makes sense

@@ -107,12 +102,6 @@ describe('e2e-metagov', function () {
);
});

it('should revert if contract is paused', async function () {

Choose a reason for hiding this comment

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

why did you remove these test cases?

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.

3 participants