@aztec/blob-client 4.0.0-devnet.1-patch.0 → 4.0.0-devnet.2-patch.0

package/dest/blobstore/blob_store_test_suite.js

@@ -12,7 +12,7 @@ export function describeBlobStore(getBlobStore) {
             Fr.random(),
             Fr.random()
         ];
-        const blob = Blob.fromFields(testFields);
+        const blob = await Blob.fromFields(testFields);
         const blobHash = blob.getEthVersionedBlobHash();
         // Store the blob
         await blobStore.addBlobs([
@@ -28,11 +28,11 @@ export function describeBlobStore(getBlobStore) {
     });
     it('should handle multiple blobs stored and retrieved by their hashes', async ()=>{
         // Create two different blobs
-        const blob1 = Blob.fromFields([
+        const blob1 = await Blob.fromFields([
             Fr.random(),
             Fr.random()
         ]);
-        const blob2 = Blob.fromFields([
+        const blob2 = await Blob.fromFields([
             Fr.random(),
             Fr.random(),
             Fr.random()
@@ -64,13 +64,13 @@ export function describeBlobStore(getBlobStore) {
     });
     it('should handle retrieving subset of stored blobs', async ()=>{
         // Store multiple blobs
-        const blob1 = Blob.fromFields([
+        const blob1 = await Blob.fromFields([
             Fr.random()
         ]);
-        const blob2 = Blob.fromFields([
+        const blob2 = await Blob.fromFields([
             Fr.random()
         ]);
-        const blob3 = Blob.fromFields([
+        const blob3 = await Blob.fromFields([
             Fr.random()
         ]);
         await blobStore.addBlobs([
@@ -90,7 +90,7 @@ export function describeBlobStore(getBlobStore) {
         expect(retrievedBlobs[1]).toEqual(blob3);
     });
     it('should handle duplicate blob hashes in request', async ()=>{
-        const blob = Blob.fromFields([
+        const blob = await Blob.fromFields([
             Fr.random()
         ]);
         const blobHash = blob.getEthVersionedBlobHash();
@@ -112,8 +112,8 @@ export function describeBlobStore(getBlobStore) {
             Fr.random(),
             Fr.random()
         ];
-        const blob1 = Blob.fromFields(fields);
-        const blob2 = Blob.fromFields(fields);
+        const blob1 = await Blob.fromFields(fields);
+        const blob2 = await Blob.fromFields(fields);
         const blobHash = blob1.getEthVersionedBlobHash();
         // Store first blob
         await blobStore.addBlobs([

package/dest/client/http.js

@@ -183,8 +183,8 @@ export class HttpBlobClient {
         // Return the result, ignoring any undefined ones
         const getFilledBlobs = ()=>resultBlobs.filter((b)=>b !== undefined);
         // Helper to fill in results from fetched blobs
-        const fillResults = (fetchedBlobs)=>{
-            const blobs = processFetchedBlobs(fetchedBlobs, blobHashes, this.log);
+        const fillResults = async (fetchedBlobs)=>{
+            const blobs = await processFetchedBlobs(fetchedBlobs, blobHashes, this.log);
             // Fill in any missing positions with matching blobs
             for(let i = 0; i < blobHashes.length; i++){
                 if (resultBlobs[i] === undefined) {
@@ -236,7 +236,7 @@ export class HttpBlobClient {
                         ...ctx
                     });
                     const blobs = await this.getBlobsFromHost(l1ConsensusHostUrl, slotNumber, l1ConsensusHostIndex);
-                    const result = fillResults(blobs);
+                    const result = await fillResults(blobs);
                     this.log.debug(`Got ${blobs.length} blobs from consensus host (total: ${result.length}/${blobHashes.length})`, {
                         slotNumber,
                         l1ConsensusHostUrl,
@@ -279,7 +279,7 @@ export class HttpBlobClient {
                 this.log.debug('No blobs found from archive client', archiveCtx);
             } else {
                 this.log.trace(`Got ${allBlobs.length} blobs from archive client before filtering`, archiveCtx);
-                const result = fillResults(allBlobs);
+                const result = await fillResults(allBlobs);
                 this.log.debug(`Got ${allBlobs.length} blobs from archive client (total: ${result.length}/${blobHashes.length})`, archiveCtx);
                 if (result.length === blobHashes.length) {
                     return returnWithCallback(result);
@@ -320,7 +320,7 @@ export class HttpBlobClient {
                 });
                 const blobs = await client.getBlobsByHashes(blobHashStrings);
                 if (blobs.length > 0) {
-                    const result = fillResults(blobs);
+                    const result = await fillResults(blobs);
                     this.log.debug(`Got ${blobs.length} blobs from filestore (total: ${result.length}/${ctx.blobHashes.length})`, {
                         url: client.getBaseUrl(),
                         ...ctx
@@ -335,7 +335,7 @@ export class HttpBlobClient {
     }
     async getBlobSidecarFrom(hostUrl, blockHashOrSlot, blobHashes = [], l1ConsensusHostIndex) {
         const blobs = await this.getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex);
-        return processFetchedBlobs(blobs, blobHashes, this.log).filter((b)=>b !== undefined);
+        return (await processFetchedBlobs(blobs, blobHashes, this.log)).filter((b)=>b !== undefined);
     }
     async getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex) {
         try {
@@ -530,7 +530,7 @@ function parseBlobJson(data) {
 }
 // Returns an array that maps each blob hash to the corresponding blob, or undefined if the blob is not found
 // or the data does not match the commitment.
-function processFetchedBlobs(blobs, blobHashes, logger) {
+async function processFetchedBlobs(blobs, blobHashes, logger) {
     const requestedBlobHashes = new Set(blobHashes.map(bufferToHex));
     const hashToBlob = new Map();
     for (const blobJson of blobs){
@@ -539,7 +539,7 @@ function processFetchedBlobs(blobs, blobHashes, logger) {
             continue;
         }
         try {
-            const blob = Blob.fromJson(blobJson);
+            const blob = await Blob.fromJson(blobJson);
             hashToBlob.set(hashHex, blob);
         } catch (err) {
             // If the above throws, it's likely that the blob commitment does not match the hash of the blob data.

package/dest/client/tests.js

@@ -17,7 +17,7 @@ import { makeRandomBlob } from '@aztec/blob-lib/testing';
         await cleanup();
     });
     it('should send and retrieve blobs by hash', async ()=>{
-        const blob = makeRandomBlob(5);
+        const blob = await makeRandomBlob(5);
         const blobHash = blob.getEthVersionedBlobHash();
         await client.sendBlobsToFilestore([
             blob
@@ -29,9 +29,9 @@ import { makeRandomBlob } from '@aztec/blob-lib/testing';
         expect(retrievedBlobs[0]).toEqual(blob);
     });
     it('should handle multiple blobs', async ()=>{
-        const blobs = Array.from({
+        const blobs = await Promise.all(Array.from({
             length: 3
-        }, ()=>makeRandomBlob(7));
+        }, ()=>makeRandomBlob(7)));
         const blobHashes = blobs.map((blob)=>blob.getEthVersionedBlobHash());
         await client.sendBlobsToFilestore(blobs);
         const retrievedBlobs = await client.getBlobSidecar(blockId, blobHashes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/blob-client",
-  "version": "4.0.0-devnet.1-patch.0",
+  "version": "4.0.0-devnet.2-patch.0",
   "type": "module",
   "bin": "./dest/client/bin/index.js",
   "exports": {
@@ -56,12 +56,12 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "4.0.0-devnet.1-patch.0",
-    "@aztec/ethereum": "4.0.0-devnet.1-patch.0",
-    "@aztec/foundation": "4.0.0-devnet.1-patch.0",
-    "@aztec/kv-store": "4.0.0-devnet.1-patch.0",
-    "@aztec/stdlib": "4.0.0-devnet.1-patch.0",
-    "@aztec/telemetry-client": "4.0.0-devnet.1-patch.0",
+    "@aztec/blob-lib": "4.0.0-devnet.2-patch.0",
+    "@aztec/ethereum": "4.0.0-devnet.2-patch.0",
+    "@aztec/foundation": "4.0.0-devnet.2-patch.0",
+    "@aztec/kv-store": "4.0.0-devnet.2-patch.0",
+    "@aztec/stdlib": "4.0.0-devnet.2-patch.0",
+    "@aztec/telemetry-client": "4.0.0-devnet.2-patch.0",
     "express": "^4.21.2",
     "snappy": "^7.2.2",
     "source-map-support": "^0.5.21",

package/src/blobstore/blob_store_test_suite.ts

@@ -13,7 +13,7 @@ export function describeBlobStore(getBlobStore: () => Promise<BlobStore>) {
   it('should store and retrieve a blob by hash', async () => {
     // Create a test blob with random fields
     const testFields = [Fr.random(), Fr.random(), Fr.random()];
-    const blob = Blob.fromFields(testFields);
+    const blob = await Blob.fromFields(testFields);
     const blobHash = blob.getEthVersionedBlobHash();
 
     // Store the blob
@@ -29,8 +29,8 @@ export function describeBlobStore(getBlobStore: () => Promise<BlobStore>) {
 
   it('should handle multiple blobs stored and retrieved by their hashes', async () => {
     // Create two different blobs
-    const blob1 = Blob.fromFields([Fr.random(), Fr.random()]);
-    const blob2 = Blob.fromFields([Fr.random(), Fr.random(), Fr.random()]);
+    const blob1 = await Blob.fromFields([Fr.random(), Fr.random()]);
+    const blob2 = await Blob.fromFields([Fr.random(), Fr.random(), Fr.random()]);
 
     const blobHash1 = blob1.getEthVersionedBlobHash();
     const blobHash2 = blob2.getEthVersionedBlobHash();
@@ -57,9 +57,9 @@ export function describeBlobStore(getBlobStore: () => Promise<BlobStore>) {
 
   it('should handle retrieving subset of stored blobs', async () => {
     // Store multiple blobs
-    const blob1 = Blob.fromFields([Fr.random()]);
-    const blob2 = Blob.fromFields([Fr.random()]);
-    const blob3 = Blob.fromFields([Fr.random()]);
+    const blob1 = await Blob.fromFields([Fr.random()]);
+    const blob2 = await Blob.fromFields([Fr.random()]);
+    const blob3 = await Blob.fromFields([Fr.random()]);
 
     await blobStore.addBlobs([blob1, blob2, blob3]);
 
@@ -75,7 +75,7 @@ export function describeBlobStore(getBlobStore: () => Promise<BlobStore>) {
   });
 
   it('should handle duplicate blob hashes in request', async () => {
-    const blob = Blob.fromFields([Fr.random()]);
+    const blob = await Blob.fromFields([Fr.random()]);
     const blobHash = blob.getEthVersionedBlobHash();
 
     await blobStore.addBlobs([blob]);
@@ -91,8 +91,8 @@ export function describeBlobStore(getBlobStore: () => Promise<BlobStore>) {
   it('should overwrite blob when storing with same hash', async () => {
     // Create two blobs that will have the same hash (same content)
     const fields = [Fr.random(), Fr.random()];
-    const blob1 = Blob.fromFields(fields);
-    const blob2 = Blob.fromFields(fields);
+    const blob1 = await Blob.fromFields(fields);
+    const blob2 = await Blob.fromFields(fields);
 
     const blobHash = blob1.getEthVersionedBlobHash();
 

package/src/client/http.ts

@@ -215,8 +215,8 @@ export class HttpBlobClient implements BlobClientInterface {
     const getFilledBlobs = (): Blob[] => resultBlobs.filter((b): b is Blob => b !== undefined);
 
     // Helper to fill in results from fetched blobs
-    const fillResults = (fetchedBlobs: BlobJson[]): Blob[] => {
-      const blobs = processFetchedBlobs(fetchedBlobs, blobHashes, this.log);
+    const fillResults = async (fetchedBlobs: BlobJson[]): Promise<Blob[]> => {
+      const blobs = await processFetchedBlobs(fetchedBlobs, blobHashes, this.log);
       // Fill in any missing positions with matching blobs
       for (let i = 0; i < blobHashes.length; i++) {
         if (resultBlobs[i] === undefined) {
@@ -269,7 +269,7 @@ export class HttpBlobClient implements BlobClientInterface {
             ...ctx,
           });
           const blobs = await this.getBlobsFromHost(l1ConsensusHostUrl, slotNumber, l1ConsensusHostIndex);
-          const result = fillResults(blobs);
+          const result = await fillResults(blobs);
           this.log.debug(
             `Got ${blobs.length} blobs from consensus host (total: ${result.length}/${blobHashes.length})`,
             { slotNumber, l1ConsensusHostUrl, ...ctx },
@@ -312,7 +312,7 @@ export class HttpBlobClient implements BlobClientInterface {
         this.log.debug('No blobs found from archive client', archiveCtx);
       } else {
         this.log.trace(`Got ${allBlobs.length} blobs from archive client before filtering`, archiveCtx);
-        const result = fillResults(allBlobs);
+        const result = await fillResults(allBlobs);
         this.log.debug(
           `Got ${allBlobs.length} blobs from archive client (total: ${result.length}/${blobHashes.length})`,
           archiveCtx,
@@ -345,7 +345,7 @@ export class HttpBlobClient implements BlobClientInterface {
    */
   private async tryFileStores(
     getMissingBlobHashes: () => Buffer[],
-    fillResults: (blobs: BlobJson[]) => Blob[],
+    fillResults: (blobs: BlobJson[]) => Promise<Blob[]>,
     ctx: { blockHash: string; blobHashes: string[] },
   ): Promise<void> {
     // Shuffle clients for load distribution
@@ -366,7 +366,7 @@ export class HttpBlobClient implements BlobClientInterface {
         });
         const blobs = await client.getBlobsByHashes(blobHashStrings);
         if (blobs.length > 0) {
-          const result = fillResults(blobs);
+          const result = await fillResults(blobs);
           this.log.debug(
             `Got ${blobs.length} blobs from filestore (total: ${result.length}/${ctx.blobHashes.length})`,
             {
@@ -388,7 +388,7 @@ export class HttpBlobClient implements BlobClientInterface {
     l1ConsensusHostIndex?: number,
   ): Promise<Blob[]> {
     const blobs = await this.getBlobsFromHost(hostUrl, blockHashOrSlot, l1ConsensusHostIndex);
-    return processFetchedBlobs(blobs, blobHashes, this.log).filter((b): b is Blob => b !== undefined);
+    return (await processFetchedBlobs(blobs, blobHashes, this.log)).filter((b): b is Blob => b !== undefined);
   }
 
   public async getBlobsFromHost(
@@ -616,7 +616,11 @@ function parseBlobJson(data: any): BlobJson {
 
 // Returns an array that maps each blob hash to the corresponding blob, or undefined if the blob is not found
 // or the data does not match the commitment.
-function processFetchedBlobs(blobs: BlobJson[], blobHashes: Buffer[], logger: Logger): (Blob | undefined)[] {
+async function processFetchedBlobs(
+  blobs: BlobJson[],
+  blobHashes: Buffer[],
+  logger: Logger,
+): Promise<(Blob | undefined)[]> {
   const requestedBlobHashes = new Set<string>(blobHashes.map(bufferToHex));
   const hashToBlob = new Map<string, Blob>();
   for (const blobJson of blobs) {
@@ -626,7 +630,7 @@ function processFetchedBlobs(blobs: BlobJson[], blobHashes: Buffer[], logger: Lo
     }
 
     try {
-      const blob = Blob.fromJson(blobJson);
+      const blob = await Blob.fromJson(blobJson);
       hashToBlob.set(hashHex, blob);
     } catch (err) {
       // If the above throws, it's likely that the blob commitment does not match the hash of the blob data.

package/src/client/tests.ts

@@ -28,7 +28,7 @@ export function runBlobClientTests(
   });
 
   it('should send and retrieve blobs by hash', async () => {
-    const blob = makeRandomBlob(5);
+    const blob = await makeRandomBlob(5);
     const blobHash = blob.getEthVersionedBlobHash();
 
     await client.sendBlobsToFilestore([blob]);
@@ -39,7 +39,7 @@ export function runBlobClientTests(
   });
 
   it('should handle multiple blobs', async () => {
-    const blobs = Array.from({ length: 3 }, () => makeRandomBlob(7));
+    const blobs = await Promise.all(Array.from({ length: 3 }, () => makeRandomBlob(7)));
     const blobHashes = blobs.map(blob => blob.getEthVersionedBlobHash());
 
     await client.sendBlobsToFilestore(blobs);