From ffc5ce2f1a6d0b9779b9ca10a0cece80ba10eedc Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Thu, 26 May 2022 20:37:30 +0200
Subject: [PATCH] Fix bug. Recursive verifier test passes

---
 evm/src/get_challenges.rs     | 30 ------------------------------
 evm/src/recursive_verifier.rs |  9 +++++----
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/evm/src/get_challenges.rs b/evm/src/get_challenges.rs
index 561ee5ae..2e7d8dcb 100644
--- a/evm/src/get_challenges.rs
+++ b/evm/src/get_challenges.rs
@@ -206,35 +206,5 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
                 &config.fri_config,
             ),
         }
-        // let proof = &self.proof;
-        // let opening_proof = &proof.opening_proof;
-        // let num_challenges = config.num_challenges;
-        // let permutation_challenge_sets =
-        //     proof.permutation_zs_cap.as_ref().map(|permutation_zs_cap| {
-        //         let tmp = get_n_grand_product_challenge_sets_target(
-        //             builder,
-        //             &mut challenger,
-        //             num_challenges,
-        //             stark.permutation_batch_size(),
-        //         );
-        //         challenger.observe_cap(permutation_zs_cap);
-        //         tmp
-        //     });
-        // let stark_alphas = challenger.get_n_challenges(builder, num_challenges);
-        // challenger.observe_cap(&proof.quotient_polys_cap);
-        // let stark_zeta = challenger.get_extension_challenge(builder);
-        // challenger.observe_openings(&proof.openings.to_fri_openings());
-        // StarkProofChallengesTarget {
-        //     permutation_challenge_sets,
-        //     stark_alphas,
-        //     stark_zeta,
-        //     fri_challenges: challenger.fri_challenges::<C>(
-        //         builder,
-        //         &opening_proof.commit_phase_merkle_caps,
-        //         &opening_proof.final_poly,
-        //         opening_proof.pow_witness,
-        //         &config.fri_config,
-        //     ),
-        // }
     }
 }
diff --git a/evm/src/recursive_verifier.rs b/evm/src/recursive_verifier.rs
index e01ec0e9..55f5d13a 100644
--- a/evm/src/recursive_verifier.rs
+++ b/evm/src/recursive_verifier.rs
@@ -118,8 +118,8 @@ fn verify_stark_proof_with_challenges_circuit<
     let StarkOpeningSetTarget {
         local_values,
         next_values,
-        permutation_ctl_zs: permutation_zs,
-        permutation_ctl_zs_right: permutation_zs_right,
+        permutation_ctl_zs,
+        permutation_ctl_zs_right,
         ctl_zs_last,
         quotient_polys,
     } = &proof.openings;
@@ -151,11 +151,12 @@ fn verify_stark_proof_with_challenges_circuit<
         l_last,
     );
 
+    let num_permutation_zs = stark.num_permutation_batches(inner_config);
     let permutation_data = stark
         .uses_permutation_args()
         .then(|| PermutationCheckDataTarget {
-            local_zs: permutation_zs.clone(),
-            next_zs: permutation_zs_right.clone(),
+            local_zs: permutation_ctl_zs[..num_permutation_zs].to_vec(),
+            next_zs: permutation_ctl_zs_right[..num_permutation_zs].to_vec(),
             permutation_challenge_sets: challenges.permutation_challenge_sets.clone().unwrap(),
         });