@aztec/aztec-node 0.0.1-commit.5daedc8 → 0.0.1-commit.5de5ca79e

package/dest/aztec-node/server.js

@@ -1,18 +1,388 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+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 { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
+import { Blob } from '@aztec/blob-lib';
 import { EpochCache } from '@aztec/epoch-cache';
-import { RegistryContract, RollupContract, createEthereumChain, getPublicClient } from '@aztec/ethereum';
-import { compactArray, pick } from '@aztec/foundation/collection';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { getPublicClient, makeL1HttpTransport } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { chunkBy, compactArray, pick, unique } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { count } from '@aztec/foundation/string';
@@ -20,31 +390,36 @@ 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 { 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 { BlockBuilder, GlobalVariableBuilder, SequencerClient, createValidatorForAcceptingTxs } from '@aztec/sequencer-client';
+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';
-import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
+import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2BlockHash } from '@aztec/stdlib/block';
+import { BlockHash, L2Block } from '@aztec/stdlib/block';
 import { GasFees } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { InMemoryDebugLogStore, NullDebugLogStore } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
-import { P2PClientType } from '@aztec/stdlib/p2p';
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import { PublicSimulationOutput, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { NodeKeystoreAdapter, ValidatorClient, createBlockProposalHandler, createValidatorClient } 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 { createPublicClient } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
 import { createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
+_dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    }));
 /**
  * The aztec node.
  */ export class AztecNodeService {
@@ -56,6 +431,7 @@ import { NodeMetrics } from './node_metrics.js';
     l1ToL2MessageSource;
     worldStateSynchronizer;
     sequencer;
+    proverNode;
     slasherClient;
     validatorsSentinel;
     epochPruneWatcher;
@@ -67,11 +443,25 @@ import { NodeMetrics } from './node_metrics.js';
     proofVerifier;
     telemetry;
     log;
+    blobClient;
+    validatorClient;
+    keyStoreManager;
+    debugLogStore;
+    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')){
+    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;
@@ -80,6 +470,7 @@ import { NodeMetrics } from './node_metrics.js';
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.worldStateSynchronizer = worldStateSynchronizer;
         this.sequencer = sequencer;
+        this.proverNode = proverNode;
         this.slasherClient = slasherClient;
         this.validatorsSentinel = validatorsSentinel;
         this.epochPruneWatcher = epochPruneWatcher;
@@ -91,11 +482,22 @@ import { NodeMetrics } from './node_metrics.js';
         this.proofVerifier = proofVerifier;
         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();
@@ -116,20 +518,28 @@ import { NodeMetrics } from './node_metrics.js';
         const packageVersion = getPackageVersion() ?? '';
         const telemetry = deps.telemetry ?? getTelemetryClient();
         const dateProvider = deps.dateProvider ?? new DateProvider();
-        const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config, {
-            logger: createLogger('node:blob-sink:client')
-        });
         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();
@@ -138,8 +548,8 @@ import { NodeMetrics } from './node_metrics.js';
             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);
         }
@@ -149,7 +559,9 @@ import { NodeMetrics } from './node_metrics.js';
         }
         const publicClient = createPublicClient({
             chain: ethereumChain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+            transport: makeL1HttpTransport(config.l1RpcUrls, {
+                timeout: config.l1HttpTimeoutMS
+            }),
             pollingInterval: config.viemPollingIntervalMS
         });
         const l1ContractsAddresses = await RegistryContract.collectAddresses(publicClient, config.l1Contracts.registryAddress, config.rollupVersion ?? 'canonical');
@@ -159,22 +571,24 @@ import { NodeMetrics } from './node_metrics.js';
             ...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, log.createChild('blob-client'));
         // attempt snapshot sync if possible
         await trySnapshotSync(config, log);
         const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, {
             dateProvider
         });
         const archiver = await createArchiver(config, {
-            blobSinkClient,
+            blobClient,
             epochCache,
             telemetry,
             dateProvider
@@ -183,74 +597,97 @@ import { NodeMetrics } from './node_metrics.js';
         });
         // now create the merkle trees and the world state synchronizer
         const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.prefilledPublicData, telemetry);
-        const circuitVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+        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();
-        const blockBuilder = new BlockBuilder({
+        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 = createValidatorClient(config, {
-            p2pClient,
-            telemetry,
-            dateProvider,
-            epochCache,
-            blockBuilder,
-            blockSource: archiver,
-            l1ToL2MessageSource: archiver,
-            keyStoreManager
-        });
-        // 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,
+                slashingProtectionDb: deps.slashingProtectionDb
+            });
+            // If we have a validator client, register it as a source of offenses for the slasher,
+            // and have it register callbacks on the p2p client *before* we start it, otherwise messages
+            // like attestations or auths will fail.
+            if (validatorClient) {
+                watchers.push(validatorClient);
+                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, {
-                blockBuilder,
+                checkpointsBuilder: validatorCheckpointsBuilder,
+                worldState: worldStateSynchronizer,
                 epochCache,
                 blockSource: archiver,
                 l1ToL2MessageSource: archiver,
                 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(), blockBuilder, 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 ()=>{
@@ -263,21 +700,36 @@ import { NodeMetrics } from './node_metrics.js';
         // Validator enabled, create/start relevant service
         let sequencer;
         let slasherClient;
-        if (!config.disableValidator) {
+        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 = await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
+            const l1TxUtils = config.sequencerPublisherForwarderAddress ? await createForwarderL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.sequencerPublisherForwarderAddress, {
+                ...config,
+                scope: 'sequencer'
+            }, {
+                telemetry,
+                logger: log.createChild('l1-tx-utils'),
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
+            }) : await createL1TxUtilsFromSigners(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
                 ...config,
                 scope: 'sequencer'
             }, {
                 telemetry,
                 logger: log.createChild('l1-tx-utils'),
-                dateProvider
+                dateProvider,
+                kzg: Blob.getViemKzgInstance()
             });
             // Create and start the sequencer client
+            const checkpointsBuilder = new CheckpointsBuilder({
+                ...config,
+                l1GenesisTime,
+                slotDuration: Number(slotDuration),
+                rollupManaLimit
+            }, worldStateSynchronizer, archiver, dateProvider, telemetry, debugLogStore);
             sequencer = await SequencerClient.new(config, {
                 ...deps,
                 epochCache,
@@ -286,12 +738,12 @@ import { NodeMetrics } from './node_metrics.js';
                 p2pClient,
                 worldStateSynchronizer,
                 slasherClient,
-                blockBuilder,
+                checkpointsBuilder,
                 l2BlockSource: archiver,
                 l1ToL2MessageSource: archiver,
                 telemetry,
                 dateProvider,
-                blobSinkClient,
+                blobClient,
                 nodeKeyStore: keyStoreManager
             });
         }
@@ -301,7 +753,35 @@ import { NodeMetrics } from './node_metrics.js';
         } else if (sequencer) {
             log.warn(`Sequencer created but not started`);
         }
-        return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, new GlobalVariableBuilder(config), epochCache, packageVersion, proofVerifier, telemetry, log);
+        // 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)
+        });
+        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.
@@ -309,6 +789,9 @@ import { NodeMetrics } from './node_metrics.js';
    */ getSequencer() {
         return this.sequencer;
     }
+    /** Returns the prover node subsystem, if enabled. */ getProverNode() {
+        return this.proverNode;
+    }
     getBlockSource() {
         return this.blockSource;
     }
@@ -328,7 +811,10 @@ import { NodeMetrics } from './node_metrics.js';
         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.
@@ -351,33 +837,46 @@ import { NodeMetrics } from './node_metrics.js';
             rollupVersion,
             enr,
             l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
+            protocolContractAddresses: protocolContractAddresses,
+            realProofs: !!this.config.realProofs
         };
         return nodeInfo;
     }
     /**
-   * Get a block specified by its number.
-   * @param number - The block number being requested.
+   * 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(number) {
-        const blockNumber = number === 'latest' ? await this.getBlockNumber() : number;
-        return await this.blockSource.getBlock(blockNumber);
+   */ async getBlock(block) {
+        if (BlockHash.isBlockHash(block)) {
+            return this.getBlockByHash(block);
+        }
+        const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
+        if (blockNumber === BlockNumber.ZERO) {
+            return this.buildInitialBlock();
+        }
+        return await this.blockSource.getL2Block(blockNumber);
     }
     /**
    * Get a block specified by its hash.
    * @param blockHash - The block hash being requested.
    * @returns The requested block.
    */ async getBlockByHash(blockHash) {
-        const publishedBlock = await this.blockSource.getPublishedBlockByHash(blockHash);
-        return publishedBlock?.block;
+        const initialBlockHash = await this.#getInitialHeaderHash();
+        if (blockHash.equals(initialBlockHash)) {
+            return this.buildInitialBlock();
+        }
+        return await this.blockSource.getL2BlockByHash(blockHash);
+    }
+    buildInitialBlock() {
+        const initialHeader = this.worldStateSynchronizer.getCommitted().getInitialHeader();
+        return L2Block.empty(initialHeader);
     }
     /**
    * Get a block specified by its archive root.
    * @param archive - The archive root being requested.
    * @returns The requested block.
    */ async getBlockByArchive(archive) {
-        const publishedBlock = await this.blockSource.getPublishedBlockByArchive(archive);
-        return publishedBlock?.block;
+        return await this.blockSource.getL2BlockByArchive(archive);
     }
     /**
    * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
@@ -385,16 +884,22 @@ import { NodeMetrics } from './node_metrics.js';
    * @param limit - The maximum number of blocks to obtain.
    * @returns The blocks requested.
    */ async getBlocks(from, limit) {
-        return await this.blockSource.getBlocks(from, limit) ?? [];
+        return await this.blockSource.getBlocks(from, BlockNumber(limit)) ?? [];
+    }
+    async getCheckpoints(from, limit) {
+        return await this.blockSource.getCheckpoints(from, limit) ?? [];
     }
-    async getPublishedBlocks(from, limit) {
-        return await this.blockSource.getPublishedBlocks(from, limit) ?? [];
+    async getCheckpointedBlocks(from, limit) {
+        return await this.blockSource.getCheckpointedBlocks(from, limit) ?? [];
+    }
+    getCheckpointsDataForEpoch(epochNumber) {
+        return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
     }
     /**
-   * Method to fetch the current base fees.
-   * @returns The current base fees.
-   */ async getCurrentBaseFees() {
-        return await this.globalVariableBuilder.getCurrentBaseFees();
+   * Method to fetch the current min L2 fees.
+   * @returns The current min L2 fees.
+   */ async getCurrentMinFees() {
+        return await this.globalVariableBuilder.getCurrentMinFees();
     }
     async getMaxPriorityFees() {
         for await (const tx of this.p2pClient.iteratePendingTxs()){
@@ -414,6 +919,12 @@ import { NodeMetrics } from './node_metrics.js';
     async getProvenBlockNumber() {
         return await this.blockSource.getProvenBlockNumber();
     }
+    async getCheckpointedBlockNumber() {
+        return await this.blockSource.getCheckpointedL2BlockNumber();
+    }
+    getCheckpointNumber() {
+        return this.blockSource.getCheckpointNumber();
+    }
     /**
    * Method to fetch the version of the package.
    * @returns The node package version
@@ -438,22 +949,37 @@ import { NodeMetrics } from './node_metrics.js';
     getContract(address) {
         return this.contractDataSource.getContract(address);
     }
-    /**
-   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-   * @param from - The block number from which to begin retrieving logs.
-   * @param limit - The maximum number of blocks to retrieve logs from.
-   * @returns An array of private logs from the specified range of blocks.
-   */ getPrivateLogs(from, limit) {
-        return this.logsSource.getPrivateLogs(from, limit);
-    }
-    /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @param logsPerTag - The maximum number of logs to return for each tag. By default no limit is set
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   */ getLogsByTags(tags, logsPerTag) {
-        return this.logsSource.getLogsByTags(tags, logsPerTag);
+    async getPrivateLogsByTags(tags, page, referenceBlock) {
+        let upToBlockNumber;
+        if (referenceBlock) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
+                const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
+                if (!header) {
+                    throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
+                }
+                upToBlockNumber = header.globalVariables.blockNumber;
+            }
+        }
+        return this.logsSource.getPrivateLogsByTags(tags, page, upToBlockNumber);
+    }
+    async getPublicLogsByTagsFromContract(contractAddress, tags, page, referenceBlock) {
+        let upToBlockNumber;
+        if (referenceBlock) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (referenceBlock.equals(initialBlockHash)) {
+                upToBlockNumber = BlockNumber(0);
+            } else {
+                const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
+                if (!header) {
+                    throw new Error(`Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`);
+                }
+                upToBlockNumber = header.globalVariables.blockNumber;
+            }
+        }
+        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -488,24 +1014,33 @@ import { NodeMetrics } from './node_metrics.js';
             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
         });
     }
     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, '');
-        }
+        // Check the tx pool status first. If the tx is known to the pool (pending or mined), we'll use that
+        // as a fallback if we don't find a settled receipt in the archiver.
+        const txPoolStatus = await this.p2pClient.getTxStatus(txHash);
+        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) {
-            txReceipt = 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.
+            receipt = new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
+        } else {
+            // Otherwise, if we don't know the tx, we consider it dropped.
+            receipt = new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
         }
-        return txReceipt;
+        this.debugLogStore.decorateReceiptWithLogs(txHash.toString(), receipt);
+        return receipt;
     }
     getTxEffect(txHash) {
         return this.blockSource.getTxEffect(txHash);
@@ -519,13 +1054,21 @@ import { NodeMetrics } from './node_metrics.js';
         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);
+        await tryStop(this.blobClient);
         await tryStop(this.telemetry);
         this.log.info(`Stopped Aztec Node`);
     }
     /**
+   * Returns the blob client used by this node.
+   * @internal - Exposed for testing purposes only.
+   */ getBlobClient() {
+        return this.blobClient;
+    }
+    /**
    * Method to retrieve pending txs.
    * @param limit - The number of items to returns
    * @param after - The last known pending tx. Used for pagination
@@ -550,101 +1093,79 @@ import { NodeMetrics } from './node_metrics.js';
    */ async getTxsByHash(txHashes) {
         return compactArray(await Promise.all(txHashes.map((txHash)=>this.getTxByHash(txHash))));
     }
-    /**
-   * Find the indexes of the given leaves in the given tree along with a block metadata pointing to the block in which
-   * the leaves were inserted.
-   * @param blockNumber - The block number at which to get the data or 'latest' for latest data.
-   * @param treeId - The tree to search in.
-   * @param leafValues - The values to search for.
-   * @returns The indices of leaves and the block metadata of a block in which the leaves were inserted.
-   */ async findLeavesIndexes(blockNumber, treeId, leafValues) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    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, 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 InBlock objects by combining indices, blockNumbers and blockHashes and return them.
-        return maybeIndices.map((index, i)=>{
+        // Create DataInBlock objects by combining indices, blockNumbers and blockHashes and return them.
+        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: Number(blockNumber),
-                l2BlockHash: L2BlockHash.fromField(blockHash),
+                l2BlockNumber: blockNumber,
+                l2BlockHash: new BlockHash(blockHash),
                 data: index
             };
         });
     }
-    /**
-   * Returns a sibling path for the given index in the nullifier tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */ async getNullifierSiblingPath(blockNumber, leafIndex) {
-        const committedDb = await this.#getWorldState(blockNumber);
-        return committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, leafIndex);
-    }
-    /**
-   * Returns a sibling path for the given index in the data tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */ async getNoteHashSiblingPath(blockNumber, leafIndex) {
-        const committedDb = await this.#getWorldState(blockNumber);
-        return committedDb.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-    }
-    async getArchiveMembershipWitness(blockNumber, archive) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    async getBlockHashMembershipWitness(referenceBlock, blockHash) {
+        // The Noir circuit checks the archive membership proof against `anchor_block_header.last_archive.root`,
+        // which is the archive tree root BEFORE the anchor block was added (i.e. the state after block N-1).
+        // So we need the world state at block N-1, not block N, to produce a sibling path matching that root.
+        const referenceBlockNumber = await this.resolveBlockNumber(referenceBlock);
+        const committedDb = await this.getWorldState(BlockNumber(referenceBlockNumber - 1));
         const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.ARCHIVE, [
-            archive
+            blockHash
         ]);
         return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
     }
-    async getNoteHashMembershipWitness(blockNumber, noteHash) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    async getNoteHashMembershipWitness(referenceBlock, noteHash) {
+        const committedDb = await this.getWorldState(referenceBlock);
         const [pathAndIndex] = await committedDb.findSiblingPaths(MerkleTreeId.NOTE_HASH_TREE, [
             noteHash
         ]);
         return pathAndIndex === undefined ? undefined : MembershipWitness.fromSiblingPath(pathAndIndex.index, pathAndIndex.path);
     }
-    /**
-   * Returns the index and a sibling path for a leaf in the committed l1 to l2 data tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param l1ToL2Message - The l1ToL2Message to get the index / sibling path for.
-   * @returns A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
-   */ async getL1ToL2MessageMembershipWitness(blockNumber, l1ToL2Message) {
-        const db = await this.#getWorldState(blockNumber);
+    async getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message) {
+        const db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
             l1ToL2Message
         ]);
@@ -657,9 +1178,9 @@ import { NodeMetrics } from './node_metrics.js';
             witness.path
         ];
     }
-    async getL1ToL2MessageBlock(l1ToL2Message) {
+    async getL1ToL2MessageCheckpoint(l1ToL2Message) {
         const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-        return messageIndex ? InboxLeaf.l2BlockFromIndex(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.
@@ -670,38 +1191,17 @@ import { NodeMetrics } from './node_metrics.js';
         return messageIndex !== undefined;
     }
     /**
-   * Returns all the L2 to L1 messages in a block.
-   * @param blockNumber - The block number at which to get the data.
-   * @returns The L2 to L1 messages (undefined if the block number is not found).
-   */ async getL2ToL1Messages(blockNumber) {
-        const block = await this.blockSource.getBlock(blockNumber === 'latest' ? await this.getBlockNumber() : blockNumber);
-        return block?.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs);
-    }
-    /**
-   * Returns a sibling path for a leaf in the committed blocks tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - Index of the leaf in the tree.
-   * @returns The sibling path.
-   */ async getArchiveSiblingPath(blockNumber, leafIndex) {
-        const committedDb = await this.#getWorldState(blockNumber);
-        return committedDb.getSiblingPath(MerkleTreeId.ARCHIVE, leafIndex);
-    }
-    /**
-   * Returns a sibling path for a leaf in the committed public data tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - Index of the leaf in the tree.
-   * @returns The sibling path.
-   */ async getPublicDataSiblingPath(blockNumber, leafIndex) {
-        const committedDb = await this.#getWorldState(blockNumber);
-        return committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
-    }
-    /**
-   * Returns a nullifier membership witness for a given nullifier at a given block.
-   * @param blockNumber - The block number at which to get the index.
-   * @param nullifier - Nullifier we try to find witness for.
-   * @returns The nullifier membership witness (if found).
-   */ async getNullifierMembershipWitness(blockNumber, nullifier) {
-        const db = await this.#getWorldState(blockNumber);
+   * Returns all the L2 to L1 messages in an epoch.
+   * @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 `getCheckpointedBlocksForEpoch` returns blocks in ascending order of block number.
+        const checkpointedBlocks = await this.blockSource.getCheckpointedBlocksForEpoch(epoch);
+        const blocksInCheckpoints = chunkBy(checkpointedBlocks, (cb)=>cb.block.header.globalVariables.slotNumber).map((group)=>group.map((cb)=>cb.block));
+        return blocksInCheckpoints.map((blocks)=>blocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs)));
+    }
+    async getNullifierMembershipWitness(referenceBlock, nullifier) {
+        const db = await this.getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
             nullifier.toBuffer()
         ]);
@@ -715,35 +1215,22 @@ import { NodeMetrics } from './node_metrics.js';
         }
         return new NullifierMembershipWitness(index, leafPreimage, path);
     }
-    /**
-   * Returns a low nullifier membership witness for a given nullifier at a given block.
-   * @param blockNumber - The block number at which to get the index.
-   * @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(blockNumber, nullifier) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    async getLowNullifierMembershipWitness(referenceBlock, nullifier) {
+        const committedDb = await this.getWorldState(referenceBlock);
         const findResult = await committedDb.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
         if (!findResult) {
             return undefined;
         }
         const { index, alreadyPresent } = findResult;
         if (alreadyPresent) {
-            this.log.warn(`Nullifier ${nullifier.toBigInt()} already exists in the tree`);
+            throw new Error(`Cannot prove nullifier non-inclusion: nullifier ${nullifier.toBigInt()} already exists in the tree`);
         }
         const preimageData = await committedDb.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
         const siblingPath = await committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
         return new NullifierMembershipWitness(BigInt(index), preimageData, siblingPath);
     }
-    async getPublicDataWitness(blockNumber, leafSlot) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    async getPublicDataWitness(referenceBlock, leafSlot) {
+        const committedDb = await this.getWorldState(referenceBlock);
         const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
         if (!lowLeafResult) {
             return undefined;
@@ -753,18 +1240,8 @@ import { NodeMetrics } from './node_metrics.js';
             return new PublicDataWitness(lowLeafResult.index, preimage, path);
         }
     }
-    /**
-   * Gets the storage value at the given contract storage slot.
-   *
-   * @remarks The storage slot here refers to the slot as it is defined in Noir not the index in the merkle tree.
-   * Aztec's version of `eth_getStorageAt`.
-   *
-   * @param contract - Address of the contract to query.
-   * @param slot - Slot to query.
-   * @param blockNumber - The block number at which to get the data or 'latest'.
-   * @returns Storage value at the given contract slot.
-   */ async getPublicStorageAt(blockNumber, contract, slot) {
-        const committedDb = await this.#getWorldState(blockNumber);
+    async getPublicStorageAt(referenceBlock, contract, slot) {
+        const committedDb = await this.getWorldState(referenceBlock);
         const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
         const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
         if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
@@ -773,18 +1250,22 @@ import { NodeMetrics } from './node_metrics.js';
         const preimage = await committedDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
         return preimage.leaf.value;
     }
-    /**
-   * Returns the currently committed block header, or the initial header if no blocks have been produced.
-   * @returns The current committed block header.
-   */ async getBlockHeader(blockNumber = 'latest') {
-        return blockNumber === 0 || blockNumber === 'latest' && await this.blockSource.getBlockNumber() === 0 ? this.worldStateSynchronizer.getCommitted().getInitialHeader() : this.blockSource.getBlockHeader(blockNumber);
-    }
-    /**
-   * Get a block header specified by its hash.
-   * @param blockHash - The block hash being requested.
-   * @returns The requested block header.
-   */ async getBlockHeaderByHash(blockHash) {
-        return await this.blockSource.getBlockHeaderByHash(blockHash);
+    async getBlockHeader(block = 'latest') {
+        if (BlockHash.isBlockHash(block)) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (block.equals(initialBlockHash)) {
+                // Block source doesn't handle initial header so we need to handle the case separately.
+                return this.worldStateSynchronizer.getCommitted().getInitialHeader();
+            }
+            return this.blockSource.getBlockHeaderByHash(block);
+        } else {
+            // Block source doesn't handle initial header so we need to handle the case separately.
+            const blockNumber = block === 'latest' ? await this.getBlockNumber() : block;
+            if (blockNumber === BlockNumber.ZERO) {
+                return this.worldStateSynchronizer.getCommitted().getInitialHeader();
+            }
+            return this.blockSource.getBlockHeader(block);
+        }
     }
     /**
    * Get a block header specified by its archive root.
@@ -793,6 +1274,12 @@ import { NodeMetrics } from './node_metrics.js';
    */ 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.
@@ -805,17 +1292,20 @@ import { NodeMetrics } from './node_metrics.js';
             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 = await this.blockSource.getBlockNumber() + 1;
+        const latestBlockNumber = await this.blockSource.getBlockNumber();
+        const blockNumber = BlockNumber.add(latestBlockNumber, 1);
         // If sequencer is not initialized, we just set these values to zero for simulation.
         const coinbase = EthAddress.ZERO;
         const feeRecipient = AztecAddress.ZERO;
         const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(blockNumber, coinbase, feeRecipient);
-        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry);
+        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry, this.log.getBindings());
         this.log.verbose(`Simulating public calls for tx ${txHash}`, {
             globalVariables: newGlobalVariables.toInspect(),
             txHash,
             blockNumber
         });
+        // Ensure world-state has caught up with the latest block we loaded from the archiver
+        await this.worldStateSynchronizer.syncImmediate(latestBlockNumber);
         const merkleTreeFork = await this.worldStateSynchronizer.fork();
         try {
             const config = PublicSimulatorConfig.from({
@@ -823,12 +1313,14 @@ import { NodeMetrics } from './node_metrics.js';
                 collectDebugLogs: true,
                 collectHints: false,
                 collectCallMetadata: true,
-                maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads,
-                collectStatistics: false
+                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([
+            const [processedTxs, failedTxs, _usedTxs, returns, debugLogs] = await processor.process([
                 tx
             ]);
             // REFACTOR: Consider returning the error rather than throwing
@@ -839,7 +1331,7 @@ import { NodeMetrics } from './node_metrics.js';
                 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();
         }
@@ -847,19 +1339,26 @@ import { NodeMetrics } from './node_metrics.js';
     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 = await this.blockSource.getBlockNumber() + 1;
-        const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
+        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
+        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(),
-            gasFees: await this.getCurrentBaseFees(),
+            setupAllowList: [
+                ...await getDefaultAllowedSetupFunctions(),
+                ...this.config.txPublicSetupAllowListExtend ?? []
+            ],
+            gasFees: await this.getCurrentMinFees(),
             skipFeeEnforcement,
-            txsPermitted: !this.config.disableTransactions
-        });
+            txsPermitted: !this.config.disableTransactions,
+            rollupManaLimit: l1Constants.rollupManaLimit,
+            maxBlockL2Gas: this.config.validateMaxL2BlockGas,
+            maxBlockDAGas: this.config.validateMaxDABlockGas
+        }, this.log.getBindings());
         return await validator.validateTx(tx);
     }
     getConfig() {
@@ -919,7 +1418,7 @@ import { NodeMetrics } from './node_metrics.js';
             throw new Error(`Archiver initial sync not complete. Cannot start snapshot.`);
         }
         // And it has an L2 block hash
-        const l2BlockHash = await archiver.getL2Tips().then((tips)=>tips.latest.hash);
+        const l2BlockHash = await archiver.getL2Tips().then((tips)=>tips.proposed.hash);
         if (!l2BlockHash) {
             this.metrics.recordSnapshotError();
             throw new Error(`Archiver has no latest L2 block hash downloaded. Cannot start snapshot.`);
@@ -946,7 +1445,7 @@ import { NodeMetrics } from './node_metrics.js';
         if (!('rollbackTo' in archiver)) {
             throw new Error('Archiver implementation does not support rollbacks.');
         }
-        const finalizedBlock = await archiver.getL2Tips().then((tips)=>tips.finalized.number);
+        const finalizedBlock = await archiver.getL2Tips().then((tips)=>tips.finalized.block.number);
         if (targetBlock < finalizedBlock) {
             if (force) {
                 this.log.warn(`Clearing world state database to allow rolling back behind finalized block ${finalizedBlock}`);
@@ -1001,42 +1500,148 @@ import { NodeMetrics } from './node_metrics.js';
             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();
+        }
+        return this.initialHeaderHashPromise;
+    }
     /**
    * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
-   * @param blockNumber - The block number at which to get the data.
+   * @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(blockNumber) {
-        if (typeof blockNumber === 'number' && blockNumber < INITIAL_L2_BLOCK_NUM - 1) {
-            throw new Error('Invalid block number to get world state for: ' + blockNumber);
-        }
-        let blockSyncedTo = 0;
+   */ async getWorldState(block) {
+        let blockSyncedTo = BlockNumber.ZERO;
         try {
             // Attempt to sync the world state if necessary
             blockSyncedTo = await this.#syncWorldState();
         } catch (err) {
             this.log.error(`Error getting world state: ${err}`);
         }
-        // using a snapshot could be less efficient than using the committed db
-        if (blockNumber === 'latest' /*|| blockNumber === blockSyncedTo*/ ) {
-            this.log.debug(`Using committed db for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
+        if (block === 'latest') {
+            this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
             return this.worldStateSynchronizer.getCommitted();
-        } else if (blockNumber <= blockSyncedTo) {
-            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
-            return this.worldStateSynchronizer.getSnapshot(blockNumber);
+        }
+        // Get the block number, either directly from the parameter or by quering the archiver with the block hash
+        let blockNumber;
+        if (BlockHash.isBlockHash(block)) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (block.equals(initialBlockHash)) {
+                // Block source doesn't handle initial header so we need to handle the case separately.
+                return this.worldStateSynchronizer.getSnapshot(BlockNumber.ZERO);
+            }
+            const header = await this.blockSource.getBlockHeaderByHash(block);
+            if (!header) {
+                throw new Error(`Block hash ${block.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
+            }
+            blockNumber = header.getBlockNumber();
         } else {
-            throw new Error(`Block ${blockNumber} not yet synced`);
+            blockNumber = block;
+        }
+        // Check it's within world state sync range
+        if (blockNumber > blockSyncedTo) {
+            throw new Error(`Queried block ${block} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+        }
+        this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
+        const snapshot = this.worldStateSynchronizer.getSnapshot(blockNumber);
+        // Double-check world-state synced to the same block hash as was requested
+        if (BlockHash.isBlockHash(block)) {
+            const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
+            if (!blockHash || !new BlockHash(blockHash).equals(block)) {
+                throw new Error(`Block hash ${block.toString()} not found in world state at block number ${blockNumber}. If the node API has been queried with anchor block hash possibly a reorg has occurred.`);
+            }
+        }
+        return snapshot;
+    }
+    /** Resolves a block parameter to a block number. */ async resolveBlockNumber(block) {
+        if (block === 'latest') {
+            return BlockNumber(await this.blockSource.getBlockNumber());
+        }
+        if (BlockHash.isBlockHash(block)) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (block.equals(initialBlockHash)) {
+                return BlockNumber.ZERO;
+            }
+            const header = await this.blockSource.getBlockHeaderByHash(block);
+            if (!header) {
+                throw new Error(`Block hash ${block.toString()} not found.`);
+            }
+            return header.getBlockNumber();
         }
+        return block;
     }
     /**
    * 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 this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
+        return await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
     }
 }
-_ts_decorate([
-    trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], AztecNodeService.prototype, "simulatePublicCalls", null);