@aztec/prover-client 0.69.1 → 0.70.0

package/src/proving_broker/proving_job_controller.ts

@@ -42,13 +42,13 @@ export class ProvingJobController {
     }
 
     this.status = ProvingJobControllerStatus.PROVING;
+
     this.promise = this.generateProof()
       .then(
         result => {
           if (this.status === ProvingJobControllerStatus.ABORTED) {
             return;
           }
-
           this.status = ProvingJobControllerStatus.DONE;
           return this.onComplete(this.jobId, this.inputs.type, undefined, result);
         },
@@ -124,6 +124,10 @@ export class ProvingJobController {
         return await this.circuitProver.getBlockRootRollupProof(inputs, signal, this.epochNumber);
       }
 
+      case ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP: {
+        return await this.circuitProver.getSingleTxBlockRootRollupProof(inputs, signal, this.epochNumber);
+      }
+
       case ProvingRequestType.BLOCK_MERGE_ROLLUP: {
         return await this.circuitProver.getBlockMergeRollupProof(inputs, signal, this.epochNumber);
       }
@@ -140,10 +144,6 @@ export class ProvingJobController {
         return await this.circuitProver.getRootParityProof(inputs, signal, this.epochNumber);
       }
 
-      case ProvingRequestType.PRIVATE_KERNEL_EMPTY: {
-        return await this.circuitProver.getEmptyPrivateKernelProof(inputs, signal, this.epochNumber);
-      }
-
       case ProvingRequestType.TUBE_PROOF: {
         return await this.circuitProver.getTubeProof(inputs, signal, this.epochNumber);
       }

package/src/proving_broker/rpc.ts

@@ -6,7 +6,6 @@ import {
   type ProvingJobConsumer,
   ProvingJobId,
   type ProvingJobProducer,
-  ProvingJobSettledResult,
   ProvingJobStatus,
   ProvingRequestType,
 } from '@aztec/circuit-types';
@@ -26,10 +25,10 @@ const GetProvingJobResponse = z.object({
 });
 
 export const ProvingJobProducerSchema: ApiSchemaFor<ProvingJobProducer> = {
-  enqueueProvingJob: z.function().args(ProvingJob).returns(z.void()),
+  enqueueProvingJob: z.function().args(ProvingJob).returns(ProvingJobStatus),
   getProvingJobStatus: z.function().args(ProvingJobId).returns(ProvingJobStatus),
   cancelProvingJob: z.function().args(ProvingJobId).returns(z.void()),
-  waitForJobToSettle: z.function().args(ProvingJobId).returns(ProvingJobSettledResult),
+  getCompletedJobs: z.function().args(z.array(ProvingJobId)).returns(z.array(ProvingJobId)),
 };
 
 export const ProvingJobConsumerSchema: ApiSchemaFor<ProvingJobConsumer> = {

package/src/test/mock_prover.ts

@@ -3,7 +3,6 @@ import {
   type ProvingJob,
   type ProvingJobId,
   type ProvingJobProducer,
-  type ProvingJobSettledResult,
   type ProvingJobStatus,
   type PublicInputsAndRecursiveProof,
   type ServerCircuitProver,
@@ -17,8 +16,6 @@ import {
   type BaseParityInputs,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-  type PrivateKernelEmptyInputData,
-  type PrivateToRollupKernelCircuitPublicInputs,
   RECURSIVE_PROOF_LENGTH,
   type RootParityInputs,
   TUBE_PROOF_LENGTH,
@@ -37,12 +34,12 @@ import {
   type PublicBaseRollupInputs,
   type RootRollupInputs,
   type RootRollupPublicInputs,
+  type SingleTxBlockRootRollupInputs,
 } from '@aztec/circuits.js/rollup';
 import {
   makeBaseOrMergeRollupPublicInputs,
   makeBlockRootOrBlockMergeRollupPublicInputs,
   makeParityPublicInputs,
-  makePrivateToRollupKernelCircuitPublicInputs,
   makeRootRollupPublicInputs,
 } from '@aztec/circuits.js/testing';
 import { times } from '@aztec/foundation/collection';
@@ -83,7 +80,7 @@ export class TestBroker implements ProvingJobProducer {
     return this.proofStore;
   }
 
-  enqueueProvingJob(job: ProvingJob): Promise<void> {
+  enqueueProvingJob(job: ProvingJob): Promise<ProvingJobStatus> {
     return this.broker.enqueueProvingJob(job);
   }
   getProvingJobStatus(id: ProvingJobId): Promise<ProvingJobStatus> {
@@ -92,8 +89,9 @@ export class TestBroker implements ProvingJobProducer {
   cancelProvingJob(id: string): Promise<void> {
     return this.broker.cancelProvingJob(id);
   }
-  waitForJobToSettle(id: ProvingJobId): Promise<ProvingJobSettledResult> {
-    return this.broker.waitForJobToSettle(id);
+
+  getCompletedJobs(ids: ProvingJobId[]): Promise<ProvingJobId[]> {
+    return this.broker.getCompletedJobs(ids);
   }
 }
 
@@ -219,19 +217,16 @@ export class MockProver implements ServerCircuitProver {
     );
   }
 
-  getEmptyPrivateKernelProof(
-    _inputs: PrivateKernelEmptyInputData,
+  getSingleTxBlockRootRollupProof(
+    _input: SingleTxBlockRootRollupInputs,
     _signal?: AbortSignal,
     _epochNumber?: number,
   ): Promise<
-    PublicInputsAndRecursiveProof<
-      PrivateToRollupKernelCircuitPublicInputs,
-      typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-    >
+    PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
   > {
     return Promise.resolve(
       makePublicInputsAndRecursiveProof(
-        makePrivateToRollupKernelCircuitPublicInputs(),
+        makeBlockRootOrBlockMergeRollupPublicInputs(),
         makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
         VerificationKeyData.makeFakeHonk(),
       ),