working on getting 2 versions of openzeppelin working

package.json

@@ -9,8 +9,6 @@
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.40",
     "@openzeppelin/contracts": "4.9.2",
     "@openzeppelin/contracts-upgradeable": "4.9.2",
-    "@openzeppelin/contracts-v5": "yarn:@openzeppelin/[email protected]",
-    "@openzeppelin/contracts-upgradeable-v5": "yarn:@openzeppelin/[email protected]",
     "hardhat-deploy": "^0.12.4",
     "husky": "^9.1.5",
     "lint-staged": "^15.2.10",

remappings.txt

@@ -2,10 +2,10 @@
 @layerzerolabs/lz-evm-v1-0.7/=node_modules/@layerzerolabs/lz-evm-v1-0.7/
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
-@openzeppelin/contracts-v5/=lib/@openzeppelin/contracts-v5/
-@openzeppelin/contracts-upgradeable-v5/=lib/@openzeppelin/contracts-upgradeable-v5/
+@openzeppelin/contracts-v5/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable-v5/=lib/openzeppelin-contracts-upgradeable/contracts/
 
-@openzeppelin/contracts/interfaces/=node_modules/@openzeppelin/contracts-v5/interfaces/
+@openzeppelin/contracts/interfaces/=lib/openzeppelin-contracts/contracts/interfaces/
 
 
 

yarn.lock

@@ -387,21 +387,11 @@
   resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-v1-0.7/-/lz-evm-v1-0.7-2.3.40.tgz#8097560124439a4a5301f13f975f5df7e33a6dd7"
   integrity sha512-0tTD84gmrsPmy2EGyIq1ZIm3xxzHt7eul27MYIn1D2V1APJ6qo+GlXTi4jZwy241wKpd9khNe+ATHOIoaZdlTQ==
 
-"@openzeppelin/contracts-upgradeable-v5@yarn:@openzeppelin/[email protected]":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz#3e5321a2ecdd0b206064356798c21225b6ec7105"
-  integrity sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==
-
 "@openzeppelin/[email protected]":
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.2.tgz#a817c75688f8daede420052fbcb34e52482e769e"
   integrity sha512-siviV3PZV/fHfPaoIC51rf1Jb6iElkYWnNYZ0leO23/ukXuvOyoC/ahy8jqiV7g+++9Nuo3n/rk5ajSN/+d/Sg==
 
-"@openzeppelin/contracts-v5@yarn:@openzeppelin/[email protected]":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210"
-  integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==
-
 "@openzeppelin/[email protected]":
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"