@aztec/aztec-node 0.0.1-commit.ffe5b04ea → 0.0.1-commit.fff30aa

package/dest/aztec-node/server.js

@@ -377,14 +377,15 @@ import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { Blob } from '@aztec/blob-lib';
 import { EpochCache } from '@aztec/epoch-cache';
 import { createEthereumChain } from '@aztec/ethereum/chain';
-import { getPublicClient } from '@aztec/ethereum/client';
+import { getPublicClient, makeL1HttpTransport } from '@aztec/ethereum/client';
 import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { compactArray, pick, unique } from '@aztec/foundation/collection';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { chunkBy, compactArray, pick, unique } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
 import { count } from '@aztec/foundation/string';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
 import { MembershipWitness } from '@aztec/foundation/trees';
@@ -411,9 +412,9 @@ import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@az
 import { PublicSimulationOutput, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient } from '@aztec/validator-client';
+import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createProposalHandler, createValidatorClient } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
 import { createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
@@ -559,9 +560,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         }
         const publicClient = createPublicClient({
             chain: ethereumChain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
-                    batch: false
-                }))),
+            transport: makeL1HttpTransport(config.l1RpcUrls, {
+                timeout: config.l1HttpTimeoutMS
+            }),
             pollingInterval: config.viemPollingIntervalMS
         });
         const l1ContractsAddresses = await RegistryContract.collectAddresses(publicClient, config.l1Contracts.registryAddress, config.rollupVersion ?? 'canonical');
@@ -637,7 +638,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 blockSource: archiver,
                 l1ToL2MessageSource: archiver,
                 keyStoreManager,
-                blobClient
+                blobClient,
+                slashingProtectionDb: deps.slashingProtectionDb
             });
             // 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
@@ -649,19 +651,21 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 }
             }
         }
-        // If there's no validator client, create a BlockProposalHandler to handle block proposals
+        // 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.
         if (!validatorClient) {
             const reexecute = !!config.alwaysReexecuteBlockProposals;
-            log.info(`Setting up block proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
-            createBlockProposalHandler(config, {
+            log.info(`Setting up proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
+            createProposalHandler(config, {
                 checkpointsBuilder: validatorCheckpointsBuilder,
                 worldState: worldStateSynchronizer,
                 epochCache,
                 blockSource: archiver,
                 l1ToL2MessageSource: archiver,
                 p2pClient,
+                blobClient,
                 dateProvider,
                 telemetry
             }).register(p2pClient, reexecute);
@@ -696,6 +700,13 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             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, {
+            l1Contracts: config.l1Contracts,
+            ethereumSlotDuration: config.ethereumSlotDuration,
+            rollupVersion: BigInt(config.rollupVersion),
+            l1GenesisTime,
+            slotDuration: Number(slotDuration)
+        });
         // Validator enabled, create/start relevant service
         let sequencer;
         let slasherClient;
@@ -743,7 +754,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 telemetry,
                 dateProvider,
                 blobClient,
-                nodeKeyStore: keyStoreManager
+                nodeKeyStore: keyStoreManager,
+                globalVariableBuilder
             });
         }
         if (!options.dontStartSequencer && sequencer) {
@@ -773,12 +785,6 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 log.info(`Prover node subsystem created but not started`);
             }
         }
-        const globalVariableBuilder = new GlobalVariableBuilder({
-            ...config,
-            rollupVersion: BigInt(config.rollupVersion),
-            l1GenesisTime,
-            slotDuration: Number(slotDuration)
-        });
         const node = new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient, validatorClient, keyStoreManager, debugLogStore);
         return node;
     }
@@ -891,6 +897,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     async getCheckpointedBlocks(from, limit) {
         return await this.blockSource.getCheckpointedBlocks(from, limit) ?? [];
     }
+    getCheckpointsDataForEpoch(epochNumber) {
+        return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
+    }
     /**
    * Method to fetch the current min L2 fees.
    * @returns The current min L2 fees.
@@ -1082,70 +1091,88 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return compactArray(await Promise.all(txHashes.map((txHash)=>this.getTxByHash(txHash))));
     }
     async findLeavesIndexes(referenceBlock, treeId, leafValues) {
-        const committedDb = await this.#getWorldState(referenceBlock);
+        const committedDb = await this.getWorldState(referenceBlock);
         const maybeIndices = await committedDb.findLeafIndices(treeId, leafValues.map((x)=>x.toBuffer()));
-        // We filter out undefined values
-        const indices = maybeIndices.filter((x)=>x !== undefined);
-        // Now we find the block numbers for the indices
-        const blockNumbers = await committedDb.getBlockNumbersForLeafIndices(treeId, indices);
-        // If any of the block numbers are undefined, we throw an error.
-        for(let i = 0; i < indices.length; i++){
-            if (blockNumbers[i] === undefined) {
-                throw new Error(`Block number is undefined for leaf index ${indices[i]} in tree ${MerkleTreeId[treeId]}`);
+        // 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(blockNumbers.filter((x)=>x !== undefined))
+            ...new Set(indexToBlockNumber.values())
         ];
-        // 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).
+        // 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));
         }));
-        // If any of the block hashes are undefined, we throw an error.
+        // Build a map from block number to block hash
+        const blockNumberToHash = new Map();
         for(let i = 0; i < uniqueBlockNumbers.length; i++){
-            if (blockHashes[i] === undefined) {
+            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, i)=>{
+        return maybeIndices.map((index)=>{
             if (index === undefined) {
                 return undefined;
             }
-            const blockNumber = blockNumbers[i];
+            const blockNumber = indexToBlockNumber.get(index);
             if (blockNumber === undefined) {
-                return undefined;
+                throw new Error(`Block number not found for leaf index ${index} in tree ${MerkleTreeId[treeId]}`);
             }
-            const blockHashIndex = uniqueBlockNumbers.indexOf(blockNumber);
-            const blockHash = blockHashes[blockHashIndex];
-            if (!blockHash) {
-                return undefined;
+            const blockHash = blockNumberToHash.get(blockNumber);
+            if (blockHash === undefined) {
+                throw new Error(`Block hash not found for block number ${blockNumber}`);
             }
             return {
-                l2BlockNumber: BlockNumber(Number(blockNumber)),
+                l2BlockNumber: blockNumber,
                 l2BlockHash: new BlockHash(blockHash),
                 data: index
             };
         });
     }
     async getBlockHashMembershipWitness(referenceBlock, blockHash) {
-        const committedDb = await this.#getWorldState(referenceBlock);
+        // 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);
+        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 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 db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
             l1ToL2Message
         ]);
@@ -1177,23 +1204,11 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ async getL2ToL1Messages(epoch) {
         // Assumes `getCheckpointedBlocksForEpoch` returns blocks in ascending order of block number.
         const checkpointedBlocks = await this.blockSource.getCheckpointedBlocksForEpoch(epoch);
-        const blocksInCheckpoints = [];
-        let previousSlotNumber = SlotNumber.ZERO;
-        let checkpointIndex = -1;
-        for (const checkpointedBlock of checkpointedBlocks){
-            const block = checkpointedBlock.block;
-            const slotNumber = block.header.globalVariables.slotNumber;
-            if (slotNumber !== previousSlotNumber) {
-                checkpointIndex++;
-                blocksInCheckpoints.push([]);
-                previousSlotNumber = slotNumber;
-            }
-            blocksInCheckpoints[checkpointIndex].push(block);
-        }
+        const blocksInCheckpoints = chunkBy(checkpointedBlocks, (cb)=>cb.block.header.globalVariables.slotNumber).map((group)=>group.map((cb)=>cb.block));
         return blocksInCheckpoints.map((blocks)=>blocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs)));
     }
     async getNullifierMembershipWitness(referenceBlock, nullifier) {
-        const db = await this.#getWorldState(referenceBlock);
+        const db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
             nullifier.toBuffer()
         ]);
@@ -1207,36 +1222,22 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         }
         return new NullifierMembershipWitness(index, leafPreimage, path);
     }
-    /**
-   * Returns a low nullifier membership witness for a given nullifier at a given block.
-   * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data
-   * (which contains the root of the nullifier tree in which we are searching for the nullifier).
-   * @param nullifier - Nullifier we try to find the low nullifier witness for.
-   * @returns The low nullifier membership witness (if found).
-   * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
-   * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
-   * we are trying to prove non-inclusion for.
-   *
-   * Note: This function returns the membership witness of the nullifier itself and not the low nullifier when
-   * the nullifier already exists in the tree. This is because the `getPreviousValueIndex` function returns the
-   * index of the nullifier itself when it already exists in the tree.
-   * TODO: This is a confusing behavior and we should eventually address that.
-   */ async getLowNullifierMembershipWitness(referenceBlock, nullifier) {
-        const committedDb = await this.#getWorldState(referenceBlock);
+    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) {
-            this.log.warn(`Nullifier ${nullifier.toBigInt()} already exists in the tree`);
+            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 committedDb = await this.getWorldState(referenceBlock);
         const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
         if (!lowLeafResult) {
             return undefined;
@@ -1247,7 +1248,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         }
     }
     async getPublicStorageAt(referenceBlock, contract, slot) {
-        const committedDb = await this.#getWorldState(referenceBlock);
+        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) {
@@ -1348,6 +1349,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
         const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
         const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
+        const l1Constants = await this.blockSource.getL1Constants();
         const validator = createTxValidatorForAcceptingTxsOverRPC(db, this.contractDataSource, verifier, {
             timestamp: nextSlotTimestamp,
             blockNumber,
@@ -1359,7 +1361,10 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             ],
             gasFees: await this.getCurrentMinFees(),
             skipFeeEnforcement,
-            txsPermitted: !this.config.disableTransactions
+            txsPermitted: !this.config.disableTransactions,
+            rollupManaLimit: l1Constants.rollupManaLimit,
+            maxBlockL2Gas: this.config.validateMaxL2BlockGas,
+            maxBlockDAGas: this.config.validateMaxDABlockGas
         }, this.log.getBindings());
         return await validator.validateTx(tx);
     }
@@ -1569,6 +1574,33 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.keyStoreManager = newManager;
         this.log.info('Keystore reloaded: coinbase, feeRecipient, and attester keys updated');
     }
+    async mineBlock() {
+        if (!this.sequencer) {
+            throw new BadRequestError('Cannot mine block: no sequencer is running');
+        }
+        const currentBlockNumber = await this.getBlockNumber();
+        // Use slot duration + 50% buffer as the timeout so this works on running networks too
+        const { slotDuration } = await this.blockSource.getL1Constants();
+        const timeoutSeconds = Math.ceil(slotDuration * 1.5);
+        // Temporarily set minTxsPerBlock to 0 so the sequencer produces a block even with no txs
+        const originalMinTxsPerBlock = this.sequencer.getSequencer().getConfig().minTxsPerBlock;
+        this.sequencer.updateConfig({
+            minTxsPerBlock: 0
+        });
+        try {
+            // Trigger the sequencer to produce a block immediately
+            void this.sequencer.trigger();
+            // Wait for the new L2 block to appear
+            await retryUntil(async ()=>{
+                const newBlockNumber = await this.getBlockNumber();
+                return newBlockNumber > currentBlockNumber ? true : undefined;
+            }, 'mineBlock', timeoutSeconds, 0.1);
+        } finally{
+            this.sequencer.updateConfig({
+                minTxsPerBlock: originalMinTxsPerBlock
+            });
+        }
+    }
     #getInitialHeaderHash() {
         if (!this.initialHeaderHashPromise) {
             this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();
@@ -1579,7 +1611,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * 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) {
+   */ async getWorldState(block) {
         let blockSyncedTo = BlockNumber.ZERO;
         try {
             // Attempt to sync the world state if necessary
@@ -1591,6 +1623,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
             return this.worldStateSynchronizer.getCommitted();
         }
+        // Get the block number, either directly from the parameter or by quering the archiver with the block hash
+        let blockNumber;
         if (BlockHash.isBlockHash(block)) {
             const initialBlockHash = await this.#getInitialHeaderHash();
             if (block.equals(initialBlockHash)) {
@@ -1601,19 +1635,41 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             if (!header) {
                 throw new Error(`Block hash ${block.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
             }
-            const blockNumber = header.getBlockNumber();
-            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getSnapshot(blockNumber);
-        }
-        // Block number provided
-        {
-            const blockNumber = block;
-            if (blockNumber > blockSyncedTo) {
-                throw new Error(`Queried block ${block} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+            blockNumber = header.getBlockNumber();
+        } else {
+            blockNumber = block;
+        }
+        // Check it's within world state sync range
+        if (blockNumber > blockSyncedTo) {
+            throw new Error(`Queried block ${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
+        if (BlockHash.isBlockHash(block)) {
+            const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
+            if (!blockHash || !new BlockHash(blockHash).equals(block)) {
+                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.`);
+            }
+        }
+        return snapshot;
+    }
+    /** Resolves a block parameter to a block number. */ async resolveBlockNumber(block) {
+        if (block === 'latest') {
+            return BlockNumber(await this.blockSource.getBlockNumber());
+        }
+        if (BlockHash.isBlockHash(block)) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (block.equals(initialBlockHash)) {
+                return BlockNumber.ZERO;
+            }
+            const header = await this.blockSource.getBlockHeaderByHash(block);
+            if (!header) {
+                throw new Error(`Block hash ${block.toString()} not found.`);
             }
-            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getSnapshot(blockNumber);
+            return header.getBlockNumber();
         }
+        return block;
     }
     /**
    * Ensure we fully sync the world state

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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9

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

package/dest/sentinel/sentinel.js

@@ -229,10 +229,10 @@ export class Sentinel extends EventEmitter {
             this.logger.trace(`Refusing to process slot ${targetSlot} given initial slot ${this.initialSlot}`);
             return false;
         }
-        const archiverSlot = await this.archiver.getL2SlotNumber();
-        if (archiverSlot === undefined || archiverSlot < targetSlot) {
+        const syncedSlot = await this.archiver.getSyncedL2SlotNumber();
+        if (syncedSlot === undefined || syncedSlot < targetSlot) {
             this.logger.debug(`Waiting for archiver to sync with L2 slot ${targetSlot}`, {
-                archiverSlot,
+                syncedSlot,
                 targetSlot
             });
             return false;

package/package.json

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

package/src/aztec-node/config.ts

@@ -3,6 +3,7 @@ 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,
@@ -26,7 +27,6 @@ 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';