Merge branch 'feat/lens-hypothetical-repay' into feat/pyth-integration

Author: jourdanDunkley

contracts/IonicUniV3Liquidator.sol

@@ -156,6 +156,14 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
     uniswapV3FlashCallback(fee0, fee1, data);
   }
 
+  function algebraFlashCallback(
+    uint256 fee0,
+    uint256 fee1,
+    bytes calldata data
+  ) external {
+    uniswapV3FlashCallback(fee0, fee1, data);
+  }
+
   function uniswapV3FlashCallback(
     uint256 fee0,
     uint256 fee1,

contracts/PoolLens.sol

@@ -110,7 +110,12 @@ contract PoolLens is Initializable {
    */
   function getPublicPoolsWithData()
     external
-    returns (uint256[] memory, PoolDirectory.Pool[] memory, IonicPoolData[] memory, bool[] memory)
+    returns (
+      uint256[] memory,
+      PoolDirectory.Pool[] memory,
+      IonicPoolData[] memory,
+      bool[] memory
+    )
   {
     (uint256[] memory indexes, PoolDirectory.Pool[] memory publicPools) = directory.getPublicPools();
     (IonicPoolData[] memory data, bool[] memory errored) = getPoolsData(publicPools);
@@ -122,9 +127,15 @@ contract PoolLens is Initializable {
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    * Ideally, we can add the `view` modifier, but many cToken functions potentially modify the state.
    */
-  function getPublicPoolsByVerificationWithData(
-    bool whitelistedAdmin
-  ) external returns (uint256[] memory, PoolDirectory.Pool[] memory, IonicPoolData[] memory, bool[] memory) {
+  function getPublicPoolsByVerificationWithData(bool whitelistedAdmin)
+    external
+    returns (
+      uint256[] memory,
+      PoolDirectory.Pool[] memory,
+      IonicPoolData[] memory,
+      bool[] memory
+    )
+  {
     (uint256[] memory indexes, PoolDirectory.Pool[] memory publicPools) = directory.getPublicPoolsByVerification(
       whitelistedAdmin
     );
@@ -137,9 +148,15 @@ contract PoolLens is Initializable {
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    * Ideally, we can add the `view` modifier, but many cToken functions potentially modify the state.
    */
-  function getPoolsByAccountWithData(
-    address account
-  ) external returns (uint256[] memory, PoolDirectory.Pool[] memory, IonicPoolData[] memory, bool[] memory) {
+  function getPoolsByAccountWithData(address account)
+    external
+    returns (
+      uint256[] memory,
+      PoolDirectory.Pool[] memory,
+      IonicPoolData[] memory,
+      bool[] memory
+    )
+  {
     (uint256[] memory indexes, PoolDirectory.Pool[] memory accountPools) = directory.getPoolsByAccount(account);
     (IonicPoolData[] memory data, bool[] memory errored) = getPoolsData(accountPools);
     return (indexes, accountPools, data, errored);
@@ -150,9 +167,15 @@ contract PoolLens is Initializable {
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    * Ideally, we can add the `view` modifier, but many cToken functions potentially modify the state.
    */
-  function getPoolsOIonicrWithData(
-    address user
-  ) external returns (uint256[] memory, PoolDirectory.Pool[] memory, IonicPoolData[] memory, bool[] memory) {
+  function getPoolsOIonicrWithData(address user)
+    external
+    returns (
+      uint256[] memory,
+      PoolDirectory.Pool[] memory,
+      IonicPoolData[] memory,
+      bool[] memory
+    )
+  {
     (uint256[] memory indexes, PoolDirectory.Pool[] memory userPools) = directory.getPoolsOfUser(user);
     (IonicPoolData[] memory data, bool[] memory errored) = getPoolsData(userPools);
     return (indexes, userPools, data, errored);
@@ -187,9 +210,16 @@ contract PoolLens is Initializable {
   /**
    * @notice Returns total supply balance (in ETH), total borrow balance (in ETH), underlying token addresses, and underlying token symbols of a Ionic pool.
    */
-  function getPoolSummary(
-    IonicComptroller comptroller
-  ) external returns (uint256, uint256, address[] memory, string[] memory, bool) {
+  function getPoolSummary(IonicComptroller comptroller)
+    external
+    returns (
+      uint256,
+      uint256,
+      address[] memory,
+      string[] memory,
+      bool
+    )
+  {
     uint256 totalBorrow = 0;
     uint256 totalSupply = 0;
     ICErc20[] memory cTokens = comptroller.getAllMarkets();
@@ -329,10 +359,7 @@ contract PoolLens is Initializable {
     return (detailedAssets);
   }
 
-  function getBorrowCapsPerCollateral(
-    ICErc20 borrowedAsset,
-    IonicComptroller comptroller
-  )
+  function getBorrowCapsPerCollateral(ICErc20 borrowedAsset, IonicComptroller comptroller)
     internal
     view
     returns (
@@ -431,9 +458,15 @@ contract PoolLens is Initializable {
    * @notice returns the total supply cap for each asset in the pool and the total non-whitelist supplied assets
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    */
-  function getSupplyCapsDataForPool(
-    IonicComptroller comptroller
-  ) public view returns (address[] memory, uint256[] memory, uint256[] memory) {
+  function getSupplyCapsDataForPool(IonicComptroller comptroller)
+    public
+    view
+    returns (
+      address[] memory,
+      uint256[] memory,
+      uint256[] memory
+    )
+  {
     ICErc20[] memory poolMarkets = comptroller.getAllMarkets();
 
     address[] memory assets = new address[](poolMarkets.length);
@@ -455,9 +488,7 @@ contract PoolLens is Initializable {
    * @notice returns the total borrow cap and the per collateral borrowing cap/blacklist for the asset
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    */
-  function getBorrowCapsForAsset(
-    ICErc20 asset
-  )
+  function getBorrowCapsForAsset(ICErc20 asset)
     public
     view
     returns (
@@ -476,9 +507,7 @@ contract PoolLens is Initializable {
    * @notice returns the total borrow cap, the per collateral borrowing cap/blacklist for the asset and the total non-whitelist borrows
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    */
-  function getBorrowCapsDataForAsset(
-    ICErc20 asset
-  )
+  function getBorrowCapsDataForAsset(ICErc20 asset)
     public
     view
     returns (
@@ -503,9 +532,11 @@ contract PoolLens is Initializable {
    * Note that the whitelist does not have to be enforced.
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    */
-  function getWhitelistedPoolsByAccount(
-    address account
-  ) public view returns (uint256[] memory, PoolDirectory.Pool[] memory) {
+  function getWhitelistedPoolsByAccount(address account)
+    public
+    view
+    returns (uint256[] memory, PoolDirectory.Pool[] memory)
+  {
     (, PoolDirectory.Pool[] memory pools) = directory.getActivePools();
     uint256 arrayLength = 0;
 
@@ -538,27 +569,22 @@ contract PoolLens is Initializable {
    * @dev This function is not designed to be called in a transaction: it is too gas-intensive.
    * Ideally, we can add the `view` modifier, but many cToken functions potentially modify the state.
    */
-  function getWhitelistedPoolsByAccountWithData(
-    address account
-  ) external returns (uint256[] memory, PoolDirectory.Pool[] memory, IonicPoolData[] memory, bool[] memory) {
+  function getWhitelistedPoolsByAccountWithData(address account)
+    external
+    returns (
+      uint256[] memory,
+      PoolDirectory.Pool[] memory,
+      IonicPoolData[] memory,
+      bool[] memory
+    )
+  {
     (uint256[] memory indexes, PoolDirectory.Pool[] memory accountPools) = getWhitelistedPoolsByAccount(account);
     (IonicPoolData[] memory data, bool[] memory errored) = getPoolsData(accountPools);
     return (indexes, accountPools, data, errored);
   }
 
   function getHealthFactor(address user, IonicComptroller pool) external view returns (uint256) {
-    (uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getAccountLiquidity(user);
-
-    if (err != 0) revert ComptrollerError(err);
-
-    if (shortfall > 0) {
-      // HF < 1.0
-      return (collateralValue * 1e18) / (collateralValue + shortfall);
-    } else {
-      // HF >= 1.0
-      if (collateralValue <= liquidity) return type(uint256).max;
-      else return (collateralValue * 1e18) / (collateralValue - liquidity);
-    }
+    return getHealthFactorHypothetical(pool, user, address(0), 0, 0, 0);
   }
 
   function getHealthFactorHypothetical(
@@ -568,7 +594,7 @@ contract PoolLens is Initializable {
     uint256 redeemTokens,
     uint256 borrowAmount,
     uint256 repayAmount
-  ) external view returns (uint256) {
+  ) public view returns (uint256) {
     (uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getHypotheticalAccountLiquidity(
       account,
       cTokenModify,

contracts/compound/Comptroller.sol

@@ -228,7 +228,11 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
    * @param mintAmount The amount of underlying being supplied to the market in exchange for tokens
    * @return 0 if the mint is allowed, otherwise a semi-opaque error code (See ErrorReporter.sol)
    */
-  function mintAllowed(address cTokenAddress, address minter, uint256 mintAmount) external override returns (uint256) {
+  function mintAllowed(
+    address cTokenAddress,
+    address minter,
+    uint256 mintAmount
+  ) external override returns (uint256) {
     // Pausing is a very serious situation - we revert to sound the alarms
     require(!mintGuardianPaused[cTokenAddress], "!mint:paused");
 
@@ -268,7 +272,11 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
    * @param redeemTokens The number of cTokens to exchange for the underlying asset in the market
    * @return 0 if the redeem is allowed, otherwise a semi-opaque error code (See ErrorReporter.sol)
    */
-  function redeemAllowed(address cToken, address redeemer, uint256 redeemTokens) external override returns (uint256) {
+  function redeemAllowed(
+    address cToken,
+    address redeemer,
+    uint256 redeemTokens
+  ) external override returns (uint256) {
     uint256 allowed = redeemAllowedInternal(cToken, redeemer, redeemTokens);
     if (allowed != uint256(Error.NO_ERROR)) {
       return allowed;
@@ -319,7 +327,12 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
    * @param actualMintAmount The amount of the underlying asset being minted
    * @param mintTokens The number of tokens being minted
    */
-  function mintVerify(address cToken, address minter, uint256 actualMintAmount, uint256 mintTokens) external {
+  function mintVerify(
+    address cToken,
+    address minter,
+    uint256 actualMintAmount,
+    uint256 mintTokens
+  ) external {
     // Add minter to suppliers mapping
     suppliers[minter] = true;
   }
@@ -417,7 +430,11 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
    * @param borrowAmount The amount of underlying the account would borrow
    * @return 0 if the borrow is allowed, otherwise a semi-opaque error code (See ErrorReporter.sol)
    */
-  function borrowAllowed(address cToken, address borrower, uint256 borrowAmount) external override returns (uint256) {
+  function borrowAllowed(
+    address cToken,
+    address borrower,
+    uint256 borrowAmount
+  ) external override returns (uint256) {
     // Pausing is a very serious situation - we revert to sound the alarms
     require(!borrowGuardianPaused[cToken], "!borrow:paused");
 
@@ -558,13 +575,7 @@ 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,
-        0
-      );
+      (Error err, , , uint256 shortfall) = getHypotheticalAccountLiquidityInternal(borrower, ICErc20(address(0)), 0, 0, 0);
       if (err != Error.NO_ERROR) {
         return uint256(err);
       }
@@ -675,7 +686,11 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
    * @param src The account which sources the tokens
    * @param dst The account which receives the tokens
    */
-  function flywheelPreTransferAction(address cToken, address src, address dst) internal {
+  function flywheelPreTransferAction(
+    address cToken,
+    address src,
+    address dst
+  ) internal {
     for (uint256 i = 0; i < rewardsDistributors.length; i++)
       IIonicFlywheel(rewardsDistributors[i]).flywheelPreTransferAction(cToken, src, dst);
   }
@@ -701,9 +716,20 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     Exp tokensToDenom;
     uint256 borrowCapForCollateral;
     uint256 borrowedAssetPrice;
+    uint256 assetAsCollateralValueCap;
   }
 
-  function getAccountLiquidity(address account) public view override returns (uint256, uint256, uint256, uint256) {
+  function getAccountLiquidity(address account)
+    public
+    view
+    override
+    returns (
+      uint256,
+      uint256,
+      uint256,
+      uint256
+    )
+  {
     (
       Error err,
       uint256 collateralValue,
@@ -729,19 +755,22 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     uint256 redeemTokens,
     uint256 borrowAmount,
     uint256 repayAmount
-  ) public view returns (uint256, uint256, uint256, uint256) {
+  ) 
+    public
+    view
+    returns (
+      uint256,
+      uint256,
+      uint256,
+      uint256
+    )
+  {
     (
       Error err,
       uint256 collateralValue,
       uint256 liquidity,
       uint256 shortfall
-    ) = getHypotheticalAccountLiquidityInternal(
-        account,
-        ICErc20(cTokenModify),
-        redeemTokens,
-        borrowAmount,
-        repayAmount
-      );
+    ) = getHypotheticalAccountLiquidityInternal(account, ICErc20(cTokenModify), redeemTokens, borrowAmount, repayAmount);
     return (uint256(err), collateralValue, liquidity, shortfall);
   }
 
@@ -762,7 +791,16 @@ contract Comptroller is ComptrollerBase, ComptrollerInterface, ComptrollerErrorR
     uint256 redeemTokens,
     uint256 borrowAmount,
     uint256 repayAmount
-  ) internal view returns (Error, uint256, uint256, uint256) {
+  ) 
+    internal
+    view
+    returns (
+      Error,
+      uint256,
+      uint256,
+      uint256
+    )
+  {
     AccountLiquidityLocalVars memory vars; // Holds all our calculation results
 
     if (address(cTokenModify) != address(0)) {
@@ -800,7 +838,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,
@@ -809,7 +847,7 @@ 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;
       }