Merge branch 'development' into feat/veion-ui

packages/chains/src/lisk/assets.ts

@@ -13,6 +13,9 @@ import { wrappedAssetDocs } from "../common";
 export const WETH = "0x4200000000000000000000000000000000000006";
 export const USDT = "0x05D032ac25d322df992303dCa074EE7392C117b9";
 export const LSK = "0xac485391EB2d7D88253a7F1eF18C37f4242D1A24";
+export const USDC = "0xF242275d3a6527d877f2c927a82D9b057609cc71";
+export const WBTC = "0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3";
+export const ION = "0x3f608A49a3ab475dA7fBb167C1Be6b7a45cD7013";
 
 export const assets: SupportedAsset[] = [
   {
@@ -52,9 +55,46 @@ export const assets: SupportedAsset[] = [
       feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
     } as ChainlinkSpecificParams,
     extraDocs: wrappedAssetDocs(SupportedChains.lisk),
-    initialBorrowCap: parseEther("47000").toString(),
-    initialSupplyCap: parseEther("47000").toString(),
+    initialBorrowCap: parseEther("100000").toString(),
+    initialSupplyCap: parseEther("100000").toString(),
     initialCf: "0.5"
+  },
+  {
+    symbol: assetSymbols.USDC,
+    underlying: USDC,
+    name: "USD Coin",
+    decimals: 6,
+    oracle: OracleTypes.ChainlinkPriceOracleV2,
+    oracleSpecificParams: {
+      aggregator: "0xb4e6A7861067674AC398a26DD73A3c524C602184",
+      feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
+    } as ChainlinkSpecificParams,
+    extraDocs: wrappedAssetDocs(SupportedChains.lisk),
+    initialBorrowCap: parseUnits("100000", 6).toString(),
+    initialSupplyCap: parseUnits("100000", 6).toString(),
+    initialCf: "0.5"
+  },
+  {
+    symbol: assetSymbols.WBTC,
+    underlying: WBTC,
+    name: "Wrapped Bitcoin",
+    decimals: 8,
+    oracle: OracleTypes.ChainlinkPriceOracleV2,
+    oracleSpecificParams: {
+      aggregator: "0x13da43eA89fB692bdB6666F053FeE70aC61A53cd",
+      feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
+    } as ChainlinkSpecificParams,
+    extraDocs: wrappedAssetDocs(SupportedChains.lisk),
+    initialBorrowCap: parseUnits("1", 8).toString(),
+    initialSupplyCap: parseUnits("1", 8).toString(),
+    initialCf: "0.5"
+  },
+  {
+    symbol: assetSymbols.ION,
+    underlying: ION,
+    name: "Ion",
+    decimals: 18,
+    oracle: OracleTypes.SimplePriceOracle
   }
 ];
 

packages/contracts/chainDeploy/mainnets/lisk.ts

@@ -3,7 +3,8 @@ import { lisk } from "@ionicprotocol/chains";
 import { ChainDeployConfig, deployChainlinkOracle } from "../helpers";
 import { Address } from "viem";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { ChainlinkSpecificParams, OracleTypes } from "@ionicprotocol/types";
+import { assetSymbols, ChainlinkSpecificParams, OracleTypes } from "@ionicprotocol/types";
+import { addUnderlyingsToMpo } from "../helpers/oracles/utils";
 
 const assets = lisk.assets;
 const PRICES_CONTRACT = "0x07F544813E9Fb63D57a92f28FbD3FF0f7136F5cE";
@@ -56,6 +57,16 @@ export const deploy = async ({
     chainlinkAssets
   });
 
+  const ion = assets.find((asset) => asset.symbol === assetSymbols.ION)?.underlying;
+  if (!ion) {
+    throw new Error("ION not found");
+  }
+  const mpo = await viem.getContractAt(
+    "MasterPriceOracle",
+    (await deployments.get("MasterPriceOracle")).address as Address
+  );
+  const simplePriceOracle = await deployments.get("SimplePriceOracle");
+  await addUnderlyingsToMpo(mpo as any, [ion], simplePriceOracle.address as Address, deployer, publicClient);
   //// Uniswap V3 Liquidator Funder
   const uniswapV3LiquidatorFunder = await deployments.deploy("UniswapV3LiquidatorFunder", {
     from: deployer,

packages/contracts/contracts/compound/CToken.sol

@@ -9,17 +9,20 @@ import { EIP20Interface } from "./EIP20Interface.sol";
 import { InterestRateModel } from "./InterestRateModel.sol";
 import { ComptrollerV3Storage } from "./ComptrollerStorage.sol";
 import { IFeeDistributor } from "./IFeeDistributor.sol";
+import { CTokenOracleProtected } from "./CTokenOracleProtected.sol";
+
 import { DiamondExtension, LibDiamond } from "../ionic/DiamondExtension.sol";
 import { PoolLens } from "../PoolLens.sol";
 import { IonicUniV3Liquidator } from "../IonicUniV3Liquidator.sol";
+import { IHypernativeOracle } from "../external/hypernative/interfaces/IHypernativeOracle.sol";
 
 /**
  * @title Compound's CErc20 Contract
  * @notice CTokens which wrap an EIP-20 underlying
  * @dev This contract should not to be deployed on its own; instead, deploy `CErc20Delegator` (proxy contract) and `CErc20Delegate` (logic/implementation contract).
  * @author Compound
  */
-abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Exponential, DiamondExtension {
+abstract contract CErc20 is CTokenOracleProtected, CTokenSecondExtensionBase, TokenErrorReporter, Exponential, DiamondExtension {
   modifier isAuthorized() {
     require(
       IFeeDistributor(ionicAdmin).canCall(address(comptroller), msg.sender, address(this), msg.sig),
@@ -69,7 +72,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param mintAmount The amount of the underlying asset to supply
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function mint(uint256 mintAmount) external override isAuthorized returns (uint256) {
+  function mint(uint256 mintAmount) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     (uint256 err, ) = mintInternal(mintAmount);
     return err;
   }
@@ -80,7 +83,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param redeemTokens The number of cTokens to redeem into underlying
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function redeem(uint256 redeemTokens) external override isAuthorized returns (uint256) {
+  function redeem(uint256 redeemTokens) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     return redeemInternal(redeemTokens);
   }
 
@@ -90,7 +93,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param redeemAmount The amount of underlying to redeem
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function redeemUnderlying(uint256 redeemAmount) external override isAuthorized returns (uint256) {
+  function redeemUnderlying(uint256 redeemAmount) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     return redeemUnderlyingInternal(redeemAmount);
   }
 
@@ -99,7 +102,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param borrowAmount The amount of the underlying asset to borrow
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function borrow(uint256 borrowAmount) external override isAuthorized returns (uint256) {
+  function borrow(uint256 borrowAmount) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     return borrowInternal(borrowAmount);
   }
 
@@ -108,7 +111,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param repayAmount The amount to repay
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function repayBorrow(uint256 repayAmount) external override isAuthorized returns (uint256) {
+  function repayBorrow(uint256 repayAmount) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     (uint256 err, ) = repayBorrowInternal(repayAmount);
     return err;
   }
@@ -119,7 +122,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param repayAmount The amount to repay
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function repayBorrowBehalf(address borrower, uint256 repayAmount) external override isAuthorized returns (uint256) {
+  function repayBorrowBehalf(address borrower, uint256 repayAmount) external override isAuthorized onlyOracleApprovedAllowEOA returns (uint256) {
     (uint256 err, ) = repayBorrowBehalfInternal(borrower, repayAmount);
     return err;
   }
@@ -136,7 +139,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
     address borrower,
     uint256 repayAmount,
     address cTokenCollateral
-  ) external override isAuthorized isMinHFThresholdExceeded(borrower) returns (uint256) {
+  ) external override isAuthorized onlyOracleApprovedAllowEOA isMinHFThresholdExceeded(borrower) returns (uint256) {
     (uint256 err, ) = liquidateBorrowInternal(borrower, repayAmount, cTokenCollateral);
     return err;
   }
@@ -162,7 +165,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
     address liquidator,
     address borrower,
     uint256 seizeTokens
-  ) external override nonReentrant(true) returns (uint256) {
+  ) external override nonReentrant(true) onlyOracleApprovedAllowEOA returns (uint256) {
     return seizeInternal(msg.sender, liquidator, borrower, seizeTokens);
   }
 
@@ -181,7 +184,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param withdrawAmount Amount of fees to withdraw
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function _withdrawIonicFees(uint256 withdrawAmount) external override nonReentrant(false) returns (uint256) {
+  function _withdrawIonicFees(uint256 withdrawAmount) external override nonReentrant(false) onlyOracleApproved returns (uint256) {
     asCTokenExtension().accrueInterest();
 
     if (accrualBlockNumber != block.number) {
@@ -214,7 +217,7 @@ abstract contract CErc20 is CTokenSecondExtensionBase, TokenErrorReporter, Expon
    * @param withdrawAmount Amount of fees to withdraw
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function _withdrawAdminFees(uint256 withdrawAmount) external override nonReentrant(false) returns (uint256) {
+  function _withdrawAdminFees(uint256 withdrawAmount) external override nonReentrant(false) onlyOracleApproved returns (uint256) {
     asCTokenExtension().accrueInterest();
 
     if (accrualBlockNumber != block.number) {

packages/contracts/contracts/compound/CTokenFirstExtension.sol

@@ -9,13 +9,16 @@ import { TokenErrorReporter } from "./ErrorReporter.sol";
 import { Exponential } from "./Exponential.sol";
 import { InterestRateModel } from "./InterestRateModel.sol";
 import { IFeeDistributor } from "./IFeeDistributor.sol";
-import { Multicall } from "../utils/Multicall.sol";
+import { CTokenOracleProtected } from "./CTokenOracleProtected.sol";
 
 import { IERC20, SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
+import { Multicall } from "../utils/Multicall.sol";
 import { AddressesProvider } from "../ionic/AddressesProvider.sol";
+import { IHypernativeOracle } from "../external/hypernative/interfaces/IHypernativeOracle.sol";
 
 contract CTokenFirstExtension is
+  CTokenOracleProtected,
   CErc20FirstExtensionBase,
   TokenErrorReporter,
   Exponential,
@@ -147,7 +150,10 @@ contract CTokenFirstExtension is
    * @param amount The number of tokens to transfer
    * @return Whether or not the transfer succeeded
    */
-  function transfer(address dst, uint256 amount) public override nonReentrant(false) isAuthorized returns (bool) {
+  function transfer(
+    address dst,
+    uint256 amount
+  ) public override nonReentrant(false) isAuthorized onlyOracleApprovedAllowEOA returns (bool) {
     return transferTokens(msg.sender, msg.sender, dst, amount) == uint256(Error.NO_ERROR);
   }
 
@@ -162,7 +168,7 @@ contract CTokenFirstExtension is
     address src,
     address dst,
     uint256 amount
-  ) public override nonReentrant(false) isAuthorized returns (bool) {
+  ) public override nonReentrant(false) isAuthorized onlyOracleApprovedAllowEOA returns (bool) {
     return transferTokens(msg.sender, src, dst, amount) == uint256(Error.NO_ERROR);
   }
 
@@ -174,7 +180,10 @@ contract CTokenFirstExtension is
    * @param amount The number of tokens that are approved (-1 means infinite)
    * @return Whether or not the approval succeeded
    */
-  function approve(address spender, uint256 amount) public override isAuthorized returns (bool) {
+  function approve(
+    address spender,
+    uint256 amount
+  ) public override isAuthorized onlyOracleApprovedAllowEOA returns (bool) {
     address src = msg.sender;
     transferAllowances[src][spender] = amount;
     emit Approval(src, spender, amount);
@@ -229,7 +238,9 @@ contract CTokenFirstExtension is
    * @dev Admin function to accrue interest and set a new reserve factor
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function _setReserveFactor(uint256 newReserveFactorMantissa) public override nonReentrant(false) returns (uint256) {
+  function _setReserveFactor(
+    uint256 newReserveFactorMantissa
+  ) public override nonReentrant(false) returns (uint256) {
     accrueInterest();
     // Check caller is admin
     if (!hasAdminRights()) {
@@ -259,7 +270,9 @@ contract CTokenFirstExtension is
    * @dev Admin function to accrue interest and set a new admin fee
    * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details)
    */
-  function _setAdminFee(uint256 newAdminFeeMantissa) public override nonReentrant(false) returns (uint256) {
+  function _setAdminFee(
+    uint256 newAdminFeeMantissa
+  ) public override nonReentrant(false) returns (uint256) {
     accrueInterest();
     // Verify market's block number equals current block number
     if (accrualBlockNumber != block.number) {
@@ -638,7 +651,7 @@ contract CTokenFirstExtension is
     return balance;
   }
 
-  function flash(uint256 amount, bytes calldata data) public override isAuthorized {
+  function flash(uint256 amount, bytes calldata data) public override isAuthorized onlyOracleApprovedAllowEOA {
     accrueInterest();
 
     totalBorrows += amount;

packages/contracts/contracts/compound/CTokenOracleProtected.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.22;
+
+import { CErc20Storage } from "./CTokenInterfaces.sol";
+import { IHypernativeOracle } from "../external/hypernative/interfaces/IHypernativeOracle.sol";
+
+contract CTokenOracleProtected is CErc20Storage {
+  error InteractionNotAllowed();
+
+  modifier onlyOracleApproved() {
+    address oracleAddress = ap.getAddress("HYPERNATIVE_ORACLE");
+    if (oracleAddress == address(0)) {
+      _;
+      return;
+    }
+    IHypernativeOracle oracle = IHypernativeOracle(oracleAddress);
+    if (oracle.isBlacklistedContext(msg.sender, tx.origin) || !oracle.isTimeExceeded(msg.sender)) {
+      revert InteractionNotAllowed();
+    }
+    _;
+  }
+
+  modifier onlyOracleApprovedAllowEOA() {
+    address oracleAddress = ap.getAddress("HYPERNATIVE_ORACLE");
+    if (oracleAddress == address(0)) {
+      _;
+      return;
+    }
+
+    IHypernativeOracle oracle = IHypernativeOracle(oracleAddress);
+    if (oracle.isBlacklistedAccount(msg.sender) || msg.sender != tx.origin) {
+      revert InteractionNotAllowed();
+    }
+    _;
+  }
+}

packages/contracts/contracts/external/hypernative/interfaces/IHypernativeOracle.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.22;
+
+interface IHypernativeOracle {
+    function register(address account) external;
+    function registerStrict(address account) external;
+    function isBlacklistedAccount(address account) external view returns (bool);
+    function isBlacklistedContext(address sender, address origin) external view returns (bool);
+    function isTimeExceeded(address account) external view returns (bool);
+}