fix proposal

Author: imthatcarlos

proposals/mips/mip-x35/x35.sol

@@ -17,13 +17,12 @@ import {ProxyAdmin} from "@openzeppelin-contracts/contracts/proxy/transparent/Pr
 import {validateProxy} from "@proposals/utils/ProxyUtils.sol";
 
 // this proposal should
-// 1. deploy the new ChainlinkOEVWrapper and ChainlinkOEVMorphoWrapper contracts
-// 2. upgrade existing ChainlinkOracleProxy contracts for all markets => test that storage can still be accessed
+// 1. deploy new non-upgradeable ChainlinkOEVWrapper contracts for core markets
+// 2. upgrade existing ChainlinkOEVMorphoWrapper proxy contracts for Morpho markets => test that storage can still be accessed
 // 3. call setFeed on the ChainlinkOracle for all markets, to point to the new ChainlinkOEVWrapper contracts
 contract x35 is HybridProposal, Configs, Networks {
     string public constant override name = "MIP-X35";
 
-    string public constant IMPLEMENTATION_NAME = "CHAINLINK_OEV_WRAPPER_IMPL";
     string public constant MORPHO_IMPLEMENTATION_NAME =
         "CHAINLINK_OEV_MORPHO_WRAPPER_IMPL";
 
@@ -152,7 +151,7 @@ contract x35 is HybridProposal, Configs, Networks {
         }
     }
 
-    /// @dev deploy implementation contract (if not already deployed) and deploy proxies for all core markets
+    /// @dev deploy direct instances (non-upgradeable) for all core markets
     function _deployCoreWrappers(Addresses addresses) internal {
         OracleConfig[] memory oracleConfigs = getOracleConfigurations(
             block.chainid
@@ -164,72 +163,32 @@ contract x35 is HybridProposal, Configs, Networks {
 
         vm.startBroadcast();
 
-        // Deploy or get the implementation contract
-        ChainlinkOEVWrapper impl;
-        if (!addresses.isAddressSet(IMPLEMENTATION_NAME)) {
-            impl = new ChainlinkOEVWrapper();
-            addresses.addAddress(IMPLEMENTATION_NAME, address(impl));
-        } else {
-            impl = ChainlinkOEVWrapper(
-                addresses.getAddress(IMPLEMENTATION_NAME)
-            );
-        }
-
         for (uint256 i = 0; i < oracleConfigs.length; i++) {
             OracleConfig memory config = oracleConfigs[i];
 
             string memory wrapperName = string(
                 abi.encodePacked(config.oracleName, "_OEV_WRAPPER")
             );
 
-            // Initialize proxy
-            address proxyAdmin;
-            if (!addresses.isAddressSet("CHAINLINK_ORACLE_PROXY_ADMIN")) {
-                ProxyAdmin _proxyAdmin = new ProxyAdmin();
-                addresses.addAddress(
-                    "CHAINLINK_ORACLE_PROXY_ADMIN",
-                    address(_proxyAdmin)
-                );
-                proxyAdmin = address(_proxyAdmin);
-            } else {
-                proxyAdmin = addresses.getAddress(
-                    "CHAINLINK_ORACLE_PROXY_ADMIN"
-                );
-            }
-            address owner = addresses.getAddress("TEMPORAL_GOVERNOR");
-
-            // TODO: who should be the fee recipient?
-            address feeRecipient = addresses.isAddressSet(
-                "OEV_WRAPPER_FEE_RECIPIENT"
-            )
-                ? addresses.getAddress("OEV_WRAPPER_FEE_RECIPIENT")
-                : owner;
-
-            bytes memory initData = abi.encodeWithSelector(
-                ChainlinkOEVWrapper.initialize.selector,
+            ChainlinkOEVWrapper wrapper = new ChainlinkOEVWrapper(
                 addresses.getAddress(config.oracleName),
-                owner,
-                feeRecipient,
+                addresses.getAddress("TEMPORAL_GOVERNOR"),
+                addresses.getAddress("OEV_WRAPPER_FEE_RECIPIENT"),
+                addresses.getAddress("CHAINLINK_ORACLE"),
                 FEE_MULTIPLIER,
                 MAX_ROUND_DELAY,
                 MAX_DECREMENTS
             );
 
-            TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
-                address(impl),
-                proxyAdmin,
-                initData
-            );
-
-            // Set existing proxy to deprecated and add new proxy
+            // Set existing wrapper to deprecated and add new wrapper
             if (addresses.isAddressSet(wrapperName)) {
                 addresses.addAddress(
                     string(abi.encodePacked(wrapperName, "_DEPRECATED")),
                     addresses.getAddress(wrapperName)
                 );
-                addresses.changeAddress(wrapperName, address(proxy), true);
+                addresses.changeAddress(wrapperName, address(wrapper), true);
             } else {
-                addresses.addAddress(wrapperName, address(proxy));
+                addresses.addAddress(wrapperName, address(wrapper));
             }
         }
 
@@ -242,12 +201,24 @@ contract x35 is HybridProposal, Configs, Networks {
             return;
         }
 
+        vm.startBroadcast();
+
+        // Ensure proxy admin exists for Morpho wrapper upgrades
+        if (!addresses.isAddressSet("CHAINLINK_ORACLE_PROXY_ADMIN")) {
+            ProxyAdmin proxyAdmin = new ProxyAdmin();
+            addresses.addAddress(
+                "CHAINLINK_ORACLE_PROXY_ADMIN",
+                address(proxyAdmin)
+            );
+        }
+
+        // Deploy Morpho implementation if needed
         if (!addresses.isAddressSet(MORPHO_IMPLEMENTATION_NAME)) {
-            vm.startBroadcast();
             ChainlinkOEVMorphoWrapper impl = new ChainlinkOEVMorphoWrapper();
             addresses.addAddress(MORPHO_IMPLEMENTATION_NAME, address(impl));
-            vm.stopBroadcast();
         }
+
+        vm.stopBroadcast();
     }
 
     // FIX: test the contructor setting