@aztec/aztec-node 0.0.1-commit.3469e52 → 0.0.1-commit.350e0a4d

package/dest/aztec-node/server.js

@@ -371,55 +371,59 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
 var _dec, _initProto;
-import { createArchiver } from '@aztec/archiver';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
-import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
-import { EpochCache } from '@aztec/epoch-cache';
-import { createEthereumChain } from '@aztec/ethereum/chain';
-import { getPublicClient } 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 { Fr } from '@aztec/foundation/curves/bn254';
+import { BBCircuitVerifier, BatchChonkVerifier, QueuedIVCVerifier } from '@aztec/bb-prover';
+import { TestCircuitVerifier } from '@aztec/bb-prover/test';
+import { pickL1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { compactArray, pick, unique } from '@aztec/foundation/collection';
 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 { Timer } from '@aztec/foundation/timer';
 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 { uploadSnapshot } from '@aztec/node-lib/actions';
+import { createTxValidatorForAcceptingTxsOverRPC, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { 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 { L2BlockHash, L2BlockNew } from '@aztec/stdlib/block';
-import { GasFees } from '@aztec/stdlib/gas';
-import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS } from '@aztec/standard-contracts/multi-call-entrypoint';
+import { inspectBlockParameter } from '@aztec/stdlib/block';
+import { GasFees, getNetworkTxGasLimits } from '@aztec/stdlib/gas';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
-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 { NullDebugLogStore } from '@aztec/stdlib/logs';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBuilder, NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient, createValidatorForAcceptingTxs } from '@aztec/validator-client';
-import { createWorldStateSynchronizer } from '@aztec/world-state';
-import { createPublicClient, fallback, http } from 'viem';
-import { createSentinel } from '../sentinel/factory.js';
-import { createKeyStoreForValidator } from './config.js';
+import { NodeKeystoreAdapter, ValidatorClient } from '@aztec/validator-client';
+import { NodeBlockProvider } from '../modules/node_block_provider.js';
+import { NodeTxReceiptBuilder } from '../modules/node_tx_receipt.js';
+import { NodeWorldStateQueries } from '../modules/node_world_state_queries.js';
 import { NodeMetrics } from './node_metrics.js';
+import { NodePublicCallsSimulator } from './node_public_calls_simulator.js';
 _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         [Attributes.TX_HASH]: tx.getTxHash().toString()
     }));
 /**
  * The aztec node.
  */ export class AztecNodeService {
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "simulatePublicCalls"
+            ]
+        ], []));
+    }
+    metrics;
+    // Prevent two snapshot operations to happen simultaneously
+    isUploadingSnapshot = (_initProto(this), false);
+    // Saved minTxsPerBlock used by `pauseSequencer` to restore production-sequencer config on resume.
+    sequencerPausedMinTxsPerBlock;
+    nodePublicCallsSimulator;
+    worldStateQueries;
+    blockProvider;
+    txReceiptBuilder;
+    tracer;
     config;
     p2pClient;
     blockSource;
@@ -428,287 +432,155 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     l1ToL2MessageSource;
     worldStateSynchronizer;
     sequencer;
+    proverNode;
     slasherClient;
     validatorsSentinel;
-    epochPruneWatcher;
+    stopStartedWatchers;
     l1ChainId;
     version;
     globalVariableBuilder;
+    rollupContract;
+    feeProvider;
     epochCache;
     packageVersion;
-    proofVerifier;
+    peerProofVerifier;
+    rpcProofVerifier;
     telemetry;
     log;
     blobClient;
-    static{
-        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
-            [
-                _dec,
-                2,
-                "simulatePublicCalls"
-            ]
-        ], []));
-    }
-    metrics;
-    initialHeaderHashPromise;
-    // 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){
-        this.config = config;
-        this.p2pClient = p2pClient;
-        this.blockSource = blockSource;
-        this.logsSource = logsSource;
-        this.contractDataSource = contractDataSource;
-        this.l1ToL2MessageSource = l1ToL2MessageSource;
-        this.worldStateSynchronizer = worldStateSynchronizer;
-        this.sequencer = sequencer;
-        this.slasherClient = slasherClient;
-        this.validatorsSentinel = validatorsSentinel;
-        this.epochPruneWatcher = epochPruneWatcher;
-        this.l1ChainId = l1ChainId;
-        this.version = version;
-        this.globalVariableBuilder = globalVariableBuilder;
-        this.epochCache = epochCache;
-        this.packageVersion = packageVersion;
-        this.proofVerifier = proofVerifier;
-        this.telemetry = telemetry;
-        this.log = log;
-        this.blobClient = blobClient;
-        this.initialHeaderHashPromise = (_initProto(this), undefined);
-        this.isUploadingSnapshot = false;
-        this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
-        this.tracer = telemetry.getTracer('AztecNodeService');
+    validatorClient;
+    keyStoreManager;
+    debugLogStore;
+    automineSequencer;
+    constructor(deps){
+        this.config = deps.config;
+        this.p2pClient = deps.p2pClient;
+        this.blockSource = deps.blockSource;
+        this.logsSource = deps.logsSource;
+        this.contractDataSource = deps.contractDataSource;
+        this.l1ToL2MessageSource = deps.l1ToL2MessageSource;
+        this.worldStateSynchronizer = deps.worldStateSynchronizer;
+        this.sequencer = deps.sequencer;
+        this.proverNode = deps.proverNode;
+        this.slasherClient = deps.slasherClient;
+        this.validatorsSentinel = deps.validatorsSentinel;
+        this.stopStartedWatchers = deps.stopStartedWatchers;
+        this.l1ChainId = deps.l1ChainId;
+        this.version = deps.version;
+        this.globalVariableBuilder = deps.globalVariableBuilder;
+        this.rollupContract = deps.rollupContract;
+        this.feeProvider = deps.feeProvider;
+        this.epochCache = deps.epochCache;
+        this.packageVersion = deps.packageVersion;
+        this.peerProofVerifier = deps.peerProofVerifier;
+        this.rpcProofVerifier = deps.rpcProofVerifier;
+        this.telemetry = deps.telemetry ?? getTelemetryClient();
+        this.log = deps.log ?? createLogger('node');
+        this.blobClient = deps.blobClient;
+        this.validatorClient = deps.validatorClient;
+        this.keyStoreManager = deps.keyStoreManager;
+        this.debugLogStore = deps.debugLogStore ?? new NullDebugLogStore();
+        this.automineSequencer = deps.automineSequencer;
+        this.metrics = new NodeMetrics(this.telemetry, 'AztecNodeService');
+        this.tracer = this.telemetry.getTracer('AztecNodeService');
+        // The node never represents a proposer's payout addresses, so the simulator zeroes coinbase and
+        // fee recipient. The signature context only needs chain id + rollup address (see signature_utils).
+        this.nodePublicCallsSimulator = new NodePublicCallsSimulator({
+            blockSource: this.blockSource,
+            worldStateSynchronizer: this.worldStateSynchronizer,
+            l1ToL2MessageSource: this.l1ToL2MessageSource,
+            contractDataSource: this.contractDataSource,
+            globalVariableBuilder: this.globalVariableBuilder,
+            rollupContract: this.rollupContract,
+            epochCache: this.epochCache,
+            signatureContext: {
+                chainId: this.l1ChainId,
+                rollupAddress: this.config.rollupAddress
+            },
+            config: this.config,
+            telemetry: this.telemetry,
+            log: this.log.createChild('public-calls-simulator')
+        });
+        this.worldStateQueries = new NodeWorldStateQueries({
+            worldStateSynchronizer: this.worldStateSynchronizer,
+            blockSource: this.blockSource,
+            l1ToL2MessageSource: this.l1ToL2MessageSource,
+            log: this.log.createChild('world-state-queries')
+        });
+        this.blockProvider = new NodeBlockProvider(this.blockSource);
+        this.txReceiptBuilder = new NodeTxReceiptBuilder({
+            p2pClient: this.p2pClient,
+            blockSource: this.blockSource,
+            debugLogStore: this.debugLogStore
+        });
         this.log.info(`Aztec Node version: ${this.packageVersion}`);
-        this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
+        this.log.info(`Aztec Node started on chain 0x${this.l1ChainId.toString(16)}`, pickL1ContractAddresses(this.config));
+        // A defensive check that protects us against introducing a bug in the complex node creation flow. 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 (this.debugLogStore.isEnabled && this.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();
         return status.syncSummary;
     }
-    getL2Tips() {
+    getChainTips() {
         return this.blockSource.getL2Tips();
     }
-    /**
-   * initializes the Aztec Node, wait for component to sync.
-   * @param config - The configuration to be used by the aztec node.
-   * @returns - A fully synced Aztec Node for use in development/testing.
-   */ static async createAndSync(inputConfig, deps = {}, options = {}) {
-        const config = {
-            ...inputConfig
-        }; // Copy the config so we dont mutate the input object
-        const log = deps.logger ?? createLogger('node');
-        const packageVersion = getPackageVersion() ?? '';
-        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
-        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);
-            }
-        }
-        await keyStoreManager?.validateSigners();
-        // If we are a validator, verify our configuration before doing too much more.
-        if (!config.disableValidator) {
-            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');
-            }
-            ValidatorClient.validateKeyStoreConfiguration(keyStoreManager, log);
-        }
-        // validate that the actual chain id matches that specified in configuration
-        if (config.l1ChainId !== ethereumChain.chainInfo.id) {
-            throw new Error(`RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.l1ChainId}`);
-        }
-        const publicClient = createPublicClient({
-            chain: ethereumChain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
-                    batch: false
-                }))),
-            pollingInterval: config.viemPollingIntervalMS
-        });
-        const l1ContractsAddresses = await RegistryContract.collectAddresses(publicClient, config.l1Contracts.registryAddress, config.rollupVersion ?? 'canonical');
-        // Overwrite the passed in vars.
-        config.l1Contracts = {
-            ...config.l1Contracts,
-            ...l1ContractsAddresses
-        };
-        const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration, rollupVersionFromRollup] = await Promise.all([
-            rollupContract.getL1GenesisTime(),
-            rollupContract.getSlotDuration(),
-            rollupContract.getVersion()
-        ]);
-        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'));
-        // 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,
-                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
-            });
-            // Create and start the sequencer client
-            const checkpointsBuilder = new CheckpointsBuilder({
-                ...config,
-                l1GenesisTime,
-                slotDuration: Number(slotDuration)
-            }, 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
-            });
+    getL1Constants() {
+        return this.blockSource.getL1Constants();
+    }
+    getSyncedL2SlotNumber() {
+        return this.blockSource.getSyncedL2SlotNumber();
+    }
+    getSyncedL2EpochNumber() {
+        return this.blockSource.getSyncedL2EpochNumber();
+    }
+    getSyncedL1Timestamp() {
+        return this.blockSource.getL1Timestamp();
+    }
+    getCheckpointsData(query) {
+        return this.blockSource.getCheckpointsData(query);
+    }
+    async getBlockNumber(tip) {
+        if (tip === undefined || tip === 'proposed') {
+            return this.blockSource.getBlockNumber();
         }
-        if (!options.dontStartSequencer && sequencer) {
-            await sequencer.start();
-            log.verbose(`Sequencer started`);
-        } else if (sequencer) {
-            log.warn(`Sequencer created but not started`);
+        return await this.blockSource.getBlockNumber({
+            tag: tip
+        }) ?? BlockNumber.ZERO;
+    }
+    async getCheckpointNumber(tip) {
+        const tips = await this.blockSource.getL2Tips();
+        switch(tip){
+            case undefined:
+            case 'checkpointed':
+                return tips.checkpointed.checkpoint.number;
+            case 'proven':
+                return tips.proven.checkpoint.number;
+            case 'finalized':
+                return tips.finalized.checkpoint.number;
         }
-        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);
+    }
+    getBlock(param, options = {}) {
+        return this.blockProvider.getBlock(param, options);
+    }
+    getBlockData(param) {
+        return this.blockProvider.getBlockData(param);
+    }
+    getBlocks(from, limit, options = {}) {
+        return this.blockProvider.getBlocks(from, limit, options);
+    }
+    getCheckpoint(param, options = {}) {
+        return this.blockProvider.getCheckpoint(param, options);
+    }
+    getCheckpoints(from, limit, options = {}) {
+        return this.blockProvider.getCheckpoints(from, limit, options);
     }
     /**
    * Returns the sequencer client instance.
@@ -716,6 +588,12 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    */ getSequencer() {
         return this.sequencer;
     }
+    /** Test-only: returns the AutomineSequencer when wired via `useAutomineSequencer`. */ getAutomineSequencer() {
+        return this.automineSequencer;
+    }
+    /** Returns the prover node subsystem, if enabled. */ getProverNode() {
+        return this.proverNode;
+    }
     getBlockSource() {
         return this.blockSource;
     }
@@ -729,13 +607,16 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * Method to return the currently deployed L1 contract addresses.
    * @returns - The currently deployed L1 contract addresses.
    */ getL1ContractAddresses() {
-        return Promise.resolve(this.config.l1Contracts);
+        return Promise.resolve(pickL1ContractAddresses(this.config));
     }
     getEncodedEnr() {
         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.
@@ -744,88 +625,47 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         return Promise.resolve(this.p2pClient.isReady() ?? false);
     }
     async getNodeInfo() {
-        const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses] = await Promise.all([
+        const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses, l1Constants] = await Promise.all([
             this.getNodeVersion(),
             this.getVersion(),
             this.getChainId(),
             this.getEncodedEnr(),
             this.getL1ContractAddresses(),
-            this.getProtocolContractAddresses()
+            this.getProtocolContractAddresses(),
+            this.blockSource.getL1Constants()
         ]);
+        // Gas limits a single tx may declare on this network, derived from network-wide constants only (the
+        // timetable's blocks-per-checkpoint and the network-minimum per-block multipliers) — never this node's
+        // local caps or configured multipliers, which can make the node stricter at block-building time but
+        // cannot define what the network accepts for relay. Clients read txsLimits to set fallback gas limits.
+        const maxTxGas = getNetworkTxGasLimits(this.config, l1Constants);
         const nodeInfo = {
             nodeVersion,
             l1ChainId: chainId,
             rollupVersion,
             enr,
             l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
+            protocolContractAddresses: protocolContractAddresses,
+            realProofs: !!this.config.realProofs,
+            txsLimits: {
+                gas: {
+                    daGas: maxTxGas.daGas,
+                    l2Gas: maxTxGas.l2Gas
+                }
+            }
         };
         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 (L2BlockHash.isL2BlockHash(block)) {
-            return this.getBlockByHash(Fr.fromBuffer(block.toBuffer()));
-        }
-        const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
-        if (blockNumber === BlockNumber.ZERO) {
-            return this.buildInitialBlock();
-        }
-        return await this.blockSource.getL2BlockNew(blockNumber);
+    async getCurrentMinFees() {
+        return await this.feeProvider.getCurrentMinFees();
     }
-    /**
-   * 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(Fr.fromBuffer(initialBlockHash.toBuffer()))) {
-            return this.buildInitialBlock();
-        }
-        return await this.blockSource.getL2BlockNewByHash(blockHash);
-    }
-    buildInitialBlock() {
-        const initialHeader = this.worldStateSynchronizer.getCommitted().getInitialHeader();
-        return L2BlockNew.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.getL2BlockNewByArchive(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.getL2BlocksNew(from, limit) ?? [];
-    }
-    async getPublishedBlocks(from, limit) {
-        return await this.blockSource.getPublishedBlocks(from, limit) ?? [];
-    }
-    async getPublishedCheckpoints(from, limit) {
-        return await this.blockSource.getPublishedCheckpoints(from, limit) ?? [];
-    }
-    async getL2BlocksNew(from, limit) {
-        return await this.blockSource.getL2BlocksNew(from, limit) ?? [];
-    }
-    async getCheckpointedBlocks(from, limit, proven) {
-        return await this.blockSource.getCheckpointedBlocks(from, limit, proven) ?? [];
-    }
-    /**
-   * Method to fetch the current min L2 fees.
-   * @returns The current min L2 fees.
-   */ async getCurrentMinFees() {
-        return await this.globalVariableBuilder.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()){
+        for await (const tx of this.p2pClient.iteratePendingTxs({
+            includeProof: false
+        })){
             return tx.getGasSettings().maxPriorityFeesPerGas;
         }
         return GasFees.from({
@@ -834,15 +674,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();
-    }
-    /**
    * Method to fetch the version of the package.
    * @returns The node package version
    */ getNodeVersion() {
@@ -863,28 +694,18 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     getContractClass(id) {
         return this.contractDataSource.getContractClass(id);
     }
-    getContract(address) {
-        return this.contractDataSource.getContract(address);
-    }
-    getPrivateLogsByTags(tags, page) {
-        return this.logsSource.getPrivateLogsByTags(tags, page);
-    }
-    getPublicLogsByTagsFromContract(contractAddress, tags, page) {
-        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page);
+    async getContract(address, referenceBlock = 'latest') {
+        const blockData = await this.getBlockData(referenceBlock);
+        if (!blockData) {
+            throw new Error(`Reference block ${inspectBlockParameter(referenceBlock)} not found when querying contract ${address}. If the node API has been queried with an anchor block hash, possibly a reorg has occurred.`);
+        }
+        return this.contractDataSource.getContract(address, blockData.header.globalVariables.timestamp);
     }
-    /**
-   * Gets public logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */ getPublicLogs(filter) {
-        return this.logsSource.getPublicLogs(filter);
+    getPrivateLogsByTags(query) {
+        return this.logsSource.getPrivateLogsByTags(query);
     }
-    /**
-   * Gets contract class logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */ getContractClassLogs(filter) {
-        return this.logsSource.getContractClassLogs(filter);
+    getPublicLogsByTags(query) {
+        return this.logsSource.getPublicLogsByTags(query);
     }
     /**
    * Method to submit a transaction to the p2p pool.
@@ -904,25 +725,23 @@ _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}`, {
+        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`, {
             txHash
         });
     }
-    async getTxReceipt(txHash) {
-        let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
-        // We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
-        // for mined and then for pending there could be a race condition where the tx is mined between the two checks
-        // and we would incorrectly return a TxReceipt with status DROPPED
-        if (await this.p2pClient.getTxStatus(txHash) === 'pending') {
-            txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
-        }
-        const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
-        if (settledTxReceipt) {
-            txReceipt = settledTxReceipt;
-        }
-        return txReceipt;
+    getTxReceipt(txHash, options) {
+        return this.txReceiptBuilder.getTxReceipt(txHash, options);
     }
     getTxEffect(txHash) {
         return this.blockSource.getTxEffect(txHash);
@@ -931,11 +750,15 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * Method to stop the aztec node.
    */ async stop() {
         this.log.info(`Stopping Aztec Node`);
-        await tryStop(this.validatorsSentinel);
-        await tryStop(this.epochPruneWatcher);
+        await this.stopStartedWatchers();
         await tryStop(this.slasherClient);
-        await tryStop(this.proofVerifier);
+        await Promise.all([
+            tryStop(this.peerProofVerifier),
+            tryStop(this.rpcProofVerifier)
+        ]);
         await tryStop(this.sequencer);
+        await tryStop(this.automineSequencer);
+        await tryStop(this.proverNode);
         await tryStop(this.p2pClient);
         await tryStop(this.worldStateSynchronizer);
         await tryStop(this.blockSource);
@@ -954,309 +777,121 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
    * @param limit - The number of items to returns
    * @param after - The last known pending tx. Used for pagination
    * @returns - The pending txs.
-   */ getPendingTxs(limit, after) {
-        return this.p2pClient.getPendingTxs(limit, after);
+   */ getPendingTxs(limit, after, options) {
+        return this.p2pClient.getPendingTxs(limit, after, options);
     }
     getPendingTxCount() {
         return this.p2pClient.getPendingTxCount();
     }
+    getPeers(includePending) {
+        return this.p2pClient.getPeers(includePending);
+    }
+    getCheckpointAttestationsForSlot(slot, proposalPayloadHash) {
+        return this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalPayloadHash);
+    }
+    getProposalsForSlot(slot) {
+        return this.p2pClient.getProposalsForSlot(slot);
+    }
     /**
-   * Method to retrieve a single tx from the mempool or unfinalized chain.
+   * Method to retrieve a single tx from the mempool or unfinalized chain. The tx's proof is only loaded and returned
+   * when `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned tx (eg whether to include its proof).
    * @returns - The tx if it exists.
-   */ getTxByHash(txHash) {
-        return Promise.resolve(this.p2pClient.getTxByHashFromPool(txHash));
+   */ getTxByHash(txHash, options) {
+        return this.p2pClient.getTxByHashFromPool(txHash, {
+            includeProof: !!options?.includeProof
+        });
     }
     /**
-   * Method to retrieve txs from the mempool or unfinalized chain.
+   * Method to retrieve txs from the mempool or unfinalized chain. The txs' proofs are only loaded and returned when
+   * `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned txs (eg whether to include their proofs).
    * @returns - The txs if it exists.
-   */ 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);
-        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]}`);
-            }
-        }
-        // Get unique block numbers in order to optimize num calls to getLeafValue function.
-        const uniqueBlockNumbers = [
-            ...new Set(blockNumbers.filter((x)=>x !== undefined))
-        ];
-        // 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).
-        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.
-        for(let i = 0; i < uniqueBlockNumbers.length; i++){
-            if (blockHashes[i] === undefined) {
-                throw new Error(`Block hash is undefined for block number ${uniqueBlockNumbers[i]}`);
-            }
-        }
-        // Create DataInBlock objects by combining indices, blockNumbers and blockHashes and return them.
-        return maybeIndices.map((index, i)=>{
-            if (index === undefined) {
-                return undefined;
-            }
-            const blockNumber = blockNumbers[i];
-            if (blockNumber === undefined) {
-                return undefined;
-            }
-            const blockHashIndex = uniqueBlockNumbers.indexOf(blockNumber);
-            const blockHash = blockHashes[blockHashIndex];
-            if (!blockHash) {
-                return undefined;
-            }
-            return {
-                l2BlockNumber: BlockNumber(Number(blockNumber)),
-                l2BlockHash: L2BlockHash.fromField(blockHash),
-                data: index
-            };
+   */ async getTxsByHash(txHashes, options) {
+        const txs = await this.p2pClient.getTxsByHashFromPool(txHashes, {
+            includeProof: !!options?.includeProof
         });
+        return compactArray(txs);
     }
-    async getNullifierSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, leafIndex);
+    findLeavesIndexes(referenceBlock, treeId, leafValues) {
+        return this.worldStateQueries.findLeavesIndexes(referenceBlock, treeId, leafValues);
     }
-    async getNoteHashSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+    getBlockHashMembershipWitness(referenceBlock, blockHash) {
+        return this.worldStateQueries.getBlockHashMembershipWitness(referenceBlock, blockHash);
     }
-    async getArchiveMembershipWitness(block, archive) {
-        const committedDb = await this.#getWorldState(block);
-        const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.ARCHIVE, [
-            archive
-        ]);
-        return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
+    getNoteHashMembershipWitness(referenceBlock, noteHash) {
+        return this.worldStateQueries.getNoteHashMembershipWitness(referenceBlock, noteHash);
     }
-    async getNoteHashMembershipWitness(block, noteHash) {
-        const committedDb = await this.#getWorldState(block);
-        const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.NOTE_HASH_TREE, [
-            noteHash
-        ]);
-        return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
+    getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message) {
+        return this.worldStateQueries.getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message);
     }
-    async getL1ToL2MessageMembershipWitness(block, l1ToL2Message) {
-        const db = await this.#getWorldState(block);
-        const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
-            l1ToL2Message
-        ]);
-        if (!witness) {
-            return undefined;
-        }
-        // REFACTOR: Return a MembershipWitness object
-        return [
-            witness.index,
-            witness.path
-        ];
-    }
-    async getL1ToL2MessageBlock(l1ToL2Message) {
-        const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-        return messageIndex ? BlockNumber.fromCheckpointNumber(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.
-   * @param l1ToL2Message - The L1 to L2 message to check.
-   * @returns Whether the message is synced and ready to be included in a block.
-   */ async isL1ToL2MessageSynced(l1ToL2Message) {
-        const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-        return messageIndex !== undefined;
+    getL1ToL2MessageCheckpoint(l1ToL2Message) {
+        return this.worldStateQueries.getL1ToL2MessageCheckpoint(l1ToL2Message);
     }
     /**
    * Returns all the L2 to L1 messages in an epoch.
+   *
+   * @deprecated Use {@link getL2ToL1MembershipWitness} to get an L2-to-L1 message witness directly.
+   *
    * @param epoch - The epoch at which to get the data.
    * @returns The L2 to L1 messages (empty array if the epoch is not found).
-   */ async getL2ToL1Messages(epoch) {
-        // Assumes `getBlocksForEpoch` returns blocks in ascending order of block number.
-        const blocks = await this.blockSource.getBlocksForEpoch(epoch);
-        const blocksInCheckpoints = [];
-        let previousSlotNumber = SlotNumber.ZERO;
-        let checkpointIndex = -1;
-        for (const block of blocks){
-            const slotNumber = block.header.globalVariables.slotNumber;
-            if (slotNumber !== previousSlotNumber) {
-                checkpointIndex++;
-                blocksInCheckpoints.push([]);
-                previousSlotNumber = slotNumber;
-            }
-            blocksInCheckpoints[checkpointIndex].push(block);
-        }
-        return blocksInCheckpoints.map((blocks)=>blocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs)));
+   */ getL2ToL1Messages(epoch) {
+        return this.worldStateQueries.getL2ToL1Messages(epoch);
     }
-    async getArchiveSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.ARCHIVE, leafIndex);
+    /**
+   * Returns the L2-to-L1 membership witness for a message in `txHash`. Passthrough to the
+   * archiver's locally-cached resolver — see {@link Archiver.getL2ToL1MembershipWitness}.
+   */ getL2ToL1MembershipWitness(txHash, message, messageIndexInTx) {
+        return this.worldStateQueries.getL2ToL1MembershipWitness(txHash, message, messageIndexInTx);
     }
-    async getPublicDataSiblingPath(block, leafIndex) {
-        const committedDb = await this.#getWorldState(block);
-        return committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
+    getNullifierMembershipWitness(referenceBlock, nullifier) {
+        return this.worldStateQueries.getNullifierMembershipWitness(referenceBlock, nullifier);
     }
-    async getNullifierMembershipWitness(block, nullifier) {
-        const db = await this.#getWorldState(block);
-        const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
-            nullifier.toBuffer()
-        ]);
-        if (!witness) {
-            return undefined;
-        }
-        const { index, path } = witness;
-        const leafPreimage = await db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
-        if (!leafPreimage) {
-            return undefined;
-        }
-        return new NullifierMembershipWitness(index, leafPreimage, path);
+    getLowNullifierMembershipWitness(referenceBlock, nullifier) {
+        return this.worldStateQueries.getLowNullifierMembershipWitness(referenceBlock, nullifier);
     }
-    /**
-   * 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);
-        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`);
-        }
-        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);
-        const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
-        if (!lowLeafResult) {
-            return undefined;
-        } else {
-            const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-            const path = await committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-            return new PublicDataWitness(lowLeafResult.index, preimage, path);
-        }
+    getPublicDataWitness(referenceBlock, leafSlot) {
+        return this.worldStateQueries.getPublicDataWitness(referenceBlock, leafSlot);
     }
-    async getPublicStorageAt(block, contract, slot) {
-        const committedDb = await this.#getWorldState(block);
-        const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
-        const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
-        if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
-            return Fr.ZERO;
-        }
-        const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-        return preimage.leaf.value;
-    }
-    async getBlockHeader(block = 'latest') {
-        if (L2BlockHash.isL2BlockHash(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);
-        } 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);
+    getPublicStorageAt(referenceBlock, contract, slot) {
+        return this.worldStateQueries.getPublicStorageAt(referenceBlock, contract, slot);
     }
     /**
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
-   **/ async simulatePublicCalls(tx, skipFeeEnforcement = false) {
-        // Check total gas limit for simulation
-        const gasSettings = tx.data.constants.txContext.gasSettings;
-        const txGasLimit = gasSettings.gasLimits.l2Gas;
-        const teardownGasLimit = gasSettings.teardownGasLimits.l2Gas;
-        if (txGasLimit + teardownGasLimit > this.config.rpcSimulatePublicMaxGasLimit) {
-            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);
-        // 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);
-        this.log.verbose(`Simulating public calls for tx ${txHash}`, {
-            globalVariables: newGlobalVariables.toInspect(),
-            txHash,
-            blockNumber
-        });
-        const merkleTreeFork = await this.worldStateSynchronizer.fork();
-        try {
-            const config = PublicSimulatorConfig.from({
-                skipFeeEnforcement,
-                collectDebugLogs: true,
-                collectHints: false,
-                collectCallMetadata: true,
-                collectStatistics: false,
-                collectionLimits: CollectionLimitsConfig.from({
-                    maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads
-                })
-            });
-            const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
-            // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
-            const [processedTxs, failedTxs, _usedTxs, returns] = await processor.process([
-                tx
-            ]);
-            // REFACTOR: Consider returning the error rather than throwing
-            if (failedTxs.length) {
-                this.log.warn(`Simulated tx ${txHash} fails: ${failedTxs[0].error}`, {
-                    txHash
-                });
-                throw failedTxs[0].error;
-            }
-            const [processedTx] = processedTxs;
-            return new PublicSimulationOutput(processedTx.revertReason, processedTx.globalVariables, processedTx.txEffect, returns, processedTx.gasUsed);
-        } finally{
-            await merkleTreeFork.close();
-        }
+   * @param skipFeeEnforcement - If true, fee enforcement is skipped.
+   * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
+   **/ simulatePublicCalls(tx, skipFeeEnforcement = false, overrides) {
+        return this.nodePublicCallsSimulator.simulate(tx, skipFeeEnforcement, overrides);
     }
     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();
+        // Enforce the same network admission limit the node advertises in getNodeInfo (network-wide, not this
+        // node's local caps), so a tx the wallet sized against txsLimits is not rejected here.
+        const networkTxGasLimits = getNetworkTxGasLimits(this.config, l1Constants);
+        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
-        });
+            isSimulation,
+            txsPermitted: !this.config.disableTransactions,
+            maxTxL2Gas: networkTxGasLimits.l2Gas,
+            maxTxDAGas: networkTxGasLimits.daGas
+        }, this.log.getBindings());
         return await validator.validateTx(tx);
     }
     getConfig() {
@@ -1269,7 +904,20 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             ...this.config,
             ...config
         };
-        this.sequencer?.updateConfig(config);
+        // If the sequencer is currently paused via pauseSequencer(), record the caller's desired
+        // minTxsPerBlock as the restore value (so resumeSequencer applies it) and keep the freeze
+        // (MAX_SAFE_INTEGER) applied to the underlying sequencer. Without this guard, forwarding
+        // the new minTxsPerBlock to the sequencer would silently unpause block production while
+        // pauseSequencer() still considers it paused.
+        const sequencerUpdate = {
+            ...config
+        };
+        if (this.sequencerPausedMinTxsPerBlock !== undefined && sequencerUpdate.minTxsPerBlock !== undefined) {
+            this.sequencerPausedMinTxsPerBlock = sequencerUpdate.minTxsPerBlock;
+            delete sequencerUpdate.minTxsPerBlock;
+        }
+        this.sequencer?.updateConfig(sequencerUpdate);
+        this.automineSequencer?.updateConfig(sequencerUpdate);
         this.slasherClient?.updateConfig(config);
         this.validatorsSentinel?.updateConfig(config);
         await this.p2pClient.updateP2PConfig(config);
@@ -1278,7 +926,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;
     }
@@ -1287,7 +946,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             classRegistry: ProtocolContractAddress.ContractClassRegistry,
             feeJuice: ProtocolContractAddress.FeeJuice,
             instanceRegistry: ProtocolContractAddress.ContractInstanceRegistry,
-            multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint
+            multiCallEntrypoint: STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS
         });
     }
     registerContractFunctionSignatures(signatures) {
@@ -1338,7 +997,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.');
@@ -1366,9 +1025,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() {
@@ -1382,74 +1045,176 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         this.blockSource.resume();
         return Promise.resolve();
     }
-    getSlashPayloads() {
-        if (!this.slasherClient) {
-            throw new Error(`Slasher client not enabled`);
+    pauseSequencer() {
+        if (this.automineSequencer) {
+            this.automineSequencer.pause();
+            return Promise.resolve();
+        }
+        if (this.sequencer) {
+            if (this.sequencerPausedMinTxsPerBlock === undefined) {
+                this.sequencerPausedMinTxsPerBlock = this.sequencer.getSequencer().getConfig().minTxsPerBlock ?? 0;
+                this.sequencer.updateConfig({
+                    minTxsPerBlock: Number.MAX_SAFE_INTEGER
+                });
+                this.log.info(`Sequencer paused (minTxsPerBlock set to MAX_SAFE_INTEGER)`, {
+                    previousMinTxsPerBlock: this.sequencerPausedMinTxsPerBlock
+                });
+            }
+            return Promise.resolve();
+        }
+        throw new BadRequestError('Cannot pause sequencer: no sequencer is running');
+    }
+    resumeSequencer() {
+        if (this.automineSequencer) {
+            this.automineSequencer.resume();
+            return Promise.resolve();
+        }
+        if (this.sequencer) {
+            if (this.sequencerPausedMinTxsPerBlock !== undefined) {
+                const restored = this.sequencerPausedMinTxsPerBlock;
+                this.sequencerPausedMinTxsPerBlock = undefined;
+                this.sequencer.updateConfig({
+                    minTxsPerBlock: restored
+                });
+                this.log.info(`Sequencer resumed (minTxsPerBlock restored)`, {
+                    minTxsPerBlock: restored
+                });
+            }
+            return Promise.resolve();
         }
-        return this.slasherClient.getSlashPayloads();
+        throw new BadRequestError('Cannot resume sequencer: no sequencer is running');
     }
     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));
         }
     }
-    #getInitialHeaderHash() {
-        if (!this.initialHeaderHashPromise) {
-            this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash().then((hash)=>L2BlockHash.fromField(hash));
+    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.`);
+                }
+            }
         }
-        return this.initialHeaderHashPromise;
-    }
-    /**
-   * 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) {
-        let blockSyncedTo = BlockNumber.ZERO;
+        // 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.automineSequencer) {
+            await this.automineSequencer.buildEmptyBlock();
+            return;
+        }
+        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 {
-            // Attempt to sync the world state if necessary
-            blockSyncedTo = await this.#syncWorldState();
-        } catch (err) {
-            this.log.error(`Error getting world state: ${err}`);
+            // 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
+            });
         }
-        if (block === 'latest') {
-            this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getCommitted();
+    }
+    async prove(upToCheckpoint) {
+        if (!this.automineSequencer) {
+            throw new BadRequestError('Cannot prove checkpoint: no automine sequencer is running');
         }
-        if (L2BlockHash.isL2BlockHash(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 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.`);
-            }
-            const blockNumber = header.getBlockNumber();
-            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getSnapshot(blockNumber);
+        return await this.automineSequencer.prove(upToCheckpoint);
+    }
+    async warpL2TimeAtLeastTo(targetTimestamp) {
+        if (!this.automineSequencer) {
+            throw new BadRequestError('Cannot warp L2 time: no automine sequencer is running');
         }
-        // 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}).`);
-            }
-            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getSnapshot(blockNumber);
+        await this.automineSequencer.warpTo(targetTimestamp);
+    }
+    async warpL2TimeAtLeastBy(duration) {
+        if (!this.automineSequencer) {
+            throw new BadRequestError('Cannot warp L2 time: no automine sequencer is running');
         }
+        await this.automineSequencer.warpBy(duration);
     }
     /**
-   * Ensure we fully sync the world state
-   * @returns A promise that fulfils once the world state is synced
-   */ async #syncWorldState() {
-        const blockSourceHeight = await this.blockSource.getBlockNumber();
-        return await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
+   * Returns a committed world-state view at `block`, driving sync first. Delegates to
+   * {@link NodeWorldStateQueries.getWorldState}; kept as a protected method so subclasses and tests can
+   * exercise the node's block-resolution and reorg-aware sync behavior.
+   */ getWorldState(block) {
+        return this.worldStateQueries.getWorldState(block);
     }
 }