Merge remote-tracking branch 'origin/merge-train/barretenberg' into rk/eccvm-audit-msm-relation

Author: notnotraju

.test_patterns.yml

@@ -45,23 +45,19 @@ tests:
     error_regex: "field_t::range_constraint"
     owners:
       - *luke
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "Failed to fetch"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
-    error_regex: "Failed to fetch"
-    owners:
-      - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "RuntimeError: Out of bounds memory access"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "call_indirect to a null table entry"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "Input is not large enough"
     owners:
       - *adam
@@ -254,7 +250,7 @@ tests:
   - regex: "ivc-integration/src/rollup_ivc_integration.test.ts"
     error_regex: "Exceeded timeout of"
     owners:
-      - *lucas
+      - *luke
   - regex: "e2e_prover/full"
     error_regex: "ProvingError: Failed to verify proof from key!"
   - regex: "slasher/src/slasher_client.test.ts"

.vscode/settings.json

@@ -174,7 +174,7 @@
   // Clangd. Note that this setting may be overridden by user settings
   // to the default value "clangd".
   //
-  "clangd.path": "clangd-16",
+  "clangd.path": "clangd-20",
   //
   // C/C++ (should be disabled)
   //

CI.md

@@ -23,7 +23,7 @@ CI3:
   - Restricting resources such a vcpus, memory and storage.
   - Building a single final slim release image from `release-image`.
 - Provides a consistent command interface on `./bootstrap.sh` scripts, e.g. `./bootstrap.sh clean|fast|full|test|test_cmds`.
-- Unifies how projects are tested allowing for a "build then test the entire repo" workflow. Projects expose their individual tests via `test_cmds` and they can all be parallelised at once to leverage maximum system throughput.
+- Unifies how projects are tested allowing for a "build then test the entire repo" workflow. Projects expose their individual tests via `test_cmds` and they can all be parallelized at once to leverage maximum system throughput.
 - Runs on a single (currently large, 128 vcpu) machine.
 - Significantly reduces the chance of flakey tests making their way into master, by "grinding" the tests in the master merge queue. This simply executes the tests as above, but across N instances. (TBD)
 - Provides a shared redis cache at the test level, meaning the same test never needs to be run twice in CI (except when grinding).
@@ -323,7 +323,7 @@ dl e6b8532f0c020b44
 Let's say you open up a test run log, you'll see something like:
 
 ```
-Command: parallelise 64 (exit: 0)
+Command: parallelize 64 (exit: 0)
 Starting test run with max 64 jobs...
 PASSED (http://ci.aztec-labs.com/736ae186bdf66226): yarn-project/end-to-end/scripts/run_test.sh simple e2e_synching
 PASSED (http://ci.aztec-labs.com/066e837f7af23761): yarn-project/end-to-end/scripts/run_test.sh simple e2e_public_testnet_transfer

avm-transpiler/Cargo.lock

@@ -6,7 +6,7 @@ cmd=${1:-}
 
 hash=$(hash_str $(../noir/bootstrap.sh hash) $(cache_content_hash .rebuild_patterns))
 
-export GIT_COMMIT="0000000000000000000000000000000000000000"
+export GIT_COMMIT="$(cat ../noir/noir-repo-ref | head -n1)-aztec"
 export SOURCE_DATE_EPOCH=0
 export GIT_DIRTY=false
 export RUSTFLAGS="-Dwarnings"

avm-transpiler/bootstrap.sh

@@ -0,0 +1,14 @@
+## `aztec-postprocess-contract`
+
+The Aztec compilation process consists of two steps:
+1. `aztec-nargo` which just forwards all arguments to Noir's `nargo` compiler at the version tied to this version of aztec.
+2. `aztec-postprocess-contract` which post-processes the compiled contracts to prepare them for use in the Aztec ecosystem.
+
+### `transpile_contract_and_gen_vks.sh`
+This script provides the core functionality behind the `aztec-postprocess-contract` command available via aztec-up. It performs postprocessing on compiled Noir contracts:
+1. Finds all contract artifacts in `target` directories
+2. Transpiles each artifact using the `avm-transpiler`
+3. Generates verification keys for each artifact using `bb` (`barretenberg`'s binary)
+4. Caches verification keys to speed up subsequent compilations
+
+Example usage: `aztec-postprocess-contract` (via aztec-up) or directly `./transpile_contract_and_gen_vks.sh`

aztec-nargo/README.md

@@ -1,32 +1,33 @@
 #!/usr/bin/env bash
-# This is a wrapper script for nargo.
-# Pass any args that you'd normally pass to nargo.
-# If the first arg is "compile",
-# run nargo and then postprocess any created artifacts.
+# This script performs postprocessing on compiled Noir contracts.
+# It expects to find compiled artifacts and transforms them via
+# transpilation and verification key generation.
 #
-# Usage: compile_then_postprocess.sh [nargo args]
+# Usage: compile-contract [artifact_path ...]
+# If no paths provided, searches for artifacts in target/ directories
 set -euo pipefail
 
 dir=$(dirname $0)
-NARGO=${NARGO:-"$dir/../noir/noir-repo/target/release/nargo"}
 TRANSPILER=${TRANSPILER:-"$dir/../avm-transpiler/target/release/avm-transpiler"}
 BB=${BB:-"$dir/../barretenberg/cpp/build/bin/bb"}
 
-
-if [ "${1:-}" != "compile" ]; then
-  # if not compiling, just pass through to nargo verbatim
-  $NARGO $@
-  exit $?
-fi
-shift # remove the compile arg so we can inject --show-artifact-paths
-
 # bb --version returns 00000000.00000000.00000000, so we compute
 # the binary hash to ensure we invalidate vk cache artifacts when bb changes
 bb_hash=$(sha256sum "$BB" | cut -d' ' -f1)
 
-# Forward all arguments to nargo, tee output to console.
-# Nargo should be outputting errors to stderr, but it doesn't. Use tee to duplicate stdout to stderr to display errors.
-artifacts_to_process=$($NARGO compile --pedantic-solving --inliner-aggressiveness 0 --show-artifact-paths $@ | tee >(cat >&2) | grep -oP 'Saved contract artifact to: \K.*')
+# If artifact paths are provided as arguments, use those
+# Otherwise, search for contract artifacts in target directories
+if [ $# -gt 0 ]; then
+  artifacts_to_process="$@"
+else
+  # Find all contract artifacts in target directories
+  artifacts_to_process=$(find . -name "*.json" -path "*/target/*" | grep -v "/cache/" | grep -v ".function_artifact_" || true)
+  
+  if [ -z "$artifacts_to_process" ]; then
+    echo "No contract artifacts found. Please compile your contracts first with 'nargo compile'."
+    exit 1
+  fi
+fi
 
 # Postprocess each artifact
 # `$artifacts_to_process` needs to be unquoted here, otherwise it will break if there are multiple artifacts
@@ -82,3 +83,5 @@ for artifact in $artifacts_to_process; do
     mv "$artifact.tmp" "$artifact"
   done
 done
+
+echo "Contract postprocessing complete!"

aztec-postprocess-contract/README.md

@@ -11,7 +11,8 @@ the user's `PATH` variable in their shell startup script so they can be found.
 
 - `aztec` - The infrastructure container.
 - `aztec-cli` - A command-line tool for interacting with infrastructure.
-- `aztec-nargo` - A build of `nargo` from `noir` that is guaranteed to be version-aligned. Provides compiler, lsp and more. On `aztec-nargo compile <...>`, automatically transpiles artifacts using `avm-transpiler` and generates verification keys using `bb`.
+- `aztec-nargo` - A build of `nargo` from `noir` that is guaranteed to be version-aligned. Provides compiler, lsp and more.
+- `aztec-postprocess-contract` - Postprocessing tool for Aztec contracts that transpiles artifacts using `avm-transpiler` and generates verification keys using `bb`.
 - `aztec-sandbox` - A wrapper around docker-compose that launches services needed for sandbox testing.
 - `aztec-up` - A tool to upgrade the aztec toolchain to the latest, or specific versions.
 - `aztec-builder` - A useful tool for projects to generate ABIs and update their dependencies.

aztec-nargo/compile_then_postprocess.sh …ntract/transpile_contract_and_gen_vks.shaztec-nargo/compile_then_postprocess.sh renamed to aztec-postprocess-contract/transpile_contract_and_gen_vks.sh aztec-nargo/compile_then_postprocess.sh renamed to aztec-postprocess-contract/transpile_contract_and_gen_vks.sh

@@ -58,10 +58,11 @@ function title() {
     echo -e "${r}"
   fi
   echo -e "This will install the following scripts and update your PATH if necessary:"
-  echo -e "  ${bold}${g}aztec${r}         - a collection of tools to launch subsystems and interact with the aztec network."
-  echo -e "  ${bold}${g}aztec-nargo${r}   - aztec's build of nargo, the noir compiler toolchain."
-  echo -e "  ${bold}${g}aztec-up${r}      - a tool to upgrade the aztec toolchain to the latest, or specific versions."
-  echo -e "  ${bold}${g}aztec-wallet${r}  - our minimalistic CLI wallet"
+  echo -e "  ${bold}${g}aztec${r}                      - a collection of tools to launch subsystems and interact with the aztec network."
+  echo -e "  ${bold}${g}aztec-nargo${r}                - aztec's build of nargo, the noir compiler toolchain."
+  echo -e "  ${bold}${g}aztec-postprocess-contract${r} - postprocessing tool for Aztec contracts (transpilation and VK generation)."
+  echo -e "  ${bold}${g}aztec-up${r}                   - a tool to upgrade the aztec toolchain to the latest, or specific versions."
+  echo -e "  ${bold}${g}aztec-wallet${r}               - our minimalistic CLI wallet"
   echo
   read -p "Do you wish to continue? (y/n)" -n 1 -r
   echo
@@ -162,6 +163,7 @@ install_bin .aztec-run
 install_bin aztec
 install_bin aztec-up
 install_bin aztec-nargo
+install_bin aztec-postprocess-contract
 install_bin aztec-wallet
 
 update_path_env_var $BIN_PATH