chore: fix after merge

air/Cargo.toml

@@ -26,8 +26,6 @@ libm = "0.2"
 math = { version = "0.10", path = "../math", package = "winter-math", default-features = false }
 utils = { version = "0.10", path = "../utils/core", package = "winter-utils", default-features = false }
 
-libc-print = "0.1.23"
-
 [dev-dependencies]
 rand-utils = { version = "0.10", path = "../utils/rand", package = "winter-rand-utils" }
 

air/src/air/context.rs

@@ -335,10 +335,8 @@ impl<B: StarkField> AirContext<B> {
         let trace_length_ext = self.trace_length_ext();
         let transition_divisior_degree = trace_length - self.num_transition_exemptions();
 
-        // we use the identity: ceil(a/b) = (a + b - 1)/b
         let num_constraint_col =
-            (highest_constraint_degree - transition_divisior_degree + trace_length_ext - 1)
-                / trace_length_ext;
+            (highest_constraint_degree - transition_divisior_degree).div_ceil(trace_length_ext);
 
         if self.zk_parameters.is_some() {
             let quotient_degree = if highest_constraint_degree < trace_length_ext {
@@ -351,8 +349,7 @@ impl<B: StarkField> AirContext<B> {
             let n_q = self.options.num_queries();
             let den = self.trace_length_ext() - (n_q + 1);
 
-            // we use the identity: ceil(a/b) = (a + b - 1)/b
-            (quotient_degree + 1 + den - 1) / den
+            (quotient_degree + 1).div_ceil(den)
         } else {
             cmp::max(num_constraint_col, 1)
         }
@@ -374,9 +371,6 @@ impl<B: StarkField> AirContext<B> {
         let trace_length = self.trace_len();
         let transition_divisior_degree = trace_length - self.num_transition_exemptions();
 
-        // we use the identity: ceil(a/b) = (a + b - 1)/b
-        let num_constraint_col =
-            (highest_constraint_degree - transition_divisior_degree).div_ceil(trace_length);
         //   highest_constraint_degree - transition_divisior_degree
         if highest_constraint_degree < self.trace_length_ext {
             // This means that our transition constraints have degree 1 and hence the boundary
@@ -392,9 +386,7 @@ impl<B: StarkField> AirContext<B> {
             let num_constraint_composition_cols = self.num_constraint_composition_columns();
             let quotient_degree = self.constraint_composition_degree();
 
-            // we use the identity: ceil(a/b) = (a + b - 1)/b
-            (quotient_degree + 1 + num_constraint_composition_cols - 1)
-                / num_constraint_composition_cols
+            (quotient_degree + 1).div_ceil(num_constraint_composition_cols)
         } else {
             self.trace_len()
         }

air/src/air/transition/degree.rs

@@ -116,7 +116,7 @@ impl TransitionConstraintDegree {
         // TODO: update documentation
         let degree_bound = self.base + self.cycles.len();
         let q_deg = degree_bound * (trace_length_ext - 1) - (trace_length - 1);
-        let blowup_factor = (q_deg + trace_length_ext - 1) / trace_length_ext;
+        let blowup_factor = q_deg.div_ceil(trace_length_ext);
 
         cmp::max(blowup_factor.next_power_of_two(), ProofOptions::MIN_BLOWUP_FACTOR)
     }

air/src/options.rs

@@ -171,7 +171,7 @@ impl ProofOptions {
             fri_folding_factor: fri_folding_factor as u8,
             fri_remainder_max_degree: fri_remainder_max_degree as u8,
             partition_options: PartitionOptions::new(1, 1),
-            is_zk
+            is_zk,
         }
     }
 

crypto/Cargo.toml

@@ -34,7 +34,6 @@ blake3 = { version = "1.5", default-features = false }
 math = { version = "0.10", path = "../math", package = "winter-math", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 utils = { version = "0.10", path = "../utils/core", package = "winter-utils", default-features = false }
-utils = { version = "0.9", path = "../utils/core", package = "winter-utils", default-features = false }
 rand =  { version = "0.8" }
 
 [dev-dependencies]

crypto/src/commitment.rs

@@ -49,7 +49,6 @@ pub trait VectorCommitment<H: Hasher>: Sized {
     fn commitment(&self) -> H::Digest;
 
     /// Returns the length of the vector committed to for `Self`.
-    fn domain_len(&self) -> usize;
     fn get_domain_len(&self) -> usize;
 
     /// Returns the length of the vector committed to for `Self::Proof`.

crypto/src/merkle/mod.rs

@@ -9,6 +9,11 @@ use alloc::{
 };
 use core::slice;
 
+use rand::{
+    distributions::{Distribution, Standard},
+    thread_rng, Rng, RngCore,
+};
+
 use crate::{
     errors::MerkleTreeError,
     hash::{ByteDigest, Hasher},
@@ -18,8 +23,6 @@ use crate::{
 mod proofs;
 pub use proofs::BatchMerkleProof;
 
-use crate::{Hasher, MerkleTreeError, VectorCommitment};
-
 #[cfg(feature = "concurrent")]
 pub mod concurrent;
 
@@ -103,6 +106,17 @@ pub struct MerkleTree<H: Hasher> {
 /// up to the root (excluding the root itself).
 pub type MerkleTreeOpening<H> = (<H as Hasher>::Digest, Vec<<H as Hasher>::Digest>);
 
+/// Salted Merkle tree opening consisting of a leaf value, a salt, and a Merkle path leading
+/// from this leaf up to the root (excluding the root itself).
+pub type SaltedMerkleTreeOpening<H> =
+    (<H as Hasher>::Digest, (<H as Hasher>::Digest, Vec<<H as Hasher>::Digest>));
+
+/// Salted Merkle tree multi opening consisting of a vector of leaves, a vector of corresponding salts,
+/// and a collection of corresponding Merkle paths leading from these leaves up to the root
+/// (excluding the root itself). The collection of Merkle paths is stored as a [BatchMerkleProof].
+pub type SaltedMerkleTreeMultiOpening<H> =
+    (Vec<<H as Hasher>::Digest>, (Vec<<H as Hasher>::Digest>, BatchMerkleProof<H>));
+
 // MERKLE TREE IMPLEMENTATION
 // ================================================================================================
 
@@ -422,7 +436,6 @@ impl<H: Hasher> VectorCommitment<H> for MerkleTree<H> {
         *self.root()
     }
 
-    fn domain_len(&self) -> usize {
     fn get_domain_len(&self) -> usize {
         1 << self.depth()
     }
@@ -468,11 +481,6 @@ impl<H: Hasher> VectorCommitment<H> for MerkleTree<H> {
 // SALTED MERKLE TREE
 // ================================================================================================
 
-use rand::{
-    distributions::{Distribution, Standard},
-    thread_rng, Rng, RngCore,
-};
-
 pub struct SaltedMerkleTree<H: Hasher> {
     leaves: Vec<H::Digest>,
     tree: MerkleTree<H>,
@@ -517,18 +525,15 @@ where
         self.tree.depth()
     }
 
-    pub fn prove(
-        &self,
-        index: usize,
-    ) -> Result<(H::Digest, (H::Digest, Vec<H::Digest>)), MerkleTreeError> {
+    pub fn prove(&self, index: usize) -> Result<SaltedMerkleTreeOpening<H>, MerkleTreeError> {
         let (_, proof) = self.tree.prove(index)?;
         Ok((self.leaves[index], (self.salts[index], proof)))
     }
 
     pub fn prove_batch(
         &self,
         indexes: &[usize],
-    ) -> Result<(Vec<H::Digest>, (Vec<H::Digest>, BatchMerkleProof<H>)), MerkleTreeError> {
+    ) -> Result<SaltedMerkleTreeMultiOpening<H>, MerkleTreeError> {
         let (_, proof) = self.tree.prove_batch(indexes)?;
         let leaves_at_indices = indexes.iter().map(|index| self.leaves[*index]).collect();
         let salts_at_indices = indexes.iter().map(|index| self.salts[*index]).collect();

examples/Cargo.toml

@@ -26,7 +26,7 @@ default = ["std"]
 std = ["core-utils/std", "hex/std", "rand-utils", "winterfell/std"]
 
 [dependencies]
-air = { version = "0.9", path = "../air", package = "winter-air", default-features = false }
+air = { version = "0.10", path = "../air", package = "winter-air", default-features = false }
 blake3 = { version = "1.5", default-features = false }
 core-utils = { version = "0.10", path = "../utils/core", package = "winter-utils", default-features = false }
 hex = { version = "0.4", optional = true }

examples/src/fibonacci/fib2/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -85,7 +83,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/fibonacci/fib8/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -100,7 +98,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/fibonacci/fib_small/prover.rs

@@ -6,9 +6,8 @@ use air::ZkParameters;
 use rand_chacha::{rand_core::SeedableRng, ChaCha20Rng};
 use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
-    DefaultConstraintEvaluator, DefaultConstraintEvaluator, DefaultTraceLde, DefaultTraceLde,
-    PartitionOptions, StarkDomain, StarkDomain, Trace, Trace, TraceInfo, TraceInfo, TracePolyTable,
-    TracePolyTable, TraceTable, TraceTable,
+    DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
+    TracePolyTable, TraceTable,
 };
 
 use super::{

examples/src/fibonacci/mulfib2/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -81,7 +79,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/fibonacci/mulfib8/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -93,7 +91,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/lamport/aggregate/prover.rs

@@ -9,9 +9,8 @@ use rand_chacha::{rand_core::SeedableRng, ChaCha20Rng};
 use winterfell::iterators::*;
 use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
-    DefaultConstraintEvaluator, DefaultConstraintEvaluator, DefaultTraceLde, DefaultTraceLde,
-    PartitionOptions, StarkDomain, StarkDomain, TraceInfo, TraceInfo, TracePolyTable,
-    TracePolyTable, TraceTable, TraceTable,
+    DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, TraceInfo,
+    TracePolyTable, TraceTable,
 };
 
 use super::{

examples/src/lamport/threshold/prover.rs

@@ -13,8 +13,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -171,7 +169,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/merkle/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -136,7 +134,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/rescue/prover.rs

@@ -9,8 +9,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable, TraceTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
-    TraceTable,
 };
 
 use super::{
@@ -103,7 +101,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(

examples/src/rescue_raps/prover.rs

@@ -10,7 +10,6 @@ use winterfell::{
     crypto::MerkleTree, matrix::ColMatrix, AuxRandElements, ConstraintCompositionCoefficients,
     DefaultConstraintEvaluator, DefaultTraceLde, PartitionOptions, StarkDomain, Trace, TraceInfo,
     TracePolyTable,
-    DefaultConstraintEvaluator, DefaultTraceLde, StarkDomain, Trace, TraceInfo, TracePolyTable,
 };
 
 use super::{
@@ -134,7 +133,14 @@ where
         zk_parameters: Option<ZkParameters>,
     ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
         let mut prng = ChaCha20Rng::from_entropy();
-        DefaultTraceLde::new(trace_info, main_trace, domain, partition_option, zk_parameters, &mut prng)
+        DefaultTraceLde::new(
+            trace_info,
+            main_trace,
+            domain,
+            partition_option,
+            zk_parameters,
+            &mut prng,
+        )
     }
 
     fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(