@aztec/aztec-node 0.0.1-commit.f2ce05ee → 0.0.1-commit.f504929

package/dest/sentinel/sentinel.js

@@ -8,6 +8,15 @@ import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
 import { L2BlockStream, getAttestationInfoFromPublishedCheckpoint } from '@aztec/stdlib/block';
 import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import EventEmitter from 'node:events';
+/** Maps a validator status to its category: proposer or attestation. */ function statusToCategory(status) {
+    switch(status){
+        case 'attestation-sent':
+        case 'attestation-missed':
+            return 'attestation';
+        default:
+            return 'proposer';
+    }
+}
 export class Sentinel extends EventEmitter {
     epochCache;
     archiver;
@@ -82,16 +91,14 @@ export class Sentinel extends EventEmitter {
             return;
         }
         const blockNumber = event.block.number;
-        const block = await this.archiver.getL2Block(blockNumber);
-        if (!block) {
-            this.logger.error(`Failed to get block ${blockNumber}`, {
-                block
-            });
+        const header = await this.archiver.getBlockHeader(blockNumber);
+        if (!header) {
+            this.logger.error(`Failed to get block header ${blockNumber}`);
             return;
         }
         // TODO(palla/slash): We should only be computing proven performance if this is
         // a full proof epoch and not a partial one, otherwise we'll end up with skewed stats.
-        const epoch = getEpochAtSlot(block.header.getSlot(), this.epochCache.getL1Constants());
+        const epoch = getEpochAtSlot(header.getSlot(), this.epochCache.getL1Constants());
         this.logger.debug(`Computing proven performance for epoch ${epoch}`);
         const performance = await this.computeProvenPerformance(epoch);
         this.logger.info(`Computed proven performance for epoch ${epoch}`, performance);
@@ -100,7 +107,11 @@ export class Sentinel extends EventEmitter {
     }
     async computeProvenPerformance(epoch) {
         const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, this.epochCache.getL1Constants());
-        const { committee } = await this.epochCache.getCommittee(fromSlot);
+        const { committee, isEscapeHatchOpen } = await this.epochCache.getCommittee(fromSlot);
+        if (isEscapeHatchOpen) {
+            this.logger.info(`Skipping proven performance for epoch ${epoch} - escape hatch is open`);
+            return {};
+        }
         if (!committee) {
             this.logger.trace(`No committee found for slot ${fromSlot}`);
             return {};
@@ -242,7 +253,12 @@ export class Sentinel extends EventEmitter {
    * Gathers committee and proposer data for a given slot, computes slot stats,
    * and updates overall stats.
    */ async processSlot(slot) {
-        const { epoch, seed, committee } = await this.epochCache.getCommittee(slot);
+        const { epoch, seed, committee, isEscapeHatchOpen } = await this.epochCache.getCommittee(slot);
+        if (isEscapeHatchOpen) {
+            this.logger.info(`Skipping slot ${slot} at epoch ${epoch} - escape hatch is open`);
+            this.lastProcessedSlot = slot;
+            return;
+        }
         if (!committee || committee.length === 0) {
             this.logger.trace(`No committee found for slot ${slot} at epoch ${epoch}`);
             this.lastProcessedSlot = slot;
@@ -263,17 +279,17 @@ export class Sentinel extends EventEmitter {
             committee
         });
         // Check if there is an L2 block in L1 for this L2 slot
-        // Here we get all attestations for the block mined at the given slot,
-        // or all attestations for all proposals in the slot if no block was mined.
+        // Here we get all checkpoint attestations for the checkpoint at the given slot,
+        // or all checkpoint attestations for all proposals in the slot if no checkpoint 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.slotNumberToCheckpoint.get(slot);
-        const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, block?.archive);
+        // (contains the ones synced from mined checkpoints, which we may have missed from p2p).
+        const checkpoint = this.slotNumberToCheckpoint.get(slot);
+        const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, checkpoint?.archive);
         // Filter out attestations with invalid signatures
         const p2pAttestors = p2pAttested.map((a)=>a.getSender()).filter((s)=>s !== undefined);
         const attestors = new Set([
             ...p2pAttestors.map((a)=>a.toString()),
-            ...block?.attestors.map((a)=>a.toString()) ?? []
+            ...checkpoint?.attestors.map((a)=>a.toString()) ?? []
         ].filter((addr)=>proposer.toString() !== addr));
         // We assume that there was a block proposal if at least one of the validators (other than the proposer) attested to it.
         // It could be the case that every single validator failed, and we could differentiate it by having
@@ -281,17 +297,26 @@ export class Sentinel extends EventEmitter {
         // But we'll leave that corner case out to reduce pressure on the node.
         // TODO(palla/slash): This breaks if a given node has more than one validator in the current committee,
         // since they will attest to their own proposal it even if it's not re-executable.
-        const blockStatus = block ? 'mined' : attestors.size > 0 ? 'proposed' : 'missed';
-        this.logger.debug(`Block for slot ${slot} was ${blockStatus}`, {
-            ...block,
+        let status;
+        if (checkpoint) {
+            status = 'checkpoint-mined';
+        } else if (attestors.size > 0) {
+            status = 'checkpoint-proposed';
+        } else {
+            // No checkpoint on L1 and no checkpoint attestations seen. Check if block proposals were sent for this slot.
+            const hasBlockProposals = await this.p2p.hasBlockProposalsForSlot(slot);
+            status = hasBlockProposals ? 'checkpoint-missed' : 'blocks-missed';
+        }
+        this.logger.debug(`Checkpoint status for slot ${slot}: ${status}`, {
+            ...checkpoint,
             slot
         });
-        // Get attestors that failed their duties for this block, but only if there was a block proposed
-        const missedAttestors = new Set(blockStatus === 'missed' ? [] : committee.filter((v)=>!attestors.has(v.toString()) && !proposer.equals(v)).map((v)=>v.toString()));
+        // Get attestors that failed their checkpoint attestation duties, but only if there was a checkpoint proposed or mined
+        const missedAttestors = new Set(status === 'blocks-missed' || status === 'checkpoint-missed' ? [] : committee.filter((v)=>!attestors.has(v.toString()) && !proposer.equals(v)).map((v)=>v.toString()));
         this.logger.debug(`Retrieved ${attestors.size} attestors out of ${committee.length} for slot ${slot}`, {
-            blockStatus,
+            status,
             proposer: proposer.toString(),
-            ...block,
+            ...checkpoint,
             slot,
             attestors: [
                 ...attestors
@@ -304,7 +329,7 @@ export class Sentinel extends EventEmitter {
         // Compute the status for each validator in the committee
         const statusFor = (who)=>{
             if (who === proposer.toString()) {
-                return `block-${blockStatus}`;
+                return status;
             } else if (attestors.has(who)) {
                 return 'attestation-sent';
             } else if (missedAttestors.has(who)) {
@@ -361,15 +386,16 @@ export class Sentinel extends EventEmitter {
     computeStatsForValidator(address, allHistory, fromSlot, toSlot) {
         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 lastProposal = history.filter((h)=>h.status === 'checkpoint-proposed' || h.status === 'checkpoint-mined').at(-1);
         const lastAttestation = history.filter((h)=>h.status === 'attestation-sent').at(-1);
         return {
             address: EthAddress.fromString(address),
             lastProposal: this.computeFromSlot(lastProposal?.slot),
             lastAttestation: this.computeFromSlot(lastAttestation?.slot),
             totalSlots: history.length,
-            missedProposals: this.computeMissed(history, 'block', [
-                'block-missed'
+            missedProposals: this.computeMissed(history, 'proposer', [
+                'checkpoint-missed',
+                'blocks-missed'
             ]),
             missedAttestations: this.computeMissed(history, 'attestation', [
                 'attestation-missed'
@@ -377,8 +403,8 @@ export class Sentinel extends EventEmitter {
             history
         };
     }
-    computeMissed(history, computeOverPrefix, filter) {
-        const relevantHistory = history.filter((h)=>!computeOverPrefix || h.status.startsWith(computeOverPrefix));
+    computeMissed(history, computeOverCategory, filter) {
+        const relevantHistory = history.filter((h)=>!computeOverCategory || statusToCategory(h.status) === computeOverCategory);
         const filteredHistory = relevantHistory.filter((h)=>filter.includes(h.status));
         return {
             currentStreak: countWhile([

package/dest/sentinel/store.d.ts

@@ -5,7 +5,7 @@ import type { ValidatorStatusHistory, ValidatorStatusInSlot, ValidatorsEpochPerf
 export declare class SentinelStore {
     private store;
     private config;
-    static readonly SCHEMA_VERSION = 2;
+    static readonly SCHEMA_VERSION = 3;
     private readonly historyMap;
     private readonly provenMap;
     constructor(store: AztecAsyncKVStore, config: {
@@ -32,4 +32,4 @@ export declare class SentinelStore {
     private statusToNumber;
     private statusFromNumber;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFDVixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLDBCQUEwQixFQUMzQixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLHFCQUFhLGFBQWE7SUFXdEIsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQVhoQixnQkFBdUIsY0FBYyxLQUFLO0lBRzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUF1QztJQUlsRSxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBdUM7SUFFakUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE1BQU0sRUFBRTtRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQywrQkFBK0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUluRjtJQUVNLGdCQUFnQixXQUV0QjtJQUVNLGtDQUFrQyxXQUV4QztJQUVZLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLDBCQUEwQixpQkFNL0Y7SUFFWSxvQkFBb0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQztRQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLFdBQVcsQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUduSDtZQUVhLHNDQUFzQztJQTZCdkMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLEtBQUssTUFBTSxFQUFFLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFDLGlCQVFqSDtZQUVhLDBCQUEwQjtJQVkzQixZQUFZLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLE1BQU0sRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUMsQ0FNbEY7SUFFWSxVQUFVLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBR3hGO0lBRUQsT0FBTyxDQUFDLG9CQUFvQjtJQU01QixPQUFPLENBQUMsc0JBQXNCO0lBYTlCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFNeEIsT0FBTyxDQUFDLGtCQUFrQjtJQVcxQixPQUFPLENBQUMsY0FBYztJQW1CdEIsT0FBTyxDQUFDLGdCQUFnQjtDQWdCekIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFDVixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLDBCQUEwQixFQUMzQixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLHFCQUFhLGFBQWE7SUFXdEIsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQVhoQixnQkFBdUIsY0FBYyxLQUFLO0lBRzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUF1QztJQUlsRSxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBdUM7SUFFakUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE1BQU0sRUFBRTtRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQywrQkFBK0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUluRjtJQUVNLGdCQUFnQixXQUV0QjtJQUVNLGtDQUFrQyxXQUV4QztJQUVZLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLDBCQUEwQixpQkFNL0Y7SUFFWSxvQkFBb0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQztRQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLFdBQVcsQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUduSDtZQUVhLHNDQUFzQztJQTZCdkMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLEtBQUssTUFBTSxFQUFFLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFDLGlCQVFqSDtZQUVhLDBCQUEwQjtJQVEzQixZQUFZLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLE1BQU0sRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUMsQ0FNbEY7SUFFWSxVQUFVLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBR3hGO0lBRUQsT0FBTyxDQUFDLG9CQUFvQjtJQU01QixPQUFPLENBQUMsc0JBQXNCO0lBYTlCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFNeEIsT0FBTyxDQUFDLGtCQUFrQjtJQVcxQixPQUFPLENBQUMsY0FBYztJQXFCdEIsT0FBTyxDQUFDLGdCQUFnQjtDQWtCekIifQ==

package/dest/sentinel/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAElC,qBAAa,aAAa;IAWtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAXhB,gBAAuB,cAAc,KAAK;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAIlE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IAEjE,YACU,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,+BAA+B,EAAE,MAAM,CAAA;KAAE,EAInF;IAEM,gBAAgB,WAEtB;IAEM,kCAAkC,WAExC;IAEY,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,iBAM/F;IAEY,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC,CAGnH;YAEa,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC,iBAQjH;YAEa,0BAA0B;IAY3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAMlF;IAEY,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAGxF;IAED,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,gBAAgB;CAgBzB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAElC,qBAAa,aAAa;IAWtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAXhB,gBAAuB,cAAc,KAAK;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAIlE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IAEjE,YACU,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,+BAA+B,EAAE,MAAM,CAAA;KAAE,EAInF;IAEM,gBAAgB,WAEtB;IAEM,kCAAkC,WAExC;IAEY,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,iBAM/F;IAEY,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC,CAGnH;YAEa,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC,iBAQjH;YAEa,0BAA0B;IAQ3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAMlF;IAEY,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAGxF;IAED,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,gBAAgB;CAkBzB"}

package/dest/sentinel/store.js

@@ -4,7 +4,7 @@ import { BufferReader, numToUInt8, numToUInt32BE, serializeToBuffer } from '@azt
 export class SentinelStore {
     store;
     config;
-    static SCHEMA_VERSION = 2;
+    static SCHEMA_VERSION = 3;
     // a map from validator address to their ValidatorStatusHistory
     historyMap;
     // a map from validator address to their historical proven epoch performance
@@ -134,16 +134,18 @@ export class SentinelStore {
     }
     statusToNumber(status) {
         switch(status){
-            case 'block-mined':
+            case 'checkpoint-mined':
                 return 1;
-            case 'block-proposed':
+            case 'checkpoint-proposed':
                 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;
             default:
                 {
                     const _exhaustive = status;
@@ -154,15 +156,17 @@ export class SentinelStore {
     statusFromNumber(status) {
         switch(status){
             case 1:
-                return 'block-mined';
+                return 'checkpoint-mined';
             case 2:
-                return 'block-proposed';
+                return 'checkpoint-proposed';
             case 3:
-                return 'block-missed';
+                return 'checkpoint-missed';
             case 4:
                 return 'attestation-sent';
             case 5:
                 return 'attestation-missed';
+            case 6:
+                return 'blocks-missed';
             default:
                 throw new Error(`Unknown status: ${status}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.0.1-commit.f2ce05ee",
+  "version": "0.0.1-commit.f504929",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -65,30 +65,32 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.f2ce05ee",
-    "@aztec/bb-prover": "0.0.1-commit.f2ce05ee",
-    "@aztec/blob-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/constants": "0.0.1-commit.f2ce05ee",
-    "@aztec/epoch-cache": "0.0.1-commit.f2ce05ee",
-    "@aztec/ethereum": "0.0.1-commit.f2ce05ee",
-    "@aztec/foundation": "0.0.1-commit.f2ce05ee",
-    "@aztec/kv-store": "0.0.1-commit.f2ce05ee",
-    "@aztec/l1-artifacts": "0.0.1-commit.f2ce05ee",
-    "@aztec/merkle-tree": "0.0.1-commit.f2ce05ee",
-    "@aztec/node-keystore": "0.0.1-commit.f2ce05ee",
-    "@aztec/node-lib": "0.0.1-commit.f2ce05ee",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f2ce05ee",
-    "@aztec/p2p": "0.0.1-commit.f2ce05ee",
-    "@aztec/protocol-contracts": "0.0.1-commit.f2ce05ee",
-    "@aztec/prover-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/sequencer-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/simulator": "0.0.1-commit.f2ce05ee",
-    "@aztec/slasher": "0.0.1-commit.f2ce05ee",
-    "@aztec/stdlib": "0.0.1-commit.f2ce05ee",
-    "@aztec/telemetry-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/validator-client": "0.0.1-commit.f2ce05ee",
-    "@aztec/validator-ha-signer": "0.0.1-commit.f2ce05ee",
-    "@aztec/world-state": "0.0.1-commit.f2ce05ee",
+    "@aztec/archiver": "0.0.1-commit.f504929",
+    "@aztec/bb-prover": "0.0.1-commit.f504929",
+    "@aztec/blob-client": "0.0.1-commit.f504929",
+    "@aztec/blob-lib": "0.0.1-commit.f504929",
+    "@aztec/constants": "0.0.1-commit.f504929",
+    "@aztec/epoch-cache": "0.0.1-commit.f504929",
+    "@aztec/ethereum": "0.0.1-commit.f504929",
+    "@aztec/foundation": "0.0.1-commit.f504929",
+    "@aztec/kv-store": "0.0.1-commit.f504929",
+    "@aztec/l1-artifacts": "0.0.1-commit.f504929",
+    "@aztec/merkle-tree": "0.0.1-commit.f504929",
+    "@aztec/node-keystore": "0.0.1-commit.f504929",
+    "@aztec/node-lib": "0.0.1-commit.f504929",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f504929",
+    "@aztec/p2p": "0.0.1-commit.f504929",
+    "@aztec/protocol-contracts": "0.0.1-commit.f504929",
+    "@aztec/prover-client": "0.0.1-commit.f504929",
+    "@aztec/prover-node": "0.0.1-commit.f504929",
+    "@aztec/sequencer-client": "0.0.1-commit.f504929",
+    "@aztec/simulator": "0.0.1-commit.f504929",
+    "@aztec/slasher": "0.0.1-commit.f504929",
+    "@aztec/stdlib": "0.0.1-commit.f504929",
+    "@aztec/telemetry-client": "0.0.1-commit.f504929",
+    "@aztec/validator-client": "0.0.1-commit.f504929",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f504929",
+    "@aztec/world-state": "0.0.1-commit.f504929",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",

package/src/aztec-node/config.ts

@@ -13,9 +13,14 @@ import {
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import { type ProverClientUserConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
+import {
+  type ProverNodeConfig,
+  proverNodeConfigMappings,
+  specificProverNodeConfigMappings,
+} from '@aztec/prover-node/config';
 import {
   type SequencerClientConfig,
-  type TxSenderConfig,
+  type SequencerTxSenderConfig,
   sequencerClientConfigMappings,
 } from '@aztec/sequencer-client/config';
 import { slasherConfigMappings } from '@aztec/slasher';
@@ -46,16 +51,18 @@ export type AztecNodeConfig = ArchiverConfig &
   SharedNodeConfig &
   GenesisStateConfig &
   NodeRPCConfig &
-  SlasherConfig & {
+  SlasherConfig &
+  ProverNodeConfig & {
     /** L1 contracts addresses */
     l1Contracts: L1ContractAddresses;
     /** Whether the validator is disabled for this node */
     disableValidator: boolean;
     /** Whether to skip waiting for the archiver to be fully synced before starting other services */
     skipArchiverInitialSync: boolean;
-
     /** A flag to force verification of tx Chonk proofs. Only used for testnet */
     debugForceTxProofVerification: boolean;
+    /** Whether to enable the prover node as a subsystem. */
+    enableProverNode: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
@@ -63,6 +70,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
+  ...proverNodeConfigMappings,
   ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
@@ -72,6 +80,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...genesisStateConfigMappings,
   ...nodeRpcConfigMappings,
   ...slasherConfigMappings,
+  ...specificProverNodeConfigMappings,
   l1Contracts: {
     description: 'The deployed L1 contract addresses',
     nested: l1ContractAddressesMapping,
@@ -91,6 +100,11 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
     ...booleanConfigHelper(false),
   },
+  enableProverNode: {
+    env: 'ENABLE_PROVER_NODE',
+    description: 'Whether to enable the prover node as a subsystem.',
+    ...booleanConfigHelper(false),
+  },
 };
 
 /**
@@ -101,7 +115,7 @@ export function getConfigEnvVars(): AztecNodeConfig {
   return getConfigFromMappings<AztecNodeConfig>(aztecNodeConfigMappings);
 }
 
-type ConfigRequiredToBuildKeyStore = TxSenderConfig & SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
+type ConfigRequiredToBuildKeyStore = SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
 
 function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
@@ -120,7 +134,7 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): Ke
     feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
     coinbase: config.coinbase ?? config.validatorAddresses[0],
     remoteSigner: config.web3SignerUrl,
-    publisher: config.publisherAddresses ?? [],
+    publisher: config.sequencerPublisherAddresses ?? [],
   });
 
   const keyStore: KeyStore = {
@@ -145,8 +159,10 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): K
   const coinbase = config.coinbase ?? EthAddress.fromString(privateKeyToAddress(ethPrivateKeys[0]));
   const feeRecipient = config.feeRecipient ?? AztecAddress.ZERO;
 
-  const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
+  const publisherKeys = config.sequencerPublisherPrivateKeys
+    ? config.sequencerPublisherPrivateKeys.map((k: { getValue: () => string }) =>
+        ethPrivateKeySchema.parse(k.getValue()),
+      )
     : [];
 
   validatorKeyStores.push({
@@ -168,7 +184,7 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): K
 }
 
 export function createKeyStoreForValidator(
-  config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+  config: SequencerTxSenderConfig & SequencerClientConfig & SharedNodeConfig,
 ): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);