moved TraceLde constructor into Prover trait

facebook · Oct 22, 2023 · d03cc8f · d03cc8f
1 parent 33f434c
commit d03cc8f
Show file tree

Hide file tree

Showing 31 changed files with 271 additions and 153 deletions.
diff --git a/README.md b/README.md
@@ -237,7 +237,8 @@ like:
 use winterfell::{
     crypto::{hashers::Blake3_256, DefaultRandomCoin},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, Trace, TraceTable,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, Trace,
+    TracePolyTable, TraceTable,
 };
 
 // We'll use BLAKE3 as the hash function during proof generation.
@@ -278,6 +279,16 @@ impl Prover for WorkProver {
         }
     }
 
+    // We'll use the default trace low-degree extension.
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
     // We'll use the default constraint evaluator to evaluate AIR constraints.
     fn new_evaluator<'a, E: FieldElement<BaseField = BaseElement>>(
         &self,

diff --git a/examples/src/fibonacci/fib2/mod.rs b/examples/src/fibonacci/fib2/mod.rs
@@ -11,8 +11,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib2/prover.rs b/examples/src/fibonacci/fib2/prover.rs
@@ -5,7 +5,8 @@
 
 use super::{
     BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FibAir, FieldElement, PhantomData, ProofOptions, Prover, Trace, TraceTable, TRACE_WIDTH,
+    FibAir, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace, TracePolyTable,
+    TraceTable, TRACE_WIDTH,
 };
 
 // FIBONACCI PROVER
@@ -67,15 +68,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }
diff --git a/examples/src/fibonacci/fib8/mod.rs b/examples/src/fibonacci/fib8/mod.rs
@@ -11,8 +11,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib8/prover.rs b/examples/src/fibonacci/fib8/prover.rs
@@ -5,7 +5,8 @@
 
 use super::{
     BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    Fib8Air, FieldElement, PhantomData, ProofOptions, Prover, Trace, TraceTable,
+    Fib8Air, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace, TracePolyTable,
+    TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -82,15 +83,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }
diff --git a/examples/src/fibonacci/fib_small/mod.rs b/examples/src/fibonacci/fib_small/mod.rs
@@ -11,8 +11,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f64::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/fib_small/prover.rs b/examples/src/fibonacci/fib_small/prover.rs
@@ -4,7 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 use super::{
     air::FibSmall, BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde,
-    ElementHasher, FieldElement, PhantomData, ProofOptions, Prover, Trace, TraceTable, TRACE_WIDTH,
+    ElementHasher, FieldElement, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
+    TracePolyTable, TraceTable, TRACE_WIDTH,
 };
 
 // FIBONACCI PROVER
@@ -66,15 +67,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }
diff --git a/examples/src/fibonacci/mulfib2/mod.rs b/examples/src/fibonacci/mulfib2/mod.rs
@@ -11,8 +11,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/mulfib2/prover.rs b/examples/src/fibonacci/mulfib2/prover.rs
@@ -5,7 +5,8 @@
 
 use super::{
     BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FieldElement, MulFib2Air, PhantomData, ProofOptions, Prover, Trace, TraceTable,
+    FieldElement, MulFib2Air, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
+    TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -63,15 +64,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }
diff --git a/examples/src/fibonacci/mulfib8/mod.rs b/examples/src/fibonacci/mulfib8/mod.rs
@@ -11,8 +11,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, FieldElement},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/fibonacci/mulfib8/prover.rs b/examples/src/fibonacci/mulfib8/prover.rs
@@ -5,7 +5,8 @@
 
 use super::{
     BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin, DefaultTraceLde, ElementHasher,
-    FieldElement, MulFib8Air, PhantomData, ProofOptions, Prover, Trace, TraceTable,
+    FieldElement, MulFib8Air, PhantomData, ProofOptions, Prover, StarkDomain, Trace,
+    TracePolyTable, TraceTable,
 };
 
 // FIBONACCI PROVER
@@ -75,15 +76,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }
diff --git a/examples/src/lamport/aggregate/mod.rs b/examples/src/lamport/aggregate/mod.rs
@@ -13,8 +13,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, get_power_series, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;

diff --git a/examples/src/lamport/aggregate/prover.rs b/examples/src/lamport/aggregate/prover.rs
@@ -6,8 +6,8 @@
 use super::{
     get_power_series, rescue, BaseElement, DefaultConstraintEvaluator, DefaultRandomCoin,
     DefaultTraceLde, ElementHasher, FieldElement, LamportAggregateAir, PhantomData, ProofOptions,
-    Prover, PublicInputs, Signature, StarkField, TraceTable, CYCLE_LENGTH, NUM_HASH_ROUNDS,
-    SIG_CYCLE_LENGTH, TRACE_WIDTH,
+    Prover, PublicInputs, Signature, StarkDomain, StarkField, TracePolyTable, TraceTable,
+    CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
 };
 
 #[cfg(feature = "concurrent")]
@@ -110,15 +110,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }

diff --git a/examples/src/lamport/threshold/mod.rs b/examples/src/lamport/threshold/mod.rs
@@ -14,8 +14,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, ElementHasher},
     math::{fields::f128::BaseElement, get_power_series, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod signature;

diff --git a/examples/src/lamport/threshold/prover.rs b/examples/src/lamport/threshold/prover.rs
@@ -6,8 +6,8 @@
 use super::{
     get_power_series, rescue, AggPublicKey, BaseElement, DefaultConstraintEvaluator,
     DefaultRandomCoin, DefaultTraceLde, ElementHasher, FieldElement, LamportThresholdAir,
-    PhantomData, ProofOptions, Prover, PublicInputs, Signature, StarkField, TraceTable,
-    HASH_CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
+    PhantomData, ProofOptions, Prover, PublicInputs, Signature, StarkDomain, StarkField,
+    TracePolyTable, TraceTable, HASH_CYCLE_LENGTH, NUM_HASH_ROUNDS, SIG_CYCLE_LENGTH, TRACE_WIDTH,
 };
 use std::collections::HashMap;
 
@@ -151,15 +151,21 @@ where
         &self.options
     }
 
-    fn new_evaluator<'a, E>(
+    fn new_trace_lde<E: FieldElement<BaseField = Self::BaseField>>(
+        &self,
+        trace_info: &winterfell::TraceInfo,
+        main_trace: &winterfell::ColMatrix<Self::BaseField>,
+        domain: &StarkDomain<Self::BaseField>,
+    ) -> (Self::TraceLde<E>, TracePolyTable<E>) {
+        DefaultTraceLde::new(trace_info, main_trace, domain)
+    }
+
+    fn new_evaluator<'a, E: FieldElement<BaseField = Self::BaseField>>(
         &self,
         air: &'a Self::Air,
         aux_rand_elements: winterfell::AuxTraceRandElements<E>,
         composition_coefficients: winterfell::ConstraintCompositionCoefficients<E>,
-    ) -> Self::ConstraintEvaluator<'a, E>
-    where
-        E: FieldElement<BaseField = Self::BaseField>,
-    {
+    ) -> Self::ConstraintEvaluator<'a, E> {
         DefaultConstraintEvaluator::new(air, aux_rand_elements, composition_coefficients)
     }
 }

diff --git a/examples/src/merkle/mod.rs b/examples/src/merkle/mod.rs
@@ -18,8 +18,8 @@ use std::time::Instant;
 use winterfell::{
     crypto::{DefaultRandomCoin, Digest, ElementHasher, MerkleTree},
     math::{fields::f128::BaseElement, FieldElement, StarkField},
-    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkProof, Trace,
-    TraceTable, VerifierError,
+    DefaultConstraintEvaluator, DefaultTraceLde, ProofOptions, Prover, StarkDomain, StarkProof,
+    Trace, TracePolyTable, TraceTable, VerifierError,
 };
 
 mod air;