feat: merge-train/spartan

.github/workflows/nightly-bench-10tps.yml

@@ -13,6 +13,10 @@ on:
         description: "Nightly tag to use (e.g., 2.3.4-nightly.20251209). Ignored if docker_image is set. Leave empty to auto-detect."
         required: false
         type: string
+      source_ref:
+        description: "Git ref to checkout (e.g., v5.0.0-nightly.20260529). Required when docker_image is not a standard nightly tag."
+        required: false
+        type: string
 
 concurrency:
   group: nightly-bench-10tps-${{ github.ref }}
@@ -24,6 +28,7 @@ jobs:
     outputs:
       docker_image: ${{ steps.docker-image.outputs.docker_image }}
       image_label: ${{ steps.docker-image.outputs.image_label }}
+      source_ref: ${{ steps.docker-image.outputs.source_ref }}
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -36,19 +41,43 @@ jobs:
           if [[ -n "${{ inputs.docker_image }}" ]]; then
             docker_image="${{ inputs.docker_image }}"
             image_label="${{ inputs.docker_image }}"
+            image_tag="${docker_image##*:}"
           elif [[ -n "${{ inputs.nightly_tag }}" ]]; then
             nightly_tag="${{ inputs.nightly_tag }}"
             docker_image="aztecprotocol/aztec:${nightly_tag}"
             image_label="${nightly_tag}"
+            image_tag="${nightly_tag}"
           else
             current_version=$(jq -r '."."' .release-please-manifest.json)
             nightly_tag="${current_version}-nightly.$(date -u +%Y%m%d)"
             docker_image="aztecprotocol/aztec:${nightly_tag}"
             image_label="${nightly_tag}"
+            image_tag="${nightly_tag}"
           fi
+
+          if [[ -n "${{ inputs.source_ref }}" ]]; then
+            source_ref="${{ inputs.source_ref }}"
+          elif [[ "${image_tag:-}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-nightly\.[0-9]{8}$ ]]; then
+            source_ref="v${image_tag}"
+          else
+            echo "Could not infer git ref from docker image. Pass workflow input source_ref."
+            exit 1
+          fi
+
           echo "docker_image=$docker_image" >> "$GITHUB_OUTPUT"
           echo "image_label=$image_label" >> "$GITHUB_OUTPUT"
+          echo "source_ref=$source_ref" >> "$GITHUB_OUTPUT"
           echo "Using docker image: $docker_image"
+          echo "Using source ref: $source_ref"
+
+      - name: Verify source git ref
+        id: verify-source
+        run: |
+          set -euo pipefail
+          source_ref="${{ steps.docker-image.outputs.source_ref }}"
+          git fetch --depth 1 origin "refs/tags/${source_ref}:refs/tags/${source_ref}"
+          source_sha=$(git rev-parse "${source_ref}^{}")
+          echo "Nightly source commit: $source_sha"
 
       - name: Check if Docker image exists
         run: |
@@ -68,19 +97,21 @@ jobs:
       network: bench-10tps
       namespace: bench-10tps
       aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
-      ref: next
+      ref: ${{ needs.select-image.outputs.source_ref }}
       notify_on_failure: false
     secrets: inherit
 
   wait-for-first-l2-block:
-    needs: deploy-bench-10tps-network
+    needs:
+      - select-image
+      - deploy-bench-10tps-network
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: ${{ github.sha }}
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -108,7 +139,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: ${{ github.sha }}
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Run 10 TPS benchmark
         timeout-minutes: 240
@@ -139,7 +170,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Cleanup network resources
         env:
@@ -165,7 +196,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Notify Slack on failure
         env:

.github/workflows/nightly-spartan-bench.yml

@@ -20,6 +20,7 @@ jobs:
     outputs:
       nightly_tag: ${{ steps.nightly-tag.outputs.nightly_tag }}
       docker_image: ${{ steps.nightly-tag.outputs.docker_image }}
+      source_ref: ${{ steps.nightly-tag.outputs.source_ref }}
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -36,9 +37,20 @@ jobs:
             nightly_tag="${current_version}-nightly.$(date -u +%Y%m%d)"
           fi
           docker_image="aztecprotocol/aztec:${nightly_tag}"
+          source_ref="v${nightly_tag}"
           echo "nightly_tag=$nightly_tag" >> "$GITHUB_OUTPUT"
           echo "docker_image=$docker_image" >> "$GITHUB_OUTPUT"
+          echo "source_ref=$source_ref" >> "$GITHUB_OUTPUT"
           echo "Using nightly tag: $nightly_tag"
+          echo "Using source ref: $source_ref"
+
+      - name: Verify source git ref
+        run: |
+          set -euo pipefail
+          source_ref="${{ steps.nightly-tag.outputs.source_ref }}"
+          git fetch --depth 1 origin "refs/tags/${source_ref}:refs/tags/${source_ref}"
+          source_sha=$(git rev-parse "${source_ref}^{}")
+          echo "Nightly source commit: $source_sha"
 
       - name: Check if Docker image exists
         run: |
@@ -61,19 +73,21 @@ jobs:
       network: tps-scenario
       namespace: nightly-bench
       aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
-      ref: next
+      ref: ${{ needs.select-image.outputs.source_ref }}
       notify_on_failure: false
     secrets: inherit
 
   wait-bench-l2-block:
-    needs: deploy-bench-network
+    needs:
+      - select-image
+      - deploy-bench-network
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -102,7 +116,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Run benchmarks
         timeout-minutes: 240
@@ -152,6 +166,7 @@ jobs:
   cleanup-bench:
     if: always()
     needs:
+      - select-image
       - deploy-bench-network
       - wait-bench-l2-block
       - benchmark
@@ -160,7 +175,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Cleanup network resources
         env:
@@ -186,7 +201,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Notify Slack and dispatch ClaudeBox on failure
         env:
@@ -210,19 +225,21 @@ jobs:
       network: prove-n-tps-fake
       namespace: prove-n-tps-fake
       aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
-      ref: next
+      ref: ${{ needs.select-image.outputs.source_ref }}
       notify_on_failure: false
     secrets: inherit
 
   wait-proving-l2-block:
-    needs: deploy-proving-network
+    needs:
+      - select-image
+      - deploy-proving-network
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -251,7 +268,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Run proving benchmarks
         timeout-minutes: 180
@@ -299,6 +316,7 @@ jobs:
   cleanup-proving:
     if: always()
     needs:
+      - select-image
       - deploy-proving-network
       - wait-proving-l2-block
       - proving-benchmark
@@ -307,7 +325,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Cleanup network resources
         env:
@@ -333,7 +351,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Notify Slack and dispatch ClaudeBox on failure
         env:
@@ -357,19 +375,21 @@ jobs:
       network: block-capacity
       namespace: nightly-block-capacity
       aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
-      ref: next
+      ref: ${{ needs.select-image.outputs.source_ref }}
       notify_on_failure: false
     secrets: inherit
 
   wait-block-capacity-l2-block:
-    needs: deploy-block-capacity-network
+    needs:
+      - select-image
+      - deploy-block-capacity-network
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -398,7 +418,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Run block capacity benchmarks
         timeout-minutes: 240
@@ -447,6 +467,7 @@ jobs:
   cleanup-block-capacity:
     if: always()
     needs:
+      - select-image
       - deploy-block-capacity-network
       - wait-block-capacity-l2-block
       - block-capacity-benchmark
@@ -455,7 +476,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Cleanup network resources
         env:
@@ -481,7 +502,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: next
+          ref: ${{ needs.select-image.outputs.source_ref }}
 
       - name: Notify Slack and dispatch ClaudeBox on failure
         env: