Merge branch 'next' into merge-train/barretenberg

Author: ludamad

.github/workflows/deploy-rpc.yml

@@ -4,16 +4,16 @@ on:
   workflow_call:
     inputs:
       rpc_environment:
-        description: "RPC environment to deploy: testnet or mainnet."
+        description: "RPC environment to deploy. Must match a directory under spartan/terraform/deploy-rpc/environments."
         required: true
         type: string
       v4_aztec_docker_image:
         description: "Full Aztec Docker image for the v4 RPC, for example aztecprotocol/aztec:4.3.1."
         required: true
         type: string
       canonical_aztec_docker_image:
-        description: "Full Aztec Docker image for canonical RPC. Accepted now, used when the canonical RPC block is enabled."
-        required: true
+        description: "Full Aztec Docker image for canonical RPC."
+        required: false
         type: string
         default: ""
       ref:
@@ -25,31 +25,6 @@ on:
         required: false
         type: string
         default: "testnet-440309"
-      gcp_region:
-        description: "GCP region passed to Terraform."
-        required: false
-        type: string
-        default: "us-west1"
-      cluster:
-        description: "GKE cluster name."
-        required: false
-        type: string
-        default: "aztec-gke-public"
-      cluster_location:
-        description: "GKE cluster location used by gcloud."
-        required: false
-        type: string
-        default: "us-west1-a"
-      k8s_cluster_context:
-        description: "Kubernetes context override. Defaults to gke_<project>_<location>_<cluster>."
-        required: false
-        type: string
-        default: ""
-      respect_tf_lock:
-        description: "Whether Terraform should respect state locking."
-        required: false
-        type: boolean
-        default: true
     secrets:
       GCP_SA_KEY:
         description: "GCP service account key for Terraform, GCS state, and GKE access."
@@ -68,8 +43,8 @@ on:
         required: true
         type: string
       canonical_aztec_docker_image:
-        description: "Full Aztec Docker image for canonical RPC. Accepted now, used when the canonical RPC block is enabled."
-        required: true
+        description: "Full Aztec Docker image for canonical RPC."
+        required: false
         type: string
       ref:
         description: "Git ref to checkout. Leave empty to use the current ref."
@@ -80,30 +55,6 @@ on:
         required: false
         type: string
         default: "testnet-440309"
-      gcp_region:
-        description: "GCP region passed to Terraform."
-        required: false
-        type: string
-        default: "us-west1"
-      cluster:
-        description: "GKE cluster name."
-        required: false
-        type: string
-        default: "aztec-gke-public"
-      cluster_location:
-        description: "GKE cluster location used by gcloud."
-        required: false
-        type: string
-        default: "us-west1-a"
-      k8s_cluster_context:
-        description: "Kubernetes context override. Defaults to gke_<project>_<location>_<cluster>."
-        required: false
-        type: string
-      respect_tf_lock:
-        description: "Whether Terraform should respect state locking."
-        required: false
-        type: boolean
-        default: true
 
 permissions:
   contents: read
@@ -117,25 +68,13 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GCP_PROJECT_ID: ${{ inputs.gcp_project_id }}
-      GCP_REGION: ${{ inputs.gcp_region }}
-      CLUSTER_NAME: ${{ inputs.cluster }}
-      CLUSTER_LOCATION: ${{ inputs.cluster_location }}
+      GKE_CLUSTER_NAME: aztec-gke-public
+      GKE_CLUSTER_LOCATION: us-west1-a
     steps:
-      - name: Determine checkout ref
-        id: checkout-ref
-        env:
-          REQUESTED_REF: ${{ inputs.ref }}
-        run: |
-          if [[ -n "$REQUESTED_REF" ]]; then
-            echo "ref=$REQUESTED_REF" >> "$GITHUB_OUTPUT"
-          else
-            echo "ref=${{ github.ref }}" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Checkout
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
-          ref: ${{ steps.checkout-ref.outputs.ref }}
+          ref: ${{ inputs.ref || github.ref }}
           fetch-depth: 0
           persist-credentials: false
 
@@ -144,48 +83,39 @@ jobs:
           RPC_ENVIRONMENT: ${{ inputs.rpc_environment }}
           V4_AZTEC_DOCKER_IMAGE: ${{ inputs.v4_aztec_docker_image }}
           CANONICAL_AZTEC_DOCKER_IMAGE: ${{ inputs.canonical_aztec_docker_image }}
-          K8S_CLUSTER_CONTEXT: ${{ inputs.k8s_cluster_context }}
         run: |
-          if [[ "$RPC_ENVIRONMENT" != "testnet" && "$RPC_ENVIRONMENT" != "mainnet" ]]; then
-            echo "Error: rpc_environment must be testnet or mainnet, got '$RPC_ENVIRONMENT'"
-            exit 1
-          fi
-
-          if [[ ! "$V4_AZTEC_DOCKER_IMAGE" =~ ^.+:.+$ ]]; then
-            echo "Error: v4_aztec_docker_image must be in repository:tag form"
+          terraform_base_dir="spartan/terraform/deploy-rpc/environments"
+          mapfile -t available_environments < <(find "$terraform_base_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort)
+          available_envs="$(printf '%s, ' "${available_environments[@]}")"
+          available_envs="${available_envs%, }"
+
+          valid_environment=false
+          for available_environment in "${available_environments[@]}"; do
+            if [[ "$RPC_ENVIRONMENT" == "$available_environment" ]]; then
+              valid_environment=true
+              break
+            fi
+          done
+
+          if [[ "$valid_environment" != "true" ]]; then
+            echo "Error: rpc_environment must match one of: $available_envs, got '$RPC_ENVIRONMENT'"
             exit 1
           fi
 
-          if [[ -n "$CANONICAL_AZTEC_DOCKER_IMAGE" && ! "$CANONICAL_AZTEC_DOCKER_IMAGE" =~ ^.+:.+$ ]]; then
-            echo "Error: canonical_aztec_docker_image must be empty or in repository:tag form"
-            exit 1
-          fi
-
-          resolved_context="$K8S_CLUSTER_CONTEXT"
-          if [[ -z "$resolved_context" ]]; then
-            resolved_context="gke_${GCP_PROJECT_ID}_${CLUSTER_LOCATION}_${CLUSTER_NAME}"
-          fi
-
-          namespace="${RPC_ENVIRONMENT}-rpc"
-          terraform_dir="spartan/terraform/deploy-rpc/environments/${RPC_ENVIRONMENT}"
-          state_path="${CLUSTER_NAME}/${namespace}/deploy-rpc"
+          resolved_context="gke_${GCP_PROJECT_ID}_${GKE_CLUSTER_LOCATION}_${GKE_CLUSTER_NAME}"
 
-          if [[ ! -d "$terraform_dir" ]]; then
-            echo "Error: Terraform environment not found: $terraform_dir"
-            exit 1
-          fi
+          terraform_dir="${terraform_base_dir}/${RPC_ENVIRONMENT}"
 
           {
             echo "RPC_ENVIRONMENT=$RPC_ENVIRONMENT"
-            echo "NAMESPACE=$namespace"
             echo "TERRAFORM_DIR=$terraform_dir"
-            echo "STATE_PATH=$state_path"
             echo "K8S_CLUSTER_CONTEXT=$resolved_context"
             echo "TF_VAR_GCP_PROJECT_ID=$GCP_PROJECT_ID"
-            echo "TF_VAR_GCP_REGION=$GCP_REGION"
             echo "TF_VAR_K8S_CLUSTER_CONTEXT=$resolved_context"
             echo "TF_VAR_V4_AZTEC_DOCKER_IMAGE=$V4_AZTEC_DOCKER_IMAGE"
-            echo "TF_VAR_CANONICAL_AZTEC_DOCKER_IMAGE=$CANONICAL_AZTEC_DOCKER_IMAGE"
+            if [[ -n "$CANONICAL_AZTEC_DOCKER_IMAGE" ]]; then
+              echo "TF_VAR_CANONICAL_AZTEC_DOCKER_IMAGE=$CANONICAL_AZTEC_DOCKER_IMAGE"
+            fi
           } >> "$GITHUB_ENV"
 
       - name: Authenticate to Google Cloud
@@ -200,8 +130,8 @@ jobs:
 
       - name: Configure kubectl
         run: |
-          gcloud container clusters get-credentials "$CLUSTER_NAME" \
-            --region "$CLUSTER_LOCATION" \
+          gcloud container clusters get-credentials "$GKE_CLUSTER_NAME" \
+            --location "$GKE_CLUSTER_LOCATION" \
             --project "$GCP_PROJECT_ID"
           kubectl config use-context "$K8S_CLUSTER_CONTEXT"
 
@@ -211,17 +141,19 @@ jobs:
           terraform_version: "1.7.5"
           terraform_wrapper: false
 
-      - name: Configure Terraform backend
-        run: spartan/scripts/override_terraform_backend.sh "$TERRAFORM_DIR" "$CLUSTER_NAME" "$STATE_PATH"
-
       - name: Terraform Init
-        run: terraform -chdir="$TERRAFORM_DIR" init -reconfigure
+        run: terraform -chdir="$TERRAFORM_DIR" init -reconfigure -input=false
 
       - name: Terraform Plan
-        run: terraform -chdir="$TERRAFORM_DIR" plan -out=tfplan -lock=${{ inputs.respect_tf_lock }}
+        run: terraform -chdir="$TERRAFORM_DIR" plan -input=false -out=tfplan
 
       - name: Terraform Apply
-        run: terraform -chdir="$TERRAFORM_DIR" apply -auto-approve -lock=${{ inputs.respect_tf_lock }} tfplan
+        run: terraform -chdir="$TERRAFORM_DIR" apply -input=false -auto-approve tfplan
+
+      - name: Capture Terraform outputs
+        run: |
+          namespace="$(terraform -chdir="$TERRAFORM_DIR" output -raw namespace)"
+          echo "RPC_NAMESPACE=$namespace" >> "$GITHUB_ENV"
 
       - name: Write summary
         if: always()
@@ -232,7 +164,8 @@ jobs:
             echo "| Field | Value |"
             echo "|---|---|"
             echo "| Environment | \`${RPC_ENVIRONMENT:-${{ inputs.rpc_environment }}}\` |"
-            echo "| Namespace | \`${NAMESPACE:-unknown}\` |"
+            echo "| Namespace | \`${RPC_NAMESPACE:-unknown}\` |"
             echo "| v4 image | \`${TF_VAR_V4_AZTEC_DOCKER_IMAGE:-unknown}\` |"
-            echo "| Terraform state | \`${STATE_PATH:-unknown}\` |"
+            echo "| canonical image | \`${TF_VAR_CANONICAL_AZTEC_DOCKER_IMAGE:-not set}\` |"
+            echo "| Terraform directory | \`${TERRAFORM_DIR:-unknown}\` |"
           } >> "$GITHUB_STEP_SUMMARY"

.test_patterns.yml

@@ -389,6 +389,14 @@ tests:
     owners:
       - *palla
 
+  # http://ci.aztec-labs.com/e5938ff415312e06
+  # ChainMonitor teardown race: its poll loop calls the L1 Inbox getState() after
+  # Jest has torn down the module env (ERR_VM_MODULE_NOT_MODULE). Test itself passes.
+  - regex: "src/e2e_sequencer/gov_proposal.parallel.test.ts"
+    error_regex: "a file after the Jest environment has been torn down"
+    owners:
+      - *palla
+
   # http://ci.aztec-labs.com/153f5dcbb0f3799c
   - regex: "src/e2e_offchain_payment.test.ts"
     error_regex: "✕ reprocesses an offchain-delivered payment after an L1 reorg"

Makefile

@@ -47,7 +47,7 @@ endef
 # PHONY TARGETS - List every target that has a file/dir of the same name.
 #==============================================================================
 
-.PHONY: noir barretenberg noir-projects l1-contracts release-image boxes playground docs aztec-up spartan wsdb
+.PHONY: noir barretenberg noir-projects l1-contracts release-image boxes playground docs aztec-up spartan wsdb bb-avm-sim
 
 #==============================================================================
 # BOOTSTRAP TARGETS
@@ -69,7 +69,7 @@ full: fast bb-full-tests bb-cpp-full yarn-project-benches
 bench: yarn-project-benches bb-sol bb-acir
 
 # Release. Everything plus copy bb cross compiles to ts projects.
-release: fast bb-cpp-release-dir bb-ts-cross-copy ipc-runtime-cross
+release: fast bb-cpp-release-dir bb-ts-cross-copy bb-avm-sim-cross-copy ipc-runtime-cross
 
 #==============================================================================
 # Noir
@@ -104,7 +104,7 @@ avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm6
 #==============================================================================
 
 # Barretenberg - Aggregate target for all barretenberg sub-projects.
-barretenberg: bb-cpp bb-ts bb-rs bb-acir bb-docs bb-sol bb-bbup bb-crs
+barretenberg: bb-cpp bb-ts bb-avm-sim bb-rs bb-acir bb-docs bb-sol bb-bbup bb-crs
 
 # BB C++ - Main aggregate target.
 bb-cpp: bb-cpp-native bb-cpp-wasm bb-cpp-wasm-threads
@@ -156,19 +156,19 @@ bb-cpp-cross-arm64-macos-objects: bb-cpp-yarn
 	$(call build,$@,barretenberg/cpp,build_cross_objects arm64-macos)
 
 # Cross-compile for ARM64 Linux (release only)
-bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux bb-cpp-yarn
+bb-cpp-cross-arm64-linux: bb-cpp-native bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux bb-cpp-yarn
 	$(call build,$@,barretenberg/cpp,build_preset arm64-linux)
 
 # Cross-compile for AMD64 macOS (release only)
-bb-cpp-cross-amd64-macos: bb-cpp-cross-amd64-macos-objects avm-transpiler-cross-amd64-macos bb-cpp-yarn
+bb-cpp-cross-amd64-macos: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos-objects avm-transpiler-cross-amd64-macos bb-cpp-yarn
 	$(call build,$@,barretenberg/cpp,build_preset amd64-macos)
 
 # Cross-compile for ARM64 macOS (release or CI_FULL)
-bb-cpp-cross-arm64-macos: bb-cpp-cross-arm64-macos-objects avm-transpiler-cross-arm64-macos bb-cpp-yarn
+bb-cpp-cross-arm64-macos: bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos-objects avm-transpiler-cross-arm64-macos bb-cpp-yarn
 	$(call build,$@,barretenberg/cpp,build_preset arm64-macos)
 
 # Cross-compile for AMD64 Windows (release only)
-bb-cpp-cross-amd64-windows: avm-transpiler-cross-amd64-windows
+bb-cpp-cross-amd64-windows: bb-cpp-cross-arm64-macos avm-transpiler-cross-amd64-windows
 	$(call build,$@,barretenberg/cpp,build_preset amd64-windows)
 
 # iOS SDK download (shared by all iOS cross-compile targets)
@@ -180,19 +180,19 @@ bb-cpp-android-sysroot:
 	$(call run_command,$@,$(ROOT)/barretenberg/cpp,bash scripts/download-android-sysroot.sh)
 
 # Cross-compile for ARM64 iOS (release only, static lib only)
-bb-cpp-cross-arm64-ios: bb-cpp-ios-sdk
+bb-cpp-cross-arm64-ios: bb-cpp-cross-amd64-windows bb-cpp-ios-sdk
 	$(call build,$@,barretenberg/cpp,build_preset arm64-ios)
 
 # Cross-compile for ARM64 iOS Simulator (release only, static lib only)
-bb-cpp-cross-arm64-ios-sim: bb-cpp-ios-sdk
+bb-cpp-cross-arm64-ios-sim: bb-cpp-cross-arm64-ios bb-cpp-ios-sdk
 	$(call build,$@,barretenberg/cpp,build_preset arm64-ios-sim)
 
 # Cross-compile for ARM64 Android (release only, static lib only)
-bb-cpp-cross-arm64-android: bb-cpp-android-sysroot
+bb-cpp-cross-arm64-android: bb-cpp-cross-arm64-ios-sim bb-cpp-android-sysroot
 	$(call build,$@,barretenberg/cpp,build_preset arm64-android)
 
 # Cross-compile for x86_64 Android (release only, static lib only)
-bb-cpp-cross-x86_64-android: bb-cpp-android-sysroot
+bb-cpp-cross-x86_64-android: bb-cpp-cross-arm64-android bb-cpp-android-sysroot
 	$(call build,$@,barretenberg/cpp,build_preset x86_64-android)
 
 bb-cpp-cross: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos bb-cpp-cross-amd64-windows bb-cpp-cross-arm64-ios bb-cpp-cross-arm64-ios-sim bb-cpp-cross-arm64-android bb-cpp-cross-x86_64-android
@@ -225,11 +225,17 @@ bb-cpp-full: bb-cpp bb-cpp-gcc bb-cpp-fuzzing bb-cpp-windows bb-cpp-asan bb-cpp-
 
 # BB TypeScript - TypeScript bindings
 bb-ts: bb-cpp-wasm bb-cpp-wasm-threads bb-cpp-native ipc-runtime
-	$(call build,$@,barretenberg/ts)
+	$(call build,$@,barretenberg/ts,build_bb_js)
 
 # Copies the cross-compiles into bb.js.
 bb-ts-cross-copy: bb-ts bb-cpp-cross
-	$(call build,$@,barretenberg/ts,cross_copy)
+	$(call build,$@,barretenberg/ts,cross_copy_bb_js)
+
+bb-avm-sim: ipc-codegen ipc-runtime bb-cpp-native
+	$(call build,$@,barretenberg/ts,build_bb_avm_sim)
+
+bb-avm-sim-cross-copy: bb-avm-sim bb-cpp-cross
+	$(call build,$@,barretenberg/ts,cross_copy_bb_avm_sim)
 
 # BB Rust - barretenberg-rs FFI crate
 bb-rs: bb-ts bb-cpp-native
@@ -396,8 +402,17 @@ l1-contracts-src: l1-contracts-solc
 l1-contracts-verifier: noir-protocol-circuits l1-contracts-src
 	$(call build,$@,l1-contracts,build_verifier)
 
+# l1-contracts-artifacts: Generate the @aztec/l1-artifacts TS package (ABIs/bytecode/storage) and the
+# self-contained foundry bundle used by the runtime forge deploy path. Must depend on the verifier, not
+# just build_src: the generated artifact list includes HonkVerifier, and its real implementation is only
+# produced by build_verifier (which compiles generated/HonkVerifier.sol, copied from noir-projects).
+# build_src only compiles the src/ coverage mock of the same name, which collides on the same out/ path
+# and would be published instead if the verifier had not run last.
+l1-contracts-artifacts: l1-contracts-verifier
+	$(call build,$@,l1-contracts,build_artifacts)
+
 # l1-contracts: Complete build (aggregate target)
-l1-contracts: l1-contracts-src l1-contracts-verifier
+l1-contracts: l1-contracts-src l1-contracts-verifier l1-contracts-artifacts
 
 l1-contracts-tests: l1-contracts-verifier
 	$(call test,$@,l1-contracts)
@@ -406,7 +421,7 @@ l1-contracts-tests: l1-contracts-verifier
 # Yarn Project - TypeScript monorepo with all TS packages
 #==============================================================================
 
-yarn-project: bb-ts noir-projects l1-contracts wsdb
+yarn-project: bb-ts noir-projects l1-contracts wsdb bb-avm-sim
 	$(call build,$@,yarn-project)
 
 yarn-project-tests: yarn-project