@aztec/aztec-node 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/src/sentinel/sentinel.ts

@@ -1,4 +1,5 @@
 import type { EpochCache } from '@aztec/epoch-cache';
+import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
@@ -18,7 +19,7 @@ import {
   L2BlockStream,
   type L2BlockStreamEvent,
   type L2BlockStreamEventHandler,
-  getAttestationInfoFromPublishedL2Block,
+  getAttestationInfoFromPublishedCheckpoint,
 } from '@aztec/stdlib/block';
 import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import type {
@@ -40,10 +41,13 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   protected blockStream!: L2BlockStream;
   protected l2TipsStore: L2TipsStore;
 
-  protected initialSlot: bigint | undefined;
-  protected lastProcessedSlot: bigint | undefined;
-  protected slotNumberToBlock: Map<bigint, { blockNumber: number; archive: string; attestors: EthAddress[] }> =
-    new Map();
+  protected initialSlot: SlotNumber | undefined;
+  protected lastProcessedSlot: SlotNumber | undefined;
+  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+  protected slotNumberToCheckpoint: Map<
+    SlotNumber,
+    { checkpointNumber: CheckpointNumber; archive: string; attestors: EthAddress[] }
+  > = new Map();
 
   constructor(
     protected epochCache: EpochCache,
@@ -74,7 +78,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   /** Loads initial slot and initializes blockstream. We will not process anything at or before the initial slot. */
   protected async init() {
     this.initialSlot = this.epochCache.getEpochAndSlotNow().slot;
-    const startingBlock = await this.archiver.getBlockNumber();
+    const startingBlock = BlockNumber(await this.archiver.getBlockNumber());
     this.logger.info(`Starting validator sentinel with initial slot ${this.initialSlot} and block ${startingBlock}`);
     this.blockStream = new L2BlockStream(this.archiver, this.l2TipsStore, this, this.logger, { startingBlock });
   }
@@ -85,39 +89,46 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
 
   public async handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void> {
     await this.l2TipsStore.handleBlockStreamEvent(event);
-    if (event.type === 'blocks-added') {
-      // Store mapping from slot to archive, block number, and attestors
-      for (const block of event.blocks) {
-        this.slotNumberToBlock.set(block.block.header.getSlot(), {
-          blockNumber: block.block.number,
-          archive: block.block.archive.root.toString(),
-          attestors: getAttestationInfoFromPublishedL2Block(block)
-            .filter(a => a.status === 'recovered-from-signature')
-            .map(a => a.address!),
-        });
-      }
-
-      // Prune the archive map to only keep at most N entries
-      const historyLength = this.store.getHistoryLength();
-      if (this.slotNumberToBlock.size > historyLength) {
-        const toDelete = Array.from(this.slotNumberToBlock.keys())
-          .sort((a, b) => Number(a - b))
-          .slice(0, this.slotNumberToBlock.size - historyLength);
-        for (const key of toDelete) {
-          this.slotNumberToBlock.delete(key);
-        }
-      }
+    if (event.type === 'chain-checkpointed') {
+      this.handleCheckpoint(event);
     } else if (event.type === 'chain-proven') {
       await this.handleChainProven(event);
     }
   }
 
+  protected handleCheckpoint(event: L2BlockStreamEvent) {
+    if (event.type !== 'chain-checkpointed') {
+      return;
+    }
+    const checkpoint = event.checkpoint;
+
+    // Store mapping from slot to archive, checkpoint number, and attestors
+    this.slotNumberToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, {
+      checkpointNumber: checkpoint.checkpoint.number,
+      archive: checkpoint.checkpoint.archive.root.toString(),
+      attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint)
+        .filter(a => a.status === 'recovered-from-signature')
+        .map(a => a.address!),
+    });
+
+    // Prune the archive map to only keep at most N entries
+    const historyLength = this.store.getHistoryLength();
+    if (this.slotNumberToCheckpoint.size > historyLength) {
+      const toDelete = Array.from(this.slotNumberToCheckpoint.keys())
+        .sort((a, b) => Number(a - b))
+        .slice(0, this.slotNumberToCheckpoint.size - historyLength);
+      for (const key of toDelete) {
+        this.slotNumberToCheckpoint.delete(key);
+      }
+    }
+  }
+
   protected async handleChainProven(event: L2BlockStreamEvent) {
     if (event.type !== 'chain-proven') {
       return;
     }
     const blockNumber = event.block.number;
-    const block = await this.archiver.getBlock(blockNumber);
+    const block = await this.archiver.getL2Block(blockNumber);
     if (!block) {
       this.logger.error(`Failed to get block ${blockNumber}`, { block });
       return;
@@ -134,7 +145,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     await this.handleProvenPerformance(epoch, performance);
   }
 
-  protected async computeProvenPerformance(epoch: bigint): Promise<ValidatorsEpochPerformance> {
+  protected async computeProvenPerformance(epoch: EpochNumber): Promise<ValidatorsEpochPerformance> {
     const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, this.epochCache.getL1Constants());
     const { committee } = await this.epochCache.getCommittee(fromSlot);
     if (!committee) {
@@ -142,7 +153,11 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       return {};
     }
 
-    const stats = await this.computeStats({ fromSlot, toSlot, validators: committee });
+    const stats = await this.computeStats({
+      fromSlot,
+      toSlot,
+      validators: committee,
+    });
     this.logger.debug(`Stats for epoch ${epoch}`, { ...stats, fromSlot, toSlot, epoch });
 
     // Note that we are NOT using the total slots in the epoch as `total` here, since we only
@@ -165,7 +180,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
    */
   protected async checkPastInactivity(
     validator: EthAddress,
-    currentEpoch: bigint,
+    currentEpoch: EpochNumber,
     requiredConsecutiveEpochs: number,
   ): Promise<boolean> {
     if (requiredConsecutiveEpochs === 0) {
@@ -175,23 +190,24 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     // Get all historical performance for this validator
     const allPerformance = await this.store.getProvenPerformance(validator);
 
+    // Sort by epoch descending to get most recent first, keep only epochs strictly before the current one, and get the first N
+    const pastEpochs = allPerformance.sort((a, b) => Number(b.epoch - a.epoch)).filter(p => p.epoch < currentEpoch);
+
     // If we don't have enough historical data, don't slash
-    if (allPerformance.length < requiredConsecutiveEpochs) {
+    if (pastEpochs.length < requiredConsecutiveEpochs) {
       this.logger.debug(
         `Not enough historical data for slashing ${validator} for inactivity (${allPerformance.length} epochs < ${requiredConsecutiveEpochs} required)`,
       );
       return false;
     }
 
-    // Sort by epoch descending to get most recent first, keep only epochs strictly before the current one, and get the first N
-    return allPerformance
-      .sort((a, b) => Number(b.epoch - a.epoch))
-      .filter(p => p.epoch < currentEpoch)
+    // Check that we have at least requiredConsecutiveEpochs and that all of them are above the inactivity threshold
+    return pastEpochs
       .slice(0, requiredConsecutiveEpochs)
       .every(p => p.missed / p.total >= this.config.slashInactivityTargetPercentage);
   }
 
-  protected async handleProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
+  protected async handleProvenPerformance(epoch: EpochNumber, performance: ValidatorsEpochPerformance) {
     if (this.config.slashInactivityPenalty === 0n) {
       return;
     }
@@ -215,7 +231,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       validator: EthAddress.fromString(address),
       amount: this.config.slashInactivityPenalty,
       offenseType: OffenseType.INACTIVITY,
-      epochOrSlot: epoch,
+      epochOrSlot: BigInt(epoch),
     }));
 
     if (criminals.length > 0) {
@@ -256,8 +272,13 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
    * We also don't move past the archiver last synced L2 slot, as we don't want to process data that is not yet available.
    * Last, we check the p2p is synced with the archiver, so it has pulled all attestations from it.
    */
-  protected async isReadyToProcess(currentSlot: bigint) {
-    const targetSlot = currentSlot - 2n;
+  protected async isReadyToProcess(currentSlot: SlotNumber): Promise<SlotNumber | false> {
+    if (currentSlot < 2) {
+      this.logger.trace(`Current slot ${currentSlot} too early.`);
+      return false;
+    }
+
+    const targetSlot = SlotNumber(currentSlot - 2);
     if (this.lastProcessedSlot && this.lastProcessedSlot >= targetSlot) {
       this.logger.trace(`Already processed slot ${targetSlot}`, { lastProcessedSlot: this.lastProcessedSlot });
       return false;
@@ -279,8 +300,8 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       return false;
     }
 
-    const archiverLastBlockHash = await this.l2TipsStore.getL2Tips().then(tip => tip.latest.hash);
-    const p2pLastBlockHash = await this.p2p.getL2Tips().then(tips => tips.latest.hash);
+    const archiverLastBlockHash = await this.l2TipsStore.getL2Tips().then(tip => tip.proposed.hash);
+    const p2pLastBlockHash = await this.p2p.getL2Tips().then(tips => tips.proposed.hash);
     const isP2pSynced = archiverLastBlockHash === p2pLastBlockHash;
     if (!isP2pSynced) {
       this.logger.debug(`Waiting for P2P client to sync with archiver`, { archiverLastBlockHash, p2pLastBlockHash });
@@ -294,7 +315,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
    * Gathers committee and proposer data for a given slot, computes slot stats,
    * and updates overall stats.
    */
-  protected async processSlot(slot: bigint) {
+  protected async processSlot(slot: SlotNumber) {
     const { epoch, seed, committee } = await this.epochCache.getCommittee(slot);
     if (!committee || committee.length === 0) {
       this.logger.trace(`No committee found for slot ${slot} at epoch ${epoch}`);
@@ -310,7 +331,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   }
 
   /** Computes activity for a given slot. */
-  protected async getSlotActivity(slot: bigint, epoch: bigint, proposer: EthAddress, committee: EthAddress[]) {
+  protected async getSlotActivity(slot: SlotNumber, epoch: EpochNumber, proposer: EthAddress, committee: EthAddress[]) {
     this.logger.debug(`Computing stats for slot ${slot} at epoch ${epoch}`, { slot, epoch, proposer, committee });
 
     // Check if there is an L2 block in L1 for this L2 slot
@@ -319,8 +340,8 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     // or all attestations for all proposals in the slot if no block was mined.
     // We gather from both p2p (contains the ones seen on the p2p layer) and archiver
     // (contains the ones synced from mined blocks, which we may have missed from p2p).
-    const block = this.slotNumberToBlock.get(slot);
-    const p2pAttested = await this.p2p.getAttestationsForSlot(slot, block?.archive);
+    const block = this.slotNumberToCheckpoint.get(slot);
+    const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, block?.archive);
     // Filter out attestations with invalid signatures
     const p2pAttestors = p2pAttested.map(a => a.getSender()).filter((s): s is EthAddress => s !== undefined);
     const attestors = new Set(
@@ -372,7 +393,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   }
 
   /** Push the status for each slot for each validator. */
-  protected updateValidators(slot: bigint, stats: Record<`0x${string}`, ValidatorStatusInSlot | undefined>) {
+  protected updateValidators(slot: SlotNumber, stats: Record<`0x${string}`, ValidatorStatusInSlot | undefined>) {
     return this.store.updateValidators(slot, stats);
   }
 
@@ -381,13 +402,13 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     fromSlot,
     toSlot,
     validators,
-  }: { fromSlot?: bigint; toSlot?: bigint; validators?: EthAddress[] } = {}): Promise<ValidatorsStats> {
+  }: { fromSlot?: SlotNumber; toSlot?: SlotNumber; validators?: EthAddress[] } = {}): Promise<ValidatorsStats> {
     const histories = validators
       ? fromEntries(await Promise.all(validators.map(async v => [v.toString(), await this.store.getHistory(v)])))
       : await this.store.getHistories();
 
     const slotNow = this.epochCache.getEpochAndSlotNow().slot;
-    fromSlot ??= (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
+    fromSlot ??= SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
     toSlot ??= this.lastProcessedSlot ?? slotNow;
 
     const stats = mapValues(histories, (history, address) =>
@@ -405,8 +426,8 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   /** Computes stats for a single validator. */
   public async getValidatorStats(
     validatorAddress: EthAddress,
-    fromSlot?: bigint,
-    toSlot?: bigint,
+    fromSlot?: SlotNumber,
+    toSlot?: SlotNumber,
   ): Promise<SingleValidatorStats | undefined> {
     const history = await this.store.getHistory(validatorAddress);
 
@@ -415,13 +436,14 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     }
 
     const slotNow = this.epochCache.getEpochAndSlotNow().slot;
-    const effectiveFromSlot = fromSlot ?? (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
+    const effectiveFromSlot =
+      fromSlot ?? SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
     const effectiveToSlot = toSlot ?? this.lastProcessedSlot ?? slotNow;
 
     const historyLength = BigInt(this.store.getHistoryLength());
-    if (effectiveToSlot - effectiveFromSlot > historyLength) {
+    if (BigInt(effectiveToSlot) - BigInt(effectiveFromSlot) > historyLength) {
       throw new Error(
-        `Slot range (${effectiveToSlot - effectiveFromSlot}) exceeds history length (${historyLength}). ` +
+        `Slot range (${BigInt(effectiveToSlot) - BigInt(effectiveFromSlot)}) exceeds history length (${historyLength}). ` +
           `Requested range: ${effectiveFromSlot} to ${effectiveToSlot}.`,
       );
     }
@@ -432,11 +454,10 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       effectiveFromSlot,
       effectiveToSlot,
     );
-    const allTimeProvenPerformance = await this.store.getProvenPerformance(validatorAddress);
 
     return {
       validator,
-      allTimeProvenPerformance,
+      allTimeProvenPerformance: await this.store.getProvenPerformance(validatorAddress),
       lastProcessedSlot: this.lastProcessedSlot,
       initialSlot: this.initialSlot,
       slotWindow: this.store.getHistoryLength(),
@@ -446,11 +467,11 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
   protected computeStatsForValidator(
     address: `0x${string}`,
     allHistory: ValidatorStatusHistory,
-    fromSlot?: bigint,
-    toSlot?: bigint,
+    fromSlot?: SlotNumber,
+    toSlot?: SlotNumber,
   ): ValidatorStats {
-    let history = fromSlot ? allHistory.filter(h => h.slot >= fromSlot) : allHistory;
-    history = toSlot ? history.filter(h => h.slot <= toSlot) : history;
+    let history = fromSlot ? allHistory.filter(h => BigInt(h.slot) >= fromSlot) : allHistory;
+    history = toSlot ? history.filter(h => BigInt(h.slot) <= toSlot) : history;
     const lastProposal = history.filter(h => h.status === 'block-proposed' || h.status === 'block-mined').at(-1);
     const lastAttestation = history.filter(h => h.status === 'attestation-sent').at(-1);
     return {
@@ -479,7 +500,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     };
   }
 
-  protected computeFromSlot(slot: bigint | undefined) {
+  protected computeFromSlot(slot: SlotNumber | undefined) {
     if (slot === undefined) {
       return undefined;
     }

package/src/sentinel/store.ts

@@ -1,3 +1,4 @@
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BufferReader, numToUInt8, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
@@ -33,7 +34,7 @@ export class SentinelStore {
     return this.config.historicProvenPerformanceLength;
   }
 
-  public async updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
+  public async updateProvenPerformance(epoch: EpochNumber, performance: ValidatorsEpochPerformance) {
     await this.store.transactionAsync(async () => {
       for (const [who, { missed, total }] of Object.entries(performance)) {
         await this.pushValidatorProvenPerformanceForEpoch({ who: EthAddress.fromString(who), missed, total, epoch });
@@ -41,7 +42,7 @@ export class SentinelStore {
     });
   }
 
-  public async getProvenPerformance(who: EthAddress): Promise<{ missed: number; total: number; epoch: bigint }[]> {
+  public async getProvenPerformance(who: EthAddress): Promise<{ missed: number; total: number; epoch: EpochNumber }[]> {
     const currentPerformanceBuffer = await this.provenMap.getAsync(who.toString());
     return currentPerformanceBuffer ? this.deserializePerformance(currentPerformanceBuffer) : [];
   }
@@ -55,7 +56,7 @@ export class SentinelStore {
     who: EthAddress;
     missed: number;
     total: number;
-    epoch: bigint;
+    epoch: EpochNumber;
   }) {
     const currentPerformance = await this.getProvenPerformance(who);
     const existingIndex = currentPerformance.findIndex(p => p.epoch === epoch);
@@ -75,7 +76,7 @@ export class SentinelStore {
     await this.provenMap.set(who.toString(), this.serializePerformance(performanceToKeep));
   }
 
-  public async updateValidators(slot: bigint, statuses: Record<`0x${string}`, ValidatorStatusInSlot | undefined>) {
+  public async updateValidators(slot: SlotNumber, statuses: Record<`0x${string}`, ValidatorStatusInSlot | undefined>) {
     await this.store.transactionAsync(async () => {
       for (const [who, status] of Object.entries(statuses)) {
         if (status) {
@@ -87,7 +88,7 @@ export class SentinelStore {
 
   private async pushValidatorStatusForSlot(
     who: EthAddress,
-    slot: bigint,
+    slot: SlotNumber,
     status: 'block-mined' | 'block-proposed' | 'block-missed' | 'attestation-sent' | 'attestation-missed',
   ) {
     await this.store.transactionAsync(async () => {
@@ -110,18 +111,18 @@ export class SentinelStore {
     return data && this.deserializeHistory(data);
   }
 
-  private serializePerformance(performance: { missed: number; total: number; epoch: bigint }[]): Buffer {
+  private serializePerformance(performance: { missed: number; total: number; epoch: EpochNumber }[]): Buffer {
     return serializeToBuffer(
       performance.map(p => [numToUInt32BE(Number(p.epoch)), numToUInt32BE(p.missed), numToUInt32BE(p.total)]),
     );
   }
 
-  private deserializePerformance(buffer: Buffer): { missed: number; total: number; epoch: bigint }[] {
+  private deserializePerformance(buffer: Buffer): { missed: number; total: number; epoch: EpochNumber }[] {
     const reader = new BufferReader(buffer);
-    const performance: { missed: number; total: number; epoch: bigint }[] = [];
+    const performance: { missed: number; total: number; epoch: EpochNumber }[] = [];
     while (!reader.isEmpty()) {
       performance.push({
-        epoch: BigInt(reader.readNumber()),
+        epoch: EpochNumber(reader.readNumber()),
         missed: reader.readNumber(),
         total: reader.readNumber(),
       });
@@ -139,7 +140,7 @@ export class SentinelStore {
     const reader = new BufferReader(buffer);
     const history: ValidatorStatusHistory = [];
     while (!reader.isEmpty()) {
-      const slot = BigInt(reader.readNumber());
+      const slot = SlotNumber(reader.readNumber());
       const status = this.statusFromNumber(reader.readUInt8());
       history.push({ slot, status });
     }