Merge branch 'main' into mohit/currency_manager

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: Build
+
+on: [push, pull_request]
+
+env:
+  SCARB_VERSION: 2.4.0
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: ${{ env.SCARB_VERSION }}
+      - name: Check cairo format
+        run: |
+          cd flex_marketplace
+          scarb fmt --check
+      - name: Build cairo programs
+        run: |
+          cd flex_marketplace
+          scarb build

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: Test
+
+on: [push, pull_request]
+
+env:
+  SCARB_VERSION: 2.4.0
+  SNFORGE_VERSION: 0.13.0
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: ${{ env.SCARB_VERSION }}
+      - uses: foundry-rs/setup-snfoundry@v2
+        with:
+          starknet-foundry-version: ${{ env.SNFORGE_VERSION }}
+      - name: Run cairo tests
+        run: |
+          cd flex_marketplace
+          snforge test

.gitignore

@@ -1,3 +1,7 @@
 
 flex_marketplace/target/
-.snfoundry_cache
+.snfoundry_cache
+
+
+flex_marketplace/.snfoundry_cache/
+

flex_marketplace/Scarb.toml

@@ -1,8 +1,7 @@
 [package]
 name = "flex"
 version = "0.1.0"
-
-# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
+edition = "2023_01"
 
 [dependencies]
 starknet = "2.4.0"
@@ -18,4 +17,8 @@ allowed-libfuncs-list.name = "experimental"
 sierra-replace-ids = true
 
 [tool.fmt]
-sort-module-level-items = true
+sort-module-level-items = true
+
+[scripts]
+test = "snforge test"
+

flex_marketplace/src/lib.cairo

@@ -1,6 +1,25 @@
 mod marketplace {
     mod ERC721_flex;
 
+    mod launchpad {
+        mod ERC721_launchpad_migrated;
+        mod ERC721_launchpad;
+        mod minter;
+    }
+
+    mod swap {
+        mod exponential_curve;
+        mod pair_factory;
+        mod pair;
+    }
+
+    mod utils {
+        mod merkle;
+        mod order_types;
+        mod reentrancy_guard;
+    }
+
+
     mod contract_deployer;
     mod currency_manager;
     mod execution_manager;