diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock index 21ff357893f..6959e781579 100644 --- a/avm-transpiler/Cargo.lock +++ b/avm-transpiler/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "acir" -version = "0.43.0" +version = "0.44.0" dependencies = [ "acir_field", "base64 0.21.7", @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.43.0" +version = "0.44.0" dependencies = [ "ark-bn254", "ark-ff", @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "acvm" -version = "0.43.0" +version = "0.44.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -44,7 +44,7 @@ dependencies = [ [[package]] name = "acvm_blackbox_solver" -version = "0.43.0" +version = "0.44.0" dependencies = [ "acir", "blake2", @@ -159,10 +159,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "arena" -version = "0.27.0" - [[package]] name = "ark-bn254" version = "0.4.0" @@ -323,7 +319,7 @@ dependencies = [ [[package]] name = "aztec_macros" -version = "0.27.0" +version = "0.28.0" dependencies = [ "convert_case", "iter-extended", @@ -434,7 +430,7 @@ dependencies = [ [[package]] name = "brillig" -version = "0.43.0" +version = "0.44.0" dependencies = [ "acir_field", "serde", @@ -442,7 +438,7 @@ dependencies = [ [[package]] name = "brillig_vm" -version = "0.43.0" +version = "0.44.0" dependencies = [ "acir", "acvm_blackbox_solver", @@ -854,7 +850,7 @@ dependencies = [ [[package]] name = "fm" -version = "0.27.0" +version = "0.28.0" dependencies = [ "codespan-reporting", "serde", @@ -1032,7 +1028,7 @@ dependencies = [ [[package]] name = "iter-extended" -version = "0.27.0" +version = "0.28.0" [[package]] name = "itertools" @@ -1197,7 +1193,7 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "noirc_abi" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", "iter-extended", @@ -1210,9 +1206,13 @@ dependencies = [ "toml", ] +[[package]] +name = "noirc_arena" +version = "0.28.0" + [[package]] name = "noirc_driver" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", "aztec_macros", @@ -1233,7 +1233,7 @@ dependencies = [ [[package]] name = "noirc_errors" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", "base64 0.21.7", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "noirc_evaluator" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", "chrono", @@ -1268,16 +1268,16 @@ dependencies = [ [[package]] name = "noirc_frontend" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", - "arena", "chumsky", "fm", "im", "iter-extended", "lalrpop", "lalrpop-util", + "noirc_arena", "noirc_errors", "noirc_printable_type", "petgraph", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "noirc_printable_type" -version = "0.27.0" +version = "0.28.0" dependencies = [ "acvm", "iter-extended", diff --git a/noir/noir-repo/acvm-repo/acvm_js/build.sh b/noir/noir-repo/acvm-repo/acvm_js/build.sh index 16fb26e55db..c07d2d8a4c1 100755 --- a/noir/noir-repo/acvm-repo/acvm_js/build.sh +++ b/noir/noir-repo/acvm-repo/acvm_js/build.sh @@ -25,7 +25,7 @@ function run_if_available { require_command jq require_command cargo require_command wasm-bindgen -require_command wasm-opt +#require_command wasm-opt self_path=$(dirname "$(readlink -f "$0")") pname=$(cargo read-manifest | jq -r '.name') diff --git a/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json index a276a29046f..b5782269674 100644 --- a/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json +++ b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json @@ -42,7 +42,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "dependencies": { - "@aztec/bb.js": "0.35.1", + "@aztec/bb.js": "portal:../../../../barretenberg/ts", "@noir-lang/types": "workspace:*", "fflate": "^0.8.0" }, diff --git a/noir/noir-repo/tooling/noirc_abi_wasm/build.sh b/noir/noir-repo/tooling/noirc_abi_wasm/build.sh index 16fb26e55db..c07d2d8a4c1 100755 --- a/noir/noir-repo/tooling/noirc_abi_wasm/build.sh +++ b/noir/noir-repo/tooling/noirc_abi_wasm/build.sh @@ -25,7 +25,7 @@ function run_if_available { require_command jq require_command cargo require_command wasm-bindgen -require_command wasm-opt +#require_command wasm-opt self_path=$(dirname "$(readlink -f "$0")") pname=$(cargo read-manifest | jq -r '.name') diff --git a/noir/noir-repo/yarn.lock b/noir/noir-repo/yarn.lock index e9915882fac..b45678f5d8b 100644 --- a/noir/noir-repo/yarn.lock +++ b/noir/noir-repo/yarn.lock @@ -221,19 +221,18 @@ __metadata: languageName: node linkType: hard -"@aztec/bb.js@npm:0.35.1": - version: 0.35.1 - resolution: "@aztec/bb.js@npm:0.35.1" +"@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg": + version: 0.0.0-use.local + resolution: "@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg" dependencies: comlink: ^4.4.1 commander: ^10.0.1 debug: ^4.3.4 tslib: ^2.4.0 bin: - bb.js: dest/node/main.js - checksum: 8e3551f059523d9494af4721a9219e2c6e63c8ed1df447a2d0daa9f8526a794758ae708bd1d9c9b1fbfb89c56dc867d9f0b87250dbabfcde23ec02dabbb5a32a + bb.js: ./dest/node/main.js languageName: node - linkType: hard + linkType: soft "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.11, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3": version: 7.23.5 @@ -4396,7 +4395,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg" dependencies: - "@aztec/bb.js": 0.35.1 + "@aztec/bb.js": "portal:../../../../barretenberg/ts" "@noir-lang/types": "workspace:*" "@types/node": ^20.6.2 "@types/prettier": ^3