Merge branch 'main' of github.com:morpho-labs/blue into refactor/exts…

…load

.github/workflows/hardhat.yml

@@ -30,5 +30,13 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
+      - name: Save hardhat cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            cache_hardhat
+            artifacts
+          key: ${{ github.ref_name }}-hardhat
+
       - name: Run Hardhat tests
         run: yarn test

hardhat.config.ts

@@ -5,7 +5,6 @@ import "@nomiclabs/hardhat-ethers";
 import "@typechain/hardhat";
 import * as dotenv from "dotenv";
 import "ethers-maths";
-import "hardhat-deal";
 import "hardhat-gas-reporter";
 import "hardhat-tracer";
 import { HardhatUserConfig } from "hardhat/config";
@@ -21,7 +20,7 @@ const config: HardhatUserConfig = {
       gasPrice: 0,
       initialBaseFeePerGas: 0,
       accounts: {
-        count: 102,
+        count: 252,
       },
     },
   },
@@ -43,6 +42,7 @@ const config: HardhatUserConfig = {
     timeout: 3000000,
   },
   typechain: {
+    target: "ethers-v5",
     outDir: "types/",
     externalArtifacts: ["deps/**/*.json"],
   },

package.json

@@ -9,37 +9,35 @@
     "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "ethers": "^5.7.2",
-    "ethers-maths": "^3.5.1",
-    "lodash": "^4.17.21",
-    "openzeppelin-contracts": "^4.0.0"
+    "ethers-maths": "^3.5.3",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.6",
-    "@commitlint/config-conventional": "^17.6.6",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^17.6.7",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomicfoundation/hardhat-foundry": "^1.0.1",
+    "@nomicfoundation/hardhat-foundry": "^1.0.2",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "@typechain/ethers-v5": "^10.2.1",
-    "@typechain/hardhat": "^6.1.6",
+    "@typechain/ethers-v5": "^11.1.0",
+    "@typechain/hardhat": "^8.0.2",
     "@types/chai": "^4.3.5",
     "@types/lodash": "^4.14.195",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.2.5",
+    "@types/node": "^20.4.2",
     "chai": "^4.3.7",
-    "dotenv": "^16.1.3",
-    "hardhat": "2.15",
-    "hardhat-deal": "^1.3.0",
+    "dotenv": "^16.3.1",
+    "hardhat": "^2.17.0",
     "hardhat-gas-reporter": "^1.0.9",
-    "hardhat-tracer": "2.3.2",
-    "husky": "8.0.3",
-    "lint-staged": "13.2.2",
-    "prettier": "^2.8.8",
-    "solidity-coverage": "^0.8.2",
+    "hardhat-tracer": "^2.5.1",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.2.3",
+    "prettier": "^3.0.0",
+    "solidity-coverage": "^0.8.4",
     "ts-node": "^10.9.1",
-    "typechain": "^8.2.0",
-    "typescript": "5.0.4"
+    "typechain": "^8.3.0",
+    "typescript": "^5.1.6"
   },
   "lint-staged": {
     "*.sol": "forge fmt",