feat: merge-train/spartan

.github/workflows/deploy-rpc.yml

@@ -13,7 +13,7 @@ on:
         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: false
+        required: true
         type: string
         default: ""
       ref:
@@ -69,7 +69,7 @@ on:
         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: false
+        required: true
         type: string
       ref:
         description: "Git ref to checkout. Leave empty to use the current ref."

.github/workflows/nightly-release-tag.yml

@@ -15,8 +15,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Public only tags v5-next here (v4-next is handled in its own job below);
-        # next is tagged on the private repo only.
         branch: ${{ github.repository == 'AztecProtocol/aztec-packages-private' && fromJSON('["next", "v5-next"]') || fromJSON('["v5-next"]') }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.repository }}-${{ matrix.branch }}
@@ -36,25 +34,3 @@ jobs:
           echo "${{ matrix.branch }} nightly tag: $nightly_tag"
           git tag -a "$nightly_tag" -m "$nightly_tag"
           git push origin "$nightly_tag"
-
-  nightly-release-tag-v4-next:
-    if: ${{ github.repository == 'AztecProtocol/aztec-packages' }}
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.repository }}-v4-next
-    steps:
-      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
-        with:
-          ref: v4-next
-          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
-
-      - name: Create v4-next Nightly Tag
-        run: |
-          git config --global user.email "tech@aztecprotocol.com"
-          git config --global user.name "AztecBot"
-          current_version=$(jq -r '."."' .release-please-manifest.json)
-          echo "Current version: $current_version"
-          nightly_tag="v${current_version}-nightly.$(date -u +%Y%m%d)"
-          echo "v4-next nightly tag: $nightly_tag"
-          git tag -a "$nightly_tag" -m "$nightly_tag"
-          git push origin "$nightly_tag"

spartan/.gitignore

@@ -36,3 +36,4 @@ environments/*
 !environments/bench-10tps.env
 *.tfvars
 !terraform/deploy-external-secrets/*.tfvars
+!terraform/deploy-rpc/modules/environment/alloy-*.tgz

spartan/metrics/grafana/alerts/contactpoints.yaml

@@ -36,6 +36,30 @@ contactPoints:
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
+  - orgId: 1
+    name: "Slack #alerts-staging-public by namespace"
+    receivers:
+      - uid: alertsstagingpublicbynamespace
+        type: slack
+        settings:
+          url: $SLACK_WEBHOOK_STAGING_PUBLIC_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
+          text: |-
+            {{ template "aztec.slack.by_namespace" . }}
+        disableResolveMessage: false
+
+  - orgId: 1
+    name: "Slack #alerts-staging-public by network"
+    receivers:
+      - uid: alertsstagingpublicbynetwork
+        type: slack
+        settings:
+          url: $SLACK_WEBHOOK_STAGING_PUBLIC_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
+          text: |-
+            {{ template "aztec.slack.by_network" . }}
+        disableResolveMessage: false
+
   - orgId: 1
     name: "Slack #alerts-testnet by namespace"
     receivers: