Merge branch 'main' into affine-serialization

lambdaclass · Dec 8, 2023 · cca8e8b · cca8e8b
2 parents bb7928c + 438113f
commit cca8e8b
Show file tree

Hide file tree

Showing 62 changed files with 1,984 additions and 1,846 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,18 +4,18 @@ exclude = ["ensure-no_std"]
 resolver = "2"
 
 [workspace.package]
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/lambdaclass/lambdaworks"
 
 [workspace.dependencies]
 iai-callgrind = "0.3.1"
-lambdaworks-crypto = { path = "./crypto", version = "0.2.0" }
-lambdaworks-gpu = { path = "./gpu", version = "0.2.0" }
-lambdaworks-math = { path = "./math", version = "0.2.0" }
-stark-platinum-prover = { path = "./provers/stark", version = "0.2.0" }
-cairo-platinum-prover = { path = "./provers/cairo", version = "0.2.0" }
+lambdaworks-crypto = { path = "./crypto", version = "0.3.0" }
+lambdaworks-gpu = { path = "./gpu", version = "0.3.0" }
+lambdaworks-math = { path = "./math", version = "0.3.0" }
+stark-platinum-prover = { path = "./provers/stark", version = "0.3.0" }
+cairo-platinum-prover = { path = "./provers/cairo", version = "0.3.0" }
 
 [profile.bench]
 lto = true

diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -13,6 +13,7 @@ sha3 = "0.10"
 sha2 = "0.10"
 thiserror = "1.0.38"
 serde = { version = "1.0", features = ["derive"] }
+rayon = { version = "1.8.0", optional = true }
 
 [dev-dependencies]
 criterion = "0.4"
@@ -21,6 +22,7 @@ rand = "0.8.5"
 
 [features]
 test_fiat_shamir = []
+parallel = ["dep:rayon"]
 
 [[bench]]
 name = "criterion_merkle"

diff --git a/crypto/src/commitments/kzg.rs b/crypto/src/commitments/kzg.rs
@@ -200,7 +200,7 @@ impl<const N: usize, F: IsPrimeField<RepresentativeType = UnsignedInteger<N>>, P
                 &(alpha_g2.operate_with(&(g2.operate_with_self(x.representative())).neg())),
             ),
         ]);
-        e == FieldElement::one()
+        e == Ok(FieldElement::one())
     }
 
     fn open_batch(

diff --git a/crypto/src/hash/poseidon/bls12381/t2/mds_matrix.csv b/crypto/src/hash/poseidon/bls12381/t2/mds_matrix.csv
diff --git a/crypto/src/hash/poseidon/bls12381/t2/round_constants.csv b/crypto/src/hash/poseidon/bls12381/t2/round_constants.csv
diff --git a/crypto/src/hash/poseidon/bls12381/t3/mds_matrix.csv b/crypto/src/hash/poseidon/bls12381/t3/mds_matrix.csv
diff --git a/crypto/src/hash/poseidon/bls12381/t3/round_constants.csv b/crypto/src/hash/poseidon/bls12381/t3/round_constants.csv