@aztec/aztec-node 0.0.0-test.1 → 0.0.1-commit.b655e406

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

@@ -0,0 +1 @@
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,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;gBAGvD,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,+BAA+B,EAAE,MAAM,CAAA;KAAE;IAM7E,gBAAgB;IAIhB,kCAAkC;IAI5B,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,0BAA0B;IAQ9E,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;YAKjG,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC;YAUhG,0BAA0B;IAY3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAQtE,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAKzF,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,gBAAgB;CAgBzB"}

package/dest/sentinel/store.js

@@ -0,0 +1,169 @@
+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;
+    // a map from validator address to their ValidatorStatusHistory
+    historyMap;
+    // a map from validator address to their historical proven epoch performance
+    // e.g. { validator: [{ epoch: 1, missed: 1, total: 10 }, { epoch: 2, missed: 3, total: 7 }, ...] }
+    provenMap;
+    constructor(store, config){
+        this.store = store;
+        this.config = config;
+        this.historyMap = store.openMap('sentinel-validator-status');
+        this.provenMap = store.openMap('sentinel-validator-proven');
+    }
+    getHistoryLength() {
+        return this.config.historyLength;
+    }
+    getHistoricProvenPerformanceLength() {
+        return this.config.historicProvenPerformanceLength;
+    }
+    async updateProvenPerformance(epoch, performance) {
+        await this.store.transactionAsync(async ()=>{
+            for (const [who, { missed, total }] of Object.entries(performance)){
+                await this.pushValidatorProvenPerformanceForEpoch({
+                    who: EthAddress.fromString(who),
+                    missed,
+                    total,
+                    epoch
+                });
+            }
+        });
+    }
+    async getProvenPerformance(who) {
+        const currentPerformanceBuffer = await this.provenMap.getAsync(who.toString());
+        return currentPerformanceBuffer ? this.deserializePerformance(currentPerformanceBuffer) : [];
+    }
+    async pushValidatorProvenPerformanceForEpoch({ who, missed, total, epoch }) {
+        const currentPerformance = await this.getProvenPerformance(who);
+        const existingIndex = currentPerformance.findIndex((p)=>p.epoch === epoch);
+        if (existingIndex !== -1) {
+            currentPerformance[existingIndex] = {
+                missed,
+                total,
+                epoch
+            };
+        } else {
+            currentPerformance.push({
+                missed,
+                total,
+                epoch
+            });
+        }
+        // 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));
+    }
+    async updateValidators(slot, statuses) {
+        await this.store.transactionAsync(async ()=>{
+            for (const [who, status] of Object.entries(statuses)){
+                if (status) {
+                    await this.pushValidatorStatusForSlot(EthAddress.fromString(who), slot, status);
+                }
+            }
+        });
+    }
+    async pushValidatorStatusForSlot(who, slot, status) {
+        await this.store.transactionAsync(async ()=>{
+            const currentHistory = await this.getHistory(who) ?? [];
+            const newHistory = [
+                ...currentHistory,
+                {
+                    slot,
+                    status
+                }
+            ].slice(-this.config.historyLength);
+            await this.historyMap.set(who.toString(), this.serializeHistory(newHistory));
+        });
+    }
+    async getHistories() {
+        const histories = {};
+        for await (const [address, history] of this.historyMap.entriesAsync()){
+            histories[address] = this.deserializeHistory(history);
+        }
+        return histories;
+    }
+    async getHistory(address) {
+        const data = await this.historyMap.getAsync(address.toString());
+        return data && this.deserializeHistory(data);
+    }
+    serializePerformance(performance) {
+        return serializeToBuffer(performance.map((p)=>[
+                numToUInt32BE(Number(p.epoch)),
+                numToUInt32BE(p.missed),
+                numToUInt32BE(p.total)
+            ]));
+    }
+    deserializePerformance(buffer) {
+        const reader = new BufferReader(buffer);
+        const performance = [];
+        while(!reader.isEmpty()){
+            performance.push({
+                epoch: BigInt(reader.readNumber()),
+                missed: reader.readNumber(),
+                total: reader.readNumber()
+            });
+        }
+        return performance;
+    }
+    serializeHistory(history) {
+        return serializeToBuffer(history.map((h)=>[
+                numToUInt32BE(Number(h.slot)),
+                numToUInt8(this.statusToNumber(h.status))
+            ]));
+    }
+    deserializeHistory(buffer) {
+        const reader = new BufferReader(buffer);
+        const history = [];
+        while(!reader.isEmpty()){
+            const slot = BigInt(reader.readNumber());
+            const status = this.statusFromNumber(reader.readUInt8());
+            history.push({
+                slot,
+                status
+            });
+        }
+        return history;
+    }
+    statusToNumber(status) {
+        switch(status){
+            case 'block-mined':
+                return 1;
+            case 'block-proposed':
+                return 2;
+            case 'block-missed':
+                return 3;
+            case 'attestation-sent':
+                return 4;
+            case 'attestation-missed':
+                return 5;
+            default:
+                {
+                    const _exhaustive = status;
+                    throw new Error(`Unknown status: ${status}`);
+                }
+        }
+    }
+    statusFromNumber(status) {
+        switch(status){
+            case 1:
+                return 'block-mined';
+            case 2:
+                return 'block-proposed';
+            case 3:
+                return 'block-missed';
+            case 4:
+                return 'attestation-sent';
+            case 5:
+                return 'attestation-missed';
+            default:
+                throw new Error(`Unknown status: ${status}`);
+        }
+    }
+}

package/dest/test/index.d.ts

@@ -0,0 +1,31 @@
+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 type { L2BlockSource } from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { L2LogsSource, Service, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import type { GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
+import type { AztecNodeConfig } from '../aztec-node/config.js';
+import { AztecNodeService } from '../aztec-node/server.js';
+import { Sentinel } from '../sentinel/sentinel.js';
+export declare class TestAztecNodeService extends AztecNodeService {
+    config: AztecNodeConfig;
+    p2pClient: P2P;
+    blockSource: L2BlockSource & Partial<Service>;
+    logsSource: L2LogsSource;
+    contractDataSource: ContractDataSource;
+    l1ToL2MessageSource: L1ToL2MessageSource;
+    worldStateSynchronizer: WorldStateSynchronizer;
+    sequencer: SequencerClient | undefined;
+    slasherClient: SlasherClientInterface | undefined;
+    validatorsSentinel: Sentinel | undefined;
+    epochPruneWatcher: EpochPruneWatcher | undefined;
+    l1ChainId: number;
+    version: number;
+    globalVariableBuilder: GlobalVariableBuilderInterface;
+    epochCache: EpochCacheInterface;
+    packageVersion: string;
+}
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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"}

package/dest/test/index.js

@@ -0,0 +1 @@
+import { AztecNodeService } from '../aztec-node/server.js';

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.b655e406",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./config": "./dest/aztec-node/config.js"
+    "./config": "./dest/aztec-node/config.js",
+    "./sentinel": "./dest/aztec-node/sentinel.js",
+    "./test": "./dest/test/index.js"
   },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
@@ -21,8 +23,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -59,39 +59,49 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.0-test.1",
-    "@aztec/bb-prover": "0.0.0-test.1",
-    "@aztec/blob-sink": "0.0.0-test.1",
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/epoch-cache": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/merkle-tree": "0.0.0-test.1",
-    "@aztec/p2p": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/prover-client": "0.0.0-test.1",
-    "@aztec/sequencer-client": "0.0.0-test.1",
-    "@aztec/simulator": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/telemetry-client": "0.0.0-test.1",
-    "@aztec/validator-client": "0.0.0-test.1",
-    "@aztec/world-state": "0.0.0-test.1",
-    "koa": "^2.14.2",
-    "koa-router": "^12.0.0",
-    "tslib": "^2.4.0"
+    "@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",
+    "koa": "^2.16.1",
+    "koa-router": "^13.1.1",
+    "tslib": "^2.4.0",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.7.23",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.3",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -100,6 +110,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/aztec-node/config.ts

@@ -1,15 +1,37 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
+import {
+  type GenesisStateConfig,
+  type L1ContractAddresses,
+  genesisStateConfigMappings,
+  l1ContractAddressesMapping,
+} from '@aztec/ethereum';
 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,
+  ethPrivateKeySchema,
+  keyStoreConfigMappings,
+} from '@aztec/node-keystore';
+import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
-import { type ProverClientConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
-import { type SequencerClientConfig, sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
+import { type ProverClientUserConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
+import {
+  type SequencerClientConfig,
+  type TxSenderConfig,
+  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 ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
 
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
+import { privateKeyToAddress } from 'viem/accounts';
+
+import { type SentinelConfig, sentinelConfigMappings } from '../sentinel/config.js';
 
 export { sequencerClientConfigMappings, type SequencerClientConfig };
 
@@ -19,34 +41,51 @@ export { sequencerClientConfigMappings, type SequencerClientConfig };
 export type AztecNodeConfig = ArchiverConfig &
   SequencerClientConfig &
   ValidatorClientConfig &
-  ProverClientConfig &
+  ProverClientUserConfig &
   WorldStateConfig &
-  Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
+  Pick<ProverClientUserConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig &
-  DataStoreConfig & {
+  DataStoreConfig &
+  SentinelConfig &
+  SharedNodeConfig &
+  GenesisStateConfig &
+  NodeRPCConfig &
+  SlasherConfig & {
+    /** L1 contracts addresses */
+    l1Contracts: L1ContractAddresses;
     /** Whether the validator is disabled for this node */
     disableValidator: boolean;
-    /** Whether to populate the genesis state with initial fee juice for the test accounts */
-    testAccounts: boolean;
+    /** Whether to skip waiting for the archiver to be fully synced before starting other services */
+    skipArchiverInitialSync: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
+  ...dataConfigMappings,
+  ...keyStoreConfigMappings,
   ...archiverConfigMappings,
   ...sequencerClientConfigMappings,
   ...validatorClientConfigMappings,
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
   ...p2pConfigMappings,
-  ...dataConfigMappings,
+  ...sentinelConfigMappings,
+  ...sharedNodeConfigMappings,
+  ...genesisStateConfigMappings,
+  ...nodeRpcConfigMappings,
+  ...slasherConfigMappings,
+  l1Contracts: {
+    description: 'The deployed L1 contract addresses',
+    nested: l1ContractAddressesMapping,
+  },
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Whether the validator is disabled for this node.',
     ...booleanConfigHelper(),
   },
-  testAccounts: {
-    env: 'TEST_ACCOUNTS',
-    description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
-    ...booleanConfigHelper(),
+  skipArchiverInitialSync: {
+    env: 'SKIP_ARCHIVER_INITIAL_SYNC',
+    description: 'Whether to skip waiting for the archiver to be fully synced before starting other services.',
+    ...booleanConfigHelper(false),
   },
 };
 
@@ -58,14 +97,78 @@ export function getConfigEnvVars(): AztecNodeConfig {
   return getConfigFromMappings<AztecNodeConfig>(aztecNodeConfigMappings);
 }
 
-/**
- * Returns package version.
- */
-export function getPackageVersion() {
-  const releasePleaseManifestPath = resolve(
-    dirname(fileURLToPath(import.meta.url)),
-    '../../../../.release-please-manifest.json',
-  );
-  const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString());
-  return version['.'];
+type ConfigRequiredToBuildKeyStore = TxSenderConfig & SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
+
+function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
+  const validatorKeyStores: ValidatorKeyStore[] = [];
+
+  if (
+    config.web3SignerUrl === undefined ||
+    config.web3SignerUrl.length === 0 ||
+    config.validatorAddresses === undefined ||
+    config.validatorAddresses.length === 0
+  ) {
+    return undefined;
+  }
+
+  validatorKeyStores.push({
+    attester: config.validatorAddresses,
+    feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
+    coinbase: config.coinbase ?? config.validatorAddresses[0],
+    remoteSigner: config.web3SignerUrl,
+    publisher: config.publisherAddresses ?? [],
+  });
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: undefined,
+    remoteSigner: undefined,
+    validators: validatorKeyStores,
+  };
+  return keyStore;
+}
+
+function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
+  const validatorKeyStores: ValidatorKeyStore[] = [];
+  const ethPrivateKeys = config.validatorPrivateKeys
+    ? config.validatorPrivateKeys.getValue().map(x => ethPrivateKeySchema.parse(x))
+    : [];
+
+  if (!ethPrivateKeys.length) {
+    return undefined;
+  }
+  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()))
+    : [];
+
+  validatorKeyStores.push({
+    attester: ethPrivateKeys,
+    feeRecipient: feeRecipient,
+    coinbase: coinbase,
+    remoteSigner: undefined,
+    publisher: publisherKeys,
+  });
+
+  const keyStore: KeyStore = {
+    schemaVersion: 1,
+    slasher: undefined,
+    prover: undefined,
+    remoteSigner: undefined,
+    validators: validatorKeyStores,
+  };
+  return keyStore;
+}
+
+export function createKeyStoreForValidator(
+  config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+): KeyStore | undefined {
+  if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+    return createKeyStoreFromWeb3Signer(config);
+  }
+
+  return createKeyStoreFromPrivateKeys(config);
 }

package/src/aztec-node/node_metrics.ts

@@ -11,6 +11,9 @@ export class NodeMetrics {
   private receiveTxCount: UpDownCounter;
   private receiveTxDuration: Histogram;
 
+  private snapshotErrorCount: UpDownCounter;
+  private snapshotDuration: Histogram;
+
   constructor(client: TelemetryClient, name = 'AztecNode') {
     const meter = client.getMeter(name);
     this.receiveTxCount = meter.createUpDownCounter(Metrics.NODE_RECEIVE_TX_COUNT, {});
@@ -19,6 +22,19 @@ export class NodeMetrics {
       unit: 'ms',
       valueType: ValueType.INT,
     });
+
+    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.snapshotErrorCount.add(0);
   }
 
   receivedTx(durationMs: number, isAccepted: boolean) {
@@ -29,4 +45,16 @@ export class NodeMetrics {
       [Attributes.OK]: isAccepted,
     });
   }
+
+  recordSnapshot(durationMs: number) {
+    if (isNaN(durationMs)) {
+      return;
+    }
+
+    this.snapshotDuration.record(Math.ceil(durationMs));
+  }
+
+  recordSnapshotError() {
+    this.snapshotErrorCount.add(1);
+  }
 }