@aztec/blob-client 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

package/dest/client/http.js

@@ -20,6 +20,7 @@ export class HttpBlobClient {
     healthcheckUploadIntervalId;
     /** Cached beacon genesis time (seconds since Unix epoch). Fetched once at startup. */ beaconGenesisTime;
     /** Cached beacon slot duration in seconds. Fetched once at startup. */ beaconSecondsPerSlot;
+    /** Indexes of consensus hosts that serve blob sidecars (supernodes). Populated by testSources(). */ superNodeHostIndexes;
     constructor(config, opts = {}){
         this.opts = opts;
         this.disabled = false;
@@ -73,6 +74,7 @@ export class HttpBlobClient {
         let consensusNonSuperNodes = 0;
         let archiveSources = 0;
         let blobSinks = 0;
+        const detectedSuperNodes = new Set();
         if (l1ConsensusHostUrls && l1ConsensusHostUrls.length > 0) {
             for(let l1ConsensusHostIndex = 0; l1ConsensusHostIndex < l1ConsensusHostUrls.length; l1ConsensusHostIndex++){
                 const l1ConsensusHostUrl = l1ConsensusHostUrls[l1ConsensusHostIndex];
@@ -101,9 +103,10 @@ export class HttpBlobClient {
                             this.log.info(`L1 consensus host serves blob sidecars (supernode)`, {
                                 l1ConsensusHostUrl
                             });
+                            detectedSuperNodes.add(l1ConsensusHostIndex);
                             consensusSuperNodes++;
                         } else {
-                            this.log.info(`L1 consensus host does not serve blob sidecars`, {
+                            this.log.info(`L1 consensus host does not serve blob sidecars, skipping for blob fetching`, {
                                 l1ConsensusHostUrl
                             });
                             consensusNonSuperNodes++;
@@ -121,6 +124,7 @@ export class HttpBlobClient {
                 }
             }
         }
+        this.superNodeHostIndexes = detectedSuperNodes;
         if (this.archiveClient) {
             try {
                 const latest = await this.archiveClient.getLatestBlock();
@@ -193,29 +197,25 @@ export class HttpBlobClient {
         }
     }
     /**
-   * Get the blob sidecar
+   * Get the blob sidecar.
    *
-   * If requesting from the blob client, we send the blobkHash
-   * If requesting from the beacon node, we send the slot number
-   *
-   * Source ordering depends on sync state:
-   * - Historical sync: blob client → FileStore → L1 consensus → Archive
-   * - Near tip sync: blob client → FileStore → L1 consensus → FileStore (with retries) → Archive (eg blobscan)
+   * Alternates between two primary sources (consensus and filestore) in a retry loop,
+   * then falls back to archive if blobs are still missing. The order of the primary
+   * sources is configurable via `blobPreferFilestores`.
    *
    * @param blockHash - The block hash
    * @param blobHashes - The blob hashes to fetch
-   * @param opts - Options including isHistoricalSync flag
+   * @param opts - Options for slot resolution
    * @returns The blobs
    */ async getBlobSidecar(blockHash, blobHashes, opts) {
         if (this.disabled) {
             this.log.warn('Blob storage is disabled, returning empty blob sidecar');
             return [];
         }
-        const isHistoricalSync = opts?.isHistoricalSync ?? false;
         // Accumulate blobs across sources, preserving order and handling duplicates
         // resultBlobs[i] will contain the blob for blobHashes[i], or undefined if not yet found
         const resultBlobs = new Array(blobHashes.length).fill(undefined);
-        // Helper to get  missing blob hashes that we still need to fetch
+        // Helper to get missing blob hashes that we still need to fetch
         const getMissingBlobHashes = ()=>blobHashes.map((bh, i)=>resultBlobs[i] === undefined ? bh : undefined).filter((bh)=>bh !== undefined);
         // Return the result, ignoring any undefined ones
         const getFilledBlobs = ()=>resultBlobs.filter((b)=>b !== undefined);
@@ -237,80 +237,69 @@ export class HttpBlobClient {
             }
             return blobs;
         };
-        const { l1ConsensusHostUrls } = this.config;
         const ctx = {
             blockHash,
             blobHashes: blobHashes.map(bufferToHex)
         };
-        // Try filestore (quick, no retries) - useful for both historical and near-tip sync
-        if (this.fileStoreClients.length > 0 && getMissingBlobHashes().length > 0) {
-            await this.tryFileStores(getMissingBlobHashes, fillResults, ctx);
-            if (getMissingBlobHashes().length === 0) {
-                return returnWithCallback(getFilledBlobs());
+        // Lazily resolve the slot number — only resolved when consensus hosts are actually tried.
+        let slotNumber;
+        let slotResolved = false;
+        const getSlotNumber = async ()=>{
+            if (!slotResolved) {
+                slotNumber = await this.resolveSlotNumber(blockHash, opts);
+                slotResolved = true;
             }
-        }
-        const missingAfterSink = getMissingBlobHashes();
-        if (missingAfterSink.length > 0 && l1ConsensusHostUrls && l1ConsensusHostUrls.length > 0) {
-            // The beacon api can query by slot number, so we get that first
-            const consensusCtx = {
-                l1ConsensusHostUrls,
-                ...ctx
-            };
-            this.log.trace(`Attempting to get slot number for block hash`, consensusCtx);
-            const slotNumber = await this.getSlotNumber(blockHash, opts?.parentBeaconBlockRoot, opts?.l1BlockTimestamp);
-            this.log.debug(`Got slot number ${slotNumber} from consensus host for querying blobs`, consensusCtx);
-            if (slotNumber) {
-                let l1ConsensusHostUrl;
-                for(let l1ConsensusHostIndex = 0; l1ConsensusHostIndex < l1ConsensusHostUrls.length; l1ConsensusHostIndex++){
-                    const missingHashes = getMissingBlobHashes();
-                    if (missingHashes.length === 0) {
-                        break;
-                    }
-                    l1ConsensusHostUrl = l1ConsensusHostUrls[l1ConsensusHostIndex];
-                    this.log.trace(`Attempting to get ${missingHashes.length} blobs from consensus host`, {
-                        slotNumber,
-                        l1ConsensusHostUrl,
-                        ...ctx
-                    });
-                    const blobs = await this.getBlobsFromHost(l1ConsensusHostUrl, slotNumber, l1ConsensusHostIndex, getMissingBlobHashes());
-                    const result = await fillResults(blobs);
-                    this.log.debug(`Got ${blobs.length} blobs from consensus host (total: ${result.length}/${blobHashes.length})`, {
-                        slotNumber,
-                        l1ConsensusHostUrl,
-                        ...ctx
-                    });
-                    if (result.length === blobHashes.length) {
-                        return returnWithCallback(result);
-                    }
+            return slotNumber;
+        };
+        // Build the two source-try functions. The order depends on the config.
+        const tryConsensus = ()=>this.tryConsensusHosts(getSlotNumber, getMissingBlobHashes, fillResults, ctx);
+        const tryFilestores = ()=>this.tryFileStores(getMissingBlobHashes, fillResults, ctx);
+        const preferFilestores = this.config.blobPreferFilestores ?? false;
+        const [trySourceA, trySourceB] = preferFilestores ? [
+            tryFilestores,
+            tryConsensus
+        ] : [
+            tryConsensus,
+            tryFilestores
+        ];
+        // Historical sync: blobs should already exist, use shorter backoff for transient errors.
+        // Near-tip sync: blobs may still be uploading, use longer backoff for eventual consistency.
+        const isHistoricalSync = opts?.isHistoricalSync ?? false;
+        const backoff = isHistoricalSync ? [
+            1,
+            1
+        ] : [
+            1,
+            1,
+            1,
+            2,
+            2
+        ];
+        // Retry loop: alternate between the two primary sources with backoff.
+        try {
+            await retry(async ()=>{
+                if (getMissingBlobHashes().length > 0) {
+                    await trySourceA();
                 }
-            }
-        }
-        // For near-tip sync, retry filestores with backoff (eventual consistency)
-        // This handles the case where blobs are still being uploaded by other validators
-        if (!isHistoricalSync && this.fileStoreClients.length > 0 && getMissingBlobHashes().length > 0) {
-            try {
-                await retry(async ()=>{
-                    await this.tryFileStores(getMissingBlobHashes, fillResults, ctx);
-                    if (getMissingBlobHashes().length > 0) {
-                        throw new Error('Still missing blobs from filestores');
-                    }
-                }, 'filestore blob retrieval', makeBackoff([
-                    1,
-                    1,
-                    2
-                ]), this.log, true);
-                return returnWithCallback(getFilledBlobs());
-            } catch  {
-            // Exhausted retries, continue to archive fallback
-            }
-        }
-        const missingAfterConsensus = getMissingBlobHashes();
-        if (missingAfterConsensus.length > 0 && this.archiveClient) {
+                if (getMissingBlobHashes().length > 0) {
+                    await trySourceB();
+                }
+                if (getMissingBlobHashes().length > 0) {
+                    throw new Error('Still missing blobs after trying all primary sources');
+                }
+            }, 'blob retrieval', makeBackoff(backoff), this.log, true);
+            return returnWithCallback(getFilledBlobs());
+        } catch  {
+        // Exhausted retries, continue to archive fallback
+        }
+        // Archive fallback
+        const missingAfterPrimary = getMissingBlobHashes();
+        if (missingAfterPrimary.length > 0 && this.archiveClient) {
             const archiveCtx = {
                 archiveUrl: this.archiveClient.getBaseUrl(),
                 ...ctx
             };
-            this.log.trace(`Attempting to get ${missingAfterConsensus.length} blobs from archive`, archiveCtx);
+            this.log.trace(`Attempting to get ${missingAfterPrimary.length} blobs from archive`, archiveCtx);
             const allBlobs = await this.archiveClient.getBlobsFromBlock(blockHash);
             if (!allBlobs) {
                 this.log.debug('No blobs found from archive client', archiveCtx);
@@ -326,13 +315,63 @@ export class HttpBlobClient {
         const result = getFilledBlobs();
         if (result.length < blobHashes.length) {
             this.log.warn(`Failed to fetch all blobs for ${blockHash} from all blob sources (got ${result.length}/${blobHashes.length})`, {
-                l1ConsensusHostUrls,
+                l1ConsensusHostUrls: this.config.l1ConsensusHostUrls,
                 archiveUrl: this.archiveClient?.getBaseUrl(),
                 fileStoreUrls: this.fileStoreClients.map((c)=>c.getBaseUrl())
             });
         }
         return returnWithCallback(result);
     }
+    /** Resolves the beacon slot number for the given block hash. Returns undefined if no consensus hosts. */ resolveSlotNumber(blockHash, opts) {
+        const { l1ConsensusHostUrls } = this.config;
+        if (!l1ConsensusHostUrls || l1ConsensusHostUrls.length === 0) {
+            return undefined;
+        }
+        // If no supernodes, no point resolving the slot
+        if (this.superNodeHostIndexes && this.superNodeHostIndexes.size === 0) {
+            return undefined;
+        }
+        return this.getSlotNumber(blockHash, opts?.parentBeaconBlockRoot, opts?.l1BlockTimestamp);
+    }
+    /**
+   * Try all supernode consensus hosts for blob sidecars.
+   * Skips hosts that were detected as non-supernodes during testSources().
+   */ async tryConsensusHosts(getSlotNumber, getMissingBlobHashes, fillResults, ctx) {
+        const { l1ConsensusHostUrls } = this.config;
+        if (!l1ConsensusHostUrls || l1ConsensusHostUrls.length === 0) {
+            return;
+        }
+        const slotNumber = await getSlotNumber();
+        if (!slotNumber) {
+            return;
+        }
+        for(let l1ConsensusHostIndex = 0; l1ConsensusHostIndex < l1ConsensusHostUrls.length; l1ConsensusHostIndex++){
+            const missingHashes = getMissingBlobHashes();
+            if (missingHashes.length === 0) {
+                break;
+            }
+            // Skip non-supernode hosts if we've already detected supernodes
+            if (this.superNodeHostIndexes && !this.superNodeHostIndexes.has(l1ConsensusHostIndex)) {
+                this.log.trace(`Skipping non-supernode consensus host`, {
+                    l1ConsensusHostUrl: l1ConsensusHostUrls[l1ConsensusHostIndex]
+                });
+                continue;
+            }
+            const l1ConsensusHostUrl = l1ConsensusHostUrls[l1ConsensusHostIndex];
+            this.log.trace(`Attempting to get ${missingHashes.length} blobs from consensus host`, {
+                slotNumber,
+                l1ConsensusHostUrl,
+                ...ctx
+            });
+            const blobs = await this.getBlobsFromHost(l1ConsensusHostUrl, slotNumber, l1ConsensusHostIndex, missingHashes);
+            const result = await fillResults(blobs);
+            this.log.debug(`Got ${blobs.length} blobs from consensus host (total: ${result.length}/${ctx.blobHashes.length})`, {
+                slotNumber,
+                l1ConsensusHostUrl,
+                ...ctx
+            });
+        }
+    }
     /**
    * Try all filestores once (shuffled for load distribution).
    * @param getMissingBlobHashes - Function to get remaining blob hashes to fetch
@@ -419,19 +458,20 @@ export class HttpBlobClient {
             }
             baseUrl += `?${params.toString()}`;
         }
-        const { url, ...options } = getBeaconNodeFetchOptions(baseUrl, this.config, l1ConsensusHostIndex);
+        const { url, logSafeUrl, ...options } = getBeaconNodeFetchOptions(baseUrl, this.config, l1ConsensusHostIndex);
         this.log.debug(`Fetching blob sidecar for ${blockHashOrSlot}`, {
-            url,
+            url: logSafeUrl,
             ...options
         });
-        return this.fetch(url, options);
+        // No retry here — this is called inside the main retry loop in getBlobSidecar
+        return fetch(url, options);
     }
     async getLatestSlotNumber(hostUrl, l1ConsensusHostIndex) {
         try {
             const baseUrl = `${hostUrl}/eth/v1/beacon/headers/head`;
-            const { url, ...options } = getBeaconNodeFetchOptions(baseUrl, this.config, l1ConsensusHostIndex);
+            const { url, logSafeUrl, ...options } = getBeaconNodeFetchOptions(baseUrl, this.config, l1ConsensusHostIndex);
             this.log.debug(`Fetching latest slot number`, {
-                url,
+                url: logSafeUrl,
                 ...options
             });
             const res = await this.fetch(url, options);
@@ -640,11 +680,15 @@ function getBeaconNodeFetchOptions(url, config, l1ConsensusHostIndex) {
     const l1ConsensusHostApiKey = l1ConsensusHostIndex !== undefined && l1ConsensusHostApiKeys && l1ConsensusHostApiKeys[l1ConsensusHostIndex];
     const l1ConsensusHostApiKeyHeader = l1ConsensusHostIndex !== undefined && l1ConsensusHostApiKeyHeaders && l1ConsensusHostApiKeyHeaders[l1ConsensusHostIndex];
     let formattedUrl = url;
+    let logSafeUrl = url;
     if (l1ConsensusHostApiKey && l1ConsensusHostApiKey.getValue() !== '' && !l1ConsensusHostApiKeyHeader) {
-        formattedUrl += `${formattedUrl.includes('?') ? '&' : '?'}key=${l1ConsensusHostApiKey.getValue()}`;
+        const separator = formattedUrl.includes('?') ? '&' : '?';
+        formattedUrl += `${separator}key=${l1ConsensusHostApiKey.getValue()}`;
+        logSafeUrl += `${separator}key=[REDACTED]`;
     }
     return {
         url: formattedUrl,
+        logSafeUrl,
         ...l1ConsensusHostApiKey && l1ConsensusHostApiKeyHeader && {
             headers: {
                 [l1ConsensusHostApiKeyHeader]: l1ConsensusHostApiKey.getValue()

package/dest/client/interface.d.ts

@@ -5,9 +5,7 @@ import type { Blob } from '@aztec/blob-lib';
 export interface GetBlobSidecarOptions {
     /**
      * True if the archiver is catching up (historical sync), false if near tip.
-     * This affects source ordering:
-     * - Historical: FileStore first (data should exist), then L1 consensus, then archive (eg. blobscan)
-     * - Near tip: FileStore first with no retries (data should exist), L1 consensus second (freshest data), then FileStore with retries, then archive (eg. blobscan)
+     * Historical sync uses a shorter retry backoff since blobs should already exist.
      */
     isHistoricalSync?: boolean;
     /**
@@ -36,4 +34,4 @@ export interface BlobClientInterface {
     /** Returns true if this client can upload blobs to filestore. */
     canUpload(): boolean;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILE1BQU0sV0FBVyxxQkFBcUI7SUFDcEM7Ozs7O09BS0c7SUFDSCxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUMzQjs7O09BR0c7SUFDSCxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUMvQjs7OztPQUlHO0lBQ0gsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDM0I7QUFFRCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLDBFQUEwRTtJQUMxRSxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3RELHFFQUFxRTtJQUNyRSxjQUFjLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN0Ryw2RUFBNkU7SUFDN0UsS0FBSyxDQUFDLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hCLG9GQUFvRjtJQUNwRixXQUFXLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdCLDBEQUEwRDtJQUMxRCxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDZCxpRUFBaUU7SUFDakUsU0FBUyxJQUFJLE9BQU8sQ0FBQztDQUN0QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILE1BQU0sV0FBVyxxQkFBcUI7SUFDcEM7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDM0I7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDL0I7Ozs7T0FJRztJQUNILGdCQUFnQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQzNCO0FBRUQsTUFBTSxXQUFXLG1CQUFtQjtJQUNsQywwRUFBMEU7SUFDMUUsb0JBQW9CLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0RCxxRUFBcUU7SUFDckUsY0FBYyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7SUFDdEcsNkVBQTZFO0lBQzdFLEtBQUssQ0FBQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN4QixvRkFBb0Y7SUFDcEYsV0FBVyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3QiwwREFBMEQ7SUFDMUQsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDO0lBQ2QsaUVBQWlFO0lBQ2pFLFNBQVMsSUFBSSxPQUFPLENBQUM7Q0FDdEIifQ==

package/dest/client/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/client/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,0EAA0E;IAC1E,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,qEAAqE;IACrE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACtG,6EAA6E;IAC7E,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,oFAAoF;IACpF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,0DAA0D;IAC1D,IAAI,CAAC,IAAI,IAAI,CAAC;IACd,iEAAiE;IACjE,SAAS,IAAI,OAAO,CAAC;CACtB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/client/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,0EAA0E;IAC1E,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,qEAAqE;IACrE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACtG,6EAA6E;IAC7E,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,oFAAoF;IACpF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,0DAA0D;IAC1D,IAAI,CAAC,IAAI,IAAI,CAAC;IACd,iEAAiE;IACjE,SAAS,IAAI,OAAO,CAAC;CACtB"}

package/dest/filestore/factory.d.ts

@@ -1,4 +1,5 @@
 import { type Logger } from '@aztec/foundation/log';
+import { type HttpFileStoreOptions } from '@aztec/stdlib/file-store';
 import { FileStoreBlobClient } from './filestore_blob_client.js';
 /**
  * Metadata required to construct the base path for blob storage.
@@ -25,8 +26,8 @@ export declare function makeBlobBasePath(metadata: BlobFileStoreMetadata): strin
  * @param logger - Optional logger
  * @returns A FileStoreBlobClient for reading blobs, or undefined if storeUrl is undefined
  */
-export declare function createReadOnlyFileStoreBlobClient(storeUrl: string, metadata: BlobFileStoreMetadata, logger?: Logger): Promise<FileStoreBlobClient>;
-export declare function createReadOnlyFileStoreBlobClient(storeUrl: string | undefined, metadata: BlobFileStoreMetadata, logger?: Logger): Promise<FileStoreBlobClient | undefined>;
+export declare function createReadOnlyFileStoreBlobClient(storeUrl: string, metadata: BlobFileStoreMetadata, logger?: Logger, httpOptions?: HttpFileStoreOptions): Promise<FileStoreBlobClient>;
+export declare function createReadOnlyFileStoreBlobClient(storeUrl: string | undefined, metadata: BlobFileStoreMetadata, logger?: Logger, httpOptions?: HttpFileStoreOptions): Promise<FileStoreBlobClient | undefined>;
 /**
  * Creates multiple read-only FileStoreBlobClients from an array of URLs.
  *
@@ -35,7 +36,7 @@ export declare function createReadOnlyFileStoreBlobClient(storeUrl: string | und
  * @param logger - Optional logger
  * @returns Array of FileStoreBlobClients (excludes any that failed to create)
  */
-export declare function createReadOnlyFileStoreBlobClients(storeUrls: string[] | undefined, metadata: BlobFileStoreMetadata, logger?: Logger): Promise<FileStoreBlobClient[]>;
+export declare function createReadOnlyFileStoreBlobClients(storeUrls: string[] | undefined, metadata: BlobFileStoreMetadata, logger?: Logger, httpOptions?: HttpFileStoreOptions): Promise<FileStoreBlobClient[]>;
 /**
  * Creates a writable FileStoreBlobClient for uploading blobs.
  * Note: https:// URLs are not supported for upload, only s3://, gs://, or file://.
@@ -47,4 +48,4 @@ export declare function createReadOnlyFileStoreBlobClients(storeUrls: string[] |
  */
 export declare function createWritableFileStoreBlobClient(storeUrl: string, metadata: BlobFileStoreMetadata, logger?: Logger): Promise<FileStoreBlobClient>;
 export declare function createWritableFileStoreBlobClient(storeUrl: string | undefined, metadata: BlobFileStoreMetadata, logger?: Logger): Promise<FileStoreBlobClient | undefined>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpbGVzdG9yZS9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQVFsRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRTs7O0dBR0c7QUFDSCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLHNCQUFzQjtJQUN0QixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLHlCQUF5QjtJQUN6QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLDhEQUE4RDtJQUM5RCxhQUFhLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxxQkFBcUIsR0FBRyxNQUFNLENBS3hFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixpQ0FBaUMsQ0FDckQsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDaEMsd0JBQXNCLGlDQUFpQyxDQUNyRCxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDNUIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUFDO0FBbUI1Qzs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLGtDQUFrQyxDQUN0RCxTQUFTLEVBQUUsTUFBTSxFQUFFLEdBQUcsU0FBUyxFQUMvQixRQUFRLEVBQUUscUJBQXFCLEVBQy9CLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQW9CaEM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixpQ0FBaUMsQ0FDckQsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDaEMsd0JBQXNCLGlDQUFpQyxDQUNyRCxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDNUIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpbGVzdG9yZS9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBRUwsS0FBSyxvQkFBb0IsRUFJMUIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRTs7O0dBR0c7QUFDSCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLHNCQUFzQjtJQUN0QixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLHlCQUF5QjtJQUN6QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLDhEQUE4RDtJQUM5RCxhQUFhLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxxQkFBcUIsR0FBRyxNQUFNLENBS3hFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixpQ0FBaUMsQ0FDckQsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEVBQ2YsV0FBVyxDQUFDLEVBQUUsb0JBQW9CLEdBQ2pDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBQ2hDLHdCQUFzQixpQ0FBaUMsQ0FDckQsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzVCLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUNmLFdBQVcsQ0FBQyxFQUFFLG9CQUFvQixHQUNqQyxPQUFPLENBQUMsbUJBQW1CLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFvQjVDOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0Isa0NBQWtDLENBQ3RELFNBQVMsRUFBRSxNQUFNLEVBQUUsR0FBRyxTQUFTLEVBQy9CLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUNmLFdBQVcsQ0FBQyxFQUFFLG9CQUFvQixHQUNqQyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQW9CaEM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixpQ0FBaUMsQ0FDckQsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDaEMsd0JBQXNCLGlDQUFpQyxDQUNyRCxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDNUIsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUFDIn0=

package/dest/filestore/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/filestore/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAQlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,sBAAsB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,MAAM,CAKxE;AAED;;;;;;;GAOG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;AAmB5C;;;;;;;GAOG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAC/B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAoBhC;AAED;;;;;;;;GAQG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/filestore/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAEL,KAAK,oBAAoB,EAI1B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,sBAAsB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,MAAM,CAKxE;AAED;;;;;;;GAOG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,oBAAoB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,oBAAoB,GACjC,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;AAoB5C;;;;;;;GAOG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAC/B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,oBAAoB,GACjC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAoBhC;AAED;;;;;;;;GAQG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC"}

package/dest/filestore/factory.js

@@ -10,7 +10,7 @@ import { FileStoreBlobClient } from './filestore_blob_client.js';
     const normalizedAddress = rollupAddress.toLowerCase().replace(/^0x/, '');
     return `aztec-${l1ChainId}-${rollupVersion}-0x${normalizedAddress}`;
 }
-export async function createReadOnlyFileStoreBlobClient(storeUrl, metadata, logger) {
+export async function createReadOnlyFileStoreBlobClient(storeUrl, metadata, logger, httpOptions) {
     if (!storeUrl) {
         return undefined;
     }
@@ -20,7 +20,7 @@ export async function createReadOnlyFileStoreBlobClient(storeUrl, metadata, logg
         storeUrl,
         basePath
     });
-    const store = await createReadOnlyFileStore(storeUrl, log);
+    const store = await createReadOnlyFileStore(storeUrl, log, httpOptions);
     return new FileStoreBlobClient(store, basePath, log);
 }
 /**
@@ -30,7 +30,7 @@ export async function createReadOnlyFileStoreBlobClient(storeUrl, metadata, logg
  * @param metadata - Chain metadata for constructing the base path
  * @param logger - Optional logger
  * @returns Array of FileStoreBlobClients (excludes any that failed to create)
- */ export async function createReadOnlyFileStoreBlobClients(storeUrls, metadata, logger) {
+ */ export async function createReadOnlyFileStoreBlobClients(storeUrls, metadata, logger, httpOptions) {
     if (!storeUrls || storeUrls.length === 0) {
         return [];
     }
@@ -38,7 +38,7 @@ export async function createReadOnlyFileStoreBlobClient(storeUrl, metadata, logg
     const clients = [];
     for (const storeUrl of storeUrls){
         try {
-            const client = await createReadOnlyFileStoreBlobClient(storeUrl, metadata, log);
+            const client = await createReadOnlyFileStoreBlobClient(storeUrl, metadata, log, httpOptions);
             if (client) {
                 clients.push(client);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/blob-client",
-  "version": "0.0.1-commit.c2eed6949",
+  "version": "0.0.1-commit.c52d6e7",
   "type": "module",
   "bin": "./dest/client/bin/index.js",
   "exports": {
@@ -56,18 +56,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.c2eed6949",
-    "@aztec/ethereum": "0.0.1-commit.c2eed6949",
-    "@aztec/foundation": "0.0.1-commit.c2eed6949",
-    "@aztec/kv-store": "0.0.1-commit.c2eed6949",
-    "@aztec/stdlib": "0.0.1-commit.c2eed6949",
-    "@aztec/telemetry-client": "0.0.1-commit.c2eed6949",
+    "@aztec/blob-lib": "0.0.1-commit.c52d6e7",
+    "@aztec/ethereum": "0.0.1-commit.c52d6e7",
+    "@aztec/foundation": "0.0.1-commit.c52d6e7",
+    "@aztec/kv-store": "0.0.1-commit.c52d6e7",
+    "@aztec/stdlib": "0.0.1-commit.c52d6e7",
+    "@aztec/telemetry-client": "0.0.1-commit.c52d6e7",
     "express": "^4.21.2",
     "snappy": "^7.2.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2",
-    "zod": "^3.23.8"
+    "zod": "^4"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

package/src/client/config.ts

@@ -59,6 +59,12 @@ export interface BlobClientConfig extends BlobArchiveApiConfig {
 
   /** Timeout for HTTP requests to the L1 RPC node in ms. */
   l1HttpTimeoutMS?: number;
+
+  /** Whether to prefer filestores over consensus clients when fetching blobs. Default: false (consensus first). */
+  blobPreferFilestores?: boolean;
+
+  /** Timeout in ms for HTTP requests to the blob file store. Default: 10000 (10s). */
+  blobFileStoreTimeoutMs?: number;
 }
 
 export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
@@ -87,7 +93,7 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobSinkMapSizeKb: {
     env: 'BLOB_SINK_MAP_SIZE_KB',
     description: 'The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.',
-    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    ...optionalNumberConfigHelper(),
   },
   blobAllowEmptySources: {
     env: 'BLOB_ALLOW_EMPTY_SOURCES',
@@ -110,13 +116,23 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobHealthcheckUploadIntervalMinutes: {
     env: 'BLOB_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES',
     description: 'Interval in minutes for uploading healthcheck file to file store (default: 60 = 1 hour)',
-    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    ...optionalNumberConfigHelper(),
   },
   l1HttpTimeoutMS: {
     env: 'ETHEREUM_HTTP_TIMEOUT_MS',
     description: 'Timeout for HTTP requests to the L1 RPC node in ms.',
     ...optionalNumberConfigHelper(),
   },
+  blobPreferFilestores: {
+    env: 'BLOB_PREFER_FILESTORES',
+    description: 'Whether to prefer filestores over consensus clients when fetching blobs. Default: false.',
+    ...booleanConfigHelper(false),
+  },
+  blobFileStoreTimeoutMs: {
+    env: 'BLOB_FILE_STORE_TIMEOUT_MS',
+    description: 'Timeout in ms for HTTP requests to the blob file store. Default: 10000 (10s).',
+    ...optionalNumberConfigHelper(),
+  },
   ...blobArchiveApiConfigMappings,
 };
 

package/src/client/factory.ts

@@ -48,7 +48,7 @@ export function createBlobClient(config?: BlobClientConfig, deps?: CreateBlobCli
 export interface BlobClientWithFileStoresConfig extends BlobClientConfig {
   l1ChainId: number;
   rollupVersion: number;
-  l1Contracts: { rollupAddress: { toString(): string } };
+  rollupAddress: { toString(): string };
 }
 
 /**
@@ -73,11 +73,18 @@ export async function createBlobClientWithFileStores(
   const fileStoreMetadata: BlobFileStoreMetadata = {
     l1ChainId: config.l1ChainId,
     rollupVersion: config.rollupVersion,
-    rollupAddress: config.l1Contracts.rollupAddress.toString(),
+    rollupAddress: config.rollupAddress.toString(),
+  };
+
+  // Disable internal retries for blob file stores — retry logic is handled by HttpBlobClient.
+  // Set a configurable timeout (default 10s) to avoid hanging on slow stores.
+  const httpOptions = {
+    retryBackoff: [] as number[],
+    timeoutMs: config.blobFileStoreTimeoutMs ?? 10_000,
   };
 
   const [fileStoreClients, fileStoreUploadClient] = await Promise.all([
-    createReadOnlyFileStoreBlobClients(config.blobFileStoreUrls, fileStoreMetadata, log),
+    createReadOnlyFileStoreBlobClients(config.blobFileStoreUrls, fileStoreMetadata, log, httpOptions),
     createWritableFileStoreBlobClient(config.blobFileStoreUploadUrl, fileStoreMetadata, log),
   ]);