chore: use workspace build with nargo compile --workspace

yarn-project/noir-compiler/src/noir-version.json

@@ -1,4 +1,4 @@
 {
   "tag": "aztec",
-  "commit": "39e1433a9c4184b72f3c5ab0368cfaa5d4ce537b"
+  "commit": "f173c05cbff96dfc48a22cc2f1f76396b968d5a0"
 }

yarn-project/noir-contracts/Dockerfile.build

@@ -20,6 +20,5 @@ RUN ./scripts/install_noirup.sh $(pwd)
 ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"
 
 RUN ./scripts/install_noir.sh
-RUN ./scripts/install_noir_backend.sh
-RUN ./scripts/compile_ci.sh
+RUN ./scripts/compile_all.sh
 RUN ./scripts/nargo_test_ci.sh

yarn-project/noir-contracts/package.json

@@ -16,10 +16,10 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
-    "noir:clean": "rm -rf ./src/artifacts ./src/types && mkdir -p ../aztec.js/src/abis/ && find ../aztec.js/src/abis/ -mindepth 1 -delete",
+    "noir:clean": "rm -rf ./src/artifacts ./src/types && mkdir -p ../aztec.js/src/abis/ && find ../aztec.js/src/abis/ -mindepth 1 -delete && rm -rf target/",
     "noir:build": "./src/scripts/compile.sh",
-    "noir:build:all": "yarn noir:clean && ./src/scripts/compile.sh $(./scripts/get_all_contracts.sh)",
-    "noir:types:all": "./scripts/types.sh $(./scripts/get_all_contracts.sh)"
+    "noir:build:all": "yarn noir:clean && ./scripts/compile_all.sh && ./scripts/types_all.sh",
+    "noir:types:all": "./scripts/types_all.sh"
   },
   "inherits": [
     "../package.common.json"

yarn-project/noir-contracts/scripts/catch.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Handler for SIGCHLD, cleanup if child exit with error, used by nargo_test.sh and compile.sh
+handle_sigchld() {
+    for pid in "${pids[@]}"; do
+        # If process is no longer running
+        if ! kill -0 "$pid" 2>/dev/null; then
+            # Wait for the process and get exit status
+            wait "$pid"
+            status=$?
+
+            # If exit status is error
+            if [ $status -ne 0 ]; then
+                # Create error file
+                touch "$error_file"
+            fi
+        fi
+    done
+}

yarn-project/noir-contracts/scripts/compile.sh

@@ -2,31 +2,16 @@
 
 # Compiles noir contracts in parallel, bubbling any compilation errors
 
+source ./scripts/catch.sh
+source ./scripts/nargo_check.sh
+
 ROOT=$(pwd)
 
 # Error flag file
 error_file="/tmp/error.$$"
 # Array of child PIDs
 pids=()
 
-# Handler for SIGCHLD, cleanup if child exit with error
-handle_sigchld() {
-    for pid in "${pids[@]}"; do
-        # If process is no longer running
-        if ! kill -0 "$pid" 2>/dev/null; then
-            # Wait for the process and get exit status
-            wait "$pid"
-            status=$?
-
-            # If exit status is error
-            if [ $status -ne 0 ]; then
-                # Create error file
-                touch "$error_file"
-            fi
-        fi
-    done
-}
-
 # Set SIGCHLD handler
 trap handle_sigchld SIGCHLD # Trap any ERR signal and call the custom error handler
 
@@ -41,15 +26,8 @@ build() {
   nargo compile --package $CONTRACT_FOLDER --output-debug;
 }
 
-# Check nargo version matches the expected one
-echo "Using $(nargo --version)"
-EXPECTED_VERSION=$(jq -r '.commit' ../noir-compiler/src/noir-version.json)
-FOUND_VERSION=$(nargo --version | grep -oP 'git version hash: \K[0-9a-f]+')
-if [ "$EXPECTED_VERSION" != "$FOUND_VERSION" ]; then
-  echo "Expected nargo version $EXPECTED_VERSION but found version $FOUND_VERSION. Aborting."
-  exit 1
-fi
-
+# Check nargo version
+nargo_check
 
 # Build contracts
 for CONTRACT_NAME in "$@"; do

yarn-project/noir-contracts/scripts/compile_all.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Compiles all noir contracts
+
+source ./scripts/nargo_check.sh
+
+echo "Checking noir version"
+nargo_check
+
+# Runs the compile scripts for all contracts.
+echo "Compiling all contracts"
+
+nargo compile --workspace

yarn-project/noir-contracts/scripts/nargo_check.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Check nargo version matches the expected one
+nargo_check() {
+    echo "Using $(nargo --version)"
+    EXPECTED_VERSION=$(jq -r '.commit' ../noir-compiler/src/noir-version.json)
+    FOUND_VERSION=$(nargo --version | grep -oP 'git version hash: \K[0-9a-f]+')
+    if [ "$EXPECTED_VERSION" != "$FOUND_VERSION" ]; then
+      echo "Expected nargo version $EXPECTED_VERSION but found version $FOUND_VERSION. Aborting."
+      exit 1
+    fi
+}

yarn-project/noir-contracts/scripts/nargo_test.sh

@@ -12,6 +12,8 @@
 # If testing multiple libraries:
 #  ./scripts/test.sh LIB <LIBRARY_NAME> <LIBRARY_NAME> <LIBRARY_NAME> <LIBRARY_NAME> ...
 
+source ./scripts/catch.sh
+
 ROOT=$(pwd)
 
 # Get the project type from the first argument
@@ -23,24 +25,6 @@ error_file="/tmp/error.$$"
 # Array of child PIDs
 pids=()
 
-# Handler for SIGCHLD, cleanup if child exit with error
-handle_sigchld() {
-    for pid in "${pids[@]}"; do
-        # If process is no longer running
-        if ! kill -0 "$pid" 2>/dev/null; then
-            # Wait for the process and get exit status
-            wait "$pid"
-            status=$?
-
-            # If exit status is error
-            if [ $status -ne 0 ]; then
-                # Create error file
-                touch "$error_file"
-            fi
-        fi
-    done
-}
-
 # Set SIGCHLD handler
 trap handle_sigchld SIGCHLD # Trap any ERR signal and call the custom error handler
 
@@ -51,7 +35,7 @@ test() {
     CONTRACT_FOLDER="${PROJECT_NAME}_contract"
     echo "Testing contract $PROJECT_NAME..."
     cd src/contracts/$CONTRACT_FOLDER
-    nargo test
+    nargo test --package ${PROJECT_NAME}_contract
   else
     echo "Testing library $PROJECT_NAME..."
     cd ../noir-libs/$PROJECT_NAME

yarn-project/noir-contracts/scripts/nargo_test_ci.sh

@@ -1,7 +1,5 @@
-
 #!/bin/bash
 
 # Runs tests scripts for all contracts, then for all libraries.
-
 ./scripts/nargo_test.sh CONTRACT $(./scripts/get_all_contracts.sh)
 ./scripts/nargo_test.sh LIB $(./scripts/get_all_libraries.sh)

yarn-project/noir-contracts/src/scripts/compile.sh

@@ -13,4 +13,5 @@ set -euo pipefail;
 
 # Run build scripts
 ./scripts/compile.sh "$@"
-./scripts/types.sh "$@"
+echo "Generating types"
+./scripts/types.sh "$@"

yarn-project/yarn-project-base/Dockerfile

@@ -122,7 +122,7 @@ WORKDIR /usr/src/yarn-project/noir-contracts
 
 # Run yarn build to have the json ABIs available for the types generator
 RUN yarn build
-RUN ./scripts/types_ci.sh
+RUN ./scripts/types_all.sh
 # Run yarn build again to build the types
 RUN yarn build