@aztec/aztec-node 0.0.1-commit.0b941701 → 0.0.1-commit.0dc957cde

package/dest/aztec-node/server.js

@@ -372,45 +372,50 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
 }
 var _dec, _initProto;
 import { createArchiver } from '@aztec/archiver';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
+import { BBCircuitVerifier, BatchChonkVerifier, QueuedIVCVerifier } from '@aztec/bb-prover';
+import { TestCircuitVerifier } from '@aztec/bb-prover/test';
 import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
+import { Blob } from '@aztec/blob-lib';
 import { EpochCache } from '@aztec/epoch-cache';
 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 } 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';
 import { KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync, uploadSnapshot } from '@aztec/node-lib/actions';
-import { createForwarderL1TxUtilsFromEthSigner, createL1TxUtilsWithBlobsFromEthSigner } from '@aztec/node-lib/factories';
-import { createP2PClient, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
+import { createForwarderL1TxUtilsFromSigners, createL1TxUtilsFromSigners } from '@aztec/node-lib/factories';
+import { createP2PClient, createTxValidatorForAcceptingTxsOverRPC, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
+import { createProverNode } from '@aztec/prover-node';
+import { createKeyStoreForProver } from '@aztec/prover-node/config';
+import { FeeProviderImpl, GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2Block, L2BlockHash } from '@aztec/stdlib/block';
+import { BlockHash, L2Block } from '@aztec/stdlib/block';
 import { GasFees } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { InMemoryDebugLogStore, NullDebugLogStore } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
-import { P2PClientType } from '@aztec/stdlib/p2p';
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import { PublicSimulationOutput, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient, createValidatorForAcceptingTxs } 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';
@@ -428,18 +433,24 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     l1ToL2MessageSource;
     worldStateSynchronizer;
     sequencer;
+    proverNode;
     slasherClient;
     validatorsSentinel;
     epochPruneWatcher;
     l1ChainId;
     version;
     globalVariableBuilder;
+    feeProvider;
     epochCache;
     packageVersion;
-    proofVerifier;
+    peerProofVerifier;
+    rpcProofVerifier;
     telemetry;
     log;
     blobClient;
+    validatorClient;
+    keyStoreManager;
+    debugLogStore;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -454,7 +465,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     // Prevent two snapshot operations to happen simultaneously
     isUploadingSnapshot;
     tracer;
-    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient){
+    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, feeProvider, epochCache, packageVersion, peerProofVerifier, rpcProofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient, validatorClient, keyStoreManager, debugLogStore = new NullDebugLogStore()){
         this.config = config;
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
@@ -463,24 +474,39 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.worldStateSynchronizer = worldStateSynchronizer;
         this.sequencer = sequencer;
+        this.proverNode = proverNode;
         this.slasherClient = slasherClient;
         this.validatorsSentinel = validatorsSentinel;
         this.epochPruneWatcher = epochPruneWatcher;
         this.l1ChainId = l1ChainId;
         this.version = version;
         this.globalVariableBuilder = globalVariableBuilder;
+        this.feeProvider = feeProvider;
         this.epochCache = epochCache;
         this.packageVersion = packageVersion;
-        this.proofVerifier = proofVerifier;
+        this.peerProofVerifier = peerProofVerifier;
+        this.rpcProofVerifier = rpcProofVerifier;
         this.telemetry = telemetry;
         this.log = log;
         this.blobClient = blobClient;
+        this.validatorClient = validatorClient;
+        this.keyStoreManager = keyStoreManager;
+        this.debugLogStore = debugLogStore;
         this.initialHeaderHashPromise = (_initProto(this), undefined);
         this.isUploadingSnapshot = false;
         this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
         this.tracer = telemetry.getTracer('AztecNodeService');
         this.log.info(`Aztec Node version: ${this.packageVersion}`);
         this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
+        // A defensive check that protects us against introducing a bug in the complex `createAndSync` function. We must
+        // never have debugLogStore enabled when not in test mode because then we would be accumulating debug logs in
+        // memory which could be a DoS vector on the sequencer (since no fees are paid for debug logs).
+        if (debugLogStore.isEnabled && config.realProofs) {
+            throw new Error('debugLogStore should never be enabled when realProofs are set');
+        }
+    }
+    /** @internal Exposed for testing — returns the RPC proof verifier. */ getProofVerifier() {
+        return this.rpcProofVerifier;
     }
     async getWorldStateSyncStatus() {
         const status = await this.worldStateSynchronizer.status();
@@ -502,16 +528,27 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const telemetry = deps.telemetry ?? getTelemetryClient();
         const dateProvider = deps.dateProvider ?? new DateProvider();
         const ethereumChain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
-        // Build a key store from file if given or from environment otherwise
+        // Build a key store from file if given or from environment otherwise.
+        // We keep the raw KeyStore available so we can merge with prover keys if enableProverNode is set.
         let keyStoreManager;
         const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
         if (keyStoreProvided) {
             const keyStores = loadKeystores(config.keyStoreDirectory);
             keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
         } else {
-            const keyStore = createKeyStoreForValidator(config);
-            if (keyStore) {
-                keyStoreManager = new KeystoreManager(keyStore);
+            const rawKeyStores = [];
+            const validatorKeyStore = createKeyStoreForValidator(config);
+            if (validatorKeyStore) {
+                rawKeyStores.push(validatorKeyStore);
+            }
+            if (config.enableProverNode) {
+                const proverKeyStore = createKeyStoreForProver(config);
+                if (proverKeyStore) {
+                    rawKeyStores.push(proverKeyStore);
+                }
+            }
+            if (rawKeyStores.length > 0) {
+                keyStoreManager = new KeystoreManager(rawKeyStores.length === 1 ? rawKeyStores[0] : mergeKeystores(rawKeyStores));
             }
         }
         await keyStoreManager?.validateSigners();
@@ -520,8 +557,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             if (keyStoreManager === undefined) {
                 throw new Error('Failed to create key store, a requirement for running a validator');
             }
-            if (!keyStoreProvided) {
-                log.warn('KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS');
+            if (!keyStoreProvided && process.env.NODE_ENV !== 'test') {
+                log.warn("Keystore created from env: it's recommended to use a file-based key store for production");
             }
             ValidatorClient.validateKeyStoreConfiguration(keyStoreManager, log);
         }
@@ -531,9 +568,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');
@@ -543,172 +580,268 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             ...l1ContractsAddresses
         };
         const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration, rollupVersionFromRollup] = await Promise.all([
+        const [l1GenesisTime, slotDuration, rollupVersionFromRollup, rollupManaLimit] = await Promise.all([
             rollupContract.getL1GenesisTime(),
             rollupContract.getSlotDuration(),
-            rollupContract.getVersion()
+            rollupContract.getVersion(),
+            rollupContract.getManaLimit().then(Number)
         ]);
         config.rollupVersion ??= Number(rollupVersionFromRollup);
         if (config.rollupVersion !== Number(rollupVersionFromRollup)) {
             log.warn(`Registry looked up and returned a rollup with version (${config.rollupVersion}), but this does not match with version detected from the rollup directly: (${rollupVersionFromRollup}).`);
         }
-        const blobClient = await createBlobClientWithFileStores(config, createLogger('node:blob-client:client'));
+        const blobClient = await createBlobClientWithFileStores(config, log.createChild('blob-client'));
         // attempt snapshot sync if possible
         await trySnapshotSync(config, log);
         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.prefilledPublicData, telemetry);
-        const circuitVerifier = config.realProofs || config.debugForceTxProofVerification ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
-        if (!config.realProofs) {
-            log.warn(`Aztec node is accepting fake proofs`);
-        }
-        const proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
-        // create the tx pool and the p2p client, which will need the l2 block source
-        const p2pClient = await createP2PClient(P2PClientType.Full, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
-        // We should really not be modifying the config object
-        config.txPublicSetupAllowList = config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
-        // Create FullNodeCheckpointsBuilder for validator and non-validator block proposal handling
-        const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder({
-            ...config,
-            l1GenesisTime,
-            slotDuration: Number(slotDuration)
-        }, worldStateSynchronizer, archiver, dateProvider, telemetry);
-        // We'll accumulate sentinel watchers here
-        const watchers = [];
-        // Create validator client if required
-        const validatorClient = await createValidatorClient(config, {
-            checkpointsBuilder: validatorCheckpointsBuilder,
-            worldState: worldStateSynchronizer,
-            p2pClient,
-            telemetry,
-            dateProvider,
-            epochCache,
-            blockSource: archiver,
-            l1ToL2MessageSource: archiver,
-            keyStoreManager,
-            blobClient
-        });
-        // If we have a validator client, register it as a source of offenses for the slasher,
-        // and have it register callbacks on the p2p client *before* we start it, otherwise messages
-        // like attestations or auths will fail.
-        if (validatorClient) {
-            watchers.push(validatorClient);
-            if (!options.dontStartSequencer) {
-                await validatorClient.registerHandlers();
-            }
-        }
-        // If there's no validator client but alwaysReexecuteBlockProposals is enabled,
-        // create a BlockProposalHandler to reexecute block proposals for monitoring
-        if (!validatorClient && config.alwaysReexecuteBlockProposals) {
-            log.info('Setting up block proposal reexecution for monitoring');
-            createBlockProposalHandler(config, {
-                checkpointsBuilder: validatorCheckpointsBuilder,
-                worldState: worldStateSynchronizer,
+        // Track started resources so we can clean up on partial failure during node creation.
+        const started = [];
+        try {
+            const archiver = await createArchiver(config, {
+                blobClient,
                 epochCache,
-                blockSource: archiver,
-                l1ToL2MessageSource: archiver,
-                p2pClient,
-                dateProvider,
-                telemetry
-            }).registerForReexecution(p2pClient);
-        }
-        // Start world state and wait for it to sync to the archiver.
-        await worldStateSynchronizer.start();
-        // Start p2p. Note that it depends on world state to be running.
-        await p2pClient.start();
-        const validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-        if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
-            watchers.push(validatorsSentinel);
-        }
-        let epochPruneWatcher;
-        if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-            epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), validatorCheckpointsBuilder, config);
-            watchers.push(epochPruneWatcher);
-        }
-        // We assume we want to slash for invalid attestations unless all max penalties are set to 0
-        let attestationsBlockWatcher;
-        if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
-            attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
-            watchers.push(attestationsBlockWatcher);
-        }
-        // Start p2p-related services once the archiver has completed sync
-        void archiver.waitForInitialSync().then(async ()=>{
-            await p2pClient.start();
-            await validatorsSentinel?.start();
-            await epochPruneWatcher?.start();
-            await attestationsBlockWatcher?.start();
-            log.info(`All p2p services started`);
-        }).catch((err)=>log.error('Failed to start p2p services after archiver sync', err));
-        // Validator enabled, create/start relevant service
-        let sequencer;
-        let slasherClient;
-        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.publisherForwarderAddress ? await createForwarderL1TxUtilsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.publisherForwarderAddress, {
-                ...config,
-                scope: 'sequencer'
-            }, {
                 telemetry,
-                logger: log.createChild('l1-tx-utils'),
                 dateProvider
-            }) : await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
-                ...config,
-                scope: 'sequencer'
             }, {
-                telemetry,
-                logger: log.createChild('l1-tx-utils'),
-                dateProvider
+                blockUntilSync: !config.skipArchiverInitialSync
             });
-            // Create and start the sequencer client
-            const checkpointsBuilder = new CheckpointsBuilder({
-                ...config,
+            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);
-            sequencer = await SequencerClient.new(config, {
-                ...deps,
-                epochCache,
-                l1TxUtils,
-                validatorClient,
-                p2pClient,
-                worldStateSynchronizer,
-                slasherClient,
-                checkpointsBuilder,
-                l2BlockSource: archiver,
-                l1ToL2MessageSource: archiver,
-                telemetry,
-                dateProvider,
-                blobClient,
-                nodeKeyStore: keyStoreManager
-            });
+            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,
+                    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));
+            // 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'),
+                    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
+                });
+            }
+            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, 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;
         }
-        if (!options.dontStartSequencer && sequencer) {
-            await sequencer.start();
-            log.verbose(`Sequencer started`);
-        } else if (sequencer) {
-            log.warn(`Sequencer created but not started`);
-        }
-        const globalVariableBuilder = new GlobalVariableBuilder({
-            ...config,
-            rollupVersion: BigInt(config.rollupVersion),
-            l1GenesisTime,
-            slotDuration: Number(slotDuration)
-        });
-        return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient);
     }
     /**
    * Returns the sequencer client instance.
@@ -716,6 +849,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ getSequencer() {
         return this.sequencer;
     }
+    /** Returns the prover node subsystem, if enabled. */ getProverNode() {
+        return this.proverNode;
+    }
     getBlockSource() {
         return this.blockSource;
     }
@@ -735,7 +871,10 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return Promise.resolve(this.p2pClient.getEnr()?.encodeTxt());
     }
     async getAllowedPublicSetup() {
-        return this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
+        return [
+            ...await getDefaultAllowedSetupFunctions(),
+            ...this.config.txPublicSetupAllowListExtend ?? []
+        ];
     }
     /**
    * Method to determine if the node is ready to accept transactions.
@@ -758,7 +897,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             rollupVersion,
             enr,
             l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
+            protocolContractAddresses: protocolContractAddresses,
+            realProofs: !!this.config.realProofs
         };
         return nodeInfo;
     }
@@ -767,8 +907,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * @param block - The block parameter (block number, block hash, or 'latest').
    * @returns The requested block.
    */ async getBlock(block) {
-        if (L2BlockHash.isL2BlockHash(block)) {
-            return this.getBlockByHash(Fr.fromBuffer(block.toBuffer()));
+        if (BlockHash.isBlockHash(block)) {
+            return this.getBlockByHash(block);
         }
         const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
         if (blockNumber === BlockNumber.ZERO) {
@@ -782,7 +922,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * @returns The requested block.
    */ async getBlockByHash(blockHash) {
         const initialBlockHash = await this.#getInitialHeaderHash();
-        if (blockHash.equals(Fr.fromBuffer(initialBlockHash.toBuffer()))) {
+        if (blockHash.equals(initialBlockHash)) {
             return this.buildInitialBlock();
         }
         return await this.blockSource.getL2BlockByHash(blockHash);
@@ -812,11 +952,14 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     async getCheckpointedBlocks(from, limit) {
         return await this.blockSource.getCheckpointedBlocks(from, limit) ?? [];
     }
-    /**
-   * Method to fetch the current min L2 fees.
-   * @returns The current min L2 fees.
-   */ async getCurrentMinFees() {
-        return await this.globalVariableBuilder.getCurrentMinFees();
+    getCheckpointsDataForEpoch(epochNumber) {
+        return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
+    }
+    async getCurrentMinFees() {
+        return await this.feeProvider.getCurrentMinFees();
+    }
+    /** Returns predicted min fees for the current slot and next N slots. */ async getPredictedMinFees(manaUsage) {
+        return await this.feeProvider.getPredictedMinFees(manaUsage);
     }
     async getMaxPriorityFees() {
         for await (const tx of this.p2pClient.iteratePendingTxs()){
@@ -839,6 +982,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     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
@@ -864,30 +1010,36 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return this.contractDataSource.getContract(address);
     }
     async getPrivateLogsByTags(tags, page, referenceBlock) {
+        let upToBlockNumber;
         if (referenceBlock) {
             const initialBlockHash = await this.#getInitialHeaderHash();
-            if (!referenceBlock.equals(initialBlockHash)) {
-                const blockHashFr = Fr.fromBuffer(referenceBlock.toBuffer());
-                const header = await this.blockSource.getBlockHeaderByHash(blockHashFr);
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
+                const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
                 if (!header) {
                     throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
                 }
+                upToBlockNumber = header.globalVariables.blockNumber;
             }
         }
-        return this.logsSource.getPrivateLogsByTags(tags, page);
+        return this.logsSource.getPrivateLogsByTags(tags, page, upToBlockNumber);
     }
     async getPublicLogsByTagsFromContract(contractAddress, tags, page, referenceBlock) {
+        let upToBlockNumber;
         if (referenceBlock) {
             const initialBlockHash = await this.#getInitialHeaderHash();
-            if (!referenceBlock.equals(initialBlockHash)) {
-                const blockHashFr = Fr.fromBuffer(referenceBlock.toBuffer());
-                const header = await this.blockSource.getBlockHeaderByHash(blockHashFr);
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
+                const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
                 if (!header) {
                     throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
                 }
+                upToBlockNumber = header.globalVariables.blockNumber;
             }
         }
-        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page);
+        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -922,8 +1074,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             throw new Error(`Invalid tx: ${reason}`);
         }
         await this.p2pClient.sendTx(tx);
-        this.metrics.receivedTx(timer.ms(), true);
-        this.log.info(`Received tx ${txHash}`, {
+        const duration = timer.ms();
+        this.metrics.receivedTx(duration, true);
+        this.log.info(`Received tx ${txHash} in ${duration}ms`, {
             txHash
         });
     }
@@ -934,18 +1087,20 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         const isKnownToPool = txPoolStatus === 'pending' || txPoolStatus === 'mined';
         // Then get the actual tx from the archiver, which tracks every tx in a mined block.
         const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
+        let receipt;
         if (settledTxReceipt) {
-            // If the archiver has the receipt then return it.
-            return settledTxReceipt;
+            receipt = settledTxReceipt;
         } else if (isKnownToPool) {
             // 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.
-            return new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
+            receipt = new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
         } else {
             // Otherwise, if we don't know the tx, we consider it dropped.
-            return new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
+            receipt = new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
         }
+        this.debugLogStore.decorateReceiptWithLogs(txHash.toString(), receipt);
+        return receipt;
     }
     getTxEffect(txHash) {
         return this.blockSource.getTxEffect(txHash);
@@ -957,8 +1112,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         await tryStop(this.validatorsSentinel);
         await tryStop(this.epochPruneWatcher);
         await tryStop(this.slasherClient);
-        await tryStop(this.proofVerifier);
+        await Promise.all([
+            tryStop(this.peerProofVerifier),
+            tryStop(this.rpcProofVerifier)
+        ]);
         await tryStop(this.sequencer);
+        await tryStop(this.proverNode);
         await tryStop(this.p2pClient);
         await tryStop(this.worldStateSynchronizer);
         await tryStop(this.blockSource);
@@ -997,79 +1156,83 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ async getTxsByHash(txHashes) {
         return compactArray(await Promise.all(txHashes.map((txHash)=>this.getTxByHash(txHash))));
     }
-    async findLeavesIndexes(block, treeId, leafValues) {
-        const committedDb = await this.#getWorldState(block);
+    async findLeavesIndexes(referenceBlock, treeId, leafValues) {
+        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 l2BlockHash = blockNumberToHash.get(blockNumber);
+            if (l2BlockHash === undefined) {
+                throw new Error(`Block hash not found for block number ${blockNumber}`);
             }
             return {
-                l2BlockNumber: BlockNumber(Number(blockNumber)),
-                l2BlockHash: L2BlockHash.fromField(blockHash),
+                l2BlockNumber: blockNumber,
+                l2BlockHash,
                 data: index
             };
         });
     }
-    async getNullifierSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, leafIndex);
-    }
-    async getNoteHashSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-    }
-    async getArchiveMembershipWitness(block, archive) {
-        const committedDb = await this.#getWorldState(block);
+    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, [
-            archive
+            blockHash
         ]);
         return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
     }
-    async getNoteHashMembershipWitness(block, noteHash) {
-        const committedDb = await this.#getWorldState(block);
+    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(block, l1ToL2Message) {
-        const db = await this.#getWorldState(block);
+    async getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message) {
+        const db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
             l1ToL2Message
         ]);
@@ -1082,9 +1245,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             witness.path
         ];
     }
-    async getL1ToL2MessageBlock(l1ToL2Message) {
+    async getL1ToL2MessageCheckpoint(l1ToL2Message) {
         const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-        return messageIndex ? BlockNumber.fromCheckpointNumber(InboxLeaf.checkpointNumberFromIndex(messageIndex)) : undefined;
+        return messageIndex ? InboxLeaf.checkpointNumberFromIndex(messageIndex) : undefined;
     }
     /**
    * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
@@ -1101,31 +1264,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 getArchiveSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.ARCHIVE, leafIndex);
-    }
-    async getPublicDataSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
-    }
-    async getNullifierMembershipWitness(block, nullifier) {
-        const db = await this.#getWorldState(block);
+    async getNullifierMembershipWitness(referenceBlock, nullifier) {
+        const db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
             nullifier.toBuffer()
         ]);
@@ -1139,35 +1282,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 block - The block parameter (block number, block hash, or 'latest') at which to get the data.
-   * @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(block, nullifier) {
-        const committedDb = await this.#getWorldState(block);
+    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(block, leafSlot) {
-        const committedDb = await this.#getWorldState(block);
+    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;
@@ -1177,8 +1307,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             return new PublicDataWitness(lowLeafResult.index, preimage, path);
         }
     }
-    async getPublicStorageAt(block, contract, slot) {
-        const committedDb = await this.#getWorldState(block);
+    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) {
@@ -1188,14 +1318,13 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return preimage.leaf.value;
     }
     async getBlockHeader(block = 'latest') {
-        if (L2BlockHash.isL2BlockHash(block)) {
+        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();
             }
-            const blockHashFr = Fr.fromBuffer(block.toBuffer());
-            return this.blockSource.getBlockHeaderByHash(blockHashFr);
+            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;
@@ -1212,6 +1341,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ 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.
@@ -1224,17 +1359,20 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             throw new BadRequestError(`Transaction total gas limit ${txGasLimit + teardownGasLimit} (${txGasLimit} + ${teardownGasLimit}) exceeds maximum gas limit ${this.config.rpcSimulatePublicMaxGasLimit} for simulation`);
         }
         const txHash = tx.getTxHash();
-        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
+        const latestBlockNumber = await this.blockSource.getBlockNumber();
+        const blockNumber = BlockNumber.add(latestBlockNumber, 1);
         // If sequencer is not initialized, we just set these values to zero for simulation.
         const coinbase = EthAddress.ZERO;
         const feeRecipient = AztecAddress.ZERO;
         const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(blockNumber, coinbase, feeRecipient);
-        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry);
+        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry, this.log.getBindings());
         this.log.verbose(`Simulating public calls for tx ${txHash}`, {
             globalVariables: newGlobalVariables.toInspect(),
             txHash,
             blockNumber
         });
+        // Ensure world-state has caught up with the latest block we loaded from the archiver
+        await this.worldStateSynchronizer.syncImmediate(latestBlockNumber);
         const merkleTreeFork = await this.worldStateSynchronizer.fork();
         try {
             const config = PublicSimulatorConfig.from({
@@ -1249,7 +1387,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             });
             const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
             // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
-            const [processedTxs, failedTxs, _usedTxs, returns] = await processor.process([
+            const [processedTxs, failedTxs, _usedTxs, returns, debugLogs] = await processor.process([
                 tx
             ]);
             // REFACTOR: Consider returning the error rather than throwing
@@ -1260,27 +1398,34 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 throw failedTxs[0].error;
             }
             const [processedTx] = processedTxs;
-            return new PublicSimulationOutput(processedTx.revertReason, processedTx.globalVariables, processedTx.txEffect, returns, processedTx.gasUsed);
+            return new PublicSimulationOutput(processedTx.revertReason, processedTx.globalVariables, processedTx.txEffect, returns, processedTx.gasUsed, debugLogs);
         } finally{
             await merkleTreeFork.close();
         }
     }
     async isValidTx(tx, { isSimulation, skipFeeEnforcement } = {}) {
         const db = this.worldStateSynchronizer.getCommitted();
-        const verifier = isSimulation ? undefined : this.proofVerifier;
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
+        const verifier = isSimulation ? undefined : this.rpcProofVerifier;
+        // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
         const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
         const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
-        const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
+        const l1Constants = await this.blockSource.getL1Constants();
+        const validator = createTxValidatorForAcceptingTxsOverRPC(db, this.contractDataSource, verifier, {
             timestamp: nextSlotTimestamp,
             blockNumber,
             l1ChainId: this.l1ChainId,
             rollupVersion: this.version,
-            setupAllowList: this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions(),
+            setupAllowList: [
+                ...await getDefaultAllowedSetupFunctions(),
+                ...this.config.txPublicSetupAllowListExtend ?? []
+            ],
             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);
     }
     getConfig() {
@@ -1302,7 +1447,18 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             archiver.updateConfig(config);
         }
         if (newConfig.realProofs !== this.config.realProofs) {
-            this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
+            await Promise.all([
+                tryStop(this.peerProofVerifier),
+                tryStop(this.rpcProofVerifier)
+            ]);
+            if (newConfig.realProofs) {
+                this.peerProofVerifier = await BatchChonkVerifier.new(newConfig, newConfig.bbChonkVerifyMaxBatch, 'peer');
+                const rpcVerifier = await BBCircuitVerifier.new(newConfig);
+                this.rpcProofVerifier = new QueuedIVCVerifier(rpcVerifier, newConfig.numConcurrentIVCVerifiers);
+            } else {
+                this.peerProofVerifier = new TestCircuitVerifier();
+                this.rpcProofVerifier = new TestCircuitVerifier();
+            }
         }
         this.config = newConfig;
     }
@@ -1362,7 +1518,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         });
         return Promise.resolve();
     }
-    async rollbackTo(targetBlock, force) {
+    async rollbackTo(targetBlock, force, resumeSync = true) {
         const archiver = this.blockSource;
         if (!('rollbackTo' in archiver)) {
             throw new Error('Archiver implementation does not support rollbacks.');
@@ -1390,9 +1546,13 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             this.log.error(`Error during rollback`, err);
             throw err;
         } finally{
-            this.log.info(`Resuming world state and archiver sync.`);
-            this.worldStateSynchronizer.resumeSync();
-            archiver.resume();
+            if (resumeSync) {
+                this.log.info(`Resuming world state and archiver sync.`);
+                this.worldStateSynchronizer.resumeSync();
+                archiver.resume();
+            } else {
+                this.log.info(`Sync left paused after rollback (resumeSync=false).`);
+            }
         }
     }
     async pauseSync() {
@@ -1406,22 +1566,110 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.blockSource.resume();
         return Promise.resolve();
     }
-    getSlashPayloads() {
-        if (!this.slasherClient) {
-            throw new Error(`Slasher client not enabled`);
-        }
-        return this.slasherClient.getSlashPayloads();
-    }
     getSlashOffenses(round) {
         if (!this.slasherClient) {
             throw new Error(`Slasher client not enabled`);
         }
         if (round === 'all') {
-            return this.slasherClient.getPendingOffenses();
+            return this.slasherClient.getOffenses();
         } else {
             return this.slasherClient.gatherOffensesForRound(round === 'current' ? undefined : BigInt(round));
         }
     }
+    async reloadKeystore() {
+        if (!this.config.keyStoreDirectory?.length) {
+            throw new BadRequestError('Cannot reload keystore: node is not using a file-based keystore. ' + 'Set KEY_STORE_DIRECTORY to use file-based keystores.');
+        }
+        if (!this.validatorClient) {
+            throw new BadRequestError('Cannot reload keystore: validator is not enabled.');
+        }
+        this.log.info('Reloading keystore from disk');
+        // Re-read and validate keystore files
+        const keyStores = loadKeystores(this.config.keyStoreDirectory);
+        const newManager = new KeystoreManager(mergeKeystores(keyStores));
+        await newManager.validateSigners();
+        ValidatorClient.validateKeyStoreConfiguration(newManager, this.log);
+        // Validate that every validator's publisher keys overlap with the L1 signers
+        // that were initialized at startup. Publishers cannot be hot-reloaded, so a
+        // validator with a publisher key that doesn't match any existing L1 signer
+        // would silently fail on every proposer slot.
+        if (this.keyStoreManager && this.sequencer) {
+            const oldAdapter = NodeKeystoreAdapter.fromKeyStoreManager(this.keyStoreManager);
+            const availablePublishers = new Set(oldAdapter.getAttesterAddresses().flatMap((a)=>oldAdapter.getPublisherAddresses(a).map((p)=>p.toString().toLowerCase())));
+            const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
+            for (const attester of newAdapter.getAttesterAddresses()){
+                const pubs = newAdapter.getPublisherAddresses(attester);
+                if (pubs.length > 0 && !pubs.some((p)=>availablePublishers.has(p.toString().toLowerCase()))) {
+                    throw new BadRequestError(`Cannot reload keystore: validator ${attester} has publisher keys ` + `[${pubs.map((p)=>p.toString()).join(', ')}] but none match the L1 signers initialized at startup ` + `[${[
+                        ...availablePublishers
+                    ].join(', ')}]. Publishers cannot be hot-reloaded — ` + `use an existing publisher key or restart the node.`);
+                }
+            }
+        }
+        // Build adapters for old and new keystores to compute diff
+        const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
+        const newAddresses = newAdapter.getAttesterAddresses();
+        const oldAddresses = this.keyStoreManager ? NodeKeystoreAdapter.fromKeyStoreManager(this.keyStoreManager).getAttesterAddresses() : [];
+        const oldSet = new Set(oldAddresses.map((a)=>a.toString()));
+        const newSet = new Set(newAddresses.map((a)=>a.toString()));
+        const added = newAddresses.filter((a)=>!oldSet.has(a.toString()));
+        const removed = oldAddresses.filter((a)=>!newSet.has(a.toString()));
+        if (added.length > 0) {
+            this.log.info(`Keystore reload: adding attester keys: ${added.map((a)=>a.toString()).join(', ')}`);
+        }
+        if (removed.length > 0) {
+            this.log.info(`Keystore reload: removing attester keys: ${removed.map((a)=>a.toString()).join(', ')}`);
+        }
+        if (added.length === 0 && removed.length === 0) {
+            this.log.info('Keystore reload: attester keys unchanged');
+        }
+        // Update the validator client (coinbase, feeRecipient, attester keys)
+        this.validatorClient.reloadKeystore(newManager);
+        // Update the publisher factory's keystore so newly-added validators
+        // can be matched to existing publisher keys when proposing blocks.
+        if (this.sequencer) {
+            this.sequencer.updatePublisherNodeKeyStore(newAdapter);
+        }
+        // Update slasher's "don't-slash-self" list with new validator addresses
+        if (this.slasherClient && !this.config.slashSelfAllowed) {
+            const slashValidatorsNever = unique([
+                ...this.config.slashValidatorsNever ?? [],
+                ...newAddresses
+            ].map((a)=>a.toString())).map(EthAddress.fromString);
+            this.slasherClient.updateConfig({
+                slashValidatorsNever
+            });
+        }
+        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();
@@ -1432,7 +1680,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
@@ -1444,30 +1692,57 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
             return this.worldStateSynchronizer.getCommitted();
         }
-        if (L2BlockHash.isL2BlockHash(block)) {
+        // 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)) {
-                // Block source doesn't handle initial header so we need to handle the case separately.
-                return this.worldStateSynchronizer.getSnapshot(BlockNumber.ZERO);
+                // 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();
             }
-            const blockHashFr = Fr.fromBuffer(block.toBuffer());
-            const header = await this.blockSource.getBlockHeaderByHash(blockHashFr);
-            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.`);
+        } 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 || !block.equals(blockHash)) {
+                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());
+        }
+        if (BlockHash.isBlockHash(block)) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (block.equals(initialBlockHash)) {
+                return BlockNumber.ZERO;
             }
-            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}).`);
+            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