chore!: update to ACVM 0.7.0 (#90)

* chore!: update to ACVM 0.7.0 * chore(serializer): explicit that oracle lays no constraints --------- Co-authored-by: Joss <joss@aztecprotocol.com>
noir-lang · Mar 27, 2023 · 6c03687 · 6c03687
1 parent a2cf864
commit 6c03687
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 99 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/barretenberg_static_lib/src/acvm_interop/proof_system.rs b/barretenberg_static_lib/src/acvm_interop/proof_system.rs
@@ -9,42 +9,6 @@ use common::serializer::serialize_circuit;
 use std::collections::BTreeMap;
 
 impl ProofSystemCompiler for Plonk {
-    fn prove_with_meta(
-        &self,
-        circuit: Circuit,
-        witness_values: BTreeMap<Witness, FieldElement>,
-    ) -> Vec<u8> {
-        let constraint_system = serialize_circuit(&circuit);
-
-        let mut composer = StandardComposer::new(constraint_system);
-
-        let proving_key = composer.compute_proving_key();
-
-        let assignments = proof::flatten_witness_map(&circuit, witness_values);
-
-        composer.create_proof_with_pk(assignments, &proving_key)
-    }
-
-    fn verify_from_cs(
-        &self,
-        proof: &[u8],
-        public_inputs: Vec<FieldElement>,
-        circuit: Circuit,
-    ) -> bool {
-        let constraint_system = serialize_circuit(&circuit);
-
-        let mut composer = StandardComposer::new(constraint_system);
-
-        let proving_key = composer.compute_proving_key();
-        let verification_key = composer.compute_verification_key(&proving_key);
-
-        composer.verify_with_vk(
-            proof,
-            Assignments::from_vec(public_inputs),
-            &verification_key,
-        )
-    }
-
     fn np_language(&self) -> Language {
         Language::PLONKCSat { width: 3 }
     }

diff --git a/barretenberg_static_lib/src/acvm_interop/pwg.rs b/barretenberg_static_lib/src/acvm_interop/pwg.rs
@@ -1,6 +1,6 @@
 use common::acvm::acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness};
-use common::acvm::FieldElement;
-use common::acvm::PartialWitnessGenerator;
+use common::acvm::{FieldElement, OpcodeResolution};
+use common::acvm::{OpcodeResolutionError, PartialWitnessGenerator};
 use std::collections::BTreeMap;
 
 mod black_box_functions;
@@ -13,7 +13,7 @@ impl PartialWitnessGenerator for Plonk {
     fn solve_black_box_function_call(
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         func_call: &BlackBoxFuncCall,
-    ) -> Result<(), common::acvm::OpcodeResolutionError> {
+    ) -> Result<OpcodeResolution, OpcodeResolutionError> {
         BlackBoxFuncCaller::solve_black_box_func_call(initial_witness, func_call)
     }
 }
diff --git a/barretenberg_static_lib/src/acvm_interop/pwg/black_box_functions.rs b/barretenberg_static_lib/src/acvm_interop/pwg/black_box_functions.rs
@@ -1,7 +1,7 @@
 use crate::Barretenberg;
 
 use common::acvm::acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness};
-use common::acvm::{FieldElement, OpcodeResolutionError};
+use common::acvm::{FieldElement, OpcodeResolution, OpcodeResolutionError};
 use common::black_box_functions::BarretenbergShared;
 use std::collections::BTreeMap;
 
@@ -37,7 +37,7 @@ impl BlackBoxFuncCaller {
     pub(super) fn solve_black_box_func_call(
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         gadget_call: &BlackBoxFuncCall,
-    ) -> Result<(), OpcodeResolutionError> {
+    ) -> Result<OpcodeResolution, OpcodeResolutionError> {
         common::black_box_functions::solve_black_box_func_call::<Barretenberg>(
             initial_witness,
             gadget_call,

diff --git a/barretenberg_wasm/src/acvm_interop/proof_system.rs b/barretenberg_wasm/src/acvm_interop/proof_system.rs
@@ -10,42 +10,6 @@ use common::serializer::serialize_circuit;
 use std::collections::BTreeMap;
 
 impl ProofSystemCompiler for Plonk {
-    fn prove_with_meta(
-        &self,
-        circuit: Circuit,
-        witness_values: BTreeMap<Witness, FieldElement>,
-    ) -> Vec<u8> {
-        let constraint_system = serialize_circuit(&circuit);
-
-        let mut composer = StandardComposer::new(constraint_system);
-
-        let proving_key = composer.compute_proving_key();
-
-        let assignments = proof::flatten_witness_map(&circuit, witness_values);
-
-        composer.create_proof_with_pk(assignments, &proving_key)
-    }
-
-    fn verify_from_cs(
-        &self,
-        proof: &[u8],
-        public_inputs: Vec<FieldElement>,
-        circuit: Circuit,
-    ) -> bool {
-        let constraint_system = serialize_circuit(&circuit);
-
-        let mut composer = StandardComposer::new(constraint_system);
-
-        let proving_key = composer.compute_proving_key();
-        let verification_key = composer.compute_verification_key(&proving_key);
-
-        composer.verify_with_vk(
-            proof,
-            Assignments::from_vec(public_inputs),
-            &verification_key,
-        )
-    }
-
     fn np_language(&self) -> Language {
         Language::PLONKCSat { width: 3 }
     }

diff --git a/barretenberg_wasm/src/acvm_interop/pwg.rs b/barretenberg_wasm/src/acvm_interop/pwg.rs
@@ -1,6 +1,6 @@
 use common::acvm::acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness};
-use common::acvm::FieldElement;
-use common::acvm::PartialWitnessGenerator;
+use common::acvm::{FieldElement, OpcodeResolution};
+use common::acvm::{OpcodeResolutionError, PartialWitnessGenerator};
 use std::collections::BTreeMap;
 
 mod black_box_functions;
@@ -13,7 +13,7 @@ impl PartialWitnessGenerator for Plonk {
     fn solve_black_box_function_call(
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         func_call: &BlackBoxFuncCall,
-    ) -> Result<(), common::acvm::OpcodeResolutionError> {
+    ) -> Result<OpcodeResolution, OpcodeResolutionError> {
         BlackBoxFuncCaller::solve_black_box_func_call(initial_witness, func_call)
     }
 }
diff --git a/barretenberg_wasm/src/acvm_interop/pwg/black_box_functions.rs b/barretenberg_wasm/src/acvm_interop/pwg/black_box_functions.rs
@@ -1,7 +1,7 @@
 use crate::Barretenberg;
 
 use common::acvm::acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness};
-use common::acvm::{FieldElement, OpcodeResolutionError};
+use common::acvm::{FieldElement, OpcodeResolution, OpcodeResolutionError};
 use common::black_box_functions::BarretenbergShared;
 use std::collections::BTreeMap;
 
@@ -37,7 +37,7 @@ impl BlackBoxFuncCaller {
     pub(super) fn solve_black_box_func_call(
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         gadget_call: &BlackBoxFuncCall,
-    ) -> Result<(), OpcodeResolutionError> {
+    ) -> Result<OpcodeResolution, OpcodeResolutionError> {
         common::black_box_functions::solve_black_box_func_call::<Barretenberg>(
             initial_witness,
             gadget_call,

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-acvm = { version = "0.6.0", features = ["bn254"] }
+acvm = { version = "0.7.0", features = ["bn254"] }
 
 sled = "0.34.6"
 blake2 = "0.9.1"

diff --git a/common/src/black_box_functions.rs b/common/src/black_box_functions.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use acvm::{
     acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness, BlackBoxFunc},
     pwg::{self, witness_to_value},
-    FieldElement, OpcodeResolutionError,
+    FieldElement, OpcodeResolution, OpcodeResolutionError,
 };
 use blake2::{Blake2s, Digest};
 
@@ -27,7 +27,7 @@ pub trait BarretenbergShared: PathHasher {
 pub fn solve_black_box_func_call<B: BarretenbergShared>(
     initial_witness: &mut BTreeMap<Witness, FieldElement>,
     gadget_call: &BlackBoxFuncCall,
-) -> Result<(), OpcodeResolutionError> {
+) -> Result<OpcodeResolution, OpcodeResolutionError> {
     match gadget_call.name {
         BlackBoxFunc::SHA256 => pwg::hash::sha256(initial_witness, gadget_call),
         BlackBoxFunc::Blake2s => pwg::hash::blake2s(initial_witness, gadget_call),
@@ -157,5 +157,6 @@ pub fn solve_black_box_func_call<B: BarretenbergShared>(
         }
         BlackBoxFunc::RANGE => acvm::pwg::range::solve_range_opcode(initial_witness, gadget_call)?,
     }
-    Ok(())
+
+    Ok(OpcodeResolution::Solved)
 }
diff --git a/common/src/serializer.rs b/common/src/serializer.rs
@@ -338,19 +338,19 @@ pub fn serialize_circuit(circuit: &Circuit) -> ConstraintSystem {
                     BlackBoxFunc::AES => panic!("AES has not yet been implemented"),
                 };
             }
-            Opcode::Directive(_) => {
-                // Directives are only needed by the pwg
+            Opcode::Directive(_) | Opcode::Oracle(_) => {
+                // Directives & Oracles are only needed by the pwg
             }
-            Opcode::Block(_, _) => {
-                // TODO: implement serialization of blocks to match BB's interface
+            Opcode::Block(_) | Opcode::RAM(_) | Opcode::ROM(_) => {
+                // TODO: implement serialization to match BB's interface
             }
         }
     }
 
     // Create constraint system
     ConstraintSystem {
         var_num: circuit.current_witness_index + 1, // number of witnesses is the witness index + 1;
-        public_inputs: circuit.public_inputs.indices(),
+        public_inputs: circuit.public_inputs().indices(),
         logic_constraints,
         range_constraints,
         sha256_constraints,