@aztec/aztec-node 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/aztec-node/server.js

@@ -9,35 +9,40 @@ import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@azte
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { RegistryContract, RollupContract, createEthereumChain, getPublicClient } from '@aztec/ethereum';
-import { createL1TxUtilsWithBlobsFromEthSigner } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { compactArray, pick } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 import { count } from '@aztec/foundation/string';
 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 { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { BlockBuilder, GlobalVariableBuilder, SequencerClient, createValidatorForAcceptingTxs } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
+import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2BlockHash } from '@aztec/stdlib/block';
+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 { 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 { NodeKeystoreAdapter, ValidatorClient, createValidatorClient } from '@aztec/validator-client';
+import { 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';
@@ -68,8 +73,6 @@ import { NodeMetrics } from './node_metrics.js';
     metrics;
     // Prevent two snapshot operations to happen simultaneously
     isUploadingSnapshot;
-    // Serial queue to ensure that we only send one tx at a time
-    txQueue;
     tracer;
     constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node')){
         this.config = config;
@@ -92,10 +95,8 @@ import { NodeMetrics } from './node_metrics.js';
         this.telemetry = telemetry;
         this.log = log;
         this.isUploadingSnapshot = false;
-        this.txQueue = new SerialQueue();
         this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
         this.tracer = telemetry.getTracer('AztecNodeService');
-        this.txQueue.start();
         this.log.info(`Aztec Node version: ${this.packageVersion}`);
         this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
     }
@@ -134,6 +135,7 @@ import { NodeMetrics } from './node_metrics.js';
                 keyStoreManager = new KeystoreManager(keyStore);
             }
         }
+        await keyStoreManager?.validateSigners();
         // If we are a validator, verify our configuration before doing too much more.
         if (!config.disableValidator) {
             if (keyStoreManager === undefined) {
@@ -142,7 +144,7 @@ import { NodeMetrics } from './node_metrics.js';
             if (!keyStoreProvided) {
                 log.warn('KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS');
             }
-            ValidatorClient.validateKeyStoreConfiguration(keyStoreManager);
+            ValidatorClient.validateKeyStoreConfiguration(keyStoreManager, log);
         }
         // validate that the actual chain id matches that specified in configuration
         if (config.l1ChainId !== ethereumChain.chainInfo.id) {
@@ -180,49 +182,27 @@ import { NodeMetrics } from './node_metrics.js';
             telemetry,
             dateProvider
         }, {
-            blockUntilSync: true
+            blockUntilSync: !config.skipArchiverInitialSync
         });
         // now create the merkle trees and the world state synchronizer
         const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.prefilledPublicData, telemetry);
-        const circuitVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
+        const circuitVerifier = config.realProofs || config.debugForceTxProofVerification ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
         if (!config.realProofs) {
             log.warn(`Aztec node is accepting fake proofs`);
         }
         const proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
         // create the tx pool and the p2p client, which will need the l2 block source
         const p2pClient = await createP2PClient(P2PClientType.Full, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
-        // Start world state and wait for it to sync to the archiver.
-        await worldStateSynchronizer.start();
-        // Start p2p. Note that it depends on world state to be running.
-        await p2pClient.start();
+        // We should really not be modifying the config object
         config.txPublicSetupAllowList = config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
         const blockBuilder = new BlockBuilder({
             ...config,
             l1GenesisTime,
             slotDuration: Number(slotDuration)
         }, worldStateSynchronizer, archiver, dateProvider, telemetry);
+        // We'll accumulate sentinel watchers here
         const watchers = [];
-        const validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-        if (validatorsSentinel) {
-            // we can run a sentinel without trying to slash.
-            await validatorsSentinel.start();
-            if (config.slashInactivityPenalty > 0n) {
-                watchers.push(validatorsSentinel);
-            }
-        }
-        let epochPruneWatcher;
-        if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-            epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), blockBuilder, config);
-            await epochPruneWatcher.start();
-            watchers.push(epochPruneWatcher);
-        }
-        // We assume we want to slash for invalid attestations unless all max penalties are set to 0
-        let attestationsBlockWatcher;
-        if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
-            attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
-            await attestationsBlockWatcher.start();
-            watchers.push(attestationsBlockWatcher);
-        }
+        // Create validator client if required
         const validatorClient = createValidatorClient(config, {
             p2pClient,
             telemetry,
@@ -233,10 +213,56 @@ import { NodeMetrics } from './node_metrics.js';
             l1ToL2MessageSource: archiver,
             keyStoreManager
         });
+        // If we have a validator client, register it as a source of offenses for the slasher,
+        // and have it register callbacks on the p2p client *before* we start it, otherwise messages
+        // like attestations or auths will fail.
         if (validatorClient) {
             watchers.push(validatorClient);
+            if (!options.dontStartSequencer) {
+                await validatorClient.registerHandlers();
+            }
+        }
+        // If there's no validator client but alwaysReexecuteBlockProposals is enabled,
+        // create a BlockProposalHandler to reexecute block proposals for monitoring
+        if (!validatorClient && config.alwaysReexecuteBlockProposals) {
+            log.info('Setting up block proposal reexecution for monitoring');
+            createBlockProposalHandler(config, {
+                blockBuilder,
+                epochCache,
+                blockSource: archiver,
+                l1ToL2MessageSource: archiver,
+                p2pClient,
+                dateProvider,
+                telemetry
+            }).registerForReexecution(p2pClient);
         }
-        log.verbose(`All Aztec Node subsystems synced`);
+        // Start world state and wait for it to sync to the archiver.
+        await worldStateSynchronizer.start();
+        // Start p2p. Note that it depends on world state to be running.
+        await p2pClient.start();
+        const validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
+        if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
+            watchers.push(validatorsSentinel);
+        }
+        let epochPruneWatcher;
+        if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
+            epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), blockBuilder, config);
+            watchers.push(epochPruneWatcher);
+        }
+        // We assume we want to slash for invalid attestations unless all max penalties are set to 0
+        let attestationsBlockWatcher;
+        if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
+            attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
+            watchers.push(attestationsBlockWatcher);
+        }
+        // Start p2p-related services once the archiver has completed sync
+        void archiver.waitForInitialSync().then(async ()=>{
+            await p2pClient.start();
+            await validatorsSentinel?.start();
+            await epochPruneWatcher?.start();
+            await attestationsBlockWatcher?.start();
+            log.info(`All p2p services started`);
+        }).catch((err)=>log.error('Failed to start p2p services after archiver sync', err));
         // Validator enabled, create/start relevant service
         let sequencer;
         let slasherClient;
@@ -246,12 +272,23 @@ import { NodeMetrics } from './node_metrics.js';
             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 = keyStoreManager.createAllValidatorPublisherSigners().map((signer)=>{
-                return createL1TxUtilsWithBlobsFromEthSigner(publicClient, signer, log, dateProvider, config);
+            const l1TxUtils = config.publisherForwarderAddress ? await createForwarderL1TxUtilsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.publisherForwarderAddress, {
+                ...config,
+                scope: 'sequencer'
+            }, {
+                telemetry,
+                logger: log.createChild('l1-tx-utils'),
+                dateProvider
+            }) : await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
+                ...config,
+                scope: 'sequencer'
+            }, {
+                telemetry,
+                logger: log.createChild('l1-tx-utils'),
+                dateProvider
             });
+            // Create and start the sequencer client
             sequencer = await SequencerClient.new(config, {
-                // if deps were provided, they should override the defaults,
-                // or things that we created in this function
                 ...deps,
                 epochCache,
                 l1TxUtils,
@@ -271,6 +308,8 @@ import { NodeMetrics } from './node_metrics.js';
         if (!options.dontStartSequencer && sequencer) {
             await sequencer.start();
             log.verbose(`Sequencer started`);
+        } else if (sequencer) {
+            log.warn(`Sequencer created but not started`);
         }
         return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, new GlobalVariableBuilder(config), epochCache, packageVersion, proofVerifier, telemetry, log);
     }
@@ -298,6 +337,9 @@ import { NodeMetrics } from './node_metrics.js';
     getEncodedEnr() {
         return Promise.resolve(this.p2pClient.getEnr()?.encodeTxt());
     }
+    async getAllowedPublicSetup() {
+        return this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
+    }
     /**
    * Method to determine if the node is ready to accept transactions.
    * @returns - Flag indicating the readiness for tx submission.
@@ -328,7 +370,24 @@ import { NodeMetrics } from './node_metrics.js';
    * @param number - The block number being requested.
    * @returns The requested block.
    */ async getBlock(number) {
-        return await this.blockSource.getBlock(number);
+        const blockNumber = number === 'latest' ? await this.getBlockNumber() : number;
+        return await this.blockSource.getBlock(blockNumber);
+    }
+    /**
+   * Get a block specified by its hash.
+   * @param blockHash - The block hash being requested.
+   * @returns The requested block.
+   */ async getBlockByHash(blockHash) {
+        const publishedBlock = await this.blockSource.getPublishedBlockByHash(blockHash);
+        return publishedBlock?.block;
+    }
+    /**
+   * Get a block specified by its archive root.
+   * @param archive - The archive root being requested.
+   * @returns The requested block.
+   */ async getBlockByArchive(archive) {
+        const publishedBlock = await this.blockSource.getPublishedBlockByArchive(archive);
+        return publishedBlock?.block;
     }
     /**
    * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
@@ -347,6 +406,15 @@ import { NodeMetrics } from './node_metrics.js';
    */ async getCurrentBaseFees() {
         return await this.globalVariableBuilder.getCurrentBaseFees();
     }
+    async getMaxPriorityFees() {
+        for await (const tx of this.p2pClient.iteratePendingTxs()){
+            return tx.getGasSettings().maxPriorityFeesPerGas;
+        }
+        return GasFees.from({
+            feePerDaGas: 0n,
+            feePerL2Gas: 0n
+        });
+    }
     /**
    * Method to fetch the latest block number synchronized by the node.
    * @returns The block number.
@@ -381,14 +449,6 @@ import { NodeMetrics } from './node_metrics.js';
         return this.contractDataSource.getContract(address);
     }
     /**
-   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-   * @param from - The block number from which to begin retrieving logs.
-   * @param limit - The maximum number of blocks to retrieve logs from.
-   * @returns An array of private logs from the specified range of blocks.
-   */ getPrivateLogs(from, limit) {
-        return this.logsSource.getPrivateLogs(from, limit);
-    }
-    /**
    * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
    * @param tags - The tags to filter the logs by.
    * @param logsPerTag - The maximum number of logs to return for each tag. By default no limit is set
@@ -415,7 +475,7 @@ import { NodeMetrics } from './node_metrics.js';
    * Method to submit a transaction to the p2p pool.
    * @param tx - The transaction to be submitted.
    */ async sendTx(tx) {
-        await this.txQueue.put(()=>this.#sendTx(tx));
+        await this.#sendTx(tx);
     }
     async #sendTx(tx) {
         const timer = new Timer();
@@ -456,7 +516,6 @@ import { NodeMetrics } from './node_metrics.js';
    * Method to stop the aztec node.
    */ async stop() {
         this.log.info(`Stopping Aztec Node`);
-        await this.txQueue.end();
         await tryStop(this.validatorsSentinel);
         await tryStop(this.epochPruneWatcher);
         await tryStop(this.slasherClient);
@@ -520,7 +579,7 @@ import { NodeMetrics } from './node_metrics.js';
         // Now we obtain the block hashes from the archive tree by calling await `committedDb.getLeafValue(treeId, index)`
         // (note that block number corresponds to the leaf index in the archive tree).
         const blockHashes = await Promise.all(uniqueBlockNumbers.map((blockNumber)=>{
-            return committedDb.getLeafValue(MerkleTreeId.ARCHIVE, blockNumber);
+            return committedDb.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
         }));
         // If any of the block hashes are undefined, we throw an error.
         for(let i = 0; i < uniqueBlockNumbers.length; i++){
@@ -528,7 +587,7 @@ import { NodeMetrics } from './node_metrics.js';
                 throw new Error(`Block hash is undefined for block number ${uniqueBlockNumbers[i]}`);
             }
         }
-        // Create InBlock objects by combining indices, blockNumbers and blockHashes and return them.
+        // Create DataInBlock objects by combining indices, blockNumbers and blockHashes and return them.
         return maybeIndices.map((index, i)=>{
             if (index === undefined) {
                 return undefined;
@@ -543,7 +602,7 @@ import { NodeMetrics } from './node_metrics.js';
                 return undefined;
             }
             return {
-                l2BlockNumber: Number(blockNumber),
+                l2BlockNumber: BlockNumber(Number(blockNumber)),
                 l2BlockHash: L2BlockHash.fromField(blockHash),
                 data: index
             };
@@ -600,12 +659,17 @@ import { NodeMetrics } from './node_metrics.js';
             witness.path
         ];
     }
+    async getL1ToL2MessageBlock(l1ToL2Message) {
+        const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
+        return messageIndex ? BlockNumber.fromCheckpointNumber(InboxLeaf.checkpointNumberFromIndex(messageIndex)) : undefined;
+    }
     /**
    * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
    * @param l1ToL2Message - The L1 to L2 message to check.
    * @returns Whether the message is synced and ready to be included in a block.
    */ async isL1ToL2MessageSynced(l1ToL2Message) {
-        return await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message) !== undefined;
+        const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
+        return messageIndex !== undefined;
     }
     /**
    * Returns all the L2 to L1 messages in a block.
@@ -715,7 +779,21 @@ import { NodeMetrics } from './node_metrics.js';
    * Returns the currently committed block header, or the initial header if no blocks have been produced.
    * @returns The current committed block header.
    */ async getBlockHeader(blockNumber = 'latest') {
-        return blockNumber === 0 || blockNumber === 'latest' && await this.blockSource.getBlockNumber() === 0 ? this.worldStateSynchronizer.getCommitted().getInitialHeader() : this.blockSource.getBlockHeader(blockNumber);
+        return blockNumber === BlockNumber.ZERO || blockNumber === 'latest' && await this.blockSource.getBlockNumber() === BlockNumber.ZERO ? this.worldStateSynchronizer.getCommitted().getInitialHeader() : this.blockSource.getBlockHeader(blockNumber === 'latest' ? blockNumber : blockNumber);
+    }
+    /**
+   * Get a block header specified by its hash.
+   * @param blockHash - The block hash being requested.
+   * @returns The requested block header.
+   */ async getBlockHeaderByHash(blockHash) {
+        return await this.blockSource.getBlockHeaderByHash(blockHash);
+    }
+    /**
+   * Get a block header specified by its archive root.
+   * @param archive - The archive root being requested.
+   * @returns The requested block header.
+   */ async getBlockHeaderByArchive(archive) {
+        return await this.blockSource.getBlockHeaderByArchive(archive);
     }
     /**
    * Simulates the public part of a transaction with the current state.
@@ -729,7 +807,7 @@ import { NodeMetrics } from './node_metrics.js';
             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 = await this.blockSource.getBlockNumber() + 1;
+        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
         // If sequencer is not initialized, we just set these values to zero for simulation.
         const coinbase = EthAddress.ZERO;
         const feeRecipient = AztecAddress.ZERO;
@@ -742,7 +820,17 @@ import { NodeMetrics } from './node_metrics.js';
         });
         const merkleTreeFork = await this.worldStateSynchronizer.fork();
         try {
-            const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, skipFeeEnforcement, /*clientInitiatedSimulation*/ true);
+            const config = PublicSimulatorConfig.from({
+                skipFeeEnforcement,
+                collectDebugLogs: true,
+                collectHints: false,
+                collectCallMetadata: true,
+                collectStatistics: false,
+                collectionLimits: CollectionLimitsConfig.from({
+                    maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads
+                })
+            });
+            const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
             // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
             const [processedTxs, failedTxs, _usedTxs, returns] = await processor.process([
                 tx
@@ -765,7 +853,7 @@ import { NodeMetrics } from './node_metrics.js';
         const verifier = isSimulation ? undefined : this.proofVerifier;
         // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
         const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const blockNumber = await this.blockSource.getBlockNumber() + 1;
+        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
         const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
             timestamp: nextSlotTimestamp,
             blockNumber,
@@ -788,11 +876,14 @@ import { NodeMetrics } from './node_metrics.js';
             ...this.config,
             ...config
         };
-        this.sequencer?.updateSequencerConfig(config);
+        this.sequencer?.updateConfig(config);
         this.slasherClient?.updateConfig(config);
         this.validatorsSentinel?.updateConfig(config);
-        // this.blockBuilder.updateConfig(config); // TODO: Spyros has a PR to add the builder to `this`, so we can do this
         await this.p2pClient.updateP2PConfig(config);
+        const archiver = this.blockSource;
+        if ('updateConfig' in archiver) {
+            archiver.updateConfig(config);
+        }
         if (newConfig.realProofs !== this.config.realProofs) {
             this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
         }
@@ -823,26 +914,33 @@ import { NodeMetrics } from './node_metrics.js';
         // We break support for archiver running remotely to the node
         const archiver = this.blockSource;
         if (!('backupTo' in archiver)) {
+            this.metrics.recordSnapshotError();
             throw new Error('Archiver implementation does not support backups. Cannot generate snapshot.');
         }
         // Test that the archiver has done an initial sync.
         if (!archiver.isInitialSyncComplete()) {
+            this.metrics.recordSnapshotError();
             throw new Error(`Archiver initial sync not complete. Cannot start snapshot.`);
         }
         // And it has an L2 block hash
         const l2BlockHash = await archiver.getL2Tips().then((tips)=>tips.latest.hash);
         if (!l2BlockHash) {
+            this.metrics.recordSnapshotError();
             throw new Error(`Archiver has no latest L2 block hash downloaded. Cannot start snapshot.`);
         }
         if (this.isUploadingSnapshot) {
+            this.metrics.recordSnapshotError();
             throw new Error(`Snapshot upload already in progress. Cannot start another one until complete.`);
         }
         // Do not wait for the upload to be complete to return to the caller, but flag that an operation is in progress
         this.isUploadingSnapshot = true;
+        const timer = new Timer();
         void uploadSnapshot(location, this.blockSource, this.worldStateSynchronizer, this.config, this.log).then(()=>{
             this.isUploadingSnapshot = false;
+            this.metrics.recordSnapshot(timer.ms());
         }).catch((err)=>{
             this.isUploadingSnapshot = false;
+            this.metrics.recordSnapshotError();
             this.log.error(`Error uploading snapshot: ${err}`);
         });
         return Promise.resolve();
@@ -915,7 +1013,7 @@ import { NodeMetrics } from './node_metrics.js';
         if (typeof blockNumber === 'number' && blockNumber < INITIAL_L2_BLOCK_NUM - 1) {
             throw new Error('Invalid block number to get world state for: ' + blockNumber);
         }
-        let blockSyncedTo = 0;
+        let blockSyncedTo = BlockNumber.ZERO;
         try {
             // Attempt to sync the world state if necessary
             blockSyncedTo = await this.#syncWorldState();
@@ -938,7 +1036,7 @@ import { NodeMetrics } from './node_metrics.js';
    * @returns A promise that fulfils once the world state is synced
    */ async #syncWorldState() {
         const blockSourceHeight = await this.blockSource.getBlockNumber();
-        return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
+        return await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
     }
 }
 _ts_decorate([

package/dest/bin/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env -S node --no-warnings
 export {};
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/index.d.ts

@@ -1,3 +1,3 @@
 export * from './aztec-node/config.js';
 export * from './aztec-node/server.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsd0JBQXdCLENBQUMifQ==

package/dest/sentinel/config.d.ts

@@ -1,7 +1,8 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 export type SentinelConfig = {
     sentinelHistoryLengthInEpochs: number;
+    sentinelHistoricProvenPerformanceLengthInEpochs: number;
     sentinelEnabled: boolean;
 };
 export declare const sentinelConfigMappings: ConfigMappingsType<SentinelConfig>;
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VudGluZWwvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUEyQyxNQUFNLDBCQUEwQixDQUFDO0FBRTVHLE1BQU0sTUFBTSxjQUFjLEdBQUc7SUFDM0IsNkJBQTZCLEVBQUUsTUFBTSxDQUFDO0lBQ3RDLCtDQUErQyxFQUFFLE1BQU0sQ0FBQztJQUN4RCxlQUFlLEVBQUUsT0FBTyxDQUFDO0NBQzFCLENBQUM7QUFFRixlQUFPLE1BQU0sc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxDQTRCckUsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/sentinel/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2C,MAAM,0BAA0B,CAAC;AAE5G,MAAM,MAAM,cAAc,GAAG;IAC3B,6BAA6B,EAAE,MAAM,CAAC;IACtC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAWrE,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/sentinel/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2C,MAAM,0BAA0B,CAAC;AAE5G,MAAM,MAAM,cAAc,GAAG;IAC3B,6BAA6B,EAAE,MAAM,CAAC;IACtC,+CAA+C,EAAE,MAAM,CAAC;IACxD,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CA4BrE,CAAC"}

package/dest/sentinel/config.js

@@ -5,6 +5,22 @@ export const sentinelConfigMappings = {
         env: 'SENTINEL_HISTORY_LENGTH_IN_EPOCHS',
         ...numberConfigHelper(24)
     },
+    /**
+   * The number of L2 epochs kept of proven performance history for each validator.
+   * This value must be large enough so that we have proven performance for every validator
+   * for at least slashInactivityConsecutiveEpochThreshold. Assuming this value is 3,
+   * and the committee size is 48, and we have 10k validators, then we pick 48 out of 10k each draw.
+   * For any fixed element, per-draw prob = 48/10000 = 0.0048.
+   * After n draws, count ~ Binomial(n, 0.0048). We want P(X >= 3).
+   * Results (exact binomial):
+   * - 90% chance: n = 1108
+   * - 95% chance: n = 1310
+   * - 99% chance: n = 1749
+   */ sentinelHistoricProvenPerformanceLengthInEpochs: {
+        description: 'The number of L2 epochs kept of proven performance history for each validator.',
+        env: 'SENTINEL_HISTORIC_PROVEN_PERFORMANCE_LENGTH_IN_EPOCHS',
+        ...numberConfigHelper(2000)
+    },
     sentinelEnabled: {
         description: 'Whether the sentinel is enabled or not.',
         env: 'SENTINEL_ENABLED',

package/dest/sentinel/factory.d.ts

@@ -6,4 +6,4 @@ import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import type { SentinelConfig } from './config.js';
 import { Sentinel } from './sentinel.js';
 export declare function createSentinel(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, config: SentinelConfig & DataStoreConfig & SlasherConfig, logger?: import("@aztec/foundation/log").Logger): Promise<Sentinel | undefined>;
-//# sourceMappingURL=factory.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQWlCL0IifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/sentinel/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,aAAa,EACxD,MAAM,yCAAgC,GACrC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAa/B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/sentinel/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,aAAa,EACxD,MAAM,yCAAgC,GACrC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAiB/B"}

package/dest/sentinel/factory.js

@@ -8,8 +8,10 @@ export async function createSentinel(epochCache, archiver, p2p, config, logger =
     }
     const kvStore = await createStore('sentinel', SentinelStore.SCHEMA_VERSION, config, createLogger('node:sentinel:lmdb'));
     const storeHistoryLength = config.sentinelHistoryLengthInEpochs * epochCache.getL1Constants().epochDuration;
+    const storeHistoricProvenPerformanceLength = config.sentinelHistoricProvenPerformanceLengthInEpochs;
     const sentinelStore = new SentinelStore(kvStore, {
-        historyLength: storeHistoryLength
+        historyLength: storeHistoryLength,
+        historicProvenPerformanceLength: storeHistoricProvenPerformanceLength
     });
     return new Sentinel(epochCache, archiver, p2p, sentinelStore, config, logger);
 }

package/dest/sentinel/index.d.ts

@@ -1,3 +1,3 @@
 export { Sentinel } from './sentinel.js';
 export type { ValidatorsStats, ValidatorStats, ValidatorStatusHistory, ValidatorStatusInSlot, } from '@aztec/stdlib/validators';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXpDLFlBQVksRUFDVixlQUFlLEVBQ2YsY0FBYyxFQUNkLHNCQUFzQixFQUN0QixxQkFBcUIsR0FDdEIsTUFBTSwwQkFBMEIsQ0FBQyJ9