@aztec/prover-client 0.0.1-commit.fcb71a6 → 0.0.1-commit.ff7989d6c

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,7 +1,7 @@
 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,
@@ -21,6 +21,7 @@ export class ProvingJobController {
   private promise?: Promise<void>;
   private abortController = new AbortController();
   private result?: ProvingJobResultsMap[ProvingRequestType] | Error;
+  private log: Logger;
 
   constructor(
     private jobId: ProvingJobId,
@@ -29,8 +30,13 @@ export class ProvingJobController {
     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) {

package/src/proving_broker/rpc.ts

@@ -1,9 +1,11 @@
+import { EpochNumberSchema } from '@aztec/foundation/branded-types';
 import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
 import {
   type GetProvingJobResponse,
   ProofUri,
   ProvingJob,
   type ProvingJobBroker,
+  type ProvingJobBrokerDebug,
   type ProvingJobConsumer,
   ProvingJobId,
   type ProvingJobProducer,
@@ -53,6 +55,18 @@ export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {
   ...ProvingJobProducerSchema,
 };
 
+export const ProvingJobBrokerDebugSchema: ApiSchemaFor<ProvingJobBrokerDebug> = {
+  replayProvingJob: z
+    .function()
+    .args(ProvingJobId, z.nativeEnum(ProvingRequestType), EpochNumberSchema, ProofUri)
+    .returns(ProvingJobStatus),
+};
+
+export const ProvingJobBrokerSchemaWithDebug: ApiSchemaFor<ProvingJobBroker & ProvingJobBrokerDebug> = {
+  ...ProvingJobBrokerSchema,
+  ...ProvingJobBrokerDebugSchema,
+};
+
 export function createProvingJobBrokerClient(
   url: string,
   versions: Partial<ComponentsVersions>,

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';
@@ -106,12 +104,7 @@ export class MockProver implements ServerCircuitProver {
   constructor() {}
 
   getAvmProof(_inputs: AvmCircuitInputs, _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),
-      ),
-    );
+    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay1mYWN0b3J5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsWUFBWSxDQUFDIn0=

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 { Fr } from '@aztec/foundation/curves/bn254';
-import { L2Block } from '@aztec/stdlib/block';
-import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-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.
- *
- * 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 `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 txs;
-    private readonly logger;
-    constructor(db: MerkleTreeWriteOperations, telemetry?: TelemetryClient);
-    startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): 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, telemetry?: TelemetryClient): Promise<L2Block>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlnaHQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay1mYWN0b3J5L2xpZ2h0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsT0FBTyxFQUFpQixNQUFNLHFCQUFxQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hHLE9BQU8sRUFBcUIsS0FBSyxlQUFlLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM3RixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFRbkY7Ozs7Ozs7Ozs7Ozs7R0FhRztBQUNILHFCQUFhLHVCQUF3QixZQUFXLGFBQWE7SUFRekQsT0FBTyxDQUFDLEVBQUU7SUFDVixPQUFPLENBQUMsU0FBUztJQVJuQixPQUFPLENBQUMsZUFBZSxDQUFDLENBQWtCO0lBQzFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBTztJQUM5QixPQUFPLENBQUMsR0FBRyxDQUE0QjtJQUV2QyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBNkM7SUFFcEUsWUFDVSxFQUFFLEVBQUUseUJBQXlCLEVBQzdCLFNBQVMsR0FBRSxlQUFzQyxFQUN2RDtJQUVFLGFBQWEsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBT3pGO0lBRUQsTUFBTSxDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBU3hDO0lBRUQsaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUVwQztZQUVhLFVBQVU7Q0E4Q3pCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHFCQUFxQixDQUN6QyxHQUFHLEVBQUUsV0FBVyxFQUFFLEVBQ2xCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLGNBQWMsRUFBRSxFQUFFLEVBQUUsRUFDcEIsRUFBRSxFQUFFLHlCQUF5QixFQUM3QixTQUFTLEdBQUUsZUFBc0Msb0JBV2xEIn0=

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":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,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;IAEpE,YACU,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC,EACvD;IAEE,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAOzF;IAED,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CASxC;IAED,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAEpC;YAEa,UAAU;CA8CzB;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,108 +0,0 @@
-import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, 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/curves/bn254';
-import { createLogger } from '@aztec/foundation/log';
-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, insertSideEffects } 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 `insertSideEffects` for you.
- *
- * @deprecated Use LightweightCheckpointBuilder instead. This only works for one block per checkpoint.
- */ export class LightweightBlockFactory {
-    db;
-    telemetry;
-    globalVariables;
-    l1ToL2Messages;
-    txs;
-    logger;
-    constructor(db, telemetry = getTelemetryClient()){
-        this.db = db;
-        this.telemetry = telemetry;
-        this.logger = createLogger('lightweight-block-factory');
-    }
-    async startNewBlock(globalVariables, l1ToL2Messages) {
-        this.logger.debug('Starting new block', {
-            globalVariables: globalVariables.toInspect(),
-            l1ToL2Messages
-        });
-        this.globalVariables = globalVariables;
-        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);
-    }
-    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 lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-        const state = await this.db.getStateReference();
-        const txs = this.txs ?? [];
-        const startSpongeBlob = SpongeBlob.init();
-        const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(txs, lastArchive, state, this.globalVariables, startSpongeBlob, true);
-        header.state.validate();
-        await this.db.updateArchive(header);
-        const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-        const outHash = computeBlockOutHash(txs.map((tx)=>tx.txEffect.l2ToL1Msgs));
-        const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
-        const numBlobFields = blockBlobFields.length + 1;
-        const blobFields = blockBlobFields.concat([
-            encodeCheckpointEndMarker({
-                numBlobFields
-            })
-        ]);
-        const blobsHash = computeBlobsHashFromBlobs(getBlobsPerL1Block(blobFields));
-        const blockHeaderHash = await header.hash();
-        const contentCommitment = new ContentCommitment(blobsHash, inHash, outHash);
-        const l2BlockHeader = L2BlockHeader.from({
-            ...header,
-            blockHeadersHash: blockHeaderHash,
-            contentCommitment
-        });
-        const block = new L2Block(newArchive, l2BlockHeader, 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, telemetry = getTelemetryClient()) {
-    const builder = new LightweightBlockFactory(db, telemetry);
-    await builder.startNewBlock(globalVariables, l1ToL2Messages);
-    for (const tx of txs){
-        await insertSideEffects(tx, db);
-    }
-    await builder.addTxs(txs);
-    return await builder.setBlockCompleted();
-}

package/dest/proving_broker/proof_store/gcs_proof_store.d.ts

@@ -1,14 +0,0 @@
-import { type ProofUri, type ProvingJobId, type ProvingJobInputs, type ProvingJobInputsMap, type ProvingJobResult, type ProvingJobResultsMap } from '@aztec/stdlib/interfaces/server';
-import { ProvingRequestType } from '@aztec/stdlib/proofs';
-import type { ProofStore } from './proof_store.js';
-export declare class GoogleCloudStorageProofStore implements ProofStore {
-    private readonly bucketName;
-    private readonly path;
-    private readonly storage;
-    constructor(bucketName: string, path: string);
-    saveProofInput<T extends ProvingRequestType>(id: ProvingJobId, type: T, inputs: ProvingJobInputsMap[T]): Promise<ProofUri>;
-    saveProofOutput<T extends ProvingRequestType>(_id: ProvingJobId, _type: T, _result: ProvingJobResultsMap[T]): Promise<ProofUri>;
-    getProofInput(uri: ProofUri): Promise<ProvingJobInputs>;
-    getProofOutput(_uri: ProofUri): Promise<ProvingJobResult>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2NzX3Byb29mX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvcHJvb2Zfc3RvcmUvZ2NzX3Byb29mX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLFFBQVEsRUFDYixLQUFLLFlBQVksRUFDakIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxtQkFBbUIsRUFDeEIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxvQkFBb0IsRUFFMUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUsxRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUtuRCxxQkFBYSw0QkFBNkIsWUFBVyxVQUFVO0lBSTNELE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVTtJQUMzQixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFKdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQVU7SUFFbEMsWUFDbUIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsSUFBSSxFQUFFLE1BQU0sRUFHOUI7SUFFWSxjQUFjLENBQUMsQ0FBQyxTQUFTLGtCQUFrQixFQUN0RCxFQUFFLEVBQUUsWUFBWSxFQUNoQixJQUFJLEVBQUUsQ0FBQyxFQUNQLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsR0FDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUtuQjtJQUVELGVBQWUsQ0FBQyxDQUFDLFNBQVMsa0JBQWtCLEVBQzFDLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLEtBQUssRUFBRSxDQUFDLEVBQ1IsT0FBTyxFQUFFLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxHQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLENBRW5CO0lBRVksYUFBYSxDQUFDLEdBQUcsRUFBRSxRQUFRLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBc0JuRTtJQUVELGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGIn0=

package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gcs_proof_store.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proof_store/gcs_proof_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAE1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKnD,qBAAa,4BAA6B,YAAW,UAAU;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,YACmB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EAG9B;IAEY,cAAc,CAAC,CAAC,SAAS,kBAAkB,EACtD,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAKnB;IAED,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1C,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC/B,OAAO,CAAC,QAAQ,CAAC,CAEnB;IAEY,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAsBnE;IAED,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF"}

package/dest/proving_broker/proof_store/gcs_proof_store.js

@@ -1,52 +0,0 @@
-import { getProvingJobInputClassFor } from '@aztec/stdlib/interfaces/server';
-import { ProvingRequestType } from '@aztec/stdlib/proofs';
-import { Storage } from '@google-cloud/storage';
-import { join } from 'path';
-const INPUTS_PATH = 'inputs';
-// REFACTOR(#13067): Use the stdlib/file-store instead of referencing google-cloud-storage directly.
-export class GoogleCloudStorageProofStore {
-    bucketName;
-    path;
-    storage;
-    constructor(bucketName, path){
-        this.bucketName = bucketName;
-        this.path = path;
-        this.storage = new Storage();
-    }
-    async saveProofInput(id, type, inputs) {
-        const path = join(this.path, INPUTS_PATH, ProvingRequestType[type], id);
-        const file = this.storage.bucket(this.bucketName).file(path);
-        await file.save(inputs.toBuffer());
-        return file.cloudStorageURI.toString();
-    }
-    saveProofOutput(_id, _type, _result) {
-        throw new Error('Not implemented');
-    }
-    async getProofInput(uri) {
-        try {
-            const url = new URL(uri);
-            const bucket = this.storage.bucket(url.host);
-            const path = url.pathname.replace(/^\/+/, '');
-            const file = bucket.file(path);
-            if (!await file.exists()) {
-                throw new Error(`File at ${uri} does not exist`);
-            }
-            const typeString = path.split('/').at(-2);
-            const type = typeString ? ProvingRequestType[typeString] : undefined;
-            if (type === undefined) {
-                throw new Error(`Unrecognized proof type ${type} in path ${path}`);
-            }
-            const contents = await file.download();
-            const inputs = getProvingJobInputClassFor(type).fromBuffer(contents[0]);
-            return {
-                inputs,
-                type
-            };
-        } catch (err) {
-            throw new Error(`Error getting proof input at ${uri}: ${err}`);
-        }
-    }
-    getProofOutput(_uri) {
-        throw new Error('Not implemented');
-    }
-}

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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudF9pbnN0cnVtZW50YXRpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm92aW5nX2FnZW50X2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRCxPQUFPLEVBQTJCLEtBQUssZUFBZSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFFbkcscUJBQWEsMkJBQTJCO0lBQ3RDLE9BQU8sQ0FBQyxRQUFRLENBQVk7SUFFNUIsWUFBWSxNQUFNLEVBQUUsZUFBZSxFQUFFLElBQUksU0FBaUIsRUFRekQ7SUFFRCxjQUFjLENBQUMsU0FBUyxFQUFFLEtBQUssR0FBRyxNQUFNLFFBR3ZDO0NBQ0YifQ==

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;IAE5B,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,SAAiB,EAQzD;IAED,cAAc,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,QAGvC;CACF"}

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,137 +0,0 @@
-import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, 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/curves/bn254';
-import { createLogger } from '@aztec/foundation/log';
-import { L2Block, L2BlockHeader } from '@aztec/stdlib/block';
-import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { computeBlockOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { ContentCommitment, type GlobalVariables, type ProcessedTx } from '@aztec/stdlib/tx';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
-
-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.
- *
- * 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 `insertSideEffects` for you.
- *
- * @deprecated Use LightweightCheckpointBuilder instead. This only works for one block per checkpoint.
- */
-export class LightweightBlockFactory implements IBlockFactory {
-  private globalVariables?: GlobalVariables;
-  private l1ToL2Messages?: Fr[];
-  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[]): Promise<void> {
-    this.logger.debug('Starting new block', { globalVariables: globalVariables.toInspect(), l1ToL2Messages });
-    this.globalVariables = globalVariables;
-    this.l1ToL2Messages = padArrayEnd<Fr, number>(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!);
-  }
-
-  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 lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-    const state = await this.db.getStateReference();
-
-    const txs = this.txs ?? [];
-    const startSpongeBlob = SpongeBlob.init();
-
-    const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(
-      txs,
-      lastArchive,
-      state,
-      this.globalVariables!,
-      startSpongeBlob,
-      true,
-    );
-
-    header.state.validate();
-
-    await this.db.updateArchive(header);
-    const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
-
-    const outHash = computeBlockOutHash(txs.map(tx => tx.txEffect.l2ToL1Msgs));
-    const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages!);
-    const numBlobFields = blockBlobFields.length + 1;
-    const blobFields = blockBlobFields.concat([encodeCheckpointEndMarker({ numBlobFields })]);
-    const blobsHash = computeBlobsHashFromBlobs(getBlobsPerL1Block(blobFields));
-    const blockHeaderHash = await header.hash();
-    const contentCommitment = new ContentCommitment(blobsHash, inHash, outHash);
-    const l2BlockHeader = L2BlockHeader.from({
-      ...header,
-      blockHeadersHash: blockHeaderHash,
-      contentCommitment,
-    });
-
-    const block = new L2Block(newArchive, l2BlockHeader, 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,
-  telemetry: TelemetryClient = getTelemetryClient(),
-) {
-  const builder = new LightweightBlockFactory(db, telemetry);
-  await builder.startNewBlock(globalVariables, l1ToL2Messages);
-
-  for (const tx of txs) {
-    await insertSideEffects(tx, db);
-  }
-  await builder.addTxs(txs);
-
-  return await builder.setBlockCompleted();
-}

package/src/proving_broker/proof_store/gcs_proof_store.ts

@@ -1,76 +0,0 @@
-import {
-  type ProofUri,
-  type ProvingJobId,
-  type ProvingJobInputs,
-  type ProvingJobInputsMap,
-  type ProvingJobResult,
-  type ProvingJobResultsMap,
-  getProvingJobInputClassFor,
-} from '@aztec/stdlib/interfaces/server';
-import { ProvingRequestType } from '@aztec/stdlib/proofs';
-
-import { Storage } from '@google-cloud/storage';
-import { join } from 'path';
-
-import type { ProofStore } from './proof_store.js';
-
-const INPUTS_PATH = 'inputs';
-
-// REFACTOR(#13067): Use the stdlib/file-store instead of referencing google-cloud-storage directly.
-export class GoogleCloudStorageProofStore implements ProofStore {
-  private readonly storage: Storage;
-
-  constructor(
-    private readonly bucketName: string,
-    private readonly path: string,
-  ) {
-    this.storage = new Storage();
-  }
-
-  public async saveProofInput<T extends ProvingRequestType>(
-    id: ProvingJobId,
-    type: T,
-    inputs: ProvingJobInputsMap[T],
-  ): Promise<ProofUri> {
-    const path = join(this.path, INPUTS_PATH, ProvingRequestType[type], id);
-    const file = this.storage.bucket(this.bucketName).file(path);
-    await file.save(inputs.toBuffer());
-    return file.cloudStorageURI.toString() as ProofUri;
-  }
-
-  saveProofOutput<T extends ProvingRequestType>(
-    _id: ProvingJobId,
-    _type: T,
-    _result: ProvingJobResultsMap[T],
-  ): Promise<ProofUri> {
-    throw new Error('Not implemented');
-  }
-
-  public async getProofInput(uri: ProofUri): Promise<ProvingJobInputs> {
-    try {
-      const url = new URL(uri);
-      const bucket = this.storage.bucket(url.host);
-      const path = url.pathname.replace(/^\/+/, '');
-      const file = bucket.file(path);
-      if (!(await file.exists())) {
-        throw new Error(`File at ${uri} does not exist`);
-      }
-
-      const typeString = path.split('/').at(-2);
-      const type = typeString ? ProvingRequestType[typeString as keyof typeof ProvingRequestType] : undefined;
-      if (type === undefined) {
-        throw new Error(`Unrecognized proof type ${type} in path ${path}`);
-      }
-
-      const contents = await file.download();
-      const inputs = getProvingJobInputClassFor(type).fromBuffer(contents[0]);
-      return { inputs, type } as ProvingJobInputs;
-    } catch (err) {
-      throw new Error(`Error getting proof input at ${uri}: ${err}`);
-    }
-  }
-
-  getProofOutput(_uri: ProofUri): Promise<ProvingJobResult> {
-    throw new Error('Not implemented');
-  }
-}