Skip to content

Commit 1dd74af

Browse files
committed
fix: complete proving-broker and bb-prover wiring for msgs-only block root (A-1375)
1 parent e2643d5 commit 1dd74af

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

yarn-project/bb-prover/src/prover/server/bb_prover.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import {
1717
convertBlockRootEmptyTxFirstRollupPrivateInputsToWitnessMap,
1818
convertBlockRootFirstRollupOutputsFromWitnessMap,
1919
convertBlockRootFirstRollupPrivateInputsToWitnessMap,
20+
convertBlockRootMsgsOnlyRollupOutputsFromWitnessMap,
21+
convertBlockRootMsgsOnlyRollupPrivateInputsToWitnessMap,
2022
convertBlockRootRollupOutputsFromWitnessMap,
2123
convertBlockRootRollupPrivateInputsToWitnessMap,
2224
convertBlockRootSingleTxFirstRollupOutputsFromWitnessMap,
@@ -65,6 +67,7 @@ import {
6567
BlockRollupPublicInputs,
6668
BlockRootEmptyTxFirstRollupPrivateInputs,
6769
BlockRootFirstRollupPrivateInputs,
70+
BlockRootMsgsOnlyRollupPrivateInputs,
6871
BlockRootRollupPrivateInputs,
6972
BlockRootSingleTxFirstRollupPrivateInputs,
7073
BlockRootSingleTxRollupPrivateInputs,

yarn-project/prover-client/src/proving_broker/proving_broker.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Pr
5555
[ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP]: new PriorityMemoryQueue<EnqueuedProvingJob>(
5656
provingJobComparator,
5757
),
58+
[ProvingRequestType.BLOCK_ROOT_MSGS_ONLY_ROLLUP]: new PriorityMemoryQueue<EnqueuedProvingJob>(provingJobComparator),
5859
[ProvingRequestType.BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue<EnqueuedProvingJob>(provingJobComparator),
5960
[ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP]: new PriorityMemoryQueue<EnqueuedProvingJob>(provingJobComparator),
6061

@@ -744,6 +745,7 @@ export const PROOF_TYPES_IN_PRIORITY_ORDER: ProvingRequestType[] = [
744745
ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP,
745746
ProvingRequestType.BLOCK_ROOT_ROLLUP,
746747
ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP,
748+
ProvingRequestType.BLOCK_ROOT_MSGS_ONLY_ROLLUP,
747749
ProvingRequestType.BLOCK_MERGE_ROLLUP,
748750
ProvingRequestType.CHECKPOINT_ROOT_ROLLUP,
749751
ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP,

yarn-project/prover-client/src/proving_broker/proving_job_controller.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ export class ProvingJobController {
162162
return await this.circuitProver.getBlockRootEmptyTxFirstRollupProof(inputs, signal, this.epochNumber);
163163
}
164164

165+
case ProvingRequestType.BLOCK_ROOT_MSGS_ONLY_ROLLUP: {
166+
return await this.circuitProver.getBlockRootMsgsOnlyRollupProof(inputs, signal, this.epochNumber);
167+
}
168+
165169
case ProvingRequestType.BLOCK_ROOT_ROLLUP: {
166170
return await this.circuitProver.getBlockRootRollupProof(inputs, signal, this.epochNumber);
167171
}

0 commit comments

Comments
 (0)