diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock index 77e90dd1fb4a..a1c16ce6a30a 100644 --- a/avm-transpiler/Cargo.lock +++ b/avm-transpiler/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "acir" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir_field", "base64 0.21.7", @@ -13,6 +13,7 @@ dependencies = [ "color-eyre", "flate2", "noir_protobuf", + "num_enum", "prost", "prost-build", "protoc-prebuilt", @@ -26,7 +27,7 @@ dependencies = [ [[package]] name = "acir_field" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "ark-bn254", "ark-ff", @@ -39,7 +40,7 @@ dependencies = [ [[package]] name = "acvm" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir", "acvm_blackbox_solver", @@ -53,7 +54,7 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir", "blake2", @@ -453,7 +454,7 @@ dependencies = [ [[package]] name = "bn254_blackbox_solver" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir", "acvm_blackbox_solver", @@ -477,7 +478,7 @@ dependencies = [ [[package]] name = "brillig" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir_field", "serde", @@ -485,7 +486,7 @@ dependencies = [ [[package]] name = "brillig_vm" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acir", "acvm_blackbox_solver", @@ -925,7 +926,7 @@ dependencies = [ [[package]] name = "fm" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "codespan-reporting", "iter-extended", @@ -1265,7 +1266,7 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "iter-extended" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" [[package]] name = "itertools" @@ -1373,7 +1374,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "noir_protobuf" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "color-eyre", "prost", @@ -1381,7 +1382,7 @@ dependencies = [ [[package]] name = "noirc_abi" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acvm", "iter-extended", @@ -1396,11 +1397,11 @@ dependencies = [ [[package]] name = "noirc_arena" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" [[package]] name = "noirc_errors" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acvm", "base64 0.21.7", @@ -1417,7 +1418,7 @@ dependencies = [ [[package]] name = "noirc_evaluator" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acvm", "bn254_blackbox_solver", @@ -1445,7 +1446,7 @@ dependencies = [ [[package]] name = "noirc_frontend" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acvm", "bn254_blackbox_solver", @@ -1474,7 +1475,7 @@ dependencies = [ [[package]] name = "noirc_printable_type" -version = "1.0.0-beta.5" +version = "1.0.0-beta.6" dependencies = [ "acvm", "iter-extended", @@ -1516,6 +1517,27 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "object" version = "0.32.2" @@ -1637,6 +1659,15 @@ dependencies = [ "elliptic-curve", ] +[[package]] +name = "proc-macro-crate" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +dependencies = [ + "toml_edit 0.22.24", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -2280,7 +2311,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -2302,7 +2333,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap 2.8.0", + "toml_datetime", + "winnow 0.7.10", ] [[package]] @@ -2631,6 +2673,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" +dependencies = [ + "memchr", +] + [[package]] name = "write16" version = "1.0.0" diff --git a/noir/noir-repo-ref b/noir/noir-repo-ref index 05dbcc645672..7b90cea38d61 100644 --- a/noir/noir-repo-ref +++ b/noir/noir-repo-ref @@ -1 +1 @@ -nightly-2025-05-14 +nightly-2025-05-19 diff --git a/noir/noir-repo.patch b/noir/noir-repo.patch index 3334d22548d1..ea3bc61fe1d9 100644 --- a/noir/noir-repo.patch +++ b/noir/noir-repo.patch @@ -1,7 +1,7 @@ -From 133d79dfc55b53f12f98ff04d5e6e570a880ea94 Mon Sep 17 00:00:00 2001 +From 9990c2d4acf7e28c669c8288a6c160d75fe6d8b8 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Sat, 15 Mar 2025 15:36:12 +0000 -Subject: [PATCH 1/4] chore: turn on `skipLibCheck` +Subject: [PATCH 1/5] chore: turn on `skipLibCheck` --- tooling/noir_codegen/tsconfig.json | 1 + @@ -22,25 +22,104 @@ index 30dd2a7..a2712fd 100644 -- 2.43.0 -From ee8c3e8be962996922078637aaea70fccbadeb5c Mon Sep 17 00:00:00 2001 -From: aakoshh -Date: Mon, 17 Mar 2025 12:10:58 +0000 -Subject: [PATCH 2/4] Ignore package.tgz +From 658ff32f06ad9a4b5f6c752774fdbfdad1d1a5d7 Mon Sep 17 00:00:00 2001 +From: AztecBot +Date: Mon, 19 May 2025 12:12:25 +0000 +Subject: [PATCH 3/5] chore: disable TypeCheckError::InvalidTypeForEntryPoint --- - .gitignore | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/.gitignore b/.gitignore -index 3349018..c93fe8e 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -59,3 +59,6 @@ codegen - - mutants.out - mutants.out.old -+ -+# Artifacts created by `noir/bootstrap.sh build_packages` -+**/package.tgz + compiler/noirc_frontend/src/elaborator/mod.rs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/compiler/noirc_frontend/src/elaborator/mod.rs b/compiler/noirc_frontend/src/elaborator/mod.rs +index 89d008f..3e3387b 100644 +--- a/compiler/noirc_frontend/src/elaborator/mod.rs ++++ b/compiler/noirc_frontend/src/elaborator/mod.rs +@@ -1191,12 +1191,13 @@ impl<'context> Elaborator<'context> { + typ: &Type, + is_entry_point: bool, + has_inline_attribute: bool, +- location: Location, ++ _location: Location, + ) { + if (is_entry_point && !typ.is_valid_for_program_input()) + || (has_inline_attribute && !typ.is_valid_non_inlined_function_input()) + { +- self.push_err(TypeCheckError::InvalidTypeForEntryPoint { location }); ++ // Disabled pending updates to protocol circuits re https://github.com/noir-lang/noir/issues/8565 ++ // self.push_err(TypeCheckError::InvalidTypeForEntryPoint { location }); + } + } + -- 2.43.0 + +From e1924f0067e0d5b4d2ce437e6f0121ad1a75f2b0 Mon Sep 17 00:00:00 2001 +From: AztecBot +Date: Mon, 19 May 2025 12:46:17 +0000 +Subject: [PATCH 5/5] remove test + +--- + .../compile_failure/array_oob_regression_7952/Nargo.toml | 6 ------ + .../compile_failure/array_oob_regression_7952/Prover.toml | 2 -- + .../compile_failure/array_oob_regression_7952/src/main.nr | 7 ------- + .../compile_failure/array_oob_regression_7952/stderr.txt | 8 -------- + 4 files changed, 23 deletions(-) + delete mode 100644 test_programs/compile_failure/array_oob_regression_7952/Nargo.toml + delete mode 100644 test_programs/compile_failure/array_oob_regression_7952/Prover.toml + delete mode 100644 test_programs/compile_failure/array_oob_regression_7952/src/main.nr + delete mode 100644 test_programs/compile_failure/array_oob_regression_7952/stderr.txt + +diff --git a/test_programs/compile_failure/array_oob_regression_7952/Nargo.toml b/test_programs/compile_failure/array_oob_regression_7952/Nargo.toml +deleted file mode 100644 +index 03e8dfb..0000000 +--- a/test_programs/compile_failure/array_oob_regression_7952/Nargo.toml ++++ /dev/null +@@ -1,6 +0,0 @@ +-[package] +-name = "array_oob_regression_7952" +-type = "bin" +-authors = [""] +- +-[dependencies] +\ No newline at end of file +diff --git a/test_programs/compile_failure/array_oob_regression_7952/Prover.toml b/test_programs/compile_failure/array_oob_regression_7952/Prover.toml +deleted file mode 100644 +index 8c02f4f..0000000 +--- a/test_programs/compile_failure/array_oob_regression_7952/Prover.toml ++++ /dev/null +@@ -1,2 +0,0 @@ +-a = [[]] +-b = 1 +\ No newline at end of file +diff --git a/test_programs/compile_failure/array_oob_regression_7952/src/main.nr b/test_programs/compile_failure/array_oob_regression_7952/src/main.nr +deleted file mode 100644 +index 4a75115..0000000 +--- a/test_programs/compile_failure/array_oob_regression_7952/src/main.nr ++++ /dev/null +@@ -1,7 +0,0 @@ +-fn main(a: [[u32; 0]; 1], b: bool) -> pub [u32; 0] { +- if (b) { +- a[0] +- } else { +- a[0] +- } +-} +diff --git a/test_programs/compile_failure/array_oob_regression_7952/stderr.txt b/test_programs/compile_failure/array_oob_regression_7952/stderr.txt +deleted file mode 100644 +index e3f3917..0000000 +--- a/test_programs/compile_failure/array_oob_regression_7952/stderr.txt ++++ /dev/null +@@ -1,8 +0,0 @@ +-error: Only sized types may be used in the entry point to a program +- ┌─ src/main.nr:1:12 +- │ +-1 │ fn main(a: [[u32; 0]; 1], b: bool) -> pub [u32; 0] { +- │ ------------- Slices, references, or any type containing them may not be used in main, contract functions, or foldable functions +- │ +- +-Aborting due to 1 previous error +\ No newline at end of file +-- +2.43.0 + diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 21c609c414b3..5423bd05cf95 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -978,7 +978,7 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/noir-noir_codegen@portal:../noir/packages/noir_codegen::locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@aztec/noir-types": "npm:1.0.0-beta.5" + "@aztec/noir-types": "npm:1.0.0-beta.6" glob: "npm:^11.0.1" ts-command-line-args: "npm:^2.5.1" bin: @@ -987,14 +987,14 @@ __metadata: linkType: soft "@aztec/noir-noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.": - version: 1.0.0-beta.5 - resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=13b403&locator=%40aztec%2Faztec3-packages%40workspace%3A." + version: 1.0.0-beta.6 + resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=354553&locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@aztec/noir-acvm_js": "npm:1.0.0-beta.5" - "@aztec/noir-noirc_abi": "npm:1.0.0-beta.5" - "@aztec/noir-types": "npm:1.0.0-beta.5" + "@aztec/noir-acvm_js": "npm:1.0.0-beta.6" + "@aztec/noir-noirc_abi": "npm:1.0.0-beta.6" + "@aztec/noir-types": "npm:1.0.0-beta.6" pako: "npm:^2.1.0" - checksum: 10/997624479f7219e9fe3589fc2efa43469feb8c004857e6f19b688e89d30e46b51208c05b02cabc23fe5b1ed4126a6fedb970086277063d3d214ac073265477d6 + checksum: 10/7ed4c3721b60d1a88775e9f0892103164ab6de1828dca033225a48f4f1fde2e39a1b33aad66320fb9182b8aa3df146a416214443dfc657039266f1030cbc7af6 languageName: node linkType: hard @@ -1002,7 +1002,7 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/noir-noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A." dependencies: - "@aztec/noir-types": "npm:1.0.0-beta.5" + "@aztec/noir-types": "npm:1.0.0-beta.6" languageName: node linkType: soft