Evaluation put in whir

Author: TomWambsgans

Cargo.lock

@@ -6,9 +6,10 @@ use p3_util::log2_ceil_usize;
 use sumcheck::{MleGroup, MleGroupOwned, MleGroupRef, ProductComputation};
 use tracing::{info_span, instrument};
 use utils::PF;
-use utils::{Evaluation, FSProver, add_multilinears, from_end, multilinears_linear_combination};
+use utils::{FSProver, add_multilinears, from_end, multilinears_linear_combination};
 use whir_p3::fiat_shamir::FSChallenger;
 use whir_p3::poly::evals::{eval_eq, fold_multilinear, scale_poly};
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::poly::{evals::EvaluationsList, multilinear::MultilinearPoint};
 
 use crate::witness::AirWitness;

crates/air/src/prove.rs

@@ -3,11 +3,12 @@ use p3_field::{ExtensionField, cyclic_subgroup_known_order, dot_product};
 use p3_util::log2_ceil_usize;
 use std::ops::Range;
 use sumcheck::SumcheckComputation;
+use utils::from_end;
 use utils::univariate_selectors;
-use utils::{Evaluation, from_end};
 use utils::{FSVerifier, PF};
 use whir_p3::fiat_shamir::FSChallenger;
 use whir_p3::poly::evals::eval_eq;
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::{
     fiat_shamir::errors::ProofError,
     poly::{evals::EvaluationsList, multilinear::MultilinearPoint},

crates/air/src/verify.rs

@@ -4,10 +4,11 @@ use pcs::ColDims;
 use rayon::prelude::*;
 use std::ops::Range;
 use sumcheck::{SumcheckComputation, SumcheckComputationPacked};
-use utils::{
-    EFPacking, Evaluation, PF, Poseidon16Air, Poseidon24Air, padd_with_zero_to_next_power_of_two,
+use utils::{EFPacking, PF, Poseidon16Air, Poseidon24Air, padd_with_zero_to_next_power_of_two};
+use whir_p3::poly::{
+    evals::fold_multilinear,
+    multilinear::{Evaluation, MultilinearPoint},
 };
-use whir_p3::poly::{evals::fold_multilinear, multilinear::MultilinearPoint};
 
 use crate::*;
 use lean_vm::*;

crates/lean_prover/src/common.rs

@@ -1,6 +1,5 @@
 #![cfg_attr(not(test), allow(unused_crate_dependencies))]
 
-use std::marker::PhantomData;
 use std::ops::Range;
 
 use lean_vm::{EF, F};
@@ -25,10 +24,9 @@ fn exec_column_groups() -> Vec<Range<usize>> {
     .concat()
 }
 
-pub fn build_batch_pcs() -> WhirBatchPcs<F, EF, EF, MyMerkleHash, MyMerkleCompress, MY_DIGEST_ELEMS>
-{
+pub fn build_batch_pcs() -> WhirBatchPcs<MyMerkleHash, MyMerkleCompress, MY_DIGEST_ELEMS> {
     let base_pcs = WhirConfigBuilder {
-        folding_factor: FoldingFactor::ConstantFromSecondRound(7, 4),
+        folding_factor: FoldingFactor::new(7, 4),
         soundness_type: SecurityAssumption::CapacityBound,
         merkle_hash: build_merkle_hash(),
         merkle_compress: build_merkle_compress(),
@@ -37,12 +35,10 @@ pub fn build_batch_pcs() -> WhirBatchPcs<F, EF, EF, MyMerkleHash, MyMerkleCompre
         rs_domain_initial_reduction_factor: 5,
         security_level: 128,
         starting_log_inv_rate: 1,
-        base_field: PhantomData::<F>,
-        extension_field: PhantomData::<EF>,
     };
 
     let extension_pcs = WhirConfigBuilder {
-        folding_factor: FoldingFactor::ConstantFromSecondRound(4, 4),
+        folding_factor: FoldingFactor::new(4, 4),
         soundness_type: SecurityAssumption::CapacityBound,
         merkle_hash: build_merkle_hash(),
         merkle_compress: build_merkle_compress(),
@@ -51,8 +47,6 @@ pub fn build_batch_pcs() -> WhirBatchPcs<F, EF, EF, MyMerkleHash, MyMerkleCompre
         rs_domain_initial_reduction_factor: 2,
         security_level: 128,
         starting_log_inv_rate: 1,
-        base_field: PhantomData::<EF>,
-        extension_field: PhantomData::<EF>,
     };
 
     WhirBatchPcs(base_pcs, extension_pcs)

crates/lean_prover/src/lib.rs

@@ -21,12 +21,13 @@ use utils::dot_product_with_base;
 use utils::field_slice_as_base;
 use utils::pack_extension;
 use utils::{
-    Evaluation, PF, build_poseidon_16_air, build_poseidon_24_air, build_prover_state,
+    PF, build_poseidon_16_air, build_poseidon_24_air, build_prover_state,
     padd_with_zero_to_next_power_of_two,
 };
 use vm_air::*;
 use whir_p3::dft::EvalsDft;
 use whir_p3::poly::evals::{eval_eq, fold_multilinear};
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::poly::{evals::EvaluationsList, multilinear::MultilinearPoint};
 use whir_p3::utils::{compute_eval_eq, compute_sparse_eval_eq};
 
@@ -1353,10 +1354,10 @@ pub fn prove_execution(
     pcs.batch_open(
         &dft,
         &mut prover_state,
-        &global_statements_base,
+        global_statements_base,
         packed_pcs_witness_base.inner_witness,
         &packed_pcs_witness_base.packed_polynomial,
-        &global_statements_extension,
+        global_statements_extension,
         packed_pcs_witness_extension.inner_witness,
         &packed_pcs_witness_extension.packed_polynomial,
     );

crates/lean_prover/src/prove_execution.rs

@@ -15,12 +15,13 @@ use pcs::packed_pcs_global_statements_for_verifier;
 use pcs::{BatchPCS, NumVariables as _, packed_pcs_parse_commitment};
 use sumcheck::SumcheckComputation;
 use utils::dot_product_with_base;
-use utils::{Evaluation, PF, build_challenger, padd_with_zero_to_next_power_of_two};
+use utils::{PF, build_challenger, padd_with_zero_to_next_power_of_two};
 use utils::{ToUsize, build_poseidon_16_air, build_poseidon_24_air};
 use vm_air::*;
 use whir_p3::fiat_shamir::{errors::ProofError, verifier::VerifierState};
 use whir_p3::poly::evals::EvaluationsList;
 use whir_p3::poly::evals::eval_eq;
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::poly::multilinear::MultilinearPoint;
 
 pub fn verify_execution(
@@ -1008,9 +1009,9 @@ pub fn verify_execution(
     pcs.batch_verify(
         &mut verifier_state,
         &parsed_commitment_base,
-        &global_statements_base,
+        global_statements_base,
         &parsed_commitment_extension,
-        &global_statements_extension,
+        global_statements_extension,
     )?;
 
     Ok(())

crates/lean_prover/src/verify_execution.rs

@@ -7,14 +7,14 @@ https://eprint.iacr.org/2025/946.pdf
 
 use p3_field::{ExtensionField, Field, PrimeField64};
 use rayon::prelude::*;
-use utils::{Evaluation, ToUsize};
+use utils::ToUsize;
 
 use p3_field::PrimeCharacteristicRing;
 use sumcheck::{MleGroupRef, ProductComputation};
 use tracing::{info_span, instrument};
 use utils::{EFPacking, FSProver, FSVerifier, PF, pack_extension, packing_width};
 use whir_p3::fiat_shamir::FSChallenger;
-use whir_p3::poly::multilinear::MultilinearPoint;
+use whir_p3::poly::multilinear::{Evaluation, MultilinearPoint};
 use whir_p3::utils::parallel_clone;
 use whir_p3::{fiat_shamir::errors::ProofError, utils::uninitialized_vec};
 

crates/lookup/src/logup_star.rs

@@ -18,10 +18,11 @@ use utils::packing_log_width;
 use utils::packing_width;
 use utils::right_ref;
 use utils::unpack_extension;
-use utils::{EFPacking, Evaluation, FSProver, FSVerifier, PF};
+use utils::{EFPacking, FSProver, FSVerifier, PF};
 use whir_p3::fiat_shamir::FSChallenger;
 use whir_p3::fiat_shamir::errors::ProofError;
 use whir_p3::poly::evals::EvaluationsList;
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::poly::multilinear::MultilinearPoint;
 
 /*
@@ -150,7 +151,7 @@ where
     let next_claim =
         inner_evals[0] * (EF::ONE - mixing_challenge) + inner_evals[1] * mixing_challenge;
 
-    (next_point, next_claim).into()
+    Evaluation::new(next_point, next_claim)
 }
 
 pub fn verify_gkr_product<EF>(
@@ -208,7 +209,7 @@ where
 
     let next_claim = eval_left * (EF::ONE - mixing_challenge) + eval_right * mixing_challenge;
 
-    Ok((next_point, next_claim).into())
+    Ok(Evaluation::new(next_point, next_claim))
 }
 
 fn product_2_by_2<EF: PrimeCharacteristicRing + Sync + Send + Copy>(layer: &[EF]) -> Vec<EF> {

crates/lookup/src/product_gkr.rs

@@ -6,7 +6,6 @@ https://eprint.iacr.org/2025/946.pdf
 with custom GKR
 
 */
-
 use p3_field::PackedFieldExtension;
 use p3_field::PrimeCharacteristicRing;
 use p3_field::{ExtensionField, PrimeField64, dot_product};
@@ -19,12 +18,13 @@ use utils::pack_extension;
 use utils::packing_log_width;
 use utils::packing_width;
 use utils::unpack_extension;
-use utils::{EFPacking, Evaluation, FSProver, FSVerifier, PF, PFPacking};
+use utils::{EFPacking, FSProver, FSVerifier, PF, PFPacking};
 use whir_p3::fiat_shamir::FSChallenger;
 use whir_p3::fiat_shamir::errors::ProofError;
 use whir_p3::poly::dense::WhirDensePolynomial;
 use whir_p3::poly::evals::EvaluationsList;
 use whir_p3::poly::evals::eval_eq;
+use whir_p3::poly::multilinear::Evaluation;
 use whir_p3::poly::multilinear::MultilinearPoint;
 
 /*
@@ -209,7 +209,7 @@ where
     ]));
 
     (
-        (next_point, next_claim).into(),
+        Evaluation::new(next_point, next_claim),
         up_layer_eval_left,
         up_layer_eval_right,
     )
@@ -339,7 +339,7 @@ where
     ]));
 
     (
-        (next_point, next_claim).into(),
+        Evaluation::new(next_point, next_claim),
         up_layer_eval_left,
         up_layer_eval_right,
     )
@@ -413,7 +413,7 @@ where
             .copied(),
     );
 
-    Ok((next_point, next_claim).into())
+    Ok(Evaluation::new(next_point, next_claim))
 }
 
 pub struct GKRQuotientComputation<EF> {