feat!: Update to ACVM v0.11.0

Cargo.toml

@@ -9,10 +9,10 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-acvm = { version = "0.10.3", features = ["bn254"] }
+acvm = { version = "0.11.0", features = ["bn254"] }
+thiserror = "1.0.21"
 
 blake2 = "0.9.1"
-sha3 = "0.9.1"
 dirs = { version = "3.0", optional = true }
 reqwest = { version = "0.11.16", optional = true, default-features = false, features = [
     "stream",

src/acvm_interop/proof_system.rs

@@ -5,15 +5,17 @@ use std::collections::BTreeMap;
 
 use crate::barretenberg_structures::Assignments;
 use crate::composer::Composer;
-use crate::Barretenberg;
+use crate::{Barretenberg, Error};
 
 impl ProofSystemCompiler for Barretenberg {
+    type Error = Error;
+
     fn np_language(&self) -> Language {
         Language::PLONKCSat { width: 3 }
     }
 
-    fn get_exact_circuit_size(&self, circuit: &Circuit) -> u32 {
-        Composer::get_exact_circuit_size(self, &circuit.into())
+    fn get_exact_circuit_size(&self, circuit: &Circuit) -> Result<u32, Error> {
+        Composer::get_exact_circuit_size(self, &circuit.try_into()?)
     }
 
     fn black_box_function_supported(&self, opcode: &BlackBoxFunc) -> bool {
@@ -35,24 +37,24 @@ impl ProofSystemCompiler for Barretenberg {
         }
     }
 
-    fn preprocess(&self, circuit: &Circuit) -> (Vec<u8>, Vec<u8>) {
-        let constraint_system = &circuit.into();
+    fn preprocess(&self, circuit: &Circuit) -> Result<(Vec<u8>, Vec<u8>), Error> {
+        let constraint_system = &circuit.try_into()?;
 
-        let proving_key = self.compute_proving_key(constraint_system);
-        let verification_key = self.compute_verification_key(constraint_system, &proving_key);
+        let proving_key = self.compute_proving_key(constraint_system)?;
+        let verification_key = self.compute_verification_key(constraint_system, &proving_key)?;
 
-        (proving_key, verification_key)
+        Ok((proving_key, verification_key))
     }
 
     fn prove_with_pk(
         &self,
         circuit: &Circuit,
         witness_values: BTreeMap<Witness, FieldElement>,
         proving_key: &[u8],
-    ) -> Vec<u8> {
+    ) -> Result<Vec<u8>, Error> {
         let assignments = flatten_witness_map(circuit, witness_values);
 
-        self.create_proof_with_pk(&circuit.into(), assignments, proving_key)
+        self.create_proof_with_pk(&circuit.try_into()?, assignments, proving_key)
     }
 
     fn verify_with_vk(
@@ -61,14 +63,14 @@ impl ProofSystemCompiler for Barretenberg {
         public_inputs: BTreeMap<Witness, FieldElement>,
         circuit: &Circuit,
         verification_key: &[u8],
-    ) -> bool {
+    ) -> Result<bool, Error> {
         // Unlike when proving, we omit any unassigned witnesses.
         // Witness values should be ordered by their index but we skip over any indices without an assignment.
         let flattened_public_inputs: Vec<FieldElement> = public_inputs.into_values().collect();
 
         Composer::verify_with_vk(
             self,
-            &circuit.into(),
+            &circuit.try_into()?,
             proof,
             flattened_public_inputs.into(),
             verification_key,

src/acvm_interop/pwg.rs

@@ -24,7 +24,7 @@ impl PartialWitnessGenerator for Barretenberg {
         match func_call.name {
             BlackBoxFunc::SHA256 => hash::sha256(initial_witness, func_call),
             BlackBoxFunc::Blake2s => hash::blake2s(initial_witness, func_call),
-            BlackBoxFunc::Keccak256 => keccak256(initial_witness, func_call),
+            BlackBoxFunc::Keccak256 => hash::keccak256(initial_witness, func_call),
             BlackBoxFunc::EcdsaSecp256k1 => {
                 signature::ecdsa::secp256k1_prehashed(initial_witness, func_call)
             }
@@ -54,7 +54,10 @@ impl PartialWitnessGenerator for Barretenberg {
                     hash_path?,
                     index,
                     leaf,
-                );
+                )
+                .map_err(|err| {
+                    OpcodeResolutionError::BlackBoxFunctionFailed(func_call.name, err.to_string())
+                })?;
 
                 initial_witness.insert(func_call.outputs[0], computed_merkle_root);
                 Ok(OpcodeResolution::Solved)
@@ -82,25 +85,50 @@ impl PartialWitnessGenerator for Barretenberg {
                     .copied()
                     .chain(pub_key_y.to_vec())
                     .collect();
-                let pub_key: [u8; 64] = pub_key_bytes.try_into().unwrap();
+                let pub_key: [u8; 64] = pub_key_bytes.try_into().map_err(|v: Vec<u8>| {
+                    OpcodeResolutionError::BlackBoxFunctionFailed(
+                        func_call.name,
+                        format!("expected pubkey size {} but received {}", 64, v.len()),
+                    )
+                })?;
 
                 let mut signature = [0u8; 64];
                 for (i, sig) in signature.iter_mut().enumerate() {
-                    let _sig_i = inputs_iter.next().unwrap_or_else(|| {
-                        panic!("signature should be 64 bytes long, found only {i} bytes")
-                    });
+                    let _sig_i = inputs_iter.next().ok_or_else(|| {
+                        OpcodeResolutionError::BlackBoxFunctionFailed(
+                            func_call.name,
+                            format!("signature should be 64 bytes long, found only {i} bytes"),
+                        )
+                    })?;
                     let sig_i = witness_to_value(initial_witness, _sig_i.witness)?;
-                    *sig = *sig_i.to_be_bytes().last().unwrap()
+                    *sig = *sig_i.to_be_bytes().last().ok_or_else(|| {
+                        OpcodeResolutionError::BlackBoxFunctionFailed(
+                            func_call.name,
+                            "could not get last bytes".into(),
+                        )
+                    })?;
                 }
 
                 let mut message = Vec::new();
                 for msg in inputs_iter {
                     let msg_i_field = witness_to_value(initial_witness, msg.witness)?;
-                    let msg_i = *msg_i_field.to_be_bytes().last().unwrap();
+                    let msg_i = *msg_i_field.to_be_bytes().last().ok_or_else(|| {
+                        OpcodeResolutionError::BlackBoxFunctionFailed(
+                            func_call.name,
+                            "could not get last bytes".into(),
+                        )
+                    })?;
                     message.push(msg_i);
                 }
 
-                let valid_signature = self.verify_signature(pub_key, signature, &message);
+                let valid_signature = self
+                    .verify_signature(pub_key, signature, &message)
+                    .map_err(|err| {
+                        OpcodeResolutionError::BlackBoxFunctionFailed(
+                            func_call.name,
+                            err.to_string(),
+                        )
+                    })?;
                 if !valid_signature {
                     dbg!("signature has failed to verify");
                 }
@@ -122,7 +150,9 @@ impl PartialWitnessGenerator for Barretenberg {
                     .collect();
                 let scalars: Vec<_> = scalars?.into_iter().cloned().collect();
 
-                let (res_x, res_y) = self.encrypt(scalars);
+                let (res_x, res_y) = self.encrypt(scalars).map_err(|err| {
+                    OpcodeResolutionError::BlackBoxFunctionFailed(func_call.name, err.to_string())
+                })?;
                 initial_witness.insert(func_call.outputs[0], res_x);
                 initial_witness.insert(func_call.outputs[1], res_y);
                 Ok(OpcodeResolution::Solved)
@@ -152,7 +182,9 @@ impl PartialWitnessGenerator for Barretenberg {
             BlackBoxFunc::FixedBaseScalarMul => {
                 let scalar = witness_to_value(initial_witness, func_call.inputs[0].witness)?;
 
-                let (pub_x, pub_y) = self.fixed_base(scalar);
+                let (pub_x, pub_y) = self.fixed_base(scalar).map_err(|err| {
+                    OpcodeResolutionError::BlackBoxFunctionFailed(func_call.name, err.to_string())
+                })?;
 
                 initial_witness.insert(func_call.outputs[0], pub_x);
                 initial_witness.insert(func_call.outputs[1], pub_y);
@@ -161,59 +193,3 @@ impl PartialWitnessGenerator for Barretenberg {
         }
     }
 }
-
-// All of the code below can be removed once we update to acvm 0.11 or greater.
-use sha3::Keccak256;
-fn keccak256(
-    initial_witness: &mut BTreeMap<Witness, FieldElement>,
-    func_call: &BlackBoxFuncCall,
-) -> Result<OpcodeResolution, OpcodeResolutionError> {
-    let hash = generic_hash_256::<Keccak256>(initial_witness, func_call)?;
-
-    for (output_witness, value) in func_call.outputs.iter().zip(hash.iter()) {
-        insert_value(
-            output_witness,
-            FieldElement::from_be_bytes_reduce(&[*value]),
-            initial_witness,
-        )?;
-    }
-
-    Ok(OpcodeResolution::Solved)
-}
-fn insert_value(
-    witness: &Witness,
-    value_to_insert: FieldElement,
-    initial_witness: &mut BTreeMap<Witness, FieldElement>,
-) -> Result<(), OpcodeResolutionError> {
-    let optional_old_value = initial_witness.insert(*witness, value_to_insert);
-
-    let old_value = match optional_old_value {
-        Some(old_value) => old_value,
-        None => return Ok(()),
-    };
-
-    if old_value != value_to_insert {
-        return Err(OpcodeResolutionError::UnsatisfiedConstrain);
-    }
-
-    Ok(())
-}
-fn generic_hash_256<D: Digest>(
-    initial_witness: &mut BTreeMap<Witness, FieldElement>,
-    func_call: &BlackBoxFuncCall,
-) -> Result<[u8; 32], OpcodeResolutionError> {
-    let mut hasher = D::new();
-
-    // Read witness assignments into hasher.
-    for input in func_call.inputs.iter() {
-        let witness = input.witness;
-        let num_bits = input.num_bits as usize;
-
-        let witness_assignment = witness_to_value(initial_witness, witness)?;
-        let bytes = witness_assignment.fetch_nearest_bytes(num_bits);
-        hasher.update(bytes);
-    }
-
-    let result = hasher.finalize().as_slice().try_into().unwrap();
-    Ok(result)
-}