perf(wip): remove extraneous functions

openvm-org · Dec 28, 2024 · 2f99d1b · 2f99d1b
1 parent aa8e9a4
commit 2f99d1b
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 140 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/extensions/native/recursion/Cargo.toml b/extensions/native/recursion/Cargo.toml
@@ -37,7 +37,7 @@ tempfile = "3.14.0"
 bitcode = { workspace = true }
 
 [features]
-default = ["parallel", "mimalloc"]
+default = ["parallel", "mimalloc", "static-verifier"]
 parallel = ["openvm-stark-backend/parallel"]
 static-verifier = [
     "openvm-native-compiler/halo2-compiler",

diff --git a/extensions/native/recursion/src/challenger/multi_field32.rs b/extensions/native/recursion/src/challenger/multi_field32.rs
@@ -92,13 +92,15 @@ impl<C: Config> MultiField32ChallengerVariable<C> {
 
     pub fn sample_bits(&mut self, builder: &mut Builder<C>, bits: usize) -> Var<C::N> {
         let rand_f = self.sample(builder);
+        builder.print_f(rand_f);
         let rand_f_bits = builder.num2bits_f_circuit(rand_f);
         builder.bits2num_v_circuit(&rand_f_bits[0..bits])
     }
 
     pub fn check_witness(&mut self, builder: &mut Builder<C>, bits: usize, witness: Felt<C::F>) {
         self.observe(builder, witness);
         let element = self.sample_bits(builder, bits);
+        builder.print_v(element);
         builder.assert_var_eq(element, C::N::from_canonical_usize(0));
     }
 }
@@ -128,6 +130,7 @@ impl<C: Config> CanSampleBitsVariable<C> for MultiField32ChallengerVariable<C> {
         nb_bits: RVar<C::N>,
     ) -> Array<C, Var<C::N>> {
         let rand_f = self.sample(builder);
+        builder.print_f(rand_f);
         let rand_f_bits = builder.num2bits_f_circuit(rand_f);
         builder.vec(rand_f_bits[..nb_bits.value()].to_vec())
     }

diff --git a/extensions/native/recursion/src/fri/mod.rs b/extensions/native/recursion/src/fri/mod.rs
@@ -9,12 +9,8 @@ use openvm_native_compiler::{
 use openvm_stark_backend::p3_field::{Field, FieldAlgebra, TwoAdicField};
 pub use two_adic_pcs::*;
 
-use self::types::{
-    DimensionsVariable, FriChallengesVariable, FriConfigVariable, FriProofVariable,
-    FriQueryProofVariable,
-};
+use self::types::{DimensionsVariable, FriConfigVariable, FriQueryProofVariable};
 use crate::{
-    challenger::ChallengerVariable,
     digest::{CanPoseidon2Digest, DigestVariable},
     outer_poseidon2::Poseidon2CircuitBuilder,
     utils::cond_eval,
@@ -27,94 +23,6 @@ pub mod two_adic_pcs;
 pub mod types;
 pub mod witness;
 
-/// Reference: https://github.com/Plonky3/Plonky3/blob/4809fa7bedd9ba8f6f5d3267b1592618e3776c57/fri/src/verifier.rs#L27
-pub fn verify_shape_and_sample_challenges<C: Config>(
-    builder: &mut Builder<C>,
-    config: &FriConfigVariable<C>,
-    proof: &FriProofVariable<C>,
-    challenger: &mut impl ChallengerVariable<C>,
-) -> FriChallengesVariable<C> {
-    let betas: Array<C, Ext<C::F, C::EF>> = builder.array(proof.commit_phase_commits.len());
-
-    builder
-        .range(0, proof.commit_phase_commits.len())
-        .for_each(|i, builder| {
-            let comm = builder.get(&proof.commit_phase_commits, i);
-            challenger.observe_digest(builder, comm);
-            let sample = challenger.sample_ext(builder);
-            builder.set(&betas, i, sample);
-        });
-
-    builder
-        .range(0, proof.final_poly.len())
-        .for_each(|i, builder| {
-            let final_poly_elem = builder.get(&proof.final_poly, i);
-            let final_poly_elem_felts = builder.ext2felt(final_poly_elem);
-            challenger.observe_slice(builder, final_poly_elem_felts);
-        });
-
-    let num_query_proofs = proof.query_proofs.len().clone();
-    builder
-        .if_ne(num_query_proofs, RVar::from(config.num_queries))
-        .then(|builder| {
-            builder.error();
-        });
-
-    challenger.check_witness(builder, config.proof_of_work_bits, proof.pow_witness);
-
-    let log_max_height =
-        builder.eval_expr(proof.commit_phase_commits.len() + RVar::from(config.log_blowup));
-    let query_indices = builder.array(config.num_queries);
-    builder.range(0, config.num_queries).for_each(|i, builder| {
-        let index_bits = challenger.sample_bits(builder, log_max_height);
-        builder.set(&query_indices, i, index_bits);
-    });
-
-    FriChallengesVariable {
-        query_indices,
-        betas,
-    }
-}
-
-/// Verifies a set of FRI challenges.
-///
-/// Reference: https://github.com/Plonky3/Plonky3/blob/4809fa7bedd9ba8f6f5d3267b1592618e3776c57/fri/src/verifier.rs#L67
-#[allow(clippy::type_complexity)]
-pub fn verify_challenges<C: Config>(
-    builder: &mut Builder<C>,
-    config: &FriConfigVariable<C>,
-    proof: &FriProofVariable<C>,
-    challenges: &FriChallengesVariable<C>,
-    reduced_openings: &Array<C, Array<C, Ext<C::F, C::EF>>>,
-) where
-    C::F: TwoAdicField,
-    C::EF: TwoAdicField,
-{
-    let log_max_height =
-        builder.eval_expr(proof.commit_phase_commits.len() + RVar::from(config.log_blowup));
-    builder
-        .range(0, challenges.query_indices.len())
-        .for_each(|i, builder| {
-            let index_bits = builder.get(&challenges.query_indices, i);
-            let query_proof = builder.get(&proof.query_proofs, i);
-            let ro = builder.get(reduced_openings, i);
-
-            let folded_eval = verify_query(
-                builder,
-                config,
-                &proof.commit_phase_commits,
-                &index_bits,
-                &query_proof,
-                &challenges.betas,
-                &ro,
-                log_max_height,
-            );
-
-            let final_poly_elem = builder.get(&proof.final_poly, 0);
-            builder.assert_ext_eq(folded_eval, final_poly_elem);
-        });
-}
-
 /// Verifies a FRI query.
 ///
 /// Currently assumes the index that is accessed is constant.