Test fixes post Aave3.2

config/ethereum-mainnet.json

@@ -1,7 +1,7 @@
 {
     "chainId": 1,
     "rpcAlias": "mainnet",
-    "forkBlockNumber": 16841312,
+    "forkBlockNumber": 0,
     "addressesProvider": "0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e",
     "morphoDao": "0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa",
     "morphoEth": "0x33333aea097c193e66081E930c33020272b33333",

foundry.toml

@@ -3,6 +3,8 @@ names = true
 sizes = true
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read", path = "./config/"}]
+gas_limit = "18446744073709551615" # 2^64 - 1, to remove the gas limit
+evm_version = "shanghai"
 
 [fuzz]
 runs = 32

test/helpers/ForkTest.sol

@@ -5,7 +5,7 @@ import {IAToken} from "src/interfaces/aave/IAToken.sol";
 import {IAaveOracle} from "@aave-v3-core/interfaces/IAaveOracle.sol";
 import {IPriceOracleGetter} from "@aave-v3-core/interfaces/IPriceOracleGetter.sol";
 import {IACLManager} from "@aave-v3-core/interfaces/IACLManager.sol";
-import {IPoolConfigurator} from "@aave-v3-core/interfaces/IPoolConfigurator.sol";
+import {IPoolConfigurator} from "src/interfaces/aave/IPoolConfigurator.sol";
 import {IPoolDataProvider} from "@aave-v3-core/interfaces/IPoolDataProvider.sol";
 import {IPool, IPoolAddressesProvider} from "@aave-v3-core/interfaces/IPool.sol";
 import {IStableDebtToken} from "@aave-v3-core/interfaces/IStableDebtToken.sol";
@@ -99,6 +99,7 @@ contract ForkTest is BaseTest, Configured {
 
         forkId = forkBlockNumber == 0 ? vm.createSelectFork(rpcUrl) : vm.createSelectFork(rpcUrl, forkBlockNumber);
         vm.chainId(config.getChainId());
+        console.log("fork block number", block.number);
     }
 
     function _loadConfig() internal virtual override {
@@ -180,24 +181,31 @@ contract ForkTest is BaseTest, Configured {
     }
 
     /// @dev Avoids to revert because of AAVE token snapshots: https://github.com/aave/aave-token-v2/blob/master/contracts/token/base/GovernancePowerDelegationERC20.sol#L174
-    function _deal(address underlying, address user, uint256 amount) internal {
+    function deal(address underlying, address user, uint256 amount) internal override {
         if (amount == 0) return;
 
-        if (underlying == weth) deal(weth, weth.balance + amount); // Refill wrapped Ether.
-
+        // Needed because AAVE packs the balance struct.
         if (underlying == aave) {
-            uint256 balance = ERC20(underlying).balanceOf(user);
-
-            if (amount > balance) ERC20(underlying).safeTransfer(user, amount - balance);
-            if (amount < balance) {
-                vm.prank(user);
-                ERC20(underlying).safeTransfer(address(this), balance - amount);
-            }
+            // The slot of the balance struct "_balances" is 0.
+            bytes32 balanceSlot = keccak256(abi.encode(user, uint256(0)));
+            bytes32 initialValue = vm.load(aave, balanceSlot);
+            // The balance is stored in the first 104 bits.
+            bytes32 finalValue = ((initialValue >> 104) << 104) | bytes32(uint256(amount));
+            vm.store(aave, balanceSlot, finalValue);
+            require(ERC20(aave).balanceOf(user) == uint256(amount));
+
+            uint256 totalSupplyBefore = ERC20(aave).totalSupply();
+            // The slot of the balance struct "totalSupply" is 2.
+            bytes32 totalSupplySlot = bytes32(uint256(2));
+            vm.store(aave, totalSupplySlot, bytes32(totalSupplyBefore + amount));
+            require(ERC20(aave).totalSupply() == totalSupplyBefore + amount);
 
             return;
         }
 
-        deal(underlying, user, amount);
+        if (underlying == weth) super.deal(weth, weth.balance + amount); // Refill wrapped Ether.
+
+        super.deal(underlying, user, amount);
     }
 
     /// @dev Reverts the fork to its initial fork state.
@@ -244,14 +252,10 @@ contract ForkTest is BaseTest, Configured {
         uint8 eModeCategoryId
     ) internal {
         poolAdmin.setEModeCategory(
-            eModeCategoryId,
-            eModeCategory.ltv,
-            eModeCategory.liquidationThreshold,
-            eModeCategory.liquidationBonus,
-            address(1),
-            ""
+            eModeCategoryId, eModeCategory.ltv, eModeCategory.liquidationThreshold, eModeCategory.liquidationBonus, ""
         );
-        poolAdmin.setAssetEModeCategory(underlying, eModeCategoryId);
+        poolAdmin.setAssetBorrowableInEMode(underlying, eModeCategoryId, true);
+        poolAdmin.setAssetCollateralInEMode(underlying, eModeCategoryId, true);
     }
 
     function _assumeNotUnderlying(address input) internal view {

test/helpers/IntegrationTest.sol

@@ -234,7 +234,7 @@ contract IntegrationTest is ForkTest {
         internal
         bypassSupplyCap(underlying, amount)
     {
-        _deal(underlying, address(this), amount);
+        deal(underlying, address(this), amount);
         ERC20(underlying).safeApprove(address(pool), amount);
         pool.deposit(underlying, amount, onBehalf, 0);
     }
@@ -307,7 +307,7 @@ contract IntegrationTest is ForkTest {
         uint256 maxIterations
     ) internal returns (uint256 collateral, uint256 borrowed) {
         collateral = collateralMarket.minBorrowCollateral(borrowedMarket, amount, eModeCategoryId);
-        _deal(collateralMarket.underlying, borrower, collateral);
+        deal(collateralMarket.underlying, borrower, collateral);
 
         vm.startPrank(borrower);
         ERC20(collateralMarket.underlying).safeApprove(address(morpho), collateral);

test/integration/TestIntegrationBorrow.sol

@@ -542,7 +542,6 @@ contract TestIntegrationBorrow is IntegrationTest {
 
         TestMarket storage market = testMarkets[_randomUnderlying(seed)];
 
-        poolAdmin.setReserveStableRateBorrowing(market.underlying, false);
         poolAdmin.setReserveBorrowing(market.underlying, false);
 
         vm.expectRevert(Errors.BorrowNotEnabled.selector);

test/integration/TestIntegrationPermit2.sol

@@ -63,7 +63,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         uint256 balanceBefore = ERC20(market.underlying).balanceOf(delegator);
         uint256 balanceSupplyBefore = morpho.supplyBalance(market.underlying, delegator);
@@ -105,7 +105,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         uint256 balanceBefore = ERC20(market.underlying).balanceOf(delegator);
         uint256 balanceSupplyBefore = morpho.supplyBalance(market.underlying, delegator);
@@ -158,7 +158,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         amount = morpho.borrowBalance(market.underlying, onBehalf) - 1;
         Types.Signature memory sig = _signPermit2(market.underlying, delegator, spender, amount, deadline, privateKey);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         uint256 balanceBefore = ERC20(market.underlying).balanceOf(delegator);
 
@@ -200,7 +200,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         Types.Signature memory sig =
             _signPermit2(market.underlying, delegator, spender, type(uint160).max, deadline, privateKey);
 
-        _deal(market.underlying, delegator, type(uint160).max);
+        deal(market.underlying, delegator, type(uint160).max);
 
         vm.prank(delegator);
         morpho.repayWithPermit(market.underlying, type(uint160).max, onBehalf, deadline, sig);
@@ -232,7 +232,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         vm.prank(delegator);
         ERC20(market.underlying).safeApprove(address(PERMIT2), type(uint256).max);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         timestamp = bound(timestamp, deadline + 1, type(uint256).max);
         vm.warp(timestamp);
@@ -267,7 +267,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         vm.prank(delegator);
         ERC20(market.underlying).safeApprove(address(PERMIT2), type(uint256).max);
 
-        _deal(market.underlying, delegator, 2 * amount);
+        deal(market.underlying, delegator, 2 * amount);
 
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);
@@ -305,7 +305,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         vm.prank(delegator);
         ERC20(market.underlying).safeApprove(address(PERMIT2), type(uint256).max);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);
@@ -339,7 +339,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         vm.prank(delegator);
         ERC20(market.underlying).safeApprove(address(PERMIT2), type(uint256).max);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);
@@ -376,7 +376,7 @@ contract TestIntegrationPermit2 is IntegrationTest {
         vm.prank(delegator);
         ERC20(market.underlying).safeApprove(address(PERMIT2), type(uint256).max);
 
-        _deal(market.underlying, delegator, amount);
+        deal(market.underlying, delegator, amount);
 
         timestamp = bound(timestamp, 0, Math.min(deadline, type(uint48).max) - block.timestamp);
         vm.warp(block.timestamp + timestamp);

test/internal/TestInternalEMode.sol

@@ -44,8 +44,6 @@ contract TestInternalEMode is InternalTest, PositionsManagerInternal {
         _createMarket(usdc, 0, 3_333);
         _createMarket(wNative, 0, 3_333);
 
-        _setBalances(address(this), type(uint256).max);
-
         ERC20(dai).approve(address(_pool), type(uint256).max);
         ERC20(wbtc).approve(address(_pool), type(uint256).max);
         ERC20(usdc).approve(address(_pool), type(uint256).max);

test/invariant/TestInvariantAccessControl.sol

@@ -50,7 +50,7 @@ contract TestInvariantAccessControl is InvariantTest {
         onBehalf = _randomSender(onBehalf);
         maxIterations = _boundMaxIterations(maxIterations);
 
-        _deal(market.underlying, msg.sender, amount);
+        deal(market.underlying, msg.sender, amount);
 
         vm.prank(msg.sender); // Cannot startPrank because `morpho.supply` may revert and not call stopPrank.
         ERC20(market.underlying).safeApprove(address(morpho), amount);
@@ -64,7 +64,7 @@ contract TestInvariantAccessControl is InvariantTest {
         amount = _boundSupply(market, amount);
         onBehalf = _randomSender(onBehalf);
 
-        _deal(market.underlying, msg.sender, amount);
+        deal(market.underlying, msg.sender, amount);
 
         vm.prank(msg.sender); // Cannot startPrank because `morpho.supplyCollateral` may revert and not call stopPrank.
         ERC20(market.underlying).safeApprove(address(morpho), amount);

test/invariant/TestInvariantMorpho.sol

@@ -77,7 +77,7 @@ contract TestInvariantMorpho is InvariantTest {
         onBehalf = _randomSender(onBehalf);
         maxIterations = _boundMaxIterations(maxIterations);
 
-        _deal(market.underlying, msg.sender, amount);
+        deal(market.underlying, msg.sender, amount);
 
         vm.prank(msg.sender); // Cannot startPrank because `morpho.supply` may revert and not call stopPrank.
         ERC20(market.underlying).safeApprove(address(morpho), amount);
@@ -106,7 +106,7 @@ contract TestInvariantMorpho is InvariantTest {
         amount = _boundNotZero(amount);
         onBehalf = _randomSender(onBehalf);
 
-        _deal(market.underlying, msg.sender, amount);
+        deal(market.underlying, msg.sender, amount);
 
         vm.prank(msg.sender); // Cannot startPrank because `morpho.repay` may revert and not call stopPrank.
         ERC20(market.underlying).safeApprove(address(morpho), amount);

test/mocks/PoolAdminMock.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import {IPoolConfigurator} from "@aave-v3-core/interfaces/IPoolConfigurator.sol";
+import {IPoolConfigurator} from "src/interfaces/aave/IPoolConfigurator.sol";
 
 contract PoolAdminMock {
     IPoolConfigurator internal immutable _POOL_CONFIGURATOR;
@@ -23,23 +23,20 @@ contract PoolAdminMock {
         uint16 ltv,
         uint16 liquidationThreshold,
         uint16 liquidationBonus,
-        address priceSourceEMode,
         string memory label
     ) external {
-        _POOL_CONFIGURATOR.setEModeCategory(
-            eModeCategoryId, ltv, liquidationThreshold, liquidationBonus, priceSourceEMode, label
-        );
+        _POOL_CONFIGURATOR.setEModeCategory(eModeCategoryId, ltv, liquidationThreshold, liquidationBonus, label);
     }
 
-    function setAssetEModeCategory(address asset, uint8 eModeCategoryId) external {
-        _POOL_CONFIGURATOR.setAssetEModeCategory(asset, eModeCategoryId);
+    function setAssetBorrowableInEMode(address asset, uint8 eModeCategoryId, bool borrowable) external {
+        _POOL_CONFIGURATOR.setAssetBorrowableInEMode(asset, eModeCategoryId, borrowable);
     }
 
-    function setReserveBorrowing(address asset, bool enabled) external {
-        _POOL_CONFIGURATOR.setReserveBorrowing(asset, enabled);
+    function setAssetCollateralInEMode(address asset, uint8 eModeCategoryId, bool collateral) external {
+        _POOL_CONFIGURATOR.setAssetCollateralInEMode(asset, eModeCategoryId, collateral);
     }
 
-    function setReserveStableRateBorrowing(address asset, bool enabled) external {
-        _POOL_CONFIGURATOR.setReserveStableRateBorrowing(asset, enabled);
+    function setReserveBorrowing(address asset, bool enabled) external {
+        _POOL_CONFIGURATOR.setReserveBorrowing(asset, enabled);
     }
 }