rename stark-felt -> starknet-types-core && Implement curve mod

lambdaclass · Oct 20, 2023 · c39043a · c39043a
1 parent 79a7461
commit c39043a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,5 @@
 [workspace]
 members = [
-    "crates/stark-felt",
-    "crates/stark-curve",
     "crates/starknet-types-core",
     "crates/starknet-types-rpc",
 ]

diff --git a/crates/stark-curve/Cargo.toml b/crates/stark-curve/Cargo.toml
@@ -11,7 +11,7 @@ description = "A stark curve type for Cairo."
 readme = "README.md"
 
 [dependencies]
-lambdaworks-math = { git = "https://github.com/Lambdaclass/lambdaworks.git" ,rev = "23154c1b2b7c1cb1620e40ee53fbb446a2923923", default_features = true }
+lambdaworks-math = { git = "https://github.com/Lambdaclass/lambdaworks.git" ,rev = "340045b631e7465cc66cc9140dff9c2d41b7839f", default_features = false }
 num-traits = { version = "0.2.16", default-features = false }
 
 stark-felt = {path = "../stark-felt"}

diff --git a/crates/stark-felt/Cargo.toml → crates/starknet-types-core/Cargo.toml b/crates/stark-felt/Cargo.toml → crates/starknet-types-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "stark-felt"
+name = "starknet-types-core"
 version = "0.0.3"
 edition = "2021"
 license = "MIT"
@@ -13,7 +13,8 @@ readme = "README.md"
 [dependencies]
 bitvec = { version = "1.0.1", default-features = false }
 serde = { version = "1.0.163", optional = true, default-features = false }
-lambdaworks-math = { git = "https://github.com/Lambdaclass/lambdaworks.git" ,rev = "23154c1b2b7c1cb1620e40ee53fbb446a2923923", default_features = false }
+lambdaworks-math = { path = "../../../lambdaworks/math", default-features = false}
+
 
 arbitrary = { version = "1.3.0", optional = true, default-features = false }
 num-traits = { version = "0.2.16", default-features = false }

diff --git a/crates/stark-felt/README.md → crates/starknet-types-core/README.md b/crates/stark-felt/README.md → crates/starknet-types-core/README.md
diff --git a/crates/stark-curve/src/lib.rs → crates/starknet-types-core/src/curve.rs b/crates/stark-curve/src/lib.rs → crates/starknet-types-core/src/curve.rs
@@ -1,10 +1,11 @@
+use crate::felt::Felt;
 use core::ops;
 use lambdaworks_math::cyclic_group::IsGroup;
 use lambdaworks_math::elliptic_curve::short_weierstrass::curves::stark_curve::StarkCurve;
 use lambdaworks_math::elliptic_curve::short_weierstrass::point::ShortWeierstrassProjectivePoint;
 use lambdaworks_math::elliptic_curve::traits::{EllipticCurveError, FromAffine};
-use stark_felt::Felt;
 
+// TODO sacar pub
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ProjectivePoint(ShortWeierstrassProjectivePoint<StarkCurve>);
 

diff --git a/crates/stark-felt/src/lib.rs → crates/starknet-types-core/src/felt.rs b/crates/stark-felt/src/lib.rs → crates/starknet-types-core/src/felt.rs
@@ -1,13 +1,8 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-
 use core::ops::{Add, Neg};
 
 use bitvec::array::BitArray;
 use num_traits::{FromPrimitive, ToPrimitive, Zero};
 
-#[cfg(test)]
-mod arbitrary_proptest;
-
 #[cfg(target_pointer_width = "64")]
 pub type BitArrayStore = [u64; 4];
 
@@ -33,7 +28,7 @@ use arbitrary::{self, Arbitrary, Unstructured};
 
 /// Definition of the Field Element type.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Felt(pub FieldElement<Stark252PrimeField>);
+pub struct Felt(pub(crate) FieldElement<Stark252PrimeField>);
 
 /// A non-zero [Felt].
 pub struct NonZeroFelt(FieldElement<Stark252PrimeField>);
@@ -830,7 +825,7 @@ mod errors {
 mod test {
     use super::alloc::{format, string::String, vec::Vec};
     use super::*;
-    use crate::arbitrary_proptest::nonzero_felt;
+    use crate::felt_arbitrary::nonzero_felt;
     use core::ops::Shl;
     use proptest::prelude::*;
 

diff --git a/crates/stark-felt/src/arbitrary_proptest.rs → ...starknet-types-core/src/felt_arbitrary.rs b/crates/stark-felt/src/arbitrary_proptest.rs → ...starknet-types-core/src/felt_arbitrary.rs
@@ -2,7 +2,7 @@ use lambdaworks_math::{field::element::FieldElement, unsigned_integer::element::
 use num_traits::Zero;
 use proptest::prelude::*;
 
-use crate::Felt;
+use crate::felt::Felt;
 const FIELD_HIGH: u128 = (1 << 123) + (17 << 64); // this is equal to 10633823966279327296825105735305134080
 const FIELD_LOW: u128 = 1;
 

diff --git a/crates/starknet-types-core/src/lib.rs b/crates/starknet-types-core/src/lib.rs
@@ -0,0 +1,6 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+pub mod curve;
+pub mod felt;
+
+#[cfg(test)]
+mod felt_arbitrary;
diff --git a/ensure_no_std/Cargo.toml b/ensure_no_std/Cargo.toml
@@ -4,11 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-stark-felt = { path = "../crates/stark-felt", default-features = false, features = [
+starknet-types-core = { path = "../crates/starknet-types-core", default-features = false, features = [
     "alloc",
     "serde",
 ] }
-starknet-types-core = { path = "../crates/starknet-types-core", default-features = false }
 starknet-types-rpc = { path = "../crates/starknet-types-rpc", default-features = false }
 wee_alloc = "0.4.5"
 

diff --git a/ensure_no_std/src/main.rs b/ensure_no_std/src/main.rs
@@ -18,4 +18,4 @@ pub extern "C" fn _start() -> ! {
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[allow(unused_imports)]
-use stark_felt;
+use stark_types;