@aztec/aztec-node 0.0.1-commit.5daedc8 → 0.0.1-commit.6a729f7

package/dest/aztec-node/server.js

@@ -1,18 +1,387 @@
-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 { EpochCache } from '@aztec/epoch-cache';
-import { RegistryContract, RollupContract, createEthereumChain, getPublicClient } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { compactArray, pick } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { 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,15 +389,15 @@ 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 { createForwarderL1TxUtilsFromEthSigner, createL1TxUtilsWithBlobsFromEthSigner } from '@aztec/node-lib/factories';
 import { createP2PClient, getDefaultAllowedSetupFunctions } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { BlockBuilder, GlobalVariableBuilder, SequencerClient, createValidatorForAcceptingTxs } from '@aztec/sequencer-client';
+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';
@@ -39,12 +408,15 @@ import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@az
 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, createValidatorForAcceptingTxs } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 import { createPublicClient, fallback, http } from 'viem';
 import { createSentinel } from '../sentinel/factory.js';
 import { createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
+_dec = trackSpan('AztecNodeService.simulatePublicCalls', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    }));
 /**
  * The aztec node.
  */ export class AztecNodeService {
@@ -67,11 +439,22 @@ import { NodeMetrics } from './node_metrics.js';
     proofVerifier;
     telemetry;
     log;
+    blobClient;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "simulatePublicCalls"
+            ]
+        ], []));
+    }
     metrics;
+    initialHeaderHashPromise;
     // Prevent two snapshot operations to happen simultaneously
     isUploadingSnapshot;
     tracer;
-    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node')){
+    constructor(config, p2pClient, blockSource, logsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, l1ChainId, version, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry = getTelemetryClient(), log = createLogger('node'), blobClient){
         this.config = config;
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
@@ -91,6 +474,8 @@ import { NodeMetrics } from './node_metrics.js';
         this.proofVerifier = proofVerifier;
         this.telemetry = telemetry;
         this.log = log;
+        this.blobClient = blobClient;
+        this.initialHeaderHashPromise = (_initProto(this), undefined);
         this.isUploadingSnapshot = false;
         this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
         this.tracer = telemetry.getTracer('AztecNodeService');
@@ -116,9 +501,6 @@ 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
         let keyStoreManager;
@@ -149,7 +531,9 @@ import { NodeMetrics } from './node_metrics.js';
         }
         const publicClient = createPublicClient({
             chain: ethereumChain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+            transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
+                    batch: false
+                }))),
             pollingInterval: config.viemPollingIntervalMS
         });
         const l1ContractsAddresses = await RegistryContract.collectAddresses(publicClient, config.l1Contracts.registryAddress, config.rollupVersion ?? 'canonical');
@@ -168,13 +552,14 @@ import { NodeMetrics } from './node_metrics.js';
         if (config.rollupVersion !== Number(rollupVersionFromRollup)) {
             log.warn(`Registry looked up and returned a rollup with version (${config.rollupVersion}), but this does not match with version detected from the rollup directly: (${rollupVersionFromRollup}).`);
         }
+        const blobClient = await createBlobClientWithFileStores(config, createLogger('node:blob-client:client'));
         // attempt snapshot sync if possible
         await trySnapshotSync(config, log);
         const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, {
             dateProvider
         });
         const archiver = await createArchiver(config, {
-            blobSinkClient,
+            blobClient,
             epochCache,
             telemetry,
             dateProvider
@@ -183,7 +568,7 @@ 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);
         if (!config.realProofs) {
             log.warn(`Aztec node is accepting fake proofs`);
         }
@@ -192,7 +577,8 @@ import { NodeMetrics } from './node_metrics.js';
         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({
+        // Create FullNodeCheckpointsBuilder for validator and non-validator block proposal handling
+        const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder({
             ...config,
             l1GenesisTime,
             slotDuration: Number(slotDuration)
@@ -200,15 +586,17 @@ import { NodeMetrics } from './node_metrics.js';
         // We'll accumulate sentinel watchers here
         const watchers = [];
         // Create validator client if required
-        const validatorClient = createValidatorClient(config, {
+        const validatorClient = await createValidatorClient(config, {
+            checkpointsBuilder: validatorCheckpointsBuilder,
+            worldState: worldStateSynchronizer,
             p2pClient,
             telemetry,
             dateProvider,
             epochCache,
-            blockBuilder,
             blockSource: archiver,
             l1ToL2MessageSource: archiver,
-            keyStoreManager
+            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
@@ -224,7 +612,8 @@ import { NodeMetrics } from './node_metrics.js';
         if (!validatorClient && config.alwaysReexecuteBlockProposals) {
             log.info('Setting up block proposal reexecution for monitoring');
             createBlockProposalHandler(config, {
-                blockBuilder,
+                checkpointsBuilder: validatorCheckpointsBuilder,
+                worldState: worldStateSynchronizer,
                 epochCache,
                 blockSource: archiver,
                 l1ToL2MessageSource: archiver,
@@ -243,7 +632,7 @@ import { NodeMetrics } from './node_metrics.js';
         }
         let epochPruneWatcher;
         if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-            epochPruneWatcher = new EpochPruneWatcher(archiver, archiver, epochCache, p2pClient.getTxProvider(), blockBuilder, config);
+            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
@@ -263,13 +652,20 @@ 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.publisherForwarderAddress ? await createForwarderL1TxUtilsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), config.publisherForwarderAddress, {
+                ...config,
+                scope: 'sequencer'
+            }, {
+                telemetry,
+                logger: log.createChild('l1-tx-utils'),
+                dateProvider
+            }) : await createL1TxUtilsWithBlobsFromEthSigner(publicClient, keyStoreManager.createAllValidatorPublisherSigners(), {
                 ...config,
                 scope: 'sequencer'
             }, {
@@ -278,6 +674,11 @@ import { NodeMetrics } from './node_metrics.js';
                 dateProvider
             });
             // Create and start the sequencer client
+            const checkpointsBuilder = new CheckpointsBuilder({
+                ...config,
+                l1GenesisTime,
+                slotDuration: Number(slotDuration)
+            }, worldStateSynchronizer, archiver, dateProvider, telemetry);
             sequencer = await SequencerClient.new(config, {
                 ...deps,
                 epochCache,
@@ -286,12 +687,12 @@ import { NodeMetrics } from './node_metrics.js';
                 p2pClient,
                 worldStateSynchronizer,
                 slasherClient,
-                blockBuilder,
+                checkpointsBuilder,
                 l2BlockSource: archiver,
                 l1ToL2MessageSource: archiver,
                 telemetry,
                 dateProvider,
-                blobSinkClient,
+                blobClient,
                 nodeKeyStore: keyStoreManager
             });
         }
@@ -301,7 +702,13 @@ 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);
+        const globalVariableBuilder = new GlobalVariableBuilder({
+            ...config,
+            rollupVersion: BigInt(config.rollupVersion),
+            l1GenesisTime,
+            slotDuration: Number(slotDuration)
+        });
+        return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, slasherClient, validatorsSentinel, epochPruneWatcher, ethereumChain.chainInfo.id, config.rollupVersion, globalVariableBuilder, epochCache, packageVersion, proofVerifier, telemetry, log, blobClient);
     }
     /**
    * Returns the sequencer client instance.
@@ -356,28 +763,40 @@ import { NodeMetrics } from './node_metrics.js';
         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 +804,19 @@ 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) ?? [];
     }
     /**
-   * 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 +836,9 @@ import { NodeMetrics } from './node_metrics.js';
     async getProvenBlockNumber() {
         return await this.blockSource.getProvenBlockNumber();
     }
+    async getCheckpointedBlockNumber() {
+        return await this.blockSource.getCheckpointedL2BlockNumber();
+    }
     /**
    * Method to fetch the version of the package.
    * @returns The node package version
@@ -438,22 +863,29 @@ 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) {
+        if (referenceBlock) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (!referenceBlock.equals(initialBlockHash)) {
+                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.`);
+                }
+            }
+        }
+        return this.logsSource.getPrivateLogsByTags(tags, page);
+    }
+    async getPublicLogsByTagsFromContract(contractAddress, tags, page, referenceBlock) {
+        if (referenceBlock) {
+            const initialBlockHash = await this.#getInitialHeaderHash();
+            if (!referenceBlock.equals(initialBlockHash)) {
+                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.`);
+                }
+            }
+        }
+        return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -494,18 +926,24 @@ import { NodeMetrics } from './node_metrics.js';
         });
     }
     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);
         if (settledTxReceipt) {
-            txReceipt = settledTxReceipt;
+            // If the archiver has the receipt then return it.
+            return 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);
+        } 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');
         }
-        return txReceipt;
     }
     getTxEffect(txHash) {
         return this.blockSource.getTxEffect(txHash);
@@ -522,10 +960,17 @@ import { NodeMetrics } from './node_metrics.js';
         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,15 +995,8 @@ 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);
@@ -577,7 +1015,7 @@ import { NodeMetrics } from './node_metrics.js';
         // Now we obtain the block hashes from the archive tree by calling await `committedDb.getLeafValue(treeId, index)`
         // (note that block number corresponds to the leaf index in the archive tree).
         const blockHashes = await Promise.all(uniqueBlockNumbers.map((blockNumber)=>{
-            return committedDb.getLeafValue(MerkleTreeId.ARCHIVE, blockNumber);
+            return committedDb.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
         }));
         // If any of the block hashes are undefined, we throw an error.
         for(let i = 0; i < uniqueBlockNumbers.length; i++){
@@ -585,7 +1023,7 @@ import { NodeMetrics } from './node_metrics.js';
                 throw new Error(`Block hash is undefined for block number ${uniqueBlockNumbers[i]}`);
             }
         }
-        // Create InBlock objects by combining indices, blockNumbers and blockHashes and return them.
+        // Create DataInBlock objects by combining indices, blockNumbers and blockHashes and return them.
         return maybeIndices.map((index, i)=>{
             if (index === undefined) {
                 return undefined;
@@ -600,51 +1038,28 @@ import { NodeMetrics } from './node_metrics.js';
                 return undefined;
             }
             return {
-                l2BlockNumber: Number(blockNumber),
-                l2BlockHash: L2BlockHash.fromField(blockHash),
+                l2BlockNumber: BlockNumber(Number(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) {
+        const committedDb = await this.#getWorldState(referenceBlock);
         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
         ]);
@@ -659,7 +1074,7 @@ import { NodeMetrics } from './node_metrics.js';
     }
     async getL1ToL2MessageBlock(l1ToL2Message) {
         const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-        return messageIndex ? InboxLeaf.l2BlockFromIndex(messageIndex) : undefined;
+        return messageIndex ? BlockNumber.fromCheckpointNumber(InboxLeaf.checkpointNumberFromIndex(messageIndex)) : undefined;
     }
     /**
    * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
@@ -670,38 +1085,29 @@ 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 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 = [];
+        let previousSlotNumber = SlotNumber.ZERO;
+        let checkpointIndex = -1;
+        for (const checkpointedBlock of checkpointedBlocks){
+            const block = checkpointedBlock.block;
+            const slotNumber = block.header.globalVariables.slotNumber;
+            if (slotNumber !== previousSlotNumber) {
+                checkpointIndex++;
+                blocksInCheckpoints.push([]);
+                previousSlotNumber = slotNumber;
+            }
+            blocksInCheckpoints[checkpointIndex].push(block);
+        }
+        return blocksInCheckpoints.map((blocks)=>blocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs)));
     }
-    /**
-   * 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);
+    async getNullifierMembershipWitness(referenceBlock, nullifier) {
+        const db = await this.#getWorldState(referenceBlock);
         const [witness] = await db.findSiblingPaths(MerkleTreeId.NULLIFIER_TREE, [
             nullifier.toBuffer()
         ]);
@@ -717,7 +1123,8 @@ import { NodeMetrics } from './node_metrics.js';
     }
     /**
    * 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 referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data
+   * (which contains the root of the nullifier tree in which we are searching for the nullifier).
    * @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
@@ -728,8 +1135,8 @@ import { NodeMetrics } from './node_metrics.js';
    * 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;
@@ -742,8 +1149,8 @@ import { NodeMetrics } from './node_metrics.js';
         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 +1160,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 +1170,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.
@@ -805,12 +1206,12 @@ 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 blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
         // If sequencer is not initialized, we just set these values to zero for simulation.
         const coinbase = EthAddress.ZERO;
         const feeRecipient = AztecAddress.ZERO;
         const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(blockNumber, coinbase, feeRecipient);
-        const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry);
+        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,
@@ -823,8 +1224,10 @@ 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
@@ -849,17 +1252,17 @@ import { NodeMetrics } from './node_metrics.js';
         const verifier = isSimulation ? undefined : this.proofVerifier;
         // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
         const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const blockNumber = await this.blockSource.getBlockNumber() + 1;
+        const blockNumber = BlockNumber(await this.blockSource.getBlockNumber() + 1);
         const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
             timestamp: nextSlotTimestamp,
             blockNumber,
             l1ChainId: this.l1ChainId,
             rollupVersion: this.version,
             setupAllowList: this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions(),
-            gasFees: await this.getCurrentBaseFees(),
+            gasFees: await this.getCurrentMinFees(),
             skipFeeEnforcement,
             txsPermitted: !this.config.disableTransactions
-        });
+        }, this.log.getBindings());
         return await validator.validateTx(tx);
     }
     getConfig() {
@@ -919,7 +1322,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 +1349,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,30 +1404,50 @@ import { NodeMetrics } from './node_metrics.js';
             return this.slasherClient.gatherOffensesForRound(round === 'current' ? undefined : BigInt(round));
         }
     }
+    #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) {
+        }
+        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.`);
+            }
+            const blockNumber = header.getBlockNumber();
+            this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
+            return this.worldStateSynchronizer.getSnapshot(blockNumber);
+        }
+        // Block number provided
+        {
+            const blockNumber = block;
+            if (blockNumber > blockSyncedTo) {
+                throw new Error(`Queried block ${block} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+            }
             this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
             return this.worldStateSynchronizer.getSnapshot(blockNumber);
-        } else {
-            throw new Error(`Block ${blockNumber} not yet synced`);
         }
     }
     /**
@@ -1032,11 +1455,6 @@ import { NodeMetrics } from './node_metrics.js';
    * @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);