Cleanup.

Author: LeilaWang

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

@@ -15,7 +15,7 @@ import { sleep } from '@aztec/foundation/sleep';
 import { bufferToHex, withoutHexPrefix } from '@aztec/foundation/string';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { CommitteeAttestation, L2Block, L2BlockSourceEvents, getBlockBlobFields } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block, L2BlockSourceEvents } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { PrivateLog } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
@@ -1005,7 +1005,7 @@ async function makeRollupTx(l2Block: L2Block, signers: Secp256k1Signer[] = []) {
  * @returns Versioned blob hashes.
  */
 async function makeVersionedBlobHashes(l2Block: L2Block): Promise<`0x${string}`[]> {
-  const blobFields = getBlockBlobFields(l2Block.body.txEffects);
+  const blobFields = l2Block.body.toBlobFields();
   const blobs = await Blob.getBlobsPerBlock(blobFields);
   const blobHashes = blobs.map(b => b.getEthVersionedBlobHash());
   return blobHashes.map(h => `0x${h.toString('hex')}` as `0x${string})`);
@@ -1017,7 +1017,7 @@ async function makeVersionedBlobHashes(l2Block: L2Block): Promise<`0x${string}`[
  * @returns The blobs.
  */
 async function makeBlobsFromBlock(block: L2Block) {
-  const blobFields = getBlockBlobFields(block.body.txEffects);
+  const blobFields = block.body.toBlobFields();
   const blobs = await Blob.getBlobsPerBlock(blobFields);
   return blobs.map((blob, index) => new BlobWithIndex(blob, index));
 }

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

@@ -14,7 +14,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { Body, CommitteeAttestation, L2Block, L2BlockHeader, getBlockBlobFields } from '@aztec/stdlib/block';
+import { Body, CommitteeAttestation, L2Block, L2BlockHeader } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
@@ -78,7 +78,7 @@ export async function retrievedBlockToPublishedL2Block(retrievedBlock: Retrieved
 
   // This works when there's only one block in the checkpoint.
   // If there's more than one block, we need to build the spongeBlob from the endSpongeBlob of the previous block.
-  const blobFields = getBlockBlobFields(body.txEffects);
+  const blobFields = body.toBlobFields();
   const spongeBlob = SpongeBlob.init(blobFields.length);
   await spongeBlob.absorb(blobFields);
   const spongeBlobHash = await spongeBlob.squeeze();

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

@@ -201,11 +201,10 @@ export class BlockStore {
    */
   async *getBlockHeaders(start: number, limit: number): AsyncIterableIterator<BlockHeader> {
     for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)) {
-      const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
-      const header = block?.block.getBlockHeader();
-      if (header?.getBlockNumber() !== blockNumber) {
+      const header = L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
+      if (header.getBlockNumber() !== blockNumber) {
         throw new Error(
-          `Block number mismatch when retrieving block header from archive (expected ${blockNumber} but got ${header?.getBlockNumber()})`,
+          `Block number mismatch when retrieving block header from archive (expected ${blockNumber} but got ${header.getBlockNumber()})`,
         );
       }
       yield header;

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

@@ -133,7 +133,7 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
 
   async getBlockHeadersForEpoch(epochNumber: bigint): Promise<BlockHeader[]> {
     const blocks = await this.getBlocksForEpoch(epochNumber);
-    return await Promise.all(blocks.map(b => b.getBlockHeader()));
+    return blocks.map(b => b.getBlockHeader());
   }
 
   /**

yarn-project/prover-client/src/orchestrator/block-building-helpers.ts

@@ -329,14 +329,14 @@ export const buildHeaderAndBodyFromTxs = runInSpan(
     const outHash = txOutHashes.length === 0 ? Fr.ZERO : new Fr(computeUnbalancedMerkleTreeRoot(txOutHashes));
 
     const parityShaRoot = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
-    const blobsHash = getBlobsHashFromBlobs(await Blob.getBlobsPerBlock(body.toBlobFields()));
+    const blobFields = body.toBlobFields();
+    const blobsHash = getBlobsHashFromBlobs(await Blob.getBlobsPerBlock(blobFields));
 
     const contentCommitment = new ContentCommitment(blobsHash, parityShaRoot, outHash);
 
     const fees = txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
     const manaUsed = txs.reduce((acc, tx) => acc.add(new Fr(tx.gasUsed.billedGas.l2Gas)), Fr.ZERO);
 
-    const blobFields = getBlockBlobFields(txs.map(tx => tx.txEffect));
     const endSpongeBlob = startSpongeBlob?.clone() ?? SpongeBlob.init(blobFields.length);
     await endSpongeBlob.absorb(blobFields);
     const spongeBlobHash = await endSpongeBlob.squeeze();