chore: update to changes in Winterfell

0xPolygonMiden · Sep 18, 2024 · 892f6a9 · 892f6a9
1 parent f8efe72
commit 892f6a9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prover/src/gpu/metal/mod.rs b/prover/src/gpu/metal/mod.rs
@@ -21,7 +21,7 @@ use winter_prover::{
     matrix::{get_evaluation_offsets, ColMatrix, RowMatrix, Segment},
     proof::Queries,
     CompositionPoly, CompositionPolyTrace, ConstraintCommitment, ConstraintCompositionCoefficients,
-    DefaultConstraintEvaluator, EvaluationFrame, Prover, StarkDomain, TraceInfo, TraceLde,
+    EvaluationFrame, LogUpGkrConstraintEvaluator, Prover, StarkDomain, TraceInfo, TraceLde,
     TracePolyTable,
 };
 
@@ -138,7 +138,7 @@ where
     type RandomCoin = R;
     type TraceLde<E: FieldElement<BaseField = Felt>> = MetalTraceLde<E, H>;
     type ConstraintEvaluator<'a, E: FieldElement<BaseField = Felt>> =
-        DefaultConstraintEvaluator<'a, ProcessorAir, E>;
+        LogUpGkrConstraintEvaluator<'a, ProcessorAir, E>;
 
     fn get_pub_inputs(&self, trace: &ExecutionTrace) -> PublicInputs {
         self.execution_prover.get_pub_inputs(trace)

diff --git a/prover/src/lib.rs b/prover/src/lib.rs
@@ -22,8 +22,8 @@ use processor::{
 use tracing::instrument;
 use winter_prover::{
     crypto::MerkleTree as MerkleTreeVC, matrix::ColMatrix, ConstraintCompositionCoefficients,
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions as WinterProofOptions, Prover,
-    StarkDomain, TraceInfo, TracePolyTable,
+    DefaultTraceLde, LogUpGkrConstraintEvaluator,
+    ProofOptions as WinterProofOptions, Prover, StarkDomain, TraceInfo, TracePolyTable,
 };
 #[cfg(feature = "std")]
 use {std::time::Instant, winter_prover::Trace};
@@ -186,7 +186,7 @@ where
     type RandomCoin = R;
     type TraceLde<E: FieldElement<BaseField = Felt>> = DefaultTraceLde<E, H, Self::VC>;
     type ConstraintEvaluator<'a, E: FieldElement<BaseField = Felt>> =
-        DefaultConstraintEvaluator<'a, ProcessorAir, E>;
+        LogUpGkrConstraintEvaluator<'a, ProcessorAir, E>;
 
     type VC = MerkleTreeVC<Self::HashFn>;
 
@@ -224,7 +224,11 @@ where
         aux_rand_elements: Option<AuxRandElements<E>>,
         composition_coefficients: ConstraintCompositionCoefficients<E>,
     ) -> Self::ConstraintEvaluator<'a, E> {
-        DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
+        LogUpGkrConstraintEvaluator::new(
+            air,
+            aux_rand_elements.expect("should contain randomness"),
+            composition_coefficients,
+        )
     }
 
     fn build_aux_trace<E>(&self, trace: &Self::Trace, aux_rand_elements: &[E]) -> ColMatrix<E>