@aztec-labs/blob-client 6.1.0-nightly.20261113 → 6.1.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,6 @@
1
1
  import { Blob, type BlobJson } from '@aztec-labs/blob-lib';
2
2
  import { type Logger } from '@aztec-labs/foundation/log';
3
+ import { type TelemetryClient } from '@aztec-labs/telemetry-client';
3
4
  import { Buffer } from 'buffer';
4
5
  import type { BlobArchiveClient } from '../archive/interface.js';
5
6
  import type { FileStoreBlobClient } from '../filestore/filestore_blob_client.js';
@@ -13,8 +14,9 @@ export declare class HttpBlobClient implements BlobClientInterface {
13
14
  protected readonly fetch: typeof fetch;
14
15
  protected readonly fileStoreClients: FileStoreBlobClient[];
15
16
  protected readonly fileStoreUploadClient: FileStoreBlobClient | undefined;
17
+ private readonly instrumentation;
16
18
  private disabled;
17
- private healthcheckUploadIntervalId?;
19
+ private healthcheckUpload?;
18
20
  /** Beacon genesis time (seconds since Unix epoch), discovered at startup for custom devnets. */
19
21
  private beaconGenesisTime?;
20
22
  /** Beacon slot duration in seconds, discovered at startup for custom devnets. */
@@ -29,16 +31,13 @@ export declare class HttpBlobClient implements BlobClientInterface {
29
31
  archiveClient?: BlobArchiveClient;
30
32
  fileStoreClients?: FileStoreBlobClient[];
31
33
  fileStoreUploadClient?: FileStoreBlobClient;
34
+ telemetry?: TelemetryClient;
32
35
  /** Callback fired when blobs are successfully fetched from any source */
33
- onBlobsFetched?: (blobs: Blob[]) => void;
36
+ onBlobsFetched?: (blobs: Blob[]) => void | Promise<void>;
34
37
  /** Overrides how often consensus hosts that failed the startup probe are probed again. */
35
38
  consensusHostReprobeIntervalMs?: number;
36
39
  });
37
- /**
38
- * Upload fetched blobs to filestore (fire-and-forget).
39
- * Called automatically when blobs are fetched from any source.
40
- */
41
- private uploadBlobsToFileStore;
40
+ private uploadWithRetry;
42
41
  /**
43
42
  * Disables or enables blob storage operations.
44
43
  * When disabled, getBlobSidecar returns empty arrays and sendBlobsToFilestore returns false.
@@ -81,17 +80,16 @@ export declare class HttpBlobClient implements BlobClientInterface {
81
80
  /**
82
81
  * Start the blob client.
83
82
  * Discovers beacon configuration for custom devnets,
84
- * then uploads the initial healthcheck file (awaited) and starts periodic uploads.
83
+ * then attempts the initial healthcheck upload and starts periodic uploads even if storage is unavailable.
85
84
  */
86
85
  start(): Promise<void>;
87
- /**
88
- * Start periodic healthcheck upload to the file store to ensure it remains available even if accidentally deleted.
89
- */
90
86
  private startPeriodicHealthcheckUpload;
91
87
  private fetchBeaconConfig;
92
88
  /**
93
89
  * Stop the blob client, clearing any periodic tasks.
90
+ * In-flight upload retries are not cancelled. They end once their backoff runs out, their saves are idempotent,
91
+ * and the CLI exits the process after shutdown.
94
92
  */
95
93
  stop(): void;
96
94
  }
97
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9odHRwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxRQUFRLEVBQStCLE1BQU0sc0JBQXNCLENBQUM7QUFFeEYsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBS3ZFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFLaEMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUE4QixNQUFNLGFBQWEsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBMENqRixxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBd0J0RCxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUF2QnZCLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUMvQixTQUFTLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztJQUM1QyxTQUFTLENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsR0FBRyxTQUFTLENBQUM7SUFDaEUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxLQUFLLENBQUM7SUFDdkMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0lBQzNELFNBQVMsQ0FBQyxRQUFRLENBQUMscUJBQXFCLEVBQUUsbUJBQW1CLEdBQUcsU0FBUyxDQUFDO0lBRTFFLE9BQU8sQ0FBQyxRQUFRLENBQVM7SUFDekIsT0FBTyxDQUFDLDJCQUEyQixD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
95
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9odHRwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxRQUFRLEVBQStCLE1BQU0sc0JBQXNCLENBQUM7QUFHeEYsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBT3ZFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBS2hDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBOEIsTUFBTSxhQUFhLENBQUM7QUFFaEYsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQTBDakYscUJBQWEsY0FBZSxZQUFXLG1CQUFtQjtJQXlCdEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBeEJ2QixTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFDL0IsU0FBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFDNUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxDQUFDO0lBQ2hFLFNBQVMsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ3ZDLFNBQVMsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQztJQUMzRCxTQUFTLENBQUMsUUFBUSxDQUFDLHFCQUFxQixFQUFFLG1CQUFtQixHQUFHLFNBQVMsQ0FBQztJQUUxRSxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBNEI7SUFDNUQsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUN6QixPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBaUI7SUFFM0MsZ0dBQWdHO0lBQ2hHLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFTO0lBQ25DLGlGQUFpRjtJQUNqRixPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBUztJQUV0QyxvR0FBb0c7SUFDcEcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQWM7SUFDM0MscUdBQXFHO0lBQ3JHLE9BQU8sQ0FBQywwQkFBMEIsQ0FBcUI7SUFDdkQsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQWlCO0lBRTlDLFlBQ0UsTUFBTSxDQUFDLEVBQUUsZ0JBQWdCLEVBQ1IsSUFBSSxHQUFFO1FBQ3JCLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNoQixhQUFhLENBQUMsRUFBRSxpQkFBaUIsQ0FBQztRQUNsQyxnQkFBZ0IsQ0FBQyxFQUFFLG1CQUFtQixFQUFFLENBQUM7UUFDekMscUJBQXFCLENBQUMsRUFBRSxtQkFBbUIsQ0FBQztRQUM1QyxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7UUFDNUIseUVBQXlFO1FBQ3pFLGNBQWMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxLQUFLLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDekQsMEZBQTBGO1FBQzFGLDhCQUE4QixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ3BDLEVBOEJQO1lBRWEsZUFBZTtJQW9DN0I7Ozs7O09BS0c7SUFDSSxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sR0FBRyxJQUFJLENBR3ZDO0lBRVksV0FBVyxrQkE2RXZCO1lBR2Esa0JBQWtCO0lBaURoQyw4R0FBOEc7SUFDOUcsT0FBTyxDQUFDLHlCQUF5QjtZQWVuQiwyQkFBMkI7SUFpQjVCLG9CQUFvQixDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZWpFO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDVSxjQUFjLENBQ3pCLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUN4QixVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQ3BCLElBQUksRUFBRSxxQkFBcUIsR0FDMUIsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBeUhqQjtJQUVELHlHQUF5RztJQUN6RyxPQUFPLENBQUMsaUJBQWlCO1lBZ0JYLGlCQUFpQjtZQXdGakIsYUFBYTtJQXNDZCxrQkFBa0IsQ0FDN0IsT0FBTyxFQUFFLE1BQU0sRUFDZixlQUFlLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFDaEMsVUFBVSxHQUFFLE1BQU0sRUFBTyxFQUN6QixvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sR0FDNUIsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBR2pCO0lBRVksZ0JBQWdCLENBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBQ2hDLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxFQUM3QixVQUFVLENBQUMsRUFBRSxNQUFNLEVBQUUsR0FDcEIsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBaUJyQjtJQUVELE9BQU8sQ0FBQyxpQkFBaUI7SUFzQnpCLDRFQUE0RTtJQUM1RSxPQUFPLENBQUMsYUFBYTtJQXlCckIsc0NBQXNDO0lBQy9CLGdCQUFnQixJQUFJLGlCQUFpQixHQUFHLFNBQVMsQ0FFdkQ7SUFFRCxpRUFBaUU7SUFDMUQsU0FBUyxJQUFJLE9BQU8sQ0FFMUI7SUFFRDs7OztPQUlHO0lBQ1UsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FVbEM7WUFLYSw4QkFBOEI7WUFvQjlCLGlCQUFpQjtJQStDL0I7Ozs7T0FJRztJQUNJLElBQUksSUFBSSxJQUFJLENBSWxCO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/client/http.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/client/http.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,21 @@
1
1
  import { Blob, computeEthVersionedBlobHash } from '@aztec-labs/blob-lib';
2
2
  import { shuffle } from '@aztec-labs/foundation/array';
3
+ import { compactArray } from '@aztec-labs/foundation/collection';
3
4
  import { createLogger } from '@aztec-labs/foundation/log';
5
+ import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
4
6
  import { makeBackoff, retry } from '@aztec-labs/foundation/retry';
5
7
  import { RunningPromise } from '@aztec-labs/foundation/running-promise';
6
8
  import { schemas } from '@aztec-labs/foundation/schemas';
7
9
  import { bufferToHex, hexToBuffer } from '@aztec-labs/foundation/string';
10
+ import { Timer } from '@aztec-labs/foundation/timer';
11
+ import { getTelemetryClient } from '@aztec-labs/telemetry-client';
8
12
  import { Buffer } from 'buffer';
9
13
  import { mainnet, sepolia } from 'viem/chains';
10
14
  import { z } from 'zod';
11
15
  import { createBlobArchiveClient } from '../archive/factory.js';
12
16
  import { DEFAULT_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES } from '../filestore/healthcheck.js';
13
17
  import { getBlobClientConfigFromEnv } from './config.js';
18
+ import { BlobClientInstrumentation } from './instrumentation.js';
14
19
  /** How often consensus hosts that failed the startup probe are probed again. */ const CONSENSUS_HOST_REPROBE_INTERVAL_MS = 5 * 60 * 1000;
15
20
  const BEACON_CONFIG = {
16
21
  [mainnet.id]: {
@@ -60,8 +65,9 @@ export class HttpBlobClient {
60
65
  fetch;
61
66
  fileStoreClients;
62
67
  fileStoreUploadClient;
68
+ instrumentation;
63
69
  disabled;
64
- healthcheckUploadIntervalId;
70
+ healthcheckUpload;
65
71
  /** Beacon genesis time (seconds since Unix epoch), discovered at startup for custom devnets. */ beaconGenesisTime;
66
72
  /** Beacon slot duration in seconds, discovered at startup for custom devnets. */ beaconSecondsPerSlot;
67
73
  /** Indexes of consensus hosts that serve blob sidecars (supernodes). Populated by testSources(). */ superNodeHostIndexes;
@@ -81,9 +87,10 @@ export class HttpBlobClient {
81
87
  this.log = opts.logger ?? createLogger('blob-client:client');
82
88
  this.fileStoreClients = opts.fileStoreClients ?? [];
83
89
  this.fileStoreUploadClient = opts.fileStoreUploadClient;
90
+ this.instrumentation = new BlobClientInstrumentation(opts.telemetry ?? getTelemetryClient());
84
91
  if (this.fileStoreUploadClient && !opts.onBlobsFetched) {
85
- this.opts.onBlobsFetched = (blobs)=>{
86
- this.uploadBlobsToFileStore(blobs);
92
+ this.opts.onBlobsFetched = async (blobs)=>{
93
+ await this.sendBlobsToFilestore(blobs);
87
94
  };
88
95
  }
89
96
  this.fetch = async (...args)=>{
@@ -95,16 +102,46 @@ export class HttpBlobClient {
95
102
  ]), this.log, /*failSilently=*/ true);
96
103
  };
97
104
  }
98
- /**
99
- * Upload fetched blobs to filestore (fire-and-forget).
100
- * Called automatically when blobs are fetched from any source.
101
- */ uploadBlobsToFileStore(blobs) {
102
- if (!this.fileStoreUploadClient) {
103
- return;
105
+ async uploadWithRetry(uploadType, upload, context = {}) {
106
+ const timer = new Timer();
107
+ let success = false;
108
+ let attempt = 0;
109
+ try {
110
+ await retry(async ()=>{
111
+ attempt++;
112
+ try {
113
+ await upload();
114
+ this.instrumentation.recordAttempt(uploadType, true);
115
+ } catch (err) {
116
+ this.instrumentation.recordAttempt(uploadType, false);
117
+ this.log.warn('Blob filestore upload attempt failed', {
118
+ err,
119
+ uploadType,
120
+ attempt,
121
+ ...context
122
+ });
123
+ throw err;
124
+ }
125
+ }, `Uploading ${uploadType} to filestore`, makeBackoff([
126
+ 1,
127
+ 2,
128
+ 4,
129
+ 8,
130
+ 16
131
+ ]), this.log, true);
132
+ success = true;
133
+ return true;
134
+ } catch (err) {
135
+ this.log.error('Blob filestore upload failed after retries', {
136
+ err,
137
+ uploadType,
138
+ attempt,
139
+ ...context
140
+ });
141
+ return false;
142
+ } finally{
143
+ this.instrumentation.recordUpload(uploadType, success, timer.ms());
104
144
  }
105
- void this.fileStoreUploadClient.saveBlobs(blobs, true).catch((err)=>{
106
- this.log.warn(`Failed to upload ${blobs.length} blobs to filestore`, err);
107
- });
108
145
  }
109
146
  /**
110
147
  * Disables or enables blob storage operations.
@@ -275,18 +312,19 @@ export class HttpBlobClient {
275
312
  this.log.warn('Blob storage is disabled, not uploading blobs');
276
313
  return false;
277
314
  }
278
- if (!this.fileStoreUploadClient) {
315
+ const uploadClient = this.fileStoreUploadClient;
316
+ if (!uploadClient) {
279
317
  this.log.verbose('No filestore upload configured');
280
318
  return false;
281
319
  }
282
- this.log.verbose(`Uploading ${blobs.length} blobs to filestore`);
283
- try {
284
- await this.fileStoreUploadClient.saveBlobs(blobs, true);
285
- return true;
286
- } catch (err) {
287
- this.log.error('Failed to upload blobs to filestore', err);
288
- return false;
289
- }
320
+ const blobHashes = blobs.map((blob)=>bufferToHex(blob.getEthVersionedBlobHash()));
321
+ this.log.verbose('Uploading blobs to filestore', {
322
+ blobHashes,
323
+ blobCount: blobs.length
324
+ });
325
+ return await this.uploadWithRetry('blobs', ()=>uploadClient.saveBlobs(blobs, true), {
326
+ blobHashes
327
+ });
290
328
  }
291
329
  /**
292
330
  * Get the blob sidecar.
@@ -308,9 +346,9 @@ export class HttpBlobClient {
308
346
  // resultBlobs[i] will contain the blob for blobHashes[i], or undefined if not yet found
309
347
  const resultBlobs = new Array(blobHashes.length).fill(undefined);
310
348
  // Helper to get missing blob hashes that we still need to fetch
311
- const getMissingBlobHashes = ()=>blobHashes.map((bh, i)=>resultBlobs[i] === undefined ? bh : undefined).filter((bh)=>bh !== undefined);
349
+ const getMissingBlobHashes = ()=>compactArray(blobHashes.map((bh, i)=>resultBlobs[i] === undefined ? bh : undefined));
312
350
  // Return the result, ignoring any undefined ones
313
- const getFilledBlobs = ()=>resultBlobs.filter((b)=>b !== undefined);
351
+ const getFilledBlobs = ()=>compactArray(resultBlobs);
314
352
  // Helper to fill in results from fetched blobs
315
353
  const fillResults = async (fetchedBlobs)=>{
316
354
  const blobs = await processFetchedBlobs(fetchedBlobs, blobHashes, this.log);
@@ -325,7 +363,13 @@ export class HttpBlobClient {
325
363
  // Fire callback when returning blobs (fire-and-forget)
326
364
  const returnWithCallback = (blobs)=>{
327
365
  if (blobs.length > 0 && this.opts.onBlobsFetched) {
328
- void Promise.resolve().then(()=>this.opts.onBlobsFetched(blobs));
366
+ void Promise.resolve().then(()=>this.opts.onBlobsFetched(blobs)).catch((err)=>{
367
+ this.log.warn('Blob fetch callback failed', {
368
+ err,
369
+ blockHash,
370
+ blobHashes: blobHashes.map(bufferToHex)
371
+ });
372
+ });
329
373
  }
330
374
  return blobs;
331
375
  };
@@ -504,7 +548,7 @@ export class HttpBlobClient {
504
548
  return; // All blobs found, no need to try more filestores
505
549
  }
506
550
  try {
507
- const blobHashStrings = blobHashes.map((h)=>`0x${h.toString('hex')}`);
551
+ const blobHashStrings = blobHashes.map((h)=>bufferToHex(h));
508
552
  this.log.trace(`Attempting to get ${blobHashStrings.length} blobs from filestore`, {
509
553
  url: client.getBaseUrl(),
510
554
  ...ctx
@@ -526,7 +570,7 @@ export class HttpBlobClient {
526
570
  }
527
571
  async getBlobSidecarFrom(hostUrl, blockHashOrSlot, blobHashes = [], l1ConsensusHostIndex) {
528
572
  const blobs = await this.getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex, blobHashes);
529
- return (await processFetchedBlobs(blobs, blobHashes, this.log)).filter((b)=>b !== undefined);
573
+ return compactArray(await processFetchedBlobs(blobs, blobHashes, this.log));
530
574
  }
531
575
  async getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex, blobHashes) {
532
576
  try {
@@ -550,7 +594,7 @@ export class HttpBlobClient {
550
594
  if (blobHashes && blobHashes.length > 0) {
551
595
  const params = new URLSearchParams();
552
596
  for (const hash of blobHashes){
553
- params.append('versioned_hashes', `0x${hash.toString('hex')}`);
597
+ params.append('versioned_hashes', bufferToHex(hash));
554
598
  }
555
599
  baseUrl += `?${params.toString()}`;
556
600
  }
@@ -594,27 +638,27 @@ export class HttpBlobClient {
594
638
  /**
595
639
  * Start the blob client.
596
640
  * Discovers beacon configuration for custom devnets,
597
- * then uploads the initial healthcheck file (awaited) and starts periodic uploads.
641
+ * then attempts the initial healthcheck upload and starts periodic uploads even if storage is unavailable.
598
642
  */ async start() {
599
643
  if (this.beaconGenesisTime === undefined) {
600
644
  await this.fetchBeaconConfig();
601
645
  }
602
- if (!this.fileStoreUploadClient) {
646
+ if (!this.fileStoreUploadClient || this.healthcheckUpload) {
603
647
  return;
604
648
  }
605
- await this.fileStoreUploadClient.uploadHealthcheck();
606
- this.log.debug('Initial healthcheck file uploaded');
607
- this.startPeriodicHealthcheckUpload();
649
+ await this.startPeriodicHealthcheckUpload();
608
650
  }
609
651
  /**
610
652
  * Start periodic healthcheck upload to the file store to ensure it remains available even if accidentally deleted.
611
- */ startPeriodicHealthcheckUpload() {
653
+ */ async startPeriodicHealthcheckUpload() {
612
654
  const intervalMs = (this.config.blobHealthcheckUploadIntervalMinutes ?? DEFAULT_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES) * 60 * 1000;
613
- this.healthcheckUploadIntervalId = setInterval(()=>{
614
- void this.fileStoreUploadClient.uploadHealthcheck().catch((err)=>{
615
- this.log.warn('Failed to upload periodic healthcheck file', err);
616
- });
617
- }, intervalMs);
655
+ const initialUpload = promiseWithResolvers();
656
+ this.healthcheckUpload = new RunningPromise(async ()=>{
657
+ await this.uploadWithRetry('healthcheck', ()=>this.fileStoreUploadClient.uploadHealthcheck());
658
+ initialUpload.resolve();
659
+ }, this.log, intervalMs);
660
+ this.healthcheckUpload.start();
661
+ await initialUpload.promise;
618
662
  }
619
663
  /**
620
664
  * Fetches and caches beacon genesis time and slot duration from the first available consensus host.
@@ -656,12 +700,12 @@ export class HttpBlobClient {
656
700
  }
657
701
  /**
658
702
  * Stop the blob client, clearing any periodic tasks.
703
+ * In-flight upload retries are not cancelled. They end once their backoff runs out, their saves are idempotent,
704
+ * and the CLI exits the process after shutdown.
659
705
  */ stop() {
660
706
  void this.consensusHostReprobe?.stop();
661
- if (this.healthcheckUploadIntervalId) {
662
- clearInterval(this.healthcheckUploadIntervalId);
663
- this.healthcheckUploadIntervalId = undefined;
664
- }
707
+ void this.healthcheckUpload?.stop();
708
+ this.healthcheckUpload = undefined;
665
709
  }
666
710
  }
667
711
  async function parseBlobJsonsFromResponse(response, logger) {
@@ -0,0 +1,15 @@
1
+ import { type TelemetryClient } from '@aztec-labs/telemetry-client';
2
+ /** Kind of data being uploaded to the blob filestore. */
3
+ export type BlobUploadType = 'blobs' | 'healthcheck';
4
+ /** Records upload attempts and final outcomes separately to distinguish recovered errors from exhausted retries. */
5
+ export declare class BlobClientInstrumentation {
6
+ private readonly uploadAttempts;
7
+ private readonly uploadRequests;
8
+ private readonly uploadDuration;
9
+ constructor(telemetry: TelemetryClient);
10
+ /** Records one storage attempt, including attempts that will be retried. */
11
+ recordAttempt(type: BlobUploadType, success: boolean): void;
12
+ /** Records a request's final outcome and elapsed time after all retries. */
13
+ recordUpload(type: BlobUploadType, success: boolean, durationMs: number): void;
14
+ }
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwsS0FBSyxlQUFlLEVBR3JCLE1BQU0sOEJBQThCLENBQUM7QUFFdEMseURBQXlEO0FBQ3pELE1BQU0sTUFBTSxjQUFjLEdBQUcsT0FBTyxHQUFHLGFBQWEsQ0FBQztBQUVyRCxvSEFBb0g7QUFDcEgscUJBQWEseUJBQXlCO0lBQ3BDLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQjtJQUMvQyxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBZ0I7SUFDL0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQVk7SUFFM0MsWUFBWSxTQUFTLEVBQUUsZUFBZSxFQVNyQztJQUVELDRFQUE0RTtJQUNyRSxhQUFhLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FLakU7SUFFRCw0RUFBNEU7SUFDckUsWUFBWSxDQUFDLElBQUksRUFBRSxjQUFjLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FPcEY7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/client/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAEtC,yDAAyD;AACzD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,aAAa,CAAC;AAErD,oHAAoH;AACpH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAY;IAE3C,YAAY,SAAS,EAAE,eAAe,EASrC;IAED,4EAA4E;IACrE,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAKjE;IAED,4EAA4E;IACrE,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAOpF;CACF"}
@@ -0,0 +1,36 @@
1
+ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec-labs/telemetry-client';
2
+ /** Records upload attempts and final outcomes separately to distinguish recovered errors from exhausted retries. */ export class BlobClientInstrumentation {
3
+ uploadAttempts;
4
+ uploadRequests;
5
+ uploadDuration;
6
+ constructor(telemetry){
7
+ const meter = telemetry.getMeter('BlobClient');
8
+ const attributes = {
9
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: [
10
+ 'blobs',
11
+ 'healthcheck'
12
+ ],
13
+ [Attributes.STATUS]: [
14
+ 'success',
15
+ 'failure'
16
+ ]
17
+ };
18
+ this.uploadAttempts = createUpDownCounterWithDefault(meter, Metrics.BLOB_CLIENT_UPLOAD_ATTEMPT_COUNT, attributes);
19
+ this.uploadRequests = createUpDownCounterWithDefault(meter, Metrics.BLOB_CLIENT_UPLOAD_REQUEST_COUNT, attributes);
20
+ this.uploadDuration = meter.createHistogram(Metrics.BLOB_CLIENT_UPLOAD_DURATION);
21
+ }
22
+ /** Records one storage attempt, including attempts that will be retried. */ recordAttempt(type, success) {
23
+ this.uploadAttempts.add(1, {
24
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: type,
25
+ [Attributes.STATUS]: success ? 'success' : 'failure'
26
+ });
27
+ }
28
+ /** Records a request's final outcome and elapsed time after all retries. */ recordUpload(type, success, durationMs) {
29
+ const attributes = {
30
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: type,
31
+ [Attributes.STATUS]: success ? 'success' : 'failure'
32
+ };
33
+ this.uploadRequests.add(1, attributes);
34
+ this.uploadDuration.record(durationMs, attributes);
35
+ }
36
+ }
@@ -8,4 +8,4 @@ export declare function runBlobClientTests(createClient: () => Promise<{
8
8
  client: BlobClientInterface;
9
9
  cleanup: () => Promise<void>;
10
10
  }>): void;
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvdGVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUxRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUNoQyxZQUFZLEVBQUUsTUFBTSxPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUM7SUFBQyxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7Q0FBRSxDQUFDLFFBb0QzRiJ9
11
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvdGVzdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUxRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUNoQyxZQUFZLEVBQUUsTUFBTSxPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUM7SUFBQyxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7Q0FBRSxDQUFDLFFBb0QzRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"tests.d.ts","sourceRoot":"","sources":["../../src/client/tests.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,MAAM,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,QAoD3F"}
1
+ {"version":3,"file":"tests.d.ts","sourceRoot":"","sources":["../../src/client/tests.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,MAAM,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,QAoD3F"}
@@ -1,4 +1,5 @@
1
1
  import { makeRandomBlob } from '@aztec-labs/blob-lib/testing';
2
+ import { times } from '@aztec-labs/foundation/collection';
2
3
  import { Buffer } from 'buffer';
3
4
  /**
4
5
  * Shared test suite for blob clients
@@ -32,9 +33,7 @@ import { Buffer } from 'buffer';
32
33
  expect(retrievedBlobs[0]).toEqual(blob);
33
34
  });
34
35
  it('should handle multiple blobs', async ()=>{
35
- const blobs = await Promise.all(Array.from({
36
- length: 3
37
- }, ()=>makeRandomBlob(7)));
36
+ const blobs = await Promise.all(times(3, ()=>makeRandomBlob(7)));
38
37
  const blobHashes = blobs.map((blob)=>blob.getEthVersionedBlobHash());
39
38
  await client.sendBlobsToFilestore(blobs);
40
39
  const retrievedBlobs = await client.getBlobSidecar(blockId, blobHashes, {
@@ -64,4 +64,4 @@ export declare class FileStoreBlobClient {
64
64
  */
65
65
  private isWritable;
66
66
  }
67
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZXN0b3JlX2Jsb2JfY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmlsZXN0b3JlL2ZpbGVzdG9yZV9ibG9iX2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssUUFBUSxFQUErQixNQUFNLHNCQUFzQixDQUFDO0FBQ3hGLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQU1sRjs7O0dBR0c7QUFDSCxxQkFBYSxtQkFBbUI7SUFJNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUTtJQUozQixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUU3QixZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxFQUNwQyxRQUFRLEVBQUUsTUFBTSxFQUNqQyxNQUFNLENBQUMsRUFBRSxNQUFNLEVBR2hCO0lBRUQ7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLFFBQVE7SUFJaEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLGVBQWU7SUFJdkI7Ozs7T0FJRztJQUNHLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FtQmhFO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxEO0lBRUQ7Ozs7O09BS0c7SUFDRyxRQUFRLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxZQUFZLFVBQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0I3RDtJQUVEOzs7O09BSUc7SUFDRyxTQUFTLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFLFlBQVksVUFBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFakU7SUFFRDs7T0FFRztJQUNILFVBQVUsSUFBSSxNQUFNLENBRW5CO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBT3ZDO0lBRUQ7OztPQUdHO0lBQ0csaUJBQWlCLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVF2QztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLFVBQVU7Q0FHbkIifQ==
67
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZXN0b3JlX2Jsb2JfY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmlsZXN0b3JlL2ZpbGVzdG9yZV9ibG9iX2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssUUFBUSxFQUErQixNQUFNLHNCQUFzQixDQUFDO0FBQ3hGLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUV2RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQU1sRjs7O0dBR0c7QUFDSCxxQkFBYSxtQkFBbUI7SUFJNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUTtJQUozQixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUU3QixZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxFQUNwQyxRQUFRLEVBQUUsTUFBTSxFQUNqQyxNQUFNLENBQUMsRUFBRSxNQUFNLEVBR2hCO0lBRUQ7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLFFBQVE7SUFJaEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLGVBQWU7SUFJdkI7Ozs7T0FJRztJQUNHLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FtQmhFO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxEO0lBRUQ7Ozs7O09BS0c7SUFDRyxRQUFRLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxZQUFZLFVBQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0I3RDtJQUVEOzs7O09BSUc7SUFDRyxTQUFTLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFLFlBQVksVUFBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFakU7SUFFRDs7T0FFRztJQUNILFVBQVUsSUFBSSxNQUFNLENBRW5CO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBT3ZDO0lBRUQ7OztPQUdHO0lBQ0csaUJBQWlCLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVF2QztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLFVBQVU7Q0FHbkIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"filestore_blob_client.d.ts","sourceRoot":"","sources":["../../src/filestore/filestore_blob_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,EAA+B,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlF;;;GAGG;AACH,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJ3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,QAAQ,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,MAAM,EAGhB;IAED;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAIhB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAIvB;;;;OAIG;IACG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAmBhE;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAElD;IAED;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB7D;IAED;;;;OAIG;IACG,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;IAED;;OAEG;IACH,UAAU,IAAI,MAAM,CAEnB;IAED;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAOvC;IAED;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQvC;IAED;;OAEG;IACH,OAAO,CAAC,UAAU;CAGnB"}
1
+ {"version":3,"file":"filestore_blob_client.d.ts","sourceRoot":"","sources":["../../src/filestore/filestore_blob_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,EAA+B,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlF;;;GAGG;AACH,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJ3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,QAAQ,EAAE,MAAM,EACjC,MAAM,CAAC,EAAE,MAAM,EAGhB;IAED;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAIhB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAIvB;;;;OAIG;IACG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAmBhE;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAElD;IAED;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB7D;IAED;;;;OAIG;IACG,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;IAED;;OAEG;IACH,UAAU,IAAI,MAAM,CAEnB;IAED;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAOvC;IAED;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQvC;IAED;;OAEG;IACH,OAAO,CAAC,UAAU;CAGnB"}
@@ -1,5 +1,6 @@
1
1
  import { computeEthVersionedBlobHash } from '@aztec-labs/blob-lib';
2
2
  import { createLogger } from '@aztec-labs/foundation/log';
3
+ import { bufferToHex } from '@aztec-labs/foundation/string';
3
4
  import { Buffer } from 'buffer';
4
5
  import { inboundTransform, outboundTransform } from '../encoding/index.js';
5
6
  import { HEALTHCHECK_CONTENT, HEALTHCHECK_FILENAME } from './healthcheck.js';
@@ -63,7 +64,7 @@ import { HEALTHCHECK_CONTENT, HEALTHCHECK_FILENAME } from './healthcheck.js';
63
64
  if (!this.isWritable()) {
64
65
  throw new Error('FileStore is read-only');
65
66
  }
66
- const versionedHash = `0x${computeEthVersionedBlobHash(blob.commitment).toString('hex')}`;
67
+ const versionedHash = bufferToHex(computeEthVersionedBlobHash(blob.commitment));
67
68
  if (skipIfExists && await this.store.exists(this.blobPath(versionedHash))) {
68
69
  this.log.trace(`Blob ${versionedHash} already exists, skipping`);
69
70
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec-labs/blob-client",
3
- "version": "6.1.0-nightly.20261113",
3
+ "version": "6.1.0-rc.1",
4
4
  "type": "module",
5
5
  "bin": "./dest/client/bin/index.js",
6
6
  "exports": {
@@ -56,11 +56,11 @@
56
56
  ]
57
57
  },
58
58
  "dependencies": {
59
- "@aztec-labs/blob-lib": "6.1.0-nightly.20261113",
60
- "@aztec-labs/ethereum": "6.1.0-nightly.20261113",
61
- "@aztec-labs/foundation": "6.1.0-nightly.20261113",
62
- "@aztec-labs/stdlib": "6.1.0-nightly.20261113",
63
- "@aztec-labs/telemetry-client": "6.1.0-nightly.20261113",
59
+ "@aztec-labs/blob-lib": "6.1.0-rc.1",
60
+ "@aztec-labs/ethereum": "6.1.0-rc.1",
61
+ "@aztec-labs/foundation": "6.1.0-rc.1",
62
+ "@aztec-labs/stdlib": "6.1.0-rc.1",
63
+ "@aztec-labs/telemetry-client": "6.1.0-rc.1",
64
64
  "express": "^4.21.2",
65
65
  "snappy": "7.2.2",
66
66
  "source-map-support": "^0.5.21",
@@ -1,10 +1,14 @@
1
1
  import { Blob, type BlobJson, computeEthVersionedBlobHash } from '@aztec-labs/blob-lib';
2
2
  import { shuffle } from '@aztec-labs/foundation/array';
3
+ import { compactArray } from '@aztec-labs/foundation/collection';
3
4
  import { type Logger, createLogger } from '@aztec-labs/foundation/log';
5
+ import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
4
6
  import { makeBackoff, retry } from '@aztec-labs/foundation/retry';
5
7
  import { RunningPromise } from '@aztec-labs/foundation/running-promise';
6
8
  import { schemas } from '@aztec-labs/foundation/schemas';
7
9
  import { bufferToHex, hexToBuffer } from '@aztec-labs/foundation/string';
10
+ import { Timer } from '@aztec-labs/foundation/timer';
11
+ import { type TelemetryClient, getTelemetryClient } from '@aztec-labs/telemetry-client';
8
12
  import { Buffer } from 'buffer';
9
13
  import { mainnet, sepolia } from 'viem/chains';
10
14
  import { z } from 'zod';
@@ -14,6 +18,7 @@ import type { BlobArchiveClient } from '../archive/interface.js';
14
18
  import type { FileStoreBlobClient } from '../filestore/filestore_blob_client.js';
15
19
  import { DEFAULT_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES } from '../filestore/healthcheck.js';
16
20
  import { type BlobClientConfig, getBlobClientConfigFromEnv } from './config.js';
21
+ import { BlobClientInstrumentation, type BlobUploadType } from './instrumentation.js';
17
22
  import type { BlobClientInterface, GetBlobSidecarOptions } from './interface.js';
18
23
 
19
24
  /** How often consensus hosts that failed the startup probe are probed again. */
@@ -64,8 +69,9 @@ export class HttpBlobClient implements BlobClientInterface {
64
69
  protected readonly fileStoreClients: FileStoreBlobClient[];
65
70
  protected readonly fileStoreUploadClient: FileStoreBlobClient | undefined;
66
71
 
72
+ private readonly instrumentation: BlobClientInstrumentation;
67
73
  private disabled = false;
68
- private healthcheckUploadIntervalId?: NodeJS.Timeout;
74
+ private healthcheckUpload?: RunningPromise;
69
75
 
70
76
  /** Beacon genesis time (seconds since Unix epoch), discovered at startup for custom devnets. */
71
77
  private beaconGenesisTime?: bigint;
@@ -85,8 +91,9 @@ export class HttpBlobClient implements BlobClientInterface {
85
91
  archiveClient?: BlobArchiveClient;
86
92
  fileStoreClients?: FileStoreBlobClient[];
87
93
  fileStoreUploadClient?: FileStoreBlobClient;
94
+ telemetry?: TelemetryClient;
88
95
  /** Callback fired when blobs are successfully fetched from any source */
89
- onBlobsFetched?: (blobs: Blob[]) => void;
96
+ onBlobsFetched?: (blobs: Blob[]) => void | Promise<void>;
90
97
  /** Overrides how often consensus hosts that failed the startup probe are probed again. */
91
98
  consensusHostReprobeIntervalMs?: number;
92
99
  } = {},
@@ -101,10 +108,11 @@ export class HttpBlobClient implements BlobClientInterface {
101
108
  this.log = opts.logger ?? createLogger('blob-client:client');
102
109
  this.fileStoreClients = opts.fileStoreClients ?? [];
103
110
  this.fileStoreUploadClient = opts.fileStoreUploadClient;
111
+ this.instrumentation = new BlobClientInstrumentation(opts.telemetry ?? getTelemetryClient());
104
112
 
105
113
  if (this.fileStoreUploadClient && !opts.onBlobsFetched) {
106
- this.opts.onBlobsFetched = blobs => {
107
- this.uploadBlobsToFileStore(blobs);
114
+ this.opts.onBlobsFetched = async blobs => {
115
+ await this.sendBlobsToFilestore(blobs);
108
116
  };
109
117
  }
110
118
 
@@ -120,18 +128,40 @@ export class HttpBlobClient implements BlobClientInterface {
120
128
  };
121
129
  }
122
130
 
123
- /**
124
- * Upload fetched blobs to filestore (fire-and-forget).
125
- * Called automatically when blobs are fetched from any source.
126
- */
127
- private uploadBlobsToFileStore(blobs: Blob[]): void {
128
- if (!this.fileStoreUploadClient) {
129
- return;
131
+ private async uploadWithRetry(
132
+ uploadType: BlobUploadType,
133
+ upload: () => Promise<void>,
134
+ context: { blobHashes?: string[] } = {},
135
+ ): Promise<boolean> {
136
+ const timer = new Timer();
137
+ let success = false;
138
+ let attempt = 0;
139
+ try {
140
+ await retry(
141
+ async () => {
142
+ attempt++;
143
+ try {
144
+ await upload();
145
+ this.instrumentation.recordAttempt(uploadType, true);
146
+ } catch (err) {
147
+ this.instrumentation.recordAttempt(uploadType, false);
148
+ this.log.warn('Blob filestore upload attempt failed', { err, uploadType, attempt, ...context });
149
+ throw err;
150
+ }
151
+ },
152
+ `Uploading ${uploadType} to filestore`,
153
+ makeBackoff([1, 2, 4, 8, 16]),
154
+ this.log,
155
+ true,
156
+ );
157
+ success = true;
158
+ return true;
159
+ } catch (err) {
160
+ this.log.error('Blob filestore upload failed after retries', { err, uploadType, attempt, ...context });
161
+ return false;
162
+ } finally {
163
+ this.instrumentation.recordUpload(uploadType, success, timer.ms());
130
164
  }
131
-
132
- void this.fileStoreUploadClient.saveBlobs(blobs, true).catch(err => {
133
- this.log.warn(`Failed to upload ${blobs.length} blobs to filestore`, err);
134
- });
135
165
  }
136
166
 
137
167
  /**
@@ -313,19 +343,15 @@ export class HttpBlobClient implements BlobClientInterface {
313
343
  return false;
314
344
  }
315
345
 
316
- if (!this.fileStoreUploadClient) {
346
+ const uploadClient = this.fileStoreUploadClient;
347
+ if (!uploadClient) {
317
348
  this.log.verbose('No filestore upload configured');
318
349
  return false;
319
350
  }
320
351
 
321
- this.log.verbose(`Uploading ${blobs.length} blobs to filestore`);
322
- try {
323
- await this.fileStoreUploadClient.saveBlobs(blobs, true);
324
- return true;
325
- } catch (err) {
326
- this.log.error('Failed to upload blobs to filestore', err);
327
- return false;
328
- }
352
+ const blobHashes = blobs.map(blob => bufferToHex(blob.getEthVersionedBlobHash()));
353
+ this.log.verbose('Uploading blobs to filestore', { blobHashes, blobCount: blobs.length });
354
+ return await this.uploadWithRetry('blobs', () => uploadClient.saveBlobs(blobs, true), { blobHashes });
329
355
  }
330
356
 
331
357
  /**
@@ -356,12 +382,10 @@ export class HttpBlobClient implements BlobClientInterface {
356
382
 
357
383
  // Helper to get missing blob hashes that we still need to fetch
358
384
  const getMissingBlobHashes = (): Buffer[] =>
359
- blobHashes
360
- .map((bh, i) => (resultBlobs[i] === undefined ? bh : undefined))
361
- .filter((bh): bh is Buffer => bh !== undefined);
385
+ compactArray(blobHashes.map((bh, i) => (resultBlobs[i] === undefined ? bh : undefined)));
362
386
 
363
387
  // Return the result, ignoring any undefined ones
364
- const getFilledBlobs = (): Blob[] => resultBlobs.filter((b): b is Blob => b !== undefined);
388
+ const getFilledBlobs = (): Blob[] => compactArray(resultBlobs);
365
389
 
366
390
  // Helper to fill in results from fetched blobs
367
391
  const fillResults = async (fetchedBlobs: BlobJson[]): Promise<Blob[]> => {
@@ -378,7 +402,11 @@ export class HttpBlobClient implements BlobClientInterface {
378
402
  // Fire callback when returning blobs (fire-and-forget)
379
403
  const returnWithCallback = (blobs: Blob[]): Blob[] => {
380
404
  if (blobs.length > 0 && this.opts.onBlobsFetched) {
381
- void Promise.resolve().then(() => this.opts.onBlobsFetched!(blobs));
405
+ void Promise.resolve()
406
+ .then(() => this.opts.onBlobsFetched!(blobs))
407
+ .catch(err => {
408
+ this.log.warn('Blob fetch callback failed', { err, blockHash, blobHashes: blobHashes.map(bufferToHex) });
409
+ });
382
410
  }
383
411
  return blobs;
384
412
  };
@@ -586,7 +614,7 @@ export class HttpBlobClient implements BlobClientInterface {
586
614
  }
587
615
 
588
616
  try {
589
- const blobHashStrings = blobHashes.map(h => `0x${h.toString('hex')}`);
617
+ const blobHashStrings = blobHashes.map(h => bufferToHex(h));
590
618
  this.log.trace(`Attempting to get ${blobHashStrings.length} blobs from filestore`, {
591
619
  url: client.getBaseUrl(),
592
620
  ...ctx,
@@ -615,7 +643,7 @@ export class HttpBlobClient implements BlobClientInterface {
615
643
  l1ConsensusHostIndex?: number,
616
644
  ): Promise<Blob[]> {
617
645
  const blobs = await this.getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex, blobHashes);
618
- return (await processFetchedBlobs(blobs, blobHashes, this.log)).filter((b): b is Blob => b !== undefined);
646
+ return compactArray(await processFetchedBlobs(blobs, blobHashes, this.log));
619
647
  }
620
648
 
621
649
  public async getBlobsFromHost(
@@ -653,7 +681,7 @@ export class HttpBlobClient implements BlobClientInterface {
653
681
  if (blobHashes && blobHashes.length > 0) {
654
682
  const params = new URLSearchParams();
655
683
  for (const hash of blobHashes) {
656
- params.append('versioned_hashes', `0x${hash.toString('hex')}`);
684
+ params.append('versioned_hashes', bufferToHex(hash));
657
685
  }
658
686
  baseUrl += `?${params.toString()}`;
659
687
  }
@@ -703,35 +731,37 @@ export class HttpBlobClient implements BlobClientInterface {
703
731
  /**
704
732
  * Start the blob client.
705
733
  * Discovers beacon configuration for custom devnets,
706
- * then uploads the initial healthcheck file (awaited) and starts periodic uploads.
734
+ * then attempts the initial healthcheck upload and starts periodic uploads even if storage is unavailable.
707
735
  */
708
736
  public async start(): Promise<void> {
709
737
  if (this.beaconGenesisTime === undefined) {
710
738
  await this.fetchBeaconConfig();
711
739
  }
712
740
 
713
- if (!this.fileStoreUploadClient) {
741
+ if (!this.fileStoreUploadClient || this.healthcheckUpload) {
714
742
  return;
715
743
  }
716
744
 
717
- await this.fileStoreUploadClient.uploadHealthcheck();
718
- this.log.debug('Initial healthcheck file uploaded');
719
-
720
- this.startPeriodicHealthcheckUpload();
745
+ await this.startPeriodicHealthcheckUpload();
721
746
  }
722
747
 
723
748
  /**
724
749
  * Start periodic healthcheck upload to the file store to ensure it remains available even if accidentally deleted.
725
750
  */
726
- private startPeriodicHealthcheckUpload(): void {
751
+ private async startPeriodicHealthcheckUpload(): Promise<void> {
727
752
  const intervalMs =
728
753
  (this.config.blobHealthcheckUploadIntervalMinutes ?? DEFAULT_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES) * 60 * 1000;
729
-
730
- this.healthcheckUploadIntervalId = setInterval(() => {
731
- void this.fileStoreUploadClient!.uploadHealthcheck().catch(err => {
732
- this.log.warn('Failed to upload periodic healthcheck file', err);
733
- });
734
- }, intervalMs);
754
+ const initialUpload = promiseWithResolvers<void>();
755
+ this.healthcheckUpload = new RunningPromise(
756
+ async () => {
757
+ await this.uploadWithRetry('healthcheck', () => this.fileStoreUploadClient!.uploadHealthcheck());
758
+ initialUpload.resolve();
759
+ },
760
+ this.log,
761
+ intervalMs,
762
+ );
763
+ this.healthcheckUpload.start();
764
+ await initialUpload.promise;
735
765
  }
736
766
 
737
767
  /**
@@ -787,13 +817,13 @@ export class HttpBlobClient implements BlobClientInterface {
787
817
 
788
818
  /**
789
819
  * Stop the blob client, clearing any periodic tasks.
820
+ * In-flight upload retries are not cancelled. They end once their backoff runs out, their saves are idempotent,
821
+ * and the CLI exits the process after shutdown.
790
822
  */
791
823
  public stop(): void {
792
824
  void this.consensusHostReprobe?.stop();
793
- if (this.healthcheckUploadIntervalId) {
794
- clearInterval(this.healthcheckUploadIntervalId);
795
- this.healthcheckUploadIntervalId = undefined;
796
- }
825
+ void this.healthcheckUpload?.stop();
826
+ this.healthcheckUpload = undefined;
797
827
  }
798
828
  }
799
829
 
@@ -0,0 +1,47 @@
1
+ import {
2
+ Attributes,
3
+ type Histogram,
4
+ Metrics,
5
+ type TelemetryClient,
6
+ type UpDownCounter,
7
+ createUpDownCounterWithDefault,
8
+ } from '@aztec-labs/telemetry-client';
9
+
10
+ /** Kind of data being uploaded to the blob filestore. */
11
+ export type BlobUploadType = 'blobs' | 'healthcheck';
12
+
13
+ /** Records upload attempts and final outcomes separately to distinguish recovered errors from exhausted retries. */
14
+ export class BlobClientInstrumentation {
15
+ private readonly uploadAttempts: UpDownCounter;
16
+ private readonly uploadRequests: UpDownCounter;
17
+ private readonly uploadDuration: Histogram;
18
+
19
+ constructor(telemetry: TelemetryClient) {
20
+ const meter = telemetry.getMeter('BlobClient');
21
+ const attributes = {
22
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: ['blobs', 'healthcheck'],
23
+ [Attributes.STATUS]: ['success', 'failure'],
24
+ };
25
+ this.uploadAttempts = createUpDownCounterWithDefault(meter, Metrics.BLOB_CLIENT_UPLOAD_ATTEMPT_COUNT, attributes);
26
+ this.uploadRequests = createUpDownCounterWithDefault(meter, Metrics.BLOB_CLIENT_UPLOAD_REQUEST_COUNT, attributes);
27
+ this.uploadDuration = meter.createHistogram(Metrics.BLOB_CLIENT_UPLOAD_DURATION);
28
+ }
29
+
30
+ /** Records one storage attempt, including attempts that will be retried. */
31
+ public recordAttempt(type: BlobUploadType, success: boolean): void {
32
+ this.uploadAttempts.add(1, {
33
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: type,
34
+ [Attributes.STATUS]: success ? 'success' : 'failure',
35
+ });
36
+ }
37
+
38
+ /** Records a request's final outcome and elapsed time after all retries. */
39
+ public recordUpload(type: BlobUploadType, success: boolean, durationMs: number): void {
40
+ const attributes = {
41
+ [Attributes.BLOB_CLIENT_UPLOAD_TYPE]: type,
42
+ [Attributes.STATUS]: success ? 'success' : 'failure',
43
+ };
44
+ this.uploadRequests.add(1, attributes);
45
+ this.uploadDuration.record(durationMs, attributes);
46
+ }
47
+ }
@@ -1,4 +1,5 @@
1
1
  import { makeRandomBlob } from '@aztec-labs/blob-lib/testing';
2
+ import { times } from '@aztec-labs/foundation/collection';
2
3
  import { Buffer } from 'buffer';
3
4
  import type { Hex } from 'viem';
4
5
 
@@ -39,7 +40,7 @@ export function runBlobClientTests(
39
40
  });
40
41
 
41
42
  it('should handle multiple blobs', async () => {
42
- const blobs = await Promise.all(Array.from({ length: 3 }, () => makeRandomBlob(7)));
43
+ const blobs = await Promise.all(times(3, () => makeRandomBlob(7)));
43
44
  const blobHashes = blobs.map(blob => blob.getEthVersionedBlobHash());
44
45
 
45
46
  await client.sendBlobsToFilestore(blobs);
@@ -1,5 +1,6 @@
1
1
  import { Blob, type BlobJson, computeEthVersionedBlobHash } from '@aztec-labs/blob-lib';
2
2
  import { type Logger, createLogger } from '@aztec-labs/foundation/log';
3
+ import { bufferToHex } from '@aztec-labs/foundation/string';
3
4
  import type { FileStore, ReadOnlyFileStore } from '@aztec-labs/stdlib/file-store';
4
5
  import { Buffer } from 'buffer';
5
6
 
@@ -82,7 +83,7 @@ export class FileStoreBlobClient {
82
83
  throw new Error('FileStore is read-only');
83
84
  }
84
85
 
85
- const versionedHash = `0x${computeEthVersionedBlobHash(blob.commitment).toString('hex')}`;
86
+ const versionedHash = bufferToHex(computeEthVersionedBlobHash(blob.commitment));
86
87
 
87
88
  if (skipIfExists && (await this.store.exists(this.blobPath(versionedHash)))) {
88
89
  this.log.trace(`Blob ${versionedHash} already exists, skipping`);