@aztec/aztec-node 0.0.1-commit.8c0b8ff → 0.0.1-commit.8cb2d04d8

package/dest/aztec-node/server.js

@@ -372,7 +372,8 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
 }
 var _dec, _initProto;
 import { createArchiver } from '@aztec/archiver';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
+import { BBCircuitVerifier, BatchChonkVerifier, QueuedIVCVerifier } from '@aztec/bb-prover';
+import { TestCircuitVerifier } from '@aztec/bb-prover/test';
 import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { Blob } from '@aztec/blob-lib';
 import { EpochCache } from '@aztec/epoch-cache';
@@ -396,7 +397,7 @@ import { createP2PClient, createTxValidatorForAcceptingTxsOverRPC, getDefaultAll
 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 { FeeProviderImpl, GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
@@ -439,9 +440,11 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     l1ChainId;
     version;
     globalVariableBuilder;
+    feeProvider;
     epochCache;
     packageVersion;
-    proofVerifier;
+    peerProofVerifier;
+    rpcProofVerifier;
     telemetry;
     log;
     blobClient;
@@ -462,7 +465,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     // Prevent two snapshot operations to happen simultaneously
     isUploadingSnapshot;
     tracer;
-    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()){
+    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, feeProvider, epochCache, packageVersion, peerProofVerifier, rpcProofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient, validatorClient, keyStoreManager, debugLogStore = new NullDebugLogStore()){
         this.config = config;
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
@@ -478,9 +481,11 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.l1ChainId = l1ChainId;
         this.version = version;
         this.globalVariableBuilder = globalVariableBuilder;
+        this.feeProvider = feeProvider;
         this.epochCache = epochCache;
         this.packageVersion = packageVersion;
-        this.proofVerifier = proofVerifier;
+        this.peerProofVerifier = peerProofVerifier;
+        this.rpcProofVerifier = rpcProofVerifier;
         this.telemetry = telemetry;
         this.log = log;
         this.blobClient = blobClient;
@@ -500,6 +505,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             throw new Error('debugLogStore should never be enabled when realProofs are set');
         }
     }
+    /** @internal Exposed for testing — returns the RPC proof verifier. */ getProofVerifier() {
+        return this.rpcProofVerifier;
+    }
     async getWorldStateSyncStatus() {
         const status = await this.worldStateSynchronizer.status();
         return status.syncSummary;
@@ -597,8 +605,18 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             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 || config.debugForceTxProofVerification ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+        const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.genesis, telemetry);
+        const useRealVerifiers = config.realProofs || config.debugForceTxProofVerification;
+        let peerProofVerifier;
+        let rpcProofVerifier;
+        if (useRealVerifiers) {
+            peerProofVerifier = await BatchChonkVerifier.new(config, config.bbChonkVerifyMaxBatch, 'peer');
+            const rpcVerifier = await BBCircuitVerifier.new(config);
+            rpcProofVerifier = new QueuedIVCVerifier(rpcVerifier, config.numConcurrentIVCVerifiers);
+        } else {
+            peerProofVerifier = new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+            rpcProofVerifier = new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+        }
         let debugLogStore;
         if (!config.realProofs) {
             log.warn(`Aztec node is accepting fake proofs`);
@@ -607,13 +625,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         } else {
             debugLogStore = new NullDebugLogStore();
         }
-        const proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
         const proverOnly = config.enableProverNode && config.disableValidator;
         if (proverOnly) {
             log.info('Starting in prover-only mode: skipping validator, sequencer, sentinel, and slasher subsystems');
         }
         // create the tx pool and the p2p client, which will need the l2 block source
-        const p2pClient = await createP2PClient(config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
+        const p2pClient = await createP2PClient(config, archiver, peerProofVerifier, worldStateSynchronizer, epochCache, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
         // We'll accumulate sentinel watchers here
         const watchers = [];
         // Create FullNodeCheckpointsBuilder for block proposal handling and tx validation.
@@ -646,6 +663,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             // like attestations or auths will fail.
             if (validatorClient) {
                 watchers.push(validatorClient);
+                const vc = validatorClient;
+                const getValidatorAddresses = ()=>vc.getValidatorAddresses().map((a)=>a.toString());
+                validatorClient.getProposalHandler().register(p2pClient, true, archiver, getValidatorAddresses);
                 if (!options.dontStartSequencer) {
                     await validatorClient.registerHandlers();
                 }
@@ -654,7 +674,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         // If there's no validator client, create a ProposalHandler to handle block and checkpoint proposals
         // for monitoring or reexecution. Reexecution (default) allows us to follow the pending chain,
         // while non-reexecution is used for validating the proposals and collecting their txs.
-        // Checkpoint proposals are handled if the blob client can upload blobs.
+        // Checkpoint proposals rebuild blobs if the blob client can upload blobs.
         if (!validatorClient) {
             const reexecute = !!config.alwaysReexecuteBlockProposals;
             log.info(`Setting up proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
@@ -668,7 +688,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 blobClient,
                 dateProvider,
                 telemetry
-            }).register(p2pClient, reexecute);
+            }).register(p2pClient, reexecute, archiver);
         }
         // Start world state and wait for it to sync to the archiver.
         await worldStateSynchronizer.start();
@@ -694,19 +714,20 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         }
         // 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));
-        const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, {
+        const globalVariableBuilderConfig = {
             l1Contracts: config.l1Contracts,
             ethereumSlotDuration: config.ethereumSlotDuration,
             rollupVersion: BigInt(config.rollupVersion),
             l1GenesisTime,
             slotDuration: Number(slotDuration)
-        });
+        };
+        const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, globalVariableBuilderConfig);
+        const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig);
         // Validator enabled, create/start relevant service
         let sequencer;
         let slasherClient;
@@ -733,6 +754,22 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 dateProvider,
                 kzg: Blob.getViemKzgInstance()
             });
+            // Create a funder L1TxUtils from the keystore funding account (if configured)
+            const fundingSigner = keyStoreManager?.createFundingSigner();
+            let funderL1TxUtils;
+            if (fundingSigner) {
+                const [funder] = await createL1TxUtilsFromSigners(publicClient, [
+                    fundingSigner
+                ], {
+                    ...config,
+                    scope: 'sequencer'
+                }, {
+                    telemetry,
+                    logger: log.createChild('l1-tx-utils:funder'),
+                    dateProvider
+                });
+                funderL1TxUtils = funder;
+            }
             // Create and start the sequencer client
             const checkpointsBuilder = new CheckpointsBuilder({
                 ...config,
@@ -744,6 +781,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 ...deps,
                 epochCache,
                 l1TxUtils,
+                funderL1TxUtils,
                 validatorClient,
                 p2pClient,
                 worldStateSynchronizer,
@@ -785,7 +823,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 log.info(`Prover node subsystem created but not started`);
             }
         }
-        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);
+        const node = new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, feeProvider, epochCache, packageVersion, peerProofVerifier, rpcProofVerifier, telemetry, log, blobClient, validatorClient, keyStoreManager, debugLogStore);
         return node;
     }
     /**
@@ -900,11 +938,11 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     getCheckpointsDataForEpoch(epochNumber) {
         return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
     }
-    /**
-   * Method to fetch the current min L2 fees.
-   * @returns The current min L2 fees.
-   */ async getCurrentMinFees() {
-        return await this.globalVariableBuilder.getCurrentMinFees();
+    async getCurrentMinFees() {
+        return await this.feeProvider.getCurrentMinFees();
+    }
+    /** Returns predicted min fees for the current slot and next N slots. */ async getPredictedMinFees(manaUsage) {
+        return await this.feeProvider.getPredictedMinFees(manaUsage);
     }
     async getMaxPriorityFees() {
         for await (const tx of this.p2pClient.iteratePendingTxs()){
@@ -955,28 +993,36 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return this.contractDataSource.getContract(address);
     }
     async getPrivateLogsByTags(tags, page, referenceBlock) {
+        let upToBlockNumber;
         if (referenceBlock) {
             const initialBlockHash = await this.#getInitialHeaderHash();
-            if (!referenceBlock.equals(initialBlockHash)) {
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
                 const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
                 if (!header) {
                     throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
                 }
+                upToBlockNumber = header.globalVariables.blockNumber;
             }
         }
-        return this.logsSource.getPrivateLogsByTags(tags, page);
+        return this.logsSource.getPrivateLogsByTags(tags, page, upToBlockNumber);
     }
     async getPublicLogsByTagsFromContract(contractAddress, tags, page, referenceBlock) {
+        let upToBlockNumber;
         if (referenceBlock) {
             const initialBlockHash = await this.#getInitialHeaderHash();
-            if (!referenceBlock.equals(initialBlockHash)) {
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
                 const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
                 if (!header) {
                     throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
                 }
+                upToBlockNumber = header.globalVariables.blockNumber;
             }
         }
-        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page);
+        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -1049,7 +1095,10 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         await tryStop(this.validatorsSentinel);
         await tryStop(this.epochPruneWatcher);
         await tryStop(this.slasherClient);
-        await tryStop(this.proofVerifier);
+        await Promise.all([
+            tryStop(this.peerProofVerifier),
+            tryStop(this.rpcProofVerifier)
+        ]);
         await tryStop(this.sequencer);
         await tryStop(this.proverNode);
         await tryStop(this.p2pClient);
@@ -1132,32 +1181,26 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             if (blockNumber === undefined) {
                 throw new Error(`Block number not found for leaf index ${index} in tree ${MerkleTreeId[treeId]}`);
             }
-            const blockHash = blockNumberToHash.get(blockNumber);
-            if (blockHash === undefined) {
+            const l2BlockHash = blockNumberToHash.get(blockNumber);
+            if (l2BlockHash === undefined) {
                 throw new Error(`Block hash not found for block number ${blockNumber}`);
             }
             return {
                 l2BlockNumber: blockNumber,
-                l2BlockHash: new BlockHash(blockHash),
+                l2BlockHash,
                 data: index
             };
         });
     }
     async getBlockHashMembershipWitness(referenceBlock, blockHash) {
-        // Block 0 (the initial block) has an empty archive, so no membership witness can exist.
-        if (referenceBlock === BlockNumber.ZERO) {
-            return undefined;
-        }
-        if (BlockHash.isBlockHash(referenceBlock)) {
-            const initialBlockHash = await this.#getInitialHeaderHash();
-            if (referenceBlock.equals(initialBlockHash)) {
-                return undefined;
-            }
-        }
         // The Noir circuit checks the archive membership proof against `anchor_block_header.last_archive.root`,
         // which is the archive tree root BEFORE the anchor block was added (i.e. the state after block N-1).
         // So we need the world state at block N-1, not block N, to produce a sibling path matching that root.
         const referenceBlockNumber = await this.resolveBlockNumber(referenceBlock);
+        if (referenceBlockNumber === BlockNumber.ZERO) {
+            // Block 0 (the initial block) has an empty archive, so no membership witness can exist.
+            return undefined;
+        }
         const committedDb = await this.getWorldState(BlockNumber(referenceBlockNumber - 1));
         const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.ARCHIVE, [
             blockHash
@@ -1345,7 +1388,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     }
     async isValidTx(tx, { isSimulation, skipFeeEnforcement } = {}) {
         const db = this.worldStateSynchronizer.getCommitted();
-        const verifier = isSimulation ? undefined : this.proofVerifier;
+        const verifier = isSimulation ? undefined : this.rpcProofVerifier;
         // 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);
@@ -1387,7 +1430,18 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             archiver.updateConfig(config);
         }
         if (newConfig.realProofs !== this.config.realProofs) {
-            this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
+            await Promise.all([
+                tryStop(this.peerProofVerifier),
+                tryStop(this.rpcProofVerifier)
+            ]);
+            if (newConfig.realProofs) {
+                this.peerProofVerifier = await BatchChonkVerifier.new(newConfig, newConfig.bbChonkVerifyMaxBatch, 'peer');
+                const rpcVerifier = await BBCircuitVerifier.new(newConfig);
+                this.rpcProofVerifier = new QueuedIVCVerifier(rpcVerifier, newConfig.numConcurrentIVCVerifiers);
+            } else {
+                this.peerProofVerifier = new TestCircuitVerifier();
+                this.rpcProofVerifier = new TestCircuitVerifier();
+            }
         }
         this.config = newConfig;
     }
@@ -1447,7 +1501,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         });
         return Promise.resolve();
     }
-    async rollbackTo(targetBlock, force) {
+    async rollbackTo(targetBlock, force, resumeSync = true) {
         const archiver = this.blockSource;
         if (!('rollbackTo' in archiver)) {
             throw new Error('Archiver implementation does not support rollbacks.');
@@ -1475,9 +1529,13 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             this.log.error(`Error during rollback`, err);
             throw err;
         } finally{
-            this.log.info(`Resuming world state and archiver sync.`);
-            this.worldStateSynchronizer.resumeSync();
-            archiver.resume();
+            if (resumeSync) {
+                this.log.info(`Resuming world state and archiver sync.`);
+                this.worldStateSynchronizer.resumeSync();
+                archiver.resume();
+            } else {
+                this.log.info(`Sync left paused after rollback (resumeSync=false).`);
+            }
         }
     }
     async pauseSync() {
@@ -1491,18 +1549,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.blockSource.resume();
         return Promise.resolve();
     }
-    getSlashPayloads() {
-        if (!this.slasherClient) {
-            throw new Error(`Slasher client not enabled`);
-        }
-        return this.slasherClient.getSlashPayloads();
-    }
     getSlashOffenses(round) {
         if (!this.slasherClient) {
             throw new Error(`Slasher client not enabled`);
         }
         if (round === 'all') {
-            return this.slasherClient.getPendingOffenses();
+            return this.slasherClient.getOffenses();
         } else {
             return this.slasherClient.gatherOffensesForRound(round === 'current' ? undefined : BigInt(round));
         }
@@ -1648,7 +1700,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         // Double-check world-state synced to the same block hash as was requested
         if (BlockHash.isBlockHash(block)) {
             const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
-            if (!blockHash || !new BlockHash(blockHash).equals(block)) {
+            if (!blockHash || !block.equals(blockHash)) {
                 throw new Error(`Block hash ${block.toString()} not found in world state at block number ${blockNumber}. If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
             }
         }

package/dest/sentinel/factory.d.ts

@@ -1,9 +1,9 @@
 import type { EpochCache } from '@aztec/epoch-cache';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { P2PClient } from '@aztec/p2p';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9

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,CAY/B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/sentinel/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,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;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,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,CAY/B"}

package/dest/sentinel/sentinel.js

@@ -48,7 +48,7 @@ export class Sentinel extends EventEmitter {
         this.runningPromise.start();
     }
     /** Loads initial slot and initializes blockstream. We will not process anything at or before the initial slot. */ async init() {
-        this.initialSlot = this.epochCache.getEpochAndSlotNow().slot;
+        this.initialSlot = this.epochCache.getSlotNow();
         const startingBlock = BlockNumber(await this.archiver.getBlockNumber());
         this.logger.info(`Starting validator sentinel with initial slot ${this.initialSlot} and block ${startingBlock}`);
         this.blockStream = new L2BlockStream(this.archiver, this.l2TipsStore, this, this.logger, {
@@ -157,13 +157,13 @@ export class Sentinel extends EventEmitter {
             return false;
         }
         // Check that we have at least requiredConsecutiveEpochs and that all of them are above the inactivity threshold
-        return pastEpochs.slice(0, requiredConsecutiveEpochs).every((p)=>p.missed / p.total >= this.config.slashInactivityTargetPercentage);
+        return pastEpochs.slice(0, requiredConsecutiveEpochs).every((p)=>p.total === 0 ? false : p.missed / p.total >= this.config.slashInactivityTargetPercentage);
     }
     async handleProvenPerformance(epoch, performance) {
         if (this.config.slashInactivityPenalty === 0n) {
             return;
         }
-        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
+        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>total > 0 && missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
         this.logger.debug(`Found ${inactiveValidators.length} inactive validators in epoch ${epoch}`, {
             inactiveValidators,
             epoch,
@@ -190,7 +190,7 @@ export class Sentinel extends EventEmitter {
    * Note that we do not process historical data, since we rely on p2p data for processing,
    * and we don't have that data if we were offline during the period.
    */ async work() {
-        const { slot: currentSlot } = this.epochCache.getEpochAndSlotNow();
+        const currentSlot = this.epochCache.getSlotNow();
         try {
             // Manually sync the block stream to ensure we have the latest data.
             // Note we never `start` the blockstream, so it loops at the same pace as we do.
@@ -351,7 +351,7 @@ export class Sentinel extends EventEmitter {
                 v.toString(),
                 await this.store.getHistory(v)
             ]))) : await this.store.getHistories();
-        const slotNow = this.epochCache.getEpochAndSlotNow().slot;
+        const slotNow = this.epochCache.getSlotNow();
         fromSlot ??= SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
         toSlot ??= this.lastProcessedSlot ?? slotNow;
         const stats = mapValues(histories, (history, address)=>this.computeStatsForValidator(address, history ?? [], fromSlot, toSlot));
@@ -367,7 +367,7 @@ export class Sentinel extends EventEmitter {
         if (!history || history.length === 0) {
             return undefined;
         }
-        const slotNow = this.epochCache.getEpochAndSlotNow().slot;
+        const slotNow = this.epochCache.getSlotNow();
         const effectiveFromSlot = fromSlot ?? SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
         const effectiveToSlot = toSlot ?? this.lastProcessedSlot ?? slotNow;
         const historyLength = BigInt(this.store.getHistoryLength());

package/package.json

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

package/src/aztec-node/config.ts

@@ -3,7 +3,6 @@ import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethe
 import { type L1ContractAddresses, l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
 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,
@@ -27,6 +26,7 @@ import { slasherConfigMappings } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type NodeRPCConfig, nodeRpcConfigMappings } from '@aztec/stdlib/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';