From 602f4cf2e2fa15947bf8363a7d5fe261817968af Mon Sep 17 00:00:00 2001 From: kevaundray Date: Fri, 8 Sep 2023 22:29:36 +0000 Subject: [PATCH 1/3] patch acvm to use branch --- Cargo.lock | 23 +++++++++-------------- Cargo.toml | 4 ++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dec1f2de5db..f9ce0c5fb27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,8 +5,7 @@ version = 3 [[package]] name = "acir" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72cee4cc3e41fd1bba9c94271e4cbd7ac611240b554c186778c6ffe74ad9000c" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir_field", "bincode", @@ -19,8 +18,7 @@ dependencies = [ [[package]] name = "acir_field" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80dc2861464de968b44c053f67511e6b5b0c12a1742aa9df5a052ac30a156a7" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "ark-bn254", "ark-ff", @@ -33,8 +31,7 @@ dependencies = [ [[package]] name = "acvm" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbecfd8c8aba8fef5456ff66d134d69aa228f655287922aa9b41ed45d5c8d7db" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir", "acvm_blackbox_solver", @@ -67,15 +64,16 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c1c09a9abe7e866de157f16b8323df3d94f65dbf35ced712bb74f297a2f4e" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir", "blake2", "flate2", "getrandom", + "hex", "js-sys", "k256", + "num-bigint", "p256", "pkg-config", "reqwest", @@ -91,8 +89,7 @@ dependencies = [ [[package]] name = "acvm_stdlib" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8078f715d04b3e8b7e94d9ed8913861ccf4a28ea607aea56ea97629a77b97c" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir", ] @@ -496,8 +493,7 @@ dependencies = [ [[package]] name = "brillig" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef05d7dc961b0b6a93a84b0e780d2bc654b90cd6f273275882a40ae9d474d8cf" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir_field", "serde", @@ -506,8 +502,7 @@ dependencies = [ [[package]] name = "brillig_vm" version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9971bd5cec004068b255eef8ea1c71f7e058e4e47fddca4e0a8d089ec1d3940" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" dependencies = [ "acir", "acvm_blackbox_solver", diff --git a/Cargo.toml b/Cargo.toml index 02b8f4b08fe..d63c0a14556 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,3 +62,7 @@ url = "2.2.0" wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] } wasm-bindgen-test = "0.3.33" base64 = "0.21.2" + + +[patch.crates-io] +acvm = { git = "https://github.com/noir-lang/acvm", branch = "kw/add-low-high-test" } From d9a3757f2bcd94911d6641c91bee43f02ae04687 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Wed, 13 Sep 2023 13:47:59 +0000 Subject: [PATCH 2/3] update acvm --- Cargo.lock | 40 ++++++++++++++++++++++++++-------------- Cargo.toml | 2 +- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2293282bb6b..1a9bade007d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,8 +4,9 @@ version = 3 [[package]] name = "acir" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfd6bb6cb07ac4869c58d6e0219f447c2d550a9b2f135f27a6bc6ae0178c379" dependencies = [ "acir_field", "bincode", @@ -17,8 +18,9 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f41bc6e6dab8bd68516970371d7dd897d09e9bf0aa17a72c5e51cefcdad6573" dependencies = [ "ark-bn254", "ark-ff", @@ -30,8 +32,9 @@ dependencies = [ [[package]] name = "acvm" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79eb3b6adc177c907e03b9414a45ef5b37100eb51503c573b3eaf383e93a7543" dependencies = [ "acir", "acvm_blackbox_solver", @@ -63,8 +66,9 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aac4ad683de5aebb590168405c46cdfd76dc7706a7d2c51d029258772d1933e" dependencies = [ "acir", "blake2", @@ -88,8 +92,9 @@ dependencies = [ [[package]] name = "acvm_stdlib" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3344180fe2a59d57cdb0e6251cdc7d9978f15c06eace1af7d82bab12dd3ced9" dependencies = [ "acir", ] @@ -492,8 +497,9 @@ dependencies = [ [[package]] name = "brillig" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "448a380e86405ad785c235907654bea2080386d03c77a2003063ddabb853d744" dependencies = [ "acir_field", "serde", @@ -501,8 +507,9 @@ dependencies = [ [[package]] name = "brillig_vm" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed1097a496ff44eb2b8f01789dfefb5bbd9364b132d9c2446a4ca18090259bf6" dependencies = [ "acir", "acvm_blackbox_solver", @@ -4630,3 +4637,8 @@ dependencies = [ "quote", "syn 2.0.26", ] + +[[patch.unused]] +name = "acvm" +version = "0.26.0" +source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" diff --git a/Cargo.toml b/Cargo.toml index ff28e9334a9..a302063b4e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ edition = "2021" rust-version = "1.66" [workspace.dependencies] -acvm = "0.26.0" +acvm = "0.26.1" arena = { path = "compiler/utils/arena" } fm = { path = "compiler/fm" } iter-extended = { path = "compiler/utils/iter-extended" } From 72394830e880755af38c60e7351ba4c5360ab489 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Wed, 13 Sep 2023 14:16:10 +0000 Subject: [PATCH 3/3] remove patch --- Cargo.lock | 5 ----- Cargo.toml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d2c77ba46d..ddc9c3a9f48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4636,8 +4636,3 @@ dependencies = [ "quote", "syn 2.0.26", ] - -[[patch.unused]] -name = "acvm" -version = "0.26.0" -source = "git+https://github.com/noir-lang/acvm?branch=kw/add-low-high-test#42c782a719f60b15fefe1b1e11d36b9b257f4be7" diff --git a/Cargo.toml b/Cargo.toml index a302063b4e2..8b0e89e3b9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,3 @@ url = "2.2.0" wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] } wasm-bindgen-test = "0.3.33" base64 = "0.21.2" - - -[patch.crates-io] -acvm = { git = "https://github.com/noir-lang/acvm", branch = "kw/add-low-high-test" }