Merge branch 'next' into jc/docs/how-to-update

Author: critesjosh

.github/workflows/deploy-aztec-infra.yml

@@ -100,6 +100,10 @@ on:
         description: Whether to use an external ingress for the rpc
         required: true
         type: boolean
+      otel_collector_url:
+        description: The OpenTelemetry collector that will receive metrics from this deployment. Optional
+        required: false
+        type: string
     secrets:
       GCP_SA_KEY:
         description: The GCP service account key
@@ -207,6 +211,10 @@ on:
         description: Whether to use an external ingress for the rpc
         required: true
         type: boolean
+      otel_collector_url:
+        description: The OpenTelemetry collector that will receive metrics from this deployment. Optional
+        required: false
+        type: string
 
 jobs:
   deploy_aztec_infra:
@@ -237,6 +245,7 @@ jobs:
       TF_VAR_PROVER_RESOURCE_PROFILE: ${{ inputs.prover_resource_profile }}
       TF_VAR_RPC_RESOURCE_PROFILE: ${{ inputs.rpc_resource_profile }}
       TF_VAR_RPC_EXTERNAL_INGRESS: ${{ inputs.rpc_external_ingress }}
+      TF_VAR_OTEL_COLLECTOR_URL: ${{ inputs.otel_collector_url }}
 
     steps:
       - name: Debug inputs

spartan/terraform/deploy-aztec-infra/main.tf

@@ -58,6 +58,7 @@ locals {
     "global.customAztecNetwork.slashFactoryContractAddress"    = var.SLASH_FACTORY_CONTRACT_ADDRESS
     "global.customAztecNetwork.feeAssetHandlerContractAddress" = var.FEE_ASSET_HANDLER_CONTRACT_ADDRESS
     "global.customAztecNetwork.l1ChainId"                      = var.L1_CHAIN_ID
+    "global.otelCollectorEndpoint"                             = var.OTEL_COLLECTOR_URL
   }
 
   common_list_settings = {

spartan/terraform/deploy-aztec-infra/variables.tf

@@ -79,10 +79,10 @@ variable "AZTEC_DOCKER_IMAGE" {
   default     = "aztecprotocol/aztec:staging"
 }
 
-variable "METRICS_NAMESPACE" {
-  description = "Namespace to deploy the metrics to"
+variable "OTEL_COLLECTOR_URL" {
+  description = "The URL of an OpenTelemtry collector to send metrics to"
   type        = string
-  default     = "metrics"
+  nullable    = true
 }
 
 variable "VALIDATOR_VALUES" {

spartan/terraform/deploy-metrics/outputs.tf

@@ -9,3 +9,8 @@ output "otel_collector_ip" {
   value       = google_compute_address.otel_collector_ip.address
 }
 
+output "otel_collector_base_url" {
+  description = "OTEL Collector IP"
+  value       = "http://${google_compute_address.otel_collector_ip.address}:4318"
+}
+

yarn-project/sequencer-client/src/sequencer/sequencer.test.ts

@@ -322,6 +322,7 @@ describe('sequencer', () => {
 
       expect(blockBuilder.buildBlock).not.toHaveBeenCalled();
       expect(publisher.enqueueProposeL2Block).not.toHaveBeenCalled();
+      expect(publisher.canProposeAtNextEthBlock).not.toHaveBeenCalled();
     });
 
     it('does not publish a block if it does not have enough time left in the slot after collecting attestations', async () => {

yarn-project/sequencer-client/src/sequencer/sequencer.ts

@@ -267,13 +267,13 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       return;
     }
 
-    this.setState(SequencerState.PROPOSER_CHECK, undefined);
-
     const chainTipArchive = syncedTo.archive;
     const newBlockNumber = syncedTo.blockNumber + 1;
 
     const { slot, ts, now } = this.epochCache.getEpochAndSlotInNextL1Slot();
 
+    this.setState(SequencerState.PROPOSER_CHECK, slot);
+
     // Check that the archiver and dependencies have synced to the previous L1 slot at least
     // TODO(#14766): Archiver reports L1 timestamp based on L1 blocks seen, which means that a missed L1 block will
     // cause the archiver L1 timestamp to fall behind, and cause this sequencer to start processing one L1 slot later.

yarn-project/sequencer-client/src/sequencer/utils.ts

@@ -37,7 +37,8 @@ export type SequencerStateWithSlot =
   | SequencerState.INITIALIZING_PROPOSAL
   | SequencerState.CREATING_BLOCK
   | SequencerState.COLLECTING_ATTESTATIONS
-  | SequencerState.PUBLISHING_BLOCK;
+  | SequencerState.PUBLISHING_BLOCK
+  | SequencerState.PROPOSER_CHECK;
 
 export type SequencerStateCallback = () => SequencerState;
 

yarn-project/slasher/src/tally_slasher_client.test.ts

@@ -245,7 +245,7 @@ describe('TallySlasherClient', () => {
         const targetRound = 3n;
 
         await addPendingOffense({
-          epochOrSlot: targetRound * BigInt(roundSize),
+          epochOrSlot: targetRound * BigInt(roundSize) + BigInt(epochDuration),
           offenseType: OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS, // slot-based
         });
 

yarn-project/slasher/src/tally_slasher_client.ts

@@ -9,6 +9,7 @@ import type { Prettify } from '@aztec/foundation/types';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import {
   type Offense,
+  OffenseType,
   type ProposerSlashAction,
   type ProposerSlashActionProvider,
   type SlashPayloadRound,
@@ -253,6 +254,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     const offensesFromAlwaysSlash = (this.config.slashValidatorsAlways ?? []).map(validator => ({
       validator,
       amount: this.settings.slashingAmounts[2],
+      offenseType: OffenseType.UNKNOWN,
     }));
     const [offensesToForgive, offensesToSlash] = partition([...offensesForRound, ...offensesFromAlwaysSlash], offense =>
       this.config.slashValidatorsNever?.some(v => v.equals(offense.validator)),
@@ -291,7 +293,8 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
     });
 
     const committees = await this.collectCommitteesActiveDuringRound(slashedRound);
-    const votes = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, this.settings);
+    const epochsForCommittees = getEpochsForRound(slashedRound, this.settings);
+    const votes = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, epochsForCommittees, this.settings);
     if (votes.every(v => v === 0)) {
       this.log.warn(`Computed votes for offenses are all zero. Skipping vote.`, {
         slotNumber,

yarn-project/stdlib/src/slashing/helpers.ts

@@ -106,12 +106,23 @@ export function getSlotForOffense(
   return getTimeUnitForOffense(offenseType) === 'epoch' ? epochOrSlot * BigInt(constants.epochDuration) : epochOrSlot;
 }
 
-/** Returns the epoch for a given offense. */
+/** Returns the epoch for a given offense. If the offense type or epoch is not defined, returns undefined. */
 export function getEpochForOffense(
   offense: Pick<Offense, 'epochOrSlot' | 'offenseType'>,
   constants: Pick<L1RollupConstants, 'epochDuration'>,
-): bigint {
+): bigint;
+export function getEpochForOffense(
+  offense: Partial<Pick<Offense, 'epochOrSlot' | 'offenseType'>>,
+  constants: Pick<L1RollupConstants, 'epochDuration'>,
+): bigint | undefined;
+export function getEpochForOffense(
+  offense: Partial<Pick<Offense, 'epochOrSlot' | 'offenseType'>>,
+  constants: Pick<L1RollupConstants, 'epochDuration'>,
+): bigint | undefined {
   const { epochOrSlot, offenseType } = offense;
+  if (epochOrSlot === undefined || offenseType === undefined) {
+    return undefined;
+  }
   return getTimeUnitForOffense(offenseType) === 'epoch' ? epochOrSlot : epochOrSlot / BigInt(constants.epochDuration);
 }