feat: transfer dao timelock admin to burner, verify

Author: thomas-waite

proposals/dao/tip_123.ts

@@ -60,8 +60,13 @@ const teardown: TeardownUpgradeFunc = async (addresses, oldContracts, contracts,
 // IE check balances, check state of contracts, etc.
 const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
   // 1. Verify Fei DAO timelock admin burned
+  expect(await contracts.feiDAOTimelock.admin()).to.equal(addresses.daoTimelockBurner);
 
-  // 2. Verify 
+  // 2. Verify Rari Fei deprecated timelock burned
+  expect(await contracts.rariInfraFeiTimelock.beneficiary()).to.equal(addresses.deprecatedRariFeiTimelockBurner);
+
+  // 3. Verify Rari Tribe deprecated timelock burned
+  expect(await contracts.rariInfraTribeTimelock.beneficiary()).to.equal(addresses.deprecatedRariTribeTimelockBurner);
 };
 
 export { deploy, setup, teardown, validate };

proposals/description/tip_123.ts

@@ -12,14 +12,37 @@ const tip_123: TemplatedProposalDescription = {
     //   arguments: (addresses) => [ethers.utils.id('GOVERN_ROLE'), addresses.feiDAOTimelock],
     //   description: 'Revoke the GOVERN_ROLE from the TribeDAO timelock'
     // },
-    // 2. Set pending beneficiary of deprecated Rari TRIBE timelock to burner timelock
+    // 2. Transfer beneficiary of deprecated Rari FEI timelock to burner timelock
+    {
+      target: 'rariInfraFeiTimelock',
+      values: '0',
+      method: 'setPendingBeneficiary(address)',
+      arguments: (addresses) => [addresses.deprecatedRariFeiTimelockBurner],
+      description: 'Set pending beneficiary of deprecated Rari Fei timelock burner to Fei burner timelock'
+    },
+    {
+      target: 'deprecatedRariFeiTimelockBurner',
+      values: '0',
+      method: 'acceptBeneficiary()',
+      arguments: (addresses) => [],
+      description: 'Accept deprecated Rari Fei timelock beneficiary to burner'
+    },
+
+    // 2. Transfer beneficiary of deprecated Rari TRIBE timelock to burner timelock
     {
       target: 'rariInfraTribeTimelock',
       values: '0',
       method: 'setPendingBeneficiary(address)',
       arguments: (addresses) => [addresses.deprecatedRariTribeTimelockBurner],
       description: 'Set pending beneficiary of deprecated Rari Tribe timelock burner to Tribe burner timelock'
     },
+    {
+      target: 'deprecatedRariTribeTimelockBurner',
+      values: '0',
+      method: 'acceptBeneficiary()',
+      arguments: (addresses) => [],
+      description: 'Accept deprecated Rari Tribe timelock beneficiary to burner'
+    },
     // 2. Cleanup Collaterisation Oracle
     {
       target: 'collateralizationOracle',
@@ -49,18 +72,30 @@ const tip_123: TemplatedProposalDescription = {
       target: 'core',
       values: '0',
       method: 'revokeRole(bytes32,address)',
-      arguments: (addresses) => [ethers.utils.id('GOVERN_ROLE'), addresses.feiDAOTimelock],
-      description: 'Revoke the GOVERN_ROLE from the TribeDAO timelock'
+      arguments: (addresses) => [ethers.utils.id('GOVERN_ROLE'), addresses.core],
+      description: 'Revoke the GOVERN_ROLE from the Core Treasury'
     },
     {
       target: 'core',
       values: '0',
       method: 'revokeRole(bytes32,address)',
-      arguments: (addresses) => [ethers.utils.id('GOVERN_ROLE'), addresses.core],
-      description: 'Revoke the GOVERN_ROLE from the Core Treasury'
+      arguments: (addresses) => [ethers.utils.id('GOVERN_ROLE'), addresses.feiDAOTimelock],
+      description: 'Revoke the GOVERN_ROLE from the TribeDAO timelock'
+    },
+    // 6. Transfer admin of DAO timelock to DAO timelock burner
+    {
+      target: 'feiDAOTimelock',
+      values: '0',
+      method: 'setPendingAdmin(address)',
+      arguments: (addresses) => [addresses.daoTimelockBurner],
+      description: 'Set pending Fei DAO timelock admin to be the DAO timelock burner'
     },
+    {
+      target: 'daoTimelockBurner',
+      values: '0',
+      method: 'acceptFeiDAOTimelockAdmin()',
       arguments: (addresses) => [],
-      description: ''
+      description: 'Accept Fei DAO timelock admin transfer to the DAO timelock burner'
     }
   ],
   description: `