Update to cairo 2.8.4

.github/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Cairo toolchain
         uses: software-mansion/setup-scarb@v1
         with:
-            scarb-version: "2.4.0"
+            scarb-version: "2.8.4"
 
       - name: Run tests
         run: scarb test

Scarb.lock

@@ -3,4 +3,4 @@ version = 1
 
 [[package]]
 name = "cubit"
-version = "1.3.0"
+version = "1.4.0"

Scarb.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cubit"
-version = "1.3.0"
-cairo-version = ">=2.4.0"
+version = "1.4.0"
+cairo-version = ">=2.8.4"
 edition = "2023_10"
 description = "Math library in Cairo using a 64.64 fixed point representation"
 homepage = "https://github.com/influenceth/cubit"

src/f128/math/ops.cairo

@@ -4,6 +4,7 @@ use core::result::{ResultTrait, ResultTraitImpl};
 use core::traits::{Into, TryInto};
 use core::integer;
 use core::integer::{u256_safe_div_rem, u256_as_non_zero, upcast};
+use core::num::traits::{Sqrt, WideMul};
 
 use cubit::f128::math::lut;
 use cubit::f128::types::fixed::{
@@ -204,7 +205,7 @@ struct f64 {
 }
 
 fn mul_64(a: f64, b: f64) -> f64 {
-    let prod_u128 = integer::u64_wide_mul(a.mag, b.mag);
+    let prod_u128 = a.mag.wide_mul(b.mag);
     return f64 { mag: (prod_u128 / 4294967296).try_into().unwrap(), sign: a.sign ^ b.sign };
 }
 
@@ -289,8 +290,8 @@ fn round(a: Fixed) -> Fixed {
 // x must be positive
 fn sqrt(a: Fixed) -> Fixed {
     assert(a.sign == false, 'must be positive');
-    let root = integer::u128_sqrt(a.mag);
-    let scale_root = integer::u128_sqrt(ONE_u128);
+    let root = a.mag.sqrt();
+    let scale_root = ONE_u128.sqrt();
     let res_u128 = upcast(root) * ONE_u128 / upcast(scale_root);
     return FixedTrait::new(res_u128, false);
 }

src/f128/types/fixed.cairo

@@ -4,6 +4,7 @@ use core::integer::{U256DivRem, u256_safe_divmod, u256_as_non_zero, u256_from_fe
 use core::option::OptionTrait;
 use core::result::{ResultTrait, ResultTraitImpl};
 use core::traits::{TryInto, Into};
+use core::num::traits::WideMul;
 
 use starknet::storage_access::StorePacking;
 
@@ -92,16 +93,16 @@ impl FixedImpl of FixedTrait {
     }
 
     fn new_unscaled(mag: u128, sign: bool) -> Fixed {
-        return FixedTrait::new(mag * ONE_u128, sign);
+        return Self::new(mag * ONE_u128, sign);
     }
 
     fn from_felt(val: felt252) -> Fixed {
         let mag = core::integer::u128_try_from_felt252(utils::felt_abs(val)).unwrap();
-        return FixedTrait::new(mag, utils::felt_sign(val));
+        return Self::new(mag, utils::felt_sign(val));
     }
 
     fn from_unscaled_felt(val: felt252) -> Fixed {
-        return FixedTrait::from_felt(val * ONE);
+        return Self::from_felt(val * ONE);
     }
 
     fn abs(self: Fixed) -> Fixed {
@@ -551,7 +552,7 @@ impl FixedOne of core::num::traits::One<Fixed> {
     }
     #[inline(always)]
     fn is_one(self: @Fixed) -> bool {
-        *self == FixedOne::one()
+        *self == Self::one()
     }
     #[inline(always)]
     fn is_non_one(self: @Fixed) -> bool {

src/f128/types/vec2.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec2 {
     x: Fixed,
     y: Fixed

src/f128/types/vec3.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec3 {
     x: Fixed,
     y: Fixed,

src/f128/types/vec4.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f128::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec4 {
     x: Fixed,
     y: Fixed,

src/f64/math/ops.cairo

@@ -1,7 +1,8 @@
 use core::option::OptionTrait;
 use core::result::{ResultTrait, ResultTraitImpl};
 use core::traits::{Into, TryInto};
-use core::integer::{u64_safe_divmod, u64_as_non_zero, u64_wide_mul};
+use core::integer::{u64_safe_divmod, u64_as_non_zero};
+use core::num::traits::{Sqrt, WideMul};
 
 use cubit::f64::math::lut;
 use cubit::f64::types::fixed::{HALF, ONE, Fixed, FixedIntoFelt252, FixedTrait};
@@ -43,7 +44,7 @@ fn ceil(a: Fixed) -> Fixed {
 }
 
 fn div(a: Fixed, b: Fixed) -> Fixed {
-    let a_u128 = core::integer::u64_wide_mul(a.mag, ONE);
+    let a_u128 = a.mag.wide_mul(ONE);
     let res_u128 = a_u128 / b.mag.into();
 
     // Re-apply sign
@@ -182,7 +183,7 @@ fn lt(a: Fixed, b: Fixed) -> bool {
 }
 
 fn mul(a: Fixed, b: Fixed) -> Fixed {
-    let prod_u128 = core::integer::u64_wide_mul(a.mag, b.mag);
+    let prod_u128 = a.mag.wide_mul(b.mag);
 
     // Re-apply sign
     return FixedTrait::new((prod_u128 / ONE.into()).try_into().unwrap(), a.sign ^ b.sign);
@@ -269,7 +270,7 @@ fn round(a: Fixed) -> Fixed {
 // x must be positive
 fn sqrt(a: Fixed) -> Fixed {
     assert(a.sign == false, 'must be positive');
-    let root = core::integer::u128_sqrt(a.mag.into() * ONE.into());
+    let root = (a.mag * ONE).sqrt();
     return FixedTrait::new(root.into(), false);
 }
 

src/f64/types/fixed.cairo

@@ -93,11 +93,11 @@ impl FixedImpl of FixedTrait {
 
     fn from_felt(val: felt252) -> Fixed {
         let mag = core::integer::u64_try_from_felt252(utils::felt_abs(val)).unwrap();
-        return FixedTrait::new(mag, utils::felt_sign(val));
+        return Self::new(mag, utils::felt_sign(val));
     }
 
     fn from_unscaled_felt(val: felt252) -> Fixed {
-        return FixedTrait::from_felt(val * ONE.into());
+        return Self::from_felt(val * ONE.into());
     }
 
     fn abs(self: Fixed) -> Fixed {
@@ -548,7 +548,7 @@ impl FixedOne of core::num::traits::One<Fixed> {
     }
     #[inline(always)]
     fn is_one(self: @Fixed) -> bool {
-        *self == FixedOne::one()
+        *self == Self::one()
     }
     #[inline(always)]
     fn is_non_one(self: @Fixed) -> bool {

src/f64/types/vec2.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec2 {
     x: Fixed,
     y: Fixed

src/f64/types/vec3.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec3 {
     x: Fixed,
     y: Fixed,

src/f64/types/vec4.cairo

@@ -2,7 +2,7 @@ use core::debug::PrintTrait;
 
 use cubit::f64::types::fixed::{Fixed, FixedTrait, FixedPrint};
 
-#[derive(Copy, Drop, Serde, Store)]
+#[derive(Copy, Drop, Serde)]
 struct Vec4 {
     x: Fixed,
     y: Fixed,