Include input transformation in a proving step

src/folding.rs

@@ -1,13 +1,12 @@
 use ark_bn254::{constraints::GVar, Bn254, Fr, G1Projective as G1};
 use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
 use ark_grumpkin::{constraints::GVar as GVar2, Projective as G2};
-use itertools::Itertools;
 use sonobe::{
     commitment::{kzg::KZG, pedersen::Pedersen},
     folding::{hypernova::HyperNova, nova::Nova},
     frontend::circom::CircomFCircuit,
     transcript::poseidon::poseidon_canonical_config,
-    FoldingScheme, MultiFolding,
+    Error, FoldingScheme, MultiFolding,
 };
 
 pub type NovaFolding =
@@ -31,26 +30,38 @@ pub struct StepInput<OtherInstances> {
 }
 
 pub trait FoldingSchemeExt: FoldingScheme<G1, G2, CircomFCircuit<Fr>> {
-    fn num_steps(num_inputs: usize) -> usize;
+    const MULTISTEP_SIZE: usize;
+
+    fn num_steps(num_inputs: usize) -> usize {
+        assert_eq!(num_inputs % Self::MULTISTEP_SIZE, 0);
+        num_inputs / Self::MULTISTEP_SIZE
+    }
 
     fn prepreprocess(
         poseidon_config: PoseidonConfig<Fr>,
         circuit: CircomFCircuit<Fr>,
     ) -> Self::PreprocessorParam;
 
-    fn transform_inputs(
+    fn transform_multi_input(
         &self,
-        full_input: Vec<Vec<Fr>>,
+        multi_input: Vec<Vec<Fr>>,
         initial_state: Vec<Fr>,
         rng: &mut impl rand::RngCore,
-    ) -> Vec<StepInput<Self::MultiCommittedInstanceWithWitness>>;
+    ) -> StepInput<Self::MultiCommittedInstanceWithWitness>;
+
+    fn prove_multistep(
+        &mut self,
+        multi_input: Vec<Vec<Fr>>,
+        initial_state: Vec<Fr>,
+        rng: &mut impl rand::RngCore,
+    ) -> Result<(), Error> {
+        let step_input = self.transform_multi_input(multi_input, initial_state, rng);
+        self.prove_step(rng, step_input.external_inputs, step_input.other_instances)
+    }
 }
 
 impl FoldingSchemeExt for NovaFolding {
-    fn num_steps(num_inputs: usize) -> usize {
+    const MULTISTEP_SIZE: usize = 1;
-        num_inputs // no multifolding
-    }
-
 
     fn prepreprocess(
         poseidon_config: PoseidonConfig<Fr>,
@@ -59,28 +70,22 @@ impl FoldingSchemeExt for NovaFolding {
         Self::PreprocessorParam::new(poseidon_config, circuit)
     }
 
-    fn transform_inputs(
+    fn transform_multi_input(
         &self,
-        full_input: Vec<Vec<Fr>>,
+        input: Vec<Vec<Fr>>,
         _initial_state: Vec<Fr>,
         _rng: &mut impl rand::RngCore,
-    ) -> Vec<StepInput<Self::MultiCommittedInstanceWithWitness>> {
+    ) -> StepInput<Self::MultiCommittedInstanceWithWitness> {
-        full_input
+        assert_eq!(input.len(), 1);
-            .into_iter()
+        StepInput {
-            .map(|input| StepInput {
+            external_inputs: input[0].clone(),
-                external_inputs: input,
             other_instances: None,
-            })
+        }
-            .collect()
     }
 }
 
 impl<const M: usize, const N: usize> FoldingSchemeExt for HyperNovaFolding<M, N> {
-    fn num_steps(num_inputs: usize) -> usize {
+    const MULTISTEP_SIZE: usize = M + N - 1;
-        let per_step = M + N - 1;
-        assert_eq!(num_inputs % per_step, 0);
-        num_inputs / per_step
-    }
 
     fn prepreprocess(
         poseidon_config: PoseidonConfig<Fr>,
@@ -89,43 +94,31 @@ impl<const M: usize, const N: usize> FoldingSchemeExt for HyperNovaFolding<M, N>
         Self::PreprocessorParam::new(poseidon_config, circuit)
     }
 
-    fn transform_inputs(
+    fn transform_multi_input(
         &self,
-        full_input: Vec<Vec<Fr>>,
+        multi_input: Vec<Vec<Fr>>,
         initial_state: Vec<Fr>,
         rng: &mut impl rand::RngCore,
-    ) -> Vec<StepInput<Self::MultiCommittedInstanceWithWitness>> {
+    ) -> StepInput<Self::MultiCommittedInstanceWithWitness> {
-        full_input
+        let (running, rest) = multi_input.split_at(M - 1);
-            .into_iter()
-            .chunks(M + N - 1)
-            .into_iter()
-            .map(|chunk| {
-                let chunk = chunk.collect::<Vec<_>>();
-                let (running, rest) = chunk.split_at(M - 1);
         let (incoming, [single]) = rest.split_at(N - 1) else {
             panic!("Invalid input chunk size");
         };
 
-                let lcccs = running
+        let new_running = |instance| {
-                    .iter()
+            self.new_running_instance(&mut *rng, initial_state.clone(), instance)
-                    .map(|instance| {
-                        self.new_running_instance(
-                            &mut *rng,
-                            initial_state.clone(),
-                            instance.clone(),
-                        )
                 .expect("Failed to create running instance")
-                    })
+        };
-                    .collect();
+
+        let new_instances =
+            |instances: Vec<Vec<Fr>>, maker| instances.into_iter().map(maker).collect();
+
+        let lcccs = new_instances(running.to_vec(), new_running);
 
         let cccs = incoming
             .iter()
             .map(|instance| {
-                        self.new_incoming_instance(
+                self.new_incoming_instance(&mut *rng, initial_state.clone(), instance.clone())
-                            &mut *rng,
-                            initial_state.clone(),
-                            instance.clone(),
-                        )
                     .expect("Failed to create incoming instance")
             })
             .collect();
@@ -134,8 +127,6 @@ impl<const M: usize, const N: usize> FoldingSchemeExt for HyperNovaFolding<M, N>
             external_inputs: single.clone(),
             other_instances: Some((lcccs, cccs)),
         }
-            })
-            .collect()
     }
 }
 

src/main.rs

@@ -3,7 +3,7 @@ use tracing::info_span;
 
 use crate::{
     folding::{prepare_folding, verify_folding, FoldingSchemeExt, HyperNovaFolding, NovaFolding},
-    logging::{init_logging},
+    logging::init_logging,
 };
 
 mod circuit;
@@ -25,19 +25,12 @@ fn scenario<FS: FoldingSchemeExt>(
     let (mut folding, folding_vp) = info_span!("Prepare folding")
         .in_scope(|| prepare_folding::<FS>(&config.circuit, start_state.clone(), rng));
 
-    let input = info_span!("Transform input")
-        .in_scope(|| folding.transform_inputs(config.input().to_vec(), start_state, &mut *rng));
-
     // ============== FOLDING ======================================================================
 
-    for (i, step_input) in input.into_iter().enumerate() {
+    for (i, multistep_input) in config.input().chunks(FS::MULTISTEP_SIZE).enumerate() {
         info_span!("Folding step", step = i).in_scope(|| {
             folding
-                .prove_step(
+                .prove_multistep(multistep_input.to_vec(), start_state.clone(), &mut *rng)
-                    &mut *rng,
-                    step_input.external_inputs,
-                    step_input.other_instances,
-                )
                 .expect("Failed to prove step")
         });
     }