@aztec/prover-client 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/dest/bin/get-proof-inputs.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=get-proof-inputs.d.ts.map

package/dest/bin/get-proof-inputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-proof-inputs.d.ts","sourceRoot":"","sources":["../../src/bin/get-proof-inputs.ts"],"names":[],"mappings":""}

package/dest/bin/get-proof-inputs.js

@@ -0,0 +1,51 @@
+/* eslint-disable no-console */ import { AVM_INPUTS_FILENAME } from '@aztec/bb-prover';
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { ProvingJobInputs } from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
+import { mkdirSync, writeFileSync } from 'fs';
+import { createProofStoreForUri } from '../proving_broker/index.js';
+const logger = createLogger('prover-client:get-proof-inputs');
+function printUsage() {
+    console.error('Usage: get-proof-inputs <proof-uri> [out-dir=.]');
+}
+async function main() {
+    if (process.argv[2] === '--help') {
+        printUsage();
+        return;
+    }
+    const uri = process.argv[2];
+    const outDir = process.argv[3] || '.';
+    if (!uri) {
+        printUsage();
+        throw new Error('Missing proof URI');
+    }
+    mkdirSync(outDir, {
+        recursive: true
+    });
+    const proofStore = createProofStoreForUri(uri);
+    logger.info(`Processing uri ${uri}`);
+    const input = await proofStore.getProofInput(uri);
+    logger.info(`Found inputs for ${ProvingRequestType[input.type]}`);
+    writeProofInputs(input, outDir);
+    console.log(jsonParseWithSchema(jsonStringify(input), ProvingJobInputs).inputs);
+}
+// This mimics the behavior of bb-prover/src/bb/execute.ts
+function writeProofInputs(input, outDir) {
+    switch(input.type){
+        case ProvingRequestType.PUBLIC_VM:
+            {
+                writeFileSync(`${outDir}/${AVM_INPUTS_FILENAME}`, input.inputs.serializeWithMessagePack());
+                logger.info(`Wrote AVM inputs to ${AVM_INPUTS_FILENAME}`);
+                break;
+            }
+        default:
+            {
+                throw new Error(`Unimplemented proving request type: ${ProvingRequestType[input.type]}`);
+            }
+    }
+}
+main().catch((err)=>{
+    console.error(err);
+    process.exit(1);
+});

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.
@@ -21,11 +20,10 @@ export declare class LightweightBlockFactory implements IBlockFactory {
     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 +32,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":"AAGA,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,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAmB,MAAM,kBAAkB,CAAC;AAC3F,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;IAE9B,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;IAU1F,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;YAIvB,UAAU;CAwBzB;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

@@ -5,6 +5,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { L2Block } from '@aztec/stdlib/block';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { toNumBlobFields } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints } from '../orchestrator/block-building-helpers.js';
 /**
@@ -23,7 +24,6 @@ import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBa
     telemetry;
     globalVariables;
     l1ToL2Messages;
-    startSpongeBlob;
     txs;
     logger;
     constructor(db, telemetry = getTelemetryClient()){
@@ -31,16 +31,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,10 +56,9 @@ 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 { header, body } = await buildHeaderAndBodyFromTxs(this.txs ?? [], this.globalVariables, this.l1ToL2Messages, this.db);
         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);
         this.logger.debug(`Built block ${block.number}`, {
@@ -78,16 +74,13 @@ 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 spongeBlobState = SpongeBlob.init(toNumBlobFields(txs));
     const builder = new LightweightBlockFactory(db, telemetry);
-    await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
+    await builder.startNewBlock(globalVariables, l1ToL2Messages);
     const l1ToL2MessageTree = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
     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 insertSideEffectsAndBuildBaseRollupHints(tx, globalVariables, l1ToL2MessageTree, db, spongeBlobState);
     }
     await builder.addTxs(txs);
     return await builder.setBlockCompleted();

package/dest/config.js

@@ -25,7 +25,7 @@ export const bbConfigMappings = {
     },
     numConcurrentIVCVerifiers: {
         env: 'BB_NUM_IVC_VERIFIERS',
-        description: 'Max number of chonk verifiers to run concurrently',
+        description: 'Max number of client IVC verifiers to run concurrently',
         ...numberConfigHelper(8)
     },
     bbIVCConcurrency: {

package/dest/mocks/fixtures.d.ts

@@ -1,8 +1,6 @@
 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<{
@@ -18,6 +16,5 @@ export declare function getSimulator(config: {
     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;
+export declare const makeGlobals: (blockNumber: number) => GlobalVariables;
 //# 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":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAA+C,MAAM,yBAAyB,CAAC;AAG7G,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,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,GAAI,aAAa,MAAM,oBAW9C,CAAC"}

package/dest/mocks/fixtures.js

@@ -4,12 +4,9 @@ import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { NativeACVMSimulator, WASMSimulatorWithBlobs } from '@aztec/simulator/server';
 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';
@@ -18,7 +15,7 @@ const { BB_RELEASE_DIR = 'cpp/build/bin', TEMP_DIR = '/tmp', BB_BINARY_PATH = ''
 // Determines if we have access to the bb binary and a tmp folder for temp files
 export const getEnvironmentConfig = async (logger)=>{
     try {
-        const expectedBBPath = BB_BINARY_PATH ? BB_BINARY_PATH : `${path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/', BB_RELEASE_DIR)}/bb-avm`;
+        const expectedBBPath = BB_BINARY_PATH ? BB_BINARY_PATH : `${path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/', BB_RELEASE_DIR)}/bb`;
         await fs.access(expectedBBPath, fs.constants.R_OK);
         const tempWorkingDirectory = `${TEMP_DIR}/${randomBytes(4).toString('hex')}`;
         const bbWorkingDirectory = BB_WORKING_DIRECTORY ? BB_WORKING_DIRECTORY : `${tempWorkingDirectory}/bb`;
@@ -75,31 +72,6 @@ export const updateExpectedTreesFromTxs = async (db, 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({
-        chainId: checkpointConstants.chainId,
-        version: checkpointConstants.version,
-        blockNumber,
-        slotNumber: new Fr(slotNumber),
-        timestamp: BigInt(blockNumber),
-        coinbase: checkpointConstants.coinbase,
-        feeRecipient: checkpointConstants.feeRecipient,
-        gasFees: checkpointConstants.gasFees,
-        ...overrides
-    });
-};
-export const makeCheckpointConstants = (slotNumber, overrides = {})=>{
-    return CheckpointConstantData.from({
-        chainId: Fr.ZERO,
-        version: Fr.ZERO,
-        vkTreeRoot: getVKTreeRoot(),
-        protocolContractsHash,
-        proverId: Fr.ZERO,
-        slotNumber: new Fr(slotNumber),
-        coinbase: EthAddress.ZERO,
-        feeRecipient: AztecAddress.ZERO,
-        gasFees: GasFees.empty(),
-        ...overrides
-    });
+export const makeGlobals = (blockNumber)=>{
+    return new GlobalVariables(Fr.ZERO, Fr.ZERO, blockNumber /** block number */ , new Fr(blockNumber), BigInt(blockNumber), EthAddress.ZERO, AztecAddress.ZERO, GasFees.empty());
 };

package/dest/mocks/test_context.d.ts

@@ -1,21 +1,19 @@
 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 L2Block } from '@aztec/stdlib/block';
 import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
-import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
 import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
+import { type AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { type BlockHeader, type GlobalVariables, type ProcessedTx, type Tx } 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';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 import { TestBroker } from '../test/mock_prover.js';
 export declare class TestContext {
     worldState: MerkleTreeAdminDatabase;
-    firstCheckpointNumber: Fr;
     globalVariables: GlobalVariables;
     prover: ServerCircuitProver;
     broker: TestBroker;
@@ -27,47 +25,26 @@ export declare class TestContext {
     logger: Logger;
     private headers;
     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, globalVariables: GlobalVariables, prover: ServerCircuitProver, broker: TestBroker, brokerProverFacade: BrokerCircuitProverFacade, orchestrator: TestProvingOrchestrator, blockNumber: number, 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, blockNumber, }?: {
         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;
+    setBlockHeader(header: BlockHeader, blockNumber: number): void;
     getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
     cleanup(): Promise<void>;
-    makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx>;
+    private makeProcessedTx;
     /** 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;
+    makePendingBlock(numTxs: number, numL1ToL2Messages?: number, blockNumOrGlobals?: GlobalVariables | number, makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>): Promise<{
+        block: L2Block;
         txs: ProcessedTx[];
         l1ToL2Messages: Fr[];
     }>;
-    makePendingBlocksInCheckpoint(numBlocks: number, { checkpointIndex, numTxsPerBlock, numL1ToL2Messages, firstBlockNumber, makeGlobalVariablesOpts, makeProcessedTxOpts, }?: {
-        checkpointIndex?: number;
-        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<{
-        blocks: {
-            header: BlockHeader;
-            txs: ProcessedTx[];
-        }[];
-        l1ToL2Messages: Fr[];
-        blobFields: Fr[];
-    }>;
     processPublicFunctions(txs: Tx[], { maxTransactions, numL1ToL2Messages, contractDataSource, }?: {
         maxTransactions?: number;
         numL1ToL2Messages?: number;
@@ -77,7 +54,7 @@ export declare class TestContext {
 }
 declare class TestProvingOrchestrator extends ProvingOrchestrator {
     isVerifyBuiltBlockAgainstSyncedStateEnabled: boolean;
-    protected verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void>;
+    protected verifyBuiltBlockAgainstSyncedState(l2Block: L2Block, newArchive: AppendOnlyTreeSnapshot): Promise<void>;
 }
 export {};
 //# sourceMappingURL=test_context.d.ts.map

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":"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"}
+{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}

package/dest/mocks/test_context.js

@@ -1,32 +1,31 @@
-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 { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractsList } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } 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 { 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';
+// TODO(#12613) This means of sharing test code is not ideal.
+// eslint-disable-next-line import/no-relative-packages
+import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
 import { buildBlockWithCleanDB } from '../block-factory/light.js';
 import { getTreeSnapshot } 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, makeGlobals, updateExpectedTreesFromTxs } from './fixtures.js';
 export class TestContext {
     worldState;
-    firstCheckpointNumber;
     globalVariables;
     prover;
     broker;
@@ -38,9 +37,8 @@ export class TestContext {
     logger;
     headers;
     feePayerBalance;
-    constructor(worldState, firstCheckpointNumber, globalVariables, prover, broker, brokerProverFacade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger){
+    constructor(worldState, globalVariables, prover, broker, brokerProverFacade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger){
         this.worldState = worldState;
-        this.firstCheckpointNumber = firstCheckpointNumber;
         this.globalVariables = globalVariables;
         this.prover = prover;
         this.broker = broker;
@@ -56,13 +54,9 @@ export class TestContext {
     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)), blockNumber = 1 } = {}) {
         const directoriesToCleanup = [];
-        const firstCheckpointNumber = new Fr(slotNumber);
-        const globalVariables = makeGlobals(blockNumber, slotNumber);
+        const globalVariables = makeGlobals(blockNumber);
         const feePayer = AztecAddress.fromNumber(42222);
         const initialFeePayerBalance = new Fr(10n ** 20n);
         const feePayerSlot = await computeFeePayerBalanceLeafSlot(feePayer);
@@ -95,7 +89,7 @@ export class TestContext {
         const orchestrator = new TestProvingOrchestrator(ws, facade, EthAddress.ZERO);
         await broker.start();
         facade.start();
-        return new this(ws, firstCheckpointNumber, globalVariables, localProver, broker, facade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
+        return new this(ws, globalVariables, localProver, broker, facade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
     }
     getFork() {
         return this.worldState.fork();
@@ -103,6 +97,9 @@ export class TestContext {
     getBlockHeader(blockNumber = 0) {
         return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
     }
+    setBlockHeader(header, blockNumber) {
+        this.headers.set(blockNumber, header);
+    }
     getPreviousBlockHeader(currentBlockNumber = this.blockNumber) {
         return this.getBlockHeader(currentBlockNumber - 1);
     }
@@ -122,14 +119,13 @@ 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 blockNum = (opts?.globalVariables ?? this.globalVariables).blockNumber;
+        const header = this.getBlockHeader(blockNum - 1);
         const tx = await makeBloatedProcessedTx({
             header,
             vkTreeRoot: getVKTreeRoot(),
-            protocolContracts: ProtocolContractsList,
-            globalVariables,
+            protocolContractTreeRoot,
+            globalVariables: this.globalVariables,
             feePayer: this.feePayer,
             ...opts
         });
@@ -140,9 +136,8 @@ export class TestContext {
         }
         return tx;
     }
-    /** 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);
+    /** Creates a block with the given number of txs and adds it to world-state */ async makePendingBlock(numTxs, numL1ToL2Messages = 0, blockNumOrGlobals = this.globalVariables, makeProcessedTxOpts = ()=>({})) {
+        const globalVariables = typeof blockNumOrGlobals === 'number' ? makeGlobals(blockNumOrGlobals) : blockNumOrGlobals;
         const blockNum = globalVariables.blockNumber;
         const db = await this.worldState.fork();
         const l1ToL2Messages = times(numL1ToL2Messages, (i)=>new Fr(blockNum * 100 + i));
@@ -157,7 +152,7 @@ export class TestContext {
             }));
         await this.setTreeRoots(txs);
         const block = await buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db);
-        this.headers.set(blockNum, block.getBlockHeader());
+        this.headers.set(blockNum, block.header);
         await this.worldState.handleL2BlockAndMessages(block, l1ToL2Messages);
         return {
             block,
@@ -165,63 +160,12 @@ export class TestContext {
             l1ToL2Messages
         };
     }
-    async makePendingBlocksInCheckpoint(numBlocks, { checkpointIndex = 0, numTxsPerBlock = 1, numL1ToL2Messages = 0, firstBlockNumber = this.blockNumber + checkpointIndex * numBlocks, makeGlobalVariablesOpts = ()=>({}), makeProcessedTxOpts = ()=>({}) } = {}) {
-        const slotNumber = this.firstCheckpointNumber.toNumber() + checkpointIndex;
-        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)));
-        let totalTxs = 0;
-        const blockTxs = await timesParallel(numBlocks, (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,
-                    globalVariables: blockGlobalVariables[blockIndex],
-                    header: this.getBlockHeader(firstBlockNumber - 1),
-                    newL1ToL2Snapshot,
-                    ...makeProcessedTxOpts(blockGlobalVariables[blockIndex], txIndexOffset + txIndex)
-                }));
-        });
-        const blobFields = getCheckpointBlobFields(blockTxs.map((txs)=>txs.map((tx)=>tx.txEffect)));
-        const spongeBlobState = await SpongeBlob.init(blobFields.length);
-        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);
-            blocks.push({
-                header,
-                txs
-            });
-        }
-        return {
-            blocks,
-            l1ToL2Messages,
-            blobFields
-        };
-    }
     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
-        });
+        const publicProcessor = processorFactory.create(merkleTrees, this.globalVariables, /*skipFeeEnforcement=*/ false);
         return await publicProcessor.process(txs, {
             maxTransactions
         });
@@ -246,9 +190,9 @@ class TestProvingOrchestrator extends ProvingOrchestrator {
     isVerifyBuiltBlockAgainstSyncedStateEnabled = false;
     // Disable this check by default, since it requires seeding world state with the block being built
     // This is only enabled in some tests with multiple blocks that populate the pending chain via makePendingBlock
-    verifyBuiltBlockAgainstSyncedState(provingState) {
+    verifyBuiltBlockAgainstSyncedState(l2Block, newArchive) {
         if (this.isVerifyBuiltBlockAgainstSyncedStateEnabled) {
-            return super.verifyBuiltBlockAgainstSyncedState(provingState);
+            return super.verifyBuiltBlockAgainstSyncedState(l2Block, newArchive);
         }
         return Promise.resolve();
     }