feat!: Update to ACVM 0.13.0

Cargo.toml

@@ -9,32 +9,50 @@ license = "MIT OR Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+crate-type = ["cdylib", "lib"]
+
 [dependencies]
-acvm = { version = "0.12.0", features = ["bn254"] }
+acvm = { version = "0.13.0", features = ["bn254"] }
 bincode = "1.3.3"
 bytesize = "1.2"
 reqwest = { version = "0.11.16", default-features = false, features = ["rustls-tls"] }
 serde = { version = "1.0.136", features = ["derive"] }
 serde-big-array = "0.5.1"
 thiserror = "1.0.21"
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # Native
-barretenberg-sys = { version = "0.1.2", optional = true }
+barretenberg-sys = { version = "0.2.0", optional = true }
 
 # Wasm
-wasmer = { version = "2.3", optional = true, default-features = false }
+getrandom = { version = "0.2", optional = true }
 rust-embed = { version = "6.6.0", optional = true, features = [
     "debug-embed",
     "interpolate-folder-path",
     "include-exclude",
 ] }
-getrandom = { version = "0.2", optional = true }
+wasmer = { version = "2.3", optional = true, default-features = false, features = [
+    "sys-default",
+    "cranelift",
+    "default-compiler",
+    "default-cranelift",
+    "default-universal"
+] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.2", features = [ "js" ] }
+rust-embed = { version = "6.6.0", features = [
+    "debug-embed",
+    "interpolate-folder-path",
+    "include-exclude",
+] }
+wasmer = { version = "2.3", default-features = false, features = [ "js-default" ] }
 
 [build-dependencies]
 pkg-config = "0.3"
 
-[dev-dependencies]
-blake2 = "0.10.6"
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 tokio = { version = "1.0", features = [ "macros" ] }
 
 [features]
@@ -43,18 +61,7 @@ native = [
     "dep:barretenberg-sys"
 ]
 wasm = [
-    "wasmer",
-    "dep:rust-embed",
-    "dep:getrandom",
-    "wasmer/sys-default",
-    "wasmer/cranelift",
-    "wasmer/default-compiler",
-    "wasmer/default-cranelift",
-    "wasmer/default-universal"
-]
-js = [
-    "wasmer",
+    "dep:wasmer",
     "dep:rust-embed",
-    "dep:getrandom",
-    "wasmer/js-default"
+    "dep:getrandom"
 ]

cspell.json

@@ -9,6 +9,7 @@
         "bbmalloc",
         "bbfree",
         "bindgen",
+        "Brillig",
         "cout",
         "fdstat",
         "filestat",
@@ -18,7 +19,6 @@
         "keccak",
         "linearization",
         "logstr",
-        "merkle",
         "nargo",
         "PAIRINGSBN",
         "pedersen",
@@ -32,20 +32,10 @@
         "preimages",
         "preprocess",
         "pubkey",
-        "QARITH",
-        "QECC",
-        "QLOGIC",
-        "QRANGE",
         "reqwest",
-        "rollups",
         "schnorr",
         "secp",
-        "Shleft",
-        "Shright",
-        "Spilsbury",
         "subslice",
-        "TURBOVERIFIER",
-        "vals",
         "wasi",
         "subarray",
         "ESUCCESS",
@@ -77,4 +67,4 @@
         "wasmer",
         "getrandom"
     ]
-}
+}

flake.nix

@@ -38,7 +38,7 @@
     };
 
     barretenberg = {
-      url = "github:AztecProtocol/barretenberg";
+      url = "github:AztecProtocol/barretenberg?rev=46dba6250e5b1eea792a6b4f6a299c1ecb88d694";
       # All of these inputs (a.k.a. dependencies) need to align with inputs we
       # use so they use the `inputs.*.follows` syntax to reference our inputs
       inputs = {

src/acvm_interop/common_reference_string.rs

@@ -3,7 +3,7 @@ use acvm::{acir::circuit::Circuit, async_trait, CommonReferenceString};
 use crate::{composer::Composer, BackendError, Barretenberg};
 
 // TODO(#185): Ensure CRS download works in JS
-#[async_trait]
+#[async_trait(?Send)]
 impl CommonReferenceString for Barretenberg {
     type Error = BackendError;
 

src/acvm_interop/proof_system.rs

@@ -27,21 +27,19 @@ impl ProofSystemCompiler for Barretenberg {
             Opcode::ROM(_) => true,
             Opcode::RAM(_) => true,
             Opcode::Oracle(_) => true,
+            Opcode::Brillig(_) => true,
             Opcode::BlackBoxFuncCall(func) => match func.get_black_box_func() {
                 BlackBoxFunc::AND
                 | BlackBoxFunc::XOR
                 | BlackBoxFunc::RANGE
                 | BlackBoxFunc::SHA256
                 | BlackBoxFunc::Blake2s
                 | BlackBoxFunc::Keccak256
-                | BlackBoxFunc::ComputeMerkleRoot
                 | BlackBoxFunc::SchnorrVerify
                 | BlackBoxFunc::Pedersen
                 | BlackBoxFunc::HashToField128Security
                 | BlackBoxFunc::EcdsaSecp256k1
                 | BlackBoxFunc::FixedBaseScalarMul => true,
-
-                BlackBoxFunc::AES => false,
             },
         }
     }