@aztec/prover-client 3.0.0-nightly.20251113 → 3.0.0-nightly.20251115

package/dest/block-factory/light.d.ts

@@ -1,8 +1,7 @@
-import { SpongeBlob } from '@aztec/blob-lib';
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
 import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import type { GlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
+import { type GlobalVariables, type ProcessedTx } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 /**
  * Builds a block and its header from a set of processed tx without running any circuits.
@@ -14,18 +13,19 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
  * PublicProcessor which will do this for you as it processes transactions.
  *
  * If you haven't already inserted the side effects, e.g. because you are in a testing context, you can use the helper
- * function `buildBlockWithCleanDB`, which calls `insertSideEffectsAndBuildBaseRollupHints` for you.
+ * function `buildBlockWithCleanDB`, which calls `insertSideEffects` for you.
+ *
+ * @deprecated Use LightweightCheckpointBuilder instead. This only works for one block per checkpoint.
  */
 export declare class LightweightBlockFactory implements IBlockFactory {
     private db;
     private telemetry;
     private globalVariables?;
     private l1ToL2Messages?;
-    private startSpongeBlob?;
     private txs;
     private readonly logger;
     constructor(db: MerkleTreeWriteOperations, telemetry?: TelemetryClient);
-    startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], startSpongeBlob?: SpongeBlob, isFirstBlock?: boolean): Promise<void>;
+    startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void>;
     addTxs(txs: ProcessedTx[]): Promise<void>;
     setBlockCompleted(): Promise<L2Block>;
     private buildBlock;
@@ -34,5 +34,5 @@ export declare class LightweightBlockFactory implements IBlockFactory {
  * Inserts the processed transactions into the DB, then creates a block.
  * @param db - A db fork to use for block building which WILL BE MODIFIED.
  */
-export declare function buildBlockWithCleanDB(txs: ProcessedTx[], globalVariables: GlobalVariables, l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations, startSpongeBlob?: SpongeBlob, isFirstBlock?: boolean, telemetry?: TelemetryClient): Promise<L2Block>;
+export declare function buildBlockWithCleanDB(txs: ProcessedTx[], globalVariables: GlobalVariables, l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations, telemetry?: TelemetryClient): Promise<L2Block>;
 //# sourceMappingURL=light.d.ts.map

package/dest/block-factory/light.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/block-factory/light.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEhG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAQnF;;;;;;;;;;;GAWG;AACH,qBAAa,uBAAwB,YAAW,aAAa;IASzD,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IATnB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAO;IAC9B,OAAO,CAAC,eAAe,CAAC,CAAa;IACrC,OAAO,CAAC,GAAG,CAA4B;IAEvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;gBAG1D,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC;IAGrD,aAAa,CACjB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EAEpB,eAAe,CAAC,EAAE,UAAU,EAE5B,YAAY,UAAO,GAClB,OAAO,CAAC,IAAI,CAAC;IAYhB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;YAIvB,UAAU;CA2BzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,WAAW,EAAE,EAClB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,EAAE,EAAE,yBAAyB,EAC7B,eAAe,CAAC,EAAE,UAAU,EAC5B,YAAY,UAAO,EACnB,SAAS,GAAE,eAAsC,oBAuBlD"}
+{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/block-factory/light.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAiB,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAGhG,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAQnF;;;;;;;;;;;;;GAaG;AACH,qBAAa,uBAAwB,YAAW,aAAa;IAQzD,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IARnB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAO;IAC9B,OAAO,CAAC,GAAG,CAA4B;IAEvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;gBAG1D,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC;IAGrD,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS1F,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;YAIvB,UAAU;CA6CzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,WAAW,EAAE,EAClB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC,oBAWlD"}

package/dest/block-factory/light.js

@@ -1,12 +1,14 @@
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob, computeBlobsHashFromBlobs, getBlobsPerL1Block, getTotalNumBlobFieldsFromTxs } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { L2Block } from '@aztec/stdlib/block';
+import { L2Block, L2BlockHeader } from '@aztec/stdlib/block';
+import { computeBlockOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { ContentCommitment } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
-import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints } from '../orchestrator/block-building-helpers.js';
+import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffects } from '../orchestrator/block-building-helpers.js';
 /**
  * Builds a block and its header from a set of processed tx without running any circuits.
  *
@@ -17,13 +19,14 @@ import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBa
  * PublicProcessor which will do this for you as it processes transactions.
  *
  * If you haven't already inserted the side effects, e.g. because you are in a testing context, you can use the helper
- * function `buildBlockWithCleanDB`, which calls `insertSideEffectsAndBuildBaseRollupHints` for you.
+ * function `buildBlockWithCleanDB`, which calls `insertSideEffects` for you.
+ *
+ * @deprecated Use LightweightCheckpointBuilder instead. This only works for one block per checkpoint.
  */ export class LightweightBlockFactory {
     db;
     telemetry;
     globalVariables;
     l1ToL2Messages;
-    startSpongeBlob;
     txs;
     logger;
     constructor(db, telemetry = getTelemetryClient()){
@@ -31,16 +34,13 @@ import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBa
         this.telemetry = telemetry;
         this.logger = createLogger('lightweight-block-factory');
     }
-    async startNewBlock(globalVariables, l1ToL2Messages, // Must be provided to generate the correct spongeBlobHash for the block header if there's more than one block in the checkpoint.
-    startSpongeBlob, // Only insert l1 to l2 messages for the first block in a checkpoint.
-    isFirstBlock = true) {
+    async startNewBlock(globalVariables, l1ToL2Messages) {
         this.logger.debug('Starting new block', {
             globalVariables: globalVariables.toInspect(),
             l1ToL2Messages
         });
         this.globalVariables = globalVariables;
-        this.l1ToL2Messages = isFirstBlock ? padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) : [];
-        this.startSpongeBlob = startSpongeBlob;
+        this.l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
         this.txs = undefined;
         // Update L1 to L2 tree
         await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.l1ToL2Messages);
@@ -59,12 +59,30 @@ import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBa
         return this.buildBlock();
     }
     async buildBlock() {
-        const { header, body } = await buildHeaderAndBodyFromTxs(this.txs ?? [], this.globalVariables, this.l1ToL2Messages, this.db, this.startSpongeBlob);
+        const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
+        const state = await this.db.getStateReference();
+        const txs = this.txs ?? [];
+        const txEffects = txs.map((tx)=>tx.txEffect);
+        const totalNumBlobFields = getTotalNumBlobFieldsFromTxs([
+            txEffects.map((tx)=>tx.getTxStartMarker())
+        ]);
+        const startSpongeBlob = await SpongeBlob.init(totalNumBlobFields);
+        const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(txs, lastArchive, state, this.globalVariables, startSpongeBlob, true);
         header.state.validate();
-        const blockHeader = header.toBlockHeader();
-        await this.db.updateArchive(blockHeader);
+        await this.db.updateArchive(header);
         const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-        const block = new L2Block(newArchive, header, body);
+        const outHash = computeBlockOutHash(txs.map((tx)=>tx.txEffect.l2ToL1Msgs));
+        const inHash = await computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
+        const blobFields = [
+            new Fr(totalNumBlobFields)
+        ].concat(blockBlobFields);
+        const blobsHash = computeBlobsHashFromBlobs(getBlobsPerL1Block(blobFields));
+        const contentCommitment = new ContentCommitment(blobsHash, inHash, outHash);
+        const l2BlockHeader = L2BlockHeader.from({
+            ...header,
+            contentCommitment
+        });
+        const block = new L2Block(newArchive, l2BlockHeader, body);
         this.logger.debug(`Built block ${block.number}`, {
             globalVariables: this.globalVariables?.toInspect(),
             archiveRoot: newArchive.root.toString(),
@@ -78,16 +96,11 @@ import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBa
 /**
  * Inserts the processed transactions into the DB, then creates a block.
  * @param db - A db fork to use for block building which WILL BE MODIFIED.
- */ export async function buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db, startSpongeBlob, isFirstBlock = true, telemetry = getTelemetryClient()) {
-    const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
+ */ export async function buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db, telemetry = getTelemetryClient()) {
     const builder = new LightweightBlockFactory(db, telemetry);
-    await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
-    const l1ToL2MessageTree = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
+    await builder.startNewBlock(globalVariables, l1ToL2Messages);
     for (const tx of txs){
-        // startSpongeBlob and proverId are only used for constructing private inputs of the base rollup.
-        // Their values don't matter here because we are not using the return private inputs to build the block.
-        const proverId = Fr.ZERO;
-        await insertSideEffectsAndBuildBaseRollupHints(tx, lastArchive, l1ToL2MessageTree, startSpongeBlob?.clone() ?? SpongeBlob.empty(), proverId, db);
+        await insertSideEffects(tx, db);
     }
     await builder.addTxs(txs);
     return await builder.setBlockCompleted();

package/dest/light/lightweight_checkpoint_builder.d.ts

@@ -0,0 +1,29 @@
+import { Fr } from '@aztec/foundation/fields';
+import { L2BlockNew } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { CheckpointConstantData } from '@aztec/stdlib/rollup';
+import { type GlobalVariables, type ProcessedTx, StateReference } from '@aztec/stdlib/tx';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+/**
+ * Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
+ *
+ * It updates the l1-to-l2 message tree when starting a new checkpoint, inserts the side effects to note hash,
+ * nullifier, and public data trees, then updates the archive tree when a block is added.
+ */
+export declare class LightweightCheckpointBuilder {
+    private db;
+    private telemetry;
+    private readonly logger;
+    private constants;
+    private l1ToL2Messages;
+    private lastArchives;
+    private spongeBlob;
+    private blocks;
+    private blobFields;
+    constructor(db: MerkleTreeWriteOperations, telemetry?: TelemetryClient);
+    startNewCheckpoint(constants: CheckpointConstantData, l1ToL2Messages: Fr[], totalNumBlobFields: number): Promise<void>;
+    addBlock(globalVariables: GlobalVariables, endState: StateReference, txs: ProcessedTx[]): Promise<L2BlockNew>;
+    completeCheckpoint(): Promise<Checkpoint>;
+}
+//# sourceMappingURL=lightweight_checkpoint_builder.d.ts.map

package/dest/light/lightweight_checkpoint_builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lightweight_checkpoint_builder.d.ts","sourceRoot":"","sources":["../../src/light/lightweight_checkpoint_builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,sBAAsB,EAAoB,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAQnF;;;;;GAKG;AACH,qBAAa,4BAA4B;IAUrC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IAVnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;IACzE,OAAO,CAAC,SAAS,CAAqC;IACtD,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,UAAU,CAAY;gBAGpB,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC;IAGrD,kBAAkB,CACtB,SAAS,EAAE,sBAAsB,EACjC,cAAc,EAAE,EAAE,EAAE,EACpB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC;IAiBV,QAAQ,CAAC,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAsC7G,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;CAyChD"}

package/dest/light/lightweight_checkpoint_builder.js

@@ -0,0 +1,107 @@
+import { SpongeBlob, computeBlobsHashFromBlobs, getBlobsPerL1Block } from '@aztec/blob-lib';
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { L2BlockNew } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import { computeCheckpointOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { ContentCommitment } from '@aztec/stdlib/tx';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffects } from '../orchestrator/block-building-helpers.js';
+/**
+ * Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
+ *
+ * It updates the l1-to-l2 message tree when starting a new checkpoint, inserts the side effects to note hash,
+ * nullifier, and public data trees, then updates the archive tree when a block is added.
+ */ export class LightweightCheckpointBuilder {
+    db;
+    telemetry;
+    logger;
+    constants;
+    l1ToL2Messages;
+    lastArchives;
+    spongeBlob;
+    blocks;
+    blobFields;
+    constructor(db, telemetry = getTelemetryClient()){
+        this.db = db;
+        this.telemetry = telemetry;
+        this.logger = createLogger('lightweight-checkpoint-builder');
+        this.l1ToL2Messages = [];
+        this.lastArchives = [];
+        this.spongeBlob = SpongeBlob.empty();
+        this.blocks = [];
+        this.blobFields = [];
+    }
+    async startNewCheckpoint(constants, l1ToL2Messages, totalNumBlobFields) {
+        this.logger.debug('Starting new checkpoint', {
+            constants: constants.toInspect(),
+            l1ToL2Messages
+        });
+        this.constants = constants;
+        // Insert l1-to-l2 messages into the tree.
+        this.l1ToL2Messages = l1ToL2Messages;
+        await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
+        this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
+        this.spongeBlob = await SpongeBlob.init(totalNumBlobFields);
+        this.blocks = [];
+        this.blobFields = [
+            new Fr(totalNumBlobFields)
+        ];
+    }
+    async addBlock(globalVariables, endState, txs) {
+        const isFirstBlock = this.blocks.length === 0;
+        const lastArchive = this.lastArchives[this.lastArchives.length - 1];
+        for (const tx of txs){
+            await insertSideEffects(tx, this.db);
+        }
+        const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(txs, lastArchive, endState, globalVariables, this.spongeBlob, isFirstBlock);
+        await this.db.updateArchive(header);
+        const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
+        this.lastArchives.push(newArchive);
+        const block = new L2BlockNew(newArchive, header, body);
+        this.blocks.push(block);
+        await this.spongeBlob.absorb(blockBlobFields);
+        this.blobFields.push(...blockBlobFields);
+        this.logger.debug(`Built block ${header.getBlockNumber()}`, {
+            globalVariables: globalVariables.toInspect(),
+            archiveRoot: newArchive.root.toString(),
+            stateReference: header.state.toInspect(),
+            blockHash: (await block.hash()).toString(),
+            txs: block.body.txEffects.map((tx)=>tx.txHash.toString())
+        });
+        return block;
+    }
+    async completeCheckpoint() {
+        if (!this.blocks.length) {
+            throw new Error('No blocks added to checkpoint.');
+        }
+        if (this.blobFields.length !== this.blobFields[0].toNumber()) {
+            throw new Error(`Blob fields length does not match. Expected ${this.blobFields[0].toNumber()}, got ${this.blobFields.length}.`);
+        }
+        const blocks = this.blocks;
+        const newArchive = this.lastArchives[this.lastArchives.length - 1];
+        const blobs = getBlobsPerL1Block(this.blobFields);
+        const blobsHash = computeBlobsHashFromBlobs(blobs);
+        const inHash = await computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
+        const outHash = computeCheckpointOutHash(blocks.map((block)=>block.body.txEffects.map((tx)=>tx.l2ToL1Msgs)));
+        const constants = this.constants;
+        // timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
+        const timestamp = blocks[blocks.length - 1].timestamp;
+        const totalManaUsed = blocks.reduce((acc, block)=>acc.add(block.header.totalManaUsed), Fr.ZERO);
+        const header = CheckpointHeader.from({
+            lastArchiveRoot: this.lastArchives[0].root,
+            contentCommitment: new ContentCommitment(blobsHash, inHash, outHash),
+            slotNumber: constants.slotNumber,
+            timestamp,
+            coinbase: constants.coinbase,
+            feeRecipient: constants.feeRecipient,
+            gasFees: constants.gasFees,
+            totalManaUsed
+        });
+        return new Checkpoint(newArchive, header, blocks);
+    }
+}

package/dest/mocks/fixtures.d.ts

@@ -1,9 +1,7 @@
 import type { Logger } from '@aztec/foundation/log';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { type CircuitSimulator } from '@aztec/simulator/server';
-import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { CheckpointConstantData } from '@aztec/stdlib/rollup';
-import type { ProcessedTx } from '@aztec/stdlib/tx';
 import { GlobalVariables } from '@aztec/stdlib/tx';
 export declare const getEnvironmentConfig: (logger: Logger) => Promise<{
     acvmWorkingDirectory: string;
@@ -17,7 +15,6 @@ export declare function getSimulator(config: {
     acvmWorkingDirectory: string | undefined;
     acvmBinaryPath: string | undefined;
 }, logger?: Logger): Promise<CircuitSimulator>;
-export declare const updateExpectedTreesFromTxs: (db: MerkleTreeWriteOperations, txs: ProcessedTx[]) => Promise<void>;
 export declare const makeGlobals: (blockNumber: number, slotNumber?: number, overrides?: Partial<FieldsOf<GlobalVariables> & FieldsOf<CheckpointConstantData>>) => GlobalVariables;
 export declare const makeCheckpointConstants: (slotNumber: number, overrides?: Partial<FieldsOf<CheckpointConstantData>>) => CheckpointConstantData;
 //# sourceMappingURL=fixtures.d.ts.map

package/dest/mocks/fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,KAAK,gBAAgB,EAA+C,MAAM,yBAAyB,CAAC;AAG7G,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAiBnD,eAAO,MAAM,oBAAoB,GAAU,QAAQ,MAAM;;;;;;;cAkCxD,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAGD,eAAO,MAAM,0BAA0B,GAAU,IAAI,yBAAyB,EAAE,KAAK,WAAW,EAAE,kBAgBjG,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,aAAa,MAAM,EACnB,mBAAwB,EACxB,YAAW,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAM,oBActF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAClB,YAAW,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAM,2BAc1D,CAAC"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,KAAK,gBAAgB,EAA+C,MAAM,yBAAyB,CAAC;AAG7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAiBnD,eAAO,MAAM,oBAAoB,GAAU,QAAQ,MAAM;;;;;;;cAkCxD,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAED,eAAO,MAAM,WAAW,GACtB,aAAa,MAAM,EACnB,mBAAwB,EACxB,YAAW,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAM,oBActF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAClB,YAAW,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAM,2BAc1D,CAAC"}

package/dest/mocks/fixtures.js

@@ -1,5 +1,3 @@
-import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -10,7 +8,6 @@ import { NativeACVMSimulator, WASMSimulatorWithBlobs } from '@aztec/simulator/se
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees } from '@aztec/stdlib/gas';
 import { CheckpointConstantData } from '@aztec/stdlib/rollup';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { GlobalVariables } from '@aztec/stdlib/tx';
 import { promises as fs } from 'fs';
 import path from 'path';
@@ -67,14 +64,6 @@ export async function getSimulator(config, logger) {
     logger?.info('Using WASM ACVM simulation');
     return new WASMSimulatorWithBlobs();
 }
-// Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
-export const updateExpectedTreesFromTxs = async (db, txs)=>{
-    await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, txs.flatMap((tx)=>padArrayEnd(tx.txEffect.noteHashes, Fr.zero(), MAX_NOTE_HASHES_PER_TX)));
-    await db.batchInsert(MerkleTreeId.NULLIFIER_TREE, txs.flatMap((tx)=>padArrayEnd(tx.txEffect.nullifiers, Fr.zero(), MAX_NULLIFIERS_PER_TX).map((x)=>x.toBuffer())), NULLIFIER_TREE_HEIGHT);
-    for (const tx of txs){
-        await db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, tx.txEffect.publicDataWrites.map((write)=>write.toBuffer()));
-    }
-};
 export const makeGlobals = (blockNumber, slotNumber = blockNumber, overrides = {})=>{
     const checkpointConstants = makeCheckpointConstants(slotNumber, overrides);
     return GlobalVariables.from({
@@ -82,7 +71,7 @@ export const makeGlobals = (blockNumber, slotNumber = blockNumber, overrides = {
         version: checkpointConstants.version,
         blockNumber,
         slotNumber: new Fr(slotNumber),
-        timestamp: BigInt(blockNumber),
+        timestamp: BigInt(blockNumber * 123),
         coinbase: checkpointConstants.coinbase,
         feeRecipient: checkpointConstants.feeRecipient,
         gasFees: checkpointConstants.gasFees,

package/dest/mocks/test_context.d.ts

@@ -2,12 +2,11 @@ import type { BBProverConfig } from '@aztec/bb-prover';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import type { MerkleTreeWriteOperations, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
 import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
-import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
-import { type BlockHeader, type GlobalVariables, type ProcessedTx, type Tx } from '@aztec/stdlib/tx';
+import { mockProcessedTx } from '@aztec/stdlib/testing';
+import { type BlockHeader, type GlobalVariables, type ProcessedTx } from '@aztec/stdlib/tx';
 import type { MerkleTreeAdminDatabase } from '@aztec/world-state';
 import type { BlockProvingState } from '../orchestrator/block-proving-state.js';
 import { ProvingOrchestrator } from '../orchestrator/index.js';
@@ -15,65 +14,48 @@ import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facad
 import { TestBroker } from '../test/mock_prover.js';
 export declare class TestContext {
     worldState: MerkleTreeAdminDatabase;
-    firstCheckpointNumber: Fr;
-    globalVariables: GlobalVariables;
     prover: ServerCircuitProver;
     broker: TestBroker;
     brokerProverFacade: BrokerCircuitProverFacade;
     orchestrator: TestProvingOrchestrator;
-    blockNumber: number;
-    feePayer: AztecAddress;
-    directoriesToCleanup: string[];
-    logger: Logger;
+    private feePayer;
+    private directoriesToCleanup;
+    private logger;
     private headers;
+    private checkpoints;
+    private nextCheckpointIndex;
+    private nextBlockNumber;
+    private epochNumber;
     private feePayerBalance;
-    constructor(worldState: MerkleTreeAdminDatabase, firstCheckpointNumber: Fr, globalVariables: GlobalVariables, prover: ServerCircuitProver, broker: TestBroker, brokerProverFacade: BrokerCircuitProverFacade, orchestrator: TestProvingOrchestrator, blockNumber: number, feePayer: AztecAddress, initialFeePayerBalance: Fr, directoriesToCleanup: string[], logger: Logger);
+    constructor(worldState: MerkleTreeAdminDatabase, prover: ServerCircuitProver, broker: TestBroker, brokerProverFacade: BrokerCircuitProverFacade, orchestrator: TestProvingOrchestrator, feePayer: AztecAddress, initialFeePayerBalance: Fr, directoriesToCleanup: string[], logger: Logger);
     get epochProver(): TestProvingOrchestrator;
-    getCheckpointConstants(checkpointIndex?: number): CheckpointConstantData;
-    static new(logger: Logger, { proverCount, createProver, slotNumber, blockNumber, }?: {
+    static new(logger: Logger, { proverCount, createProver, }?: {
         proverCount?: number;
         createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>;
-        slotNumber?: number;
-        blockNumber?: number;
     }): Promise<TestContext>;
-    getFork(): Promise<import("@aztec/stdlib/trees").MerkleTreeWriteOperations>;
-    getBlockHeader(blockNumber: 0): BlockHeader;
-    getBlockHeader(blockNumber: number): BlockHeader | undefined;
-    getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
+    getFork(): Promise<MerkleTreeWriteOperations>;
     cleanup(): Promise<void>;
-    makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx>;
-    /** Creates a block with the given number of txs and adds it to world-state */
-    makePendingBlock(numTxs: number, { checkpointIndex, numL1ToL2Messages, blockNumber, makeProcessedTxOpts, }?: {
-        checkpointIndex?: number;
-        numL1ToL2Messages?: number;
-        blockNumber?: number;
-        makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
-    }): Promise<{
-        block: import("@aztec/stdlib/block").L2Block;
-        txs: ProcessedTx[];
-        l1ToL2Messages: Fr[];
-    }>;
-    makePendingBlocksInCheckpoint(numBlocks: number, { checkpointIndex, numTxsPerBlock, numL1ToL2Messages, firstBlockNumber, makeGlobalVariablesOpts, makeProcessedTxOpts, }?: {
-        checkpointIndex?: number;
+    startNewEpoch(): void;
+    getBlobFields(): Fr[][];
+    getFinalBlobChallenges(): Promise<import("@aztec/blob-lib").FinalBlobBatchingChallenges>;
+    makeCheckpoint(numBlocks: number, { numTxsPerBlock, numL1ToL2Messages, makeProcessedTxOpts, ...constantOpts }?: {
         numTxsPerBlock?: number | number[];
         numL1ToL2Messages?: number;
-        firstBlockNumber?: number;
-        makeGlobalVariablesOpts?: (blockNumber: number, checkpointIndex: number) => Partial<FieldsOf<GlobalVariables> & FieldsOf<CheckpointConstantData>>;
-        makeProcessedTxOpts?: (blockGlobalVariables: GlobalVariables, txIndex: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
-    }): Promise<{
+        makeProcessedTxOpts?: (blockGlobalVariables: GlobalVariables, txIndex: number) => Partial<Parameters<typeof mockProcessedTx>[0]>;
+    } & Partial<FieldsOf<CheckpointConstantData>>): Promise<{
+        constants: CheckpointConstantData;
+        header: import("@aztec/stdlib/rollup").CheckpointHeader;
         blocks: {
             header: BlockHeader;
             txs: ProcessedTx[];
         }[];
         l1ToL2Messages: Fr[];
-        blobFields: Fr[];
+        totalNumBlobFields: number;
+        previousBlockHeader: BlockHeader;
     }>;
-    processPublicFunctions(txs: Tx[], { maxTransactions, numL1ToL2Messages, contractDataSource, }?: {
-        maxTransactions?: number;
-        numL1ToL2Messages?: number;
-        contractDataSource?: SimpleContractDataSource;
-    }): Promise<[ProcessedTx[], import("@aztec/stdlib/tx").FailedTx[], Tx[], import("@aztec/stdlib/tx").NestedProcessReturnValues[]]>;
-    private setTreeRoots;
+    private makeProcessedTx;
+    private getBlockHeader;
+    private updateTrees;
 }
 declare class TestProvingOrchestrator extends ProvingOrchestrator {
     isVerifyBuiltBlockAgainstSyncedStateEnabled: boolean;

package/dest/mocks/test_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAG5E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAiB,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACpH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AASpD,qBAAa,WAAW;IAKb,UAAU,EAAE,uBAAuB;IACnC,qBAAqB,EAAE,EAAE;IACzB,eAAe,EAAE,eAAe;IAChC,MAAM,EAAE,mBAAmB;IAC3B,MAAM,EAAE,UAAU;IAClB,kBAAkB,EAAE,yBAAyB;IAC7C,YAAY,EAAE,uBAAuB;IACrC,WAAW,EAAE,MAAM;IACnB,QAAQ,EAAE,YAAY;IAEtB,oBAAoB,EAAE,MAAM,EAAE;IAC9B,MAAM,EAAE,MAAM;IAfvB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAK;gBAGnB,UAAU,EAAE,uBAAuB,EACnC,qBAAqB,EAAE,EAAE,EACzB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,UAAU,EAClB,kBAAkB,EAAE,yBAAyB,EAC7C,YAAY,EAAE,uBAAuB,EACrC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,YAAY,EAC7B,sBAAsB,EAAE,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAAE,EAC9B,MAAM,EAAE,MAAM;IAKvB,IAAW,WAAW,4BAErB;IAEM,sBAAsB,CAAC,eAAe,SAAI,GAAG,sBAAsB;WAI7D,GAAG,CACd,MAAM,EAAE,MAAM,EACd,EACE,WAAe,EACf,YAA8G,EAC9G,UAAc,EACd,WAAe,GAChB,GAAE;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB;IA8DD,OAAO;IAIP,cAAc,CAAC,WAAW,EAAE,CAAC,GAAG,WAAW;IAC3C,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAK5D,sBAAsB,CAAC,kBAAkB,SAAmB,GAAG,WAAW;IAI3E,OAAO;IAYP,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;IAoBhG,8EAA8E;IACjE,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,EACE,eAAmB,EACnB,iBAAqB,EACrB,WAA8B,EAC9B,mBAAgC,GACjC,GAAE;QACD,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC3F;;;;;IA6BK,6BAA6B,CACxC,SAAS,EAAE,MAAM,EACjB,EACE,eAAmB,EACnB,cAAkB,EAClB,iBAAqB,EACrB,gBAAiE,EACjE,uBAAoC,EACpC,mBAAgC,GACjC,GAAE;QACD,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,uBAAuB,CAAC,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,KACpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAC3E,mBAAmB,CAAC,EAAE,CACpB,oBAAoB,EAAE,eAAe,EACrC,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACvD;;oBAiCkB,WAAW;iBAAO,WAAW,EAAE;;;;;IA2B5C,sBAAsB,CACjC,GAAG,EAAE,EAAE,EAAE,EACT,EACE,eAA4B,EAC5B,iBAAqB,EACrB,kBAAkB,GACnB,GAAE;QACD,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,kBAAkB,CAAC,EAAE,wBAAwB,CAAC;KAC1C;YAqBM,YAAY;CAuB3B;AAED,cAAM,uBAAwB,SAAQ,mBAAmB;IAChD,2CAA2C,UAAS;cAIxC,kCAAkC,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAMtG"}
+{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}