morpho-contracts-helper 0.0.19 → 0.0.21

package/contracts/MorphoMarketDataFetcher.sol

@@ -1,53 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-struct MarketParams {
-    address loanToken;
-    address collateralToken;
-    address oracle;
-    address irm;
-    uint256 lltv;
-}
-
-interface IChainlinkAggregator {
-    function decimals() external view returns (uint8);
-
-    function latestRoundData()
-        external
-        view
-        returns (
-            uint80 roundId,
-            int256 answer,
-            uint256 startedAt,
-            uint256 updatedAt,
-            uint80 answeredInRound
-        );
-}
-
-interface IERC20Metadata {
-    function name() external view returns (string memory);
-    function symbol() external view returns (string memory);
-    function decimals() external view returns (uint8);
-    function allowance(address owner, address spender) external view returns (uint256);
-}
-
-interface IMorphoChainlinkOracleV2 {
-    function BASE_FEED_1() external view returns (address);
-    function BASE_FEED_2() external view returns (address);
-    function BASE_VAULT() external view returns (address);
-    function BASE_VAULT_CONVERSION_SAMPLE() external view returns (address);
-    function QUOTE_FEED_1() external view returns (address);
-    function QUOTE_FEED_2() external view returns (address);
-    function QUOTE_VAULT() external view returns (address);
-    function QUOTE_VAULT_CONVERSION_SAMPLE() external view returns (address);
-    function SCALE_FACTOR() external view returns (uint256);
-    function price() external view returns (uint256);
-}
-
-interface IMorpho {
-    function position(bytes32 marketId, address account) external view returns (uint128 supplyShares, uint128 borrowShares, uint128 collateral);
-    function idToMarketParams(bytes32 marketId) external view returns (MarketParams memory);
-}
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {AggregatorV3Interface} from "./external/morpho/interfaces/AggregatorV3Interface.sol";
+import {IMorpho, MarketParams, Market,  Id, Position} from "./external/morpho/interfaces/IMorpho.sol";
+import {IMorphoChainlinkOracleV2} from "./external/morpho/interfaces/IMorphoChainlinkOracleV2.sol";
+import {IERC4626} from "./external/morpho/interfaces/IERC4626.sol";
 
 contract MorphoMarketDataFetcher {
 
@@ -74,14 +33,14 @@ contract MorphoMarketDataFetcher {
 
     struct OracleInfo {
         address oracleAddress;
-        address baseFeed1;
-        address baseFeed2;
-        address baseVault;
-        address baseVaultConversionSample;
-        address quoteFeed1;
-        address quoteFeed2;
-        address quoteVault;
-        address quoteVaultConversionSample;
+        AggregatorV3Interface baseFeed1;
+        AggregatorV3Interface baseFeed2;
+        IERC4626 baseVault;
+        uint256 baseVaultConversionSample;
+        AggregatorV3Interface quoteFeed1;
+        AggregatorV3Interface quoteFeed2;
+        IERC4626 quoteVault;
+        uint256 quoteVaultConversionSample;
         uint256 scaleFactor;
         uint256 currentPrice;
         MockOracleInfo baseFeed;
@@ -101,7 +60,7 @@ contract MorphoMarketDataFetcher {
         address user
     ) external view returns (MarketData memory data) {
 
-        MarketParams memory params = IMorpho(morphoAddress).idToMarketParams(marketId);
+        MarketParams memory params = IMorpho(morphoAddress).idToMarketParams(Id.wrap(marketId));
         
         data.marketParams = params;
         
@@ -123,49 +82,49 @@ contract MorphoMarketDataFetcher {
 
         if (params.oracle != address(0)) {
             data.oracle.oracleAddress = params.oracle;
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_1() returns (address a) { data.oracle.baseFeed1 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_2() returns (address a) { data.oracle.baseFeed2 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT() returns (address a) { data.oracle.baseVault = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT_CONVERSION_SAMPLE() returns (address a) { data.oracle.baseVaultConversionSample = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_1() returns (address a) { data.oracle.quoteFeed1 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_2() returns (address a) { data.oracle.quoteFeed2 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT() returns (address a) { data.oracle.quoteVault = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT_CONVERSION_SAMPLE() returns (address a) { data.oracle.quoteVaultConversionSample = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_1() returns (AggregatorV3Interface a) { data.oracle.baseFeed1 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_2() returns (AggregatorV3Interface a) { data.oracle.baseFeed2 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT() returns (IERC4626 a) { data.oracle.baseVault = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT_CONVERSION_SAMPLE() returns (uint256 a) { data.oracle.baseVaultConversionSample = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_1() returns (AggregatorV3Interface a) { data.oracle.quoteFeed1 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_2() returns (AggregatorV3Interface a) { data.oracle.quoteFeed2 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT() returns (IERC4626 a) { data.oracle.quoteVault = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT_CONVERSION_SAMPLE() returns (uint256 a) { data.oracle.quoteVaultConversionSample = a; } catch {}
             try IMorphoChainlinkOracleV2(params.oracle).SCALE_FACTOR() returns (uint256 s) { data.oracle.scaleFactor = s; } catch {}
             try IMorphoChainlinkOracleV2(params.oracle).price() returns (uint256 p) { data.oracle.currentPrice = p; } catch {}
         }
         
-        if (data.oracle.baseFeed1 != address(0)) {
-            data.oracle.baseFeed.oracleAddress = data.oracle.baseFeed1;
+        if (address(data.oracle.baseFeed1) != address(0)) {
+            data.oracle.baseFeed.oracleAddress = address(data.oracle.baseFeed1);
             
-            try IChainlinkAggregator(data.oracle.baseFeed1).latestRoundData() returns (
+            try data.oracle.baseFeed1.latestRoundData() returns (
                 uint80, int256 answer, uint256, uint256, uint80
             ) { 
                 data.oracle.baseFeed.price = answer > 0 ? uint256(answer) : 0; 
             } catch {}
 
-            try IChainlinkAggregator(data.oracle.baseFeed1).decimals() returns (uint8 _dec) { data.oracle.baseFeed.decimals = _dec; } catch {}
-            try IERC20Metadata(data.oracle.baseFeed1).symbol() returns (string memory _sym) { data.oracle.baseFeed.symbol = _sym; } catch {}
+            try data.oracle.baseFeed1.decimals() returns (uint8 _dec) { data.oracle.baseFeed.decimals = _dec; } catch {}
+            try data.oracle.baseFeed1.description() returns (string memory _sym) { data.oracle.baseFeed.symbol = _sym; } catch {}
         }
 
-        if (data.oracle.quoteFeed1 != address(0)) {
-            data.oracle.quoteFeed.oracleAddress = data.oracle.quoteFeed1;
+        if (address(data.oracle.quoteFeed1) != address(0)) {
+            data.oracle.quoteFeed.oracleAddress = address(data.oracle.quoteFeed1);
             
-            try IChainlinkAggregator(data.oracle.quoteFeed1).latestRoundData() returns (
+            try data.oracle.quoteFeed1.latestRoundData() returns (
                 uint80, int256 answer, uint256, uint256, uint80
             ) { 
                 data.oracle.quoteFeed.price = answer > 0 ? uint256(answer) : 0; 
             } catch {}
 
-            try IChainlinkAggregator(data.oracle.quoteFeed1).decimals() returns (uint8 _dec) { data.oracle.quoteFeed.decimals = _dec; } catch {}
-            try IERC20Metadata(data.oracle.quoteFeed1).symbol() returns (string memory _sym) { data.oracle.quoteFeed.symbol = _sym; } catch {}
+            try data.oracle.quoteFeed1.decimals() returns (uint8 _dec) { data.oracle.quoteFeed.decimals = _dec; } catch {}
+            try data.oracle.quoteFeed1.description() returns (string memory _sym) { data.oracle.quoteFeed.symbol = _sym; } catch {}
         }
 
         if (morphoAddress != address(0) && marketId != bytes32(0)) {
             address deadAddress = 0x000000000000000000000000000000000000dEaD;
-            try IMorpho(morphoAddress).position(marketId, deadAddress) returns (uint128 supplyShares, uint128, uint128) {
-                data.deadAddressSupply = uint256(supplyShares);
-            } catch {}
+
+            Position memory deadPosition = IMorpho(morphoAddress).position(Id.wrap(marketId), deadAddress);
+            data.deadAddressSupply = deadPosition.supplyShares;
         }
     }
 }

package/contracts/MorphoVaultV2DeployHelper.sol

@@ -9,6 +9,7 @@ import {IVaultV2Factory} from "./external/morpho/interfaces/IVaultV2Factory.sol"
 import {IVaultV2} from "./external/morpho/interfaces/IVaultV2.sol";
 import {IERC20} from "./external/morpho/interfaces/IERC20.sol";
 import {IERC4626} from "./external/morpho/interfaces/IERC4626.sol";
+import {IMorpho, MarketParams, Id, Position} from "./external/morpho/interfaces/IMorpho.sol";
 import {IMorphoMarketV1AdapterV2} from "./external/morpho/interfaces/IMorphoMarketV1AdapterV2.sol";
 import {IMorphoMarketV1AdapterV2Factory} from "./external/morpho/interfaces/IMorphoMarketV1AdapterV2Factory.sol";
 
@@ -18,6 +19,8 @@ contract MorphoVaultV2DeployHelper {
     address public immutable adapterV2FactoryAddress;
     address public immutable morphoRegistryAddress;
 
+    address constant DEAD_ADDRESS = 0x000000000000000000000000000000000000dEaD;
+
     constructor(address _vaultV2FactoryAddress, address _adapterV2FactoryAddress, address _morphoRegistryAddress) {
         vaultV2FactoryAddress = _vaultV2FactoryAddress;
         adapterV2FactoryAddress = _adapterV2FactoryAddress;
@@ -33,7 +36,9 @@ contract MorphoVaultV2DeployHelper {
         address finalOwner;
         address finalCurator;      
         address allocator;
-        address sentinel;          
+        address sentinel;    
+
+        bytes32 marketID;      
         
         uint256 vaultTimelockHigh; 
         uint256 vaultTimelockMid;  
@@ -71,6 +76,7 @@ contract MorphoVaultV2DeployHelper {
         result.adapter = adapter;
 
         iVault2.submit(abi.encodeCall(IVaultV2.setIsAllocator, (p.allocator, true)));
+        iVault2.submit(abi.encodeCall(IVaultV2.setIsAllocator, (address(this), true)));
         iVault2.submit(abi.encodeCall(IVaultV2.setAdapterRegistry, (morphoRegistryAddress)));
         
         bytes memory adapterIdData = abi.encode("this", adapter);
@@ -85,6 +91,7 @@ contract MorphoVaultV2DeployHelper {
 
         iVault2.setAdapterRegistry(morphoRegistryAddress);
         iVault2.setIsAllocator(p.allocator, true);
+        iVault2.setIsAllocator(address(this), true);
         iVault2.addAdapter(adapter);
 
         iVault2.increaseAbsoluteCap(adapterIdData, type(uint128).max);
@@ -95,6 +102,13 @@ contract MorphoVaultV2DeployHelper {
         iVault2.abdicate(IVaultV2.setSendSharesGate.selector);
         iVault2.abdicate(IVaultV2.setReceiveAssetsGate.selector);
 
+        if (p.marketID != bytes32(0)) {
+            _configureMarketAndLiquidityAdapter(vault, p.marketID, adapter, p.asset);
+        }
+
+        iVault2.submit(abi.encodeCall(IVaultV2.setIsAllocator, (address(this), false)));
+        iVault2.setIsAllocator(address(this), false);
+
         _configureVaultTimelocks(vault, p.vaultTimelockHigh, p.vaultTimelockMid);
         _configureAdapterTimelocks(adapter, p.adapterTimelock);
 
@@ -109,6 +123,52 @@ contract MorphoVaultV2DeployHelper {
         emit VaultDeployed(vault, adapter, p.finalOwner, p.finalCurator, p.allocator);
     }
 
+    function _configureMarketAndLiquidityAdapter(address vault, bytes32 marketID, address adapter, address loanAsset) internal {
+        IVaultV2 iVault2 = IVaultV2(vault);
+        IMorphoMarketV1AdapterV2 iAdapter = IMorphoMarketV1AdapterV2(adapter);
+        
+        address morpho = iAdapter.morpho();
+        
+        MarketParams memory marketParams = IMorpho(morpho).idToMarketParams(Id.wrap(marketID));
+
+        address irm = iAdapter.adaptiveCurveIrm();
+        _validateMarketParams(marketParams, loanAsset, irm);
+
+        bytes memory liquidityData = abi.encode(marketParams);
+        iVault2.submit(abi.encodeCall(IVaultV2.setLiquidityAdapterAndData, (adapter, liquidityData)));
+        iVault2.setLiquidityAdapterAndData(address(iAdapter), liquidityData);
+
+        Position memory deadPosition = IMorpho(morpho).position(Id.wrap(marketID), address(DEAD_ADDRESS));
+        uint256 deadSupplyShares = deadPosition.supplyShares;
+
+        _validateDepositAmount(1e9, deadSupplyShares);
+
+        bytes memory collateralTokenIdData = abi.encode("collateralToken", marketParams.collateralToken);
+        iVault2.submit(abi.encodeCall(IVaultV2.increaseAbsoluteCap, (collateralTokenIdData, type(uint128).max)));
+        iVault2.submit(abi.encodeCall(IVaultV2.increaseRelativeCap, (collateralTokenIdData, 1e18)));
+        iVault2.increaseAbsoluteCap(collateralTokenIdData, type(uint128).max);
+        iVault2.increaseRelativeCap(collateralTokenIdData, 1e18);
+
+        bytes memory marketIdData = abi.encode("this/marketParams", address(adapter), marketParams);
+        iVault2.submit(abi.encodeCall(IVaultV2.increaseAbsoluteCap, (marketIdData, type(uint128).max)));
+        iVault2.submit(abi.encodeCall(IVaultV2.increaseRelativeCap, (marketIdData, 1e18)));
+        iVault2.increaseAbsoluteCap(marketIdData, type(uint128).max);
+        iVault2.increaseRelativeCap(marketIdData, 1e18);
+    }
+
+    function _validateDepositAmount(uint256 requiredDeadDeposit, uint256 deadSupplyShares) internal pure {
+        require(deadSupplyShares >= requiredDeadDeposit, "Market needs dead deposit");
+    }
+
+    function _validateMarketParams(MarketParams memory marketParams, address expectedAsset, address expectedIrm)
+        internal
+        pure
+    {
+        require(marketParams.loanToken == expectedAsset, "Market loanToken does not match vault asset");
+        require(marketParams.irm == expectedIrm, "Market IRM does not match adaptiveCurveIrm");
+        require(marketParams.collateralToken != address(0), "Market not found (collateralToken is zero)");
+    }
+
     function _configureVaultTimelocks(
         address vault,
         uint256 highDuration,
@@ -127,12 +187,12 @@ contract MorphoVaultV2DeployHelper {
         selectors[6] = iVault.increaseTimelock.selector; 
  
         for (uint256 i = 0; i < 4; i++) {
-            iVault.submit(abi.encodeCall(iVault.increaseTimelock, (selectors[i], midDuration)));
+            iVault.submit(abi.encodeCall(IVaultV2.increaseTimelock, (selectors[i], midDuration)));
             iVault.increaseTimelock(selectors[i], midDuration);
         }
 
         for (uint256 i = 4; i < selectors.length; i++) {
-            iVault.submit(abi.encodeCall(iVault.increaseTimelock, (selectors[i], highDuration))); 
+            iVault.submit(abi.encodeCall(IVaultV2.increaseTimelock, (selectors[i], highDuration))); 
             iVault.increaseTimelock(selectors[i], highDuration);
         }
 
@@ -152,7 +212,7 @@ contract MorphoVaultV2DeployHelper {
         selectors[3] = IMorphoMarketV1AdapterV2.increaseTimelock.selector; 
 
         for (uint256 i = 0; i < selectors.length; i++) {
-            iAdapter.submit(abi.encodeCall(iAdapter.increaseTimelock, (selectors[i], duration)));
+            iAdapter.submit(abi.encodeCall(IMorphoMarketV1AdapterV2.increaseTimelock, (selectors[i], duration)));
             iAdapter.increaseTimelock(selectors[i], duration);
         }