Merge pull request #152 from ionicprotocol/feat/task-sfs-register

Register in SFS task
ionicprotocol · Feb 1, 2024 · 980f91e · 980f91e
2 parents 3e28173 + 01498e4
commit 980f91e
Show file tree

Hide file tree

Showing 9 changed files with 274 additions and 115 deletions.
diff --git a/packages/chains/deployments/mode.json b/packages/chains/deployments/mode.json
@@ -33,13 +33,13 @@
       "address": "0x6352b5231de62be60c7ADB8250b08CA9CCF7a9A5"
     },
     "CTokenFirstExtension": {
-      "address": "0x8C58ECb9C0050824177f4e1Cd71C335421d4aeA2"
+      "address": "0x36a84B42fa436DBcB3854e2E46ba26546C651530"
     },
     "Comptroller": {
       "address": "0x8b2B6a9dC8Cd73309Cef8d64920831d4C73F43a7"
     },
     "ComptrollerFirstExtension": {
-      "address": "0xE1A3006be645a80F206311d9f18C866c204bA02f"
+      "address": "0xCa41Aa7472C8f85C84a8Cb03deaF064ab6498Dd7"
     },
     "DefaultProxyAdmin": {
       "address": "0x985a323A1CccA8Cd5fb8935590EE33FbcFE849d0"
@@ -66,7 +66,7 @@
       "address": "0xa12c1E460c06B1745EFcbfC9A1f666a8749B0e3A"
     },
     "IonicUniV3Liquidator_Implementation": {
-      "address": "0xB48221b8a1137895e384aBcaFF8120d053Be43F5"
+      "address": "0x462fAa7042542C5CF28BC73D8F8C029267EF3E51"
     },
     "IonicUniV3Liquidator_Proxy": {
       "address": "0xa12c1E460c06B1745EFcbfC9A1f666a8749B0e3A"
@@ -96,7 +96,7 @@
       "address": "0xc71B968C6C23e2723Bae32957D815C9bE3ca1b34"
     },
     "LiquidatorsRegistryExtension": {
-      "address": "0xdd7F712Af76074993F05C0d544331792997Bd39b"
+      "address": "0xB08FAfc6E8280ce351CF22d2Db8ABd241E8A5E47"
     },
     "LiquidatorsRegistrySecondExtension": {
       "address": "0x45A4a3eBb986083597Ac3B34ee2d7dcC3Be8c5C1"

diff --git a/packages/sdk/deployments/mode/CTokenFirstExtension.json b/packages/sdk/deployments/mode/CTokenFirstExtension.json
diff --git a/packages/sdk/deployments/mode/ComptrollerFirstExtension.json b/packages/sdk/deployments/mode/ComptrollerFirstExtension.json
diff --git a/packages/sdk/deployments/mode/IonicUniV3Liquidator.json b/packages/sdk/deployments/mode/IonicUniV3Liquidator.json
diff --git a/packages/sdk/deployments/mode/IonicUniV3Liquidator_Implementation.json b/packages/sdk/deployments/mode/IonicUniV3Liquidator_Implementation.json
diff --git a/packages/sdk/deployments/mode/LiquidatorsRegistryExtension.json b/packages/sdk/deployments/mode/LiquidatorsRegistryExtension.json
diff --git a/packages/sdk/lib/contracts b/packages/sdk/lib/contracts
diff --git a/packages/sdk/tasks/market/upgrade-all.ts b/packages/sdk/tasks/market/upgrade-all.ts
@@ -16,7 +16,7 @@ task("market:set-latest", "Updates the markets' implementations whitelist").setA
   const cfe = (await ethers.getContract("CTokenFirstExtension")) as CTokenFirstExtension;
   {
     const exts = await fuseFeeDistributor.callStatic.getCErc20DelegateExtensions(erc20Delegate.address);
-    if (!exts.length) {
+    if (exts.length == 0 || exts[0] != cfe.address) {
       console.log(`setting the extension for delegate ${erc20Delegate.address}`);
       tx = await fuseFeeDistributor._setCErc20DelegateExtensions(erc20Delegate.address, [
         erc20Delegate.address,
@@ -32,7 +32,7 @@ task("market:set-latest", "Updates the markets' implementations whitelist").setA
 
   {
     const exts = await fuseFeeDistributor.callStatic.getCErc20DelegateExtensions(erc20PluginDelegate.address);
-    if (!exts.length) {
+    if (exts.length == 0 || exts[0] != cfe.address) {
       console.log(`setting the extension for plugin delegate ${erc20PluginDelegate.address}`);
       tx = await fuseFeeDistributor._setCErc20DelegateExtensions(erc20PluginDelegate.address, [
         erc20PluginDelegate.address,
@@ -48,7 +48,7 @@ task("market:set-latest", "Updates the markets' implementations whitelist").setA
 
   {
     const exts = await fuseFeeDistributor.callStatic.getCErc20DelegateExtensions(erc20PluginRewardsDelegate.address);
-    if (!exts.length) {
+    if (exts.length == 0 || exts[0] != cfe.address) {
       console.log(`setting the extension for plugin rewards delegate ${erc20PluginRewardsDelegate.address}`);
       tx = await fuseFeeDistributor._setCErc20DelegateExtensions(erc20PluginRewardsDelegate.address, [
         erc20PluginRewardsDelegate.address,

diff --git a/packages/sdk/tasks/one-time/mode-test-txs.ts b/packages/sdk/tasks/one-time/mode-test-txs.ts
@@ -1,5 +1,6 @@
 import { task } from "hardhat/config";
 
+import { ComptrollerFirstExtension } from "../../typechain";
 import { IonicComptroller } from "../../typechain/ComptrollerInterface.sol/IonicComptroller";
 import { ICErc20 } from "../../typechain/CTokenInterfaces.sol/ICErc20";
 import { ERC20 } from "../../typechain/ERC20";
@@ -99,3 +100,34 @@ task("test:txs").setAction(async ({}, { ethers, getNamedAccounts }) => {
     console.log(`mined ${tx.hash}`);
   }
 });
+
+task("mode:sfs:register").setAction(async ({}, { ethers, getNamedAccounts }) => {
+  let tx;
+  const { deployer } = await getNamedAccounts();
+  const modePoolAddr = "0xFB3323E24743Caf4ADD0fDCCFB268565c0685556";
+
+  const comptrollerAsExtension = (await ethers.getContractAt(
+    "ComptrollerFirstExtension",
+    modePoolAddr,
+    deployer
+  )) as ComptrollerFirstExtension;
+
+  tx = await comptrollerAsExtension.registerInSFS();
+  console.log(`registering the pool in SFS with tx ${tx.hash}`);
+  await tx.wait();
+  console.log(`registered the pool in SFS`);
+
+  const markets = await comptrollerAsExtension.callStatic.getAllMarkets();
+  for (let j = 0; j < markets.length; j++) {
+    const market = markets[j];
+    console.log(`market ${market}`);
+    const cTokenInstance = (await ethers.getContractAt("CTokenInterfaces.sol:ICErc20", market)) as ICErc20;
+
+    tx = await cTokenInstance.registerInSFS();
+    console.log(`registering the market ${market} in SFS with tx ${tx.hash}`);
+    await tx.wait();
+    console.log(`registered the market ${market} in SFS`);
+  }
+
+  console.log(`Done`);
+});
+10 −5		contracts/IonicUniV3Liquidator.sol
+10 −1		contracts/compound/CTokenFirstExtension.sol
+2 −0		contracts/compound/CTokenInterfaces.sol
+9 −2		contracts/compound/ComptrollerFirstExtension.sol
+6 −0		contracts/compound/ComptrollerInterface.sol
+1 −0		contracts/liquidators/registry/LiquidatorsRegistryExtension.sol
+88 −39		contracts/test/DevTesting.t.sol
+52 −28		contracts/test/liquidators/UniswapV3LiquidatorTest.t.sol