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

package/dest/sentinel/store.js

@@ -1,30 +1,31 @@
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BufferReader, numToUInt8, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
 export class SentinelStore {
     store;
     config;
-    static SCHEMA_VERSION = 2;
+    static SCHEMA_VERSION = 4;
     // a map from validator address to their ValidatorStatusHistory
     historyMap;
-    // 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 }, ...] }
-    provenMap;
+    epochMap;
     constructor(store, config){
         this.store = store;
         this.config = config;
         this.historyMap = store.openMap('sentinel-validator-status');
-        this.provenMap = store.openMap('sentinel-validator-proven');
+        this.epochMap = store.openMap('sentinel-validator-epoch');
     }
     getHistoryLength() {
         return this.config.historyLength;
     }
-    getHistoricProvenPerformanceLength() {
-        return this.config.historicProvenPerformanceLength;
+    getHistoricEpochPerformanceLength() {
+        return this.config.historicEpochPerformanceLength;
     }
-    async updateProvenPerformance(epoch, performance) {
+    async updateEpochPerformance(epoch, performance) {
         await this.store.transactionAsync(async ()=>{
             for (const [who, { missed, total }] of Object.entries(performance)){
-                await this.pushValidatorProvenPerformanceForEpoch({
+                await this.pushValidatorEpochPerformance({
                     who: EthAddress.fromString(who),
                     missed,
                     total,
@@ -33,12 +34,12 @@ export class SentinelStore {
             }
         });
     }
-    async getProvenPerformance(who) {
-        const currentPerformanceBuffer = await this.provenMap.getAsync(who.toString());
+    async getEpochPerformance(who) {
+        const currentPerformanceBuffer = await this.epochMap.getAsync(who.toString());
         return currentPerformanceBuffer ? this.deserializePerformance(currentPerformanceBuffer) : [];
     }
-    async pushValidatorProvenPerformanceForEpoch({ who, missed, total, epoch }) {
-        const currentPerformance = await this.getProvenPerformance(who);
+    async pushValidatorEpochPerformance({ who, missed, total, epoch }) {
+        const currentPerformance = await this.getEpochPerformance(who);
         const existingIndex = currentPerformance.findIndex((p)=>p.epoch === epoch);
         if (existingIndex !== -1) {
             currentPerformance[existingIndex] = {
@@ -56,9 +57,9 @@ export class SentinelStore {
         // This should be sorted by epoch, but just in case.
         // 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);
-        await this.provenMap.set(who.toString(), this.serializePerformance(performanceToKeep));
+        // keep the most recent `historicEpochPerformanceLength` entries.
+        const performanceToKeep = currentPerformance.slice(-this.config.historicEpochPerformanceLength);
+        await this.epochMap.set(who.toString(), this.serializePerformance(performanceToKeep));
     }
     async updateValidators(slot, statuses) {
         await this.store.transactionAsync(async ()=>{
@@ -105,7 +106,7 @@ export class SentinelStore {
         const performance = [];
         while(!reader.isEmpty()){
             performance.push({
-                epoch: BigInt(reader.readNumber()),
+                epoch: EpochNumber(reader.readNumber()),
                 missed: reader.readNumber(),
                 total: reader.readNumber()
             });
@@ -122,7 +123,7 @@ export class SentinelStore {
         const reader = new BufferReader(buffer);
         const history = [];
         while(!reader.isEmpty()){
-            const slot = BigInt(reader.readNumber());
+            const slot = SlotNumber(reader.readNumber());
             const status = this.statusFromNumber(reader.readUInt8());
             history.push({
                 slot,
@@ -133,16 +134,22 @@ export class SentinelStore {
     }
     statusToNumber(status) {
         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 = status;
@@ -153,15 +160,21 @@ export class SentinelStore {
     statusFromNumber(status) {
         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/dest/test/index.d.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';
@@ -21,11 +21,11 @@ export declare class TestAztecNodeService extends AztecNodeService {
     sequencer: SequencerClient | undefined;
     slasherClient: SlasherClientInterface | undefined;
     validatorsSentinel: Sentinel | undefined;
-    epochPruneWatcher: EpochPruneWatcher | undefined;
+    dataWithholdingWatcher: DataWithholdingWatcher | undefined;
     l1ChainId: number;
     version: number;
     globalVariableBuilder: GlobalVariableBuilderInterface;
     epochCache: EpochCacheInterface;
     packageVersion: string;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsS0FBSyxzQkFBc0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JHLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUscUJBQXFCLElBQUksOEJBQThCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbkQsTUFBTSxDQUFDLE9BQU8sT0FBTyxvQkFBcUIsU0FBUSxnQkFBZ0I7SUFDakQsTUFBTSxFQUFFLGVBQWUsQ0FBQztJQUN4QixTQUFTLEVBQUUsR0FBRyxDQUFDO0lBQ2YsV0FBVyxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDOUMsVUFBVSxFQUFFLFlBQVksQ0FBQztJQUN6QixrQkFBa0IsRUFBRSxrQkFBa0IsQ0FBQztJQUN2QyxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztJQUN6QyxzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztJQUMvQyxTQUFTLEVBQUUsZUFBZSxHQUFHLFNBQVMsQ0FBQztJQUN2QyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO0lBQ2xELGtCQUFrQixFQUFFLFFBQVEsR0FBRyxTQUFTLENBQUM7SUFDekMsc0JBQXNCLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO0lBQzNELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixxQkFBcUIsRUFBRSw4QkFBOEIsQ0FBQztJQUN0RCxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN2QyJ9

package/dest/test/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAEhG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,gBAAgB;IACjD,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,EAAE,YAAY,CAAC;IACzB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IACvC,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAClD,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,qBAAqB,EAAE,8BAA8B,CAAC;IACtD,UAAU,EAAE,mBAAmB,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;CACvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAEhG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,gBAAgB;IACjD,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,EAAE,YAAY,CAAC;IACzB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IACvC,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAClD,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACzC,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,qBAAqB,EAAE,8BAA8B,CAAC;IACtD,UAAU,EAAE,mBAAmB,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;CACvC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.b8a057fa",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -9,7 +9,6 @@
     "./sentinel": "./dest/aztec-node/sentinel.js",
     "./test": "./dest/test/index.js"
   },
-  "bin": "./dest/bin/index.js",
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -20,8 +19,8 @@
   "scripts": {
     "start": "node --no-warnings ./dest/bin",
     "start:debug": "node --no-warnings --inspect ./dest/bin",
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -66,38 +65,43 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.b655e406",
-    "@aztec/bb-prover": "0.0.1-commit.b655e406",
-    "@aztec/blob-sink": "0.0.1-commit.b655e406",
-    "@aztec/constants": "0.0.1-commit.b655e406",
-    "@aztec/epoch-cache": "0.0.1-commit.b655e406",
-    "@aztec/ethereum": "0.0.1-commit.b655e406",
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/kv-store": "0.0.1-commit.b655e406",
-    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
-    "@aztec/merkle-tree": "0.0.1-commit.b655e406",
-    "@aztec/node-keystore": "0.0.1-commit.b655e406",
-    "@aztec/node-lib": "0.0.1-commit.b655e406",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
-    "@aztec/p2p": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/prover-client": "0.0.1-commit.b655e406",
-    "@aztec/sequencer-client": "0.0.1-commit.b655e406",
-    "@aztec/simulator": "0.0.1-commit.b655e406",
-    "@aztec/slasher": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
-    "@aztec/telemetry-client": "0.0.1-commit.b655e406",
-    "@aztec/validator-client": "0.0.1-commit.b655e406",
-    "@aztec/world-state": "0.0.1-commit.b655e406",
+    "@aztec/archiver": "0.0.1-commit.b8a057fa",
+    "@aztec/bb-prover": "0.0.1-commit.b8a057fa",
+    "@aztec/bb.js": "0.0.1-commit.b8a057fa",
+    "@aztec/blob-client": "0.0.1-commit.b8a057fa",
+    "@aztec/blob-lib": "0.0.1-commit.b8a057fa",
+    "@aztec/constants": "0.0.1-commit.b8a057fa",
+    "@aztec/epoch-cache": "0.0.1-commit.b8a057fa",
+    "@aztec/ethereum": "0.0.1-commit.b8a057fa",
+    "@aztec/foundation": "0.0.1-commit.b8a057fa",
+    "@aztec/kv-store": "0.0.1-commit.b8a057fa",
+    "@aztec/l1-artifacts": "0.0.1-commit.b8a057fa",
+    "@aztec/node-keystore": "0.0.1-commit.b8a057fa",
+    "@aztec/node-lib": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b8a057fa",
+    "@aztec/p2p": "0.0.1-commit.b8a057fa",
+    "@aztec/protocol-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/prover-client": "0.0.1-commit.b8a057fa",
+    "@aztec/prover-node": "0.0.1-commit.b8a057fa",
+    "@aztec/sequencer-client": "0.0.1-commit.b8a057fa",
+    "@aztec/simulator": "0.0.1-commit.b8a057fa",
+    "@aztec/slasher": "0.0.1-commit.b8a057fa",
+    "@aztec/standard-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/stdlib": "0.0.1-commit.b8a057fa",
+    "@aztec/telemetry-client": "0.0.1-commit.b8a057fa",
+    "@aztec/validator-client": "0.0.1-commit.b8a057fa",
+    "@aztec/validator-ha-signer": "0.0.1-commit.b8a057fa",
+    "@aztec/world-state": "0.0.1-commit.b8a057fa",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",

package/src/aztec-node/block_response_helpers.ts

@@ -0,0 +1,161 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type BlockData, type CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
+import type {
+  CheckpointData,
+  L1PublishedData,
+  ProposedCheckpointData,
+  PublishedCheckpoint,
+} from '@aztec/stdlib/checkpoint';
+import {
+  type BlockIncludeOptions,
+  type BlockResponse,
+  type CheckpointIncludeOptions,
+  type CheckpointResponse,
+  l1PublishInfoFromL1PublishedData,
+} from '@aztec/stdlib/interfaces/client';
+
+/** Projects a full {@link L2Block} into a {@link BlockResponse}, attaching L1 / attestation context when provided. */
+export async function blockResponseFromL2Block(
+  block: L2Block,
+  options: BlockIncludeOptions,
+  context?: { l1?: L1PublishedData; attestations?: CommitteeAttestation[] },
+): Promise<BlockResponse> {
+  const response: BlockResponse = {
+    header: block.header,
+    archive: block.archive,
+    hash: await block.hash(),
+    checkpointNumber: block.checkpointNumber,
+    indexWithinCheckpoint: block.indexWithinCheckpoint,
+    number: block.number,
+  };
+  if (options.includeTransactions) {
+    (response as BlockResponse).body = block.body;
+  }
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link BlockData} into a {@link BlockResponse}. */
+export function blockResponseFromBlockData(
+  data: BlockData,
+  options: BlockIncludeOptions,
+  context?: { l1?: L1PublishedData; attestations?: CommitteeAttestation[] },
+): BlockResponse {
+  const response: BlockResponse = {
+    header: data.header,
+    archive: data.archive,
+    hash: data.blockHash,
+    checkpointNumber: data.checkpointNumber,
+    indexWithinCheckpoint: data.indexWithinCheckpoint,
+    number: data.header.getBlockNumber(),
+  };
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects a {@link PublishedCheckpoint} into a {@link CheckpointResponse}. */
+export async function checkpointResponseFromPublishedCheckpoint(
+  pc: PublishedCheckpoint,
+  options: CheckpointIncludeOptions,
+): Promise<CheckpointResponse> {
+  const response: CheckpointResponse = {
+    number: pc.checkpoint.number,
+    header: pc.checkpoint.header,
+    archive: pc.checkpoint.archive,
+    checkpointOutHash: pc.checkpoint.getCheckpointOutHash(),
+    startBlock: pc.checkpoint.blocks[0]?.number ?? BlockNumber.ZERO,
+    blockCount: pc.checkpoint.blocks.length,
+    feeAssetPriceModifier: pc.checkpoint.feeAssetPriceModifier,
+  };
+  if (options.includeBlocks) {
+    (response as CheckpointResponse).blocks = await Promise.all(
+      pc.checkpoint.blocks.map(block =>
+        blockResponseFromL2Block(block, {
+          includeTransactions: options.includeTransactions,
+          includeL1PublishInfo: false,
+          includeAttestations: false,
+        }),
+      ),
+    );
+  }
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(pc.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = pc.attestations;
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link CheckpointData} into a {@link CheckpointResponse}. `includeBlocks` is ignored (no blocks loaded). */
+export function checkpointResponseFromCheckpointData(
+  cd: CheckpointData,
+  options: CheckpointIncludeOptions,
+): CheckpointResponse {
+  const response: CheckpointResponse = {
+    number: cd.checkpointNumber,
+    header: cd.header,
+    archive: cd.archive,
+    checkpointOutHash: cd.checkpointOutHash,
+    startBlock: cd.startBlock,
+    blockCount: cd.blockCount,
+    feeAssetPriceModifier: cd.feeAssetPriceModifier,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(cd.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = cd.attestations;
+  }
+  return response;
+}
+
+/**
+ * Projects a {@link ProposedCheckpointData} into a {@link CheckpointResponse}.
+ * Pure projection — caller pre-fetches `blocks` via `blockSource.getBlocks(...)` when
+ * `options.includeBlocks` is true. Throws if `includeL1PublishInfo` or `includeAttestations`
+ * is requested (proposed checkpoints have no L1 publish info or attestations).
+ */
+export async function projectProposedToCheckpointResponse(
+  proposed: ProposedCheckpointData,
+  options: CheckpointIncludeOptions,
+  blocks?: L2Block[],
+): Promise<CheckpointResponse> {
+  if (options.includeL1PublishInfo || options.includeAttestations) {
+    throw new Error('Proposed checkpoints have no L1 publish info or attestations');
+  }
+  const response: CheckpointResponse = {
+    number: proposed.checkpointNumber,
+    header: proposed.header,
+    archive: proposed.archive,
+    checkpointOutHash: proposed.checkpointOutHash,
+    startBlock: proposed.startBlock,
+    blockCount: proposed.blockCount,
+    feeAssetPriceModifier: proposed.feeAssetPriceModifier,
+  };
+  if (options.includeBlocks) {
+    if (!blocks) {
+      throw new Error('Blocks must be supplied when includeBlocks is true');
+    }
+    (response as CheckpointResponse).blocks = await Promise.all(
+      blocks.map(block =>
+        blockResponseFromL2Block(block, {
+          includeTransactions: options.includeTransactions,
+          includeL1PublishInfo: false,
+          includeAttestations: false,
+        }),
+      ),
+    );
+  }
+  return response;
+}

package/src/aztec-node/config.ts

@@ -1,13 +1,7 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
-import {
-  type GenesisStateConfig,
-  type L1ContractAddresses,
-  genesisStateConfigMappings,
-  l1ContractAddressesMapping,
-} from '@aztec/ethereum';
+import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import {
   type KeyStore,
   type ValidatorKeyStore,
@@ -17,15 +11,21 @@ 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';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type NodeRPCConfig, nodeRpcConfigMappings } from '@aztec/stdlib/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
 
@@ -50,13 +50,31 @@ export type AztecNodeConfig = ArchiverConfig &
   SharedNodeConfig &
   GenesisStateConfig &
   NodeRPCConfig &
-  SlasherConfig & {
-    /** L1 contracts addresses */
-    l1Contracts: L1ContractAddresses;
+  SlasherConfig &
+  ProverNodeConfig & {
     /** 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;
+    /** Whether to run the slashing watchers to collect offenses even if not a validator. */
+    enableOffenseCollection: boolean;
+    /**
+     * Test-only: use the deterministic AutomineSequencer instead of the production Sequencer.
+     * Requires `aztecTargetCommitteeSize === 0` on the deployed rollup and anvil-backed L1.
+     * See `AUTOMINE_E2E_OPTS` in `end-to-end/src/fixtures/fixtures.ts`.
+     */
+    useAutomineSequencer?: boolean;
+    /**
+     * Test-only: have the AutomineSequencer automatically prove epochs (write epoch out hashes into
+     * the L1 Outbox and advance the proven tip) as checkpoints land, replacing the standalone
+     * `EpochTestSettler`. Set by the local network/sandbox; the e2e `AUTOMINE_E2E_OPTS` fixture leaves
+     * it off so tests drive proving manually via `prove` / `cheatCodes.rollup.markAsProven`.
+     */
+    automineEnableProveEpoch?: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
@@ -64,6 +82,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
+  ...proverNodeConfigMappings,
   ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
@@ -73,10 +92,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...genesisStateConfigMappings,
   ...nodeRpcConfigMappings,
   ...slasherConfigMappings,
-  l1Contracts: {
-    description: 'The deployed L1 contract addresses',
-    nested: l1ContractAddressesMapping,
-  },
+  ...specificProverNodeConfigMappings,
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Whether the validator is disabled for this node.',
@@ -87,6 +103,31 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
     ...booleanConfigHelper(false),
   },
+  debugForceTxProofVerification: {
+    env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
+    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),
+  },
+  enableOffenseCollection: {
+    env: 'OFFENSE_COLLECTION_ENABLED',
+    description: 'Whether to run the slashing watchers to collect offenses even if not a validator.',
+    ...booleanConfigHelper(false),
+  },
+  useAutomineSequencer: {
+    env: 'USE_AUTOMINE_SEQUENCER',
+    description: 'Test-only: use AutomineSequencer instead of the production Sequencer.',
+    ...booleanConfigHelper(false),
+  },
+  automineEnableProveEpoch: {
+    env: 'AUTOMINE_ENABLE_PROVE_EPOCH',
+    description: 'Test-only: have the AutomineSequencer automatically prove epochs as checkpoints land.',
+    ...booleanConfigHelper(false),
+  },
 };
 
 /**
@@ -97,7 +138,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[] = [];
@@ -116,7 +157,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 = {
@@ -132,7 +173,7 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): Ke
 function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
   const ethPrivateKeys = config.validatorPrivateKeys
-    ? config.validatorPrivateKeys.getValue().map(x => ethPrivateKeySchema.parse(x))
+    ? config.validatorPrivateKeys.getValue().map((x: string) => ethPrivateKeySchema.parse(x))
     : [];
 
   if (!ethPrivateKeys.length) {
@@ -141,8 +182,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 => ethPrivateKeySchema.parse(k.getValue()))
+  const publisherKeys = config.sequencerPublisherPrivateKeys
+    ? config.sequencerPublisherPrivateKeys.map((k: { getValue: () => string }) =>
+        ethPrivateKeySchema.parse(k.getValue()),
+      )
     : [];
 
   validatorKeyStores.push({
@@ -164,7 +207,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);

package/src/aztec-node/node_metrics.ts

@@ -4,7 +4,7 @@ import {
   Metrics,
   type TelemetryClient,
   type UpDownCounter,
-  ValueType,
+  createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
 export class NodeMetrics {
@@ -16,25 +16,14 @@ export class NodeMetrics {
 
   constructor(client: TelemetryClient, name = 'AztecNode') {
     const meter = client.getMeter(name);
-    this.receiveTxCount = meter.createUpDownCounter(Metrics.NODE_RECEIVE_TX_COUNT, {});
-    this.receiveTxDuration = meter.createHistogram(Metrics.NODE_RECEIVE_TX_DURATION, {
-      description: 'The duration of the receiveTx method',
-      unit: 'ms',
-      valueType: ValueType.INT,
+    this.receiveTxCount = createUpDownCounterWithDefault(meter, Metrics.NODE_RECEIVE_TX_COUNT, {
+      [Attributes.OK]: [true, false],
     });
+    this.receiveTxDuration = meter.createHistogram(Metrics.NODE_RECEIVE_TX_DURATION);
 
-    this.snapshotDuration = meter.createHistogram(Metrics.NODE_SNAPSHOT_DURATION, {
-      description: 'How long taking a snapshot takes',
-      unit: 'ms',
-      valueType: ValueType.INT,
-    });
-
-    this.snapshotErrorCount = meter.createUpDownCounter(Metrics.NODE_SNAPSHOT_ERROR_COUNT, {
-      description: 'How many snapshot errors have happened',
-      valueType: ValueType.INT,
-    });
+    this.snapshotDuration = meter.createHistogram(Metrics.NODE_SNAPSHOT_DURATION);
 
-    this.snapshotErrorCount.add(0);
+    this.snapshotErrorCount = createUpDownCounterWithDefault(meter, Metrics.NODE_SNAPSHOT_ERROR_COUNT);
   }
 
   receivedTx(durationMs: number, isAccepted: boolean) {