chore: adapt to upstream Nova changes

See - microsoft/Nova#163
huitseeker · Jun 26, 2023 · 9b8f7d1 · 9b8f7d1
1 parent 73c9d83
commit 9b8f7d1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/proof/nova.rs b/src/proof/nova.rs
@@ -291,17 +291,25 @@ impl<'a: 'b, 'b, C: Coprocessor<S1>> Proof<'a, C> {
 
                 assert!(cs.is_satisfied());
             }
-
-            let res = RecursiveSNARK::prove_step(
-                &pp.pp,
-                recursive_snark,
-                circuit_primary.clone(),
-                circuit_secondary.clone(),
-                z0_primary.clone(),
-                z0_secondary.clone(),
-            );
-            assert!(res.is_ok());
-            recursive_snark = Some(res?);
+            let mut r_snark = recursive_snark.unwrap_or_else(|| {
+                RecursiveSNARK::new(
+                    &pp.pp,
+                    circuit_primary,
+                    &circuit_secondary,
+                    z0_primary.clone(),
+                    z0_secondary.clone(),
+                )
+            });
+            r_snark
+                .prove_step(
+                    &pp.pp,
+                    circuit_primary,
+                    &circuit_secondary,
+                    z0_primary.clone(),
+                    z0_secondary.clone(),
+                )
+                .expect("failure to prove Nova step");
+            recursive_snark = Some(r_snark);
         }
 
         Ok(Self::Recursive(Box::new(recursive_snark.unwrap())))
@@ -339,7 +347,7 @@ impl<'a: 'b, 'b, C: Coprocessor<S1>> Proof<'a, C> {
         let zi_secondary = z0_secondary.clone();
 
         let (zi_primary_verified, zi_secondary_verified) = match self {
-            Self::Recursive(p) => p.verify(&pp.pp, num_steps, z0_primary, z0_secondary),
+            Self::Recursive(p) => p.verify(&pp.pp, num_steps, &z0_primary, &z0_secondary),
             Self::Compressed(p) => p.verify(&pp.vk, num_steps, z0_primary, z0_secondary),
         }?;