feat!: update to acvm 0.9.0 (#106)

* feat!: update to acvm 0.9.0 * chore: remove unused import
noir-lang · Apr 11, 2023 · ff350fb · ff350fb
1 parent 34fb542
commit ff350fb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/barretenberg_static_lib/src/acvm_interop/pwg.rs b/barretenberg_static_lib/src/acvm_interop/pwg.rs
@@ -11,6 +11,7 @@ use super::Plonk;
 
 impl PartialWitnessGenerator for Plonk {
     fn solve_black_box_function_call(
+        &self,
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         func_call: &BlackBoxFuncCall,
     ) -> Result<OpcodeResolution, OpcodeResolutionError> {

diff --git a/barretenberg_static_lib/src/acvm_interop/smart_contract.rs b/barretenberg_static_lib/src/acvm_interop/smart_contract.rs
@@ -1,4 +1,3 @@
-use common::acvm::acir::circuit::Circuit;
 use common::acvm::SmartContract;
 use common::crs::G2;
 use common::ULTRA_VERIFIER_CONTRACT;
@@ -26,10 +25,6 @@ impl SmartContract for Plonk {
         let verification_key_library: String = sc_as_bytes.iter().map(|b| *b as char).collect();
         format!("{ULTRA_VERIFIER_CONTRACT}{verification_key_library}")
     }
-
-    fn eth_contract_from_cs(&self, _circuit: Circuit) -> String {
-        unimplemented!("use `eth_contract_from_vk`");
-    }
 }
 
 #[test]

diff --git a/barretenberg_wasm/src/acvm_interop/pwg.rs b/barretenberg_wasm/src/acvm_interop/pwg.rs
@@ -11,6 +11,7 @@ use super::Plonk;
 
 impl PartialWitnessGenerator for Plonk {
     fn solve_black_box_function_call(
+        &self,
         initial_witness: &mut BTreeMap<Witness, FieldElement>,
         func_call: &BlackBoxFuncCall,
     ) -> Result<OpcodeResolution, OpcodeResolutionError> {

diff --git a/barretenberg_wasm/src/acvm_interop/smart_contract.rs b/barretenberg_wasm/src/acvm_interop/smart_contract.rs
@@ -1,4 +1,3 @@
-use common::acvm::acir::circuit::Circuit;
 use common::acvm::SmartContract;
 use common::crs::G2;
 use common::ULTRA_VERIFIER_CONTRACT;
@@ -34,10 +33,6 @@ impl SmartContract for Plonk {
         let verification_key_library: String = sc_as_bytes.iter().map(|b| *b as char).collect();
         format!("{ULTRA_VERIFIER_CONTRACT}{verification_key_library}")
     }
-
-    fn eth_contract_from_cs(&self, _circuit: Circuit) -> String {
-        unimplemented!("use `eth_contract_from_vk`");
-    }
 }
 
 #[test]

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.8.0", features = ["bn254"] }
+acvm = { version = "0.9.0", features = ["bn254"] }
 
 sled = "0.34.6"
 blake2 = "0.9.1"