ChainlinkOEVWrapper + ChainlinkOEVMorphoWrapper

.github/workflows/base-integration.yml

@@ -1,4 +1,4 @@
-name: Base 
+name: Base
 
 on: [pull_request]
 
@@ -121,7 +121,7 @@ jobs:
            retry_wait_seconds: 60
            timeout_minutes: 20
            max_attempts: 3
-           command: time forge test --match-contract CypherIntegrationTest --fork-url base -vvv 
+           command: time forge test --match-contract CypherIntegrationTest --fork-url base -vvv
 
   bounded-chainlink-composite-oracle:
     name: Bounded Chainlink Composite Oracle Test
@@ -147,8 +147,8 @@ jobs:
            max_attempts: 3
            command: time forge test --mc "ChainlinkBoundedCompositeOracleIntegrationTest" -vvv --ffi
 
-  chainlink-oracle-proxy:
-    name: Chainlink Oracle Proxy Test
+  chainlink-oev-wrapper:
+    name: Chainlink OEV Wrapper Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -169,5 +169,28 @@ jobs:
            retry_wait_seconds: 60
            timeout_minutes: 20
            max_attempts: 3
-           command: time forge test --mc "ChainlinkOracleProxyIntegrationTest" -vvv --ffi
+           command: time forge test --mc "ChainlinkOEVWrapperIntegration" -vvv --ffi
 
+  chainlink-oev-morpho-wrapper:
+    name: Chainlink OEV Morpho Wrapper Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Setup Environment
+        uses: ./.github/actions
+
+      - name: Setup MIPs Permissions
+        uses: ./.github/actions/setup-mips-permissions
+
+      - name: Run Integration Tests
+        uses: nick-fields/retry@v3
+        with:
+           polling_interval_seconds: 30
+           retry_wait_seconds: 60
+           timeout_minutes: 20
+           max_attempts: 3
+           command: time forge test --mc "ChainlinkOEVMorphoWrapperIntegration" -vvv --ffi

proposals/ChainlinkOracleConfigs.sol

@@ -0,0 +1,185 @@
+pragma solidity 0.8.19;
+
+import "@forge-std/Test.sol";
+import "@utils/ChainIds.sol";
+
+abstract contract ChainlinkOracleConfigs is Test {
+    struct OracleConfig {
+        string oracleName; /// e.g., CHAINLINK_ETH_USD
+        string symbol; /// e.g., as found in addresses
+        string mTokenKey; /// e.g., MOONWELL_WETH (defaults to MOONWELL_[symbol] if not specified)
+    }
+
+    struct MorphoOracleConfig {
+        string proxyName; /// e.g., CHAINLINK_stkWELL_USD (used for proxy identifier)
+        string priceFeedName; /// e.g., CHAINLINK_WELL_USD (the actual price feed oracle)
+    }
+
+    /// oracle configurations per chain id
+    mapping(uint256 => OracleConfig[]) internal _oracleConfigs;
+
+    /// morpho market configurations per chain id
+    mapping(uint256 => MorphoOracleConfig[]) internal _MorphoOracleConfigs;
+
+    /// @dev oracles are listed in the order they are in the docs
+    /// https://docs.moonwell.fi/moonwell/protocol-information/contracts#base-contract-addresses
+    /// NOTE: some oracles are commented out as they have composite oracles, or won't be part of the mip to have oev wrapper
+    constructor() {
+        /// Initialize oracle configurations for Base
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("DAI_ORACLE", "DAI", "MOONWELL_DAI")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDC_USD", "USDC", "MOONWELL_USDC")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDC_USD", "USDBC", "MOONWELL_USDBC")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_ETH_USD", "WETH", "MOONWELL_WETH")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("cbETHETH_ORACLE", "cbETH", "MOONWELL_cbETH")
+        );
+        // _oracleConfigs[BASE_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_WSTETH_STETH_COMPOSITE_ORACLE", "wstETH", "MOONWELL_wstETH")
+        // );
+        // _oracleConfigs[BASE_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_RETH_ETH_COMPOSITE_ORACLE", "rETH", "MOONWELL_rETH")
+        // );
+        // _oracleConfigs[BASE_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_WEETH_USD_COMPOSITE_ORACLE", "weETH", "MOONWELL_weETH")
+        // );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_AERO_ORACLE", "AERO", "MOONWELL_AERO")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_BTC_USD", "cbBTC", "MOONWELL_cbBTC")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_EURC_USD", "EURC", "MOONWELL_EURC")
+        );
+        // _oracleConfigs[BASE_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_wrsETH_COMPOSITE_ORACLE", "wrsETH", "MOONWELL_wrsETH")
+        // );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_WELL_USD", "xWELL_PROXY", "MOONWELL_WELL")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDS_USD", "USDS", "MOONWELL_USDS")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_TBTC_USD", "TBTC", "MOONWELL_TBTC")
+        );
+        // _oracleConfigs[BASE_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_LBTC_BTC_COMPOSITE_ORACLE", "LBTC", "MOONWELL_LBTC")
+        // );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_VIRTUAL_USD", "VIRTUAL", "MOONWELL_VIRTUAL")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_MORPHO_USD", "MORPHO", "MOONWELL_MORPHO")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_cbXRP_USD", "cbXRP", "MOONWELL_cbXRP")
+        );
+        _oracleConfigs[BASE_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_MAMO_USD", "MAMO", "MOONWELL_MAMO")
+        );
+
+        /// Initialize oracle configurations for Optimism
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDC_USD", "USDC", "MOONWELL_USDC")
+        );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDT_USD", "USDT", "MOONWELL_USDT")
+        );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_DAI_USD", "DAI", "MOONWELL_DAI")
+        );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_ETH_USD", "WETH", "MOONWELL_WETH")
+        );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_WBTC_USD", "WBTC", "MOONWELL_WBTC")
+        );
+        // _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_WSTETH_USD_COMPOSITE_ORACLE", "wstETH", "MOONWELL_wstETH")
+        // );
+        // _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_cbETH_USD_COMPOSITE_ORACLE", "cbETH", "MOONWELL_cbETH")
+        // );
+        // _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_RETH_USD_COMPOSITE_ORACLE", "rETH", "MOONWELL_rETH")
+        // );
+        // _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_WEETH_USD_COMPOSITE_ORACLE", "weETH", "MOONWELL_weETH")
+        // );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_OP_USD", "OP", "MOONWELL_OP")
+        );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_VELO_USD", "VELO", "MOONWELL_VELO")
+        );
+        // _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+        //     OracleConfig("CHAINLINK_wrsETH_COMPOSITE_ORACLE", "wrsETH", "MOONWELL_wrsETH")
+        // );
+        _oracleConfigs[OPTIMISM_CHAIN_ID].push(
+            OracleConfig("CHAINLINK_USDT_USD", "USDT0", "MOONWELL_USDT0")
+        );
+
+        /// Initialize Morpho market configurations for Base
+        _MorphoOracleConfigs[BASE_CHAIN_ID].push(
+            MorphoOracleConfig("CHAINLINK_WELL_USD", "CHAINLINK_WELL_USD")
+        );
+        _MorphoOracleConfigs[BASE_CHAIN_ID].push(
+            MorphoOracleConfig("CHAINLINK_MAMO_USD", "CHAINLINK_MAMO_USD")
+        );
+
+        _MorphoOracleConfigs[BASE_CHAIN_ID].push(
+            MorphoOracleConfig("CHAINLINK_stkWELL_USD", "CHAINLINK_WELL_USD")
+        );
+    }
+
+    function getOracleConfigurations(
+        uint256 chainId
+    ) public view returns (OracleConfig[] memory) {
+        OracleConfig[] memory configs = new OracleConfig[](
+            _oracleConfigs[chainId].length
+        );
+
+        unchecked {
+            uint256 configLength = configs.length;
+            for (uint256 i = 0; i < configLength; i++) {
+                configs[i] = OracleConfig({
+                    oracleName: _oracleConfigs[chainId][i].oracleName,
+                    symbol: _oracleConfigs[chainId][i].symbol,
+                    mTokenKey: _oracleConfigs[chainId][i].mTokenKey
+                });
+            }
+        }
+
+        return configs;
+    }
+
+    function getMorphoOracleConfigurations(
+        uint256 chainId
+    ) public view returns (MorphoOracleConfig[] memory) {
+        MorphoOracleConfig[] memory configs = new MorphoOracleConfig[](
+            _MorphoOracleConfigs[chainId].length
+        );
+
+        unchecked {
+            uint256 configLength = configs.length;
+            for (uint256 i = 0; i < configLength; i++) {
+                configs[i] = MorphoOracleConfig({
+                    proxyName: _MorphoOracleConfigs[chainId][i].proxyName,
+                    priceFeedName: _MorphoOracleConfigs[chainId][i]
+                        .priceFeedName
+                });
+            }
+        }
+
+        return configs;
+    }
+}

proposals/mips/mip-o12/mip-o12.sol

@@ -9,11 +9,10 @@ import {ERC20} from "@openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 import {ProposalActions} from "@proposals/utils/ProposalActions.sol";
 import {OPTIMISM_FORK_ID} from "@utils/ChainIds.sol";
 import {ChainlinkFeedOEVWrapper} from "@protocol/oracles/ChainlinkFeedOEVWrapper.sol";
-import {DeployChainlinkOEVWrapper} from "@script/DeployChainlinkOEVWrapper.sol";
 import {HybridProposal, ActionType} from "@proposals/proposalTypes/HybridProposal.sol";
 import {AllChainAddresses as Addresses} from "@proposals/Addresses.sol";
 
-contract mipo12 is HybridProposal, DeployChainlinkOEVWrapper {
+contract mipo12 is HybridProposal {
     using ProposalActions for *;
 
     string public constant override name = "MIP-O12";
@@ -31,7 +30,8 @@ contract mipo12 is HybridProposal, DeployChainlinkOEVWrapper {
 
     function deploy(Addresses addresses, address) public override {
         if (!addresses.isAddressSet("CHAINLINK_ETH_USD_OEV_WRAPPER")) {
-            deployChainlinkOEVWrapper(addresses, "CHAINLINK_ETH_USD");
+            // new version of deploy script not compatiblw with old wrapper
+            //deployChainlinkOEVWrapper(addresses, "CHAINLINK_ETH_USD");
         }
     }
 

proposals/mips/mip-x14/mip-x14.sol

@@ -10,12 +10,11 @@ import {ERC20} from "@openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 import {ProposalActions} from "@proposals/utils/ProposalActions.sol";
 import {ChainlinkFeedOEVWrapper} from "@protocol/oracles/ChainlinkFeedOEVWrapper.sol";
 import {ChainlinkCompositeOracle} from "@protocol/oracles/ChainlinkCompositeOracle.sol";
-import {DeployChainlinkOEVWrapper} from "@script/DeployChainlinkOEVWrapper.sol";
 import {HybridProposal, ActionType} from "@proposals/proposalTypes/HybridProposal.sol";
 import {AllChainAddresses as Addresses} from "@proposals/Addresses.sol";
 import {OPTIMISM_FORK_ID, BASE_FORK_ID, OPTIMISM_CHAIN_ID, BASE_CHAIN_ID} from "@utils/ChainIds.sol";
 
-contract mipx14 is HybridProposal, DeployChainlinkOEVWrapper {
+contract mipx14 is HybridProposal {
     using ProposalActions for *;
     using ChainIds for uint256;
 
@@ -151,10 +150,11 @@ contract mipx14 is HybridProposal, DeployChainlinkOEVWrapper {
                 )
             );
             if (!addresses.isAddressSet(wrapperName)) {
-                deployChainlinkOEVWrapper(
-                    addresses,
-                    _oracleConfigs[OPTIMISM_CHAIN_ID][i].oracleName
-                );
+                // new version of deploy script not compatiblw with old wrapper
+                //deployChainlinkOEVWrapper(
+                //   addresses,
+                //  _oracleConfigs[OPTIMISM_CHAIN_ID][i].oracleName
+                //);
             }
         }
         vm.stopBroadcast();
@@ -170,10 +170,11 @@ contract mipx14 is HybridProposal, DeployChainlinkOEVWrapper {
                 )
             );
             if (!addresses.isAddressSet(wrapperName)) {
-                deployChainlinkOEVWrapper(
-                    addresses,
-                    _oracleConfigs[BASE_CHAIN_ID][i].oracleName
-                );
+                // new version of deploy script not compatiblw with old wrapper
+                //deployChainlinkOEVWrapper(
+                //   addresses,
+                //  _oracleConfigs[BASE_CHAIN_ID][i].oracleName
+                //);
             }
         }