From edc1ec6985b8ff275c3290c3442439014efcda24 Mon Sep 17 00:00:00 2001
From: livingrockrises <90545960+livingrockrises@users.noreply.github.com>
Date: Mon, 14 Oct 2024 02:17:42 +0400
Subject: [PATCH] fix:remappings

---
 .npmrc         | 1 +
 package.json   | 7 ++++---
 remappings.txt | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .npmrc

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..cc8df9d
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+node-linker=hoisted
\ No newline at end of file
diff --git a/package.json b/package.json
index 9a9914a..b2b7d6e 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "url": "https://github.com/bcnmy"
   },
   "dependencies": {
+    "@openzeppelin/contracts": "5.0.2",
     "@rhinestone/modulekit": "^0.4.10",
     "@uniswap/v3-core": "https://github.com/Uniswap/v3-core#0.8",
     "@uniswap/v3-periphery": "https://github.com/Uniswap/v3-periphery#0.8",
@@ -14,11 +15,9 @@
     "nexus": "https://github.com/bcnmy/nexus#dev"
   },
   "devDependencies": {
-    "erc7579": "https://github.com/erc7579/erc7579-implementation",
-    "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts#master",
-    "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
     "@bonadocs/docgen": "^1.0.1-alpha.1",
     "@ethersproject/abstract-provider": "^5.7.0",
+    "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts#master",
     "@prb/test": "^0.6.4",
     "@typechain/ethers-v6": "^0.5.1",
     "@types/chai": "^4.3.11",
@@ -27,7 +26,9 @@
     "account-abstraction": "github:eth-infinitism/account-abstraction#develop",
     "chai": "^4.3.7",
     "codecov": "^3.8.3",
+    "erc7579": "https://github.com/erc7579/erc7579-implementation",
     "ethers": "^6.11.1",
+    "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
     "module-bases": "github:rhinestonewtf/module-bases",
     "modulekit": "github:rhinestonewtf/modulekit",
     "prettier": "^3.2.5",
diff --git a/remappings.txt b/remappings.txt
index e74a7da..881d781 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,6 +1,6 @@
-@openzeppelin/contracts/=node_modules/@openzeppelin/.ignored_contracts/
-@openzeppelin/=node_modules/@openzeppelin/.ignored_contracts
-@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/.ignored_contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/=node_modules/@openzeppelin/contracts
+@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/contracts/
 @prb/test/=node_modules/@prb/test/
 @nexus/=node_modules/nexus/
 forge-std/=lib/forge-std/src/