fix morpho tests

Author: imthatcarlos

proposals/ChainlinkOracleConfigs.sol

@@ -86,11 +86,13 @@ abstract contract ChainlinkOracleConfigs is Test {
                 "MOONWELL_MAMO"
             )
         );
+
+        /// NOTE: stkWELL does not have an equivalent MToken to add reserves to, so use TEMPORAL_GOVERNOR as the fee recipient
         _MorphoOracleConfigs[BASE_CHAIN_ID].push(
             MorphoOracleConfig(
                 "CHAINLINK_stkWELL_USD",
                 "CHAINLINK_WELL_USD",
-                "MOONWELL_WELL"
+                "TEMPORAL_GOVERNOR"
             )
         );
     }

src/oracles/ChainlinkOEVMorphoWrapper.sol

@@ -452,12 +452,27 @@ contract ChainlinkOEVMorphoWrapper is
             liquidatorFee
         );
 
-        // transfer the remainder to the protocol's core market for this collateral
-        EIP20Interface(marketParams.collateralToken).approve(
-            feeRecipient,
-            protocolFee
+        // transfer the remainder to the fee recipient
+        // if the fee recipient is an MToken, add as reserves
+        // otherwise, just transfer the tokens directly
+        EIP20Interface collateralToken = EIP20Interface(
+            marketParams.collateralToken
         );
-        MErc20(feeRecipient)._addReserves(protocolFee);
+
+        // Check if fee recipient is an MToken by checking if it has isMToken constant
+        try MErc20(feeRecipient).isMToken() returns (bool isMToken) {
+            if (isMToken) {
+                // It's an MToken, add as reserves
+                collateralToken.approve(feeRecipient, protocolFee);
+                MErc20(feeRecipient)._addReserves(protocolFee);
+            } else {
+                // Not an MToken, just transfer
+                collateralToken.transfer(feeRecipient, protocolFee);
+            }
+        } catch {
+            // If the call fails, it's not an MToken, just transfer
+            collateralToken.transfer(feeRecipient, protocolFee);
+        }
 
         emit PriceUpdatedEarlyAndLiquidated(
             borrower,

test/integration/oracle/ChainlinkOEVMorphoWrapperIntegration.t.sol

@@ -190,6 +190,8 @@ contract ChainlinkOEVMorphoWrapperIntegrationTest is
     }
 
     function testUpdatePriceEarlyAndLiquidate_stkWELL() public {
+        // Note: stkWELL has no market, so fee recipient should be set to treasury
+        // The wrapper will automatically detect this and transfer instead of calling _addReserves
         _testLiquidation(
             addresses.getAddress("CHAINLINK_stkWELL_USD_ORACLE_PROXY"),
             addresses.getAddress("STK_GOVTOKEN_PROXY"),
@@ -206,8 +208,8 @@ contract ChainlinkOEVMorphoWrapperIntegrationTest is
             addresses.getAddress("MAMO"),
             addresses.getAddress("MORPHO_CHAINLINK_MAMO_USD_ORACLE"),
             0.385e18,
-            50_000e18, // More MAMO tokens
-            500e18
+            250_000e18, // Scale up collateral (5x from 50k to match WELL's economic value)
+            2_500e18 // Scale up seized amount proportionally (MAMO is 4x WELL price, so 10k/4 = 2.5k)
         );
     }
 
@@ -266,14 +268,37 @@ contract ChainlinkOEVMorphoWrapperIntegrationTest is
             )
         );
 
-        // Execute liquidation and validate
+        // Execute liquidation
+        _executeLiquidation(
+            wrapper,
+            params,
+            loanToken,
+            borrowAmount,
+            seized,
+            collToken
+        );
+    }
+
+    function _executeLiquidation(
+        ChainlinkOEVMorphoWrapper wrapper,
+        MarketParams memory params,
+        address loanToken,
+        uint256 borrowAmount,
+        uint256 seized,
+        address collToken
+    ) internal {
         deal(loanToken, LIQUIDATOR, borrowAmount);
         vm.startPrank(LIQUIDATOR);
         IERC20(loanToken).approve(address(wrapper), borrowAmount);
 
         uint256 liqLoanBefore = IERC20(loanToken).balanceOf(LIQUIDATOR);
         uint256 liqCollBefore = IERC20(collToken).balanceOf(LIQUIDATOR);
 
+        // Capture fee recipient state before
+        address feeRecipient = wrapper.feeRecipient();
+        uint256 feeStateBefore = _getFeeRecipientState(feeRecipient, collToken);
+        bool isMToken = _isFeeRecipientMToken(feeRecipient);
+
         wrapper.updatePriceEarlyAndLiquidate(
             params,
             BORROWER,
@@ -282,6 +307,7 @@ contract ChainlinkOEVMorphoWrapperIntegrationTest is
         );
         vm.stopPrank();
 
+        // Assertions
         assertEq(wrapper.cachedRoundId(), 777);
         assertGt(
             liqLoanBefore - IERC20(loanToken).balanceOf(LIQUIDATOR),
@@ -293,13 +319,39 @@ contract ChainlinkOEVMorphoWrapperIntegrationTest is
             0,
             "no collateral received"
         );
+
+        // Verify protocol fee was collected
+        uint256 feeStateAfter = _getFeeRecipientState(feeRecipient, collToken);
         assertGt(
-            IERC20(collToken).balanceOf(wrapper.feeRecipient()),
-            0,
-            "no fee collected"
+            feeStateAfter,
+            feeStateBefore,
+            isMToken
+                ? "no fee collected (reserves)"
+                : "no fee collected (balance)"
         );
     }
 
+    function _isFeeRecipientMToken(
+        address feeRecipient
+    ) internal view returns (bool) {
+        try MErc20(feeRecipient).isMToken() returns (bool _isMToken) {
+            return _isMToken;
+        } catch {
+            return false;
+        }
+    }
+
+    function _getFeeRecipientState(
+        address feeRecipient,
+        address collToken
+    ) internal view returns (uint256) {
+        if (_isFeeRecipientMToken(feeRecipient)) {
+            return MErc20(feeRecipient).totalReserves();
+        } else {
+            return IERC20(collToken).balanceOf(feeRecipient);
+        }
+    }
+
     function testUpdatePriceEarlyAndLiquidate_RevertArgsZero() public {
         MarketParams memory params;
         address mUSDC = addresses.getAddress("MOONWELL_USDC");