Improve hardhat gas tests

.github/workflows/hardhat.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   build-contracts:
-    name: Compilation
+    name: Gas tests
     runs-on: ubuntu-latest
 
     steps:

package.json

@@ -40,35 +40,35 @@
   "homepage": "https://github.com/morpho-labs/morpho-stack#readme",
   "dependencies": {
     "ethers": "^6.7.1",
-    "ethers-maths": "^4.0.2",
+    "ethers-maths": "^4.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.2",
     "@nomicfoundation/hardhat-ethers": "^3.0.4",
-    "@nomicfoundation/hardhat-foundry": "^1.0.3",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-foundry": "^1.1.1",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
-    "@types/chai": "^4.3.5",
-    "@types/lodash": "^4.14.197",
+    "@types/chai": "^4.3.6",
+    "@types/lodash": "^4.14.198",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.4",
-    "chai": "^4.3.7",
+    "@types/node": "^20.6.3",
+    "chai": "^4.3.8",
     "dotenv": "^16.3.1",
-    "hardhat": "^2.17.1",
+    "hardhat": "^2.17.3",
     "hardhat-gas-reporter": "^1.0.9",
     "hardhat-tracer": "^2.6.0",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
     "solidity-coverage": "^0.8.4",
     "ts-node": "^10.9.1",
     "typechain": "^8.3.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "lint-staged": {
     "*.sol": "forge fmt",
@@ -94,4 +94,4 @@
     ],
     "importOrderSeparation": true
   }
-}
+}

src/MetaMorpho.sol

@@ -60,7 +60,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
     uint96 public fee;
     address public feeRecipient;
 
-    uint96 public timelock;
+    uint256 public timelock;
     address public guardian;
 
     address public rewardsDistributor;
@@ -480,8 +480,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
     }
 
     function _setTimelock(uint256 newTimelock) internal {
-        // Safe "unchecked" cast because newTimelock <= MAX_TIMELOCK.
-        timelock = uint96(newTimelock);
+        timelock = newTimelock;
 
         emit EventsLib.SetTimelock(newTimelock);
 

src/interfaces/IMetaMorpho.sol

@@ -34,7 +34,7 @@ interface IMetaMorpho is IERC4626 {
     function fee() external view returns (uint96);
     function feeRecipient() external view returns (address);
     function rewardsDistributor() external view returns (address);
-    function timelock() external view returns (uint96);
+    function timelock() external view returns (uint256);
     function supplyQueue(uint256) external view returns (Id);
     function withdrawQueue(uint256) external view returns (Id);
     function config(Id) external view returns (uint192 cap, uint64 withdrawRank);

test/hardhat/MetaMorpho.spec.ts

@@ -141,7 +141,7 @@ describe("MetaMorpho", () => {
     for (const marketParams of allMarketParams) {
       await metaMorpho
         .connect(riskManager)
-        .submitCap(marketParams, (BigInt.WAD * 100n * toBigInt(suppliers.length)) / toBigInt(allMarketParams.length));
+        .submitCap(marketParams, (BigInt.WAD * 10n * toBigInt(suppliers.length)) / toBigInt(allMarketParams.length));
     }
 
     await metaMorpho.connect(riskManager).setSupplyQueue(allMarketParams.map(identifier));
@@ -173,9 +173,28 @@ describe("MetaMorpho", () => {
 
       await randomForwardTimestamp();
 
+      const allocation = await Promise.all(
+        allMarketParams.map(async (marketParams) => {
+          const id = identifier(marketParams);
+          const market = await morpho.market(id);
+          const position = await morpho.position(id, await metaMorpho.getAddress());
+
+          const assets = position.supplyShares
+            .mulDivDown(market.totalSupplyAssets + 1n, market.totalSupplyShares + 10n ** 6n)
+            .min(market.totalSupplyAssets - market.totalBorrowAssets);
+
+          return {
+            marketParams,
+            assets,
+          };
+        }),
+      );
+
       await metaMorpho.connect(allocator).reallocate(
-        [{ marketParams: allMarketParams[0], assets: assets / 2n }],
-        allMarketParams.map((marketParams) => ({ marketParams, assets: assets / toBigInt(nbMarkets + 1) / 2n })),
+        allocation.filter(({ assets }) => assets > 0n),
+        allocation
+          .map(({ marketParams, assets }) => ({ marketParams, assets: (assets * 3n) / 4n }))
+          .filter(({ assets }) => assets > 0n),
       );
 
       const borrower = borrowers[i];
@@ -184,15 +203,15 @@ describe("MetaMorpho", () => {
         const market = await morpho.market(identifier(marketParams));
         const liquidity = market.totalSupplyAssets - market.totalBorrowAssets;
 
-        assets = liquidity / 2n;
+        if (liquidity < 2n) break;
 
         await randomForwardTimestamp();
 
-        await morpho.connect(borrower).supplyCollateral(marketParams, assets, borrower.address, "0x");
+        await morpho.connect(borrower).supplyCollateral(marketParams, liquidity, borrower.address, "0x");
 
         await randomForwardTimestamp();
 
-        await morpho.connect(borrower).borrow(marketParams, assets / 3n, 0, borrower.address, borrower.address);
+        await morpho.connect(borrower).borrow(marketParams, liquidity / 2n, 0, borrower.address, borrower.address);
       }
     }
   });