Merge pull request #61 from ionicprotocol/feat/lens-hypothetical-repay

created lens function for getting hypothetical health factor

contracts/PoolLens.sol

@@ -584,7 +584,24 @@ contract PoolLens is Initializable {
   }
 
   function getHealthFactor(address user, IonicComptroller pool) external view returns (uint256) {
-    (uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getAccountLiquidity(user);
+    return getHealthFactorHypothetical(pool, user, address(0), 0, 0, 0);
+  }
+
+  function getHealthFactorHypothetical(
+    IonicComptroller pool,
+    address account,
+    address cTokenModify,
+    uint256 redeemTokens,
+    uint256 borrowAmount,
+    uint256 repayAmount
+  ) public view returns (uint256) {
+    (uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getHypotheticalAccountLiquidity(
+      account,
+      cTokenModify,
+      redeemTokens,
+      borrowAmount,
+      repayAmount
+    );
 
     if (err != 0) revert ComptrollerError(err);
 

contracts/compound/Comptroller.sol

@@ -307,6 +307,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       redeemer,
       ICErc20(cToken),
       redeemTokens,
+      0,
       0
     );
     if (err != Error.NO_ERROR) {
@@ -371,6 +372,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       account,
       isBorrow ? cTokenModify : ICErc20(address(0)),
       0,
+      0,
       0
     );
     require(err == Error.NO_ERROR, "!liquidity");
@@ -482,7 +484,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     flywheelPreBorrowerAction(cToken, borrower);
 
     // Perform a hypothetical liquidity check to guard against shortfall
-    (uint256 err, , , uint256 shortfall) = this.getHypotheticalAccountLiquidity(borrower, cToken, 0, borrowAmount);
+    (uint256 err, , , uint256 shortfall) = this.getHypotheticalAccountLiquidity(borrower, cToken, 0, borrowAmount, 0);
     if (err != uint256(Error.NO_ERROR)) {
       return err;
     }
@@ -573,7 +575,13 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       require(borrowBalance >= repayAmount, "!borrow>repay");
     } else {
       /* The borrower must have shortfall in order to be liquidateable */
-      (Error err, , , uint256 shortfall) = getHypotheticalAccountLiquidityInternal(borrower, ICErc20(address(0)), 0, 0);
+      (Error err, , , uint256 shortfall) = getHypotheticalAccountLiquidityInternal(
+        borrower,
+        ICErc20(address(0)),
+        0,
+        0,
+        0
+      );
       if (err != Error.NO_ERROR) {
         return uint256(err);
       }
@@ -714,6 +722,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     Exp tokensToDenom;
     uint256 borrowCapForCollateral;
     uint256 borrowedAssetPrice;
+    uint256 assetAsCollateralValueCap;
   }
 
   function getAccountLiquidity(address account)
@@ -732,7 +741,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       uint256 collateralValue,
       uint256 liquidity,
       uint256 shortfall
-    ) = getHypotheticalAccountLiquidityInternal(account, ICErc20(address(0)), 0, 0);
+    ) = getHypotheticalAccountLiquidityInternal(account, ICErc20(address(0)), 0, 0, 0);
     return (uint256(err), collateralValue, liquidity, shortfall);
   }
 
@@ -750,7 +759,8 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     address account,
     address cTokenModify,
     uint256 redeemTokens,
-    uint256 borrowAmount
+    uint256 borrowAmount,
+    uint256 repayAmount
   )
     public
     view
@@ -766,7 +776,13 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       uint256 collateralValue,
       uint256 liquidity,
       uint256 shortfall
-    ) = getHypotheticalAccountLiquidityInternal(account, ICErc20(cTokenModify), redeemTokens, borrowAmount);
+    ) = getHypotheticalAccountLiquidityInternal(
+        account,
+        ICErc20(cTokenModify),
+        redeemTokens,
+        borrowAmount,
+        repayAmount
+      );
     return (uint256(err), collateralValue, liquidity, shortfall);
   }
 
@@ -785,7 +801,8 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     address account,
     ICErc20 cTokenModify,
     uint256 redeemTokens,
-    uint256 borrowAmount
+    uint256 borrowAmount,
+    uint256 repayAmount
   )
     internal
     view
@@ -833,7 +850,7 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
       }
       {
         // Exclude the asset-to-be-borrowed from the liquidity, except for when redeeming
-        uint256 assetAsCollateralValueCap = asComptrollerExtension().getAssetAsCollateralValueCap(
+        vars.assetAsCollateralValueCap = asComptrollerExtension().getAssetAsCollateralValueCap(
           vars.asset,
           cTokenModify,
           redeemTokens > 0,
@@ -842,7 +859,8 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
 
         // accumulate the collateral value to sumCollateral
         uint256 assetCollateralValue = mul_ScalarTruncate(vars.tokensToDenom, vars.cTokenBalance);
-        if (assetCollateralValue > assetAsCollateralValueCap) assetCollateralValue = assetAsCollateralValueCap;
+        if (assetCollateralValue > vars.assetAsCollateralValueCap)
+          assetCollateralValue = vars.assetAsCollateralValueCap;
         vars.sumCollateral += assetCollateralValue;
       }
 
@@ -870,6 +888,13 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
           borrowAmount,
           vars.sumBorrowPlusEffects
         );
+
+        uint256 repayEffect = mul_ScalarTruncate(vars.oraclePrice, repayAmount);
+        if (repayEffect >= vars.sumBorrowPlusEffects) {
+          vars.sumBorrowPlusEffects = 0;
+        } else {
+          vars.sumBorrowPlusEffects -= repayEffect;
+        }
       }
     }
 

contracts/compound/ComptrollerInterface.sol

@@ -39,7 +39,8 @@ interface ComptrollerInterface {
     address account,
     address cTokenModify,
     uint256 redeemTokens,
-    uint256 borrowAmount
+    uint256 borrowAmount,
+    uint256 repayAmount
   )
     external
     view

contracts/external/compound/IComptroller.sol

@@ -35,7 +35,8 @@ interface IComptroller {
     address account,
     address cTokenModify,
     uint256 redeemTokens,
-    uint256 borrowAmount
+    uint256 borrowAmount,
+    uint256 repayAmount
   )
     external
     view

contracts/test/LeveredPositionTest.t.sol

@@ -86,13 +86,16 @@ contract LeveredPositionLensTest is BaseTest {
   }
 
   function testPrintLeveredPositions() public debuggingOnly fork(POLYGON_MAINNET) {
-    address[] memory markets = factory.getWhitelistedCollateralMarkets();
+    address[] memory accounts = factory.getAccountsWithOpenPositions();
 
-    emit log_named_array("markets", markets);
+    emit log_named_array("accounts", accounts);
 
-    for (uint256 j = 0; j < markets.length; j++) {
-      address[] memory borrowable = factory.getBorrowableMarketsByCollateral(ICErc20(markets[j]));
-      emit log_named_array("borrowable", borrowable);
+    for (uint256 j = 0; j < accounts.length; j++) {
+      address[] memory positions;
+      bool[] memory closed;
+      (positions, closed) = factory.getPositionsByAccount(accounts[j]);
+      emit log_named_array("positions", positions);
+      //emit log_named_array("closed", closed);
     }
   }
 }

contracts/test/MaxBorrowTest.t.sol

@@ -162,7 +162,8 @@ contract MaxBorrowTest is WithPool {
         someBorrower,
         address(marketToBorrow),
         0,
-        borrowAmount
+        borrowAmount,
+        0
       );
       emit log("errBefore");
       emit log_uint(errBefore);
@@ -182,7 +183,8 @@ contract MaxBorrowTest is WithPool {
       someBorrower,
       address(marketToBorrow),
       0,
-      borrowAmount
+      borrowAmount,
+      0
     );
     emit log("errAfter");
     emit log_uint(errAfter);

contracts/test/PoolCapsAndBlacklistsTest.t.sol

@@ -93,6 +93,7 @@ contract PoolCapsAndBlacklistsTest is MarketsTest {
       borrower,
       address(ankrBNBMkt),
       0,
+      0,
       0
     );
     assertEq(shortFallBefore, 0, "should have no shortfall before");
@@ -105,6 +106,7 @@ contract PoolCapsAndBlacklistsTest is MarketsTest {
       borrower,
       address(ankrBNBMkt),
       0,
+      0,
       0
     );
     assertGt(liquidityBefore - liquidityAfterBlacklist, 0, "should have lower liquidity after bl");
@@ -121,6 +123,7 @@ contract PoolCapsAndBlacklistsTest is MarketsTest {
       borrower,
       address(ankrBNBMkt),
       0,
+      0,
       0
     );
     assertEq(shortFallWhitelist, shortFallBefore, "should have the same sf after wl");