@aztec/aztec-node 0.0.1-commit.2b2662070 → 0.0.1-commit.2c0ee1788

package/dest/aztec-node/server.js

@@ -402,7 +402,7 @@ import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { BlockHash, L2Block } from '@aztec/stdlib/block';
+import { BlockHash, L2Block, inspectBlockParameter } from '@aztec/stdlib/block';
 import { GasFees } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
@@ -417,6 +417,7 @@ import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBu
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 import { createPublicClient } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
+import { blockResponseFromBlockData, blockResponseFromL2Block, checkpointResponseFromCheckpointData, checkpointResponseFromPublishedCheckpoint } from './block_response_helpers.js';
 import { createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
 _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
@@ -437,6 +438,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     slasherClient;
     validatorsSentinel;
     epochPruneWatcher;
+    attestationsBlockWatcher;
     l1ChainId;
     version;
     globalVariableBuilder;
@@ -465,7 +467,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, feeProvider, epochCache, packageVersion, peerProofVerifier, rpcProofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient, validatorClient, keyStoreManager, debugLogStore = new NullDebugLogStore()){
+    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, attestationsBlockWatcher, 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,6 +480,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.slasherClient = slasherClient;
         this.validatorsSentinel = validatorsSentinel;
         this.epochPruneWatcher = epochPruneWatcher;
+        this.attestationsBlockWatcher = attestationsBlockWatcher;
         this.l1ChainId = l1ChainId;
         this.version = version;
         this.globalVariableBuilder = globalVariableBuilder;
@@ -512,9 +515,273 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const status = await this.worldStateSynchronizer.status();
         return status.syncSummary;
     }
+    async getChainTips() {
+        const { proposed, checkpointed, proven, finalized } = await this.blockSource.getL2Tips();
+        return {
+            proposed,
+            checkpointed,
+            proven,
+            finalized
+        };
+    }
     getL2Tips() {
         return this.blockSource.getL2Tips();
     }
+    async getBlockHeader(number) {
+        const resolvedNumber = number === 'latest' ? await this.blockSource.getBlockNumber() : number;
+        if (resolvedNumber === BlockNumber.ZERO) {
+            return this.worldStateSynchronizer.getCommitted().getInitialHeader();
+        }
+        return this.blockSource.getBlockHeader(resolvedNumber);
+    }
+    async getCheckpointedBlocks(from, limit) {
+        return await this.blockSource.getCheckpointedBlocks(from, limit) ?? [];
+    }
+    getCheckpointsDataForEpoch(epoch) {
+        return this.blockSource.getCheckpointsDataForEpoch(epoch);
+    }
+    getBlockNumber(tip) {
+        switch(tip){
+            case undefined:
+            case 'proposed':
+                return this.blockSource.getBlockNumber();
+            case 'checkpointed':
+                return this.blockSource.getCheckpointedL2BlockNumber();
+            case 'proven':
+                return this.blockSource.getProvenBlockNumber();
+            case 'finalized':
+                return this.blockSource.getFinalizedL2BlockNumber();
+        }
+    }
+    async getCheckpointNumber(tip) {
+        switch(tip){
+            case undefined:
+            case 'proposed':
+            case 'checkpointed':
+                return await this.blockSource.getCheckpointNumber();
+            case 'proven':
+            case 'finalized':
+                {
+                    const tips = await this.blockSource.getL2Tips();
+                    return tip === 'proven' ? tips.proven.checkpoint.number : tips.finalized.checkpoint.number;
+                }
+        }
+    }
+    isChainTip(value) {
+        return value === 'proposed' || value === 'checkpointed' || value === 'proven' || value === 'finalized';
+    }
+    async resolveBlockParameter(param) {
+        if (BlockHash.isBlockHash(param)) {
+            return {
+                hash: param
+            };
+        }
+        if (typeof param === 'number') {
+            return {
+                number: param
+            };
+        }
+        if (param === 'latest') {
+            return {
+                number: await this.blockSource.getBlockNumber()
+            };
+        }
+        if (this.isChainTip(param)) {
+            return {
+                number: await this.getBlockNumber(param)
+            };
+        }
+        if (typeof param === 'object' && param !== null) {
+            if ('number' in param) {
+                return {
+                    number: param.number
+                };
+            }
+            if ('hash' in param) {
+                return {
+                    hash: param.hash
+                };
+            }
+            if ('archive' in param) {
+                return {
+                    archive: param.archive
+                };
+            }
+        }
+        throw new BadRequestError(`Invalid BlockParameter: ${JSON.stringify(param)}`);
+    }
+    async resolveCheckpointParameter(param) {
+        if (typeof param === 'number') {
+            return {
+                number: param
+            };
+        }
+        if (param === 'latest') {
+            return {
+                number: await this.blockSource.getCheckpointNumber()
+            };
+        }
+        if (this.isChainTip(param)) {
+            return {
+                number: await this.getCheckpointNumber(param)
+            };
+        }
+        if (typeof param === 'object' && param !== null) {
+            if ('number' in param) {
+                return {
+                    number: param.number
+                };
+            }
+            if ('slot' in param) {
+                return {
+                    slot: param.slot
+                };
+            }
+        }
+        throw new BadRequestError(`Invalid CheckpointParameter: ${JSON.stringify(param)}`);
+    }
+    async getBlock(param, options = {}) {
+        const resolved = await this.resolveBlockParameter(param);
+        const wantTxs = !!options.includeTransactions;
+        const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+        if (resolved.hash !== undefined) {
+            const initial = await this.#getInitialHeaderHash();
+            if (resolved.hash.equals(initial)) {
+                return await this.buildGenesisBlockResponse(options);
+            }
+            if (wantTxs) {
+                const block = await this.blockSource.getL2BlockByHash(resolved.hash);
+                if (!block) {
+                    return undefined;
+                }
+                const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(block.number) : undefined;
+                return await blockResponseFromL2Block(block, options, ctx);
+            }
+            const data = await this.blockSource.getBlockHeaderByHash(resolved.hash);
+            if (!data) {
+                return undefined;
+            }
+            const blockNumber = data.globalVariables.blockNumber;
+            const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(blockNumber) : undefined;
+            if (ctx) {
+                return blockResponseFromBlockData(ctx.data, blockNumber, options, ctx);
+            }
+            const blockData = await this.blockSource.getBlockData(blockNumber);
+            if (!blockData) {
+                return undefined;
+            }
+            return blockResponseFromBlockData(blockData, blockNumber, options);
+        }
+        if (resolved.archive !== undefined) {
+            if (wantTxs) {
+                const block = await this.blockSource.getL2BlockByArchive(resolved.archive);
+                if (!block) {
+                    return undefined;
+                }
+                const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(block.number) : undefined;
+                return await blockResponseFromL2Block(block, options, ctx);
+            }
+            const data = await this.blockSource.getBlockDataByArchive(resolved.archive);
+            if (!data) {
+                return undefined;
+            }
+            const blockNumber = data.header.globalVariables.blockNumber;
+            const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(blockNumber) : undefined;
+            return blockResponseFromBlockData(data, blockNumber, options, ctx);
+        }
+        const blockNumber = resolved.number;
+        if (blockNumber === BlockNumber.ZERO) {
+            return await this.buildGenesisBlockResponse(options);
+        }
+        if (wantTxs) {
+            const block = await this.blockSource.getL2Block(blockNumber);
+            if (!block) {
+                return undefined;
+            }
+            const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(blockNumber) : undefined;
+            return await blockResponseFromL2Block(block, options, ctx);
+        }
+        const ctx = await this.blockSource.getBlockDataWithCheckpointContext(blockNumber);
+        if (!ctx) {
+            return undefined;
+        }
+        return blockResponseFromBlockData(ctx.data, blockNumber, options, ctx);
+    }
+    async getBlocks(from, limit, options = {}) {
+        const wantTxs = !!options.includeTransactions;
+        const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+        if (wantTxs) {
+            const blocks = await this.blockSource.getBlocks(from, limit);
+            return await Promise.all(blocks.map(async (block)=>{
+                const ctx = wantContext ? await this.blockSource.getBlockDataWithCheckpointContext(block.number) : undefined;
+                return blockResponseFromL2Block(block, options, ctx);
+            }));
+        }
+        const results = [];
+        for(let i = 0; i < limit; i++){
+            const blockNumber = BlockNumber(from + i);
+            const ctx = await this.blockSource.getBlockDataWithCheckpointContext(blockNumber);
+            if (!ctx) {
+                break;
+            }
+            results.push(blockResponseFromBlockData(ctx.data, blockNumber, options, ctx));
+        }
+        return results;
+    }
+    async getCheckpoint(param, options = {}) {
+        const resolved = await this.resolveCheckpointParameter(param);
+        let checkpointNumber = resolved.number;
+        if (checkpointNumber === undefined && resolved.slot !== undefined) {
+            checkpointNumber = await this.blockSource.getCheckpointNumberBySlot(resolved.slot);
+        }
+        if (checkpointNumber === undefined) {
+            return undefined;
+        }
+        if (options.includeBlocks) {
+            const [checkpoint] = await this.blockSource.getCheckpoints(checkpointNumber, 1);
+            if (!checkpoint) {
+                return undefined;
+            }
+            return await checkpointResponseFromPublishedCheckpoint(checkpoint, options);
+        }
+        const data = await this.blockSource.getCheckpointData(checkpointNumber);
+        if (!data) {
+            return undefined;
+        }
+        return checkpointResponseFromCheckpointData(data, options);
+    }
+    async getCheckpoints(from, limit, options = {}) {
+        if (options.includeBlocks) {
+            const checkpoints = await this.blockSource.getCheckpoints(from, limit);
+            return await Promise.all(checkpoints.map((cp)=>checkpointResponseFromPublishedCheckpoint(cp, options)));
+        }
+        const datas = await this.blockSource.getCheckpointDataRange(from, limit);
+        return datas.map((d)=>checkpointResponseFromCheckpointData(d, options));
+    }
+    async buildGenesisBlockResponse(options) {
+        const initial = this.worldStateSynchronizer.getCommitted().getInitialHeader();
+        const empty = L2Block.empty(initial);
+        const response = {
+            header: empty.header,
+            archive: empty.archive,
+            hash: await this.#getInitialHeaderHash(),
+            checkpointNumber: empty.checkpointNumber,
+            indexWithinCheckpoint: empty.indexWithinCheckpoint,
+            number: empty.number
+        };
+        if (options.includeTransactions) {
+            response.body = empty.body;
+        }
+        if (options.includeL1PublishInfo) {
+            response.l1 = {
+                published: false
+            };
+        }
+        if (options.includeAttestations) {
+            response.attestations = [];
+        }
+        return response;
+    }
     /**
    * initializes the Aztec Node, wait for component to sync.
    * @param config - The configuration to be used by the aztec node.
@@ -596,235 +863,261 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, {
             dateProvider
         });
-        const archiver = await createArchiver(config, {
-            blobClient,
-            epochCache,
-            telemetry,
-            dateProvider
-        }, {
-            blockUntilSync: !config.skipArchiverInitialSync
-        });
-        // now create the merkle trees and the world state synchronizer
-        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`);
-            debugLogStore = new InMemoryDebugLogStore();
-            log.info('Aztec node started in test mode (realProofs set to false) hence debug logs from public functions will be collected and served');
-        } else {
-            debugLogStore = new NullDebugLogStore();
-        }
-        const 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, 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.
-        // Override maxTxsPerCheckpoint with the validator-specific limit if set.
-        const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder({
-            ...config,
-            l1GenesisTime,
-            slotDuration: Number(slotDuration),
-            rollupManaLimit,
-            maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint
-        }, worldStateSynchronizer, archiver, dateProvider, telemetry);
-        let validatorClient;
-        if (!proverOnly) {
-            // Create validator client if required
-            validatorClient = await createValidatorClient(config, {
-                checkpointsBuilder: validatorCheckpointsBuilder,
-                worldState: worldStateSynchronizer,
-                p2pClient,
-                telemetry,
-                dateProvider,
-                epochCache,
-                blockSource: archiver,
-                l1ToL2MessageSource: archiver,
-                keyStoreManager,
+        // Track started resources so we can clean up on partial failure during node creation.
+        const started = [];
+        try {
+            const archiver = await createArchiver(config, {
                 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
-            // 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();
-                }
-            }
-        }
-        // 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 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' : ''));
-            createProposalHandler(config, {
-                checkpointsBuilder: validatorCheckpointsBuilder,
-                worldState: worldStateSynchronizer,
                 epochCache,
-                blockSource: archiver,
-                l1ToL2MessageSource: archiver,
-                p2pClient,
-                blobClient,
-                dateProvider,
-                telemetry
-            }).register(p2pClient, reexecute, archiver);
-        }
-        // Start world state and wait for it to sync to the archiver.
-        await worldStateSynchronizer.start();
-        // Start p2p. Note that it depends on world state to be running.
-        await p2pClient.start();
-        let validatorsSentinel;
-        let epochPruneWatcher;
-        let attestationsBlockWatcher;
-        if (!proverOnly) {
-            validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-            if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
-                watchers.push(validatorsSentinel);
-            }
-            if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-                epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), validatorCheckpointsBuilder, config);
-                watchers.push(epochPruneWatcher);
-            }
-            // We assume we want to slash for invalid attestations unless all max penalties are set to 0
-            if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
-                attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
-                watchers.push(attestationsBlockWatcher);
-            }
-        }
-        // Start p2p-related services once the archiver has completed sync
-        void archiver.waitForInitialSync().then(async ()=>{
-            await 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 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;
-        if (!config.disableValidator && validatorClient) {
-            // We create a slasher only if we have a sequencer, since all slashing actions go through the sequencer publisher
-            // as they are executed when the node is selected as proposer.
-            const validatorAddresses = keyStoreManager ? NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager).getAddresses() : [];
-            slasherClient = await createSlasher(config, config.l1Contracts, getPublicClient(config), watchers, dateProvider, epochCache, validatorAddresses, undefined);
-            await slasherClient.start();
-            const l1TxUtils = config.sequencerPublisherForwarderAddress ? await createForwarderL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.sequencerPublisherForwarderAddress, {
-                ...config,
-                scope: 'sequencer'
-            }, {
                 telemetry,
-                logger: log.createChild('l1-tx-utils'),
-                dateProvider,
-                kzg: Blob.getViemKzgInstance()
-            }) : await createL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
-                ...config,
-                scope: 'sequencer'
+                dateProvider
             }, {
-                telemetry,
-                logger: log.createChild('l1-tx-utils'),
-                dateProvider,
-                kzg: Blob.getViemKzgInstance()
+                blockUntilSync: !config.skipArchiverInitialSync
             });
-            // 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
-                ], {
+            started.push(archiver);
+            // now create the merkle trees and the world state synchronizer
+            const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.genesis, telemetry);
+            started.push(worldStateSynchronizer);
+            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);
+            }
+            started.push(peerProofVerifier, rpcProofVerifier);
+            let debugLogStore;
+            if (!config.realProofs) {
+                log.warn(`Aztec node is accepting fake proofs`);
+                debugLogStore = new InMemoryDebugLogStore();
+                log.info('Aztec node started in test mode (realProofs set to false) hence debug logs from public functions will be collected and served');
+            } else {
+                debugLogStore = new NullDebugLogStore();
+            }
+            const 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);
+            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, peerProofVerifier, worldStateSynchronizer, epochCache, feeProvider, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
+            started.push(p2pClient);
+            // We'll accumulate sentinel watchers here
+            const watchers = [];
+            // Create FullNodeCheckpointsBuilder for block proposal handling and tx validation.
+            // Override maxTxsPerCheckpoint with the validator-specific limit if set.
+            const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder({
+                ...config,
+                l1GenesisTime,
+                slotDuration: Number(slotDuration),
+                rollupManaLimit,
+                maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint
+            }, worldStateSynchronizer, archiver, dateProvider, telemetry);
+            let validatorClient;
+            if (!config.disableValidator) {
+                // Create validator client if required
+                validatorClient = await createValidatorClient(config, {
+                    checkpointsBuilder: validatorCheckpointsBuilder,
+                    worldState: worldStateSynchronizer,
+                    p2pClient,
+                    telemetry,
+                    dateProvider,
+                    epochCache,
+                    blockSource: archiver,
+                    l1ToL2MessageSource: archiver,
+                    keyStoreManager,
+                    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
+                // 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();
+                    }
+                }
+            }
+            // 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 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' : ''));
+                createProposalHandler(config, {
+                    checkpointsBuilder: validatorCheckpointsBuilder,
+                    worldState: worldStateSynchronizer,
+                    epochCache,
+                    blockSource: archiver,
+                    l1ToL2MessageSource: archiver,
+                    p2pClient,
+                    blobClient,
+                    dateProvider,
+                    telemetry
+                }).register(p2pClient, reexecute, archiver);
+            }
+            // Start world state and wait for it to sync to the archiver.
+            await worldStateSynchronizer.start();
+            // Start p2p. Note that it depends on world state to be running.
+            await p2pClient.start();
+            let validatorsSentinel;
+            let epochPruneWatcher;
+            let attestationsBlockWatcher;
+            if (!proverOnly) {
+                validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
+                if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
+                    watchers.push(validatorsSentinel);
+                }
+                if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
+                    epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), validatorCheckpointsBuilder, config);
+                    watchers.push(epochPruneWatcher);
+                }
+                // We assume we want to slash for invalid attestations unless all max penalties are set to 0
+                if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
+                    attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
+                    watchers.push(attestationsBlockWatcher);
+                }
+            }
+            // Start p2p-related services once the archiver has completed sync
+            void archiver.waitForInitialSync().then(async ()=>{
+                if (validatorsSentinel) {
+                    await validatorsSentinel.start();
+                    started.push(validatorsSentinel);
+                }
+                if (epochPruneWatcher) {
+                    await epochPruneWatcher.start();
+                    started.push(epochPruneWatcher);
+                }
+                if (attestationsBlockWatcher) {
+                    await attestationsBlockWatcher.start();
+                    started.push(attestationsBlockWatcher);
+                }
+                log.info(`All p2p services started`);
+            }).catch((err)=>log.error('Failed to start p2p services after archiver sync', err));
+            // Validator enabled, create/start relevant service
+            let sequencer;
+            let slasherClient;
+            if (!config.disableValidator && validatorClient) {
+                // We create a slasher only if we have a sequencer, since all slashing actions go through the sequencer publisher
+                // as they are executed when the node is selected as proposer.
+                const validatorAddresses = keyStoreManager ? NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager).getAddresses() : [];
+                slasherClient = await createSlasher(config, config.l1Contracts, getPublicClient(config), watchers, dateProvider, epochCache, validatorAddresses, undefined);
+                await slasherClient.start();
+                started.push(slasherClient);
+                const l1TxUtils = config.sequencerPublisherForwarderAddress ? await createForwarderL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.sequencerPublisherForwarderAddress, {
                     ...config,
                     scope: 'sequencer'
                 }, {
                     telemetry,
-                    logger: log.createChild('l1-tx-utils:funder'),
-                    dateProvider
+                    logger: log.createChild('l1-tx-utils'),
+                    dateProvider,
+                    kzg: Blob.getViemKzgInstance()
+                }) : await createL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
+                    ...config,
+                    scope: 'sequencer'
+                }, {
+                    telemetry,
+                    logger: log.createChild('l1-tx-utils'),
+                    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,
+                    l1GenesisTime,
+                    slotDuration: Number(slotDuration),
+                    rollupManaLimit
+                }, worldStateSynchronizer, archiver, dateProvider, telemetry, debugLogStore);
+                sequencer = await SequencerClient.new(config, {
+                    ...deps,
+                    epochCache,
+                    l1TxUtils,
+                    funderL1TxUtils,
+                    validatorClient,
+                    p2pClient,
+                    worldStateSynchronizer,
+                    slasherClient,
+                    checkpointsBuilder,
+                    l2BlockSource: archiver,
+                    l1ToL2MessageSource: archiver,
+                    telemetry,
+                    dateProvider,
+                    blobClient,
+                    nodeKeyStore: keyStoreManager,
+                    globalVariableBuilder
                 });
-                funderL1TxUtils = funder;
             }
-            // Create and start the sequencer client
-            const checkpointsBuilder = new CheckpointsBuilder({
-                ...config,
-                l1GenesisTime,
-                slotDuration: Number(slotDuration),
-                rollupManaLimit
-            }, worldStateSynchronizer, archiver, dateProvider, telemetry, debugLogStore);
-            sequencer = await SequencerClient.new(config, {
-                ...deps,
-                epochCache,
-                l1TxUtils,
-                funderL1TxUtils,
-                validatorClient,
-                p2pClient,
-                worldStateSynchronizer,
-                slasherClient,
-                checkpointsBuilder,
-                l2BlockSource: archiver,
-                l1ToL2MessageSource: archiver,
-                telemetry,
-                dateProvider,
-                blobClient,
-                nodeKeyStore: keyStoreManager,
-                globalVariableBuilder
-            });
-        }
-        if (!options.dontStartSequencer && sequencer) {
-            await sequencer.start();
-            log.verbose(`Sequencer started`);
-        } else if (sequencer) {
-            log.warn(`Sequencer created but not started`);
-        }
-        // Create prover node subsystem if enabled
-        let proverNode;
-        if (config.enableProverNode) {
-            proverNode = await createProverNode(config, {
-                ...deps.proverNodeDeps,
-                telemetry,
-                dateProvider,
-                archiver,
-                worldStateSynchronizer,
-                p2pClient,
-                epochCache,
-                blobClient,
-                keyStoreManager
-            });
-            if (!options.dontStartProverNode) {
-                await proverNode.start();
-                log.info(`Prover node subsystem started`);
-            } else {
-                log.info(`Prover node subsystem created but not started`);
+            if (!options.dontStartSequencer && sequencer) {
+                await sequencer.start();
+                started.push(sequencer);
+                log.verbose(`Sequencer started`);
+            } else if (sequencer) {
+                log.warn(`Sequencer created but not started`);
             }
+            // Create prover node subsystem if enabled
+            let proverNode;
+            if (config.enableProverNode) {
+                proverNode = await createProverNode(config, {
+                    ...deps.proverNodeDeps,
+                    telemetry,
+                    dateProvider,
+                    archiver,
+                    worldStateSynchronizer,
+                    p2pClient,
+                    epochCache,
+                    blobClient,
+                    keyStoreManager
+                });
+                if (!options.dontStartProverNode) {
+                    await proverNode.start();
+                    started.push(proverNode);
+                    log.info(`Prover node subsystem started`);
+                } else {
+                    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, attestationsBlockWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, feeProvider, epochCache, packageVersion, peerProofVerifier, rpcProofVerifier, telemetry, log, blobClient, validatorClient, keyStoreManager, debugLogStore);
+            return node;
+        } catch (err) {
+            log.error('Failed during node creation, stopping started resources', err);
+            for (const resource of started.reverse()){
+                await tryStop(resource);
+            }
+            throw err;
         }
-        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;
     }
     /**
    * Returns the sequencer client instance.
@@ -885,59 +1178,6 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         };
         return nodeInfo;
     }
-    /**
-   * Get a block specified by its block number, block hash, or 'latest'.
-   * @param block - The block parameter (block number, block hash, or 'latest').
-   * @returns The requested block.
-   */ async getBlock(block) {
-        if (BlockHash.isBlockHash(block)) {
-            return this.getBlockByHash(block);
-        }
-        const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
-        if (blockNumber === BlockNumber.ZERO) {
-            return this.buildInitialBlock();
-        }
-        return await this.blockSource.getL2Block(blockNumber);
-    }
-    /**
-   * Get a block specified by its hash.
-   * @param blockHash - The block hash being requested.
-   * @returns The requested block.
-   */ async getBlockByHash(blockHash) {
-        const initialBlockHash = await this.#getInitialHeaderHash();
-        if (blockHash.equals(initialBlockHash)) {
-            return this.buildInitialBlock();
-        }
-        return await this.blockSource.getL2BlockByHash(blockHash);
-    }
-    buildInitialBlock() {
-        const initialHeader = this.worldStateSynchronizer.getCommitted().getInitialHeader();
-        return L2Block.empty(initialHeader);
-    }
-    /**
-   * Get a block specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block.
-   */ async getBlockByArchive(archive) {
-        return await this.blockSource.getL2BlockByArchive(archive);
-    }
-    /**
-   * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
-   * @param from - The start of the range of blocks to return.
-   * @param limit - The maximum number of blocks to obtain.
-   * @returns The blocks requested.
-   */ async getBlocks(from, limit) {
-        return await this.blockSource.getBlocks(from, BlockNumber(limit)) ?? [];
-    }
-    async getCheckpoints(from, limit) {
-        return await this.blockSource.getCheckpoints(from, limit) ?? [];
-    }
-    async getCheckpointedBlocks(from, limit) {
-        return await this.blockSource.getCheckpointedBlocks(from, limit) ?? [];
-    }
-    getCheckpointsDataForEpoch(epochNumber) {
-        return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
-    }
     async getCurrentMinFees() {
         return await this.feeProvider.getCurrentMinFees();
     }
@@ -954,21 +1194,6 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         });
     }
     /**
-   * Method to fetch the latest block number synchronized by the node.
-   * @returns The block number.
-   */ async getBlockNumber() {
-        return await this.blockSource.getBlockNumber();
-    }
-    async getProvenBlockNumber() {
-        return await this.blockSource.getProvenBlockNumber();
-    }
-    async getCheckpointedBlockNumber() {
-        return await this.blockSource.getCheckpointedL2BlockNumber();
-    }
-    getCheckpointNumber() {
-        return this.blockSource.getCheckpointNumber();
-    }
-    /**
    * Method to fetch the version of the package.
    * @returns The node package version
    */ getNodeVersion() {
@@ -1056,7 +1281,15 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             });
             throw new Error(`Invalid tx: ${reason}`);
         }
-        await this.p2pClient.sendTx(tx);
+        try {
+            await this.p2pClient.sendTx(tx);
+        } catch (err) {
+            this.metrics.receivedTx(timer.ms(), false);
+            this.log.warn(`Mempool rejected tx ${txHash}: ${err.message}`, {
+                txHash
+            });
+            throw err;
+        }
         const duration = timer.ms();
         this.metrics.receivedTx(duration, true);
         this.log.info(`Received tx ${txHash} in ${duration}ms`, {
@@ -1077,10 +1310,10 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             // If the tx is in the pool but not in the archiver, it's pending.
             // This handles race conditions between archiver and p2p, where the archiver
             // has pruned the block in which a tx was mined, but p2p has not caught up yet.
-            receipt = new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
+            receipt = new TxReceipt(txHash, TxStatus.PENDING, /*executionResult=*/ undefined, /*error=*/ undefined);
         } else {
             // Otherwise, if we don't know the tx, we consider it dropped.
-            receipt = new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
+            receipt = new TxReceipt(txHash, TxStatus.DROPPED, /*executionResult=*/ undefined, /*error=*/ 'Tx dropped by P2P node');
         }
         this.debugLogStore.decorateReceiptWithLogs(txHash.toString(), receipt);
         return receipt;
@@ -1092,6 +1325,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * Method to stop the aztec node.
    */ async stop() {
         this.log.info(`Stopping Aztec Node`);
+        await tryStop(this.attestationsBlockWatcher);
         await tryStop(this.validatorsSentinel);
         await tryStop(this.epochPruneWatcher);
         await tryStop(this.slasherClient);
@@ -1300,36 +1534,6 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
         return preimage.leaf.value;
     }
-    async getBlockHeader(block = 'latest') {
-        if (BlockHash.isBlockHash(block)) {
-            const initialBlockHash = await this.#getInitialHeaderHash();
-            if (block.equals(initialBlockHash)) {
-                // Block source doesn't handle initial header so we need to handle the case separately.
-                return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-            }
-            return this.blockSource.getBlockHeaderByHash(block);
-        } else {
-            // Block source doesn't handle initial header so we need to handle the case separately.
-            const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
-            if (blockNumber === BlockNumber.ZERO) {
-                return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-            }
-            return this.blockSource.getBlockHeader(block);
-        }
-    }
-    /**
-   * Get a block header specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block header.
-   */ async getBlockHeaderByArchive(archive) {
-        return await this.blockSource.getBlockHeaderByArchive(archive);
-    }
-    getBlockData(number) {
-        return this.blockSource.getBlockData(number);
-    }
-    getBlockDataByArchive(archive) {
-        return this.blockSource.getBlockDataByArchive(archive);
-    }
     /**
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
@@ -1680,20 +1884,23 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         if (BlockHash.isBlockHash(block)) {
             const initialBlockHash = await this.#getInitialHeaderHash();
             if (block.equals(initialBlockHash)) {
-                // Block source doesn't handle initial header so we need to handle the case separately.
-                return this.worldStateSynchronizer.getSnapshot(BlockNumber.ZERO);
-            }
-            const header = await this.blockSource.getBlockHeaderByHash(block);
-            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.`);
+                // Block 0 is a first-class historical block: its state lives in the trees' persisted
+                // block-0 payload. Resolving the genesis hash to block number 0 lets the snapshot path
+                // pin reads to genesis state even after the node has advanced past it.
+                blockNumber = BlockNumber.ZERO;
+            } else {
+                const header = await this.blockSource.getBlockHeaderByHash(block);
+                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.`);
+                }
+                blockNumber = header.getBlockNumber();
             }
-            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}).`);
+            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);
@@ -1701,27 +1908,36 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         if (BlockHash.isBlockHash(block)) {
             const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
             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.`);
+                const initialBlockHash = await this.#getInitialHeaderHash();
+                throw new Error(`Block hash ${block.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${initialBlockHash.toString()}). 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());
+    /** Resolves any {@link BlockParameter} variant to a concrete block number. */ async resolveBlockNumber(block) {
+        const resolved = await this.resolveBlockParameter(block);
+        if (resolved.number !== undefined) {
+            return resolved.number;
         }
-        if (BlockHash.isBlockHash(block)) {
+        if (resolved.hash !== undefined) {
             const initialBlockHash = await this.#getInitialHeaderHash();
-            if (block.equals(initialBlockHash)) {
+            if (resolved.hash.equals(initialBlockHash)) {
                 return BlockNumber.ZERO;
             }
-            const header = await this.blockSource.getBlockHeaderByHash(block);
+            const header = await this.blockSource.getBlockHeaderByHash(resolved.hash);
+            if (!header) {
+                throw new Error(`Block hash ${resolved.hash.toString()} not found.`);
+            }
+            return header.getBlockNumber();
+        }
+        if (resolved.archive !== undefined) {
+            const header = await this.blockSource.getBlockHeaderByArchive(resolved.archive);
             if (!header) {
-                throw new Error(`Block hash ${block.toString()} not found.`);
+                throw new Error(`Block with archive ${resolved.archive.toString()} not found.`);
             }
             return header.getBlockNumber();
         }
-        return block;
+        throw new BadRequestError(`Invalid BlockParameter: ${JSON.stringify(block)}`);
     }
     /**
    * Ensure we fully sync the world state