@aztec/prover-client 0.0.1-commit.b655e406 → 0.0.1-commit.c2595eba

package/src/proving_broker/proving_broker.ts

@@ -1,3 +1,4 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { PriorityMemoryQueue } from '@aztec/foundation/queue';
@@ -15,13 +16,7 @@ import {
   tryStop,
 } from '@aztec/stdlib/interfaces/server';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
-import {
-  type TelemetryClient,
-  type Traceable,
-  type Tracer,
-  getTelemetryClient,
-  trackSpan,
-} from '@aztec/telemetry-client';
+import { type TelemetryClient, type Traceable, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
 
 import assert from 'assert';
 
@@ -301,6 +296,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
       this.resultsCache.delete(id);
       this.inProgress.delete(id);
       this.retries.delete(id);
+      this.enqueuedAt.delete(id);
     }
   }
 
@@ -353,6 +349,8 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
           const enqueuedAt = this.enqueuedAt.get(job.id);
           if (enqueuedAt) {
             this.instrumentation.recordJobWait(job.type, enqueuedAt);
+            // we can clear this flag now.
+            this.enqueuedAt.delete(job.id);
           }
 
           return { job, time };
@@ -561,13 +559,12 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     return this.#getProvingJob(filter);
   }
 
-  @trackSpan('ProvingBroker.cleanupPass')
   private async cleanupPass() {
     this.cleanupStaleJobs();
     this.reEnqueueExpiredJobs();
     const oldestEpochToKeep = this.oldestEpochToKeep();
     if (oldestEpochToKeep > 0) {
-      await this.database.deleteAllProvingJobsOlderThanEpoch(oldestEpochToKeep);
+      await this.database.deleteAllProvingJobsOlderThanEpoch(EpochNumber(oldestEpochToKeep));
       this.logger.trace(`Deleted all epochs older than ${oldestEpochToKeep}`);
     }
   }

package/src/proving_broker/proving_broker_database/memory.ts

@@ -1,3 +1,4 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import {
   type ProofUri,
   type ProvingJob,
@@ -43,7 +44,7 @@ export class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
     return Promise.resolve();
   }
 
-  deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void> {
+  deleteAllProvingJobsOlderThanEpoch(epochNumber: EpochNumber): Promise<void> {
     const toDelete = [
       ...Array.from(this.jobs.keys()).filter(x => getEpochFromProvingJobId(x) < epochNumber),
       ...Array.from(this.results.keys()).filter(x => getEpochFromProvingJobId(x) < epochNumber),

package/src/proving_broker/proving_broker_database/persisted.ts

@@ -1,3 +1,4 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { BatchQueue } from '@aztec/foundation/queue';
@@ -10,7 +11,14 @@ import {
   ProvingJobSettledResult,
   getEpochFromProvingJobId,
 } from '@aztec/stdlib/interfaces/server';
-import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
+import {
+  Attributes,
+  LmdbMetrics,
+  type TelemetryClient,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+} from '@aztec/telemetry-client';
 
 import { mkdir, readdir } from 'fs/promises';
 import { join } from 'path';
@@ -77,6 +85,8 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
 
   private batchQueue: BatchQueue<ProvingJob | [ProvingJobId, ProvingJobSettledResult], number>;
 
+  public readonly tracer: Tracer;
+
   private constructor(
     private epochs: Map<number, SingleEpochDatabase>,
     private config: ProverBrokerConfig,
@@ -91,6 +101,8 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
       () => this.estimateSize(),
     );
 
+    this.tracer = client.getTracer('KVBrokerDatabase');
+
     this.batchQueue = new BatchQueue(
       (items, key) => this.commitWrites(items, key),
       config.proverBrokerBatchSize,
@@ -104,7 +116,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
     const jobsToAdd = items.filter((item): item is ProvingJob => 'id' in item);
     const resultsToAdd = items.filter((item): item is [ProvingJobId, ProvingJobSettledResult] => Array.isArray(item));
 
-    const db = await this.getEpochDatabase(epochNumber);
+    const db = await this.getEpochDatabase(EpochNumber(epochNumber));
     await db.batchWrite(jobsToAdd, resultsToAdd);
   }
 
@@ -164,8 +176,11 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
     }
   }
 
-  async deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void> {
-    const oldEpochs = Array.from(this.epochs.keys()).filter(e => e < epochNumber);
+  @trackSpan('KVBrokerDatabase.deleteAllProvingJobsOlderThanEpoch', epochNumber => ({
+    [Attributes.EPOCH_NUMBER]: epochNumber,
+  }))
+  async deleteAllProvingJobsOlderThanEpoch(epochNumber: EpochNumber): Promise<void> {
+    const oldEpochs = Array.from(this.epochs.keys()).filter(e => e < Number(epochNumber));
     for (const old of oldEpochs) {
       const db = this.epochs.get(old);
       if (!db) {
@@ -196,7 +211,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
     return this.batchQueue.put([id, { status: 'fulfilled', value }], getEpochFromProvingJobId(id));
   }
 
-  private async getEpochDatabase(epochNumber: number): Promise<SingleEpochDatabase> {
+  private async getEpochDatabase(epochNumber: EpochNumber): Promise<SingleEpochDatabase> {
     let epochDb = this.epochs.get(epochNumber);
     if (!epochDb) {
       const newEpochDirectory = join(this.config.dataDirectory!, epochNumber.toString());

package/src/proving_broker/proving_broker_database.ts

@@ -1,3 +1,4 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server';
 
 /**
@@ -14,7 +15,7 @@ export interface ProvingBrokerDatabase {
    * Deletes all proving jobs belonging to epochs older than the given epoch
    * @param epochNumber - The epoch number beyond which jobs should be deleted
    */
-  deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void>;
+  deleteAllProvingJobsOlderThanEpoch(epochNumber: EpochNumber): Promise<void>;
 
   /**
    * Returns an iterator over all saved proving jobs

package/src/proving_broker/proving_broker_instrumentation.ts

@@ -8,7 +8,7 @@ import {
   type ObservableResult,
   type TelemetryClient,
   type UpDownCounter,
-  ValueType,
+  createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
 export type MonitorCallback = (proofType: ProvingRequestType) => number;
@@ -28,49 +28,28 @@ export class ProvingBrokerInstrumentation {
   constructor(client: TelemetryClient, name = 'ProvingBroker') {
     const meter = client.getMeter(name);
 
-    this.queueSize = meter.createObservableGauge(Metrics.PROVING_QUEUE_SIZE, {
-      valueType: ValueType.INT,
-    });
+    this.queueSize = meter.createObservableGauge(Metrics.PROVING_QUEUE_SIZE);
 
-    this.activeJobs = meter.createObservableGauge(Metrics.PROVING_QUEUE_ACTIVE_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.activeJobs = meter.createObservableGauge(Metrics.PROVING_QUEUE_ACTIVE_JOBS);
 
-    this.resolvedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_RESOLVED_JOBS, {
-      valueType: ValueType.INT,
-    });
+    const provingJobTypes = Object.values(ProvingRequestType).filter(v => typeof v === 'string');
+    const provingJobAttrs = { [Attributes.PROVING_JOB_TYPE]: provingJobTypes };
 
-    this.rejectedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_REJECTED_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.resolvedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_RESOLVED_JOBS, provingJobAttrs);
 
-    this.retriedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_RETRIED_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.rejectedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_REJECTED_JOBS, provingJobAttrs);
 
-    this.timedOutJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_TIMED_OUT_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.retriedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_RETRIED_JOBS, provingJobAttrs);
 
-    this.cachedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_CACHED_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.timedOutJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_TIMED_OUT_JOBS, provingJobAttrs);
 
-    this.totalJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_TOTAL_JOBS, {
-      valueType: ValueType.INT,
-    });
+    this.cachedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_CACHED_JOBS, provingJobAttrs);
 
-    this.jobWait = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_WAIT, {
-      description: 'Records how long a job sits in the queue',
-      unit: 'ms',
-      valueType: ValueType.INT,
-    });
+    this.totalJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_TOTAL_JOBS, provingJobAttrs);
 
-    this.jobDuration = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_DURATION, {
-      description: 'Records how long a job takes to complete',
-      unit: 'ms',
-      valueType: ValueType.INT,
-    });
+    this.jobWait = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_WAIT);
+
+    this.jobDuration = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_DURATION);
   }
 
   monitorQueueDepth(fn: MonitorCallback) {

package/src/proving_broker/proving_job_controller.ts

@@ -1,6 +1,7 @@
-import { randomBytes } from '@aztec/foundation/crypto';
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 import { AbortError } from '@aztec/foundation/error';
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
 import type {
   ProvingJobId,
   ProvingJobInputs,
@@ -20,16 +21,22 @@ export class ProvingJobController {
   private promise?: Promise<void>;
   private abortController = new AbortController();
   private result?: ProvingJobResultsMap[ProvingRequestType] | Error;
+  private log: Logger;
 
   constructor(
     private jobId: ProvingJobId,
     private inputs: ProvingJobInputs,
-    private epochNumber: number,
+    private epochNumber: EpochNumber,
     private startedAt: number,
     private circuitProver: ServerCircuitProver,
     private onComplete: () => void,
-    private log = createLogger('prover-client:proving-agent:job-controller-' + randomBytes(4).toString('hex')),
-  ) {}
+    bindings?: LoggerBindings,
+  ) {
+    this.log = createLogger('prover-client:proving-agent:job-controller', {
+      instanceId: randomBytes(4).toString('hex'),
+      ...bindings,
+    });
+  }
 
   public start(): void {
     if (this.status !== ProvingJobControllerStatus.IDLE) {
@@ -124,8 +131,7 @@ export class ProvingJobController {
     const signal = this.abortController.signal;
     switch (type) {
       case ProvingRequestType.PUBLIC_VM: {
-        // TODO(#14234)[Unconditional PIs validation]: Remove argument "undefined".
-        return await this.circuitProver.getAvmProof(inputs, undefined, signal, this.epochNumber);
+        return await this.circuitProver.getAvmProof(inputs, signal, this.epochNumber);
       }
 
       case ProvingRequestType.PUBLIC_CHONK_VERIFIER: {

package/src/test/mock_prover.ts

@@ -1,6 +1,5 @@
 import {
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
-  AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   RECURSIVE_PROOF_LENGTH,
@@ -14,7 +13,6 @@ import {
   type ProvingJobStatus,
   type PublicInputsAndRecursiveProof,
   type ServerCircuitProver,
-  makeProofAndVerificationKey,
   makePublicInputsAndRecursiveProof,
 } from '@aztec/stdlib/interfaces/server';
 import type { ParityBasePrivateInputs, ParityRootPrivateInputs } from '@aztec/stdlib/parity';
@@ -105,18 +103,8 @@ export class TestBroker implements ProvingJobProducer {
 export class MockProver implements ServerCircuitProver {
   constructor() {}
 
-  getAvmProof(
-    _inputs: AvmCircuitInputs,
-    _skipPublicInputsValidation?: boolean, // TODO(#14234)[Unconditional PIs validation]: Remove.
-    _signal?: AbortSignal,
-    _epochNumber?: number,
-  ) {
-    return Promise.resolve(
-      makeProofAndVerificationKey(
-        makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED),
-        VerificationKeyData.makeFake(AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED),
-      ),
-    );
+  getAvmProof(_inputs: AvmCircuitInputs, _signal?: AbortSignal, _epochNumber?: number) {
+    return Promise.resolve(makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED));
   }
 
   getBaseParityProof(_inputs: ParityBasePrivateInputs, _signal?: AbortSignal, _epochNumber?: number) {

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

@@ -1,2 +0,0 @@
-export * from './light.js';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block-factory/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC"}

package/dest/block-factory/index.js

@@ -1 +0,0 @@
-export * from './light.js';

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

@@ -1,38 +0,0 @@
-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 TelemetryClient } from '@aztec/telemetry-client';
-/**
- * Builds a block and its header from a set of processed tx without running any circuits.
- *
- * NOTE: the onus is ON THE CALLER to update the db that is passed in with the notes hashes, nullifiers, etc
- * PRIOR to calling `buildBlock`.
- *
- * Why? Because if you are, e.g. building a block in practice from TxObjects, you are using the
- * 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.
- */
-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>;
-    addTxs(txs: ProcessedTx[]): Promise<void>;
-    setBlockCompleted(): Promise<L2Block>;
-    private buildBlock;
-}
-/**
- * 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>;
-//# sourceMappingURL=light.d.ts.map

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

@@ -1 +0,0 @@
-{"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"}

package/dest/block-factory/light.js

@@ -1,94 +0,0 @@
-import { SpongeBlob } 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 { MerkleTreeId } from '@aztec/stdlib/trees';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints } from '../orchestrator/block-building-helpers.js';
-/**
- * Builds a block and its header from a set of processed tx without running any circuits.
- *
- * NOTE: the onus is ON THE CALLER to update the db that is passed in with the notes hashes, nullifiers, etc
- * PRIOR to calling `buildBlock`.
- *
- * Why? Because if you are, e.g. building a block in practice from TxObjects, you are using the
- * 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.
- */ export class LightweightBlockFactory {
-    db;
-    telemetry;
-    globalVariables;
-    l1ToL2Messages;
-    startSpongeBlob;
-    txs;
-    logger;
-    constructor(db, telemetry = getTelemetryClient()){
-        this.db = db;
-        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) {
-        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.txs = undefined;
-        // Update L1 to L2 tree
-        await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.l1ToL2Messages);
-    }
-    addTxs(txs) {
-        // Most times, `addTxs` is only called once per block.
-        // So avoid copies.
-        if (this.txs === undefined) {
-            this.txs = txs;
-        } else {
-            this.txs.push(...txs);
-        }
-        return Promise.resolve();
-    }
-    setBlockCompleted() {
-        return this.buildBlock();
-    }
-    async buildBlock() {
-        const { header, body } = await buildHeaderAndBodyFromTxs(this.txs ?? [], this.globalVariables, this.l1ToL2Messages, this.db, this.startSpongeBlob);
-        header.state.validate();
-        const blockHeader = header.toBlockHeader();
-        await this.db.updateArchive(blockHeader);
-        const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-        const block = new L2Block(newArchive, header, body);
-        this.logger.debug(`Built block ${block.number}`, {
-            globalVariables: this.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;
-    }
-}
-/**
- * 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);
-    const builder = new LightweightBlockFactory(db, telemetry);
-    await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
-    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 builder.addTxs(txs);
-    return await builder.setBlockCompleted();
-}

package/dest/proving_broker/proving_agent_instrumentation.d.ts

@@ -1,8 +0,0 @@
-import type { Timer } from '@aztec/foundation/timer';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-export declare class ProvingAgentInstrumentation {
-    private idleTime;
-    constructor(client: TelemetryClient, name?: string);
-    recordIdleTime(msOrTimer: Timer | number): void;
-}
-//# sourceMappingURL=proving_agent_instrumentation.d.ts.map

package/dest/proving_broker/proving_agent_instrumentation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proving_agent_instrumentation.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_agent_instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAA2B,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAEnG,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAY;gBAEhB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAiB;IAU1D,cAAc,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM;CAIzC"}

package/dest/proving_broker/proving_agent_instrumentation.js

@@ -1,16 +0,0 @@
-import { Metrics, ValueType } from '@aztec/telemetry-client';
-export class ProvingAgentInstrumentation {
-    idleTime;
-    constructor(client, name = 'ProvingAgent'){
-        const meter = client.getMeter(name);
-        this.idleTime = meter.createHistogram(Metrics.PROVING_AGENT_IDLE, {
-            description: 'Records how long an agent was idle',
-            unit: 's',
-            valueType: ValueType.DOUBLE
-        });
-    }
-    recordIdleTime(msOrTimer) {
-        const duration = typeof msOrTimer === 'number' ? msOrTimer : msOrTimer.ms();
-        this.idleTime.record(duration / 1000);
-    }
-}

package/src/block-factory/index.ts

@@ -1 +0,0 @@
-export * from './light.js';

package/src/block-factory/light.ts

@@ -1,140 +0,0 @@
-import { SpongeBlob } 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 type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-import type { GlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
-
-import {
-  buildHeaderAndBodyFromTxs,
-  getTreeSnapshot,
-  insertSideEffectsAndBuildBaseRollupHints,
-} from '../orchestrator/block-building-helpers.js';
-
-/**
- * Builds a block and its header from a set of processed tx without running any circuits.
- *
- * NOTE: the onus is ON THE CALLER to update the db that is passed in with the notes hashes, nullifiers, etc
- * PRIOR to calling `buildBlock`.
- *
- * Why? Because if you are, e.g. building a block in practice from TxObjects, you are using the
- * 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.
- */
-export class LightweightBlockFactory implements IBlockFactory {
-  private globalVariables?: GlobalVariables;
-  private l1ToL2Messages?: Fr[];
-  private startSpongeBlob?: SpongeBlob;
-  private txs: ProcessedTx[] | undefined;
-
-  private readonly logger = createLogger('lightweight-block-factory');
-
-  constructor(
-    private db: MerkleTreeWriteOperations,
-    private telemetry: TelemetryClient = getTelemetryClient(),
-  ) {}
-
-  async startNewBlock(
-    globalVariables: GlobalVariables,
-    l1ToL2Messages: Fr[],
-    // Must be provided to generate the correct spongeBlobHash for the block header if there's more than one block in the checkpoint.
-    startSpongeBlob?: SpongeBlob,
-    // Only insert l1 to l2 messages for the first block in a checkpoint.
-    isFirstBlock = true,
-  ): Promise<void> {
-    this.logger.debug('Starting new block', { globalVariables: globalVariables.toInspect(), l1ToL2Messages });
-    this.globalVariables = globalVariables;
-    this.l1ToL2Messages = isFirstBlock
-      ? padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP)
-      : [];
-    this.startSpongeBlob = startSpongeBlob;
-    this.txs = undefined;
-    // Update L1 to L2 tree
-    await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.l1ToL2Messages!);
-  }
-
-  addTxs(txs: ProcessedTx[]): Promise<void> {
-    // Most times, `addTxs` is only called once per block.
-    // So avoid copies.
-    if (this.txs === undefined) {
-      this.txs = txs;
-    } else {
-      this.txs.push(...txs);
-    }
-    return Promise.resolve();
-  }
-
-  setBlockCompleted(): Promise<L2Block> {
-    return this.buildBlock();
-  }
-
-  private async buildBlock(): Promise<L2Block> {
-    const { header, body } = await buildHeaderAndBodyFromTxs(
-      this.txs ?? [],
-      this.globalVariables!,
-      this.l1ToL2Messages!,
-      this.db,
-      this.startSpongeBlob,
-    );
-
-    header.state.validate();
-
-    const blockHeader = header.toBlockHeader();
-    await this.db.updateArchive(blockHeader);
-    const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-
-    const block = new L2Block(newArchive, header, body);
-
-    this.logger.debug(`Built block ${block.number}`, {
-      globalVariables: this.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;
-  }
-}
-
-/**
- * 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: ProcessedTx[],
-  globalVariables: GlobalVariables,
-  l1ToL2Messages: Fr[],
-  db: MerkleTreeWriteOperations,
-  startSpongeBlob?: SpongeBlob,
-  isFirstBlock = true,
-  telemetry: TelemetryClient = getTelemetryClient(),
-) {
-  const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
-  const builder = new LightweightBlockFactory(db, telemetry);
-  await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
-  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 builder.addTxs(txs);
-
-  return await builder.setBlockCompleted();
-}

package/src/proving_broker/proving_agent_instrumentation.ts

@@ -1,21 +0,0 @@
-import type { Timer } from '@aztec/foundation/timer';
-import { type Histogram, Metrics, type TelemetryClient, ValueType } from '@aztec/telemetry-client';
-
-export class ProvingAgentInstrumentation {
-  private idleTime: Histogram;
-
-  constructor(client: TelemetryClient, name = 'ProvingAgent') {
-    const meter = client.getMeter(name);
-
-    this.idleTime = meter.createHistogram(Metrics.PROVING_AGENT_IDLE, {
-      description: 'Records how long an agent was idle',
-      unit: 's',
-      valueType: ValueType.DOUBLE,
-    });
-  }
-
-  recordIdleTime(msOrTimer: Timer | number) {
-    const duration = typeof msOrTimer === 'number' ? msOrTimer : msOrTimer.ms();
-    this.idleTime.record(duration / 1000);
-  }
-}