Merge pull request #774 from openmina/fix-verif

Fix zkapp verification with feature flags

Author: sebastiencs

ledger/src/proofs/step.rs

@@ -8,7 +8,7 @@ use crate::{
             prepared_statement::{DeferredValues, PreparedStatement, ProofState},
         },
         unfinalized::dummy_ipa_step_challenges_computed,
-        util::proof_evaluation_to_list,
+        util::proof_evaluation_to_absorption_sequence,
         verifiers::wrap_domains,
         wrap::{
             create_oracle_with_public_input, dummy_ipa_wrap_sg, wrap_verifier, Domain,
@@ -2002,7 +2002,7 @@ pub fn expand_deferred(params: ExpandDeferredParams) -> Result<DeferredValues<Fp
         }
     };
 
-    let xs = proof_evaluation_to_list(&evals.evals.evals);
+    let xs = proof_evaluation_to_absorption_sequence(&evals.evals.evals);
     let (x1, x2) = &evals.evals.public_input;
 
     let old_bulletproof_challenges: Vec<_> = old_bulletproof_challenges

ledger/src/proofs/transaction.rs

@@ -4181,7 +4181,7 @@ mod tests_with_wasm {
 }
 
 #[cfg(test)]
-mod tests {
+pub(super) mod tests {
     use std::path::Path;
 
     use mina_p2p_messages::binprot::{
@@ -4215,7 +4215,7 @@ mod tests {
         PerformJob(mina_p2p_messages::v2::SnarkWorkerWorkerRpcsVersionedGetWorkV2TResponse),
     }
 
-    fn panic_in_ci() {
+    pub fn panic_in_ci() {
         fn is_ci() -> bool {
             std::env::var("CI").is_ok()
         }

ledger/src/proofs/util.rs

@@ -134,7 +134,7 @@ pub fn challenge_polynomial_checked<F: FieldWitness>(
 }
 
 /// Note: Outdated URL
-/// Note: Same as `to_absorption_sequence`
+/// Note: Different than `to_absorption_sequence`
 /// https://github.com/MinaProtocol/mina/blob/4af0c229548bc96d76678f11b6842999de5d3b0b/src/lib/pickles_types/plonk_types.ml#L611
 pub fn proof_evaluation_to_list<F: FieldWitness>(
     e: &ProofEvaluations<PointEvaluations<Vec<F>>>,
@@ -211,6 +211,86 @@ pub fn proof_evaluation_to_list<F: FieldWitness>(
     list
 }
 
+pub fn proof_evaluation_to_absorption_sequence<F: FieldWitness>(
+    e: &ProofEvaluations<PointEvaluations<Vec<F>>>,
+) -> Vec<&PointEvaluations<Vec<F>>> {
+    let ProofEvaluations {
+        public: _,
+        w,
+        coefficients,
+        z,
+        s,
+        generic_selector,
+        poseidon_selector,
+        complete_add_selector,
+        mul_selector,
+        emul_selector,
+        endomul_scalar_selector,
+        range_check0_selector,
+        range_check1_selector,
+        foreign_field_add_selector,
+        foreign_field_mul_selector,
+        xor_selector,
+        rot_selector,
+        lookup_aggregation,
+        lookup_table,
+        lookup_sorted,
+        runtime_lookup_table,
+        runtime_lookup_table_selector,
+        xor_lookup_selector,
+        lookup_gate_lookup_selector,
+        range_check_lookup_selector,
+        foreign_field_mul_lookup_selector,
+    } = e;
+
+    let mut list = vec![
+        z,
+        generic_selector,
+        poseidon_selector,
+        complete_add_selector,
+        mul_selector,
+        emul_selector,
+        endomul_scalar_selector,
+    ];
+
+    list.extend(w.iter());
+    list.extend(coefficients.iter());
+    list.extend(s.iter());
+
+    list.extend(
+        [
+            range_check0_selector,
+            range_check1_selector,
+            foreign_field_add_selector,
+            foreign_field_mul_selector,
+            xor_selector,
+            rot_selector,
+            lookup_aggregation,
+            lookup_table,
+        ]
+        .into_iter()
+        .filter_map(|v| v.as_ref()),
+    );
+
+    list.extend(lookup_sorted.iter().filter_map(|v| v.as_ref()));
+
+    list.extend(
+        [
+            runtime_lookup_table,
+            runtime_lookup_table_selector,
+            xor_lookup_selector,
+            lookup_gate_lookup_selector,
+            range_check_lookup_selector,
+            foreign_field_mul_lookup_selector,
+        ]
+        .into_iter()
+        .filter_map(|v| v.as_ref()),
+    );
+
+    #[allow(clippy::iter_cloned_collect)]
+    list.iter().cloned().collect()
+}
+
 /// https://github.com/MinaProtocol/mina/blob/4af0c229548bc96d76678f11b6842999de5d3b0b/src/lib/pickles_types/plonk_types.ml#L611
 pub fn proof_evaluation_to_list_opt<F: FieldWitness>(
     e: &ProofEvaluations<PointEvaluations<Vec<F>>>,
@@ -312,7 +392,98 @@ pub fn to_absorption_sequence_opt<F: FieldWitness>(
     evals: &ProofEvaluations<PointEvaluations<Vec<F>>>,
     hack_feature_flags: OptFlag,
 ) -> Vec<Opt<PointEvaluations<Vec<F>>>> {
-    proof_evaluation_to_list_opt(evals, hack_feature_flags)
+    let ProofEvaluations {
+        public: _,
+        w,
+        coefficients,
+        z,
+        s,
+        generic_selector,
+        poseidon_selector,
+        complete_add_selector,
+        mul_selector,
+        emul_selector,
+        endomul_scalar_selector,
+        range_check0_selector,
+        range_check1_selector,
+        foreign_field_add_selector,
+        foreign_field_mul_selector,
+        xor_selector,
+        rot_selector,
+        lookup_aggregation,
+        lookup_table,
+        lookup_sorted,
+        runtime_lookup_table,
+        runtime_lookup_table_selector,
+        xor_lookup_selector,
+        lookup_gate_lookup_selector,
+        range_check_lookup_selector,
+        foreign_field_mul_lookup_selector,
+    } = evals;
+
+    let mut list = vec![
+        Opt::Some(z.clone()),
+        Opt::Some(generic_selector.clone()),
+        Opt::Some(poseidon_selector.clone()),
+        Opt::Some(complete_add_selector.clone()),
+        Opt::Some(mul_selector.clone()),
+        Opt::Some(emul_selector.clone()),
+        Opt::Some(endomul_scalar_selector.clone()),
+    ];
+
+    list.extend(w.iter().cloned().map(Opt::Some));
+    list.extend(coefficients.iter().cloned().map(Opt::Some));
+    list.extend(s.iter().cloned().map(Opt::Some));
+
+    let zero = || PointEvaluations {
+        zeta: vec![F::zero()],
+        zeta_omega: vec![F::zero()],
+    };
+    let to_opt = |v: &Option<PointEvaluations<Vec<F>>>| {
+        if let OptFlag::Maybe = hack_feature_flags {
+            match v {
+                Some(v) => Opt::Maybe(Boolean::True, v.clone()),
+                None => Opt::Maybe(Boolean::False, zero()),
+            }
+        } else {
+            match v {
+                Some(v) => Opt::Some(v.clone()),
+                None => Opt::No,
+            }
+        }
+    };
+
+    list.extend(
+        [
+            range_check0_selector,
+            range_check1_selector,
+            foreign_field_add_selector,
+            foreign_field_mul_selector,
+            xor_selector,
+            rot_selector,
+            lookup_aggregation,
+            lookup_table,
+        ]
+        .iter()
+        .map(|e| to_opt(e)),
+    );
+
+    list.extend(lookup_sorted.iter().map(to_opt));
+
+    list.extend(
+        [
+            runtime_lookup_table,
+            runtime_lookup_table_selector,
+            xor_lookup_selector,
+            lookup_gate_lookup_selector,
+            range_check_lookup_selector,
+            foreign_field_mul_lookup_selector,
+        ]
+        .into_iter()
+        .map(to_opt),
+    );
+
+    list
 }
 
 pub fn sha256_sum(s: &[u8]) -> String {