Merge pull request #447 from morpho-org/chore/foundry-v1.4.1

Foundry v1.4.1

Author: QGarchery

foundry.lock

@@ -0,0 +1,17 @@
+{
+  "lib/erc4626-tests": {
+    "rev": "232ff9ba8194e406967f52ecc5cb52ed764209e9"
+  },
+  "lib/forge-std": {
+    "rev": "bf909b22fa55e244796dfa920c9639fdffa1c545"
+  },
+  "lib/morpho-blue": {
+    "rev": "e701e7ea524633682f81e355bec0d7c88fe02f65"
+  },
+  "lib/morpho-blue-irm": {
+    "rev": "a7d9cce3451b4a106bfd40933ac57a785b5228f3"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "c64a1edb67b6e3f4a15cca8909c9482ad33a02b0"
+  }
+}

foundry.toml

@@ -8,13 +8,24 @@ optimizer = true
 optimizer_runs = 200
 bytecode_hash = "none"
 
-[profile.default.rpc_endpoints]
+[rpc_endpoints]
 mainnet = "https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}"
 tenderly = "https://rpc.tenderly.co/fork/${TENDERLY_FORK_ID}"
 
 [profile.default.fmt]
 wrap_comments = true
 
+[lint]
+exclude_lints = [
+    "unaliased-plain-import",
+    "unused-import",
+    "erc20-unchecked-transfer",
+    "unwrapped-modifier-logic",
+    "mixed-case-variable",
+    "unsafe-typecast",
+    "asm-keccak256",
+]
+
 [profile.no_via_ir]
 via-ir = false
 

src/MetaMorpho.sol

@@ -467,10 +467,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
     }
 
     /// @inheritdoc IMetaMorphoBase
-    function acceptCap(MarketParams memory marketParams)
-        external
-        afterTimelock(pendingCap[marketParams.id()].validAt)
-    {
+    function acceptCap(MarketParams memory marketParams) external afterTimelock(pendingCap[marketParams.id()].validAt) {
         Id id = marketParams.id();
 
         // Safe "unchecked" cast because pendingCap <= type(uint184).max.

src/MetaMorphoFactory.sol

@@ -45,8 +45,9 @@ contract MetaMorphoFactory is IMetaMorphoFactory {
         string memory symbol,
         bytes32 salt
     ) external returns (IMetaMorpho metaMorpho) {
-        metaMorpho =
-            IMetaMorpho(address(new MetaMorpho{salt: salt}(initialOwner, MORPHO, initialTimelock, asset, name, symbol)));
+        metaMorpho = IMetaMorpho(
+            address(new MetaMorpho{salt: salt}(initialOwner, MORPHO, initialTimelock, asset, name, symbol))
+        );
 
         isMetaMorpho[address(metaMorpho)] = true;
 

src/mocks/ERC1820Registry.sol

@@ -28,6 +28,7 @@
  *
  */
 pragma solidity ^0.8.0;
+
 // IV is value needed to have a vanity address starting with '0x1820'.
 // IV: 53759
 
@@ -205,15 +206,14 @@ contract ERC1820Registry {
             mstore(x, erc165ID) // Place signature at beginning of empty storage
             mstore(add(x, 0x04), _interfaceId) // Place first argument directly next to signature
 
-            success :=
-                staticcall(
-                    30000, // 30k gas
-                    _contract, // To addr
-                    x, // Inputs are stored at location x
-                    0x24, // Inputs are 36 (4 + 32) bytes long
-                    x, // Store output over input (saves space)
-                    0x20 // Outputs are 32 bytes long
-                )
+            success := staticcall(
+                30000, // 30k gas
+                _contract, // To addr
+                x, // Inputs are stored at location x
+                0x24, // Inputs are 36 (4 + 32) bytes long
+                x, // Store output over input (saves space)
+                0x20 // Outputs are 32 bytes long
+            )
 
             result := mload(x) // Load the result
         }

src/mocks/ERC777Mock.sol

@@ -296,10 +296,7 @@ contract ERC777 is Context, IERC777, IERC20 {
      * - if `account` is a contract, it must implement the {IERC777Recipient}
      * interface.
      */
-    function _mint(address account, uint256 amount, bytes memory userData, bytes memory operatorData)
-        internal
-        virtual
-    {
+    function _mint(address account, uint256 amount, bytes memory userData, bytes memory operatorData) internal virtual {
         _mint(account, amount, userData, operatorData, true);
     }
 

test/forge/ReallocateIdleTest.sol

@@ -34,11 +34,11 @@ contract ReallocateIdleTest is IntegrationTest {
         suppliedAssets[1] = bound(suppliedAssets[1], 1, CAP2);
         suppliedAssets[2] = bound(suppliedAssets[2], 1, CAP2);
 
-        allocations.push(MarketAllocation(idleParams, 0));
-        allocations.push(MarketAllocation(allMarkets[0], suppliedAssets[0]));
-        allocations.push(MarketAllocation(allMarkets[1], suppliedAssets[1]));
-        allocations.push(MarketAllocation(allMarkets[2], suppliedAssets[2]));
-        allocations.push(MarketAllocation(idleParams, type(uint256).max));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: suppliedAssets[0]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: suppliedAssets[1]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: suppliedAssets[2]}));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: type(uint256).max}));
 
         uint256 idleBefore = _idle();
 

test/forge/ReallocateWithdrawTest.sol

@@ -34,10 +34,10 @@ contract ReallocateWithdrawTest is IntegrationTest {
     }
 
     function testReallocateWithdrawMax() public {
-        allocations.push(MarketAllocation(allMarkets[0], 0));
-        allocations.push(MarketAllocation(allMarkets[1], 0));
-        allocations.push(MarketAllocation(allMarkets[2], 0));
-        allocations.push(MarketAllocation(idleParams, type(uint256).max));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: type(uint256).max}));
 
         vm.expectEmit();
         emit EventsLib.ReallocateWithdraw(
@@ -72,7 +72,7 @@ contract ReallocateWithdrawTest is IntegrationTest {
         morpho.supply(allMarkets[0], 1, 0, address(vault), hex"");
         vm.stopPrank();
 
-        allocations.push(MarketAllocation(allMarkets[0], 0));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 0}));
 
         vm.prank(ALLOCATOR);
         vm.expectRevert(abi.encodeWithSelector(ErrorsLib.MarketNotEnabled.selector, allMarkets[0].id()));
@@ -95,11 +95,11 @@ contract ReallocateWithdrawTest is IntegrationTest {
         assets[1] = morpho.expectedSupplyAssets(allMarkets[1], address(vault));
         assets[2] = morpho.expectedSupplyAssets(allMarkets[2], address(vault));
 
-        allocations.push(MarketAllocation(idleParams, 0));
-        allocations.push(MarketAllocation(allMarkets[0], newAssets[0]));
-        allocations.push(MarketAllocation(allMarkets[1], newAssets[1]));
-        allocations.push(MarketAllocation(allMarkets[2], newAssets[2]));
-        allocations.push(MarketAllocation(idleParams, type(uint256).max));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: newAssets[0]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: newAssets[1]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: newAssets[2]}));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: type(uint256).max}));
 
         uint256 expectedIdle = _idle() + 3 * CAP2 - newAssets[0] - newAssets[1] - newAssets[2];
 
@@ -141,9 +141,9 @@ contract ReallocateWithdrawTest is IntegrationTest {
     function testReallocateWithdrawIncreaseSupply() public {
         _setCap(allMarkets[2], 3 * CAP2);
 
-        allocations.push(MarketAllocation(allMarkets[0], 0));
-        allocations.push(MarketAllocation(allMarkets[1], 0));
-        allocations.push(MarketAllocation(allMarkets[2], 3 * CAP2));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: 3 * CAP2}));
 
         vm.expectEmit();
         emit EventsLib.ReallocateWithdraw(
@@ -175,25 +175,25 @@ contract ReallocateWithdrawTest is IntegrationTest {
 
         _setCap(allMarkets[1], 0);
 
-        allocations.push(MarketAllocation(allMarkets[0], 0));
-        allocations.push(MarketAllocation(allMarkets[1], 0));
-        allocations.push(MarketAllocation(allMarkets[2], 0));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: 0}));
 
-        allocations.push(MarketAllocation(allMarkets[0], suppliedAssets[0]));
-        allocations.push(MarketAllocation(allMarkets[1], suppliedAssets[1]));
-        allocations.push(MarketAllocation(allMarkets[2], suppliedAssets[2]));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: suppliedAssets[0]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: suppliedAssets[1]}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: suppliedAssets[2]}));
 
         vm.prank(ALLOCATOR);
         vm.expectRevert(abi.encodeWithSelector(ErrorsLib.UnauthorizedMarket.selector, allMarkets[1].id()));
         vault.reallocate(allocations);
     }
 
     function testReallocateSupplyCapExceeded() public {
-        allocations.push(MarketAllocation(allMarkets[0], 0));
-        allocations.push(MarketAllocation(allMarkets[1], 0));
-        allocations.push(MarketAllocation(allMarkets[2], 0));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[1], assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[2], assets: 0}));
 
-        allocations.push(MarketAllocation(allMarkets[0], CAP2 + 1));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: CAP2 + 1}));
 
         vm.prank(ALLOCATOR);
         vm.expectRevert(abi.encodeWithSelector(ErrorsLib.SupplyCapExceeded.selector, allMarkets[0].id()));
@@ -207,8 +207,8 @@ contract ReallocateWithdrawTest is IntegrationTest {
 
         _setCap(allMarkets[0], type(uint184).max);
 
-        allocations.push(MarketAllocation(idleParams, 0));
-        allocations.push(MarketAllocation(allMarkets[0], 2 * CAP2 + rewards));
+        allocations.push(MarketAllocation({marketParams: idleParams, assets: 0}));
+        allocations.push(MarketAllocation({marketParams: allMarkets[0], assets: 2 * CAP2 + rewards}));
 
         vm.prank(ALLOCATOR);
         vm.expectRevert(ErrorsLib.InconsistentReallocation.selector);

test/forge/helpers/BaseTest.sol

@@ -74,11 +74,7 @@ contract BaseTest is Test {
         irm.setApr(0.5 ether); // 50%.
 
         idleParams = MarketParams({
-            loanToken: address(loanToken),
-            collateralToken: address(0),
-            oracle: address(0),
-            irm: address(irm),
-            lltv: 0
+            loanToken: address(loanToken), collateralToken: address(0), oracle: address(0), irm: address(irm), lltv: 0
         });
 
         vm.startPrank(MORPHO_OWNER);

test/forge/helpers/IntegrationTest.sol

@@ -51,8 +51,9 @@ contract IntegrationTest is BaseTest {
         string memory name,
         string memory symbol
     ) public returns (IMetaMorpho) {
-        return
-            IMetaMorpho(deployCode("MetaMorpho.sol", abi.encode(owner, morpho, initialTimelock, asset, name, symbol)));
+        return IMetaMorpho(
+            deployCode("MetaMorpho.sol", abi.encode(owner, morpho, initialTimelock, asset, name, symbol))
+        );
     }
 
     function _idle() internal view returns (uint256) {