acvm 0.24

Cargo.toml

@@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-acvm = { version = "0.23.0", features = ["bn254"] }
+acvm = { git = "https://github.com/noir-lang/acvm", features = ["bn254"] }
 thiserror = "1.0.21"
 base64 = "0.21.2"
 

src/proof_system.rs

@@ -63,12 +63,10 @@ impl ProofSystemCompiler for Barretenberg {
         }
     }
 
-    fn prove_with_pk(
+    fn prove(
         &self,
-        _common_reference_string: &[u8],
         circuit: &Circuit,
         witness_values: WitnessMap,
-        _proving_key: &[u8],
         is_recursive: bool,
     ) -> Result<Vec<u8>, Self::Error> {
         let temp_directory = tempdir().expect("could not create a temporary directory");
@@ -117,13 +115,11 @@ impl ProofSystemCompiler for Barretenberg {
         Ok(proof)
     }
 
-    fn verify_with_vk(
+    fn verify(
         &self,
-        _common_reference_string: &[u8],
         proof: &[u8],
         public_inputs: WitnessMap,
         circuit: &Circuit,
-        _verification_key: &[u8],
         is_recursive: bool,
     ) -> Result<bool, Self::Error> {
         let temp_directory = tempdir().expect("could not create a temporary directory");
@@ -184,7 +180,6 @@ impl ProofSystemCompiler for Barretenberg {
 
     fn vk_as_fields(
         &self,
-        _common_reference_string: &[u8],
         _verification_key: &[u8],
     ) -> Result<(Vec<FieldElement>, FieldElement), Self::Error> {
         panic!("vk_as_fields not supported in this backend");

src/smart_contract.rs

@@ -13,12 +13,7 @@ const ULTRA_VERIFIER_CONTRACT: &str = include_str!("contract.sol");
 impl SmartContract for Barretenberg {
     type Error = BackendError;
 
-    fn eth_contract_from_vk(
-        &self,
-        _common_reference_string: &[u8],
-        circuit: &Circuit,
-        _verification_key: &[u8],
-    ) -> Result<String, Self::Error> {
+    fn eth_contract(&self, circuit: &Circuit) -> Result<String, Self::Error> {
         let temp_directory = tempdir().expect("could not create a temporary directory");
         let temp_directory_path = temp_directory.path();
         let temp_dir_path = temp_directory_path.to_str().unwrap();
@@ -91,15 +86,12 @@ mod tests {
             private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
             public_parameters: PublicInputs::default(),
             return_values: PublicInputs::default(),
+            assert_messages: Default::default(),
         };
 
         let bb = Barretenberg;
 
-        let common_reference_string = Vec::new();
-        let verification_key = Vec::new();
-        let contract = bb
-            .eth_contract_from_vk(&common_reference_string, &circuit, &verification_key)
-            .unwrap();
+        let contract = bb.eth_contract(&circuit).unwrap();
 
         assert!(contract.contains("contract BaseUltraVerifier"));
         assert!(contract.contains("contract UltraVerifier"));