tested liquidator upgrade

Author: jourdanDunkley

contracts/IonicUniV3Liquidator.sol

@@ -17,6 +17,7 @@ import { IUniswapV3Quoter } from "./external/uniswap/quoter/interfaces/IUniswapV
 import { ICErc20 } from "./compound/CTokenInterfaces.sol";
 
 import "./PoolLens.sol";
+import "@pythnetwork/express-relay-sdk-solidity/IExpressRelay.sol";
 
 /**
  * @title IonicUniV3Liquidator
@@ -129,7 +130,7 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
 
   function safeLiquidateToTokensWithFlashLoan(
     LiquidateToTokensWithFlashSwapVars calldata vars
-  ) external onlyPERPermissioned(borrower, cTokenCollateral) returns (uint256) {
+  ) external onlyPERPermissioned(vars.borrower, vars.cTokenCollateral) returns (uint256) {
     // Input validation
     require(vars.repayAmount > 0, "Repay amount must be greater than 0.");
 

contracts/test/liquidators/IonicLiquidatorTest.sol

@@ -5,6 +5,7 @@ import { IERC20Upgradeable } from "openzeppelin-contracts-upgradeable/contracts/
 import "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
 
 import { IonicLiquidator, ILiquidator } from "../../IonicLiquidator.sol";
+import { IonicUniV3Liquidator } from "../../IonicUniV3Liquidator.sol";
 import { ICurvePool } from "../../external/curve/ICurvePool.sol";
 import { CurveSwapLiquidatorFunder } from "../../liquidators/CurveSwapLiquidatorFunder.sol";
 import { UniswapV3LiquidatorFunder } from "../../liquidators/UniswapV3LiquidatorFunder.sol";
@@ -23,13 +24,12 @@ import { BasePriceOracle } from "../../oracles/BasePriceOracle.sol";
 
 import { BaseTest } from "../config/BaseTest.t.sol";
 import { UpgradesBaseTest } from "../UpgradesBaseTest.sol";
+import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+import { PoolLens } from "../../PoolLens.sol";
 
 contract MockRedemptionStrategy is IRedemptionStrategy {
-  function redeem(
-    IERC20Upgradeable,
-    uint256,
-    bytes memory
-  ) external returns (IERC20Upgradeable, uint256) {
+  function redeem(IERC20Upgradeable, uint256, bytes memory) external returns (IERC20Upgradeable, uint256) {
     return (IERC20Upgradeable(address(0)), 1);
   }
 
@@ -151,12 +151,56 @@ contract IonicLiquidatorTest is UpgradesBaseTest {
 
     vars.redemptionStrategies[0] = IFundsConversionStrategy(0x5cA3fd2c285C4138185Ef1BdA7573D415020F3C8);
     vars.strategyData[
-        0
-      ] = hex"0000000000000000000000004200000000000000000000000000000000000006000000000000000000000000ac48fcf1049668b285f3dc72483df5ae2162f7e8";
+      0
+    ] = hex"0000000000000000000000004200000000000000000000000000000000000006000000000000000000000000ac48fcf1049668b285f3dc72483df5ae2162f7e8";
 
     liquidator.safeLiquidateToTokensWithFlashLoan(vars);
   }
 
+  function testLiquidateAfterUpgradeLiquidator() public debuggingOnly forkAtBlock(MODE_MAINNET, 9382006) {
+    // upgrade IonicLiquidator
+    TransparentUpgradeableProxy proxyV3 = TransparentUpgradeableProxy(payable(ap.getAddress("IonicUniV3Liquidator")));
+    IonicUniV3Liquidator implV3 = new IonicUniV3Liquidator();
+    IonicUniV3Liquidator liquidatorV3 = IonicUniV3Liquidator(payable(ap.getAddress("IonicUniV3Liquidator")));
+    PoolLens lens = PoolLens(0x70BB19a56BfAEc65aE861E6275A90163AbDF36a6);
+
+    ProxyAdmin proxyAdmin = ProxyAdmin(ap.getAddress("DefaultProxyAdmin"));
+
+    vm.startPrank(proxyAdmin.owner());
+    proxyAdmin.upgrade(proxyV3, address(implV3));
+    vm.stopPrank();
+
+    vm.startPrank(0x1155b614971f16758C92c4890eD338C9e3ede6b7);
+    liquidatorV3.setPoolLens(lens);
+    liquidatorV3.setHealthFactorThreshold(1e18);
+    vm.stopPrank();
+
+    IonicComptroller pool = IonicComptroller(0xFB3323E24743Caf4ADD0fDCCFB268565c0685556);
+    (, , uint256 liquidity, uint256 shortfall) = pool.getAccountLiquidity(0x92eA6902C5023CC632e3Fd84dE7CcA6b98FE853d);
+    emit log_named_uint("liquidity", liquidity);
+    emit log_named_uint("shortfall", shortfall);
+
+    uint256 healthFactor = lens.getHealthFactor(0x92eA6902C5023CC632e3Fd84dE7CcA6b98FE853d, pool);
+    emit log_named_uint("hf before", healthFactor);
+
+    ILiquidator.LiquidateToTokensWithFlashSwapVars memory vars = ILiquidator.LiquidateToTokensWithFlashSwapVars({
+      borrower: 0x92eA6902C5023CC632e3Fd84dE7CcA6b98FE853d,
+      repayAmount: 1134537086250983,
+      cErc20: ICErc20(0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2),
+      cTokenCollateral: ICErc20(0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2),
+      flashSwapContract: 0x468cC91dF6F669CaE6cdCE766995Bd7874052FBc,
+      minProfitAmount: 0,
+      redemptionStrategies: new IRedemptionStrategy[](0),
+      strategyData: new bytes[](0),
+      debtFundingStrategies: new IFundsConversionStrategy[](0),
+      debtFundingStrategiesData: new bytes[](0)
+    });
+    liquidatorV3.safeLiquidateToTokensWithFlashLoan(vars);
+
+    uint256 healthFactorAfter = lens.getHealthFactor(0x92eA6902C5023CC632e3Fd84dE7CcA6b98FE853d, pool);
+    emit log_named_uint("hf after", healthFactorAfter);
+  }
+
   // TODO test with marginal shortfall for liquidation penalty errors
   function _testLiquidatorLiquidate(address contractForFlashSwap) internal {
     IonicComptroller pool = IonicComptroller(poolAddress);