Merge branch 'development' into feat/liquidate-borrow-permissioning

Author: rhlsthrm

chains/bob/assets.ts

@@ -19,7 +19,7 @@ export const assets: SupportedAsset[] = [
     oracle: OracleTypes.FixedNativePriceOracle,
     initialSupplyCap: parseEther(String(3_000)).toString(),
     initialBorrowCap: parseEther("0.01").toString(),
-    initialCf: "85"
+    initialCf: "0.85"
   },
   {
     symbol: assetSymbols.WBTC,
@@ -33,7 +33,7 @@ export const assets: SupportedAsset[] = [
     } as ChainlinkSpecificParams,
     initialSupplyCap: parseUnits(String(100), 8).toString(),
     initialBorrowCap: parseUnits("0.00001", 8).toString(),
-    initialCf: "85"
+    initialCf: "0.85"
   },
   {
     symbol: assetSymbols.USDT,
@@ -47,7 +47,7 @@ export const assets: SupportedAsset[] = [
     } as ChainlinkSpecificParams,
     initialSupplyCap: parseUnits(String(10_000_000), 6).toString(),
     initialBorrowCap: parseUnits(String(30), 6).toString(),
-    initialCf: "85"
+    initialCf: "0.85"
   },
   {
     symbol: assetSymbols.tBTC,
@@ -61,7 +61,7 @@ export const assets: SupportedAsset[] = [
     } as ChainlinkSpecificParams,
     initialSupplyCap: parseUnits(String(100), 18).toString(),
     initialBorrowCap: parseUnits("0.00001", 18).toString(),
-    initialCf: "85"
+    initialCf: "0.85"
   },
   {
     symbol: assetSymbols.USDC,
@@ -75,7 +75,7 @@ export const assets: SupportedAsset[] = [
     } as ChainlinkSpecificParams,
     initialSupplyCap: parseUnits(String(10_000_000), 6).toString(),
     initialBorrowCap: parseUnits(String(30), 6).toString(),
-    initialCf: "85"
+    initialCf: "0.85"
   },
   {
     symbol: assetSymbols.SOV,
@@ -89,7 +89,7 @@ export const assets: SupportedAsset[] = [
     } as ChainlinkSpecificParams,
     initialSupplyCap: parseUnits(String(20_000_000), 18).toString(),
     initialBorrowCap: parseUnits(String(69), 18).toString(),
-    initialCf: "45"
+    initialCf: "0.45"
   }
 ];
 

hardhat.config.ts

@@ -54,6 +54,10 @@ const config: HardhatUserConfig = {
     optimism: {
       url: "https://mainnet.optimism.io",
       accounts: [process.env.DEPLOYER!]
+    },
+    bob: {
+      url: "https://rpc.gobob.xyz",
+      accounts: [process.env.DEPLOYER!]
     }
   }
 };

package.json

@@ -35,5 +35,8 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.5.3",
     "viem": "^2.17.3"
+  },
+  "overrides": {
+    "typescript": "^5.5.3"
   }
 }

tasks/admin/revenue.ts

@@ -201,14 +201,11 @@ task("revenue:flywheels:calculate", "Calculate the fees accrued from 4626 Perfor
   }
 );
 
-task("revenue:all:calculate", "Calculate the fees accrued from 4626 Performance Fees").setAction(
-  async (taskArgs, hre) => {
-    const pluginFees = await hre.run("revenue:4626:calculate");
-    const adminFees = await hre.run("revenue:admin:calculate");
-    const flywheelFees = await hre.run("revenue:flywheels:calculate");
-    console.log(`Total Fees: ${formatEther(pluginFees + adminFees + flywheelFees)}`);
-  }
-);
+task("revenue:all:calculate", "Calculate the fees accrued from 4626 Performance Fees").setAction(async (_, hre) => {
+  const adminFees = await hre.run("revenue:admin:calculate");
+  const flywheelFees = await hre.run("revenue:flywheels:calculate");
+  console.log(`Total Fees: ${formatEther(adminFees + flywheelFees)}`);
+});
 
 task("revenue:admin:withdraw", "Calculate the fees accrued from admin fees")
   .addParam("signer", "The address of the current deployer", "deployer", types.string)

tasks/chain-setup/bob.ts

@@ -0,0 +1,16 @@
+import { task } from "hardhat/config";
+import { assets as bobAssets } from "../../chains/bob/assets";
+
+task("market:set-cf:bob:main", "Sets caps on a market").setAction(async (_, { viem, run }) => {
+  const COMPTROLLER = "0x9cFEe81970AA10CC593B83fB96eAA9880a6DF715";
+  for (const asset of bobAssets) {
+    const pool = await viem.getContractAt("IonicComptroller", COMPTROLLER);
+    const cToken = await pool.read.cTokensByUnderlying([asset.underlying]);
+    console.log("cToken: ", cToken, asset.symbol);
+
+    await run("market:set:ltv", {
+      marketAddress: cToken,
+      ltv: asset.initialCf
+    });
+  }
+});

tasks/chain-setup/index.ts

@@ -0,0 +1 @@
+import "./bob";

tasks/index.ts

@@ -6,3 +6,4 @@ import "./leverage/configurePair";
 import "./plugin";
 import "./pool";
 import "./market";
+import "./chain-setup";

tasks/market/admin.ts

@@ -17,9 +17,9 @@ task("market:set:ltv", "Set the LTV (loan to value / collateral factor) of a mar
   .addParam("ltv", "The LTV as a floating point value between 0 and 1", undefined, types.string)
   .setAction(async ({ marketAddress, ltv }, { viem }) => {
     const publicClient = await viem.getPublicClient();
-    const market = await viem.getContractAt("CTokenInterfaces.sol:ICErc20", marketAddress);
+    const market = await viem.getContractAt("ICErc20", marketAddress);
     const poolAddress = await market.read.comptroller();
-    const pool = await viem.getContractAt("Comptroller.sol:Comptroller", poolAddress as Address);
+    const pool = await viem.getContractAt("IonicComptroller", poolAddress as Address);
 
     const ltvMantissa = parseUnits(ltv, 18);
     console.log(`will set the LTV of market ${marketAddress} to ${ltvMantissa}`);