OA tx : Balancer pfei accounting fix + remove PCVDeposits with bad debts

contracts/pcv/balancer/BalancerPool2Lens.sol

@@ -119,6 +119,7 @@ contract BalancerPool2Lens is IPCVDepositBalances {
         }
         if (feiInPair) {
             uint256 otherReserves = _getIdealReserves(balances, prices, weights, j);
+            otherReserves = (otherReserves * bptsOwned) / totalSupply;
             return (reserves, otherReserves);
         }
         return (reserves, 0);

package.json

@@ -14,7 +14,7 @@
     "console:ropsten": "npx hardhat console --network ropsten",
     "clean": "forge clean && rm -rf artifacts",
     "test": "forge test --no-match-contract IntegrationTest",
-    "test:integration": "FORK_BLOCK=14516592; forge test --fork-url https://eth-mainnet.alchemyapi.io/v2/$MAINNET_ALCHEMY_API_KEY --fork-block-number $FORK_BLOCK --match-contract IntegrationTest",
+    "test:integration": "FORK_BLOCK=14723389; forge test --fork-url https://eth-mainnet.alchemyapi.io/v2/$MAINNET_ALCHEMY_API_KEY --fork-block-number $FORK_BLOCK --match-contract IntegrationTest",
     "test:integration:latest": "forge test --fork-url https://eth-mainnet.alchemyapi.io/v2/$MAINNET_ALCHEMY_API_KEY --match-contract IntegrationTest",
     "test:hardhat": "npx hardhat test",
     "test:hardhat:dependencies": "LOGGING=true NO_RESET=true npx hardhat test test/integration/tests/dependencies.ts",

proposals/dao/oa_cr_fix.ts

@@ -0,0 +1,125 @@
+import hre, { ethers, artifacts } from 'hardhat';
+import { expect } from 'chai';
+import {
+  DeployUpgradeFunc,
+  NamedAddresses,
+  SetupUpgradeFunc,
+  TeardownUpgradeFunc,
+  ValidateUpgradeFunc
+} from '@custom-types/types';
+import { ZERO_ADDRESS, overwriteChainlinkAggregator } from '@test/helpers';
+
+const fipNumber = 'oa_cr_fix';
+let pcvStatsBefore;
+
+// Do any deployments
+// This should exclusively include new contract deployments
+const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses: NamedAddresses, logging: boolean) => {
+  // Deploy lens to report B-30FEI-70WETH as WETH and protocol-owned FEI
+  // (The new contract contains a fix)
+  const balancerPool2LensFactory = await ethers.getContractFactory('BalancerPool2Lens');
+  const balancerLensBpt30Fei70WethFixed = await balancerPool2LensFactory.deploy(
+    addresses.gaugeLensBpt30Fei70WethGauge, // address _depositAddress
+    addresses.wethERC20, // address _token
+    addresses.balancerFeiWethPool, // IWeightedPool _pool
+    addresses.chainlinkEthUsdOracleWrapper, // IOracle _reportedOracle
+    addresses.oneConstantOracle, // IOracle _otherOracle
+    false, // bool _feiIsReportedIn
+    true // bool _feiIsOther
+  );
+  await balancerLensBpt30Fei70WethFixed.deployTransaction.wait();
+  logging && console.log('balancerLensBpt30Fei70WethFixed: ', balancerLensBpt30Fei70WethFixed.address);
+
+  return {
+    balancerLensBpt30Fei70WethFixed
+  };
+};
+
+// 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(`Setup of ${fipNumber} : reading CR oracle...`);
+
+  // make sure ETH oracle is fresh (for B.AMM not to revert, etc)
+  // Read Chainlink ETHUSD price & override chainlink storage to make it a fresh value
+  const ethPrice = (await contracts.chainlinkEthUsdOracleWrapper.read())[0].toString() / 1e10;
+  await overwriteChainlinkAggregator(addresses.chainlinkEthUsdOracle, Math.round(ethPrice), '8');
+
+  // read pcvStats
+  pcvStatsBefore = await contracts.collateralizationOracle.pcvStats();
+};
+
+// 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) => {
+  // Check the removed PCV Deposits
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool8FeiPCVDepositWrapper)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool8DaiPCVDeposit)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool8LusdPCVDeposit)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool18FeiPCVDepositWrapper)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool27FeiPCVDepositWrapper)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.rariPool146EthPCVDeposit)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.convexPoolPCVDepositWrapper)).to.be.equal(
+    ZERO_ADDRESS
+  );
+
+  // Check the lens swap
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.balancerLensBpt30Fei70Weth)).to.be.equal(
+    ZERO_ADDRESS
+  );
+  expect(await contracts.collateralizationOracle.depositToToken(addresses.balancerLensBpt30Fei70WethFixed)).to.be.equal(
+    addresses.weth
+  );
+
+  // Check the new lens returned values
+  const balance = (await contracts.balancerLensBpt30Fei70WethFixed.balance()) / 1e18;
+  const resistantBalanceAndFei = await contracts.balancerLensBpt30Fei70WethFixed.resistantBalanceAndFei();
+  const resistantBalance = resistantBalanceAndFei[0] / 1e18;
+  const resistantFei = resistantBalanceAndFei[1] / 1e18;
+  expect(balance).to.be.at.least(14000);
+  expect(balance).to.be.at.most(16000);
+  expect(resistantBalance).to.be.at.least(14000);
+  expect(resistantBalance).to.be.at.most(16000);
+  expect(resistantFei).to.be.at.least(17e6);
+  expect(resistantFei).to.be.at.most(20e6);
+
+  // display pcvStats
+  console.log('----------------------------------------------------');
+  console.log(' pcvStatsBefore.protocolControlledValue [M]e18 ', pcvStatsBefore.protocolControlledValue / 1e24);
+  console.log(' pcvStatsBefore.userCirculatingFei      [M]e18 ', pcvStatsBefore.userCirculatingFei / 1e24);
+  console.log(' pcvStatsBefore.protocolEquity          [M]e18 ', pcvStatsBefore.protocolEquity / 1e24);
+  const pcvStatsAfter = await contracts.collateralizationOracle.pcvStats();
+  console.log('----------------------------------------------------');
+  console.log(' pcvStatsAfter.protocolControlledValue  [M]e18 ', pcvStatsAfter.protocolControlledValue / 1e24);
+  console.log(' pcvStatsAfter.userCirculatingFei       [M]e18 ', pcvStatsAfter.userCirculatingFei / 1e24);
+  console.log(' pcvStatsAfter.protocolEquity           [M]e18 ', pcvStatsAfter.protocolEquity / 1e24);
+  console.log('----------------------------------------------------');
+  const pcvDiff = pcvStatsAfter.protocolControlledValue.sub(pcvStatsBefore.protocolControlledValue);
+  const cFeiDiff = pcvStatsAfter.userCirculatingFei.sub(pcvStatsBefore.userCirculatingFei);
+  const eqDiff = pcvStatsAfter.protocolEquity.sub(pcvStatsBefore.protocolEquity);
+  console.log(' PCV diff                               [M]e18 ', pcvDiff / 1e24);
+  console.log(' Circ FEI diff                          [M]e18 ', cFeiDiff / 1e24);
+  console.log(' Equity diff                            [M]e18 ', eqDiff / 1e24);
+  console.log('----------------------------------------------------');
+};
+
+export { deploy, setup, teardown, validate };

proposals/description/oa_cr_fix.ts

@@ -0,0 +1,34 @@
+import { ProposalDescription } from '@custom-types/types';
+
+const fip_x: ProposalDescription = {
+  title: 'OA CR Fixes',
+  commands: [
+    {
+      target: 'collateralizationOracle',
+      values: '0',
+      method: 'swapDeposit(address,address)',
+      arguments: ['{balancerLensBpt30Fei70Weth}', '{balancerLensBpt30Fei70WethFixed}'],
+      description: 'Update B-70WETH-30FEI Lens'
+    },
+    {
+      target: 'collateralizationOracle',
+      values: '0',
+      method: 'removeDeposits(address[])',
+      arguments: [
+        [
+          '{rariPool8FeiPCVDepositWrapper}', // Fuse Pool 8 FEI
+          '{rariPool8DaiPCVDeposit}', // Fuse Pool 8 DAI
+          '{rariPool8LusdPCVDeposit}', // Fuse Pool 8 LUSD
+          '{rariPool18FeiPCVDepositWrapper}', // Fuse Pool 18 FEI
+          '{rariPool27FeiPCVDepositWrapper}', // Fuse Pool 27 FEI
+          '{rariPool146EthPCVDeposit}', // Fuse Pool 146 ETH
+          '{convexPoolPCVDepositWrapper}' // Fuse Pool 156 FEI
+        ]
+      ],
+      description: 'Remove PCV Deposits with bad debt'
+    }
+  ],
+  description: 'Fix Collateralization Oracle config after the Fuse May 2022 hack.'
+};
+
+export default fip_x;

protocol-configuration/collateralizationOracle.ts

@@ -1,13 +1,10 @@
 const collateralizationAddresses = {
   fei: [
     'feiOATimelockWrapper',
-    'rariPool8FeiPCVDepositWrapper',
     'rariPool6FeiPCVDepositWrapper',
     'rariPool19FeiPCVDepositWrapper',
     'rariPool24FeiPCVDepositWrapper',
     'rariPool25FeiPCVDepositWrapper',
-    'rariPool27FeiPCVDepositWrapper',
-    'rariPool18FeiPCVDepositWrapper',
     'rariPool90FeiPCVDepositWrapper',
     'aaveFeiPCVDepositWrapper',
     'rariPool79FeiPCVDepositWrapper',
@@ -16,18 +13,11 @@ const collateralizationAddresses = {
     'rariPool128FeiPCVDepositWrapper',
     'rariPool22FeiPCVDepositWrapper',
     'feiBuybackLensNoFee',
-    'convexPoolPCVDepositWrapper',
     'compoundPCVDepositWrapper',
     'turboFusePCVDeposit'
   ],
-  lusd: [
-    'liquityFusePoolLusdPCVDeposit',
-    'rariPool7LusdPCVDeposit',
-    'bammDeposit',
-    'lusdPSM',
-    'rariPool8LusdPCVDeposit'
-  ],
-  dai: ['compoundDaiPCVDepositWrapper', 'daiFixedPricePSM', 'rariPool8DaiPCVDeposit'],
+  lusd: ['liquityFusePoolLusdPCVDeposit', 'rariPool7LusdPCVDeposit', 'bammDeposit', 'lusdPSM'],
+  dai: ['compoundDaiPCVDepositWrapper', 'daiFixedPricePSM'],
   usd: ['namedStaticPCVDepositWrapper', 'd3poolCurvePCVDeposit', 'd3poolConvexPCVDeposit'],
   bal: ['balancerDepositBalWeth', 'balancerLensVeBalBal'],
   cream: ['creamDepositWrapper'],
@@ -38,10 +28,9 @@ const collateralizationAddresses = {
     'uniswapPCVDeposit',
     'ethTokemakPCVDeposit',
     'ethPSM',
-    'rariPool146EthPCVDeposit',
     'wethDepositWrapper',
     'balancerDepositFeiWeth',
-    'balancerLensBpt30Fei70Weth',
+    'balancerLensBpt30Fei70WethFixed',
     'balancerLensVeBalWeth'
   ],
   dpi: ['rariPool19DpiPCVDepositWrapper', 'dpiDepositWrapper'],

protocol-configuration/dependencies.ts

@@ -73,7 +73,6 @@ const dependencies: DependencyMap = {
       'liquityFusePoolLusdPCVDeposit',
       'poolPartyFeiPCVDeposit',
       'rariTimelock',
-      'rariPool146EthPCVDeposit',
       'rariPool18FeiPCVDeposit',
       'rariPool19DpiPCVDeposit',
       'rariPool19FeiPCVDeposit',
@@ -405,17 +404,14 @@ const dependencies: DependencyMap = {
   poolPartyFeiPCVDeposit: {
     contractDependencies: ['core', 'fei']
   },
-  rariPool146EthPCVDeposit: {
-    contractDependencies: ['core', 'rariPool146Eth']
-  },
   rariPool146Comptroller: {
     contractDependencies: ['rariPool146FuseAdmin', 'rariPool146Eth']
   },
   rariPool146FuseAdmin: {
     contractDependencies: ['rariPool146Comptroller']
   },
   rariPool146Eth: {
-    contractDependencies: ['rariPool146Comptroller', 'rariPool146EthPCVDeposit']
+    contractDependencies: ['rariPool146Comptroller']
   },
   rariPool18FeiPCVDeposit: {
     contractDependencies: ['core', 'fei']
@@ -523,23 +519,18 @@ const dependencies: DependencyMap = {
       'feiBuybackLens',
       'feiLusdLens',
       'feiOATimelockWrapper',
-      'rariPool18FeiPCVDepositWrapper',
       'rariPool19DpiPCVDepositWrapper',
       'rariPool19FeiPCVDepositWrapper',
       'rariPool24FeiPCVDepositWrapper',
       'rariPool25FeiPCVDepositWrapper',
-      'rariPool27FeiPCVDepositWrapper',
       'rariPool31FeiPCVDepositWrapper',
       'rariPool6FeiPCVDepositWrapper',
-      'rariPool8FeiPCVDepositWrapper',
       'rariPool9RaiPCVDepositWrapper',
       'rariPool90FeiPCVDepositWrapper',
       'rariPool79FeiPCVDepositWrapper',
       'rariPool72FeiPCVDepositWrapper',
       'rariPool128FeiPCVDepositWrapper',
       'rariPool22FeiPCVDepositWrapper',
-      'rariPool8LusdPCVDeposit',
-      'rariPool8DaiPCVDeposit',
       'voltFusePCVDeposit',
       'voltOracle',
       'turboFusePCVDeposit',
@@ -594,9 +585,6 @@ const dependencies: DependencyMap = {
   feiOATimelockWrapper: {
     contractDependencies: ['collateralizationOracle']
   },
-  rariPool18FeiPCVDepositWrapper: {
-    contractDependencies: ['collateralizationOracle']
-  },
   rariPool19DpiPCVDepositWrapper: {
     contractDependencies: ['collateralizationOracle']
   },
@@ -609,9 +597,6 @@ const dependencies: DependencyMap = {
   rariPool25FeiPCVDepositWrapper: {
     contractDependencies: ['collateralizationOracle']
   },
-  rariPool27FeiPCVDepositWrapper: {
-    contractDependencies: ['collateralizationOracle']
-  },
   rariPool31FeiPCVDepositWrapper: {
     contractDependencies: ['collateralizationOracle', 'rariPool31FeiPCVDeposit']
   },
@@ -636,9 +621,6 @@ const dependencies: DependencyMap = {
   rariPool22FeiPCVDepositWrapper: {
     contractDependencies: ['collateralizationOracle', 'rariPool22FeiPCVDeposit']
   },
-  rariPool8FeiPCVDepositWrapper: {
-    contractDependencies: ['collateralizationOracle']
-  },
   rariPool9RaiPCVDepositWrapper: {
     contractDependencies: ['collateralizationOracle']
   },
@@ -684,7 +666,7 @@ const dependencies: DependencyMap = {
       'uniswapPCVDeposit',
       'balancerDepositBalWeth',
       'balancerDepositFeiWeth',
-      'balancerLensBpt30Fei70Weth',
+      'balancerLensBpt30Fei70WethFixed',
       'balancerLensVeBalBal',
       'balancerLensVeBalWeth'
     ]
@@ -725,7 +707,12 @@ const dependencies: DependencyMap = {
     contractDependencies: ['core', 'chainlinkEthUsdOracleWrapper', 'chainlinkCREAMEthOracle', 'collateralizationOracle']
   },
   oneConstantOracle: {
-    contractDependencies: ['core', 'collateralizationOracle', 'balancerDepositFeiWeth', 'balancerLensBpt30Fei70Weth']
+    contractDependencies: [
+      'core',
+      'collateralizationOracle',
+      'balancerDepositFeiWeth',
+      'balancerLensBpt30Fei70WethFixed'
+    ]
   },
   tribeUsdCompositeOracle: {
     contractDependencies: [
@@ -928,7 +915,7 @@ const dependencies: DependencyMap = {
     contractDependencies: ['rariPool8MasterOracle']
   },
   rariPool8Dai: {
-    contractDependencies: ['rariPool8Comptroller', 'rariPool8DaiIrm', 'rariPool8DaiPCVDeposit']
+    contractDependencies: ['rariPool8Comptroller', 'rariPool8DaiIrm']
   },
   rariPool8DaiIrm: {
     contractDependencies: ['rariPool8Dai']
@@ -1008,14 +995,8 @@ const dependencies: DependencyMap = {
   delayedPCVMoverWethUniToBal: {
     contractDependencies: ['core', 'ratioPCVControllerV2']
   },
-  rariPool8DaiPCVDeposit: {
-    contractDependencies: ['rariPool8Dai', 'collateralizationOracle']
-  },
-  rariPool8LusdPCVDeposit: {
-    contractDependencies: ['rariPool8Lusd', 'collateralizationOracle']
-  },
   rariPool8Lusd: {
-    contractDependencies: ['rariPool8LusdPCVDeposit', 'rariPool8Comptroller']
+    contractDependencies: ['rariPool8Comptroller']
   },
   timelock: {
     contractDependencies: ['feiDAOTimelock']
@@ -1068,7 +1049,7 @@ const dependencies: DependencyMap = {
   balancerLensVeBalWeth: {
     contractDependencies: ['balUsdCompositeOracle', 'chainlinkEthUsdOracleWrapper']
   },
-  balancerLensBpt30Fei70Weth: {
+  balancerLensBpt30Fei70WethFixed: {
     contractDependencies: ['oneConstantOracle', 'chainlinkEthUsdOracleWrapper']
   },
   pcvGuardian: {