Review fixes

Author: 0xMimir

.github/workflows/ci.yaml

@@ -104,7 +104,7 @@ jobs:
   #       run: make test-ledger
 
   vrf-tests:
-    timeout-minutes: 8
+    timeout-minutes: 20
     runs-on: ubuntu-24.04
     strategy:
       matrix:

ledger/src/proofs/caching.rs

@@ -125,7 +125,6 @@ impl<T> From<&GroupAffineCached> for ark_ec::models::short_weierstrass::Affine<T
 where
     T: ark_ec::short_weierstrass::SWCurveConfig,
     <T as CurveConfig>::BaseField: From<ark_ff::BigInteger256>,
-    <T as CurveConfig>::BaseField: From<ark_ff::BigInt<4>>,
 {
     // This is copy of old `GroupAffine::new` function
     fn from(pallas: &GroupAffineCached) -> Self {

ledger/src/proofs/public_input/plonk_checks.rs

@@ -751,11 +751,37 @@ mod scalars {
                 let x = sub_eval(x, ctx);
                 field::mul(x, y, ctx.w)
             }
-            Operations::Sub(_, _) => todo!(),
-            Operations::Double(_) => todo!(),
-            Operations::Square(_) => todo!(),
-            Operations::Cache(_, _) => todo!(),
-            Operations::IfFeature(_, _, _) => todo!(),
+            Operations::Sub(x, y) => {
+                let x = sub_eval(x, ctx);
+                let y = sub_eval(y, ctx);
+                x - y
+            }
+            Operations::Double(x) => {
+                let x = sub_eval(x, ctx);
+                x.double()
+            }
+            Operations::Square(x) => {
+                let x = sub_eval(x, ctx);
+                field::mul(x, x, ctx.w)
+            }
+            Operations::Cache(id, _e) => ctx.cache.get(id).copied().unwrap(),
+            Operations::IfFeature(feature, e1, e2) => match ctx.env.feature_flags.as_ref() {
+                None => sub_eval(e2, ctx),
+                Some(feature_flags) => {
+                    let is_feature_enabled = match get_feature_flag(feature_flags, feature, ctx.w) {
+                        None => return sub_eval(e2, ctx),
+                        Some(enabled) => enabled,
+                    };
+
+                    let on_false = sub_eval(e2, ctx);
+                    let on_true = sub_eval(e1, ctx);
+
+                    ctx.w.exists_no_check(match is_feature_enabled {
+                        Boolean::True => on_true,
+                        Boolean::False => on_false,
+                    })
+                }
+            },
         }
     }
 

ledger/src/proofs/transaction.rs

@@ -1310,6 +1310,7 @@ impl<F: FieldWitness> InnerCurve<F> {
     }
 }
 
+use poly_commitment::SRS;
 use std::cell::RefCell;
 
 thread_local! {
@@ -3902,8 +3903,7 @@ pub fn make_prover_index<C: ProofConstants, F: FieldWitness>(
     let srs: poly_commitment::ipa::SRS<F::OtherCurve> = {
         let srs = get_srs_mut::<F>();
         let srs = srs.lock().unwrap().clone();
-        // srs.add_lagrange_basis(cs.domain.d1);
-        // srs.with_lagrange_basis(cs.domain.d1);
+        srs.get_lagrange_basis(cs.domain.d1);
         srs
     };
 

ledger/src/proofs/verifiers.rs

@@ -22,7 +22,7 @@ use kimchi::{
     mina_curves::pasta::Pallas,
 };
 use mina_curves::pasta::{Fp, Fq};
-use poly_commitment::{ipa::SRS, lagrange_basis::WithLagrangeBasis, SRS as _};
+use poly_commitment::{ipa::SRS, SRS as _};
 
 use crate::{proofs::BACKEND_TOCK_ROUNDS_N, VerificationKey};
 
@@ -338,7 +338,7 @@ fn make_verifier_index(index: VerifierIndex<Fq>) -> VerifierIndex<Fq> {
     // <https://github.com/o1-labs/proof-systems/blob/2702b09063c7a48131173d78b6cf9408674fd67e/kimchi/src/verifier_index.rs#L310-L314>
     let srs = {
         let srs = SRS::create(max_poly_size);
-        srs.with_lagrange_basis(domain);
+        srs.get_lagrange_basis(domain);
         Arc::new(srs)
     };
 
@@ -397,7 +397,7 @@ pub fn make_zkapp_verifier_index(vk: &VerificationKey) -> VerifierIndex<Fq> {
     let srs = {
         let degree = 1 << BACKEND_TOCK_ROUNDS_N;
         let srs = SRS::<Pallas>::create(degree);
-        srs.with_lagrange_basis(domain);
+        srs.get_lagrange_basis(domain);
         srs
     };
 

ledger/src/proofs/wrap.rs

@@ -266,8 +266,6 @@ fn make_lagrange<F: FieldWitness>(
 
     let x_domain = EvaluationDomain::<F>::new(domain_size).expect("invalid argument");
 
-    // srs.with_lagrange_basis(x_domain);
-
     let lagrange_bases = srs.get_lagrange_basis(x_domain)[..domain_size].to_vec();
     // lagrange_bases[..domain_size].to_vec()
     lagrange_bases.clone()
@@ -1453,7 +1451,7 @@ pub mod pcs_batch {
 pub mod wrap_verifier {
     use std::sync::Arc;
 
-    use ark_ec::short_weierstrass::Affine;
+    use ark_ec::short_weierstrass::{Affine, Projective};
     use itertools::Itertools;
     use poly_commitment::{ipa::SRS, SRS as _};
 
@@ -1826,8 +1824,6 @@ pub mod wrap_verifier {
             EvaluationDomain::<<F as crate::proofs::field::FieldWitness>::Scalar>::new(d)
                 .expect("invalid argument");
 
-        // srs.with_lagrange_basis(x_domain);
-
         let lagrange_bases = &srs.get_lagrange_basis(x_domain);
         lagrange_bases[i].clone()
     }
@@ -1910,17 +1906,22 @@ pub mod wrap_verifier {
                     };
                     (x, y)
                 })
-                .reduce(|mut acc, v| {
-                    acc.0 = Affine::from(acc.0 + v.0);
-                    acc.1 = Affine::from(acc.1 + v.1);
-                    acc
-                })
-                .unwrap();
+                .fold(
+                    (Projective::default(), Projective::default()),
+                    |mut acc, v| {
+                        acc.0 += v.0;
+                        acc.1 += v.1;
+                        acc
+                    },
+                );
 
             w.exists([y.y, y.x]);
             w.exists([x.y, x.x]);
 
-            (InnerCurve::of_affine(x), InnerCurve::of_affine(y))
+            (
+                InnerCurve::of_affine(Affine::from(x)),
+                InnerCurve::of_affine(Affine::from(y)),
+            )
         };
 
         // TODO: Hack until we have proper cvar :(