From 6743afcc77014fac575469395116b77dd205caf7 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Mon, 27 Nov 2023 18:55:43 -0500
Subject: [PATCH 1/2] feat: Aztec CI files in Noir (#3430)

This is a dual-list commit in both Noir and aztec repo. In this PR,
Aztec gets the code to make a mirror, and the mirror action pushes to
our `aztec` branch in Noir. The `aztec` branch features this as the
first commit, to then be pushed one by one from master as Noir changes
come in.

---------

Co-authored-by: ludamad <adam@aztecprotocol.com>
---
 .dockerignore                   | 22 ++++++++++++++++++++++
 .gitignore                      |  3 +++
 Dockerfile                      | 15 +++++++++++++++
 Dockerfile.packages             | 19 +++++++++++++++++++
 acvm-repo/acvm_js/build.sh      |  2 +-
 bootstrap.sh                    | 19 +++++++++++++++++++
 compiler/wasm/build.sh          |  2 +-
 package.json                    |  2 +-
 scripts/bootstrap_native.sh     | 14 ++++++++++++++
 scripts/bootstrap_packages.sh   | 32 ++++++++++++++++++++++++++++++++
 scripts/install_wasm-bindgen.sh | 10 ++++++++++
 tooling/noirc_abi_wasm/build.sh |  2 +-
 12 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 Dockerfile.packages
 create mode 100755 bootstrap.sh
 create mode 100755 scripts/bootstrap_native.sh
 create mode 100755 scripts/bootstrap_packages.sh
 create mode 100755 scripts/install_wasm-bindgen.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..25dd24f015c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,22 @@
+Dockerfile*
+.dockerignore
+
+packages
+**/package.tgz
+**/target
+**/node_modules
+**/outputs
+
+# Source resolver
+compiler/source-resolver/lib
+compiler/source-resolver/lib-node
+
+# Noir.js
+tooling/noir_js/lib
+
+# Wasm build artifacts
+compiler/wasm/nodejs
+compiler/wasm/web
+tooling/noirc_abi_wasm/nodejs
+tooling/noirc_abi_wasm/web
+tooling/noir_js/lib
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2a8db5d2686..355ae67f11c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,5 +54,8 @@ tooling/noirc_abi_wasm/nodejs
 tooling/noirc_abi_wasm/web
 tooling/noir_js/lib
 
+**/package.tgz
+packages
+
 # docs autogen build
 /docs/docs/noir_js/reference/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000000..ac818cb8bd2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM rust:alpine3.17
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache \
+        build-base \
+        bash
+WORKDIR /usr/src/noir
+COPY . .
+RUN ./scripts/bootstrap_native.sh
+
+# When running the container, mount the current working directory to /project.
+FROM alpine:3.17
+COPY --from=0 /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo
+WORKDIR /project
+ENTRYPOINT ["/usr/src/noir/target/release/nargo"]
\ No newline at end of file
diff --git a/Dockerfile.packages b/Dockerfile.packages
new file mode 100644
index 00000000000..11737014e3d
--- /dev/null
+++ b/Dockerfile.packages
@@ -0,0 +1,19 @@
+FROM rust:alpine3.17
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache \
+        build-base \
+        pkgconfig \
+        openssl-dev \
+        npm \
+        yarn \
+        bash \
+        jq
+WORKDIR /usr/src/noir
+COPY . .
+RUN ./scripts/bootstrap_packages.sh
+
+FROM scratch
+COPY --from=0 /usr/src/noir/packages /usr/src/noir/packages
+# For some unknown reason, on alpine only, we need this to exist.
+COPY --from=0 /usr/src/noir/node_modules/@noir-lang /usr/src/noir/node_modules/@noir-lang
\ No newline at end of file
diff --git a/acvm-repo/acvm_js/build.sh b/acvm-repo/acvm_js/build.sh
index 37f2fd0a5a9..24af149bcea 100755
--- a/acvm-repo/acvm_js/build.sh
+++ b/acvm-repo/acvm_js/build.sh
@@ -34,7 +34,7 @@ export CARGO_TARGET_DIR=$self_path/target
 rm -rf $self_path/outputs >/dev/null 2>&1
 rm -rf $self_path/result >/dev/null 2>&1
 
-if [ -v out ]; then
+if [ -n "$out" ]; then
   echo "Will install package to $out (defined outside installPhase.sh script)"
 else
   export out="$self_path/outputs/out"
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 00000000000..bf672ac0ad2
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+cd $(dirname "$0")
+
+CMD=${1:-}
+
+if [ -n "$CMD" ]; then
+  if [ "$CMD" = "clean" ]; then
+    git clean -fdx
+    exit 0
+  else
+    echo "Unknown command: $CMD"
+    exit 1
+  fi
+fi
+
+./scripts/bootstrap_native.sh
+./scripts/bootstrap_packages.sh
\ No newline at end of file
diff --git a/compiler/wasm/build.sh b/compiler/wasm/build.sh
index 37f2fd0a5a9..24af149bcea 100755
--- a/compiler/wasm/build.sh
+++ b/compiler/wasm/build.sh
@@ -34,7 +34,7 @@ export CARGO_TARGET_DIR=$self_path/target
 rm -rf $self_path/outputs >/dev/null 2>&1
 rm -rf $self_path/result >/dev/null 2>&1
 
-if [ -v out ]; then
+if [ -n "$out" ]; then
   echo "Will install package to $out (defined outside installPhase.sh script)"
 else
   export out="$self_path/outputs/out"
diff --git a/package.json b/package.json
index 0e86b100b7c..bced1fb21e8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "test": "yarn workspaces foreach run test",
     "test:integration": "yarn workspace integration-tests test",
     "clean:workspaces": "yarn workspaces foreach --exclude @noir-lang/root run clean",
-    "clean:root": "rm -rf ./result ./target",
+    "clean:root": "rm -rf ./result ./target ./packages",
     "clean": "yarn clean:workspaces && yarn clean:root",
     "lint": "yarn workspaces foreach --verbose run lint",
     "install:acvm_js": "yarn workspace @noir-lang/acvm_js run install:from:nix",
diff --git a/scripts/bootstrap_native.sh b/scripts/bootstrap_native.sh
new file mode 100755
index 00000000000..26cd44704aa
--- /dev/null
+++ b/scripts/bootstrap_native.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eu
+
+cd $(dirname "$0")/..
+
+# If this project has been subrepod into another project, set build data manually.
+if [ -f ".gitrepo" ]; then
+  export SOURCE_DATE_EPOCH=$(date +%s)
+  export GIT_DIRTY=false
+  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
+fi
+
+# Build native.
+cargo build --features="noirc_frontend/aztec" --release
\ No newline at end of file
diff --git a/scripts/bootstrap_packages.sh b/scripts/bootstrap_packages.sh
new file mode 100755
index 00000000000..552ddd7597a
--- /dev/null
+++ b/scripts/bootstrap_packages.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+set -eu
+
+cd $(dirname "$0")/..
+
+./scripts/install_wasm-bindgen.sh
+
+# If this project has been subrepod into another project, set build data manually.
+if [ -f ".gitrepo" ]; then
+  export SOURCE_DATE_EPOCH=$(date +%s)
+  export GIT_DIRTY=false
+  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
+fi
+
+export cargoExtraArgs="--features noirc_frontend/aztec"
+
+yarn
+yarn build
+
+# We create a folder called packages, that contains each package as it would be published to npm, named correctly.
+# These can be useful for testing, or portaling into other projects.
+yarn workspaces foreach pack
+
+rm -rf packages && mkdir -p packages
+tar zxfv acvm-repo/acvm_js/package.tgz -C packages && mv packages/package packages/acvm_js
+tar zxfv compiler/source-resolver/package.tgz -C packages && mv packages/package packages/source-resolver
+tar zxfv compiler/wasm/package.tgz -C packages && mv packages/package packages/noir_wasm
+tar zxfv tooling/noir_codegen/package.tgz -C packages && mv packages/package packages/noir_codegen
+tar zxfv tooling/noir_js/package.tgz -C packages && mv packages/package packages/noir_js
+tar zxfv tooling/noir_js_backend_barretenberg/package.tgz -C packages && mv packages/package packages/backend_barretenberg
+tar zxfv tooling/noir_js_types/package.tgz -C packages && mv packages/package packages/types
+tar zxfv tooling/noirc_abi_wasm/package.tgz -C packages && mv packages/package packages/noirc_abi
\ No newline at end of file
diff --git a/scripts/install_wasm-bindgen.sh b/scripts/install_wasm-bindgen.sh
new file mode 100755
index 00000000000..5e9f9127506
--- /dev/null
+++ b/scripts/install_wasm-bindgen.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eu
+
+cd $(dirname "$0")/..
+
+# Install wasm-bindgen-cli.
+if [ "$(wasm-bindgen --version | cut -d' ' -f2)" != "0.2.86" ]; then
+  echo "Building wasm-bindgen..."
+  RUSTFLAGS="-Ctarget-feature=-crt-static" cargo install -f wasm-bindgen-cli --version 0.2.86
+fi
diff --git a/tooling/noirc_abi_wasm/build.sh b/tooling/noirc_abi_wasm/build.sh
index 37f2fd0a5a9..24af149bcea 100755
--- a/tooling/noirc_abi_wasm/build.sh
+++ b/tooling/noirc_abi_wasm/build.sh
@@ -34,7 +34,7 @@ export CARGO_TARGET_DIR=$self_path/target
 rm -rf $self_path/outputs >/dev/null 2>&1
 rm -rf $self_path/result >/dev/null 2>&1
 
-if [ -v out ]; then
+if [ -n "$out" ]; then
   echo "Will install package to $out (defined outside installPhase.sh script)"
 else
   export out="$self_path/outputs/out"

From 454b140cfa276656ed9b8900a05771d5f48d052c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Rodr=C3=ADguez?= <sirasistant@gmail.com>
Date: Wed, 29 Nov 2023 13:14:28 +0100
Subject: [PATCH 2/2] feat: Pull latest noir for brillig optimizations (#3464)

---
 test_programs/rebuild.sh | 104 ++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 44 deletions(-)

diff --git a/test_programs/rebuild.sh b/test_programs/rebuild.sh
index d89402fb1cf..dfc3dc5c967 100755
--- a/test_programs/rebuild.sh
+++ b/test_programs/rebuild.sh
@@ -1,56 +1,72 @@
 #!/bin/bash
 set -e
 
-excluded_dirs=("workspace" "workspace_default_member")
+process_dir() {
+    local dir=$1
+    local current_dir=$2
+    local dir_name=$(basename "$dir")
+
+    if [[ ! -d "$current_dir/acir_artifacts/$dir_name" ]]; then
+      mkdir -p $current_dir/acir_artifacts/$dir_name
+    fi
+
+    cd $dir
+    if [ -d ./target/ ]; then
+      rm -r ./target/
+    fi
+    nargo compile && nargo execute witness
+
+    if [ -f ./target/witness.tr ]; then
+      mv ./target/witness.tr ./target/witness.gz
+    fi
+
+    if [ -f ./target/${dir_name}.json ]; then
+        jq -r '.bytecode' ./target/${dir_name}.json | base64 -d > ./target/acir.gz
+    fi
+
+    rm ./target/${dir_name}.json
+
+    if [ -d "$current_dir/acir_artifacts/$dir_name/target" ]; then
+      rm -r "$current_dir/acir_artifacts/$dir_name/target"
+    fi
+    mkdir $current_dir/acir_artifacts/$dir_name/target
+
+    mv ./target/*.gz $current_dir/acir_artifacts/$dir_name/target/
 
+    cd $current_dir
+}
+
+export -f process_dir
+
+excluded_dirs=("workspace" "workspace_default_member")
 current_dir=$(pwd)
 base_path="$current_dir/execution_success"
 
-# Clear the acir_artifacts directory of any existing artifacts
 rm -rf $current_dir/acir_artifacts
 mkdir -p $current_dir/acir_artifacts
 
-# Loop over every directory
+# Gather directories to process.
+dirs_to_process=()
 for dir in $base_path/*; do
-  if [[ ! -d $dir ]]; then
-    continue
-  fi
-
-  dir_name=$(basename "$dir")
-
-  if [[ ! " ${excluded_dirs[@]} " =~ " ${dir_name} " ]]; then
-      if [[ ! -d "$current_dir/acir_artifacts/$dir_name" ]]; then
-        mkdir -p $current_dir/acir_artifacts/$dir_name
-      fi
-
-      cd $dir
-      if [ -d ./target/ ]; then
-        rm -r ./target/
-      fi
-      nargo compile && nargo execute witness
-
-      # Rename witness.tr to witness.gz
-      if [ -f ./target/witness.tr ]; then
-        mv ./target/witness.tr ./target/witness.gz
-      fi
-
-      # Extract bytecode field from JSON, base64 decode it, and save it to the target directory
-      if [ -f ./target/${dir_name}.json ]; then
-          jq -r '.bytecode' ./target/${dir_name}.json | base64 -d > ./target/acir.gz
-      fi
-
-      # Delete the JSON file after extracting bytecode field
-      rm ./target/${dir_name}.json
-
-      # Clear the target directory in acir_artifacts
-      if [ -d "$current_dir/acir_artifacts/$dir_name/target" ]; then
-        rm -r "$current_dir/acir_artifacts/$dir_name/target"
-      fi
-      mkdir $current_dir/acir_artifacts/$dir_name/target
-      
-      # Move the artifacts from the target directory to the corresponding directory in acir_artifacts
-      mv ./target/*.gz $current_dir/acir_artifacts/$dir_name/target/
-
-      cd $base_path
-  fi
+    if [[ ! -d $dir ]] || [[ " ${excluded_dirs[@]} " =~ " $(basename "$dir") " ]]; then
+        continue
+    fi
+    dirs_to_process+=("$dir")
+done
+
+# Process each directory in parallel
+pids=()
+for dir in "${dirs_to_process[@]}"; do
+    process_dir "$dir" "$current_dir" &
+    pids+=($!)
+done
+
+# Check the exit status of each background job.
+for pid in "${pids[@]}"; do
+    wait $pid || exit_status=$?
 done
+
+# Exit with a failure status if any job failed.
+if [ ! -z "$exit_status" ]; then
+    exit $exit_status
+fi
\ No newline at end of file