@aztec/prover-client 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/mocks/test_context.js

@@ -1,76 +1,76 @@
 import { TestCircuitProver } from '@aztec/bb-prover';
-import { SpongeBlob } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
-import { padArrayEnd, times, timesParallel } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { TestDateProvider } from '@aztec/foundation/timer';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { padArrayEnd, times, timesAsync } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { ProtocolContractsList } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
-import { SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
-import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { EthAddress } from '@aztec/stdlib/block';
-import { getCheckpointBlobFields } from '@aztec/stdlib/checkpoint';
-import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
+import { mockProcessedTx } from '@aztec/stdlib/testing';
 import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { TreeSnapshots } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state/native';
 import { promises as fs } from 'fs';
-import { buildBlockWithCleanDB } from '../block-factory/light.js';
-import { getTreeSnapshot } from '../orchestrator/block-building-helpers.js';
+import { LightweightCheckpointBuilder } from '../light/lightweight_checkpoint_builder.js';
+import { buildFinalBlobChallenges, getTreeSnapshot, insertSideEffects } from '../orchestrator/block-building-helpers.js';
 import { ProvingOrchestrator } from '../orchestrator/index.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 import { TestBroker } from '../test/mock_prover.js';
-import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobals, updateExpectedTreesFromTxs } from './fixtures.js';
+import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobals } from './fixtures.js';
 export class TestContext {
     worldState;
-    firstCheckpointNumber;
-    globalVariables;
     prover;
     broker;
     brokerProverFacade;
     orchestrator;
-    blockNumber;
     feePayer;
     directoriesToCleanup;
     logger;
     headers;
+    checkpoints;
+    checkpointOutHashes;
+    nextCheckpointIndex;
+    nextCheckpointNumber;
+    nextBlockNumber;
+    epochNumber;
     feePayerBalance;
-    constructor(worldState, firstCheckpointNumber, globalVariables, prover, broker, brokerProverFacade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger){
+    constructor(worldState, prover, broker, brokerProverFacade, orchestrator, feePayer, initialFeePayerBalance, directoriesToCleanup, logger){
         this.worldState = worldState;
-        this.firstCheckpointNumber = firstCheckpointNumber;
-        this.globalVariables = globalVariables;
         this.prover = prover;
         this.broker = broker;
         this.brokerProverFacade = brokerProverFacade;
         this.orchestrator = orchestrator;
-        this.blockNumber = blockNumber;
         this.feePayer = feePayer;
         this.directoriesToCleanup = directoriesToCleanup;
         this.logger = logger;
         this.headers = new Map();
+        this.checkpoints = [];
+        this.checkpointOutHashes = [];
+        this.nextCheckpointIndex = 0;
+        this.nextCheckpointNumber = CheckpointNumber(1);
+        this.nextBlockNumber = 1;
+        this.epochNumber = 1;
         this.feePayerBalance = initialFeePayerBalance;
     }
     get epochProver() {
         return this.orchestrator;
     }
-    getCheckpointConstants(checkpointIndex = 0) {
-        return makeCheckpointConstants(this.firstCheckpointNumber.toNumber() + checkpointIndex);
-    }
-    static async new(logger, { proverCount = 4, createProver = async (bbConfig)=>new TestCircuitProver(await getSimulator(bbConfig, logger)), slotNumber = 1, blockNumber = 1 } = {}) {
+    static async new(logger, { proverCount = 4, createProver = async (bbConfig)=>new TestCircuitProver(await getSimulator(bbConfig, logger)) } = {}) {
         const directoriesToCleanup = [];
-        const firstCheckpointNumber = new Fr(slotNumber);
-        const globalVariables = makeGlobals(blockNumber, slotNumber);
         const feePayer = AztecAddress.fromNumber(42222);
         const initialFeePayerBalance = new Fr(10n ** 20n);
         const feePayerSlot = await computeFeePayerBalanceLeafSlot(feePayer);
-        const prefilledPublicData = [
-            new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)
-        ];
+        const genesis = {
+            prefilledPublicData: [
+                new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)
+            ],
+            genesisTimestamp: 0n
+        };
         // Separated dbs for public processor and prover - see public_processor for context
-        const ws = await NativeWorldStateService.tmp(/*rollupAddress=*/ undefined, /*cleanupTmpDir=*/ true, prefilledPublicData);
+        const ws = await NativeWorldStateService.tmp(/*rollupAddress=*/ undefined, /*cleanupTmpDir=*/ true, genesis);
         let localProver;
         const config = await getEnvironmentConfig(logger);
         if (!config) {
@@ -82,8 +82,10 @@ export class TestContext {
                 bbBinaryPath: config.expectedBBPath,
                 bbWorkingDirectory: config.bbWorkingDirectory,
                 bbSkipCleanup: config.bbSkipCleanup,
-                numConcurrentIVCVerifiers: 2,
-                bbIVCConcurrency: 1
+                numConcurrentIVCVerifiers: 8,
+                bbIVCConcurrency: 1,
+                bbChonkVerifyMaxBatch: 16,
+                bbChonkVerifyConcurrency: 6
             };
             localProver = await createProver(bbConfig);
         }
@@ -92,20 +94,14 @@ export class TestContext {
         }
         const broker = new TestBroker(proverCount, localProver);
         const facade = new BrokerCircuitProverFacade(broker);
-        const orchestrator = new TestProvingOrchestrator(ws, facade, EthAddress.ZERO);
+        const orchestrator = new TestProvingOrchestrator(ws, facade, EthAddress.ZERO, false, 10);
         await broker.start();
         facade.start();
-        return new this(ws, firstCheckpointNumber, globalVariables, localProver, broker, facade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
+        return new this(ws, localProver, broker, facade, orchestrator, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
     }
     getFork() {
         return this.worldState.fork();
     }
-    getBlockHeader(blockNumber = 0) {
-        return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
-    }
-    getPreviousBlockHeader(currentBlockNumber = this.blockNumber) {
-        return this.getBlockHeader(currentBlockNumber - 1);
-    }
     async cleanup() {
         await this.brokerProverFacade.stop();
         await this.broker.stop();
@@ -121,125 +117,138 @@ export class TestContext {
             }
         }
     }
-    async makeProcessedTx(opts) {
-        const globalVariables = opts?.globalVariables ?? this.globalVariables;
-        const blockNumber = globalVariables.blockNumber;
-        const header = opts?.header ?? this.getBlockHeader(blockNumber - 1);
-        const tx = await makeBloatedProcessedTx({
-            header,
-            vkTreeRoot: getVKTreeRoot(),
-            protocolContracts: ProtocolContractsList,
-            globalVariables,
-            feePayer: this.feePayer,
-            ...opts
-        });
-        this.feePayerBalance = new Fr(this.feePayerBalance.toBigInt() - tx.txEffect.transactionFee.toBigInt());
-        if (opts?.privateOnly) {
-            const feePayerSlot = await computeFeePayerBalanceLeafSlot(this.feePayer);
-            tx.txEffect.publicDataWrites[0] = new PublicDataWrite(feePayerSlot, this.feePayerBalance);
-        }
-        return tx;
+    startNewEpoch() {
+        this.checkpoints = [];
+        this.checkpointOutHashes = [];
+        this.nextCheckpointIndex = 0;
+        this.epochNumber++;
     }
-    /** Creates a block with the given number of txs and adds it to world-state */ async makePendingBlock(numTxs, { checkpointIndex = 0, numL1ToL2Messages = 0, blockNumber = this.blockNumber, makeProcessedTxOpts = ()=>({}) } = {}) {
-        const slotNumber = this.firstCheckpointNumber.toNumber() + checkpointIndex;
-        const globalVariables = makeGlobals(blockNumber, slotNumber);
-        const blockNum = globalVariables.blockNumber;
-        const db = await this.worldState.fork();
-        const l1ToL2Messages = times(numL1ToL2Messages, (i)=>new Fr(blockNum * 100 + i));
-        const merkleTrees = await this.worldState.fork();
-        await merkleTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
-        const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, merkleTrees);
-        const txs = await timesParallel(numTxs, (i)=>this.makeProcessedTx({
-                seed: i + blockNum * 1000,
-                globalVariables,
-                newL1ToL2Snapshot,
-                ...makeProcessedTxOpts(i)
-            }));
-        await this.setTreeRoots(txs);
-        const block = await buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db);
-        this.headers.set(blockNum, block.getBlockHeader());
-        await this.worldState.handleL2BlockAndMessages(block, l1ToL2Messages);
-        return {
-            block,
-            txs,
-            l1ToL2Messages
-        };
+    // Return blob fields of all checkpoints in the epoch.
+    getBlobFields() {
+        return this.checkpoints.map((checkpoint)=>checkpoint.toBlobFields());
     }
-    async makePendingBlocksInCheckpoint(numBlocks, { checkpointIndex = 0, numTxsPerBlock = 1, numL1ToL2Messages = 0, firstBlockNumber = this.blockNumber + checkpointIndex * numBlocks, makeGlobalVariablesOpts = ()=>({}), makeProcessedTxOpts = ()=>({}) } = {}) {
-        const slotNumber = this.firstCheckpointNumber.toNumber() + checkpointIndex;
+    async getFinalBlobChallenges() {
+        const blobFields = this.getBlobFields();
+        return await buildFinalBlobChallenges(blobFields);
+    }
+    async makeCheckpoint(numBlocks, { numTxsPerBlock = 0, numL1ToL2Messages = 0, makeProcessedTxOpts = ()=>({}), ...constantOpts } = {}) {
+        if (numBlocks === 0) {
+            throw new Error('Cannot make a checkpoint with 0 blocks. Crate an empty block (numTxsPerBlock = 0) if there are no txs.');
+        }
+        const checkpointIndex = this.nextCheckpointIndex++;
+        const checkpointNumber = this.nextCheckpointNumber;
+        this.nextCheckpointNumber++;
+        const slotNumber = checkpointNumber * 15; // times an arbitrary number to make it different to the checkpoint number
+        const constants = makeCheckpointConstants(slotNumber, constantOpts);
+        const fork = await this.worldState.fork();
+        // Build l1 to l2 messages.
         const l1ToL2Messages = times(numL1ToL2Messages, (i)=>new Fr(slotNumber * 100 + i));
-        const merkleTrees = await this.worldState.fork();
-        await merkleTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
-        const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, merkleTrees);
-        const blockGlobalVariables = times(numBlocks, (i)=>makeGlobals(firstBlockNumber + i, slotNumber, makeGlobalVariablesOpts(firstBlockNumber + i, checkpointIndex)));
+        await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
+        const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, fork);
+        const startBlockNumber = this.nextBlockNumber;
+        const previousBlockHeader = this.getBlockHeader(BlockNumber(startBlockNumber - 1));
+        // All blocks in the same slot/checkpoint share the same timestamp.
+        const timestamp = BigInt(slotNumber * 26);
+        // Build global variables.
+        const blockGlobalVariables = times(numBlocks, (i)=>makeGlobals(startBlockNumber + i, slotNumber, {
+                coinbase: constants.coinbase,
+                feeRecipient: constants.feeRecipient,
+                gasFees: constants.gasFees,
+                timestamp
+            }));
+        this.nextBlockNumber += numBlocks;
+        // Build txs.
         let totalTxs = 0;
-        const blockTxs = await timesParallel(numBlocks, (blockIndex)=>{
+        const blockEndStates = [];
+        const blockTxs = await timesAsync(numBlocks, async (blockIndex)=>{
             const txIndexOffset = totalTxs;
             const numTxs = typeof numTxsPerBlock === 'number' ? numTxsPerBlock : numTxsPerBlock[blockIndex];
             totalTxs += numTxs;
-            return timesParallel(numTxs, (txIndex)=>this.makeProcessedTx({
-                    seed: (txIndexOffset + txIndex + 1) * 321 + (checkpointIndex + 1) * 123456,
+            const txs = await timesAsync(numTxs, (txIndex)=>this.makeProcessedTx({
+                    seed: (txIndexOffset + txIndex + 1) * 321 + (checkpointIndex + 1) * 123456 + this.epochNumber * 0x99999,
                     globalVariables: blockGlobalVariables[blockIndex],
-                    header: this.getBlockHeader(firstBlockNumber - 1),
+                    anchorBlockHeader: previousBlockHeader,
                     newL1ToL2Snapshot,
                     ...makeProcessedTxOpts(blockGlobalVariables[blockIndex], txIndexOffset + txIndex)
                 }));
+            // Insert side effects into the trees.
+            const endState = await this.updateTrees(txs, fork);
+            blockEndStates.push(endState);
+            return txs;
         });
-        const blobFields = getCheckpointBlobFields(blockTxs.map((txs)=>txs.map((tx)=>tx.txEffect)));
-        const spongeBlobState = await SpongeBlob.init(blobFields.length);
+        const cleanFork = await this.worldState.fork();
+        const previousCheckpointOutHashes = this.checkpointOutHashes;
+        const builder = await LightweightCheckpointBuilder.startNewCheckpoint(checkpointNumber, {
+            ...constants,
+            timestamp
+        }, l1ToL2Messages, previousCheckpointOutHashes, cleanFork);
+        // Add tx effects to db and build block headers.
         const blocks = [];
         for(let i = 0; i < numBlocks; i++){
-            const isFirstBlock = i === 0;
-            const blockNumber = firstBlockNumber + i;
-            const globalVariables = blockGlobalVariables[i];
             const txs = blockTxs[i];
-            await this.setTreeRoots(txs);
-            const fork = await this.worldState.fork();
-            const blockMsgs = isFirstBlock ? l1ToL2Messages : [];
-            const block = await buildBlockWithCleanDB(txs, globalVariables, blockMsgs, fork, spongeBlobState, isFirstBlock);
-            const header = block.getBlockHeader();
-            this.headers.set(blockNumber, header);
-            await this.worldState.handleL2BlockAndMessages(block, blockMsgs, isFirstBlock);
-            const blockBlobFields = block.body.toBlobFields();
-            await spongeBlobState.absorb(blockBlobFields);
+            const state = blockEndStates[i];
+            const { block } = await builder.addBlock(blockGlobalVariables[i], txs, {
+                expectedEndState: state,
+                insertTxsEffects: true
+            });
+            const header = block.header;
+            this.headers.set(block.number, header);
+            const blockMsgs = block.indexWithinCheckpoint === 0 ? l1ToL2Messages : [];
+            await this.worldState.handleL2BlockAndMessages(block, blockMsgs);
             blocks.push({
                 header,
                 txs
             });
         }
+        const checkpoint = await builder.completeCheckpoint();
+        this.checkpoints.push(checkpoint);
+        this.checkpointOutHashes.push(checkpoint.getCheckpointOutHash());
         return {
+            constants,
+            checkpoint,
+            header: checkpoint.header,
             blocks,
             l1ToL2Messages,
-            blobFields
+            previousBlockHeader
         };
     }
-    async processPublicFunctions(txs, { maxTransactions = txs.length, numL1ToL2Messages = 0, contractDataSource } = {}) {
-        const l1ToL2Messages = times(numL1ToL2Messages, (i)=>new Fr(this.blockNumber * 100 + i));
-        const merkleTrees = await this.worldState.fork();
-        await merkleTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
-        const processorFactory = new PublicProcessorFactory(contractDataSource ?? new SimpleContractDataSource(), new TestDateProvider());
-        const publicProcessor = processorFactory.create(merkleTrees, this.globalVariables, {
-            skipFeeEnforcement: false,
-            clientInitiatedSimulation: false
-        });
-        return await publicProcessor.process(txs, {
-            maxTransactions
+    async makeProcessedTx(opts = {}) {
+        const tx = await mockProcessedTx({
+            vkTreeRoot: getVKTreeRoot(),
+            protocolContracts: ProtocolContractsList,
+            feePayer: this.feePayer,
+            ...opts
         });
+        this.feePayerBalance = new Fr(this.feePayerBalance.toBigInt() - tx.txEffect.transactionFee.toBigInt());
+        const feePayerSlot = await computeFeePayerBalanceLeafSlot(this.feePayer);
+        const feePaymentPublicDataWrite = new PublicDataWrite(feePayerSlot, this.feePayerBalance);
+        tx.txEffect.publicDataWrites[0] = feePaymentPublicDataWrite;
+        if (tx.avmProvingRequest) {
+            tx.avmProvingRequest.inputs.publicInputs.accumulatedData.publicDataWrites[0] = feePaymentPublicDataWrite;
+        }
+        return tx;
+    }
+    getBlockHeader(blockNumber) {
+        if (Number(blockNumber) > 0 && Number(blockNumber) >= this.nextBlockNumber) {
+            throw new Error(`Block header not built for block number ${blockNumber}.`);
+        }
+        return Number(blockNumber) === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(Number(blockNumber));
     }
-    async setTreeRoots(txs) {
-        const db = await this.worldState.fork();
+    async updateTrees(txs, fork) {
+        let startStateReference = await fork.getStateReference();
+        let endStateReference = startStateReference;
         for (const tx of txs){
-            const startStateReference = await db.getStateReference();
-            await updateExpectedTreesFromTxs(db, [
-                tx
-            ]);
-            const endStateReference = await db.getStateReference();
+            await insertSideEffects(tx, fork);
+            endStateReference = await fork.getStateReference();
             if (tx.avmProvingRequest) {
+                // Update the trees in the avm public inputs so that the proof won't fail.
                 const l1ToL2MessageTree = tx.avmProvingRequest.inputs.publicInputs.startTreeSnapshots.l1ToL2MessageTree;
                 tx.avmProvingRequest.inputs.publicInputs.startTreeSnapshots = new TreeSnapshots(l1ToL2MessageTree, startStateReference.partial.noteHashTree, startStateReference.partial.nullifierTree, startStateReference.partial.publicDataTree);
                 tx.avmProvingRequest.inputs.publicInputs.endTreeSnapshots = new TreeSnapshots(l1ToL2MessageTree, endStateReference.partial.noteHashTree, endStateReference.partial.nullifierTree, endStateReference.partial.publicDataTree);
             }
+            startStateReference = endStateReference;
         }
+        return endStateReference;
     }
 }
 class TestProvingOrchestrator extends ProvingOrchestrator {

package/dest/orchestrator/block-building-helpers.d.ts

@@ -1,13 +1,13 @@
 import { BatchedBlobAccumulator, SpongeBlob } from '@aztec/blob-lib';
-import { Fr } from '@aztec/foundation/fields';
-import { type Bufferable, type Tuple } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type Bufferable } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
-import { Body, L2BlockHeader } from '@aztec/stdlib/block';
+import { Body } from '@aztec/stdlib/block';
 import type { MerkleTreeWriteOperations, PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
 import { ProofData, RecursiveProof } from '@aztec/stdlib/proofs';
 import { BlockRollupPublicInputs, PrivateBaseRollupHints, PublicBaseRollupHints, PublicChonkVerifierPrivateInputs } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
-import { BlockHeader, GlobalVariables, PartialStateReference, type ProcessedTx, Tx } from '@aztec/stdlib/tx';
+import { BlockHeader, GlobalVariables, PartialStateReference, type ProcessedTx, StateReference, Tx } from '@aztec/stdlib/tx';
 import type { MerkleTreeReadOperations } from '@aztec/world-state';
 /**
  * Type representing the names of the trees for the base rollup.
@@ -17,36 +17,34 @@ type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'Public
  * Type representing the names of the trees.
  */
 export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
-export declare const insertSideEffectsAndBuildBaseRollupHints: (tx: ProcessedTx, lastArchive: AppendOnlyTreeSnapshot, newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, startSpongeBlob: SpongeBlob, proverId: Fr, db: MerkleTreeWriteOperations) => Promise<PublicBaseRollupHints | PrivateBaseRollupHints>;
-export declare function getChonkProofFromTx(tx: Tx | ProcessedTx): RecursiveProof<2084>;
+export declare const insertSideEffectsAndBuildBaseRollupHints: (tx: ProcessedTx, lastArchive: AppendOnlyTreeSnapshot, newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, startSpongeBlob: SpongeBlob, proverId: Fr, db: MerkleTreeWriteOperations) => Promise<PrivateBaseRollupHints | PublicBaseRollupHints>;
+export declare const insertSideEffects: (tx: ProcessedTx, db: MerkleTreeWriteOperations) => Promise<{
+    nullifierInsertionResult: import("@aztec/stdlib/trees").BatchInsertionResult<number, number>;
+    publicDataInsertionResult: import("@aztec/stdlib/trees").SequentialInsertionResult<number>;
+}>;
+export declare function getChonkProofFromTx(tx: Tx | ProcessedTx): RecursiveProof<1349>;
 export declare function getPublicChonkVerifierPrivateInputsFromTx(tx: Tx | ProcessedTx, proverId: Fr): PublicChonkVerifierPrivateInputs;
-export declare const buildBlobHints: (blobFields: Fr[]) => {
-    blobCommitments: import("@aztec/foundation/fields").BLS12Point[];
+export declare const buildBlobHints: (blobFields: Fr[]) => Promise<{
+    blobCommitments: import("@aztec/foundation/curves/bls12").BLS12Point[];
     blobs: import("@aztec/blob-lib").Blob[];
     blobsHash: Fr;
-};
-export declare const buildBlobDataFromTxs: (txsPerCheckpoint: ProcessedTx[][]) => Promise<{
-    blobFieldsLengths: number[];
-    finalBlobChallenges: import("@aztec/blob-lib").FinalBlobBatchingChallenges;
 }>;
 export declare const buildFinalBlobChallenges: (blobFieldsPerCheckpoint: Fr[][]) => Promise<import("@aztec/blob-lib").FinalBlobBatchingChallenges>;
 export declare const accumulateBlobs: (blobFields: Fr[], startBlobAccumulator: BatchedBlobAccumulator) => Promise<BatchedBlobAccumulator>;
 export declare const buildHeaderFromCircuitOutputs: (blockRootRollupOutput: BlockRollupPublicInputs) => Promise<BlockHeader>;
-export declare const buildHeaderAndBodyFromTxs: (txs: ProcessedTx[], globalVariables: GlobalVariables, l1ToL2Messages: Fr[], db: MerkleTreeReadOperations, startSpongeBlob?: SpongeBlob | undefined) => Promise<{
-    header: L2BlockHeader;
+export declare const buildHeaderAndBodyFromTxs: (txs: ProcessedTx[], lastArchive: AppendOnlyTreeSnapshot, endState: StateReference, globalVariables: GlobalVariables, startSpongeBlob: SpongeBlob, isFirstBlock: boolean) => Promise<{
+    header: BlockHeader;
     body: Body;
+    blockBlobFields: Fr[];
 }>;
-export declare const buildBlockHeaderFromTxs: (txs: ProcessedTx[], globalVariables: GlobalVariables, startSpongeBlob: SpongeBlob, db: MerkleTreeReadOperations) => Promise<BlockHeader>;
-/** Computes the inHash for a block's ContentCommitment given its l1 to l2 messages. */
-export declare function computeInHashFromL1ToL2Messages(unpaddedL1ToL2Messages: Fr[]): Promise<Fr>;
-export declare function getLastSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<Tuple<Fr, {
+export declare function getLastSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<import("@aztec/foundation/serialize").Tuple<Fr, {
     readonly 1: 42;
     readonly 4: 30;
     readonly 3: 36;
     readonly 0: 42;
     readonly 2: 40;
 }[TID]>>;
-export declare function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<Tuple<Fr, {
+export declare function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<import("@aztec/foundation/serialize").Tuple<Fr, {
     readonly 1: 42;
     readonly 4: 30;
     readonly 3: 36;
@@ -61,4 +59,4 @@ export declare function validatePartialState(partialState: PartialStateReference
 export declare function validateTx(tx: ProcessedTx): void;
 export declare function toProofData<T extends Bufferable, PROOF_LENGTH extends number>({ inputs, proof, verificationKey }: PublicInputsAndRecursiveProof<T, PROOF_LENGTH>, vkIndex?: number): ProofData<T, PROOF_LENGTH>;
 export {};
-//# sourceMappingURL=block-building-helpers.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2stYnVpbGRpbmctaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yY2hlc3RyYXRvci9ibG9jay1idWlsZGluZy1oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsVUFBVSxFQUtYLE1BQU0saUJBQWlCLENBQUM7QUFpQnpCLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQWdDLE1BQU0sNkJBQTZCLENBQUM7QUFDNUYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJNUQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzNDLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFaEgsT0FBTyxFQUFTLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RSxPQUFPLEVBRUwsdUJBQXVCLEVBQ3ZCLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsZ0NBQWdDLEVBRWpDLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUNMLHNCQUFzQixFQUN0QixZQUFZLEVBSWIsTUFBTSxxQkFBcUIsQ0FBQztBQUM3QixPQUFPLEVBQ0wsV0FBVyxFQUNYLGVBQWUsRUFDZixxQkFBcUIsRUFDckIsS0FBSyxXQUFXLEVBQ2hCLGNBQWMsRUFDZCxFQUFFLEVBQ0gsTUFBTSxrQkFBa0IsQ0FBQztBQUcxQixPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5FOztHQUVHO0FBQ0gsS0FBSyxhQUFhLEdBQUcsY0FBYyxHQUFHLGNBQWMsR0FBRyxlQUFlLEdBQUcsZ0JBQWdCLENBQUM7QUFDMUY7O0dBRUc7QUFDSCxNQUFNLE1BQU0sU0FBUyxHQUFHLGFBQWEsR0FBRyxtQkFBbUIsR0FBRyxTQUFTLENBQUM7QUFHeEUsZUFBTyxNQUFNLHdDQUF3QyxtUEEwSHBELENBQUM7QUFFRixlQUFPLE1BQU0saUJBQWlCOzs7RUFvQzdCLENBQUM7QUFFRix3QkFBZ0IsbUJBQW1CLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQVF2RDtBQUVELHdCQUFnQix5Q0FBeUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsRUFBRSxRQUFRLEVBQUUsRUFBRSxvQ0FPM0Y7QUFLRCxlQUFPLE1BQU0sY0FBYzs7OztFQUsxQixDQUFDO0FBRUYsZUFBTyxNQUFNLHdCQUF3QixxR0FFcEMsQ0FBQztBQUVGLGVBQU8sTUFBTSxlQUFlLHFHQU8zQixDQUFDO0FBRUYsZUFBTyxNQUFNLDZCQUE2QiwwRUEyQnpDLENBQUM7QUFFRixlQUFPLE1BQU0seUJBQXlCOzs7O0VBMERyQyxDQUFDO0FBRUYsd0JBQXNCLGtCQUFrQixDQUFDLEdBQUcsU0FBUyxZQUFZLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsd0JBQXdCOzs7Ozs7U0FJM0c7QUFFRCx3QkFBc0Isc0JBQXNCLENBQUMsR0FBRyxTQUFTLFlBQVksRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSx3QkFBd0I7Ozs7OztTQUkvRztBQUVELHdCQUFzQixlQUFlLENBQUMsRUFBRSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsd0JBQXdCLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBR3JIO0FBRUQsd0JBQWdCLDBCQUEwQixDQUFDLENBQUMsU0FBUyxNQUFNLEVBQUUsTUFBTSxFQUFFLENBQUMsd0JBTXJFO0FBRUQsd0JBQXNCLHFCQUFxQixDQUN6QyxNQUFNLEVBQUUsWUFBWSxFQUNwQixhQUFhLEVBQUUsTUFBTSxFQUNyQixFQUFFLEVBQUUsd0JBQXdCLEdBQzNCLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQU1mO0FBR0Qsd0JBQXNCLHVCQUF1QixDQUFDLENBQUMsU0FBUyxNQUFNLEVBQzVELEtBQUssRUFBRSxFQUFFLEVBQ1QsTUFBTSxFQUFFLFlBQVksRUFDcEIsTUFBTSxFQUFFLENBQUMsRUFDVCxFQUFFLEVBQUUsd0JBQXdCLEdBQzNCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQVkvQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FDbEMsWUFBWSxFQUFFLHFCQUFxQixFQUNuQyxhQUFhLEVBQUUsR0FBRyxDQUFDLFlBQVksRUFBRSxzQkFBc0IsQ0FBQyxRQVN6RDtBQXFCRCx3QkFBZ0IsVUFBVSxDQUFDLEVBQUUsRUFBRSxXQUFXLFFBY3pDO0FBRUQsd0JBQWdCLFdBQVcsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLFlBQVksU0FBUyxNQUFNLEVBQzNFLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsRUFBRSw2QkFBNkIsQ0FBQyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQ2xGLE9BQU8sQ0FBQyxFQUFFLE1BQU0sOEJBS2pCIn0=

package/dest/orchestrator/block-building-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}