feat: merge-train/spartan

.github/workflows/metrics-deploy.yml

@@ -37,6 +37,11 @@ on:
         required: true
         type: string
         default: "grafana-dashboard-password"
+      slack_alert_mention_user_ids:
+        description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
+        required: false
+        type: string
+        default: '["U0AHB6VR8N5"]'
     secrets:
       GCP_SA_KEY:
         required: true
@@ -70,6 +75,10 @@ on:
         description: The name of the secret which holds the Grafana dashboard password
         required: true
         default: "grafana-dashboard-password"
+      slack_alert_mention_user_ids:
+        description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
+        required: false
+        default: '["U0AHB6VR8N5"]'
 
 jobs:
   metrics_deployment:
@@ -96,6 +105,7 @@ jobs:
       SLACK_WEBHOOK_NEXT_NET_SECRET_NAME: slack-webhook-next-net-url
       SLACK_WEBHOOK_TESTNET_SECRET_NAME: slack-webhook-testnet-url
       SLACK_WEBHOOK_MAINNET_SECRET_NAME: slack-webhook-mainnet-url
+      TF_VAR_SLACK_ALERT_MENTION_USER_IDS: ${{ inputs.slack_alert_mention_user_ids }}
 
     steps:
       - name: Checkout code

spartan/metrics/grafana/alerts/contactpoints.yaml

@@ -7,6 +7,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
@@ -18,6 +19,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_NEXT_SCENARIO_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
@@ -29,6 +31,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_NEXT_NET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
@@ -40,6 +43,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_TESTNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
@@ -51,6 +55,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_MAINNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
@@ -62,6 +67,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_TESTNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_network" . }}
         disableResolveMessage: false
@@ -73,6 +79,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_MAINNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_network" . }}
         disableResolveMessage: false
@@ -84,6 +91,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_DEVNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
             {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false

spartan/terraform/deploy-metrics/main.tf

@@ -125,7 +125,8 @@ resource "helm_release" "aztec-gke-cluster" {
 
         env = {
           # we have to set an admin username through env vars otherwise the chart expects to find an 'admin-user' key in the admin secret
-          GF_SECURITY_ADMIN_USER = "admin"
+          GF_SECURITY_ADMIN_USER       = "admin"
+          SLACK_ALERT_MENTION_USER_IDS = join(",", var.SLACK_ALERT_MENTION_USER_IDS)
         }
 
         sidecar = {

spartan/terraform/deploy-metrics/variables.tf

@@ -70,6 +70,12 @@ variable "SLACK_WEBHOOK_MAINNET_SECRET_NAME" {
   default     = "slack-webhook-mainnet-url"
 }
 
+variable "SLACK_ALERT_MENTION_USER_IDS" {
+  description = "Optional Slack user IDs to mention on Grafana alert notifications."
+  type        = list(string)
+  default     = ["U0AHB6VR8N5"]
+}
+
 variable "project" {
   default = "testnet-440309"
   type    = string

yarn-project/archiver/src/archiver-misc.test.ts

@@ -10,6 +10,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { BlockHeader } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
@@ -57,7 +58,9 @@ describe('Archiver misc', () => {
     const instrumentation = mock<ArchiverInstrumentation>({ isEnabled: () => true, tracer });
     const archiverStore = createArchiverDataStores(await openTmpStore('archiver_misc_test'), { logsMaxPageSize: 1000 });
     const events = new EventEmitter() as ArchiverEmitter;
-    const l2TipsCache = new L2TipsCache(archiverStore.blocks);
+    const initialHeader = BlockHeader.empty();
+    const initialBlockHash = await initialHeader.hash();
+    const l2TipsCache = new L2TipsCache(archiverStore.blocks, initialBlockHash);
 
     archiver = new Archiver(
       publicClient,
@@ -77,6 +80,8 @@ describe('Archiver misc', () => {
       l1Constants,
       synchronizer,
       events,
+      initialHeader,
+      initialBlockHash,
       l2TipsCache,
     );
   });