Adapt to upstream Nova RecursiveSNARK API changes

- Updated the `nova` dependency branch in Cargo.toml for compatibility testing - adapts tohttps://github.com/lurk-lang/arecibo/pull/87
huitseeker · Oct 30, 2023 · a87d82e · a87d82e
1 parent 362a294
commit a87d82e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -128,7 +128,7 @@ clap = "4.3.17"
 ff = "0.13"
 metrics = "0.21.1"
 neptune = { git = "https://github.com/lurk-lab/neptune", branch = "dev" }
-nova = { git = "https://github.com/lurk-lab/arecibo", branch = "dev", package = "nova-snark" }
+nova = { git = "https://github.com/lurk-lab/arecibo", branch = "forward_port_238_242", package = "nova-snark" }
 once_cell = "1.18.0"
 pairing = { version = "0.23" }
 pasta_curves = { git = "https://github.com/lurk-lab/pasta_curves", branch = "dev" }

diff --git a/src/proof/nova.rs b/src/proof/nova.rs
@@ -419,18 +419,13 @@ where
                             &pp.pp,
                             &circuit_primary,
                             &circuit_secondary,
-                            z0_primary.clone(),
-                            z0_secondary.clone(),
+                            &z0_primary,
+                            &z0_secondary,
                         )
+                        .expect("Failed to construct initial recursive snark")
                     });
                     r_snark
-                        .prove_step(
-                            &pp.pp,
-                            &circuit_primary,
-                            &circuit_secondary,
-                            z0_primary.clone(),
-                            z0_secondary.clone(),
-                        )
+                        .prove_step(&pp.pp, &circuit_primary, &circuit_secondary)
                         .expect("failure to prove Nova step");
                     recursive_snark = Some(r_snark);
                 }
@@ -467,18 +462,13 @@ where
                         &pp.pp,
                         circuit_primary,
                         &circuit_secondary,
-                        z0_primary.clone(),
-                        z0_secondary.clone(),
+                        &z0_primary,
+                        &z0_secondary,
                     )
+                    .expect("Failed to construct initial recursive snark")
                 });
                 r_snark
-                    .prove_step(
-                        &pp.pp,
-                        circuit_primary,
-                        &circuit_secondary,
-                        z0_primary.clone(),
-                        z0_secondary.clone(),
-                    )
+                    .prove_step(&pp.pp, circuit_primary, &circuit_secondary)
                     .expect("failure to prove Nova step");
                 recursive_snark = Some(r_snark);
             }
@@ -520,9 +510,7 @@ where
 
         let (zi_primary_verified, zi_secondary_verified) = match self {
             Self::Recursive(p, _) => p.verify(&pp.pp, num_steps, z0_primary, &z0_secondary),
-            Self::Compressed(p, _) => {
-                p.verify(&pp.vk, num_steps, z0_primary.to_vec(), z0_secondary)
-            }
+            Self::Compressed(p, _) => p.verify(&pp.vk, num_steps, z0_primary, &z0_secondary),
         }?;
 
         Ok(zi_primary == zi_primary_verified && zi_secondary == zi_secondary_verified)