From 06509ad0d33d732dcb2578e5754e301503423bbb Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Tue, 20 Jun 2023 13:57:33 -0700 Subject: [PATCH 1/2] fix(nargo): Update acvm-backend-barretenberg to allow wasm backend compilation --- Cargo.lock | 8 +++----- Cargo.toml | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f359a5bb66..3d4cb15d946 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,8 +52,7 @@ dependencies = [ [[package]] name = "acvm-backend-barretenberg" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90594c6d8107569d2ba337a3e1ff2c440cf5ba3f7bc2d3b07af5a405d769584d" +source = "git+https://github.com/noir-lang/acvm-backend-barretenberg?rev=3043e9f69f25c48027d95fae7ecbb8d576b3a82f#3043e9f69f25c48027d95fae7ecbb8d576b3a82f" dependencies = [ "acvm", "barretenberg-sys", @@ -1405,9 +1404,9 @@ dependencies = [ [[package]] name = "gloo-utils" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" dependencies = [ "js-sys", "serde", @@ -3677,7 +3676,6 @@ dependencies = [ "wasmer-engine-universal", "wasmer-types", "wasmer-vm", - "wasmparser", "wat", "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 5080b629347..682fa84ab13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,3 +58,4 @@ wasm-bindgen-test = "0.3.33" [patch.crates-io] async-lsp = { git = "https://github.com/oxalica/async-lsp", rev = "9fc2db84ddcda291a864f044657f68d4377557f7" } +acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "3043e9f69f25c48027d95fae7ecbb8d576b3a82f" } From 178c535b44dde8badc8289a774acbf1954b61eb2 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 21 Jun 2023 08:32:38 -0700 Subject: [PATCH 2/2] update to released version --- Cargo.lock | 5 +++-- Cargo.toml | 1 - crates/nargo_cli/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d4cb15d946..37d566404fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,8 +51,9 @@ dependencies = [ [[package]] name = "acvm-backend-barretenberg" -version = "0.5.0" -source = "git+https://github.com/noir-lang/acvm-backend-barretenberg?rev=3043e9f69f25c48027d95fae7ecbb8d576b3a82f#3043e9f69f25c48027d95fae7ecbb8d576b3a82f" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a378e1d68ed47b4ed1af4533b455e01836d21bf27bde482e977edea0869f0b21" dependencies = [ "acvm", "barretenberg-sys", diff --git a/Cargo.toml b/Cargo.toml index 682fa84ab13..5080b629347 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,4 +58,3 @@ wasm-bindgen-test = "0.3.33" [patch.crates-io] async-lsp = { git = "https://github.com/oxalica/async-lsp", rev = "9fc2db84ddcda291a864f044657f68d4377557f7" } -acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "3043e9f69f25c48027d95fae7ecbb8d576b3a82f" } diff --git a/crates/nargo_cli/Cargo.toml b/crates/nargo_cli/Cargo.toml index 4fc32da4655..fac96757f1c 100644 --- a/crates/nargo_cli/Cargo.toml +++ b/crates/nargo_cli/Cargo.toml @@ -43,7 +43,7 @@ color-eyre = "0.6.2" tokio = "1.0" # Backends -acvm-backend-barretenberg = { version = "0.5.0", default-features = false } +acvm-backend-barretenberg = { version = "0.5.1", default-features = false } [dev-dependencies] tempdir = "0.3.7"