Merge branch 'develop' into feat/vaults

# Conflicts: # .github/workflows/tests-integration-mainnet.yml # package.json # yarn.lock
lidofinance · Jan 13, 2025 · eac8eb9 · eac8eb9
2 parents 65ef7d5 + 49c9751
commit eac8eb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/tests-integration-mainnet.yml b/.github/workflows/tests-integration-mainnet.yml
@@ -1,4 +1,5 @@
 name: Integration Tests
+
 #on: [push]
 #
 #jobs:

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "engines": {
     "node": ">=22"
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "scripts": {
     "compile": "hardhat compile",
     "cleanup": "hardhat clean",
@@ -31,6 +31,7 @@
     "test:integration:scratch:fulltrace": "INTEGRATION_WITH_CSM=off INTEGRATION_WITH_SCRATCH_DEPLOY=on hardhat test test/integration/**/*.ts --fulltrace --disabletracer",
     "test:integration:fork:local": "hardhat test test/integration/**/*.ts --network local",
     "test:integration:fork:mainnet": "hardhat test test/integration/**/*.ts --network mainnet-fork",
+    "test:integration:fork:mainnet:custom": "hardhat test --network mainnet-fork",
     "typecheck": "tsc --noEmit",
     "prepare": "husky",
     "abis:extract": "hardhat abis:extract",