Merge pull request #75 from ionicprotocol/feat/liquidate-borrow-permissioning

modifier for blocking unwanted liquidations on ctoken

Author: rhlsthrm

chainDeploy/helpers/logging.ts

@@ -1,33 +1,94 @@
+import { encodeFunctionData } from "viem"; // Adjust the import path according to your project structure
 import { promises as fs } from "fs";
 
+interface PrepareAndLogTransactionParams {
+  contractInstance: any; // Replace `any` with the correct contract type if available
+  functionName: string;
+  args: any[];
+  description: string;
+  inputs: {
+    internalType: string;
+    name: string;
+    type: string;
+  }[];
+}
+
 export const logTransaction = (description: string, data: string) => {
   console.log(`Transaction: ${description}`);
   console.log(`Data: ${data}`);
 };
 
 const transactions: any[] = [];
 
-export const addTransaction = (tx: any) => {
+export const addTransaction = async (tx: any) => {
   transactions.push(tx);
+  await writeSingleTransactionToFile(tx);
+};
+
+const writeSingleTransactionToFile = async (tx: any) => {
+  const filePath = "./transactions.json";
+  try {
+    let batch;
+    try {
+      const fileContent = await fs.readFile(filePath, "utf8");
+      batch = JSON.parse(fileContent);
+    } catch (error) {
+      if (error.code === "ENOENT" || error.message === "Unexpected end of JSON input") {
+        batch = {
+          version: "1.0",
+          chainId: "34443",
+          createdAt: Math.floor(Date.now() / 1000),
+          meta: {
+            name: "Transactions Batch",
+            description: "",
+            txBuilderVersion: "1.16.5",
+            createdFromSafeAddress: "0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2",
+            createdFromOwnerAddress: "",
+            checksum: "0x"
+          },
+          transactions: []
+        };
+      } else {
+        throw error;
+      }
+    }
+
+    batch.transactions.push(tx);
+
+    await fs.writeFile(filePath, JSON.stringify(batch, null, 2));
+    console.log(`Transaction added and written to ${filePath}`);
+  } catch (error) {
+    console.error(`Failed to write transaction to ${filePath}`, error);
+  }
 };
 
-export const writeTransactionsToFile = async () => {
-  const batch = {
-    version: "1.0",
-    chainId: "34443",
-    createdAt: Math.floor(Date.now() / 1000),
-    meta: {
-      name: "Transactions Batch",
-      description: "",
-      txBuilderVersion: "1.16.5",
-      createdFromSafeAddress: "0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2",
-      createdFromOwnerAddress: "",
-      checksum: "0x"
+export const prepareAndLogTransaction = async ({
+  contractInstance,
+  functionName,
+  args,
+  description,
+  inputs
+}: PrepareAndLogTransactionParams) => {
+  const data = encodeFunctionData({
+    abi: contractInstance.abi,
+    functionName,
+    args
+  });
+
+  await addTransaction({
+    to: contractInstance.address,
+    value: "0",
+    data,
+    contractMethod: {
+      inputs,
+      name: functionName,
+      payable: false
     },
-    transactions
-  };
+    contractInputsValues: args.reduce((acc: any, arg: any, index: number) => {
+      acc[inputs[index].name] = arg;
+      return acc;
+    }, {})
+  });
 
-  const filePath = "./transactions.json";
-  await fs.writeFile(filePath, JSON.stringify(batch, null, 2));
-  console.log(`Transactions written to ${filePath}`);
+  logTransaction(description, data);
 };

contracts/compound/CToken.sol

@@ -10,6 +10,8 @@ import { InterestRateModel } from "./InterestRateModel.sol";
 import { ComptrollerV3Storage } from "./ComptrollerStorage.sol";
 import { IFeeDistributor } from "./IFeeDistributor.sol";
 import { DiamondExtension, LibDiamond } from "../ionic/DiamondExtension.sol";
+import { PoolLens } from "../PoolLens.sol";
+import { IonicUniV3Liquidator } from "../IonicUniV3Liquidator.sol";
 
 /**
  * @title Compound's CErc20 Contract
@@ -26,6 +28,18 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
     _;
   }
 
+  modifier isMinHFThresholdExceeded(address borrower) {
+    PoolLens lens = PoolLens(ap.getAddress("PoolLens"));
+    IonicUniV3Liquidator liquidator = IonicUniV3Liquidator(payable(ap.getAddress("IonicUniV3Liquidator")));
+
+    if (lens.getHealthFactor(borrower, comptroller) > liquidator.healthFactorThreshold()) {
+      require(msg.sender == address(liquidator), "Health factor not low enough for non-permissioned liquidations");
+      _;
+    } else {
+      _;
+    }
+  }
+
   function _getExtensionFunctions() public pure virtual override returns (bytes4[] memory) {
     uint8 fnsCount = 13;
     bytes4[] memory functionSelectors = new bytes4[](fnsCount);
@@ -122,7 +136,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
     address borrower,
     uint256 repayAmount,
     address cTokenCollateral
-  ) external override isAuthorized returns (uint256) {
+  ) external override isAuthorized isMinHFThresholdExceeded(borrower) returns (uint256) {
     (uint256 err, ) = liquidateBorrowInternal(borrower, repayAmount, cTokenCollateral);
     return err;
   }

contracts/compound/CTokenFirstExtension.sol

@@ -13,6 +13,8 @@ import { Multicall } from "../utils/Multicall.sol";
 
 import { IERC20, SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
+import { AddressesProvider } from "../ionic/AddressesProvider.sol";
+
 contract CTokenFirstExtension is
   CErc20FirstExtensionBase,
   TokenErrorReporter,
@@ -29,7 +31,7 @@ contract CTokenFirstExtension is
   }
 
   function _getExtensionFunctions() external pure virtual override returns (bytes4[] memory) {
-    uint8 fnsCount = 24;
+    uint8 fnsCount = 25;
     bytes4[] memory functionSelectors = new bytes4[](fnsCount);
     functionSelectors[--fnsCount] = this.transfer.selector;
     functionSelectors[--fnsCount] = this.transferFrom.selector;
@@ -39,6 +41,7 @@ contract CTokenFirstExtension is
     functionSelectors[--fnsCount] = this._setAdminFee.selector;
     functionSelectors[--fnsCount] = this._setInterestRateModel.selector;
     functionSelectors[--fnsCount] = this._setNameAndSymbol.selector;
+    functionSelectors[--fnsCount] = this._setAddressesProvider.selector;
     functionSelectors[--fnsCount] = this._setReserveFactor.selector;
     functionSelectors[--fnsCount] = this.supplyRatePerBlock.selector;
     functionSelectors[--fnsCount] = this.borrowRatePerBlock.selector;
@@ -219,6 +222,13 @@ contract CTokenFirstExtension is
     symbol = _symbol;
   }
 
+  function _setAddressesProvider(address _ap) external {
+    // Check caller is admin
+    require(hasAdminRights(), "!admin");
+
+    ap = AddressesProvider(_ap);
+  }
+
   /**
    * @notice accrues interest and sets a new reserve factor for the protocol using _setReserveFactorFresh
    * @dev Admin function to accrue interest and set a new reserve factor

contracts/compound/CTokenInterfaces.sol

@@ -4,6 +4,7 @@ pragma solidity >=0.8.0;
 import { IonicComptroller } from "./ComptrollerInterface.sol";
 import { InterestRateModel } from "./InterestRateModel.sol";
 import { ComptrollerV3Storage } from "./ComptrollerStorage.sol";
+import { AddressesProvider } from "../ionic/AddressesProvider.sol";
 
 abstract contract CTokenAdminStorage {
   /*
@@ -147,6 +148,11 @@ abstract contract CErc20Storage is CTokenAdminStorage {
    * @notice Underlying asset for this CToken
    */
   address public underlying;
+
+  /**
+   * @notice Addresses Provider
+   */
+  AddressesProvider public ap;
 }
 
 abstract contract CTokenBaseEvents {