Merge branch 'feature/cover-re' into feature/cover-re-usdc

NexusMutual · May 21, 2024 · 156e444 · 156e444
2 parents 530172b + 6262a99
commit 156e444
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/deployments/package.json b/deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nexusmutual/deployments",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "description": "Nexus Mutual deployed contract addresses and abis",
   "typings": "./dist/index.d.ts",
   "main": "./dist/index.js",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nexusmutual",
-  "version": "2.4.3",
+  "version": "2.5.0",
   "description": "NexusMutual smart contracts",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/NexusMutual/smart-contracts",
   "dependencies": {
-    "@nexusmutual/deployments": "^2.4.2",
+    "@nexusmutual/deployments": "^2.5.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@openzeppelin/contracts-v4": "npm:@openzeppelin/contracts@^4.7.3",
     "dotenv": "^8.6.0",

diff --git a/test/unit/SwapOperator/setup.js b/test/unit/SwapOperator/setup.js
@@ -100,7 +100,10 @@ async function setup() {
     enzymeV4Vault.address,
     await owner.getAddress(), // _safe
     dai.address,
+<<<<<<< HEAD
     usdc.address,
+=======
+>>>>>>> feature/cover-re
     enzymeFundValueCalculatorRouter.address,
     parseEther('1'),
   );