@aztec/aztec-node 0.0.1-commit.aada20e3 → 0.0.1-commit.b1c78909e

package/dest/aztec-node/server.js

@@ -374,12 +374,13 @@ var _dec, _initProto;
 import { createArchiver } from '@aztec/archiver';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 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 { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
 import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { compactArray, pick } from '@aztec/foundation/collection';
+import { 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';
@@ -389,9 +390,11 @@ 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 { createProverNode } from '@aztec/prover-node';
+import { createKeyStoreForProver } from '@aztec/prover-node/config';
 import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AttestationsBlockWatcher, EpochPruneWatcher, createSlasher } from '@aztec/slasher';
@@ -402,13 +405,13 @@ 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, createBlockProposalHandler, createValidatorClient } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 import { createPublicClient, fallback, http } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
@@ -428,6 +431,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     l1ToL2MessageSource;
     worldStateSynchronizer;
     sequencer;
+    proverNode;
     slasherClient;
     validatorsSentinel;
     epochPruneWatcher;
@@ -440,6 +444,9 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     telemetry;
     log;
     blobClient;
+    validatorClient;
+    keyStoreManager;
+    debugLogStore;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -454,7 +461,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, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient, validatorClient, keyStoreManager, debugLogStore = new NullDebugLogStore()){
         this.config = config;
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
@@ -463,6 +470,7 @@ _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;
@@ -475,12 +483,21 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         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');
+        }
     }
     async getWorldStateSyncStatus() {
         const status = await this.worldStateSynchronizer.status();
@@ -502,16 +519,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 +548,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);
         }
@@ -543,16 +571,17 @@ _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, {
@@ -569,48 +598,63 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         // 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);
+        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 proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
+        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(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 p2pClient = await createP2PClient(config, archiver, proofVerifier, worldStateSynchronizer, epochCache, packageVersion, dateProvider, telemetry, deps.p2pClientDeps);
+        // We'll accumulate sentinel watchers here
+        const watchers = [];
+        // Create FullNodeCheckpointsBuilder for block proposal handling and tx validation.
+        // Override maxTxsPerCheckpoint with the validator-specific limit if set.
         const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder({
             ...config,
             l1GenesisTime,
-            slotDuration: Number(slotDuration)
+            slotDuration: Number(slotDuration),
+            rollupManaLimit,
+            maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint
         }, 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();
+        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
+            });
+            // 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');
+        // If there's no validator client, create a BlockProposalHandler to handle block 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.
+        if (!validatorClient) {
+            const reexecute = !!config.alwaysReexecuteBlockProposals;
+            log.info(`Setting up block proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
             createBlockProposalHandler(config, {
                 checkpointsBuilder: validatorCheckpointsBuilder,
                 worldState: worldStateSynchronizer,
@@ -620,26 +664,29 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
                 p2pClient,
                 dateProvider,
                 telemetry
-            }).registerForReexecution(p2pClient);
+            }).register(p2pClient, reexecute);
         }
         // 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 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);
+        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 ()=>{
@@ -658,27 +705,30 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             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, {
+            const l1TxUtils = config.sequencerPublisherForwarderAddress ? await createForwarderL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.sequencerPublisherForwarderAddress, {
                 ...config,
                 scope: 'sequencer'
             }, {
                 telemetry,
                 logger: log.createChild('l1-tx-utils'),
-                dateProvider
-            }) : await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
+            }) : await createL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
                 ...config,
                 scope: 'sequencer'
             }, {
                 telemetry,
                 logger: log.createChild('l1-tx-utils'),
-                dateProvider
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
             });
             // Create and start the sequencer client
             const checkpointsBuilder = new CheckpointsBuilder({
                 ...config,
                 l1GenesisTime,
-                slotDuration: Number(slotDuration)
-            }, worldStateSynchronizer, archiver, dateProvider, telemetry);
+                slotDuration: Number(slotDuration),
+                rollupManaLimit
+            }, worldStateSynchronizer, archiver, dateProvider, telemetry, debugLogStore);
             sequencer = await SequencerClient.new(config, {
                 ...deps,
                 epochCache,
@@ -702,13 +752,35 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         } else if (sequencer) {
             log.warn(`Sequencer created but not started`);
         }
+        // Create prover node subsystem if enabled
+        let proverNode;
+        if (config.enableProverNode) {
+            proverNode = await createProverNode(config, {
+                ...deps.proverNodeDeps,
+                telemetry,
+                dateProvider,
+                archiver,
+                worldStateSynchronizer,
+                p2pClient,
+                epochCache,
+                blobClient,
+                keyStoreManager
+            });
+            if (!options.dontStartProverNode) {
+                await proverNode.start();
+                log.info(`Prover node subsystem started`);
+            } else {
+                log.info(`Prover node subsystem created but not started`);
+            }
+        }
         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);
+        const node = new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, proverNode, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient, validatorClient, keyStoreManager, debugLogStore);
+        return node;
     }
     /**
    * Returns the sequencer client instance.
@@ -716,6 +788,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 +810,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 +836,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             rollupVersion,
             enr,
             l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
+            protocolContractAddresses: protocolContractAddresses,
+            realProofs: !!this.config.realProofs
         };
         return nodeInfo;
     }
@@ -839,6 +918,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
@@ -920,8 +1002,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
         });
     }
@@ -932,18 +1015,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,6 +1042,7 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
         await tryStop(this.slasherClient);
         await tryStop(this.proofVerifier);
         await tryStop(this.sequencer);
+        await tryStop(this.proverNode);
         await tryStop(this.p2pClient);
         await tryStop(this.worldStateSynchronizer);
         await tryStop(this.blockSource);
@@ -998,47 +1084,51 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     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 blockHash = blockNumberToHash.get(blockNumber);
+            if (blockHash === undefined) {
+                throw new Error(`Block hash not found for block number ${blockNumber}`);
             }
             return {
-                l2BlockNumber: BlockNumber(Number(blockNumber)),
+                l2BlockNumber: blockNumber,
                 l2BlockHash: new BlockHash(blockHash),
                 data: index
             };
@@ -1072,9 +1162,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.
@@ -1194,6 +1284,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.
@@ -1206,7 +1302,8 @@ _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;
@@ -1217,6 +1314,8 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             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({
@@ -1231,7 +1330,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
@@ -1242,7 +1341,7 @@ _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();
         }
@@ -1250,18 +1349,25 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
     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)
+        // 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);
     }
@@ -1404,6 +1510,73 @@ _dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
             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');
+    }
     #getInitialHeaderHash() {
         if (!this.initialHeaderHashPromise) {
             this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();