fix: enncoding

AztecProtocol · Jan 17, 2025 · 203b2e7 · 203b2e7
1 parent e896fb1
commit 203b2e7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/yarn-project/archiver/src/archiver/data_retrieval.ts b/yarn-project/archiver/src/archiver/data_retrieval.ts
@@ -172,7 +172,7 @@ async function getBlockFromRollupTx(
     throw new NoBlobBodiesFoundError(Number(l2BlockNum));
   }
 
-  const blockFields = blobBodies.flatMap(b => b.toFields());
+  const blockFields = blobBodies.flatMap(b => b.toEncodedFields());
 
   const header = BlockHeader.fromBuffer(Buffer.from(hexToBytes(decodedArgs.header)));
   // TODO(#9101): Retreiving the block body from calldata is a temporary soln before we have

diff --git a/yarn-project/aztec/src/cli/aztec_start_options.ts b/yarn-project/aztec/src/cli/aztec_start_options.ts
@@ -1,6 +1,7 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import { faucetConfigMapping } from '@aztec/aztec-faucet/config';
 import { sequencerClientConfigMappings } from '@aztec/aztec-node/config';
+import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
 import { botConfigMappings } from '@aztec/bot/config';
 import {
   type ConfigMapping,
@@ -257,6 +258,15 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     },
     ...getOptions('sequencer', sequencerClientConfigMappings),
   ],
+  BLOB_SINK: [
+    {
+      flag: '--blob-sink',
+      description: 'Starts Aztec Blob Sink with options',
+      defaultValue: undefined,
+      envVar: undefined,
+    },
+    ...getOptions('blobSink', blobSinkConfigMapping),
+  ],
   'PROVER NODE': [
     {
       flag: '--prover-node',

diff --git a/yarn-project/foundation/src/blob/encoding.ts b/yarn-project/foundation/src/blob/encoding.ts
@@ -53,7 +53,7 @@ export function deserializeEncodedBlobFields(blob: BlobBuffer): Fr[] {
     const currentField = fieldReader.peekField();
 
     // Stop when we hit a zero field
-    if (currentField.isZero()) {
+    if (!currentField || currentField.isZero()) {
       break;
     }
 

diff --git a/yarn-project/foundation/src/serialize/field_reader.ts b/yarn-project/foundation/src/serialize/field_reader.ts
@@ -179,6 +179,6 @@ export class FieldReader {
    * @returns A bool.
    */
   public isFinished(): boolean {
-    return this.index === this.length;
+    return this.index >= this.length;
   }
 }