chore: Blob and archiver syncing improvements (#13542)

This PR includes multiple chores/fixes, each split by commit:
- **[Blob sink server fetches from L1 consensus on blob
miss](87569ae175e55dc4bed6ada826d71aa6c2507069)**:
The blob sink server, when it was requested a blob it didn't have, would
fall back to an archival service (like blobscan) to retrieve it. Now,
before falling back to blobscan, it tries with a configured L1 consensus
client. This commit includes a refactor of the sink server so it just
reuses code from the client, rather than reimplementing much of its
logic.
  ```
[16:18:18.964] TRACE: blob-sink Received blobs request for block
0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9
{"blockId":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9"}
[16:18:18.965] TRACE: blob-sink-client Attempting to get slot number for
block hash
{"l1ConsensusHostUrls":["https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia"],"blockHash":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9","blobHashes":[]}
[16:18:20.014] DEBUG: blob-sink-client Got slot number 7409506 from
consensus host for querying blobs
{"l1ConsensusHostUrls":["https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia"],"blockHash":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9","blobHashes":[]}
[16:18:20.014] TRACE: blob-sink-client Attempting to get blobs from
consensus host
{"slotNumber":7409506,"l1ConsensusHostUrl":"https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia","blockHash":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9","blobHashes":[]}
[16:18:20.014] DEBUG: blob-sink-client Fetching blob sidecar for 7409506
{"url":"https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia/eth/v1/beacon/blob_sidecars/7409506"}
[16:18:20.337] TRACE: blob-sink-client Failed to deserialise blob
{"commitment":"0x84d99a55b6d1020fa0e3c9f912355dc5e6a1ec3e8001bd077e60c8abeb86fa5f8d68a19e1d22de899ce3102ceffbec37"}
[16:18:20.337] TRACE: blob-sink-client Failed to deserialise blob
{"commitment":"0xaa95e1d4f7c0bbaee7b8b81300b039164d9cadf9a0cc965efe7ecfbf0cf5fe583bc31058967241e43cf900f038080d7b"}
[16:18:20.342] DEBUG: blob-sink-client Got 1 blobs from consensus host
{"slotNumber":7409506,"l1ConsensusHostUrl":"https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia","blockHash":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9","blobHashes":[]}
[16:18:20.342] VERBOSE: blob-sink Storing blob downloaded from archive
for block
0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9
[16:18:20.342] DEBUG: blob-sink Returning 1 blobs for block
0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9
{"blockId":"0x29ca78726c02ddb3dc392c915efcccc9963744fe0b6838e9034022fca287adb9"}
  ```
- **[Fix default paths to archive
API](529bbf25325143786cc100580dd7f613d33ac72b)**:
They were missing the protocol, which caused them to fail when doing
`new URL(url)` in the telemetry setup.
- **[Tweak logging for blob sink
client](dea449f19a09538681336884ff86457cedc18c85)**:
Updated logging so errors to fetch blobs are properly logged as warns,
and retries are demoted to debug.
  ```
[16:16:27.287] DEBUG: blob-sink-client Fetching blob sidecar for
0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
{"url":"http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b"}
[16:16:27.288] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 1s...
[16:16:28.290] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 1s...
[16:16:29.291] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 3s...
[16:16:32.292] WARN: blob-sink-client Error getting blob sidecar from
http://localhost:8090: fetch failed
[16:16:32.292] DEBUG: blob-sink-client Got 0 blobs from blob sink
{"blobSinkUrl":"http://localhost:8090","blockHash":"0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b","blobHashes":["0x010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014"]}
[16:16:32.292] WARN: blob-sink-client Failed to fetch blobs for
0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b from
all blob sources
{"blobSinkUrl":"http://localhost:8090","l1ConsensusHostUrls":[]}
  ```
- **[Do not finish archiver sync until
success](dd851c7c8a8a02eadaf036669c6b904f6e81c94d)**:
If there was an error during archiver syncing, the initial
`createAndSync` promise would still resolve, and the node would start in
a state of incomplete sync. Now the archiver waits until the sync is
successful before returning control.
  ```
[16:16:12.116] INFO: archiver Starting archiver sync to rollup contract
0x2a6eb8e6110ad8e6cc0ba5b8a794740e05ce62a6 from L1 block 8076568 to
current L1 block 8118693
[16:16:26.908] DEBUG: archiver Got 1 L2 block processed logs for L2
blocks 1-1 between L1 blocks 8077379-8077388
[16:16:27.287] DEBUG: blob-sink-client Fetching blob sidecar for
0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
{"url":"http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b"}
[16:16:27.288] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 1s...
[16:16:28.290] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 1s...
[16:16:29.291] DEBUG: blob-sink-client Fetching
http://localhost:8090/eth/v1/beacon/blob_sidecars/0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b
failed. Will retry in 3s...
[16:16:32.292] WARN: blob-sink-client Error getting blob sidecar from
http://localhost:8090: fetch failed
[16:16:32.292] DEBUG: blob-sink-client Got 0 blobs from blob sink
{"blobSinkUrl":"http://localhost:8090","blockHash":"0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b","blobHashes":["0x010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014"]}
[16:16:32.292] WARN: blob-sink-client Failed to fetch blobs for
0xe79d762e7fdb5171a1d5a1d35e67f253eb409f07597a3a89b4cf17af5706601b from
all blob sources
{"blobSinkUrl":"http://localhost:8090","l1ConsensusHostUrls":[]}
[16:16:32.292] ERROR: archiver Error syncing archiver: No blob bodies
found for block 1
  [16:16:32.292] INFO: archiver Retrying initial archiver sync in 500ms
[16:16:32.957] INFO: archiver Starting archiver sync to rollup contract
0x2a6eb8e6110ad8e6cc0ba5b8a794740e05ce62a6 from L1 block 8076568 to
current L1 block 8118695
  ```
- **[Fix start --archiver
command](56b426dd8a02cc2d1ef2ae03c5303c7399255e47)**:
Wrong config mappings meant that the archiver was only fetching the
rollup contract address from config, and now the registry contract
address is the one required.
- **[Test blob sources on archiver
startup](cef04b78f2fb7f878cc7b4134085ccf96dc1cb4e)**:
Reaches out to every L1 consensus host configured, blob sink, and
archive blob service on archiver startup, and logs the result.
  ```
[16:22:32.054] INFO: blob-sink-client Testing configured blob sources
{"blobSinkUrl":"http://localhost:8090","l1ConsensusHostUrls":["https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia"],"archiveUrl":"api.sepolia.blobscan.com"}
[16:22:32.059] INFO: blob-sink-client Blob sink is reachable
{"blobSinkUrl":"http://localhost:8090"}
[16:22:32.584] INFO: blob-sink-client L1 consensus host is reachable
{"l1ConsensusHostUrl":"https://lb.drpc.org/rest/KEY/eth-beacon-chain-sepolia"}
[16:22:35.155] INFO: blob-sink-client Archive client is reachable and
synced to L1 block 8088445
{"latest":{"hash":"0x80c3dd67e5d296b3faa880381a17936bc259b33764e5f6c05ab1492c1846785c","slot":7377108,"number":8088445},"archiveUrl":"api.sepolia.blobscan.com"}
[16:22:35.322] INFO: archiver Starting archiver sync to rollup contract
0x2a6eb8e6110ad8e6cc0ba5b8a794740e05ce62a6 from L1 block 8076568 to
current L1 block 8118721
  ```

Fixes #13530

Author: spalladino

yarn-project/archiver/src/archiver/archiver.test.ts

@@ -1,5 +1,6 @@
 import { Blob } from '@aztec/blob-lib';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import { BlobWithIndex } from '@aztec/blob-sink/types';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { DefaultL1ContractsConfig, RollupContract, type ViemPublicClient } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -640,5 +641,6 @@ async function makeVersionedBlobHashes(l2Block: L2Block): Promise<`0x${string}`[
  * @returns The blobs.
  */
 async function makeBlobsFromBlock(block: L2Block) {
-  return await Blob.getBlobs(block.body.toBlobFields());
+  const blobs = await Blob.getBlobs(block.body.toBlobFields());
+  return blobs.map((blob, index) => new BlobWithIndex(blob, index));
 }

yarn-project/archiver/src/archiver/archiver.ts

@@ -4,6 +4,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
+import { sleep } from '@aztec/foundation/sleep';
 import { count } from '@aztec/foundation/string';
 import { elapsed } from '@aztec/foundation/timer';
 import { InboxAbi } from '@aztec/l1-artifacts';
@@ -182,8 +183,13 @@ export class Archiver extends EventEmitter implements ArchiveSource, Traceable {
       throw new Error('Archiver is already running');
     }
 
+    await this.blobSinkClient.testSources();
+
     if (blockUntilSynced) {
-      await this.syncSafe(blockUntilSynced);
+      while (!(await this.syncSafe(true))) {
+        this.log.info(`Retrying initial archiver sync in ${this.config.pollingIntervalMs}ms`);
+        await sleep(this.config.pollingIntervalMs);
+      }
     }
 
     this.runningPromise = new RunningPromise(
@@ -211,8 +217,14 @@ export class Archiver extends EventEmitter implements ArchiveSource, Traceable {
   private async syncSafe(initialRun: boolean) {
     try {
       await this.sync(initialRun);
+      return true;
     } catch (error) {
-      this.log.error('Error during sync', { error });
+      if (error instanceof NoBlobBodiesFoundError) {
+        this.log.error(`Error syncing archiver: ${error.message}`);
+      } else {
+        this.log.error('Error during archiver sync', error);
+      }
+      return false;
     }
   }
 

yarn-project/archiver/src/archiver/config.ts

@@ -3,6 +3,7 @@ import {
   type L1ContractAddresses,
   type L1ContractsConfig,
   type L1ReaderConfig,
+  l1ContractAddressesMapping,
   l1ContractsConfigMappings,
   l1ReaderConfigMappings,
 } from '@aztec/ethereum';
@@ -88,6 +89,10 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
     ...numberConfigHelper(1000),
   },
   ...l1ContractsConfigMappings,
+  l1Contracts: {
+    description: 'The deployed L1 contract addresses',
+    nested: l1ContractAddressesMapping,
+  },
 };
 
 /**

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -248,7 +248,7 @@ async function getBlockFromRollupTx(
 
   let blockFields: Fr[];
   try {
-    blockFields = Blob.toEncodedFields(blobBodies);
+    blockFields = Blob.toEncodedFields(blobBodies.map(b => b.blob));
   } catch (err: any) {
     if (err instanceof BlobDeserializationError) {
       logger.fatal(err.message);

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -165,7 +165,8 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     const telemetry = deps.telemetry ?? getTelemetryClient();
     const log = deps.logger ?? createLogger('node');
     const dateProvider = deps.dateProvider ?? new DateProvider();
-    const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
+    const blobSinkClient =
+      deps.blobSinkClient ?? createBlobSinkClient(config, { logger: createLogger('node:blob-sink:client') });
     const ethereumChain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
 
     // validate that the actual chain id matches that specified in configuration

yarn-project/aztec/src/cli/cmds/start_archiver.ts

@@ -6,14 +6,9 @@ import {
   getArchiverConfigFromEnv,
 } from '@aztec/archiver';
 import { createLogger } from '@aztec/aztec.js';
-import {
-  type BlobSinkConfig,
-  blobSinkConfigMapping,
-  createBlobSinkClient,
-  getBlobSinkConfigFromEnv,
-} from '@aztec/blob-sink/client';
+import { type BlobSinkConfig, blobSinkConfigMapping, createBlobSinkClient } from '@aztec/blob-sink/client';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type DataStoreConfig, dataConfigMappings, getDataConfigFromEnv } from '@aztec/kv-store/config';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
@@ -29,7 +24,7 @@ export async function startArchiver(
   signalHandlers: (() => Promise<void>)[],
   services: NamespacedApiHandlers,
 ): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
-  const envConfig = { ...getArchiverConfigFromEnv(), ...getDataConfigFromEnv(), ...getBlobSinkConfigFromEnv() };
+  const envConfig = getArchiverConfigFromEnv();
   const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobSinkConfig>(
     options,
     { ...archiverConfigMappings, ...dataConfigMappings, ...blobSinkConfigMapping },
@@ -57,7 +52,7 @@ export async function startArchiver(
   const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
 
   const telemetry = initTelemetryClient(getTelemetryClientConfig());
-  const blobSinkClient = createBlobSinkClient(archiverConfig);
+  const blobSinkClient = createBlobSinkClient(archiverConfig, { logger: createLogger('archiver:blob-sink:client') });
   const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, { telemetry, blobSinkClient }, true);
   services.archiver = [archiver, ArchiverApiSchema];
   signalHandlers.push(archiver.stop);

yarn-project/blob-lib/src/blob.test.ts

@@ -140,16 +140,16 @@ describe('blob', () => {
     }
   });
 
-  it('Should serialise and deserialise a blob', async () => {
+  it('should serialise and deserialise a blob', async () => {
     const blob = await Blob.fromFields([Fr.random(), Fr.random(), Fr.random()]);
     const blobBuffer = blob.toBuffer();
     const deserialisedBlob = Blob.fromBuffer(blobBuffer);
     expect(blob.fieldsHash.equals(deserialisedBlob.fieldsHash)).toBe(true);
   });
 
-  it('Should create a blob from a JSON object', async () => {
+  it('should create a blob from a JSON object', async () => {
     const blob = await makeEncodedBlob(3);
-    const blobJson = blob.toJson();
+    const blobJson = blob.toJson(1);
     const deserialisedBlob = await Blob.fromJson(blobJson);
     expect(blob.fieldsHash.equals(deserialisedBlob.fieldsHash)).toBe(true);
   });

yarn-project/blob-lib/src/blob.ts

@@ -123,10 +123,10 @@ export class Blob {
    * @param index - optional - The index of the blob in the block.
    * @returns The JSON representation of the blob.
    */
-  toJson(index?: number): BlobJson {
+  toJson(index: number): BlobJson {
     return {
       blob: `0x${Buffer.from(this.data).toString('hex')}`,
-      index,
+      index: index.toString(),
       // eslint-disable-next-line camelcase
       kzg_commitment: `0x${this.commitment.toString('hex')}`,
       // eslint-disable-next-line camelcase

yarn-project/blob-lib/src/interface.ts

@@ -3,7 +3,7 @@
  */
 export interface BlobJson {
   blob: string;
-  index?: number;
+  index: string;
   // eslint-disable-next-line camelcase
   kzg_commitment: string;
   // eslint-disable-next-line camelcase

yarn-project/blob-sink/package.json

@@ -8,7 +8,8 @@
   "exports": {
     "./server": "./dest/server/index.js",
     "./client": "./dest/client/index.js",
-    "./encoding": "./dest/encoding/index.js"
+    "./encoding": "./dest/encoding/index.js",
+    "./types": "./dest/types/index.js"
   },
   "inherits": [
     "../package.common.json"

yarn-project/blob-sink/src/archive/blobscan_archive_client.ts

@@ -31,17 +31,30 @@ export const BlobscanBlockResponseSchema = z
     ),
   })
   .transform(data =>
-    data.transactions.flatMap(tx =>
-      tx.blobs.map(blob => ({
-        blob: blob.data,
-        // eslint-disable-next-line camelcase
-        kzg_commitment: blob.commitment,
-        // eslint-disable-next-line camelcase
-        kzg_proof: blob.proof,
-      })),
-    ),
+    data.transactions
+      .flatMap(tx =>
+        tx.blobs.map(blob => ({
+          blob: blob.data,
+          // eslint-disable-next-line camelcase
+          kzg_commitment: blob.commitment,
+          // eslint-disable-next-line camelcase
+          kzg_proof: blob.proof,
+        })),
+      )
+      .map((blob, index) => ({ ...blob, index: index.toString() })),
   ) satisfies ZodFor<BlobJson[]>;
 
+// Response from https://api.blobscan.com/blocks?sort=desc&type=canonical
+export const BlobscanBlocksResponseSchema = z.object({
+  blocks: z.array(
+    z.object({
+      hash: z.string(),
+      slot: z.number().int(),
+      number: z.number().int(),
+    }),
+  ),
+});
+
 export class BlobscanArchiveClient implements BlobArchiveClient {
   private readonly logger = createLogger('blob-sink:blobscan-archive-client');
   private readonly fetchOpts = { headers: { accept: 'application/json' } };
@@ -68,6 +81,30 @@ export class BlobscanArchiveClient implements BlobArchiveClient {
     );
   }
 
+  public async getLatestBlock(): Promise<{ hash: string; number: number; slot: number }> {
+    const url = `https://${this.baseUrl}/blocks?sort=desc&type=canonical&p=1&ps=1`;
+    this.logger.trace(`Fetching latest block from ${url}`);
+    const response = await this.fetch(url, this.fetchOpts);
+
+    if (response.status !== 200) {
+      throw new Error(`Failed to fetch latest block: ${response.statusText} (${response.status})`, {
+        cause: {
+          httpResponse: {
+            status: response.status,
+            body: await response.text().catch(() => 'Failed to read response body'),
+          },
+        },
+      });
+    }
+
+    const parsed = await response.json().then((data: any) => BlobscanBlocksResponseSchema.parse(data));
+    if (parsed.blocks.length === 0) {
+      throw new Error(`No blocks found at ${this.baseUrl}`);
+    }
+
+    return parsed.blocks[0];
+  }
+
   public getBaseUrl(): string {
     return this.baseUrl;
   }
@@ -87,10 +124,7 @@ export class BlobscanArchiveClient implements BlobArchiveClient {
         cause: {
           httpResponse: {
             status: response.status,
-            body: await response.text().catch(err => {
-              this.logger.warn('Failed to read response body', err);
-              return '';
-            }),
+            body: await response.text().catch(() => 'Failed to read response body'),
           },
         },
       });

yarn-project/blob-sink/src/archive/factory.ts

@@ -8,9 +8,9 @@ export function createBlobArchiveClient(config: BlobSinkConfig): BlobArchiveClie
   }
 
   if (config.l1ChainId === 1) {
-    return new BlobscanArchiveClient('api.blobscan.com');
+    return new BlobscanArchiveClient('https://api.blobscan.com');
   } else if (config.l1ChainId === 11155111) {
-    return new BlobscanArchiveClient('api.sepolia.blobscan.com');
+    return new BlobscanArchiveClient('https://api.sepolia.blobscan.com');
   }
 
   return undefined;

yarn-project/blob-sink/src/archive/interface.ts

@@ -4,5 +4,6 @@ import type { BlobJson } from '@aztec/blob-lib';
 export interface BlobArchiveClient {
   getBlobData(id: string): Promise<Buffer | undefined>;
   getBlobsFromBlock(blockId: string): Promise<BlobJson[] | undefined>;
+  getLatestBlock(): Promise<{ hash: string; number: number; slot: number }>;
   getBaseUrl(): string;
 }

yarn-project/blob-sink/src/client/bin/index.ts

@@ -24,7 +24,7 @@ async function main() {
   const blobs = await blobSinkClient.getBlobSidecar(blockHash, blobHashes);
   logger.info(`Got ${blobs.length} blobs`);
   for (const blob of blobs) {
-    console.log(blob.toJson());
+    console.log(blob.toJSON());
   }
 }
 

yarn-project/blob-sink/src/client/blob-sink-client-tests.ts

@@ -33,8 +33,8 @@ export function runBlobSinkClientTests(
 
     const retrievedBlobs = await client.getBlobSidecar(blockId, [blobHash]);
     expect(retrievedBlobs).toHaveLength(1);
-    expect(retrievedBlobs[0].fieldsHash.toString()).toBe(blob.fieldsHash.toString());
-    expect(retrievedBlobs[0].commitment.toString('hex')).toBe(blob.commitment.toString('hex'));
+    expect(retrievedBlobs[0].blob.fieldsHash.toString()).toBe(blob.fieldsHash.toString());
+    expect(retrievedBlobs[0].blob.commitment.toString('hex')).toBe(blob.commitment.toString('hex'));
   });
 
   it('should handle multiple blobs', async () => {
@@ -49,15 +49,15 @@ export function runBlobSinkClientTests(
     expect(retrievedBlobs).toHaveLength(3);
 
     for (let i = 0; i < blobs.length; i++) {
-      expect(retrievedBlobs[i].fieldsHash.toString()).toBe(blobs[i].fieldsHash.toString());
-      expect(retrievedBlobs[i].commitment.toString('hex')).toBe(blobs[i].commitment.toString('hex'));
+      expect(retrievedBlobs[i].blob.fieldsHash.toString()).toBe(blobs[i].fieldsHash.toString());
+      expect(retrievedBlobs[i].blob.commitment.toString('hex')).toBe(blobs[i].commitment.toString('hex'));
     }
 
     // Can request blobs by index
     const retrievedBlobsByIndex = await client.getBlobSidecar(blockId, blobHashes, [0, 2]);
     expect(retrievedBlobsByIndex).toHaveLength(2);
-    expect(retrievedBlobsByIndex[0].fieldsHash.toString()).toBe(blobs[0].fieldsHash.toString());
-    expect(retrievedBlobsByIndex[1].fieldsHash.toString()).toBe(blobs[2].fieldsHash.toString());
+    expect(retrievedBlobsByIndex[0].blob.fieldsHash.toString()).toBe(blobs[0].fieldsHash.toString());
+    expect(retrievedBlobsByIndex[1].blob.fieldsHash.toString()).toBe(blobs[2].fieldsHash.toString());
   });
 
   it('should return empty array for non-existent block', async () => {

yarn-project/blob-sink/src/client/config.ts

@@ -69,3 +69,10 @@ export const blobSinkConfigMapping: ConfigMappingsType<BlobSinkConfig> = {
 export function getBlobSinkConfigFromEnv(): BlobSinkConfig {
   return getConfigFromMappings<BlobSinkConfig>(blobSinkConfigMapping);
 }
+
+/**
+ * Returns whether the given blob sink config has any remote sources defined.
+ */
+export function hasRemoteBlobSinkSources(config: BlobSinkConfig = {}): boolean {
+  return !!(config.blobSinkUrl || config.l1ConsensusHostUrls?.length || config.archiveApiUrl);
+}

yarn-project/blob-sink/src/client/factory.ts

@@ -1,18 +1,23 @@
+import { type Logger, createLogger } from '@aztec/foundation/log';
+
 import { MemoryBlobStore } from '../blobstore/memory_blob_store.js';
-import type { BlobSinkConfig } from './config.js';
+import { type BlobSinkConfig, hasRemoteBlobSinkSources } from './config.js';
 import { HttpBlobSinkClient } from './http.js';
 import type { BlobSinkClientInterface } from './interface.js';
 import { LocalBlobSinkClient } from './local.js';
 
-export function createBlobSinkClient(config?: BlobSinkConfig): BlobSinkClientInterface {
-  if (
-    !config?.blobSinkUrl &&
-    (!config?.l1ConsensusHostUrls || config?.l1ConsensusHostUrls?.length == 0) &&
-    !config?.archiveApiUrl
-  ) {
+export function createBlobSinkClient(config?: BlobSinkConfig, deps?: { logger: Logger }): BlobSinkClientInterface {
+  const log = deps?.logger ?? createLogger('blob-sink:client');
+  if (!hasRemoteBlobSinkSources(config)) {
+    log.info(`Creating local blob sink client.`);
     const blobStore = new MemoryBlobStore();
     return new LocalBlobSinkClient(blobStore);
   }
 
-  return new HttpBlobSinkClient(config);
+  log.info(`Creating HTTP blob sink client.`, {
+    blobSinkUrl: config?.blobSinkUrl,
+    l1ConsensusHostUrls: config?.l1ConsensusHostUrls,
+    archiveApiUrl: config?.archiveApiUrl,
+  });
+  return new HttpBlobSinkClient(config, deps);
 }