@aztec/aztec-node 5.0.0-rc.1 → 5.0.0-rc.2

package/dest/modules/node_world_state_queries.js

@@ -0,0 +1,257 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { chunkBy } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { inspectBlockParameter } from '@aztec/stdlib/block';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+import { normalizeBlockParameter } from './block_parameter.js';
+/**
+ * Serves the node's Merkle-tree and membership-witness queries against committed world-state at a
+ * requested block. Extracted from `AztecNodeService` so the block-resolution and reorg-aware sync logic
+ * can be unit-tested without standing up the whole node, and to keep `server.ts` smaller.
+ */ export class NodeWorldStateQueries {
+    worldStateSynchronizer;
+    blockSource;
+    l1ToL2MessageSource;
+    log;
+    constructor(deps){
+        this.worldStateSynchronizer = deps.worldStateSynchronizer;
+        this.blockSource = deps.blockSource;
+        this.l1ToL2MessageSource = deps.l1ToL2MessageSource;
+        this.log = deps.log ?? createLogger('node:world-state-queries');
+    }
+    async findLeavesIndexes(referenceBlock, treeId, leafValues) {
+        const committedDb = await this.getWorldState(referenceBlock);
+        const maybeIndices = await committedDb.findLeafIndices(treeId, leafValues.map((x)=>x.toBuffer()));
+        // Filter out undefined values to query block numbers only for found leaves
+        const definedIndices = maybeIndices.filter((x)=>x !== undefined);
+        // Now we find the block numbers for the defined indices
+        const blockNumbers = await committedDb.getBlockNumbersForLeafIndices(treeId, definedIndices);
+        // Build a map from leaf index to block number
+        const indexToBlockNumber = new Map();
+        for(let i = 0; i < definedIndices.length; i++){
+            const blockNumber = blockNumbers[i];
+            if (blockNumber === undefined) {
+                throw new Error(`Block number is undefined for leaf index ${definedIndices[i]} in tree ${MerkleTreeId[treeId]}`);
+            }
+            indexToBlockNumber.set(definedIndices[i], blockNumber);
+        }
+        // Get unique block numbers in order to optimize num calls to getLeafValue function.
+        const uniqueBlockNumbers = [
+            ...new Set(indexToBlockNumber.values())
+        ];
+        // Now we obtain the block hashes from the archive tree (block number = leaf index in archive tree).
+        const blockHashes = await Promise.all(uniqueBlockNumbers.map((blockNumber)=>{
+            return committedDb.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
+        }));
+        // Build a map from block number to block hash
+        const blockNumberToHash = new Map();
+        for(let i = 0; i < uniqueBlockNumbers.length; i++){
+            const blockHash = blockHashes[i];
+            if (blockHash === undefined) {
+                throw new Error(`Block hash is undefined for block number ${uniqueBlockNumbers[i]}`);
+            }
+            blockNumberToHash.set(uniqueBlockNumbers[i], blockHash);
+        }
+        // Create DataInBlock objects by combining indices, blockNumbers and blockHashes and return them.
+        return maybeIndices.map((index)=>{
+            if (index === undefined) {
+                return undefined;
+            }
+            const blockNumber = indexToBlockNumber.get(index);
+            if (blockNumber === undefined) {
+                throw new Error(`Block number not found for leaf index ${index} in tree ${MerkleTreeId[treeId]}`);
+            }
+            const l2BlockHash = blockNumberToHash.get(blockNumber);
+            if (l2BlockHash === undefined) {
+                throw new Error(`Block hash not found for block number ${blockNumber}`);
+            }
+            return {
+                l2BlockNumber: blockNumber,
+                l2BlockHash,
+                data: index
+            };
+        });
+    }
+    async getBlockHashMembershipWitness(referenceBlock, blockHash) {
+        // 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
+        ]);
+        return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
+    }
+    async getNoteHashMembershipWitness(referenceBlock, noteHash) {
+        const committedDb = await this.getWorldState(referenceBlock);
+        const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.NOTE_HASH_TREE, [
+            noteHash
+        ]);
+        return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
+    }
+    async getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message) {
+        const db = await this.getWorldState(referenceBlock);
+        const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
+            l1ToL2Message
+        ]);
+        if (!witness) {
+            return undefined;
+        }
+        // REFACTOR: Return a MembershipWitness object
+        return [
+            witness.index,
+            witness.path
+        ];
+    }
+    async getL1ToL2MessageCheckpoint(l1ToL2Message) {
+        const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
+        return messageIndex !== undefined ? InboxLeaf.checkpointNumberFromIndex(messageIndex) : undefined;
+    }
+    /**
+   * Returns all the L2 to L1 messages in an epoch (empty array if the epoch is not found). The public
+   * `AztecNodeService.getL2ToL1Messages` that delegates here is deprecated in favor of
+   * {@link getL2ToL1MembershipWitness}.
+   * @param epoch - The epoch at which to get the data.
+   */ async getL2ToL1Messages(epoch) {
+        const blocks = await this.blockSource.getBlocks({
+            epoch,
+            onlyCheckpointed: true
+        });
+        const blocksInCheckpoints = chunkBy(blocks, (block)=>block.header.globalVariables.slotNumber);
+        return blocksInCheckpoints.map((slotBlocks)=>slotBlocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs)));
+    }
+    /**
+   * Returns the L2-to-L1 membership witness for a message in `txHash`. Passthrough to the
+   * archiver's locally-cached resolver — see {@link Archiver.getL2ToL1MembershipWitness}.
+   */ getL2ToL1MembershipWitness(txHash, message, messageIndexInTx) {
+        return this.blockSource.getL2ToL1MembershipWitness(txHash, message, messageIndexInTx);
+    }
+    async getNullifierMembershipWitness(referenceBlock, nullifier) {
+        const db = await this.getWorldState(referenceBlock);
+        const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
+            nullifier.toBuffer()
+        ]);
+        if (!witness) {
+            return undefined;
+        }
+        const { index, path } = witness;
+        const leafPreimage = await db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
+        if (!leafPreimage) {
+            return undefined;
+        }
+        return new NullifierMembershipWitness(index, leafPreimage, path);
+    }
+    async getLowNullifierMembershipWitness(referenceBlock, nullifier) {
+        const committedDb = await this.getWorldState(referenceBlock);
+        const findResult = await committedDb.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
+        if (!findResult) {
+            return undefined;
+        }
+        const { index, alreadyPresent } = findResult;
+        if (alreadyPresent) {
+            throw new Error(`Cannot prove nullifier non-inclusion: nullifier ${nullifier.toBigInt()} already exists in the tree`);
+        }
+        const preimageData = await committedDb.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
+        const siblingPath = await committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
+        return new NullifierMembershipWitness(BigInt(index), preimageData, siblingPath);
+    }
+    async getPublicDataWitness(referenceBlock, leafSlot) {
+        const committedDb = await this.getWorldState(referenceBlock);
+        const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
+        if (!lowLeafResult) {
+            return undefined;
+        } else {
+            const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+            const path = await committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+            return new PublicDataWitness(lowLeafResult.index, preimage, path);
+        }
+    }
+    async getPublicStorageAt(referenceBlock, contract, slot) {
+        const committedDb = await this.getWorldState(referenceBlock);
+        const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
+        const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
+        if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
+            return Fr.ZERO;
+        }
+        const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        return preimage.leaf.value;
+    }
+    /**
+   * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
+   * @param block - The block parameter (block number, block hash, or 'latest') at which to get the data.
+   * @returns An instance of a committed MerkleTreeOperations
+   */ async getWorldState(block) {
+        const query = normalizeBlockParameter(block);
+        // When the request anchors on a specific block hash, resolve it against the archiver up front and
+        // drive the world-state sync to that exact block number and hash. Resolving against the archiver
+        // first fails fast with a clear reorg error if the hash is unknown, and passing the hash to the
+        // synchronizer makes the sync reorg-aware: it barriers until the archive-tree commit for that block
+        // has landed and verifies it matches the requested fork, instead of syncing to bare latest height
+        // and then racing the snapshot read below against an in-flight archive-tree write.
+        const requestedHash = 'hash' in query ? query.hash : undefined;
+        const anchorBlockNumber = requestedHash !== undefined ? await this.resolveBlockNumber(query) : undefined;
+        let blockSyncedTo = BlockNumber.ZERO;
+        try {
+            // Attempt to sync the world state if necessary
+            blockSyncedTo = await this.#syncWorldState(anchorBlockNumber, requestedHash);
+        } catch (err) {
+            this.log.error(`Error getting world state: ${err}`);
+        }
+        if ('tag' in query && query.tag === 'proposed') {
+            this.log.debug(`Using committed db for latest block, world state synced upto ${blockSyncedTo}`);
+            return this.worldStateSynchronizer.getCommitted();
+        }
+        const blockNumber = anchorBlockNumber ?? await this.resolveBlockNumber(query);
+        // Check it's within world state sync range
+        if (blockNumber > blockSyncedTo) {
+            throw new Error(`Queried block ${inspectBlockParameter(block)} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+        }
+        this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
+        const snapshot = this.worldStateSynchronizer.getSnapshot(blockNumber);
+        // Double-check world-state synced to the same block hash as was requested.
+        // Block 0 is skipped: the snapshot returned by `getSnapshot(0)` is the *pre*-genesis archive
+        // (size 0), so leaf 0 is not yet inserted from that snapshot's view even though block 0's hash
+        // does live at archive index 0 in the committed tree. The genesis hash is already validated by
+        // the archiver when it resolves the hash query to block number 0.
+        if (requestedHash !== undefined && blockNumber !== BlockNumber.ZERO) {
+            const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
+            if (!blockHash || !requestedHash.equals(blockHash)) {
+                throw new Error(`Block hash ${requestedHash.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${this.blockSource.getGenesisBlockHash().toString()}). If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
+            }
+        }
+        return snapshot;
+    }
+    /** Resolves any {@link BlockParameter} variant to a concrete block number. */ async resolveBlockNumber(block) {
+        const query = normalizeBlockParameter(block);
+        const blockNumber = await this.blockSource.getBlockNumber(query);
+        if (blockNumber === undefined) {
+            if ('hash' in query) {
+                throw new Error(`Block hash ${query.hash.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
+            }
+            if ('archive' in query) {
+                throw new Error(`Block with archive ${query.archive.toString()} not found.`);
+            }
+            throw new Error(`Block not found for ${inspectBlockParameter(block)}.`);
+        }
+        return blockNumber;
+    }
+    /**
+   * Ensure the world state is synced.
+   * @param targetBlockNumber - Block to sync up to. Defaults to the latest block known to the archiver.
+   * @param blockHash - If provided, the synchronizer verifies the block at `targetBlockNumber` matches this
+   * hash, resyncing (and so detecting reorgs) if it does not yet match or has been reorged away.
+   * @returns A promise that fulfils once the world state is synced
+   */ async #syncWorldState(targetBlockNumber, blockHash) {
+        const target = targetBlockNumber ?? await this.blockSource.getBlockNumber();
+        return await this.worldStateSynchronizer.syncImmediate(target, blockHash);
+    }
+}

package/dest/sentinel/factory.d.ts

@@ -3,9 +3,9 @@ import type { P2PClient } from '@aztec/p2p';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import type { SlasherConfig, ValidatorClientConfig } 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, reexecutionTracker: CheckpointReexecutionTracker, config: SentinelConfig & DataStoreConfig & SlasherConfig & Pick<ChainConfig, 'l1ChainId' | 'rollupAddress'>, logger?: import("@aztec/foundation/log").Logger): Promise<Sentinel | undefined>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2xELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHekMsd0JBQXNCLGNBQWMsQ0FDbEMsVUFBVSxFQUFFLFVBQVUsRUFDdEIsUUFBUSxFQUFFLGFBQWEsRUFDdkIsR0FBRyxFQUFFLFNBQVMsRUFDZCxrQkFBa0IsRUFBRSw0QkFBNEIsRUFDaEQsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxFQUMzRyxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9
+export declare function createSentinel(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, reexecutionTracker: CheckpointReexecutionTracker, config: SentinelConfig & DataStoreConfig & SlasherConfig & Pick<ChainConfig, 'l1ChainId' | 'rollupAddress'> & Pick<ValidatorClientConfig, 'disableValidator'>, logger?: import("@aztec/foundation/log").Logger): Promise<Sentinel | undefined>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLHFCQUFxQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2xELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHekMsd0JBQXNCLGNBQWMsQ0FDbEMsVUFBVSxFQUFFLFVBQVUsRUFDdEIsUUFBUSxFQUFFLGFBQWEsRUFDdkIsR0FBRyxFQUFFLFNBQVMsRUFDZCxrQkFBa0IsRUFBRSw0QkFBNEIsRUFDaEQsTUFBTSxFQUFFLGNBQWMsR0FDcEIsZUFBZSxHQUNmLGFBQWEsR0FDYixJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLHFCQUFxQixFQUFFLGtCQUFrQixDQUFDLEVBQ2pELE1BQU0seUNBQWdDLEdBQ3JDLE9BQU8sQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDLENBb0IvQiJ9

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;AAGrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,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,kBAAkB,EAAE,4BAA4B,EAChD,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,EAC3G,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,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,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,kBAAkB,EAAE,4BAA4B,EAChD,MAAM,EAAE,cAAc,GACpB,eAAe,GACf,aAAa,GACb,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,EACjD,MAAM,yCAAgC,GACrC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAoB/B"}

package/dest/sentinel/factory.js

@@ -3,9 +3,16 @@ import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { Sentinel } from './sentinel.js';
 import { SentinelStore } from './store.js';
 export async function createSentinel(epochCache, archiver, p2p, reexecutionTracker, config, logger = createLogger('node:sentinel')) {
-    if (!config.sentinelEnabled) {
+    const runsValidator = !config.disableValidator;
+    if (!runsValidator && !config.sentinelEnabled) {
+        logger.verbose('Sentinel is disabled');
         return undefined;
     }
+    if (runsValidator) {
+        logger.info('Enabling sentinel since this node runs a validator');
+    } else {
+        logger.info('Enabling sentinel from SENTINEL_ENABLED configuration');
+    }
     const kvStore = await createStore('sentinel', SentinelStore.SCHEMA_VERSION, config, logger.getBindings());
     const storeHistoryLength = config.sentinelHistoryLengthInEpochs * epochCache.getL1Constants().epochDuration;
     const storeHistoricEpochPerformanceLength = config.sentinelHistoricEpochPerformanceLengthInEpochs;

package/dest/sentinel/sentinel.d.ts

@@ -2,11 +2,10 @@ import type { EpochCache } from '@aztec/epoch-cache';
 import { CheckpointNumber, CheckpointProposalHash, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { type L2TipsStore } from '@aztec/kv-store/stores';
 import type { P2PClient } from '@aztec/p2p';
 import { type Watcher, type WatcherEmitter } from '@aztec/slasher';
 import type { SlasherConfig } from '@aztec/slasher/config';
-import { type L2BlockSource, L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/stdlib/block';
+import { type L2BlockSource } from '@aztec/stdlib/block';
 import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import type { SingleValidatorStats, ValidatorStats, ValidatorStatusHistory, ValidatorStatusInSlot, ValidatorStatusType, ValidatorsEpochPerformance, ValidatorsStats } from '@aztec/stdlib/validators';
@@ -46,7 +45,7 @@ declare const Sentinel_base: new () => WatcherEmitter;
  * first:
  *
  *  - `checkpoint-mined`        — a checkpoint covering this slot has landed on L1
- *                                (`slotNumberToCheckpoint` populated from `chain-checkpointed`).
+ *                                (fetched on demand via `archiver.getCheckpoint({ slot })`).
  *  - `checkpoint-valid`        — the local node re-executed a checkpoint proposal for this slot
  *                                successfully (consulted via `CheckpointReexecutionTracker`).
  *  - `checkpoint-invalid`      — the local node re-executed a checkpoint proposal for this slot
@@ -84,7 +83,7 @@ declare const Sentinel_base: new () => WatcherEmitter;
  * (no history entries for that slot) and per-epoch evaluation writes an empty performance map
  * (no slashing).
  */
-export declare class Sentinel extends Sentinel_base implements L2BlockStreamEventHandler, Watcher {
+export declare class Sentinel extends Sentinel_base implements Watcher {
     protected epochCache: EpochCache;
     protected archiver: L2BlockSource;
     protected p2p: P2PClient;
@@ -93,29 +92,19 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     protected config: SentinelRuntimeConfig;
     protected logger: import("@aztec/foundation/log").Logger;
     protected runningPromise: RunningPromise;
-    protected blockStream: L2BlockStream;
-    protected l2TipsStore: L2TipsStore;
     protected initialSlot: SlotNumber | undefined;
     protected lastProcessedSlot: SlotNumber | undefined;
     /** Largest epoch number for which the end-of-epoch aggregator has run. */
     protected lastEvaluatedEpoch: EpochNumber | undefined;
-    protected slotNumberToCheckpoint: Map<SlotNumber, {
-        checkpointNumber: CheckpointNumber;
-        archive: string;
-        /** Hex keccak256 of the consensus payload bytes; used to fetch matching p2p attestations. */
-        proposalPayloadHash: CheckpointProposalHash;
-        attestors: EthAddress[];
-    }>;
     constructor(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, store: SentinelStore, reexecutionTracker: CheckpointReexecutionTracker, config: SentinelRuntimeConfig, logger?: import("@aztec/foundation/log").Logger);
     private getSignatureContext;
     updateConfig(config: Partial<SlasherConfig>): void;
     start(): Promise<void>;
     /**
-     * Loads initial slot and initializes blockstream. We will not process anything at or before
-     * the initial slot. Floors at the archiver's synced L2 slot so the sentinel keeps making
-     * forward progress when L1 is advancing but L2 has no activity (the synced slot is driven by
-     * L1 sync, not by L2 blocks). Falls back to the wallclock if the archiver isn't ready yet
-     * (cold start).
+     * Loads the initial slot. We will not process anything at or before the initial slot. Floors at the
+     * archiver's synced L2 slot so the sentinel keeps making forward progress when L1 is advancing but L2 has no
+     * activity (the synced slot is driven by L1 sync, not by L2 blocks). Falls back to the wallclock if the
+     * archiver isn't ready yet (cold start).
      */
     protected init(): Promise<void>;
     /**
@@ -127,8 +116,19 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
      */
     protected getCurrentSlot(): Promise<SlotNumber>;
     stop(): Promise<void>;
-    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
-    protected handleCheckpoint(event: L2BlockStreamEvent): void;
+    /**
+     * Fetches the L1-confirmed checkpoint covering a slot (if any) and derives the slot-level data the
+     * activity classifier needs: the checkpoint number, archive root, consensus payload hash (used to fetch
+     * matching p2p attestations regardless of feeAssetPriceModifier variants), and the recovered attestor set.
+     * Reads on demand so the result is always against the canonical chain — a reorged-out checkpoint simply
+     * stops being returned, with no stale mapping to clean up.
+     */
+    protected getCheckpointForSlot(slot: SlotNumber): Promise<{
+        checkpointNumber: CheckpointNumber;
+        archive: string;
+        proposalPayloadHash: CheckpointProposalHash;
+        attestors: EthAddress[];
+    } | undefined>;
     /**
      * Called once per epoch, after the configured end-of-epoch buffer has elapsed beyond the
      * epoch's last slot. Computes per-epoch performance from the slot-level history collected
@@ -214,4 +214,4 @@ export declare class Sentinel extends Sentinel_base implements L2BlockStreamEven
     } | undefined;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudGluZWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zZW50aW5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBRUwsZ0JBQWdCLEVBQ2hCLHNCQUFzQixFQUN0QixXQUFXLEVBQ1gsVUFBVSxFQUNYLE1BQU0saUNBQWlDLENBQUM7QUFFekMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEVBQXFCLEtBQUssV0FBVyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sRUFJTCxLQUFLLE9BQU8sRUFDWixLQUFLLGNBQWMsRUFFcEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLGFBQWEsRUFDYixLQUFLLGtCQUFrQixFQUN2QixLQUFLLHlCQUF5QixFQUUvQixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sS0FBSyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxLQUFLLEVBQ1Ysb0JBQW9CLEVBQ3BCLGNBQWMsRUFDZCxzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLG1CQUFtQixFQUNuQiwwQkFBMEIsRUFDMUIsZUFBZSxFQUNoQixNQUFNLDBCQUEwQixDQUFDO0FBSWxDLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudGluZWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zZW50aW5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXBILE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sRUFJTCxLQUFLLE9BQU8sRUFDWixLQUFLLGNBQWMsRUFFcEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQTZDLE1BQU0scUJBQXFCLENBQUM7QUFDcEcsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd4RCxPQUFPLEtBQUssRUFDVixvQkFBb0IsRUFDcEIsY0FBYyxFQUNkLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsbUJBQW1CLEVBQ25CLDBCQUEwQixFQUMxQixlQUFlLEVBQ2hCLE1BQU0sMEJBQTBCLENBQUM7QUFJbEMsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2xELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFM0MsTUFBTSxNQUFNLHFCQUFxQixHQUFHLElBQUksQ0FDdEMsYUFBYSxFQUNiLGlDQUFp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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

@@ -1,11 +1,10 @@
-import { BlockNumber, CheckpointProposalHash, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { CheckpointProposalHash, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { L2TipsMemoryStore } from '@aztec/kv-store/stores';
 import { OffenseType, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec/slasher';
-import { L2BlockStream, getAttestationInfoFromPublishedCheckpoint } from '@aztec/stdlib/block';
+import { getAttestationInfoFromPublishedCheckpoint } from '@aztec/stdlib/block';
 import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { ConsensusPayload } from '@aztec/stdlib/p2p';
 import EventEmitter from 'node:events';
@@ -50,7 +49,7 @@ import EventEmitter from 'node:events';
  * first:
  *
  *  - `checkpoint-mined`        — a checkpoint covering this slot has landed on L1
- *                                (`slotNumberToCheckpoint` populated from `chain-checkpointed`).
+ *                                (fetched on demand via `archiver.getCheckpoint({ slot })`).
  *  - `checkpoint-valid`        — the local node re-executed a checkpoint proposal for this slot
  *                                successfully (consulted via `CheckpointReexecutionTracker`).
  *  - `checkpoint-invalid`      — the local node re-executed a checkpoint proposal for this slot
@@ -96,15 +95,11 @@ import EventEmitter from 'node:events';
     config;
     logger;
     runningPromise;
-    blockStream;
-    l2TipsStore;
     initialSlot;
     lastProcessedSlot;
     /** Largest epoch number for which the end-of-epoch aggregator has run. */ lastEvaluatedEpoch;
-    slotNumberToCheckpoint;
     constructor(epochCache, archiver, p2p, store, reexecutionTracker, config, logger = createLogger('node:sentinel')){
-        super(), this.epochCache = epochCache, this.archiver = archiver, this.p2p = p2p, this.store = store, this.reexecutionTracker = reexecutionTracker, this.config = config, this.logger = logger, this.slotNumberToCheckpoint = new Map();
-        this.l2TipsStore = new L2TipsMemoryStore(archiver.getGenesisBlockHash());
+        super(), this.epochCache = epochCache, this.archiver = archiver, this.p2p = p2p, this.store = store, this.reexecutionTracker = reexecutionTracker, this.config = config, this.logger = logger;
         const interval = epochCache.getL1Constants().ethereumSlotDuration * 1000 / 4;
         this.runningPromise = new RunningPromise(this.work.bind(this), logger, interval);
     }
@@ -125,18 +120,13 @@ import EventEmitter from 'node:events';
         this.runningPromise.start();
     }
     /**
-   * Loads initial slot and initializes blockstream. We will not process anything at or before
-   * the initial slot. Floors at the archiver's synced L2 slot so the sentinel keeps making
-   * forward progress when L1 is advancing but L2 has no activity (the synced slot is driven by
-   * L1 sync, not by L2 blocks). Falls back to the wallclock if the archiver isn't ready yet
-   * (cold start).
+   * Loads the initial slot. We will not process anything at or before the initial slot. Floors at the
+   * archiver's synced L2 slot so the sentinel keeps making forward progress when L1 is advancing but L2 has no
+   * activity (the synced slot is driven by L1 sync, not by L2 blocks). Falls back to the wallclock if the
+   * archiver isn't ready yet (cold start).
    */ async init() {
         this.initialSlot = await this.getCurrentSlot();
-        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, {
-            startingBlock
-        });
+        this.logger.info(`Starting validator sentinel with initial slot ${this.initialSlot}`);
     }
     /**
    * Returns the L2 slot the sentinel should treat as "current": the archiver's last fully
@@ -150,35 +140,27 @@ import EventEmitter from 'node:events';
     stop() {
         return this.runningPromise.stop();
     }
-    async handleBlockStreamEvent(event) {
-        await this.l2TipsStore.handleBlockStreamEvent(event);
-        if (event.type === 'chain-checkpointed') {
-            this.handleCheckpoint(event);
-        }
-    }
-    handleCheckpoint(event) {
-        if (event.type !== 'chain-checkpointed') {
-            return;
+    /**
+   * Fetches the L1-confirmed checkpoint covering a slot (if any) and derives the slot-level data the
+   * activity classifier needs: the checkpoint number, archive root, consensus payload hash (used to fetch
+   * matching p2p attestations regardless of feeAssetPriceModifier variants), and the recovered attestor set.
+   * Reads on demand so the result is always against the canonical chain — a reorged-out checkpoint simply
+   * stops being returned, with no stale mapping to clean up.
+   */ async getCheckpointForSlot(slot) {
+        const checkpoint = await this.archiver.getCheckpoint({
+            slot
+        });
+        if (!checkpoint) {
+            return undefined;
         }
-        const checkpoint = event.checkpoint;
-        // Store mapping from slot to archive, checkpoint number, attestors, and the consensus payload
-        // hash (used to query matching p2p attestations regardless of feeAssetPriceModifier variants).
         const signatureContext = this.getSignatureContext();
         const proposalPayloadHash = CheckpointProposalHash.fromBuffer(ConsensusPayload.fromCheckpoint(checkpoint.checkpoint, signatureContext).getPayloadHash());
-        this.slotNumberToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, {
+        return {
             checkpointNumber: checkpoint.checkpoint.number,
             archive: checkpoint.checkpoint.archive.root.toString(),
             proposalPayloadHash,
             attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint, signatureContext).filter((a)=>a.status === 'recovered-from-signature').map((a)=>a.address)
-        });
-        // Prune the archive map to only keep at most N entries
-        const historyLength = this.store.getHistoryLength();
-        if (this.slotNumberToCheckpoint.size > historyLength) {
-            const toDelete = Array.from(this.slotNumberToCheckpoint.keys()).sort((a, b)=>Number(a - b)).slice(0, this.slotNumberToCheckpoint.size - historyLength);
-            for (const key of toDelete){
-                this.slotNumberToCheckpoint.delete(key);
-            }
-        }
+        };
     }
     /**
    * Called once per epoch, after the configured end-of-epoch buffer has elapsed beyond the
@@ -284,9 +266,6 @@ import EventEmitter from 'node:events';
    */ async work() {
         const currentSlot = await this.getCurrentSlot();
         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.
-            await this.blockStream.sync();
             // Per-slot activity recording (lag = 2 slots for P2P attestation settlement).
             const targetSlot = await this.isReadyToProcess(currentSlot);
             if (targetSlot !== false) {
@@ -363,7 +342,7 @@ import EventEmitter from 'node:events';
             });
             return false;
         }
-        const archiverLastBlockHash = await this.l2TipsStore.getL2Tips().then((tip)=>tip.proposed.hash);
+        const archiverLastBlockHash = await this.archiver.getL2Tips().then((tip)=>tip.proposed.hash);
         const p2pLastBlockHash = await this.p2p.getL2Tips().then((tips)=>tips.proposed.hash);
         const isP2pSynced = archiverLastBlockHash === p2pLastBlockHash;
         if (!isP2pSynced) {
@@ -421,8 +400,9 @@ import EventEmitter from 'node:events';
             committee
         });
         // Gather attestors from both p2p (live attestations) and the archiver (signers on the
-        // checkpoint if one has landed on L1). Used regardless of which case applies.
-        const checkpoint = this.slotNumberToCheckpoint.get(slot);
+        // checkpoint if one has landed on L1). Fetched on demand so it always reflects the canonical chain.
+        // Used regardless of which case applies.
+        const checkpoint = await this.getCheckpointForSlot(slot);
         const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, checkpoint?.proposalPayloadHash);
         const p2pAttestors = p2pAttested.map((a)=>a.getSender()).filter((s)=>s !== undefined);
         const attestors = new Set([