FIP-78a: Metagovernance - ANGLE #529

eswak · 2022-02-08T03:46:15Z

Forum: https://tribe.fei.money/t/fip-78a-meta-governance-angle-angle/3924
Snapshot: https://snapshot.org/#/fei.eth/proposal/0x6fb9e4bc23247f5f65da9a57577bee83b8dc748a21c5102ed1401bbcde720908

The purpose of this PR is to enable meta-governance with the protocol-owned governance tokens :

ANGLE
INDEX (already live)

SnapshotDelegatorPCVDeposit

This contract existed already, I just moved it to a new metagov folder. It is now using the new ACL system with METAGOVERNANCE_VOTE_ADMIN role.

Used for INDEX (already deployed on-chain)

AngleDelegatorPCVDeposit

This contract is a SnapshotDelegatorPCVDeposit that can also vote-escrow tokens (VoteEscrowTokenManager), vote and propose on an OZ governor (OZGovernorVoter), and stake tokens in gauges and claim their rewards (LiquidityGaugeManager).

Angle deprecated their OZ governor, but I wanted to include that feature in the immutable contract, because they may reinstate a governor in the future.

Used for ANGLE.

GaugeLens

Very simple "lens" that reports the balance of a contract staked in a gauge

UniswapLens

Manipulation-resistant balance and FEI contained within LP tokens. Uses the same formula as in UniswapPCVDeposit.

ACL

This PR uses the new ACL system with TribeRoles.sol and the onlyRole modifier. New roles:

FEI can be pre-minted on PCVDeposit before calling deposit()

Also set METAGOV_ADMIN_ROLE as the default contract admin role

contracts/metagov/SnapshotDelegatorPCVDeposit.sol

contracts/metagov/utils/LiquidityGaugeManager.sol

contracts/metagov/utils/OZGovernorVoter.sol

Joeysantoro · 2022-02-08T20:43:51Z

contracts/metagov/utils/VoteEscrowTokenManager.sol

+    /// @dev permissionless: anyone can lock tokens and extend the lock
+    /// duration at anytime. The only way to withdraw tokens will be to
+    /// pause this contract for MAXTIME and then call exitLock().
+    function lock() external whenNotPaused {


should be behind a low-clearance VOTE_ESCROW role imo

I'll make a METAGOVERNANCE_TOKEN_STAKING role, that we'll use for AAVE/stkAAVE and CVX/vlCVX too. The mechanisms are very similar.

ElliotFriedman · 2022-02-12T06:22:14Z

contracts/metagov/AngleDelegatorPCVDeposit.sol

+    ) VoteEscrowTokenManager(
+        IERC20(0x31429d1856aD1377A8A0079410B297e1a9e214c2), // ANGLE
+        IVeToken(0x0C462Dbb9EC8cD1630f1728B2CFD2769d09f0dd5), // veANGLE
+        4 * 365 * 86400 // 4 years


You can just use solidity keyword day instead of putting 86,400

I'd like to keep the same exact wording as in the veANGLE token's code if you don't mind

ElliotFriedman · 2022-02-12T06:33:13Z

It would be great to see unit tests on all this new solidity

- VoteEscrowTokenManager - OZGovernorVoter - LiquidityGaugeManager

eswak · 2022-02-14T17:35:58Z

It would be great to see unit tests on all this new solidity

I added a lot of e2e tests for the various new contracts, they interact with real on-chain governors, gauges, and veTokens, to validate the behavior

agEurAngleUniswapPCVDeposit is not in the CR oracle anymore

thomas-waite

Main comments:

Question about whether we are effectively going to be continuously locking tokens with this implementation
Would break out the parser/debug mode you've added into the e2e tests to a seperate PR. Will reduce this PR size + make it easier to go through the parser/debug mode. Not sure adding a new ProposalCategory of DEBUG is the optimal way to do it
Would break out the metagov.ts tests into several different test files with a parent metagov directory. Will reduce the file size and make it easier to review

On a seperate note, I know the e2e tests for this work have been taking a long time to run and made development painful. In the Backup Oracles PR, I've added forge based integration tests for development. They run significantly faster than our TypeScript e2e tests, and will likely be a better way to test contracts that interact with other protocols as a pose to e2e testing our whole protocol

contracts/metagov/AngleDelegatorPCVDeposit.sol

contracts/metagov/utils/LiquidityGaugeManager.sol

contracts/metagov/utils/VoteEscrowTokenManager.sol

test/integration/setup/index.ts

test/integration/tests/metagov.ts

contracts/core/TribeRoles.sol

contracts/metagov/AngleDelegatorPCVDeposit.sol

Joeysantoro · 2022-02-23T00:02:06Z

protocol-configuration/permissions.ts

+  METAGOVERNANCE_VOTE_ADMIN: ['feiDAOTimelock', 'opsOptimisticTimelock'],
+  METAGOVERNANCE_TOKEN_STAKING: ['feiDAOTimelock', 'opsOptimisticTimelock'],
+  METAGOVERNANCE_GAUGE_ADMIN: ['feiDAOTimelock', 'opsOptimisticTimelock'],
+  METAGOVERNANCE_GAUGE_STAKING: ['feiDAOTimelock', 'opsOptimisticTimelock']


Are any of these higher clearance?

arguably METAGOVERNANCE_GAUGE_ADMIN is higher risk because it can stake the protocol's LP tokens held on the contract on an arbitrary contract (it can whitelist a gauge & then stake in it), so I'll move it to the optimisticTimelock that has a longer duration

VoteEscrowTokenManager: rename _totalTokens() to _totalTokensManaged()

Merge METAGOVERNANCE_GAUGE_STAKING and METAGOVERNANCE_GAUGE_ADMIN roles, only keep METAGOVERNANCE_GAUGE_ADMIN. Change METAGOVERNANCE_GAUGE_ADMIN reciption to OA timelock (not OPS OA timelock)

Joeysantoro · 2022-02-27T17:32:09Z

contracts/core/TribeRoles.sol

+    bytes32 internal constant METAGOVERNANCE_GAUGE_ADMIN = keccak256("METAGOVERNANCE_GAUGE_ADMIN");
+
+    /// @notice manages staking to & unstaking from gauges of the protocol's tokens
+    bytes32 internal constant METAGOVERNANCE_GAUGE_STAKING = keccak256("METAGOVERNANCE_GAUGE_STAKING");


this role can be deleted

thomas-waite

Looks good!

eswak added 4 commits February 7, 2022 18:06

UniswapPCVDeposit: MINTER_ROLE is now optional

756b022

FEI can be pre-minted on PCVDeposit before calling deposit()

Move SnapshotDelegatorPCVDeposit to metagov folder

be65493

Also set METAGOV_ADMIN_ROLE as the default contract admin role

Add ANGLE metagovernance smartcontracts

21451a6

Add FIP-78a DAO script

aaf5a22

Joeysantoro reviewed Feb 8, 2022

View reviewed changes

contracts/metagov/SnapshotDelegatorPCVDeposit.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 8, 2022

View reviewed changes

contracts/metagov/utils/LiquidityGaugeManager.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 8, 2022

View reviewed changes

contracts/metagov/utils/OZGovernorVoter.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 8, 2022

View reviewed changes

eswak added 4 commits February 8, 2022 14:53

Use TribeRoles for SnapshotDelegatorPCVDeposit

7677fd6

Use new TribeRoles ACL for Angle metagovernance

045e7ef

Add additional checks on gauge whitelisting

ec5dacc

Add GaugeLens and UniswapLens to read agEUR balance

99604ca

ElliotFriedman reviewed Feb 12, 2022

View reviewed changes

eswak added 4 commits February 14, 2022 17:46

Add e2e tests for metagov features

81175e0

- VoteEscrowTokenManager - OZGovernorVoter - LiquidityGaugeManager

FIP-78a: Increase amount of pre-minted FEI

0be1fa3

Add FIP-78a proposal description

d5585ed

Merge branch 'develop' into feat/metagov-angle

876da8d

eswak added 8 commits February 14, 2022 18:42

Remove passed proposals from proposal config

5471997

Add DEBUG type for proposal step-by-step execution

27c0339

Fix FIP-78a description

6c6b437

Remove .only

1c1c6ed

Fix dependencies

3b3c450

agEurAngleUniswapPCVDeposit is not in the CR oracle anymore

Fix FIP-78a e2e tests and on-chain description

4de1b16

Remove deprecated AngleUniswapPCVDeposit from CR oracle

15db3f0

Add agEurUniswapPCVDeposit to CR oracle config

c7ed226

thomas-waite reviewed Feb 15, 2022

View reviewed changes

eswak added 2 commits February 16, 2022 14:30

Define constants in AngleDelegatorPCVDeposit

d6038dc

Add VoteEscrowTokenManager.setLockDuration() fn

3f7d0f8

Joeysantoro reviewed Feb 22, 2022

View reviewed changes

contracts/core/TribeRoles.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 22, 2022

View reviewed changes

contracts/metagov/AngleDelegatorPCVDeposit.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 22, 2022

View reviewed changes

contracts/metagov/AngleDelegatorPCVDeposit.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed Feb 23, 2022

View reviewed changes

eswak added 6 commits February 24, 2022 20:27

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

bf047e7

Joey review 1

939615b

VoteEscrowTokenManager: rename _totalTokens() to _totalTokensManaged()

Joey review 2

85bec40

Merge METAGOVERNANCE_GAUGE_STAKING and METAGOVERNANCE_GAUGE_ADMIN roles, only keep METAGOVERNANCE_GAUGE_ADMIN. Change METAGOVERNANCE_GAUGE_ADMIN reciption to OA timelock (not OPS OA timelock)

Use more realistic slippage tolerance for agEUR deposit

e616f8e

Update expected agEUR deposit resistantBalanceAndFei.fei

9fc6b09

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

14333ff

eswak self-assigned this Feb 27, 2022

Joeysantoro reviewed Feb 27, 2022

View reviewed changes

fei-protocol deleted a comment from Joeysantoro Feb 28, 2022

eswak added 12 commits February 28, 2022 11:48

Remove METAGOVERNANCE_GAUGE_STAKING role

7c45d24

Deploy FIP-78a contracts

cb2b930

Remove FIP_84a from proposals_config

b55ac8f

Remove fip_84b and fip_84c from proposals config

8afb345

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

fa6a8e3

Skip e2e-migrate-proxies

b13f2f3

Update dependencies files

931feb9

npm run prettier:sol

1bf9e98

add fip_78a proposalId

145f184

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

cfdb449

Remove FIP-78a from proposals_config

969393a

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

c59c9e4

eswak requested a review from a team as a code owner March 7, 2022 14:24

Merge remote-tracking branch 'origin/develop' into feat/metagov-angle

b636a2e

thomas-waite approved these changes Mar 7, 2022

View reviewed changes

eswak merged commit 6f211da into develop Mar 7, 2022

eswak deleted the feat/metagov-angle branch March 7, 2022 15:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIP-78a: Metagovernance - ANGLE #529

FIP-78a: Metagovernance - ANGLE #529

eswak commented Feb 8, 2022 •

edited

Joeysantoro Feb 8, 2022

eswak Feb 8, 2022

ElliotFriedman Feb 12, 2022

eswak Feb 14, 2022

ElliotFriedman commented Feb 12, 2022

eswak commented Feb 14, 2022

thomas-waite left a comment •

edited

Joeysantoro Feb 23, 2022

eswak Feb 24, 2022

Joeysantoro Feb 27, 2022

thomas-waite left a comment

FIP-78a: Metagovernance - ANGLE #529

FIP-78a: Metagovernance - ANGLE #529

Conversation

eswak commented Feb 8, 2022 • edited

SnapshotDelegatorPCVDeposit

AngleDelegatorPCVDeposit

GaugeLens

UniswapLens

ACL

Joeysantoro Feb 8, 2022

Choose a reason for hiding this comment

eswak Feb 8, 2022

Choose a reason for hiding this comment

ElliotFriedman Feb 12, 2022

Choose a reason for hiding this comment

eswak Feb 14, 2022

Choose a reason for hiding this comment

ElliotFriedman commented Feb 12, 2022

eswak commented Feb 14, 2022

thomas-waite left a comment • edited

Choose a reason for hiding this comment

Joeysantoro Feb 23, 2022

Choose a reason for hiding this comment

eswak Feb 24, 2022

Choose a reason for hiding this comment

Joeysantoro Feb 27, 2022

Choose a reason for hiding this comment

thomas-waite left a comment

Choose a reason for hiding this comment

eswak commented Feb 8, 2022 •

edited

thomas-waite left a comment •

edited