Merge branch 'development' into feat/adrastia-prudentia-caps

Author: TRiLeZ

.github/workflows/pull-request-build-and-test.yml

@@ -47,6 +47,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Install Npm dependencies
+        run: npm install
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
@@ -84,6 +87,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Install Npm dependencies
+        run: npm install
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:

contracts/GlobalPauser.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+import { IonicComptroller } from "./compound/ComptrollerInterface.sol";
+import { ICErc20 } from "./compound/CTokenInterfaces.sol";
+import { Ownable2Step } from "openzeppelin-contracts/contracts/access/Ownable2Step.sol";
+
+interface IPoolDirectory {
+  struct Pool {
+    string name;
+    address creator;
+    address comptroller;
+    uint256 blockPosted;
+    uint256 timestampPosted;
+  }
+
+  function getActivePools() external view returns (uint256, Pool[] memory);
+}
+
+contract GlobalPauser is Ownable2Step {
+  IPoolDirectory public poolDirectory;
+  mapping(address => bool) public pauseGuardian;
+
+  modifier onlyPauseGuardian() {
+    require(pauseGuardian[msg.sender], "!guardian");
+    _;
+  }
+
+  constructor(address _poolDirectory) Ownable2Step() {
+    poolDirectory = IPoolDirectory(_poolDirectory);
+  }
+
+  function setPauseGuardian(address _pauseGuardian, bool _isPauseGuardian) external onlyOwner {
+    pauseGuardian[_pauseGuardian] = _isPauseGuardian;
+  }
+
+  function pauseAll() external onlyPauseGuardian {
+    (, IPoolDirectory.Pool[] memory pools) = poolDirectory.getActivePools();
+    for (uint256 i = 0; i < pools.length; i++) {
+      ICErc20[] memory markets = IonicComptroller(pools[i].comptroller).getAllMarkets();
+      for (uint256 j = 0; j < markets.length; j++) {
+        bool isPaused = IonicComptroller(pools[i].comptroller).borrowGuardianPaused(address(markets[j]));
+        if (!isPaused) {
+          IonicComptroller(pools[i].comptroller)._setBorrowPaused(markets[j], true);
+        }
+
+        isPaused = IonicComptroller(pools[i].comptroller).mintGuardianPaused(address(markets[j]));
+        if (!isPaused) {
+          IonicComptroller(pools[i].comptroller)._setMintPaused(markets[j], true);
+        }
+      }
+    }
+  }
+}

contracts/ILiquidator.sol

@@ -46,4 +46,10 @@ interface ILiquidator {
 
   function _whitelistRedemptionStrategies(IRedemptionStrategy[] calldata strategies, bool[] calldata whitelisted)
     external;
+
+  function setExpressRelay(address _expressRelay) external;
+
+  function setPoolLens(address _poolLens) external;
+
+  function setHealthFactorThreshold(uint256 _healthFactorThreshold) external;
 }

contracts/IonicLiquidator.sol

@@ -19,16 +19,23 @@ import "./external/uniswap/UniswapV2Library.sol";
 
 import { ICErc20 } from "./compound/CTokenInterfaces.sol";
 
+import "@pythnetwork/express-relay-sdk-solidity/IExpressRelay.sol";
+import "@pythnetwork/express-relay-sdk-solidity/IExpressRelayFeeReceiver.sol";
+
+import "./PoolLens.sol";
+
 /**
  * @title IonicLiquidator
  * @author David Lucid <[email protected]> (https://github.com/davidlucid)
  * @notice IonicLiquidator safely liquidates unhealthy borrowers (with flashloan support).
  * @dev Do not transfer NATIVE or tokens directly to this address. Only send NATIVE here when using a method, and only approve tokens for transfer to here when using a method. Direct NATIVE transfers will be rejected and direct token transfers will be lost.
  */
-contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
+contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee, IExpressRelayFeeReceiver {
   using AddressUpgradeable for address payable;
   using SafeERC20Upgradeable for IERC20Upgradeable;
 
+  event VaultReceivedETH(address sender, uint256 amount, bytes permissionKey);
+
   /**
    * @dev W_NATIVE contract address.
    */
@@ -64,6 +71,27 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
    */
   uint8 public flashSwapFee;
 
+  /**
+   * @dev Addres of Pyth Express Relay for preventing value leakage in liquidations.
+   */
+  IExpressRelay public expressRelay;
+  /**
+   * @dev Pool Lens.
+   */
+  PoolLens public lens;
+  /**
+   * @dev Health Factor below which PER permissioning is bypassed.
+   */
+  uint256 public healthFactorThreshold;
+
+  modifier onlyPERPermissioned(address borrower, ICErc20 cToken) {
+    uint256 currentHealthFactor = lens.getHealthFactor(borrower, cToken.comptroller());
+    if (currentHealthFactor > healthFactorThreshold) {
+      require(expressRelay.isPermissioned(address(this), abi.encode(borrower)), "invalid liquidation");
+    }
+    _;
+  }
+
   function initialize(
     address _wtoken,
     address _uniswapV2router,
@@ -119,15 +147,21 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
     ICErc20 cErc20,
     ICErc20 cTokenCollateral,
     uint256 minOutputAmount
-  ) external returns (uint256) {
+  ) external onlyPERPermissioned(borrower, cTokenCollateral) returns (uint256) {
     // Transfer tokens in, approve to cErc20, and liquidate borrow
     require(repayAmount > 0, "Repay amount (transaction value) must be greater than 0.");
     IERC20Upgradeable underlying = IERC20Upgradeable(cErc20.underlying());
     underlying.safeTransferFrom(msg.sender, address(this), repayAmount);
     justApprove(underlying, address(cErc20), repayAmount);
     require(cErc20.liquidateBorrow(borrower, repayAmount, address(cTokenCollateral)) == 0, "Liquidation failed.");
-    // Transfer seized amount to sender
-    return transferSeizedFunds(address(cTokenCollateral), minOutputAmount);
+
+    // Redeem seized cTokens for underlying asset
+    uint256 seizedCTokenAmount = cTokenCollateral.balanceOf(address(this));
+    require(seizedCTokenAmount > 0, "No cTokens seized.");
+    uint256 redeemResult = cTokenCollateral.redeem(seizedCTokenAmount);
+    require(redeemResult == 0, "Error calling redeeming seized cToken: error code not equal to 0");
+
+    return transferSeizedFunds(address(cTokenCollateral.underlying()), minOutputAmount);
   }
 
   /**
@@ -150,6 +184,7 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
    */
   function safeLiquidateToTokensWithFlashLoan(LiquidateToTokensWithFlashSwapVars calldata vars)
     external
+    onlyPERPermissioned(vars.borrower, vars.cTokenCollateral)
     returns (uint256)
   {
     // Input validation
@@ -199,6 +234,23 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
     require(payable(msg.sender).isContract(), "Sender is not a contract.");
   }
 
+  /**
+   * @notice receiveAuctionProceedings function - receives native token from the express relay
+   * You can use permission key to distribute the received funds to users who got liquidated, LPs, etc...
+   */
+  function receiveAuctionProceedings(bytes calldata permissionKey) external payable {
+    emit VaultReceivedETH(msg.sender, msg.value, permissionKey);
+  }
+
+  function withdrawAll() external onlyOwner {
+    uint256 balance = address(this).balance;
+    require(balance > 0, "No Ether left to withdraw");
+
+    // Transfer all Ether to the owner
+    (bool sent, ) = msg.sender.call{ value: balance }("");
+    require(sent, "Failed to send Ether");
+  }
+
   /**
    * @dev Callback function for Uniswap flashloans.
    */
@@ -419,6 +471,19 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
     }
   }
 
+  function setExpressRelay(address _expressRelay) external onlyOwner {
+    expressRelay = IExpressRelay(_expressRelay);
+  }
+
+  function setPoolLens(address _poolLens) external onlyOwner {
+    lens = PoolLens(_poolLens);
+  }
+
+  function setHealthFactorThreshold(uint256 _healthFactorThreshold) external onlyOwner {
+    require(_healthFactorThreshold <= 1e18, "Invalid Health Factor Threshold");
+    healthFactorThreshold = _healthFactorThreshold;
+  }
+
   /**
    * @dev Redeem "special" collateral tokens (before swapping the output for borrowed tokens to be repaid via Uniswap).
    * Public visibility because we have to call this function externally if called from a payable IonicLiquidator function (for some reason delegatecall fails when called with msg.value > 0).

contracts/IonicUniV3Liquidator.sol

@@ -16,15 +16,20 @@ 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";
+import "@pythnetwork/express-relay-sdk-solidity/IExpressRelayFeeReceiver.sol";
+
 /**
  * @title IonicUniV3Liquidator
  * @author Veliko Minkov <[email protected]> (https://github.com/vminkov)
  * @notice IonicUniV3Liquidator liquidates unhealthy borrowers with flashloan support.
  */
-contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3FlashCallback {
+contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3FlashCallback, IExpressRelayFeeReceiver {
   using AddressUpgradeable for address payable;
   using SafeERC20Upgradeable for IERC20Upgradeable;
 
+  event VaultReceivedETH(address sender, uint256 amount, bytes permissionKey);
   /**
    * @dev Cached liquidator profit exchange source.
    * ERC20 token address or the zero address for NATIVE.
@@ -48,6 +53,27 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
   mapping(address => bool) public redemptionStrategiesWhitelist;
   IUniswapV3Quoter public quoter;
 
+  /**
+   * @dev Addres of Pyth Express Relay for preventing value leakage in liquidations.
+   */
+  IExpressRelay public expressRelay;
+  /**
+   * @dev Pool Lens.
+   */
+  PoolLens public lens;
+  /**
+   * @dev Health Factor below which PER permissioning is bypassed.
+   */
+  uint256 public healthFactorThreshold;
+
+  modifier onlyPERPermissioned(address borrower, ICErc20 cToken) {
+    uint256 currentHealthFactor = lens.getHealthFactor(borrower, cToken.comptroller());
+    if (currentHealthFactor > healthFactorThreshold) {
+      require(expressRelay.isPermissioned(address(this), abi.encode(borrower)), "invalid liquidation");
+    }
+    _;
+  }
+
   function initialize(address _wtoken, address _quoter) external initializer {
     __Ownable_init();
     W_NATIVE_ADDRESS = _wtoken;
@@ -68,15 +94,21 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
     ICErc20 cErc20,
     ICErc20 cTokenCollateral,
     uint256 minOutputAmount
-  ) external returns (uint256) {
+  ) external onlyPERPermissioned(borrower, cTokenCollateral) returns (uint256) {
     // Transfer tokens in, approve to cErc20, and liquidate borrow
     require(repayAmount > 0, "Repay amount (transaction value) must be greater than 0.");
     IERC20Upgradeable underlying = IERC20Upgradeable(cErc20.underlying());
     underlying.safeTransferFrom(msg.sender, address(this), repayAmount);
     underlying.approve(address(cErc20), repayAmount);
     require(cErc20.liquidateBorrow(borrower, repayAmount, address(cTokenCollateral)) == 0, "Liquidation failed.");
-    // Transfer seized amount to sender
-    return transferSeizedFunds(address(cTokenCollateral), minOutputAmount);
+
+    // Redeem seized cTokens for underlying asset
+    uint256 seizedCTokenAmount = cTokenCollateral.balanceOf(address(this));
+    require(seizedCTokenAmount > 0, "No cTokens seized.");
+    uint256 redeemResult = cTokenCollateral.redeem(seizedCTokenAmount);
+    require(redeemResult == 0, "Error calling redeeming seized cToken: error code not equal to 0");
+
+    return transferSeizedFunds(address(cTokenCollateral.underlying()), minOutputAmount);
   }
 
   /**
@@ -95,6 +127,7 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
 
   function safeLiquidateToTokensWithFlashLoan(LiquidateToTokensWithFlashSwapVars calldata vars)
     external
+    onlyPERPermissioned(vars.borrower, vars.cTokenCollateral)
     returns (uint256)
   {
     // Input validation
@@ -144,6 +177,23 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
     require(payable(msg.sender).isContract(), "Sender is not a contract.");
   }
 
+  /**
+   * @notice receiveAuctionProceedings function - receives native token from the express relay
+   * You can use permission key to distribute the received funds to users who got liquidated, LPs, etc...
+   */
+  function receiveAuctionProceedings(bytes calldata permissionKey) external payable {
+    emit VaultReceivedETH(msg.sender, msg.value, permissionKey);
+  }
+
+  function withdrawAll() external onlyOwner {
+    uint256 balance = address(this).balance;
+    require(balance > 0, "No Ether left to withdraw");
+
+    // Transfer all Ether to the owner
+    (bool sent, ) = msg.sender.call{ value: balance }("");
+    require(sent, "Failed to send Ether");
+  }
+
   /**
    * @dev Callback function for Uniswap flashloans.
    */
@@ -156,6 +206,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,
@@ -333,6 +391,19 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
     }
   }
 
+  function setExpressRelay(address _expressRelay) external onlyOwner {
+    expressRelay = IExpressRelay(_expressRelay);
+  }
+
+  function setPoolLens(address _poolLens) external onlyOwner {
+    lens = PoolLens(_poolLens);
+  }
+
+  function setHealthFactorThreshold(uint256 _healthFactorThreshold) external onlyOwner {
+    require(_healthFactorThreshold <= 1e18, "Invalid Health Factor Threshold");
+    healthFactorThreshold = _healthFactorThreshold;
+  }
+
   /**
    * @dev Redeem "special" collateral tokens (before swapping the output for borrowed tokens to be repaid via Uniswap).
    * Public visibility because we have to call this function externally if called from a payable IonicLiquidator function (for some reason delegatecall fails when called with msg.value > 0).

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);