Test/swap

.github/workflows/katana.yaml

@@ -1,10 +1,9 @@
 name: Run Katana
+
 on:
-  merge_group:
-  push:
-    branches: [main]
   pull_request:
-    branches: ["*"]
+    types: [opened, synchronize, reopened]
+
 jobs:
   katana:
     runs-on: ubuntu-latest

.github/workflows/security.yaml

@@ -1,8 +1,11 @@
 name: Security
 
 on:
+  merge_group:
+  push:
+    branches: [main]
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: ["*"]
 
 jobs:
   check:

.github/workflows/tests.yaml

@@ -1,10 +1,9 @@
 name: Tests
+
 on:
-  merge_group:
-  push:
-    branches: [main]
   pull_request:
-    branches: ["*"]
+    types: [opened, synchronize, reopened]
+
 jobs:
   check:
     runs-on: ubuntu-latest

Scarb.lock

@@ -0,0 +1,27 @@
+# Code generated by scarb DO NOT EDIT.
+version = 1
+
+[[package]]
+name = "openzeppelin"
+version = "0.7.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.7.0#61a2505fe0c0f19b5de2b3f8dedf421ba2cff657"
+
+[[package]]
+name = "yas_core"
+version = "0.1.0"
+
+[[package]]
+name = "yas_faucet"
+version = "0.1.0"
+dependencies = [
+ "openzeppelin",
+ "yas_core",
+]
+
+[[package]]
+name = "yas_periphery"
+version = "0.1.0"
+dependencies = [
+ "openzeppelin",
+ "yas_core",
+]

crates/yas_core/src/lib.cairo

@@ -37,6 +37,21 @@ mod tests {
     mod test_contracts {
         mod test_yas_factory;
         mod test_yas_pool;
+        mod test_swap_pool_0;
+        mod test_swap_pool_1;
+        mod test_swap_pool_2;
+        mod test_swap_pool_3;
+        mod test_swap_pool_4;
+        mod test_swap_pool_5;
+        mod test_swap_pool_6;
+        mod test_swap_pool_7;
+        mod test_swap_pool_8;
+        mod test_swap_pool_9;
+        mod test_swap_pool_10;
+        mod test_swap_pool_11;
+        mod test_swap_pool_12;
+        mod test_swap_pool_13;
+        mod test_swap_pool_14;
     }
 
     mod test_libraries {
@@ -62,7 +77,22 @@ mod tests {
 
     mod utils {
         mod constants;
+        mod swap_helper;
         mod swap_cases;
+        mod pool_0;
         mod pool_1;
+        mod pool_2;
+        mod pool_3;
+        mod pool_4;
+        mod pool_5;
+        mod pool_6;
+        mod pool_7;
+        mod pool_8;
+        mod pool_9;
+        mod pool_10;
+        mod pool_11;
+        mod pool_12;
+        mod pool_13;
+        mod pool_14;
     }
 }

crates/yas_core/src/libraries/tick_bitmap.cairo

@@ -146,14 +146,18 @@ mod TickBitmap {
         let divisor = IntegerTrait::<i32>::new(256, false);
         let negative_lower_bound = IntegerTrait::<i32>::new(256, true);
 
-        let result = if tick >= zero && tick <= upper_bound {
+        let result = if tick >= zero && tick <= upper_bound { //tick: [0, 255]
             zero
-        } else if tick > upper_bound {
+        } else if tick > upper_bound { //tick: [256, 887272]
             tick / divisor
-        } else if tick >= negative_lower_bound {
+        } else if tick >= negative_lower_bound { //tick: [-256, -1]
             one_negative
-        } else {
-            tick / divisor + one_negative
+        } else { //tick: [-887272, -257]
+            if (mod_i32(tick, divisor) != zero) {
+                IntegerTrait::<i32>::new((tick.mag / divisor.mag) + 1, true)
+            } else {
+                IntegerTrait::<i32>::new((tick.mag / divisor.mag), true)
+            }
         };
         result.try_into().expect('calculate_word')
     }

crates/yas_core/src/tests/test_contracts/test_swap_pool_0.cairo

@@ -0,0 +1,48 @@
+mod PoolCase0 {
+    use yas_core::tests::utils::swap_helper::SwapTestHelper::test_pool;
+    use yas_core::tests::utils::pool_0::{SWAP_CASES_POOL_0, SWAP_EXPECTED_RESULTS_POOL_0};
+    use yas_core::tests::utils::swap_cases::SwapTestHelper::POOL_CASES;
+
+    const PRECISION: u256 = 5;
+
+    #[test]
+    #[available_gas(200000000000)]
+    fn test_pool_0_success_cases() {
+        let pool_case = POOL_CASES()[0];
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_0();
+        let (success_swap_cases, _) = SWAP_CASES_POOL_0();
+        test_pool(pool_case, expected_cases, success_swap_cases, PRECISION);
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_0_panics_0() {
+        let PANIC_CASE = 0;
+        let pool_case = POOL_CASES()[0];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_0();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_0();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_0_panics_1() {
+        let PANIC_CASE = 1;
+        let pool_case = POOL_CASES()[0];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_0();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_0();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+}

crates/yas_core/src/tests/test_contracts/test_swap_pool_1.cairo

@@ -0,0 +1,48 @@
+mod PoolCase1 {
+    use yas_core::tests::utils::swap_helper::SwapTestHelper::test_pool;
+    use yas_core::tests::utils::pool_1::{SWAP_CASES_POOL_1, SWAP_EXPECTED_RESULTS_POOL_1};
+    use yas_core::tests::utils::swap_cases::SwapTestHelper::POOL_CASES;
+
+    const PRECISION: u256 = 5;
+
+    #[test]
+    #[available_gas(200000000000)]
+    fn test_pool_1_success_cases() {
+        let pool_case = POOL_CASES()[1];
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_1();
+        let (success_swap_cases, _) = SWAP_CASES_POOL_1();
+        test_pool(pool_case, expected_cases, success_swap_cases, PRECISION);
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_1_panics_0() {
+        let PANIC_CASE = 0;
+        let pool_case = POOL_CASES()[1];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_1();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_1();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_1_panics_1() {
+        let PANIC_CASE = 1;
+        let pool_case = POOL_CASES()[1];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_1();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_1();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+}

crates/yas_core/src/tests/test_contracts/test_swap_pool_10.cairo

@@ -0,0 +1,80 @@
+mod PoolCase10 {
+    use yas_core::tests::utils::swap_helper::SwapTestHelper::test_pool;
+    use yas_core::tests::utils::pool_10::{SWAP_CASES_POOL_10, SWAP_EXPECTED_RESULTS_POOL_10};
+    use yas_core::tests::utils::swap_cases::SwapTestHelper::POOL_CASES;
+
+    const PRECISION: u256 = 5;
+
+    #[test]
+    #[available_gas(200000000000)]
+    fn test_pool_10_success_cases() {
+        let pool_case = POOL_CASES()[10];
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_10();
+        let (success_swap_cases, _) = SWAP_CASES_POOL_10();
+        test_pool(pool_case, expected_cases, success_swap_cases, PRECISION);
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_10_panics_0() {
+        let PANIC_CASE = 0;
+        let pool_case = POOL_CASES()[10];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_10();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_10();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_10_panics_1() {
+        let PANIC_CASE = 1;
+        let pool_case = POOL_CASES()[10];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_10();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_10();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_10_panics_2() {
+        let PANIC_CASE = 2;
+        let pool_case = POOL_CASES()[10];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_10();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_10();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_10_panics_3() {
+        let PANIC_CASE = 3;
+        let pool_case = POOL_CASES()[10];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_10();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_10();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+}

crates/yas_core/src/tests/test_contracts/test_swap_pool_11.cairo

@@ -0,0 +1,80 @@
+mod PoolCase11 {
+    use yas_core::tests::utils::swap_helper::SwapTestHelper::test_pool;
+    use yas_core::tests::utils::pool_11::{SWAP_CASES_POOL_11, SWAP_EXPECTED_RESULTS_POOL_11};
+    use yas_core::tests::utils::swap_cases::SwapTestHelper::POOL_CASES;
+
+    const PRECISION: u256 = 5;
+
+    #[test]
+    #[available_gas(200000000000)]
+    fn test_pool_11_success_cases() {
+        let pool_case = POOL_CASES()[11];
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_11();
+        let (success_swap_cases, _) = SWAP_CASES_POOL_11();
+        test_pool(pool_case, expected_cases, success_swap_cases, PRECISION);
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_11_panics_0() {
+        let PANIC_CASE = 0;
+        let pool_case = POOL_CASES()[11];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_11();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_11();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_11_panics_1() {
+        let PANIC_CASE = 1;
+        let pool_case = POOL_CASES()[11];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_11();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_11();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_11_panics_2() {
+        let PANIC_CASE = 2;
+        let pool_case = POOL_CASES()[11];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_11();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_11();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+
+    #[test]
+    #[available_gas(200000000000)]
+    #[should_panic(expected: ('SPL', 'ENTRYPOINT_FAILED', 'ENTRYPOINT_FAILED'))]
+    fn test_pool_11_panics_3() {
+        let PANIC_CASE = 3;
+        let pool_case = POOL_CASES()[11];
+        let (success_swap_cases, panic_swap_cases) = SWAP_CASES_POOL_11();
+        let expected_cases = SWAP_EXPECTED_RESULTS_POOL_11();
+        test_pool(
+            pool_case,
+            array![*expected_cases[PANIC_CASE]],
+            array![*panic_swap_cases[PANIC_CASE]],
+            Zeroable::zero()
+        );
+    }
+}