@aztec/aztec-node 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

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';
@@ -8,45 +9,45 @@ import type {
 } from '@aztec/stdlib/validators';
 
 export class SentinelStore {
-  public static readonly SCHEMA_VERSION = 2;
+  public static readonly SCHEMA_VERSION = 4;
 
   // a map from validator address to their ValidatorStatusHistory
   private readonly historyMap: AztecAsyncMap<`0x${string}`, Buffer>;
 
-  // a map from validator address to their historical proven epoch performance
+  // a map from validator address to their historical epoch performance, evaluated at end-of-epoch.
   // e.g. { validator: [{ epoch: 1, missed: 1, total: 10 }, { epoch: 2, missed: 3, total: 7 }, ...] }
-  private readonly provenMap: AztecAsyncMap<`0x${string}`, Buffer>;
+  private readonly epochMap: AztecAsyncMap<`0x${string}`, Buffer>;
 
   constructor(
     private store: AztecAsyncKVStore,
-    private config: { historyLength: number; historicProvenPerformanceLength: number },
+    private config: { historyLength: number; historicEpochPerformanceLength: number },
   ) {
     this.historyMap = store.openMap('sentinel-validator-status');
-    this.provenMap = store.openMap('sentinel-validator-proven');
+    this.epochMap = store.openMap('sentinel-validator-epoch');
   }
 
   public getHistoryLength() {
     return this.config.historyLength;
   }
 
-  public getHistoricProvenPerformanceLength() {
-    return this.config.historicProvenPerformanceLength;
+  public getHistoricEpochPerformanceLength() {
+    return this.config.historicEpochPerformanceLength;
   }
 
-  public async updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
+  public async updateEpochPerformance(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 });
+        await this.pushValidatorEpochPerformance({ who: EthAddress.fromString(who), missed, total, epoch });
       }
     });
   }
 
-  public async getProvenPerformance(who: EthAddress): Promise<{ missed: number; total: number; epoch: bigint }[]> {
-    const currentPerformanceBuffer = await this.provenMap.getAsync(who.toString());
+  public async getEpochPerformance(who: EthAddress): Promise<{ missed: number; total: number; epoch: EpochNumber }[]> {
+    const currentPerformanceBuffer = await this.epochMap.getAsync(who.toString());
     return currentPerformanceBuffer ? this.deserializePerformance(currentPerformanceBuffer) : [];
   }
 
-  private async pushValidatorProvenPerformanceForEpoch({
+  private async pushValidatorEpochPerformance({
     who,
     missed,
     total,
@@ -55,9 +56,9 @@ export class SentinelStore {
     who: EthAddress;
     missed: number;
     total: number;
-    epoch: bigint;
+    epoch: EpochNumber;
   }) {
-    const currentPerformance = await this.getProvenPerformance(who);
+    const currentPerformance = await this.getEpochPerformance(who);
     const existingIndex = currentPerformance.findIndex(p => p.epoch === epoch);
     if (existingIndex !== -1) {
       currentPerformance[existingIndex] = { missed, total, epoch };
@@ -69,13 +70,13 @@ export class SentinelStore {
     // Since we keep the size small, this is not a big deal.
     currentPerformance.sort((a, b) => Number(a.epoch - b.epoch));
 
-    // keep the most recent `historicProvenPerformanceLength` entries.
-    const performanceToKeep = currentPerformance.slice(-this.config.historicProvenPerformanceLength);
+    // keep the most recent `historicEpochPerformanceLength` entries.
+    const performanceToKeep = currentPerformance.slice(-this.config.historicEpochPerformanceLength);
 
-    await this.provenMap.set(who.toString(), this.serializePerformance(performanceToKeep));
+    await this.epochMap.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) {
@@ -85,11 +86,7 @@ export class SentinelStore {
     });
   }
 
-  private async pushValidatorStatusForSlot(
-    who: EthAddress,
-    slot: bigint,
-    status: 'block-mined' | 'block-proposed' | 'block-missed' | 'attestation-sent' | 'attestation-missed',
-  ) {
+  private async pushValidatorStatusForSlot(who: EthAddress, slot: SlotNumber, status: ValidatorStatusInSlot) {
     await this.store.transactionAsync(async () => {
       const currentHistory = (await this.getHistory(who)) ?? [];
       const newHistory = [...currentHistory, { slot, status }].slice(-this.config.historyLength);
@@ -110,18 +107,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 +136,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 });
     }
@@ -148,16 +145,22 @@ export class SentinelStore {
 
   private statusToNumber(status: ValidatorStatusInSlot): number {
     switch (status) {
-      case 'block-mined':
+      case 'checkpoint-mined':
         return 1;
-      case 'block-proposed':
+      case 'checkpoint-valid':
         return 2;
-      case 'block-missed':
+      case 'checkpoint-missed':
         return 3;
       case 'attestation-sent':
         return 4;
       case 'attestation-missed':
         return 5;
+      case 'blocks-missed':
+        return 6;
+      case 'checkpoint-invalid':
+        return 7;
+      case 'checkpoint-unvalidated':
+        return 8;
       default: {
         const _exhaustive: never = status;
         throw new Error(`Unknown status: ${status}`);
@@ -168,15 +171,21 @@ export class SentinelStore {
   private statusFromNumber(status: number): ValidatorStatusInSlot {
     switch (status) {
       case 1:
-        return 'block-mined';
+        return 'checkpoint-mined';
       case 2:
-        return 'block-proposed';
+        return 'checkpoint-valid';
       case 3:
-        return 'block-missed';
+        return 'checkpoint-missed';
       case 4:
         return 'attestation-sent';
       case 5:
         return 'attestation-missed';
+      case 6:
+        return 'blocks-missed';
+      case 7:
+        return 'checkpoint-invalid';
+      case 8:
+        return 'checkpoint-unvalidated';
       default:
         throw new Error(`Unknown status: ${status}`);
     }

package/src/test/index.ts

@@ -1,7 +1,7 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import type { P2P } from '@aztec/p2p';
 import { SequencerClient } from '@aztec/sequencer-client';
-import { EpochPruneWatcher, type SlasherClientInterface } from '@aztec/slasher';
+import { DataWithholdingWatcher, type SlasherClientInterface } from '@aztec/slasher';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { L2LogsSource, Service, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
@@ -23,7 +23,7 @@ export declare class TestAztecNodeService extends AztecNodeService {
   declare public sequencer: SequencerClient | undefined;
   declare public slasherClient: SlasherClientInterface | undefined;
   declare public validatorsSentinel: Sentinel | undefined;
-  declare public epochPruneWatcher: EpochPruneWatcher | undefined;
+  declare public dataWithholdingWatcher: DataWithholdingWatcher | undefined;
   declare public l1ChainId: number;
   declare public version: number;
   declare public globalVariableBuilder: GlobalVariableBuilderInterface;