@aztec/aztec-node 0.0.1-commit.8afd444 → 0.0.1-commit.934299a21

package/dest/aztec-node/server.js

@@ -374,12 +374,13 @@ var _dec, _initProto;
 import { createArchiver } from '@aztec/archiver';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
+import { Blob } from '@aztec/blob-lib';
 import { EpochCache } from '@aztec/epoch-cache';
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { getPublicClient } from '@aztec/ethereum/client';
 import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
 import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { compactArray, pick } from '@aztec/foundation/collection';
+import { compactArray, pick, unique } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
@@ -389,9 +390,11 @@ import { DateProvider, Timer } from '@aztec/foundation/timer';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import { KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync, uploadSnapshot } from '@aztec/node-lib/actions';
-import { createForwarderL1TxUtilsFromEthSigner, createL1TxUtilsWithBlobsFromEthSigner } from '@aztec/node-lib/factories';
-import { createP2PClient, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
+import { createForwarderL1TxUtilsFromSigners, createL1TxUtilsFromSigners } from '@aztec/node-lib/factories';
+import { createP2PClient, createTxValidatorForAcceptingTxsOverRPC, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { createProverNode } from '@aztec/prover-node';
+import { createKeyStoreForProver } from '@aztec/prover-node/config';
 import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
@@ -402,13 +405,14 @@ import { GasFees } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { InMemoryDebugLogStore, NullDebugLogStore } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import { PublicSimulationOutput, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient, createValidatorForAcceptingTxs } from '@aztec/validator-client';
+import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 import { createPublicClient, fallback, http } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
@@ -428,6 +432,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     l1ToL2MessageSource;
     worldStateSynchronizer;
     sequencer;
+    proverNode;
     slasherClient;
     validatorsSentinel;
     epochPruneWatcher;
@@ -440,6 +445,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     telemetry;
     log;
     blobClient;
+    validatorClient;
+    keyStoreManager;
+    debugLogStore;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -454,7 +462,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     // Prevent two snapshot operations to happen simultaneously
     isUploadingSnapshot;
     tracer;
-    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient){
+    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient, validatorClient, keyStoreManager, debugLogStore = new NullDebugLogStore()){
         this.config = config;
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
@@ -463,6 +471,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.worldStateSynchronizer = worldStateSynchronizer;
         this.sequencer = sequencer;
+        this.proverNode = proverNode;
         this.slasherClient = slasherClient;
         this.validatorsSentinel = validatorsSentinel;
         this.epochPruneWatcher = epochPruneWatcher;
@@ -475,12 +484,21 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.telemetry = telemetry;
         this.log = log;
         this.blobClient = blobClient;
+        this.validatorClient = validatorClient;
+        this.keyStoreManager = keyStoreManager;
+        this.debugLogStore = debugLogStore;
         this.initialHeaderHashPromise = (_initProto(this), undefined);
         this.isUploadingSnapshot = false;
         this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
         this.tracer = telemetry.getTracer('AztecNodeService');
         this.log.info(`Aztec Node version: ${this.packageVersion}`);
         this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
+        // A defensive check that protects us against introducing a bug in the complex `createAndSync` function. We must
+        // never have debugLogStore enabled when not in test mode because then we would be accumulating debug logs in
+        // memory which could be a DoS vector on the sequencer (since no fees are paid for debug logs).
+        if (debugLogStore.isEnabled && config.realProofs) {
+            throw new Error('debugLogStore should never be enabled when realProofs are set');
+        }
     }
     async getWorldStateSyncStatus() {
         const status = await this.worldStateSynchronizer.status();
@@ -502,16 +520,27 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const telemetry = deps.telemetry ?? getTelemetryClient();
         const dateProvider = deps.dateProvider ?? new DateProvider();
         const ethereumChain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
-        // Build a key store from file if given or from environment otherwise
+        // Build a key store from file if given or from environment otherwise.
+        // We keep the raw KeyStore available so we can merge with prover keys if enableProverNode is set.
         let keyStoreManager;
         const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
         if (keyStoreProvided) {
             const keyStores = loadKeystores(config.keyStoreDirectory);
             keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
         } else {
-            const keyStore = createKeyStoreForValidator(config);
-            if (keyStore) {
-                keyStoreManager = new KeystoreManager(keyStore);
+            const rawKeyStores = [];
+            const validatorKeyStore = createKeyStoreForValidator(config);
+            if (validatorKeyStore) {
+                rawKeyStores.push(validatorKeyStore);
+            }
+            if (config.enableProverNode) {
+                const proverKeyStore = createKeyStoreForProver(config);
+                if (proverKeyStore) {
+                    rawKeyStores.push(proverKeyStore);
+                }
+            }
+            if (rawKeyStores.length > 0) {
+                keyStoreManager = new KeystoreManager(rawKeyStores.length === 1 ? rawKeyStores[0] : mergeKeystores(rawKeyStores));
             }
         }
         await keyStoreManager?.validateSigners();
@@ -520,8 +549,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             if (keyStoreManager === undefined) {
                 throw new Error('Failed to create key store, a requirement for running a validator');
             }
-            if (!keyStoreProvided) {
-                log.warn('KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS');
+            if (!keyStoreProvided && process.env.NODE_ENV !== 'test') {
+                log.warn("Keystore created from env: it's recommended to use a file-based key store for production");
             }
             ValidatorClient.validateKeyStoreConfiguration(keyStoreManager, log);
         }
@@ -552,7 +581,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         if (config.rollupVersion !== Number(rollupVersionFromRollup)) {
             log.warn(`Registry looked up and returned a rollup with version (${config.rollupVersion}), but this does not match with version detected from the rollup directly: (${rollupVersionFromRollup}).`);
         }
-        const blobClient = await createBlobClientWithFileStores(config, createLogger('node:blob-client:client'));
+        const blobClient = await createBlobClientWithFileStores(config, log.createChild('blob-client'));
         // attempt snapshot sync if possible
         await trySnapshotSync(config, log);
         const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, {
@@ -569,8 +598,13 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         // now create the merkle trees and the world state synchronizer
         const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.prefilledPublicData, telemetry);
         const circuitVerifier = config.realProofs || config.debugForceTxProofVerification ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+        let debugLogStore;
         if (!config.realProofs) {
             log.warn(`Aztec node is accepting fake proofs`);
+            debugLogStore = new InMemoryDebugLogStore();
+            log.info('Aztec node started in test mode (realProofs set to false) hence debug logs from public functions will be collected and served');
+        } else {
+            debugLogStore = new NullDebugLogStore();
         }
         const proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
         // create the tx pool and the p2p client, which will need the l2 block source
@@ -658,27 +692,29 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             const validatorAddresses = keyStoreManager ? NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager).getAddresses() : [];
             slasherClient = await createSlasher(config, config.l1Contracts, getPublicClient(config), watchers, dateProvider, epochCache, validatorAddresses, undefined);
             await slasherClient.start();
-            const l1TxUtils = config.publisherForwarderAddress ? await createForwarderL1TxUtilsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.publisherForwarderAddress, {
+            const l1TxUtils = config.sequencerPublisherForwarderAddress ? await createForwarderL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.sequencerPublisherForwarderAddress, {
                 ...config,
                 scope: 'sequencer'
             }, {
                 telemetry,
                 logger: log.createChild('l1-tx-utils'),
-                dateProvider
-            }) : await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
+            }) : await createL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
                 ...config,
                 scope: 'sequencer'
             }, {
                 telemetry,
                 logger: log.createChild('l1-tx-utils'),
-                dateProvider
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
             });
             // Create and start the sequencer client
             const checkpointsBuilder = new CheckpointsBuilder({
                 ...config,
                 l1GenesisTime,
                 slotDuration: Number(slotDuration)
-            }, worldStateSynchronizer, archiver, dateProvider, telemetry);
+            }, worldStateSynchronizer, archiver, dateProvider, telemetry, debugLogStore);
             sequencer = await SequencerClient.new(config, {
                 ...deps,
                 epochCache,
@@ -702,13 +738,35 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         } else if (sequencer) {
             log.warn(`Sequencer created but not started`);
         }
+        // Create prover node subsystem if enabled
+        let proverNode;
+        if (config.enableProverNode) {
+            proverNode = await createProverNode(config, {
+                ...deps.proverNodeDeps,
+                telemetry,
+                dateProvider,
+                archiver,
+                worldStateSynchronizer,
+                p2pClient,
+                epochCache,
+                blobClient,
+                keyStoreManager
+            });
+            if (!options.dontStartProverNode) {
+                await proverNode.start();
+                log.info(`Prover node subsystem started`);
+            } else {
+                log.info(`Prover node subsystem created but not started`);
+            }
+        }
         const globalVariableBuilder = new GlobalVariableBuilder({
             ...config,
             rollupVersion: BigInt(config.rollupVersion),
             l1GenesisTime,
             slotDuration: Number(slotDuration)
         });
-        return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient);
+        const node = new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient, validatorClient, keyStoreManager, debugLogStore);
+        return node;
     }
     /**
    * Returns the sequencer client instance.
@@ -716,6 +774,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ getSequencer() {
         return this.sequencer;
     }
+    /** Returns the prover node subsystem, if enabled. */ getProverNode() {
+        return this.proverNode;
+    }
     getBlockSource() {
         return this.blockSource;
     }
@@ -758,7 +819,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             rollupVersion,
             enr,
             l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
+            protocolContractAddresses: protocolContractAddresses,
+            realProofs: !!this.config.realProofs
         };
         return nodeInfo;
     }
@@ -932,18 +994,20 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const isKnownToPool = txPoolStatus === 'pending' || txPoolStatus === 'mined';
         // Then get the actual tx from the archiver, which tracks every tx in a mined block.
         const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
+        let receipt;
         if (settledTxReceipt) {
-            // If the archiver has the receipt then return it.
-            return settledTxReceipt;
+            receipt = settledTxReceipt;
         } else if (isKnownToPool) {
             // If the tx is in the pool but not in the archiver, it's pending.
             // This handles race conditions between archiver and p2p, where the archiver
             // has pruned the block in which a tx was mined, but p2p has not caught up yet.
-            return new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
+            receipt = new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
         } else {
             // Otherwise, if we don't know the tx, we consider it dropped.
-            return new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
+            receipt = new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
         }
+        this.debugLogStore.decorateReceiptWithLogs(txHash.toString(), receipt);
+        return receipt;
     }
     getTxEffect(txHash) {
         return this.blockSource.getTxEffect(txHash);
@@ -957,6 +1021,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         await tryStop(this.slasherClient);
         await tryStop(this.proofVerifier);
         await tryStop(this.sequencer);
+        await tryStop(this.proverNode);
         await tryStop(this.p2pClient);
         await tryStop(this.worldStateSynchronizer);
         await tryStop(this.blockSource);
@@ -1194,6 +1259,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ async getBlockHeaderByArchive(archive) {
         return await this.blockSource.getBlockHeaderByArchive(archive);
     }
+    getBlockData(number) {
+        return this.blockSource.getBlockData(number);
+    }
+    getBlockDataByArchive(archive) {
+        return this.blockSource.getBlockDataByArchive(archive);
+    }
     /**
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
@@ -1206,7 +1277,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             throw new BadRequestError(`Transaction total gas limit ${txGasLimit + teardownGasLimit} (${txGasLimit} + ${teardownGasLimit}) exceeds maximum gas limit ${this.config.rpcSimulatePublicMaxGasLimit} for simulation`);
         }
         const txHash = tx.getTxHash();
-        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
+        const latestBlockNumber = await this.blockSource.getBlockNumber();
+        const blockNumber = BlockNumber.add(latestBlockNumber, 1);
         // If sequencer is not initialized, we just set these values to zero for simulation.
         const coinbase = EthAddress.ZERO;
         const feeRecipient = AztecAddress.ZERO;
@@ -1217,6 +1289,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             txHash,
             blockNumber
         });
+        // Ensure world-state has caught up with the latest block we loaded from the archiver
+        await this.worldStateSynchronizer.syncImmediate(latestBlockNumber);
         const merkleTreeFork = await this.worldStateSynchronizer.fork();
         try {
             const config = PublicSimulatorConfig.from({
@@ -1231,7 +1305,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             });
             const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
             // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
-            const [processedTxs, failedTxs, _usedTxs, returns] = await processor.process([
+            const [processedTxs, failedTxs, _usedTxs, returns, _blobFields, debugLogs] = await processor.process([
                 tx
             ]);
             // REFACTOR: Consider returning the error rather than throwing
@@ -1242,7 +1316,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 throw failedTxs[0].error;
             }
             const [processedTx] = processedTxs;
-            return new PublicSimulationOutput(processedTx.revertReason, processedTx.globalVariables, processedTx.txEffect, returns, processedTx.gasUsed);
+            return new PublicSimulationOutput(processedTx.revertReason, processedTx.globalVariables, processedTx.txEffect, returns, processedTx.gasUsed, debugLogs);
         } finally{
             await merkleTreeFork.close();
         }
@@ -1250,10 +1324,10 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     async isValidTx(tx, { isSimulation, skipFeeEnforcement } = {}) {
         const db = this.worldStateSynchronizer.getCommitted();
         const verifier = isSimulation ? undefined : this.proofVerifier;
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
+        // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
         const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
         const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
-        const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
+        const validator = createTxValidatorForAcceptingTxsOverRPC(db, this.contractDataSource, verifier, {
             timestamp: nextSlotTimestamp,
             blockNumber,
             l1ChainId: this.l1ChainId,
@@ -1404,6 +1478,73 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             return this.slasherClient.gatherOffensesForRound(round === 'current' ? undefined : BigInt(round));
         }
     }
+    async reloadKeystore() {
+        if (!this.config.keyStoreDirectory?.length) {
+            throw new BadRequestError('Cannot reload keystore: node is not using a file-based keystore. ' + 'Set KEY_STORE_DIRECTORY to use file-based keystores.');
+        }
+        if (!this.validatorClient) {
+            throw new BadRequestError('Cannot reload keystore: validator is not enabled.');
+        }
+        this.log.info('Reloading keystore from disk');
+        // Re-read and validate keystore files
+        const keyStores = loadKeystores(this.config.keyStoreDirectory);
+        const newManager = new KeystoreManager(mergeKeystores(keyStores));
+        await newManager.validateSigners();
+        ValidatorClient.validateKeyStoreConfiguration(newManager, this.log);
+        // Validate that every validator's publisher keys overlap with the L1 signers
+        // that were initialized at startup. Publishers cannot be hot-reloaded, so a
+        // validator with a publisher key that doesn't match any existing L1 signer
+        // would silently fail on every proposer slot.
+        if (this.keyStoreManager && this.sequencer) {
+            const oldAdapter = NodeKeystoreAdapter.fromKeyStoreManager(this.keyStoreManager);
+            const availablePublishers = new Set(oldAdapter.getAttesterAddresses().flatMap((a)=>oldAdapter.getPublisherAddresses(a).map((p)=>p.toString().toLowerCase())));
+            const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
+            for (const attester of newAdapter.getAttesterAddresses()){
+                const pubs = newAdapter.getPublisherAddresses(attester);
+                if (pubs.length > 0 && !pubs.some((p)=>availablePublishers.has(p.toString().toLowerCase()))) {
+                    throw new BadRequestError(`Cannot reload keystore: validator ${attester} has publisher keys ` + `[${pubs.map((p)=>p.toString()).join(', ')}] but none match the L1 signers initialized at startup ` + `[${[
+                        ...availablePublishers
+                    ].join(', ')}]. Publishers cannot be hot-reloaded — ` + `use an existing publisher key or restart the node.`);
+                }
+            }
+        }
+        // Build adapters for old and new keystores to compute diff
+        const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
+        const newAddresses = newAdapter.getAttesterAddresses();
+        const oldAddresses = this.keyStoreManager ? NodeKeystoreAdapter.fromKeyStoreManager(this.keyStoreManager).getAttesterAddresses() : [];
+        const oldSet = new Set(oldAddresses.map((a)=>a.toString()));
+        const newSet = new Set(newAddresses.map((a)=>a.toString()));
+        const added = newAddresses.filter((a)=>!oldSet.has(a.toString()));
+        const removed = oldAddresses.filter((a)=>!newSet.has(a.toString()));
+        if (added.length > 0) {
+            this.log.info(`Keystore reload: adding attester keys: ${added.map((a)=>a.toString()).join(', ')}`);
+        }
+        if (removed.length > 0) {
+            this.log.info(`Keystore reload: removing attester keys: ${removed.map((a)=>a.toString()).join(', ')}`);
+        }
+        if (added.length === 0 && removed.length === 0) {
+            this.log.info('Keystore reload: attester keys unchanged');
+        }
+        // Update the validator client (coinbase, feeRecipient, attester keys)
+        this.validatorClient.reloadKeystore(newManager);
+        // Update the publisher factory's keystore so newly-added validators
+        // can be matched to existing publisher keys when proposing blocks.
+        if (this.sequencer) {
+            this.sequencer.updatePublisherNodeKeyStore(newAdapter);
+        }
+        // Update slasher's "don't-slash-self" list with new validator addresses
+        if (this.slasherClient && !this.config.slashSelfAllowed) {
+            const slashValidatorsNever = unique([
+                ...this.config.slashValidatorsNever ?? [],
+                ...newAddresses
+            ].map((a)=>a.toString())).map(EthAddress.fromString);
+            this.slasherClient.updateConfig({
+                slashValidatorsNever
+            });
+        }
+        this.keyStoreManager = newManager;
+        this.log.info('Keystore reloaded: coinbase, feeRecipient, and attester keys updated');
+    }
     #getInitialHeaderHash() {
         if (!this.initialHeaderHashPromise) {
             this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();

package/dest/sentinel/sentinel.d.ts

@@ -77,7 +77,7 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     /** Computes stats for a single validator. */
     getValidatorStats(validatorAddress: EthAddress, fromSlot?: SlotNumber, toSlot?: SlotNumber): Promise<SingleValidatorStats | undefined>;
     protected computeStatsForValidator(address: `0x${string}`, allHistory: ValidatorStatusHistory, fromSlot?: SlotNumber, toSlot?: SlotNumber): ValidatorStats;
-    protected computeMissed(history: ValidatorStatusHistory, computeOverPrefix: ValidatorStatusType | undefined, filter: ValidatorStatusInSlot[]): {
+    protected computeMissed(history: ValidatorStatusHistory, computeOverCategory: ValidatorStatusType | undefined, filter: ValidatorStatusInSlot[]): {
         currentStreak: number;
         rate: number | undefined;
         count: number;
@@ -90,4 +90,4 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     } | undefined;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudGluZWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zZW50aW5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBQWUsZ0JBQWdCLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXpHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxFQUFxQixLQUFLLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM1QyxPQUFPLEVBSUwsS0FBSyxPQUFPLEVBQ1osS0FBSyxjQUFjLEVBQ3BCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0QsT0FBTyxFQUNMLEtBQUssYUFBYSxFQUNsQixhQUFhLEVBQ2IsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyx5QkFBeUIsRUFFL0IsTUFBTSxxQkFBcUIsQ0FBQztBQUU3QixPQUFPLEtBQUssRUFDVixvQkFBb0IsRUFDcEIsY0FBYyxFQUNkLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsbUJBQW1CLEVBQ25CLDBCQUEwQixFQUMxQixlQUFlLEVBQ2hCLE1BQU0sMEJBQTBCLENBQUM7QUFJbEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQzs7QUFFM0MscUJBQWEsUUFBUyxTQUFRLGFBQTJDLFlBQVcseUJBQXlCLEVBQUUsT0FBTztJQWNsSCxTQUFTLENBQUMsVUFBVSxFQUFFLFVBQVU7SUFDaEMsU0FBUyxDQUFDLFFBQVEsRUFBRSxhQUFhO0lB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudGluZWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zZW50aW5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBQWUsZ0JBQWdCLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXpHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxFQUFxQixLQUFLLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM1QyxPQUFPLEVBSUwsS0FBSyxPQUFPLEVBQ1osS0FBSyxjQUFjLEVBQ3BCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0QsT0FBTyxFQUNMLEtBQUssYUFBYSxFQUNsQixhQUFhLEVBQ2IsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyx5QkFBeUIsRUFFL0IsTUFBTSxxQkFBcUIsQ0FBQztBQUU3QixPQUFPLEtBQUssRUFDVixvQkFBb0IsRUFDcEIsY0FBYyxFQUNkLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsbUJBQW1CLEVBQ25CLDBCQUEwQixFQUMxQixlQUFlLEVBQ2hCLE1BQU0sMEJBQTBCLENBQUM7QUFJbEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQzs7QUFhM0MscUJBQWEsUUFBUyxTQUFRLGFBQTJDLFlBQVcseUJBQXlCLEVBQUUsT0FBTztJQWNsSCxTQUFTLENBQUMsVUFBVSxFQUFFLFVBQVU7SUFDaEMsU0FBUyxDQUFDLFFBQVEsRUFBRSxhQUFhO0lB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

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

@@ -1 +1 @@
-{"version":3,"file":"sentinel.d.ts","sourceRoot":"","sources":["../../src/sentinel/sentinel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sentinel.d.ts","sourceRoot":"","sources":["../../src/sentinel/sentinel.ts"],"names":[],"mappings":"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"}

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([