refactor: adjust config to be in fei terms

thomas-waite · thomas-waite · commit 6df05728e136 · 2022-04-21T01:15:08.000+02:00
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -52,8 +52,8 @@ export default {
       chainId: 5777, // Any network (default: none)
       forking: enableMainnetForking
         ? {
-            url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`,
-            blockNumber: 14617965
+            url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`
+            // blockNumber: 14617965
           }
         : undefined
     },
diff --git a/scripts/deploy/turboRollout.ts b/scripts/deploy/turboRollout.ts
@@ -6,16 +6,7 @@ import * as TurboBoosterJson from './abis/TurboBooster.sol/TurboBooster.json';
 import * as TurboAdminJson from './abis/TurboAdmin.sol/TurboAdmin.json';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
-import {
-  pool8Config,
-  pool18Config,
-  gOhmConfig,
-  gohmCollateralSupplyCap,
-  gohmCollateralBoostCap,
-  balConfig,
-  balCollateralSupplyCap,
-  balCollateralBoostCap
-} from './turboRolloutConfig';
+import { pool8Config, pool18Config, gOhmConfig, balConfig } from './turboRolloutConfig';
 
 // Turbo admin config
 const TURBO_ADMIN_ADDRESS = '0x64c4Bffb220818F0f2ee6DAe7A2F17D92b359c5d';
@@ -45,9 +36,12 @@ export const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses
   // 2. Set boost caps
   // console.log('Setting boost caps...');
   const turboBoosterContract = new ethers.Contract(addresses.turboBooster, TurboBoosterJson.abi, deploySigner);
-  await turboBoosterContract.setBoostCapForVault(pool8Strategy.address, pool8Config.supplyCap);
-  await turboBoosterContract.setBoostCapForVault(pool18Strategy.address, pool18Config.supplyCap);
-  // await validateBoostSupplyCaps(turboBoosterContract, pool8Strategy.address, pool18Strategy.address);
+  const pool8Tx = await turboBoosterContract.setBoostCapForVault(pool8Strategy.address, pool8Config.supplyCap);
+  await pool8Tx.wait();
+
+  const pool18Tx = await turboBoosterContract.setBoostCapForVault(pool18Strategy.address, pool18Config.supplyCap);
+  await pool18Tx.wait();
+  await validateBoostSupplyCaps(turboBoosterContract, pool8Strategy.address, pool18Strategy.address);
 
   // 3. Add BAL and gOHM collaterals
   const turboAdminContract = new ethers.Contract(addresses.turboAdmin, TurboAdminJson.abi, deploySigner);
@@ -56,7 +50,7 @@ export const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses
     'Balancer',
     'BAL',
     balConfig.collateralMantissa,
-    balCollateralSupplyCap
+    balConfig.feiDenomCollateralCap
   );
   await balResponseTx.wait();
   console.log('Added BAL collateral');
@@ -66,23 +60,26 @@ export const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses
     'Governance OHM',
     'gOHM',
     gOhmConfig.collateralMantisa,
-    gohmCollateralSupplyCap
+    gOhmConfig.feiDenomCollateralCap
   );
   await gOHMResponseTx.wait();
   console.log('Added gOHM collateral');
 
   // 4. Set boost caps for new collateral types
   console.log('Setting boost supply caps');
-  const balBoostCapTx = await turboBoosterContract.setBoostCapForCollateral(balConfig.address, balCollateralBoostCap);
+  const balBoostCapTx = await turboBoosterContract.setBoostCapForCollateral(
+    balConfig.address,
+    balConfig.feiDenomBoostCap
+  );
   await balBoostCapTx.wait();
 
   const gOHMBoostCapTx = await turboBoosterContract.setBoostCapForCollateral(
     gOhmConfig.address,
-    gohmCollateralBoostCap
+    gOhmConfig.feiDenomBoostCap
   );
   await gOHMBoostCapTx.wait();
   await validateCollateralBoostCaps(turboBoosterContract);
-  console.log('Finished')
+  console.log('Finished');
   return {};
 };
 
@@ -97,8 +94,8 @@ async function validateBoostSupplyCaps(turboBoosterContract: Contract, pool8Stra
 async function validateCollateralBoostCaps(turboBoosterContract: Contract) {
   console.log('Validating collateral boost caps...');
   const balBoostCap = await turboBoosterContract.getBoostCapForCollateral(balConfig.address);
-  expect(balBoostCap).to.equal(balCollateralBoostCap);
+  expect(balBoostCap).to.equal(balConfig.feiDenomBoostCap);
 
   const gohmBoostCap = await turboBoosterContract.getBoostCapForCollateral(gOhmConfig.address);
-  expect(gohmBoostCap).to.equal(gohmCollateralBoostCap);
+  expect(gohmBoostCap).to.equal(gOhmConfig.feiDenomBoostCap);
 }
diff --git a/scripts/deploy/turboRolloutConfig.ts b/scripts/deploy/turboRolloutConfig.ts
@@ -1,5 +1,4 @@
 import { ethers } from 'hardhat';
-const toBN = ethers.BigNumber.from;
 
 export const pool8Config = {
   supplyCap: ethers.utils.parseEther('2000000'), // 2M, units of Fei
@@ -15,30 +14,15 @@ export const pool18Config = {
 export const gOhmConfig = {
   address: '0x0ab87046fBb341D058F17CBC4c1133F25a20a52f',
   dollarPrice: 2955, // Approximate
-  dollarCollateralCap: 5_000_000, // $5M
-  dollarBoostCap: 1_000_000, // $1M
+  feiDenomCollateralCap: 5_000_000, // $5M
+  feiDenomBoostCap: 1_000_000, // $1M
   collateralMantisa: ethers.utils.parseEther('0.5') // 0.5e18, collateral factor
 };
 
-export const gohmCollateralSupplyCap = ethers.constants.WeiPerEther.mul(
-  toBN(gOhmConfig.dollarCollateralCap).div(toBN(gOhmConfig.dollarPrice))
-); // 5M (1e18 * (max gOhm $ collateral / gOhm $ price))
-
-export const gohmCollateralBoostCap = ethers.constants.WeiPerEther.mul(
-  toBN(gOhmConfig.dollarBoostCap).div(toBN(gOhmConfig.dollarPrice))
-);
-
 export const balConfig = {
   address: '0xba100000625a3754423978a60c9317c58a424e3D',
   dollarPrice: 15, // Approximate
-  dollarCollateralCap: 5_000_000, // $5M
-  dollarBoostCap: 1_000_000, // $1M
+  feiDenomCollateralCap: 5_000_000, // $5M
+  feiDenomBoostCap: 1_000_000, // $1M
   collateralMantissa: ethers.utils.parseEther('0.75') // 0.8e18, collateral factor
 };
-
-export const balCollateralSupplyCap = ethers.constants.WeiPerEther.mul(
-  toBN(balConfig.dollarCollateralCap).div(toBN(balConfig.dollarPrice))
-);
-export const balCollateralBoostCap = ethers.constants.WeiPerEther.mul(
-  toBN(balConfig.dollarBoostCap).div(toBN(balConfig.dollarPrice))
-);
