Merge branch 'lambdaclass:main' into feat/pairing_subgroup_check

lambdaclass · Oct 2, 2023 · 04c48cc · 04c48cc
2 parents e8144d4 + 314fafc
commit 04c48cc
Show file tree

Hide file tree

Showing 21 changed files with 379 additions and 433 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -96,7 +96,7 @@ jobs:
           cache: "pip"
 
       - name: Install cairo-lang toolchain and dependencies
-        run: pip install -r requirements.txt
+        run: pip install -r provers/cairo/requirements.txt
 
       - name: Install testing tools
         uses: taiki-e/install-action@v2

diff --git a/Cargo.toml b/Cargo.toml
@@ -4,17 +4,17 @@ exclude = ["ensure-no_std"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.4"
+version = "0.2.0"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/lambdaclass/lambdaworks"
 
 [workspace.dependencies]
 iai-callgrind = "0.3.1"
-lambdaworks-crypto = { path = "./crypto" }
-lambdaworks-gpu = { path = "./gpu" }
-lambdaworks-math = { path = "./math" }
-stark-platinum-prover = { path = "./provers/stark" }
+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" }
 
 [profile.bench]
 lto = true

diff --git a/crypto/benches/criterion_merkle.rs b/crypto/benches/criterion_merkle.rs
@@ -1,6 +1,8 @@
 use core::time::Duration;
 use criterion::{criterion_group, criterion_main, Criterion};
-use lambdaworks_crypto::merkle_tree::{backends::hash_256_bits::Tree256Bits, merkle::MerkleTree};
+use lambdaworks_crypto::merkle_tree::{
+    backends::field_element::FieldElementBackend, merkle::MerkleTree,
+};
 use lambdaworks_math::{
     field::element::FieldElement,
     field::fields::fft_friendly::stark_252_prime_field::Stark252PrimeField,
@@ -9,7 +11,7 @@ use sha3::Keccak256;
 type F = Stark252PrimeField;
 type FE = FieldElement<F>;
 
-type TreeBackend = Tree256Bits<F, Keccak256>;
+type TreeBackend = FieldElementBackend<F, Keccak256, 32>;
 
 fn merkle_tree_benchmarks(c: &mut Criterion) {
     let mut group = c.benchmark_group("Merkle Tree");

diff --git a/crypto/benches/iai_merkle.rs b/crypto/benches/iai_merkle.rs
@@ -1,7 +1,7 @@
 use core::hint::black_box;
 use lambdaworks_crypto::{
     hash::sha3::Sha3Hasher,
-    merkle_tree::{backends::hash_256_bits::Tree256Bits, merkle::MerkleTree},
+    merkle_tree::{backends::field_element::FieldElementBackend, merkle::MerkleTree},
 };
 use lambdaworks_math::{
     field::element::FieldElement,
@@ -12,7 +12,7 @@ use sha3::Keccak256;
 type F = Stark252PrimeField;
 type FE = FieldElement<Stark252PrimeField>;
 
-type TreeBackend = Tree256Bits<F, Keccak256>;
+type TreeBackend = FieldElementBackend<F, Keccak256, 32>;
 
 #[inline(never)]
 #[export_name = "util::build_unhashed_leaves"]

diff --git a/crypto/src/merkle_tree/backends/batch_256_bits.rs b/crypto/src/merkle_tree/backends/batch_256_bits.rs
diff --git a/crypto/src/merkle_tree/backends/batch_512_bits.rs b/crypto/src/merkle_tree/backends/batch_512_bits.rs