CR Oracle + Timelock Ops

block.txt

@@ -1 +1 @@
-14967500
+15004720

proposals/dao/tip_115.ts

@@ -0,0 +1,60 @@
+import { ERC20PCVDepositWrapper__factory } from '@custom-types/contracts';
+import {
+  DeployUpgradeFunc,
+  NamedAddresses,
+  SetupUpgradeFunc,
+  TeardownUpgradeFunc,
+  ValidateUpgradeFunc
+} from '@custom-types/types';
+import chai, { expect } from 'chai';
+import hre from 'hardhat';
+import { time } from '@test/helpers';
+import { ethers } from 'ethers';
+import CBN from 'chai-bn';
+
+chai.use(CBN(ethers.BigNumber));
+
+const fipNumber = 'tip_115';
+
+// Do any deployments
+// This should exclusively include new contract deployments
+const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses: NamedAddresses, logging: boolean) => {
+  const factory = (await hre.ethers.getContractFactory('ERC20PCVDepositWrapper')) as ERC20PCVDepositWrapper__factory;
+  const rariTimelockFeiOldLens = await factory.deploy(addresses.rariInfraFeiTimelock, addresses.fei, true);
+  await rariTimelockFeiOldLens.deployTransaction.wait();
+
+  const tribalCouncilTimelockFeiLens = await factory.deploy(addresses.tribalCouncilTimelock, addresses.fei, true);
+  await tribalCouncilTimelockFeiLens.deployTransaction.wait();
+
+  return { rariTimelockFeiOldLens, tribalCouncilTimelockFeiLens };
+};
+
+// Do any setup necessary for running the test.
+// This could include setting up Hardhat to impersonate accounts,
+// ensuring contracts have a specific state, etc.
+const setup: SetupUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
+  console.log(`No actions to complete in setup for fip ${fipNumber}`);
+};
+
+// Tears down any changes made in setup() that need to be
+// cleaned up before doing any validation checks.
+const teardown: TeardownUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
+  console.log(`No actions to complete in teardown for fip${fipNumber}`);
+};
+
+// Run any validations required on the fip using mocha or console logging
+// IE check balances, check state of contracts, etc.
+const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {
+  expect(await contracts.rariInfraFeiTimelock.beneficiary()).to.be.equal(addresses.tribalCouncilTimelock);
+  expect(await contracts.rariInfraTribeTimelock.beneficiary()).to.be.equal(addresses.tribalCouncilTimelock);
+  expect(await contracts.rariTimelockFeiOldLens.balance()).to.be.equal('3178504756468797564687976');
+  expect(await contracts.tribalCouncilTimelockFeiLens.balance()).to.be.equal('0');
+  expect(await contracts.rariTimelockFeiOldLens.balanceReportedIn()).to.be.equal(addresses.fei);
+  expect(await contracts.tribalCouncilTimelockFeiLens.balanceReportedIn()).to.be.equal(addresses.fei);
+  expect(await contracts.namedStaticPCVDepositWrapper.numDeposits()).to.be.equal('0');
+  expect(await contracts.ethToDaiLBPSwapper.swapEndTime()).to.be.gt(
+    ethers.BigNumber.from((await time.latest()).toString())
+  );
+};
+
+export { deploy, setup, teardown, validate };

proposals/description/tip_115.ts

@@ -0,0 +1,110 @@
+import { TemplatedProposalDescription } from '@custom-types/types';
+
+const tip_115: TemplatedProposalDescription = {
+  title: 'TIP-115: Collateralization and Operations Updates',
+  commands: [
+    {
+      target: 'collateralizationOracle',
+      values: '0',
+      method: 'addDeposit(address)',
+      arguments: (addresses) => [addresses.rariTimelockFeiOldLens],
+      description: 'Add FEI lens to CR oracle for old timelocked FEI'
+    },
+    {
+      target: 'collateralizationOracle',
+      values: '0',
+      method: 'addDeposit(address)',
+      arguments: (addresses) => [addresses.tribalCouncilTimelockFeiLens],
+      description: 'Add FEI lens to CR oracle for tribal council timelock FEI'
+    },
+    {
+      target: 'collateralizationOracle',
+      values: '0',
+      method: 'removeDeposit(address)',
+      arguments: (addresses) => [addresses.namedStaticPCVDepositWrapper],
+      description: 'Remove NamedStaticPCVDepositWrapper from CR oracle'
+    },
+    {
+      target: 'namedStaticPCVDepositWrapper',
+      values: '0',
+      method: 'removeDeposit(uint256)',
+      arguments: (addresses) => [1],
+      description: 'Remove NamedStaticPCVDepositWrapper FEI deposit'
+    },
+    {
+      target: 'namedStaticPCVDepositWrapper',
+      values: '0',
+      method: 'removeDeposit(uint256)',
+      arguments: (addresses) => [0],
+      description: 'Remove NamedStaticPCVDepositWrapper INDEX deposit'
+    },
+    {
+      target: 'rariInfraFeiTimelock',
+      values: '0',
+      method: 'acceptBeneficiary()',
+      arguments: (addresses) => [],
+      description: 'Accept beneficiary of rari infra fei timelock'
+    },
+    {
+      target: 'rariInfraTribeTimelock',
+      values: '0',
+      method: 'acceptBeneficiary()',
+      arguments: (addresses) => [],
+      description: 'Accept beneficiary of rari infra tribe timelock'
+    },
+
+    //// Trigger new LBP of ETH
+    {
+      target: 'pcvGuardianNew',
+      values: '0',
+      method: 'withdrawToSafeAddress(address,address,uint256,bool,bool)',
+      arguments: (addresses) => [
+        addresses.daiFixedPricePSM,
+        addresses.ethToDaiLBPSwapper,
+        '1000000000000000000000000',
+        false,
+        false
+      ],
+      description: 'Withdraw 1M DAI to LBP Swapper'
+    },
+    {
+      target: 'pcvGuardianNew',
+      values: '0',
+      method: 'withdrawToSafeAddress(address,address,uint256,bool,bool)',
+      arguments: (addresses) => [
+        addresses.ethPSM,
+        addresses.ethToDaiLBPSwapper,
+        '10000000000000000000000',
+        false,
+        false
+      ],
+      description: 'Withdraw 10k ETH to LBP Swapper'
+    },
+    {
+      target: 'ethToDaiLBPSwapper',
+      values: '0',
+      method: 'swap()',
+      arguments: (addresses) => [],
+      description: 'Trigger new ETH LBP swap'
+    },
+    {
+      target: 'core',
+      values: '0',
+      method: 'grantRole(bytes32,address)',
+      arguments: (addresses) => [
+        '0x471cfe1a44bf1b786db7d7104d51e6728ed7b90a35394ad7cc424adf8ed16816', // SWAP_ADMIN_ROLE
+        addresses.tribalCouncilSafe
+      ],
+      description: 'Grant SWAP_ADMIN_ROLE to Tribal Council multisig'
+    }
+  ],
+  description: `Executes a few cleanup actions related to collateralization and operations:
+  1. Add a collateralization FEI lens to the FEI in the tribal council timelock and old rari timelocks
+  2. Accept beneficiary of the old rari timelocks to tribal council timelock.  
+  3. Remove deprecated namedStaticPCVDeposit from collateralization oracle. 
+  4. Trigger new ETH LBP to convert 10k ETH to DAI.
+  5. Grant tribal council safe the SWAP_ADMIN_ROLE to initiate LBPs after governance funds them.
+  `
+};
+
+export default tip_115;

protocol-configuration/collateralizationOracle.ts

@@ -10,11 +10,13 @@ const collateralizationAddresses: CollateralizationAddressType = {
     'rariPool22FeiPCVDepositWrapper',
     'feiBuybackLensNoFee',
     'compoundFeiPCVDepositWrapper',
-    'turboFusePCVDeposit'
+    'turboFusePCVDeposit',
+    'rariTimelockFeiOldLens',
+    'tribalCouncilTimelockFeiLens'
   ],
   lusd: ['rariPool7LusdPCVDeposit', 'bammDeposit', 'lusdPSM'],
   dai: ['compoundDaiPCVDepositWrapper', 'daiFixedPricePSM', 'dpiToDaiLensDai', 'ethToDaiLensDai'],
-  usd: ['namedStaticPCVDepositWrapper', 'd3poolCurvePCVDeposit', 'd3poolConvexPCVDeposit'],
+  usd: ['d3poolCurvePCVDeposit', 'd3poolConvexPCVDeposit'],
   bal: ['balancerDepositBalWeth', 'balancerLensVeBalBal', 'balancerGaugeStaker'],
   weth: [
     'ethLidoPCVDeposit',

protocol-configuration/mainnetAddresses.ts

@@ -239,6 +239,16 @@ const MainnetContractsConfig: MainnetContractsConfig = {
     address: '0x8096314D9014EbB69Fc777ED3791DDE6FFbaFAed',
     category: AddressCategory.Governance
   },
+  tribalCouncilTimelockFeiLens: {
+    artifactName: 'ERC20PCVDepositWrapper',
+    address: '0x4037a70152F4c88Ad40522f35BD4dDD17E6B2052',
+    category: AddressCategory.PCV
+  },
+  rariTimelockFeiOldLens: {
+    artifactName: 'ERC20PCVDepositWrapper',
+    address: '0x614D46B7eB2AC1a359b8835D64954F3Ee4E6F676',
+    category: AddressCategory.PCV
+  },
   lusdPSM: {
     artifactName: 'PegStabilityModule',
     address: '0xb0e731F036AdfDeC12da77c15aaB0F90E8e45A0e',

protocol-configuration/permissions.ts

@@ -31,7 +31,7 @@ export const permissions = {
     'opsOptimisticTimelock',
     'tribalCouncilTimelock'
   ],
-  SWAP_ADMIN_ROLE: ['pcvEquityMinter', 'optimisticTimelock', 'tribalCouncilTimelock'],
+  SWAP_ADMIN_ROLE: ['pcvEquityMinter', 'optimisticTimelock', 'tribalCouncilTimelock', 'tribalCouncilSafe'],
   BALANCER_MANAGER_ADMIN_ROLE: [],
   RATE_LIMITED_MINTER_ADMIN: [],
   PARAMETER_ADMIN: [],

protocol-configuration/proposalsConfig.ts

@@ -1,39 +1,14 @@
 import { ProposalCategory, TemplatedProposalsConfigMap } from '@custom-types/types';
-import tip_111 from '@proposals/description/tip_111';
 import pod_exec_v2 from '@proposals/description/pod_exec_v2';
-import tokemak_withdraw from '@proposals/description/tokemak_withdraw';
-import tip_112 from '@proposals/description/tip_112';
+import tip_115 from '@proposals/description/tip_115';
 
 const proposals: TemplatedProposalsConfigMap = {
-  tip_111: {
+  tip_115: {
     deploy: false, // deploy flag for whether to run deploy action during e2e tests or use mainnet state
     totalValue: 0, // amount of ETH to send to DAO execution
-    proposal: tip_111, // full proposal file, imported from '@proposals/description/fip_xx.ts'
+    proposal: tip_115, // full proposal file, imported from '@proposals/description/fip_xx.ts'
     proposalId: '',
-    affectedContractSignoff: [
-      /*'dpiToDaiLBPSwapper',
-      'compoundDaiPCVDeposit',
-      'tribalCouncilSafe',
-      'ratioPCVControllerV2'*/
-    ],
-    deprecatedContractSignoff: [],
-    category: ProposalCategory.DAO
-  },
-  tip_112: {
-    deploy: false, // deploy flag for whether to run deploy action during e2e tests or use mainnet state
-    totalValue: 0, // amount of ETH to send to DAO execution
-    proposal: tip_112, // full proposal file, imported from '@proposals/description/fip_xx.ts'
-    proposalId: '',
-    affectedContractSignoff: ['core', 'fuseFixer', 'pcvGuardianNew'],
-    deprecatedContractSignoff: [],
-    category: ProposalCategory.DAO
-  },
-  tokemak_withdraw: {
-    deploy: false, // deploy flag for whether to run deploy action during e2e tests or use mainnet state
-    totalValue: 0, // amount of ETH to send to DAO execution
-    proposal: tokemak_withdraw, // full proposal file, imported from '@proposals/description/fip_xx.ts'
-    proposalId: '',
-    affectedContractSignoff: ['ethTokemakPCVDeposit'],
+    affectedContractSignoff: [],
     deprecatedContractSignoff: [],
     category: ProposalCategory.TC
   },

test/integration/tests/buybacks.ts

@@ -130,57 +130,4 @@ describe('e2e-buybacks', function () {
       expectApprox(afterStats[2], beforeStats[2].sub(beforeBalance));
     });
   });
-
-  describe('Collateralization Oracle Keeper', async function () {
-    it('can only call when deviation or time met', async function () {
-      const { namedStaticPCVDepositWrapper, collateralizationOracleWrapper, collateralizationOracleKeeper, fei } =
-        contracts;
-
-      const beforeBalance = await fei.balanceOf(deployAddress);
-
-      // set Chainlink ETHUSD to a fixed 4,000$ value
-      await overwriteChainlinkAggregator(contractAddresses.chainlinkEthUsdOracle, '400000000000', '8');
-
-      await collateralizationOracleWrapper.update();
-
-      // After updating everything should be up to date
-      expect(await collateralizationOracleWrapper.isOutdatedOrExceededDeviationThreshold()).to.be.false;
-
-      // After time increase, should be outdated
-      await increaseTime(await collateralizationOracleWrapper.remainingTime());
-
-      expect(await collateralizationOracleWrapper.isOutdatedOrExceededDeviationThreshold()).to.be.true;
-      expect(await collateralizationOracleWrapper.isOutdated()).to.be.true;
-      expect(await collateralizationOracleWrapper.isExceededDeviationThreshold()).to.be.false;
-
-      // UpdateIfOutdated succeeds
-      await collateralizationOracleWrapper.updateIfOutdated();
-
-      expect(await collateralizationOracleWrapper.isOutdatedOrExceededDeviationThreshold()).to.be.false;
-
-      // Increase PCV balance to exceed deviation threshold
-      const pcvStats = await collateralizationOracleWrapper.pcvStats();
-      await namedStaticPCVDepositWrapper.addDeposit({
-        depositName: 'massive test deposit',
-        usdAmount: pcvStats[0],
-        feiAmount: 1,
-        underlyingTokenAmount: 1,
-        underlyingToken: ethers.constants.AddressZero
-      });
-
-      expect(await collateralizationOracleWrapper.isOutdatedOrExceededDeviationThreshold()).to.be.true;
-      expect(await collateralizationOracleWrapper.isOutdated()).to.be.false;
-      expect(await collateralizationOracleWrapper.isExceededDeviationThreshold()).to.be.true;
-
-      // Keeper is incentivized to update oracle
-      await increaseTime(await collateralizationOracleKeeper.MIN_MINT_FREQUENCY());
-
-      await collateralizationOracleKeeper.mint();
-
-      const incentive = await collateralizationOracleKeeper.incentiveAmount();
-      expect(beforeBalance.add(incentive)).to.be.equal(await fei.balanceOf(deployAddress));
-
-      expect(await collateralizationOracleWrapper.isOutdatedOrExceededDeviationThreshold()).to.be.false;
-    });
-  });
 });