Merge pull request #62 from briansinw3b/main

Open edition Drop
Flex-NFT-Marketplace · Mar 13, 2024 · bc7af0c · bc7af0c
2 parents 020f313 + 7a60f1d
commit bc7af0c
Show file tree

Hide file tree

Showing 12 changed files with 1,068 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ flex_marketplace/.snfoundry_cache/
 tool-versions
 
 .vscode/
+target
diff --git a/flex_marketplace/Scarb.lock b/flex_marketplace/Scarb.lock
@@ -1,10 +1,16 @@
 # Code generated by scarb DO NOT EDIT.
 version = 1
 
+[[package]]
+name = "alexandria_storage"
+version = "0.2.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+
 [[package]]
 name = "flex"
 version = "0.1.0"
 dependencies = [
+ "alexandria_storage",
  "openzeppelin",
  "snforge_std",
 ]

diff --git a/flex_marketplace/Scarb.toml b/flex_marketplace/Scarb.toml
@@ -7,6 +7,7 @@ edition = "2023_01"
 starknet = "2.4.3"
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.14.0" }
 openzeppelin = { git = "https://github.com/openzeppelin/cairo-contracts", tag = "v0.8.0"  }
+alexandria_storage = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.3.0-rc0" }
 
 [scripts]
 test = "snforge test"

diff --git a/flex_marketplace/src/lib.cairo b/flex_marketplace/src/lib.cairo
@@ -36,11 +36,12 @@ mod marketplace {
         mod merkle;
         mod order_types;
         mod reentrancy_guard;
+        mod openedition;
     }
 
+    mod openedition;
     mod contract_deployer;
     mod currency_manager;
-    mod ERC721_flex;
     mod execution_manager;
     mod marketplace;
     mod proxy;

diff --git a/flex_marketplace/src/marketplace/openedition.cairo b/flex_marketplace/src/marketplace/openedition.cairo
@@ -0,0 +1,14 @@
+mod interfaces {
+    mod IFlexDrop;
+    mod IFlexDropContractMetadata;
+    mod INonFungibleFlexDropToken;
+}
+
+mod ERC721_open_edition;
+
+mod FlexDrop;
+
+mod erc721_metadata {
+    mod ERC721_metadata;
+}
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ flex_marketplace/.snfoundry_cache/
		tool-versions

		.vscode/
		target