fix integration tests by increasing borrow cap

Author: anajuliabit

src/morpho/IMorphoChainlinkOracleV2.sol

@@ -9,7 +9,7 @@ import {AggregatorV3Interface} from "@protocol/oracles/AggregatorV3Interface.sol
 /// @custom:contact [email protected]
 /// @notice Interface of MorphoChainlinkOracleV2.
 interface IMorphoChainlinkOracleV2 {
-    /// @notice Returns the address of the base ERC4626 vault.
+    /// @notice Returns hte address of the base ERC4626 vault.
     function BASE_VAULT() external view returns (IERC4626);
 
     /// @notice Returns the base vault conversion sample.

test/integration/IRModelWethUpgradePostProposalIntegration.t.sol

@@ -11,10 +11,12 @@ import {Configs} from "@proposals/Configs.sol";
 import {AllChainAddresses as Addresses} from "@proposals/Addresses.sol";
 import {Comptroller} from "@protocol/Comptroller.sol";
 import {PostProposalCheck} from "@test/integration/PostProposalCheck.sol";
+import {MarketBase} from "@test/utils/MarketBase.sol";
 import {BASE_FORK_ID} from "@utils/ChainIds.sol";
 
 contract IRModelWethUpgradePostProposalTest is PostProposalCheck, Configs {
     Comptroller comptroller;
+    MarketBase marketBase;
     MErc20 mUSDbC;
     MErc20 mWeth;
     MErc20 mcbEth;
@@ -25,6 +27,7 @@ contract IRModelWethUpgradePostProposalTest is PostProposalCheck, Configs {
         vm.selectFork(BASE_FORK_ID);
 
         comptroller = Comptroller(addresses.getAddress("UNITROLLER"));
+        marketBase = new MarketBase(comptroller);
         mUSDbC = MErc20(addresses.getAddress("MOONWELL_USDBC"));
         mWeth = MErc20(addresses.getAddress("MOONWELL_WETH"));
         mcbEth = MErc20(addresses.getAddress("MOONWELL_cbETH"));
@@ -54,21 +57,8 @@ contract IRModelWethUpgradePostProposalTest is PostProposalCheck, Configs {
         testSupplyingWethAfterIRModelUpgradeSucceeds();
         uint256 borrowAmount = 74e18;
 
-        // Check current borrow cap and increase if needed
-        uint256 currentBorrowCap = comptroller.borrowCaps(address(mWeth));
-        uint256 totalBorrows = mWeth.totalBorrows();
-        uint256 nextTotalBorrows = totalBorrows + borrowAmount;
-
-        // If borrow would hit cap, increase it
-        if (currentBorrowCap != 0 && nextTotalBorrows >= currentBorrowCap) {
-            vm.startPrank(addresses.getAddress("TEMPORAL_GOVERNOR"));
-            MToken[] memory mTokens = new MToken[](1);
-            mTokens[0] = mWeth;
-            uint256[] memory newBorrowCaps = new uint256[](1);
-            newBorrowCaps[0] = currentBorrowCap + borrowAmount;
-            comptroller._setMarketBorrowCaps(mTokens, newBorrowCaps);
-            vm.stopPrank();
-        }
+        // Ensure sufficient borrow cap using the utility function
+        marketBase.ensureSufficientBorrowCap(mWeth, borrowAmount, addresses);
 
         address[] memory mToken = new address[](1);
         mToken[0] = address(mWeth);

test/integration/ReentrancyBaseLiveSystemIntegration.t.sol

@@ -15,6 +15,7 @@ import {mipb02 as mip} from "@proposals/mips/mip-b02/mip-b02.sol";
 import {MErc20Delegator} from "@protocol/MErc20Delegator.sol";
 import {MaliciousBorrower} from "@test/mock/MaliciousBorrower.sol";
 import {PostProposalCheck} from "@test/integration/PostProposalCheck.sol";
+import {MarketBase} from "@test/utils/MarketBase.sol";
 import {ComptrollerErrorReporter} from "@protocol/TokenErrorReporter.sol";
 import {AllChainAddresses as Addresses} from "@proposals/Addresses.sol";
 
@@ -24,6 +25,7 @@ contract ReentrancyPostProposalTest is
     ComptrollerErrorReporter
 {
     Comptroller comptroller;
+    MarketBase marketBase;
     WETHRouter router;
 
     function setUp() public override {
@@ -32,6 +34,7 @@ contract ReentrancyPostProposalTest is
         vm.selectFork(BASE_FORK_ID);
 
         comptroller = Comptroller(addresses.getAddress("UNITROLLER"));
+        marketBase = new MarketBase(comptroller);
         router = WETHRouter(payable(addresses.getAddress("WETH_ROUTER")));
     }
 
@@ -95,6 +98,14 @@ contract ReentrancyPostProposalTest is
 
         deal(addresses.getAddress("WETH"), address(borrower), 100e18); /// fund attack contract with weth
 
+        // Ensure sufficient borrow cap for the attack (60 WETH = 100 * 0.6)
+        uint256 borrowAmount = 60e18;
+        marketBase.ensureSufficientBorrowCap(
+            MErc20(mToken),
+            borrowAmount,
+            addresses
+        );
+
         vm.expectRevert("re-entered"); /// cannot reenter and borrow
         borrower.exploit();
     }
@@ -108,6 +119,14 @@ contract ReentrancyPostProposalTest is
 
         deal(addresses.getAddress("WETH"), address(borrower), 100e18); /// fund attack contract with weth
 
+        // Ensure sufficient borrow cap for the attack (60 WETH = 100 * 0.6)
+        uint256 borrowAmount = 60e18;
+        marketBase.ensureSufficientBorrowCap(
+            MErc20(mToken),
+            borrowAmount,
+            addresses
+        );
+
         vm.expectEmit(true, true, true, true, address(comptroller));
         /// cannot reenter and borrow
 

test/integration/oracle/ChainlinkOEVWrapperIntegration.t.sol

@@ -257,19 +257,13 @@ contract ChainlinkOEVWrapperIntegrationTest is PostProposalCheck {
             // so we need to convert borrow amount to 6 decimals
             borrowAmount = ((liquidity * 80) / 100) / 1e12; // Changed from full amount
 
-            // before borrowing, increase borrow cap to make sure we borrow a significant amount
-            vm.startPrank(addresses.getAddress("TEMPORAL_GOVERNOR"));
-            MToken[] memory mTokens = new MToken[](1);
-            mTokens[0] = mTokenBorrowed;
-            uint256[] memory newBorrowCaps = new uint256[](1);
-            uint256 currentBorrowCap = comptroller.borrowCaps(
-                address(mTokens[0])
+            // Ensure sufficient borrow cap using the utility function
+            marketBase.ensureSufficientBorrowCap(
+                mTokenBorrowed,
+                borrowAmount,
+                addresses
             );
 
-            newBorrowCaps[0] = currentBorrowCap + borrowAmount;
-            comptroller._setMarketBorrowCaps(mTokens, newBorrowCaps);
-            vm.stopPrank();
-
             // make sure the mToken has enough underlying to borrow
             deal(
                 MErc20(address(mTokenBorrowed)).underlying(),

test/utils/MarketBase.sol

@@ -1,11 +1,13 @@
 //SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.19;
 
+import {Test} from "@forge-std/Test.sol";
 import {MToken} from "@protocol/MToken.sol";
 import {Comptroller} from "@protocol/Comptroller.sol";
 import {ExponentialNoError} from "@protocol/ExponentialNoError.sol";
+import {AllChainAddresses as Addresses} from "@proposals/Addresses.sol";
 
-contract MarketBase is ExponentialNoError {
+contract MarketBase is ExponentialNoError, Test {
     Comptroller comptroller;
 
     constructor(Comptroller _comptroller) {
@@ -106,4 +108,30 @@ contract MarketBase is ExponentialNoError {
                     : borrowableAmount
             ) - 1;
     }
+
+    /// @notice Ensures sufficient borrow cap for a given borrow amount
+    /// @dev If the current borrow cap would be exceeded, this function increases it
+    /// @param mToken The market token to check/increase borrow cap for
+    /// @param borrowAmount The amount to be borrowed
+    /// @param addresses The addresses contract to get TEMPORAL_GOVERNOR
+    function ensureSufficientBorrowCap(
+        MToken mToken,
+        uint256 borrowAmount,
+        Addresses addresses
+    ) public {
+        uint256 currentBorrowCap = comptroller.borrowCaps(address(mToken));
+        uint256 totalBorrows = mToken.totalBorrows();
+        uint256 nextTotalBorrows = totalBorrows + borrowAmount;
+
+        // If borrow would hit cap, increase it
+        if (currentBorrowCap != 0 && nextTotalBorrows >= currentBorrowCap) {
+            vm.startPrank(addresses.getAddress("TEMPORAL_GOVERNOR"));
+            MToken[] memory mTokens = new MToken[](1);
+            mTokens[0] = mToken;
+            uint256[] memory newBorrowCaps = new uint256[](1);
+            newBorrowCaps[0] = currentBorrowCap + borrowAmount;
+            comptroller._setMarketBorrowCaps(mTokens, newBorrowCaps);
+            vm.stopPrank();
+        }
+    }
 }