added resursive stea

ourzora · Nov 13, 2023 · d4a5b3a · d4a5b3a
1 parent e72e8f5
commit d4a5b3a
Show file tree

Hide file tree

Showing 6 changed files with 6,013 additions and 88 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/openzeppelin-contracts-upgradeable"]
+	path = packages/openzeppelin-contracts-upgradeable
+	url = [email protected]:ourzora/openzeppelin-contracts-upgradeable.git
diff --git a/README.md b/README.md
@@ -19,6 +19,10 @@ Install prerequisites:
 - [Node.js and yarn](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)
 - [Foundry](https://book.getfoundry.sh/getting-started/installation)
 
+Clone the repository recursively, to include submodules:
+
+    git clone --recurse-submodules -j8 [email protected]:ourzora/zora-protocol.git
+
 Install dependencies:
 
     yarn

diff --git a/packages/1155-contracts/foundry.toml b/packages/1155-contracts/foundry.toml
@@ -6,7 +6,10 @@ fs_permissions = [
   { access = "readwrite", path = "./deterministicConfig" },
 ]
 libs = ['_imagine', 'node_modules', 'script']
-allow_paths = ["node_modules/@zoralabs/protocol-rewards"]
+allow_paths = [
+  "node_modules/@zoralabs/protocol-rewards",
+  "node_modules/@zoralabs/openzeppelin-contracts-upgradeable",
+]
 optimizer = true
 optimizer_runs = 50
 via_ir = true

diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@openzeppelin/contracts": "4.9.2",
-    "@zoralabs/openzeppelin-contracts-upgradeable": "4.8.4",
+    "@zoralabs/openzeppelin-contracts-upgradeable": "*",
     "@zoralabs/protocol-rewards": "*",
     "ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b",
     "forge-std": "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80",

diff --git a/packages/openzeppelin-contracts-upgradeable b/packages/openzeppelin-contracts-upgradeable