From 3a4af471e023174129b3e3613cde5fc15208dddf Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 15:27:16 +0100 Subject: [PATCH 1/7] chore: bump bb --- scripts/install_bb.sh | 2 +- tooling/noir_js_backend_barretenberg/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install_bb.sh b/scripts/install_bb.sh index b0d55b6ff1d..157d80f06ce 100755 --- a/scripts/install_bb.sh +++ b/scripts/install_bb.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="0.43.0" +VERSION="0.45.1" BBUP_PATH=~/.bb/bbup diff --git a/tooling/noir_js_backend_barretenberg/package.json b/tooling/noir_js_backend_barretenberg/package.json index b0c9e85315a..3628fb93bdd 100644 --- a/tooling/noir_js_backend_barretenberg/package.json +++ b/tooling/noir_js_backend_barretenberg/package.json @@ -41,7 +41,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "dependencies": { - "@aztec/bb.js": "0.43.0", + "@aztec/bb.js": "0.45.1", "@noir-lang/types": "workspace:*", "fflate": "^0.8.0" }, diff --git a/yarn.lock b/yarn.lock index 73dfbf6e82e..87eb6497884 100644 --- a/yarn.lock +++ b/yarn.lock @@ -221,9 +221,9 @@ __metadata: languageName: node linkType: hard -"@aztec/bb.js@npm:0.43.0": - version: 0.43.0 - resolution: "@aztec/bb.js@npm:0.43.0" +"@aztec/bb.js@npm:0.45.1": + version: 0.45.1 + resolution: "@aztec/bb.js@npm:0.45.1" dependencies: comlink: ^4.4.1 commander: ^10.0.1 @@ -231,7 +231,7 @@ __metadata: tslib: ^2.4.0 bin: bb.js: dest/node/main.js - checksum: 63d2617529e00a05e1ac9364639dc10761e50cb6a16e010ac6354011440de037112a82d7cdd29a65b139af528c7d865b047e157b25d15ac36ff701863d550a5b + checksum: 25c3db288207f25f8f43e1a9819b6e948d2e67caa41cd8767afc4a7910f7ed5d02afa17f33c349751f8befbc4d64fbd7541988f12aeba2bb15df73fd8b667195 languageName: node linkType: hard @@ -4396,7 +4396,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg" dependencies: - "@aztec/bb.js": 0.43.0 + "@aztec/bb.js": 0.45.1 "@noir-lang/types": "workspace:*" "@types/node": ^20.6.2 "@types/prettier": ^3 From 48a2f759dd1b21c00e4085f648176b647d6f78ef Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 15:34:52 +0100 Subject: [PATCH 2/7] chore: add script to bump bb version --- scripts/bump-bb.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 scripts/bump-bb.sh diff --git a/scripts/bump-bb.sh b/scripts/bump-bb.sh new file mode 100755 index 00000000000..e69709319f3 --- /dev/null +++ b/scripts/bump-bb.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +BB_VERSION=$1 + +sed -i "s/^VERSION=.*/VERSION=\"$BB_VERSION\"/" ./scripts/install_bb.sh + +tmp=$(mktemp) +BACKEND_BARRETENBERG_PACKAGE_JSON=./tooling/noir_js_backend_barretenberg/package.json +jq --arg v $BB_VERSION '.dependencies."@aztec/bb.js" = $v' $BACKEND_BARRETENBERG_PACKAGE_JSON > $tmp && mv $tmp $BACKEND_BARRETENBERG_PACKAGE_JSON + +YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install From aa3869792e02eb3f9eb03440457a636da6b3551d Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 15:37:10 +0100 Subject: [PATCH 3/7] chore: downgrade to 0.45.0 --- scripts/install_bb.sh | 2 +- tooling/noir_js_backend_barretenberg/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install_bb.sh b/scripts/install_bb.sh index 157d80f06ce..ba8a0b5a849 100755 --- a/scripts/install_bb.sh +++ b/scripts/install_bb.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="0.45.1" +VERSION="0.45.0" BBUP_PATH=~/.bb/bbup diff --git a/tooling/noir_js_backend_barretenberg/package.json b/tooling/noir_js_backend_barretenberg/package.json index 3628fb93bdd..8255c3198f9 100644 --- a/tooling/noir_js_backend_barretenberg/package.json +++ b/tooling/noir_js_backend_barretenberg/package.json @@ -41,7 +41,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "dependencies": { - "@aztec/bb.js": "0.45.1", + "@aztec/bb.js": "0.45.0", "@noir-lang/types": "workspace:*", "fflate": "^0.8.0" }, diff --git a/yarn.lock b/yarn.lock index 87eb6497884..b3ed9f103f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -221,9 +221,9 @@ __metadata: languageName: node linkType: hard -"@aztec/bb.js@npm:0.45.1": - version: 0.45.1 - resolution: "@aztec/bb.js@npm:0.45.1" +"@aztec/bb.js@npm:0.45.0": + version: 0.45.0 + resolution: "@aztec/bb.js@npm:0.45.0" dependencies: comlink: ^4.4.1 commander: ^10.0.1 @@ -231,7 +231,7 @@ __metadata: tslib: ^2.4.0 bin: bb.js: dest/node/main.js - checksum: 25c3db288207f25f8f43e1a9819b6e948d2e67caa41cd8767afc4a7910f7ed5d02afa17f33c349751f8befbc4d64fbd7541988f12aeba2bb15df73fd8b667195 + checksum: 02cf21a75580e4e1187bc346404d92456decd52db46bb32de4dcfa2784baf74bb05a62d31ed2d71de48b7ddf449ce579a11e31ea242afe6ed7ac7fd7da1699c2 languageName: node linkType: hard @@ -4396,7 +4396,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg" dependencies: - "@aztec/bb.js": 0.45.1 + "@aztec/bb.js": 0.45.0 "@noir-lang/types": "workspace:*" "@types/node": ^20.6.2 "@types/prettier": ^3 From 9942c4ff5f4ecf4f0acee80b5698ea7631c71eda Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 16:04:02 +0100 Subject: [PATCH 4/7] . --- scripts/install_bb.sh | 2 +- test_programs/gates_report.sh | 2 +- tooling/noir_js_backend_barretenberg/package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install_bb.sh b/scripts/install_bb.sh index ba8a0b5a849..157d80f06ce 100755 --- a/scripts/install_bb.sh +++ b/scripts/install_bb.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="0.45.0" +VERSION="0.45.1" BBUP_PATH=~/.bb/bbup diff --git a/test_programs/gates_report.sh b/test_programs/gates_report.sh index b33e81b037c..422c99f1caa 100755 --- a/test_programs/gates_report.sh +++ b/test_programs/gates_report.sh @@ -4,7 +4,7 @@ set -e BACKEND=${BACKEND:-bb} # These tests are incompatible with gas reporting -excluded_dirs=("workspace" "workspace_default_member" "double_verify_nested_proof") +excluded_dirs=("workspace" "workspace_default_member" "double_verify_nested_proof" "databus") current_dir=$(pwd) artifacts_path="$current_dir/acir_artifacts" diff --git a/tooling/noir_js_backend_barretenberg/package.json b/tooling/noir_js_backend_barretenberg/package.json index 8255c3198f9..3628fb93bdd 100644 --- a/tooling/noir_js_backend_barretenberg/package.json +++ b/tooling/noir_js_backend_barretenberg/package.json @@ -41,7 +41,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "dependencies": { - "@aztec/bb.js": "0.45.0", + "@aztec/bb.js": "0.45.1", "@noir-lang/types": "workspace:*", "fflate": "^0.8.0" }, diff --git a/yarn.lock b/yarn.lock index b3ed9f103f6..87eb6497884 100644 --- a/yarn.lock +++ b/yarn.lock @@ -221,9 +221,9 @@ __metadata: languageName: node linkType: hard -"@aztec/bb.js@npm:0.45.0": - version: 0.45.0 - resolution: "@aztec/bb.js@npm:0.45.0" +"@aztec/bb.js@npm:0.45.1": + version: 0.45.1 + resolution: "@aztec/bb.js@npm:0.45.1" dependencies: comlink: ^4.4.1 commander: ^10.0.1 @@ -231,7 +231,7 @@ __metadata: tslib: ^2.4.0 bin: bb.js: dest/node/main.js - checksum: 02cf21a75580e4e1187bc346404d92456decd52db46bb32de4dcfa2784baf74bb05a62d31ed2d71de48b7ddf449ce579a11e31ea242afe6ed7ac7fd7da1699c2 + checksum: 25c3db288207f25f8f43e1a9819b6e948d2e67caa41cd8767afc4a7910f7ed5d02afa17f33c349751f8befbc4d64fbd7541988f12aeba2bb15df73fd8b667195 languageName: node linkType: hard @@ -4396,7 +4396,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg" dependencies: - "@aztec/bb.js": 0.45.0 + "@aztec/bb.js": 0.45.1 "@noir-lang/types": "workspace:*" "@types/node": ^20.6.2 "@types/prettier": ^3 From 106cb83a2dcaeb5e5f6113a1630e7de529d9932c Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 17:08:39 +0100 Subject: [PATCH 5/7] . --- test_programs/gates_report.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test_programs/gates_report.sh b/test_programs/gates_report.sh index 422c99f1caa..ea3e32e8c21 100755 --- a/test_programs/gates_report.sh +++ b/test_programs/gates_report.sh @@ -4,7 +4,7 @@ set -e BACKEND=${BACKEND:-bb} # These tests are incompatible with gas reporting -excluded_dirs=("workspace" "workspace_default_member" "double_verify_nested_proof" "databus") +excluded_dirs=("workspace" "workspace_default_member" "databus") current_dir=$(pwd) artifacts_path="$current_dir/acir_artifacts" @@ -18,6 +18,9 @@ NUM_ARTIFACTS=$(ls -1q "$artifacts_path" | wc -l) ITER="1" for pathname in $test_dirs; do ARTIFACT_NAME=$(basename "$pathname") + if [[ " ${excluded_dirs[@]} " =~ "$ARTIFACT_NAME" ]]; then + continue + fi GATES_INFO=$($BACKEND gates -b "$artifacts_path/$ARTIFACT_NAME/target/program.json") MAIN_FUNCTION_INFO=$(echo $GATES_INFO | jq -r '.functions[0] | .name = "main"') From a3f52f67e3b3e1364d6000ccaed5292d8c3656f3 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jul 2024 17:19:07 +0100 Subject: [PATCH 6/7] . --- test_programs/gates_report.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test_programs/gates_report.sh b/test_programs/gates_report.sh index ea3e32e8c21..6c901ff24bc 100755 --- a/test_programs/gates_report.sh +++ b/test_programs/gates_report.sh @@ -19,6 +19,7 @@ ITER="1" for pathname in $test_dirs; do ARTIFACT_NAME=$(basename "$pathname") if [[ " ${excluded_dirs[@]} " =~ "$ARTIFACT_NAME" ]]; then + ITER=$(( $ITER + 1 )) continue fi From 950c7544eb65433c5e27123af4b5b75525cc4ce4 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:31:33 +0100 Subject: [PATCH 7/7] Update scripts/bump-bb.sh --- scripts/bump-bb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bump-bb.sh b/scripts/bump-bb.sh index e69709319f3..36c1f78ca05 100755 --- a/scripts/bump-bb.sh +++ b/scripts/bump-bb.sh @@ -2,7 +2,7 @@ BB_VERSION=$1 -sed -i "s/^VERSION=.*/VERSION=\"$BB_VERSION\"/" ./scripts/install_bb.sh +sed -i.bak "s/^VERSION=.*/VERSION=\"$BB_VERSION\"/" ./scripts/install_bb.sh && rm ./scripts/install_bb.sh.bak tmp=$(mktemp) BACKEND_BARRETENBERG_PACKAGE_JSON=./tooling/noir_js_backend_barretenberg/package.json