Merge pull request #41 from ionicprotocol/test/kim-flash-swap-liquidations

vminkov · web-flow · commit 1b5701fe11b0 · 2024-02-28T09:49:40.000+02:00
Kim flash swap liquidations
diff --git a/contracts/IonicLiquidator.sol b/contracts/IonicLiquidator.sol
@@ -70,7 +70,7 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
     uint8 _flashSwapFee
   ) external initializer {
     __Ownable_init();
-    require(_uniswapV2router != address(0), "UniswapV2Factory not defined.");
+    require(_uniswapV2router != address(0), "_uniswapV2router not defined.");
     W_NATIVE_ADDRESS = _wtoken;
     UNISWAP_V2_ROUTER_02 = IUniswapV2Router02(_uniswapV2router);
     flashSwapFee = _flashSwapFee;
@@ -188,7 +188,7 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
       msg.data
     );
 
-    return transferSeizedFunds(address(vars.cTokenCollateral), vars.minProfitAmount);
+    return transferSeizedFunds(_liquidatorProfitExchangeSource, vars.minProfitAmount);
   }
 
   /**
diff --git a/contracts/compound/CTokenFirstExtension.sol b/contracts/compound/CTokenFirstExtension.sol
@@ -346,7 +346,6 @@ contract CTokenFirstExtension is
   function borrowRatePerBlockAfterBorrow(uint256 borrowAmount) public view returns (uint256) {
     uint256 cash = asCToken().getCash();
     require(cash >= borrowAmount, "market cash not enough");
-    //if (cash < borrowAmount) revert ;
 
     return
       interestRateModel.getBorrowRate(
@@ -708,7 +707,7 @@ contract CTokenFirstExtension is
   }
 
   function registerInSFS() external returns (uint256) {
-    require(hasAdminRights(), "!admin");
+    require(hasAdminRights() || msg.sender == address(comptroller), "!admin");
     SFSRegister sfsContract = SFSRegister(0x8680CEaBcb9b56913c519c069Add6Bc3494B7020);
     return sfsContract.register(0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2);
   }
diff --git a/contracts/compound/ComptrollerFirstExtension.sol b/contracts/compound/ComptrollerFirstExtension.sol
@@ -508,6 +508,11 @@ contract ComptrollerFirstExtension is
   function registerInSFS() external returns (uint256) {
     require(hasAdminRights(), "!admin");
     SFSRegister sfsContract = SFSRegister(0x8680CEaBcb9b56913c519c069Add6Bc3494B7020);
+
+    for (uint256 i = 0; i < allMarkets.length; i++) {
+      allMarkets[i].registerInSFS();
+    }
+
     return sfsContract.register(0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2);
   }
 }
diff --git a/contracts/external/uniswap/IUniswapV2Router02.sol b/contracts/external/uniswap/IUniswapV2Router02.sol
@@ -34,6 +34,15 @@ interface IUniswapV2Router02 is IUniswapV2Router01 {
     uint256 deadline
   ) external;
 
+  function swapExactTokensForTokensSupportingFeeOnTransferTokens(
+    uint256 amountIn,
+    uint256 amountOutMin,
+    address[] calldata path,
+    address to,
+    address referrer,
+    uint256 deadline
+  ) external;
+
   function swapExactETHForTokensSupportingFeeOnTransferTokens(
     uint256 amountOutMin,
     address[] calldata path,
diff --git a/contracts/liquidators/BaseUniswapV2Liquidator.sol b/contracts/liquidators/BaseUniswapV2Liquidator.sol
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
+import "openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol";
+
+import "../external/uniswap/IUniswapV2Router02.sol";
+
+import "./IRedemptionStrategy.sol";
+
+abstract contract BaseUniswapV2Liquidator is IRedemptionStrategy {
+  using SafeERC20Upgradeable for IERC20Upgradeable;
+
+  /**
+   * @notice Redeems custom collateral `token` for an underlying token.
+   * @param inputToken The input wrapped token to be redeemed for an underlying token.
+   * @param inputAmount The amount of the input wrapped token to be redeemed for an underlying token.
+   * @param strategyData The ABI-encoded data to be used in the redemption strategy logic.
+   * @return outputToken The underlying ERC20 token outputted.
+   * @return outputAmount The quantity of underlying tokens outputted.
+   */
+  function redeem(
+    IERC20Upgradeable inputToken,
+    uint256 inputAmount,
+    bytes memory strategyData
+  ) external override returns (IERC20Upgradeable outputToken, uint256 outputAmount) {
+    return _convert(inputToken, inputAmount, strategyData);
+  }
+
+  function _convert(
+    IERC20Upgradeable inputToken,
+    uint256 inputAmount,
+    bytes memory strategyData
+  ) internal returns (IERC20Upgradeable outputToken, uint256 outputAmount) {
+    // Get Uniswap router and path
+    (IUniswapV2Router02 uniswapV2Router, address[] memory swapPath) = abi.decode(
+      strategyData,
+      (IUniswapV2Router02, address[])
+    );
+    require(swapPath.length >= 2 && swapPath[0] == address(inputToken), "Invalid UniswapLiquidator swap path.");
+
+    // Swap underlying tokens
+    inputToken.approve(address(uniswapV2Router), inputAmount);
+
+    // call the relevant fn depending on the uni v2 fork specifics
+    _swap(uniswapV2Router, inputAmount, swapPath);
+
+    // Get new collateral
+    outputToken = IERC20Upgradeable(swapPath[swapPath.length - 1]);
+    outputAmount = outputToken.balanceOf(address(this));
+  }
+
+  function _swap(
+    IUniswapV2Router02 uniswapV2Router,
+    uint256 inputAmount,
+    address[] memory swapPath
+  ) internal virtual;
+}
diff --git a/contracts/liquidators/KimUniV2Liquidator.sol b/contracts/liquidators/KimUniV2Liquidator.sol
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "./BaseUniswapV2Liquidator.sol";
+
+contract KimUniV2Liquidator is BaseUniswapV2Liquidator {
+  function _swap(
+    IUniswapV2Router02 uniswapV2Router,
+    uint256 inputAmount,
+    address[] memory swapPath
+  ) internal override {
+    uniswapV2Router.swapExactTokensForTokensSupportingFeeOnTransferTokens(
+      inputAmount,
+      0,
+      swapPath,
+      address(this),
+      address(0), // referrer
+      block.timestamp
+    );
+  }
+
+  function name() public pure virtual returns (string memory) {
+    return "KimUniV2Liquidator";
+  }
+}
diff --git a/contracts/liquidators/UniswapV2Liquidator.sol b/contracts/liquidators/UniswapV2Liquidator.sol
@@ -1,56 +1,20 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.0;
 
-import "openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
-import "openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol";
-
-import "../external/uniswap/IUniswapV2Router02.sol";
-
-import "./IRedemptionStrategy.sol";
+import "./BaseUniswapV2Liquidator.sol";
 
 /**
  * @title UniswapV2Liquidator
  * @notice Exchanges seized token collateral for underlying tokens via a Uniswap V2 router for use as a step in a liquidation.
  * @author David Lucid <david@rari.capital> (https://github.com/davidlucid)
  */
-contract UniswapV2Liquidator is IRedemptionStrategy {
-  using SafeERC20Upgradeable for IERC20Upgradeable;
-
-  /**
-   * @notice Redeems custom collateral `token` for an underlying token.
-   * @param inputToken The input wrapped token to be redeemed for an underlying token.
-   * @param inputAmount The amount of the input wrapped token to be redeemed for an underlying token.
-   * @param strategyData The ABI-encoded data to be used in the redemption strategy logic.
-   * @return outputToken The underlying ERC20 token outputted.
-   * @return outputAmount The quantity of underlying tokens outputted.
-   */
-  function redeem(
-    IERC20Upgradeable inputToken,
-    uint256 inputAmount,
-    bytes memory strategyData
-  ) external override returns (IERC20Upgradeable outputToken, uint256 outputAmount) {
-    return _convert(inputToken, inputAmount, strategyData);
-  }
-
-  function _convert(
-    IERC20Upgradeable inputToken,
+contract UniswapV2Liquidator is BaseUniswapV2Liquidator {
+  function _swap(
+    IUniswapV2Router02 uniswapV2Router,
     uint256 inputAmount,
-    bytes memory strategyData
-  ) internal returns (IERC20Upgradeable outputToken, uint256 outputAmount) {
-    // Get Uniswap router and path
-    (IUniswapV2Router02 uniswapV2Router, address[] memory swapPath) = abi.decode(
-      strategyData,
-      (IUniswapV2Router02, address[])
-    );
-    require(swapPath.length >= 2 && swapPath[0] == address(inputToken), "Invalid UniswapLiquidator swap path.");
-
-    // Swap underlying tokens
-    inputToken.approve(address(uniswapV2Router), inputAmount);
+    address[] memory swapPath
+  ) internal override {
     uniswapV2Router.swapExactTokensForTokens(inputAmount, 0, swapPath, address(this), block.timestamp);
-
-    // Get new collateral
-    outputToken = IERC20Upgradeable(swapPath[swapPath.length - 1]);
-    outputAmount = outputToken.balanceOf(address(this));
   }
 
   function name() public pure virtual returns (string memory) {
diff --git a/contracts/liquidators/registry/LiquidatorsRegistryExtension.sol b/contracts/liquidators/registry/LiquidatorsRegistryExtension.sol
@@ -253,7 +253,7 @@ contract LiquidatorsRegistryExtension is LiquidatorsRegistryStorage, DiamondExte
       strategyData = solidlySwapLiquidatorData(inputToken, outputToken);
     } else if (isStrategy(strategy, "SolidlyLpTokenLiquidator")) {
       strategyData = solidlyLpTokenLiquidatorData(inputToken, outputToken);
-    } else if (isStrategy(strategy, "UniswapV2LiquidatorFunder")) {
+    } else if (isStrategy(strategy, "UniswapV2LiquidatorFunder") || isStrategy(strategy, "KimUniV2Liquidator")) {
       strategyData = uniswapV2LiquidatorData(inputToken, outputToken);
     } else if (isStrategy(strategy, "UniswapV3LiquidatorFunder")) {
       strategyData = uniswapV3LiquidatorFunderData(inputToken, outputToken);
diff --git a/contracts/test/ComptrollerTest.t.sol b/contracts/test/ComptrollerTest.t.sol
@@ -61,6 +61,10 @@ contract ComptrollerTest is BaseTest {
     _testInflationProtection();
   }
 
+  function testModeInflationProtection() public debuggingOnly fork(MODE_MAINNET) {
+    _testInflationProtection();
+  }
+
   function _testInflationProtection() internal {
     PoolDirectory fpd = PoolDirectory(ap.getAddress("PoolDirectory"));
     PoolDirectory.Pool[] memory pools = fpd.getAllPools();
diff --git a/contracts/test/DevTesting.t.sol b/contracts/test/DevTesting.t.sol
@@ -136,10 +136,36 @@ contract DevTesting is BaseTest {
     }
   }
 
+  function testDisableCollateralUsdc() public debuggingOnly fork(MODE_MAINNET) {
+    address user = 0xF70CBE91fB1b1AfdeB3C45Fb8CDD2E1249b5b75E;
+    address usdcMarketAddr = 0x2BE717340023C9e14C1Bb12cb3ecBcfd3c3fB038;
+
+    vm.startPrank(user);
+
+    uint256 borrowed = ICErc20(usdcMarketAddr).borrowBalanceCurrent(user);
+
+    emit log_named_uint("borrowed", borrowed);
+
+    pool.exitMarket(usdcMarketAddr);
+  }
+
   function testAssetAsCollateralCap() public debuggingOnly fork(MODE_MAINNET) {
     pool.getAssetAsCollateralValueCap(wethMarket, usdcMarket, false, deployer);
   }
 
+  function testRegisterSFS() public debuggingOnly fork(MODE_MAINNET) {
+    emit log_named_address("pool admin", pool.admin());
+
+    vm.startPrank(0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2);
+    pool.registerInSFS();
+
+    ICErc20[] memory markets = pool.getAllMarkets();
+
+    for (uint8 i = 0; i < markets.length; i++) {
+      markets[i].registerInSFS();
+    }
+  }
+
   function testModeUsdcBorrow() public debuggingOnly fork(MODE_MAINNET) {
     vm.prank(deployer);
     require(usdcMarket.borrow(5e6) == 0, "can't borrow");
diff --git a/contracts/test/PoolLensTest.t.sol b/contracts/test/PoolLensTest.t.sol
@@ -5,13 +5,53 @@ import "./config/BaseTest.t.sol";
 
 import { PoolLens } from "../PoolLens.sol";
 import "../compound/ComptrollerInterface.sol";
+import { JumpRateModel } from "../compound/JumpRateModel.sol";
 
 contract PoolLensTest is BaseTest {
   function testPolygonFPL() public debuggingOnly fork(POLYGON_MAINNET) {
     PoolLens fpl = PoolLens(0xD7225110D8F419b0E8Ad0A536977965E62fB5769);
     fpl.getPoolAssetsWithData(IonicComptroller(0xB08A309eFBFFa41f36A06b2D0C9a4629749b17a2));
   }
 
+  function testModeFPL() public debuggingOnly fork(MODE_MAINNET) {
+    IonicComptroller pool = IonicComptroller(0xFB3323E24743Caf4ADD0fDCCFB268565c0685556);
+    //    PoolLens fpl = PoolLens(0x611a68618412c2e15A36e3e59C0b979746d87AB8);
+    //    PoolLens.PoolAsset[] memory datas = fpl.getPoolAssetsWithData(pool);
+    //
+    //    emit log_named_uint("ionicFee", datas[0].ionicFee);
+    //    emit log_named_uint("adminFee", datas[0].adminFee);
+
+    ICErc20[] memory markets = pool.getAllMarkets();
+
+    for (uint256 i = 0; i < markets.length; i++) {
+      uint256 totalUnderlyingSupplied = markets[i].getTotalUnderlyingSupplied();
+      uint256 totalBorrows = markets[i].totalBorrows();
+      uint256 totalReserves = markets[i].totalReserves();
+      uint256 cash = markets[i].getCash();
+
+      emit log("");
+      emit log(markets[i].symbol());
+      emit log_named_uint("totalUnderlyingSupplied", totalUnderlyingSupplied);
+      emit log_named_uint("totalBorrows", totalBorrows);
+      emit log_named_uint("totalReserves", totalReserves);
+      emit log_named_uint("cash", cash);
+      emit log_named_uint("reserves + fees", cash + totalBorrows - totalUnderlyingSupplied);
+
+      JumpRateModel irm = JumpRateModel(markets[i].interestRateModel());
+
+      emit log_named_uint("blocksPerYear", irm.blocksPerYear());
+
+      emit log_named_uint(
+        "borrow rate per year",
+        irm.blocksPerYear() * irm.getBorrowRate(cash, totalBorrows, totalReserves)
+      );
+      emit log_named_uint(
+        "supply rate per year",
+        irm.blocksPerYear() * irm.getSupplyRate(cash, totalBorrows, totalReserves, 0.1e18)
+      );
+    }
+  }
+
   function testWhitelistsFPL() public debuggingOnly fork(BSC_CHAPEL) {
     PoolLens fpl = PoolLens(0x604805B587C939042120D2e22398f299547A130c);
     fpl.getSupplyCapsDataForPool(IonicComptroller(0x307BEc9d1368A459E9168fa6296C1e69025ab30f));
diff --git a/contracts/test/liquidators/IonicLiquidatorTest.sol b/contracts/test/liquidators/IonicLiquidatorTest.sol
diff --git a/contracts/test/liquidators/UniswapV3LiquidatorTest.t.sol b/contracts/test/liquidators/UniswapV3LiquidatorTest.t.sol

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,6 @@ contract CTokenFirstExtension is`
`346`	`346`	`function borrowRatePerBlockAfterBorrow(uint256 borrowAmount) public view returns (uint256) {`
`347`	`347`	`uint256 cash = asCToken().getCash();`
`348`	`348`	`require(cash >= borrowAmount, "market cash not enough");`
`349`		`- //if (cash < borrowAmount) revert ;`
`350`	`349`
`351`	`350`	`return`
`352`	`351`	`interestRateModel.getBorrowRate(`
`@@ -708,7 +707,7 @@ contract CTokenFirstExtension is`
`708`	`707`	`}`
`709`	`708`
`710`	`709`	`function registerInSFS() external returns (uint256) {`
`711`		`- require(hasAdminRights(), "!admin");`
	`710`	`+ require(hasAdminRights() \|\| msg.sender == address(comptroller), "!admin");`
`712`	`711`	`SFSRegister sfsContract = SFSRegister(0x8680CEaBcb9b56913c519c069Add6Bc3494B7020);`
`713`	`712`	`return sfsContract.register(0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2);`
`714`	`713`	`}`
Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,11 @@ contract ComptrollerFirstExtension is`
`508`	`508`	`function registerInSFS() external returns (uint256) {`
`509`	`509`	`require(hasAdminRights(), "!admin");`
`510`	`510`	`SFSRegister sfsContract = SFSRegister(0x8680CEaBcb9b56913c519c069Add6Bc3494B7020);`
	`511`	`+`
	`512`	`+ for (uint256 i = 0; i < allMarkets.length; i++) {`
	`513`	`+ allMarkets[i].registerInSFS();`
	`514`	`+ }`
	`515`	`+`
`511`	`516`	`return sfsContract.register(0x8Fba84867Ba458E7c6E2c024D2DE3d0b5C3ea1C2);`
`512`	`517`	`}`
`513`	`518`	`}`