@aztec/prover-client 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +16 -2
- package/dest/light/lightweight_checkpoint_builder.d.ts +10 -5
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
- package/dest/light/lightweight_checkpoint_builder.js +53 -22
- package/dest/mocks/test_context.d.ts +3 -1
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +18 -9
- package/dest/orchestrator/block-building-helpers.d.ts +4 -4
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +2 -2
- package/dest/orchestrator/block-proving-state.d.ts +4 -1
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +7 -0
- package/dest/orchestrator/checkpoint-proving-state.d.ts +10 -3
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/checkpoint-proving-state.js +13 -4
- package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts +107 -0
- package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts.map +1 -0
- package/dest/orchestrator/checkpoint-sub-tree-orchestrator.js +151 -0
- package/dest/orchestrator/epoch-proving-context.d.ts +51 -0
- package/dest/orchestrator/epoch-proving-context.d.ts.map +1 -0
- package/dest/orchestrator/epoch-proving-context.js +81 -0
- package/dest/orchestrator/epoch-proving-state.d.ts +3 -3
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +5 -3
- package/dest/orchestrator/index.d.ts +4 -1
- package/dest/orchestrator/index.d.ts.map +1 -1
- package/dest/orchestrator/index.js +3 -0
- package/dest/orchestrator/orchestrator.d.ts +16 -26
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +76 -206
- package/dest/orchestrator/proving-scheduler.d.ts +72 -0
- package/dest/orchestrator/proving-scheduler.d.ts.map +1 -0
- package/dest/orchestrator/proving-scheduler.js +117 -0
- package/dest/orchestrator/top-tree-orchestrator.d.ts +83 -0
- package/dest/orchestrator/top-tree-orchestrator.d.ts.map +1 -0
- package/dest/orchestrator/top-tree-orchestrator.js +182 -0
- package/dest/orchestrator/top-tree-proving-scheduler.d.ts +62 -0
- package/dest/orchestrator/top-tree-proving-scheduler.d.ts.map +1 -0
- package/dest/orchestrator/top-tree-proving-scheduler.js +73 -0
- package/dest/orchestrator/top-tree-proving-state.d.ts +61 -0
- package/dest/orchestrator/top-tree-proving-state.d.ts.map +1 -0
- package/dest/orchestrator/top-tree-proving-state.js +185 -0
- package/dest/prover-client/prover-client.d.ts +62 -3
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +50 -2
- package/dest/proving_broker/broker_prover_facade.d.ts +1 -1
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +13 -19
- package/dest/proving_broker/config.d.ts +9 -73
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +3 -3
- package/dest/proving_broker/index.d.ts +2 -1
- package/dest/proving_broker/index.d.ts.map +1 -1
- package/dest/proving_broker/index.js +1 -0
- package/dest/proving_broker/proving_broker.d.ts +2 -2
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +39 -10
- package/dest/proving_broker/proving_broker_database/persisted.js +2 -2
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +3 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.js +7 -0
- package/dest/proving_broker/rpc.d.ts +3 -1
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +80 -24
- package/dest/test/mock_prover.d.ts +4 -4
- package/package.json +18 -19
- package/src/config.ts +18 -2
- package/src/light/lightweight_checkpoint_builder.ts +56 -25
- package/src/mocks/test_context.ts +13 -10
- package/src/orchestrator/block-building-helpers.ts +2 -2
- package/src/orchestrator/block-proving-state.ts +9 -0
- package/src/orchestrator/checkpoint-proving-state.ts +18 -5
- package/src/orchestrator/checkpoint-sub-tree-orchestrator.ts +271 -0
- package/src/orchestrator/epoch-proving-context.ts +101 -0
- package/src/orchestrator/epoch-proving-state.ts +6 -4
- package/src/orchestrator/index.ts +8 -0
- package/src/orchestrator/orchestrator.ts +98 -268
- package/src/orchestrator/proving-scheduler.ts +156 -0
- package/src/orchestrator/top-tree-orchestrator.ts +314 -0
- package/src/orchestrator/top-tree-proving-scheduler.ts +154 -0
- package/src/orchestrator/top-tree-proving-state.ts +220 -0
- package/src/prover-client/prover-client.ts +127 -2
- package/src/proving_broker/broker_prover_facade.ts +17 -20
- package/src/proving_broker/config.ts +3 -2
- package/src/proving_broker/index.ts +1 -0
- package/src/proving_broker/proving_broker.ts +34 -7
- package/src/proving_broker/proving_broker_database/persisted.ts +2 -2
- package/src/proving_broker/proving_broker_instrumentation.ts +9 -0
- package/src/proving_broker/rpc.ts +36 -24
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import type { BatchedBlob, BatchedBlobAccumulator, FinalBlobBatchingChallenges } from '@aztec/blob-lib';
|
|
2
|
+
import type { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
|
|
3
|
+
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
4
|
+
import { type TreeNodeLocation } from '@aztec/foundation/trees';
|
|
5
|
+
import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
|
|
6
|
+
import type { Proof } from '@aztec/stdlib/proofs';
|
|
7
|
+
import { CheckpointMergeRollupPrivateInputs, CheckpointPaddingRollupPrivateInputs, CheckpointRollupPublicInputs, RootRollupPrivateInputs, type RootRollupPublicInputs } from '@aztec/stdlib/rollup';
|
|
8
|
+
/**
|
|
9
|
+
* Lean top-tree-only state. Owns the merge tree of checkpoint root proofs, the
|
|
10
|
+
* single-checkpoint padding proof slot, the final root rollup proof, and the blob
|
|
11
|
+
* accumulator endpoints needed to finalise the epoch's batched blob proof.
|
|
12
|
+
*
|
|
13
|
+
* Constructed with `totalNumCheckpoints` and `finalBlobBatchingChallenges` upfront —
|
|
14
|
+
* by the time the top tree starts, all checkpoints are known and the challenges are
|
|
15
|
+
* derivable from their blob fields.
|
|
16
|
+
*/
|
|
17
|
+
export declare class TopTreeProvingState {
|
|
18
|
+
#private;
|
|
19
|
+
readonly epochNumber: EpochNumber;
|
|
20
|
+
readonly totalNumCheckpoints: number;
|
|
21
|
+
readonly finalBlobBatchingChallenges: FinalBlobBatchingChallenges;
|
|
22
|
+
readonly startBlobAccumulator: BatchedBlobAccumulator;
|
|
23
|
+
private readonly completionCallback;
|
|
24
|
+
private readonly rejectionCallback;
|
|
25
|
+
private checkpointProofs;
|
|
26
|
+
private checkpointPaddingProof;
|
|
27
|
+
private rootRollupProof;
|
|
28
|
+
private endBlobAccumulator;
|
|
29
|
+
private finalBatchedBlob;
|
|
30
|
+
private lifecycle;
|
|
31
|
+
constructor(epochNumber: EpochNumber, totalNumCheckpoints: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges, startBlobAccumulator: BatchedBlobAccumulator, completionCallback: () => void, rejectionCallback: (reason: string) => void);
|
|
32
|
+
setCheckpointRootRollupProof(checkpointIndex: number, provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
|
|
33
|
+
tryStartProvingCheckpointMerge(location: TreeNodeLocation): boolean;
|
|
34
|
+
setCheckpointMergeRollupProof(location: TreeNodeLocation, provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
35
|
+
isReadyForCheckpointMerge(location: TreeNodeLocation): boolean;
|
|
36
|
+
getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
|
|
37
|
+
getCheckpointMergeRollupInputs(mergeLocation: TreeNodeLocation): CheckpointMergeRollupPrivateInputs;
|
|
38
|
+
tryStartProvingPaddingCheckpoint(): boolean;
|
|
39
|
+
setCheckpointPaddingProof(provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
40
|
+
getPaddingCheckpointInputs(): CheckpointPaddingRollupPrivateInputs;
|
|
41
|
+
tryStartProvingRootRollup(): boolean;
|
|
42
|
+
setRootRollupProof(provingOutput: PublicInputsAndRecursiveProof<RootRollupPublicInputs>): void;
|
|
43
|
+
isReadyForRootRollup(): boolean;
|
|
44
|
+
getRootRollupInputs(): RootRollupPrivateInputs;
|
|
45
|
+
/**
|
|
46
|
+
* Sets the end-of-epoch blob accumulator, computed by the top-tree orchestrator
|
|
47
|
+
* from the surviving checkpoints' blob fields. Required before `finalizeBatchedBlob`.
|
|
48
|
+
*/
|
|
49
|
+
setEndBlobAccumulator(accumulator: BatchedBlobAccumulator): void;
|
|
50
|
+
finalizeBatchedBlob(): Promise<void>;
|
|
51
|
+
getEpochProofResult(): {
|
|
52
|
+
proof: Proof;
|
|
53
|
+
publicInputs: RootRollupPublicInputs;
|
|
54
|
+
batchedBlobInputs: BatchedBlob;
|
|
55
|
+
};
|
|
56
|
+
verifyState(): boolean;
|
|
57
|
+
resolve(): void;
|
|
58
|
+
reject(reason: string): void;
|
|
59
|
+
cancel(): void;
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9wLXRyZWUtcHJvdmluZy1zdGF0ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yY2hlc3RyYXRvci90b3AtdHJlZS1wcm92aW5nLXN0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxzQkFBc0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFpQyx5Q0FBeUMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2pILE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBdUIsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxrQ0FBa0MsRUFDbEMsb0NBQW9DLEVBQ3BDLDRCQUE0QixFQUM1Qix1QkFBdUIsRUFDdkIsS0FBSyxzQkFBc0IsRUFDNUIsTUFBTSxzQkFBc0IsQ0FBQztBQVc5Qjs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLG1CQUFtQjs7YUFhWixXQUFXLEVBQUUsV0FBVzthQUN4QixtQkFBbUIsRUFBRSxNQUFNO2FBQzNCLDJCQUEyQixFQUFFLDJCQUEyQjthQUN4RCxvQkFBb0IsRUFBRSxzQkFBc0I7SUFDNUQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0I7SUFDbkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFqQnBDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FFdEI7SUFDRixPQUFPLENBQUMsc0JBQXNCLENBRWhCO0lBQ2QsT0FBTyxDQUFDLGVBQWUsQ0FBdUY7SUFDOUcsT0FBTyxDQUFDLGtCQUFrQixDQUFxQztJQUMvRCxPQUFPLENBQUMsZ0JBQWdCLENBQTBCO0lBQ2xELE9BQU8sQ0FBQyxTQUFTLENBQThCO0lBRS9DLFlBQ2tCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLG1CQUFtQixFQUFFLE1BQU0sRUFDM0IsMkJBQTJCLEVBQUUsMkJBQTJCLEVBQ3hELG9CQUFvQixFQUFFLHNCQUFzQixFQUMzQyxrQkFBa0IsRUFBRSxNQUFNLElBQUksRUFDOUIsaUJBQWlCLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxLQUFLLElBQUksRUFNN0Q7SUFJTSw0QkFBNEIsQ0FDakMsZUFBZSxFQUFFLE1BQU0sRUFDdkIsYUFBYSxFQUFFLDZCQUE2QixDQUMxQyw0QkFBNEIsRUFDNUIsT0FBTyx5Q0FBeUMsQ0FDakQsR0FDQSxnQkFBZ0IsQ0FFbEI7SUFJTSw4QkFBOEIsQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLFdBTS9EO0lBRU0sNkJBQTZCLENBQ2xDLFFBQVEsRUFBRSxnQkFBZ0IsRUFDMUIsYUFBYSxFQUFFLDZCQUE2QixDQUMxQyw0QkFBNEIsRUFDNUIsT0FBTyx5Q0FBeUMsQ0FDakQsUUFHRjtJQUVNLHlCQUF5QixDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsV0FFMUQ7SUFFTSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLG9CQUVsRDtJQUVNLDhCQUE4QixDQUFDLGFBQWEsRUFBRSxnQkFBZ0Isc0NBTXBFO0lBSU0sZ0NBQWdDLFlBTXRDO0lBRU0seUJBQXlCLENBQzlCLGFBQWEsRUFBRSw2QkFBNkIsQ0FDMUMsNEJBQTRCLEVBQzVCLE9BQU8seUNBQXlDLENBQ2pELFFBR0Y7SUFFTSwwQkFBMEIseUNBRWhDO0lBSU0seUJBQXlCLFlBTS9CO0lBRU0sa0JBQWtCLENBQUMsYUFBYSxFQUFFLDZCQUE2QixDQUFDLHNCQUFzQixDQUFDLFFBRTdGO0lBRU0sb0JBQW9CLFlBRzFCO0lBRU0sbUJBQW1CLDRCQVF6QjtJQUlEOzs7T0FHRztJQUNJLHFCQUFxQixDQUFDLFdBQVcsRUFBRSxzQkFBc0IsUUFFL0Q7SUFFWSxtQkFBbUIsa0JBSy9CO0lBRU0sbUJBQW1CLElBQUk7UUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDO1FBQUMsWUFBWSxFQUFFLHNCQUFzQixDQUFDO1FBQUMsaUJBQWlCLEVBQUUsV0FBVyxDQUFBO0tBQUUsQ0FVbkg7SUFJTSxXQUFXLFlBRWpCO0lBRU0sT0FBTyxTQU1iO0lBRU0sTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLFFBTTNCO0lBRU0sTUFBTSxTQUVaO0NBUUYifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"top-tree-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/top-tree-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACxG,OAAO,KAAK,EAAiC,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AACjH,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,KAAK,gBAAgB,EAAuB,MAAM,yBAAyB,CAAC;AACrF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,kCAAkC,EAClC,oCAAoC,EACpC,4BAA4B,EAC5B,uBAAuB,EACvB,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAW9B;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;;aAaZ,WAAW,EAAE,WAAW;aACxB,mBAAmB,EAAE,MAAM;aAC3B,2BAA2B,EAAE,2BAA2B;aACxD,oBAAoB,EAAE,sBAAsB;IAC5D,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAjBpC,OAAO,CAAC,gBAAgB,CAEtB;IACF,OAAO,CAAC,sBAAsB,CAEhB;IACd,OAAO,CAAC,eAAe,CAAuF;IAC9G,OAAO,CAAC,kBAAkB,CAAqC;IAC/D,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,SAAS,CAA8B;IAE/C,YACkB,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,MAAM,EAC3B,2BAA2B,EAAE,2BAA2B,EACxD,oBAAoB,EAAE,sBAAsB,EAC3C,kBAAkB,EAAE,MAAM,IAAI,EAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EAM7D;IAIM,4BAA4B,CACjC,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,6BAA6B,CAC1C,4BAA4B,EAC5B,OAAO,yCAAyC,CACjD,GACA,gBAAgB,CAElB;IAIM,8BAA8B,CAAC,QAAQ,EAAE,gBAAgB,WAM/D;IAEM,6BAA6B,CAClC,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EAAE,6BAA6B,CAC1C,4BAA4B,EAC5B,OAAO,yCAAyC,CACjD,QAGF;IAEM,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,WAE1D;IAEM,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,oBAElD;IAEM,8BAA8B,CAAC,aAAa,EAAE,gBAAgB,sCAMpE;IAIM,gCAAgC,YAMtC;IAEM,yBAAyB,CAC9B,aAAa,EAAE,6BAA6B,CAC1C,4BAA4B,EAC5B,OAAO,yCAAyC,CACjD,QAGF;IAEM,0BAA0B,yCAEhC;IAIM,yBAAyB,YAM/B;IAEM,kBAAkB,CAAC,aAAa,EAAE,6BAA6B,CAAC,sBAAsB,CAAC,QAE7F;IAEM,oBAAoB,YAG1B;IAEM,mBAAmB,4BAQzB;IAID;;;OAGG;IACI,qBAAqB,CAAC,WAAW,EAAE,sBAAsB,QAE/D;IAEY,mBAAmB,kBAK/B;IAEM,mBAAmB,IAAI;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,YAAY,EAAE,sBAAsB,CAAC;QAAC,iBAAiB,EAAE,WAAW,CAAA;KAAE,CAUnH;IAIM,WAAW,YAEjB;IAEM,OAAO,SAMb;IAEM,MAAM,CAAC,MAAM,EAAE,MAAM,QAM3B;IAEM,MAAM,SAEZ;CAQF"}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { UnbalancedTreeStore } from '@aztec/foundation/trees';
|
|
2
|
+
import { CheckpointMergeRollupPrivateInputs, CheckpointPaddingRollupPrivateInputs, RootRollupPrivateInputs } from '@aztec/stdlib/rollup';
|
|
3
|
+
import { toProofData } from './block-building-helpers.js';
|
|
4
|
+
var TOP_TREE_LIFECYCLE = /*#__PURE__*/ function(TOP_TREE_LIFECYCLE) {
|
|
5
|
+
TOP_TREE_LIFECYCLE[TOP_TREE_LIFECYCLE["CREATED"] = 0] = "CREATED";
|
|
6
|
+
TOP_TREE_LIFECYCLE[TOP_TREE_LIFECYCLE["RESOLVED"] = 1] = "RESOLVED";
|
|
7
|
+
TOP_TREE_LIFECYCLE[TOP_TREE_LIFECYCLE["REJECTED"] = 2] = "REJECTED";
|
|
8
|
+
return TOP_TREE_LIFECYCLE;
|
|
9
|
+
}(TOP_TREE_LIFECYCLE || {});
|
|
10
|
+
/**
|
|
11
|
+
* Lean top-tree-only state. Owns the merge tree of checkpoint root proofs, the
|
|
12
|
+
* single-checkpoint padding proof slot, the final root rollup proof, and the blob
|
|
13
|
+
* accumulator endpoints needed to finalise the epoch's batched blob proof.
|
|
14
|
+
*
|
|
15
|
+
* Constructed with `totalNumCheckpoints` and `finalBlobBatchingChallenges` upfront —
|
|
16
|
+
* by the time the top tree starts, all checkpoints are known and the challenges are
|
|
17
|
+
* derivable from their blob fields.
|
|
18
|
+
*/ export class TopTreeProvingState {
|
|
19
|
+
epochNumber;
|
|
20
|
+
totalNumCheckpoints;
|
|
21
|
+
finalBlobBatchingChallenges;
|
|
22
|
+
startBlobAccumulator;
|
|
23
|
+
completionCallback;
|
|
24
|
+
rejectionCallback;
|
|
25
|
+
checkpointProofs;
|
|
26
|
+
checkpointPaddingProof;
|
|
27
|
+
rootRollupProof;
|
|
28
|
+
endBlobAccumulator;
|
|
29
|
+
finalBatchedBlob;
|
|
30
|
+
lifecycle;
|
|
31
|
+
constructor(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges, startBlobAccumulator, completionCallback, rejectionCallback){
|
|
32
|
+
this.epochNumber = epochNumber;
|
|
33
|
+
this.totalNumCheckpoints = totalNumCheckpoints;
|
|
34
|
+
this.finalBlobBatchingChallenges = finalBlobBatchingChallenges;
|
|
35
|
+
this.startBlobAccumulator = startBlobAccumulator;
|
|
36
|
+
this.completionCallback = completionCallback;
|
|
37
|
+
this.rejectionCallback = rejectionCallback;
|
|
38
|
+
this.lifecycle = 0;
|
|
39
|
+
if (totalNumCheckpoints < 1) {
|
|
40
|
+
throw new Error(`TopTreeProvingState requires at least one checkpoint; got ${totalNumCheckpoints}.`);
|
|
41
|
+
}
|
|
42
|
+
this.checkpointProofs = new UnbalancedTreeStore(totalNumCheckpoints);
|
|
43
|
+
}
|
|
44
|
+
// --- checkpoint root rollup ---
|
|
45
|
+
setCheckpointRootRollupProof(checkpointIndex, provingOutput) {
|
|
46
|
+
return this.checkpointProofs.setLeaf(checkpointIndex, {
|
|
47
|
+
provingOutput
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
// --- checkpoint merge rollup ---
|
|
51
|
+
tryStartProvingCheckpointMerge(location) {
|
|
52
|
+
if (this.checkpointProofs.getNode(location)?.isProving) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
this.checkpointProofs.setNode(location, {
|
|
56
|
+
isProving: true
|
|
57
|
+
});
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
setCheckpointMergeRollupProof(location, provingOutput) {
|
|
61
|
+
this.checkpointProofs.setNode(location, {
|
|
62
|
+
provingOutput
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
isReadyForCheckpointMerge(location) {
|
|
66
|
+
return !!this.checkpointProofs.getSibling(location)?.provingOutput;
|
|
67
|
+
}
|
|
68
|
+
getParentLocation(location) {
|
|
69
|
+
return this.checkpointProofs.getParentLocation(location);
|
|
70
|
+
}
|
|
71
|
+
getCheckpointMergeRollupInputs(mergeLocation) {
|
|
72
|
+
const [left, right] = this.checkpointProofs.getChildren(mergeLocation).map((c)=>c?.provingOutput);
|
|
73
|
+
if (!left || !right) {
|
|
74
|
+
throw new Error('At least one child is not ready for the checkpoint merge rollup.');
|
|
75
|
+
}
|
|
76
|
+
return new CheckpointMergeRollupPrivateInputs([
|
|
77
|
+
toProofData(left),
|
|
78
|
+
toProofData(right)
|
|
79
|
+
]);
|
|
80
|
+
}
|
|
81
|
+
// --- padding (single-checkpoint case) ---
|
|
82
|
+
tryStartProvingPaddingCheckpoint() {
|
|
83
|
+
if (this.checkpointPaddingProof?.isProving) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
this.checkpointPaddingProof = {
|
|
87
|
+
isProving: true
|
|
88
|
+
};
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
91
|
+
setCheckpointPaddingProof(provingOutput) {
|
|
92
|
+
this.checkpointPaddingProof = {
|
|
93
|
+
provingOutput
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
getPaddingCheckpointInputs() {
|
|
97
|
+
return new CheckpointPaddingRollupPrivateInputs();
|
|
98
|
+
}
|
|
99
|
+
// --- root rollup ---
|
|
100
|
+
tryStartProvingRootRollup() {
|
|
101
|
+
if (this.rootRollupProof?.isProving) {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
this.rootRollupProof = {
|
|
105
|
+
isProving: true
|
|
106
|
+
};
|
|
107
|
+
return true;
|
|
108
|
+
}
|
|
109
|
+
setRootRollupProof(provingOutput) {
|
|
110
|
+
this.rootRollupProof = {
|
|
111
|
+
provingOutput
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
isReadyForRootRollup() {
|
|
115
|
+
const childProofs = this.#getChildProofsForRoot();
|
|
116
|
+
return childProofs.every((p)=>!!p);
|
|
117
|
+
}
|
|
118
|
+
getRootRollupInputs() {
|
|
119
|
+
const [left, right] = this.#getChildProofsForRoot();
|
|
120
|
+
if (!left || !right) {
|
|
121
|
+
throw new Error('At least one child is not ready for the root rollup.');
|
|
122
|
+
}
|
|
123
|
+
return RootRollupPrivateInputs.from({
|
|
124
|
+
previousRollups: [
|
|
125
|
+
toProofData(left),
|
|
126
|
+
toProofData(right)
|
|
127
|
+
]
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
// --- blob accumulator finalisation ---
|
|
131
|
+
/**
|
|
132
|
+
* Sets the end-of-epoch blob accumulator, computed by the top-tree orchestrator
|
|
133
|
+
* from the surviving checkpoints' blob fields. Required before `finalizeBatchedBlob`.
|
|
134
|
+
*/ setEndBlobAccumulator(accumulator) {
|
|
135
|
+
this.endBlobAccumulator = accumulator;
|
|
136
|
+
}
|
|
137
|
+
async finalizeBatchedBlob() {
|
|
138
|
+
if (!this.endBlobAccumulator) {
|
|
139
|
+
throw new Error('End blob accumulator not set; call setEndBlobAccumulator before finalize.');
|
|
140
|
+
}
|
|
141
|
+
this.finalBatchedBlob = await this.endBlobAccumulator.finalize(true);
|
|
142
|
+
}
|
|
143
|
+
getEpochProofResult() {
|
|
144
|
+
const provingOutput = this.rootRollupProof?.provingOutput;
|
|
145
|
+
if (!provingOutput || !this.finalBatchedBlob) {
|
|
146
|
+
throw new Error('Top-tree proof not ready; root rollup or batched blob missing.');
|
|
147
|
+
}
|
|
148
|
+
return {
|
|
149
|
+
proof: provingOutput.proof.binaryProof,
|
|
150
|
+
publicInputs: provingOutput.inputs,
|
|
151
|
+
batchedBlobInputs: this.finalBatchedBlob
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
// --- lifecycle ---
|
|
155
|
+
verifyState() {
|
|
156
|
+
return this.lifecycle === 0;
|
|
157
|
+
}
|
|
158
|
+
resolve() {
|
|
159
|
+
if (!this.verifyState()) {
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
this.lifecycle = 1;
|
|
163
|
+
this.completionCallback();
|
|
164
|
+
}
|
|
165
|
+
reject(reason) {
|
|
166
|
+
if (!this.verifyState()) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
this.lifecycle = 2;
|
|
170
|
+
this.rejectionCallback(reason);
|
|
171
|
+
}
|
|
172
|
+
cancel() {
|
|
173
|
+
this.reject('Top-tree proving cancelled');
|
|
174
|
+
}
|
|
175
|
+
#getChildProofsForRoot() {
|
|
176
|
+
const rootLocation = {
|
|
177
|
+
level: 0,
|
|
178
|
+
index: 0
|
|
179
|
+
};
|
|
180
|
+
return this.totalNumCheckpoints === 1 ? [
|
|
181
|
+
this.checkpointProofs.getNode(rootLocation)?.provingOutput,
|
|
182
|
+
this.checkpointPaddingProof?.provingOutput
|
|
183
|
+
] : this.checkpointProofs.getChildren(rootLocation).map((c)=>c?.provingOutput);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
@@ -1,10 +1,44 @@
|
|
|
1
1
|
import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover';
|
|
2
|
+
import type { EpochNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
4
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
5
|
import { type ActualProverConfig, type EpochProver, type EpochProverManager, type ForkMerkleTreeOperations, type ProvingJobBroker, type ProvingJobConsumer, type ReadonlyWorldStateAccess, type ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
|
|
6
|
+
import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
7
|
+
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
4
8
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
5
9
|
import type { ProverClientConfig } from '../config.js';
|
|
10
|
+
import { CheckpointSubTreeOrchestrator } from '../orchestrator/checkpoint-sub-tree-orchestrator.js';
|
|
11
|
+
import { EpochProvingContext } from '../orchestrator/epoch-proving-context.js';
|
|
12
|
+
import { TopTreeOrchestrator } from '../orchestrator/top-tree-orchestrator.js';
|
|
13
|
+
/**
|
|
14
|
+
* The factory surface that `EpochProvingJob` (in `prover-node`) depends on. Implemented
|
|
15
|
+
* by `ProverClient`. Defined here rather than in stdlib because the return types
|
|
16
|
+
* (`CheckpointSubTreeOrchestrator`, `TopTreeOrchestrator`) are concrete classes from
|
|
17
|
+
* this package.
|
|
18
|
+
*
|
|
19
|
+
* A single `BrokerCircuitProverFacade` is owned by `ProverClient` and shared across
|
|
20
|
+
* every orchestrator (every sub-tree and every top-tree across every concurrent epoch
|
|
21
|
+
* job). The broker delivers each completed-job notification exactly once (drained on
|
|
22
|
+
* the first `getCompletedJobs` poll), so multiple facades polling the same broker
|
|
23
|
+
* race and lose notifications
|
|
24
|
+
*
|
|
25
|
+
* The facade's job map cleans up entries on resolve/reject, and the prover-node
|
|
26
|
+
* keeps `ProverClient` alive for its whole lifetime
|
|
27
|
+
*/
|
|
28
|
+
export interface EpochProverFactory {
|
|
29
|
+
getProverId(): EthAddress;
|
|
30
|
+
/**
|
|
31
|
+
* Constructs a per-epoch shared context for the caching of e.g. chonk verifier results
|
|
32
|
+
*/
|
|
33
|
+
createEpochProvingContext(epochNumber: EpochNumber): EpochProvingContext;
|
|
34
|
+
/**
|
|
35
|
+
* Constructs and starts a `CheckpointSubTreeOrchestrator` for a single checkpoint.
|
|
36
|
+
*/
|
|
37
|
+
createCheckpointSubTreeOrchestrator(epochContext: EpochProvingContext, checkpointConstants: CheckpointConstantData, l1ToL2Messages: Fr[], totalNumBlocks: number, headerOfLastBlockInPreviousCheckpoint: BlockHeader): Promise<CheckpointSubTreeOrchestrator>;
|
|
38
|
+
createTopTreeOrchestrator(): TopTreeOrchestrator;
|
|
39
|
+
}
|
|
6
40
|
/** Manages proving of epochs by orchestrating the proving of individual blocks relying on a pool of prover agents. */
|
|
7
|
-
export declare class ProverClient implements EpochProverManager {
|
|
41
|
+
export declare class ProverClient implements EpochProverManager, EpochProverFactory {
|
|
8
42
|
private config;
|
|
9
43
|
private worldState;
|
|
10
44
|
private orchestratorClient;
|
|
@@ -15,8 +49,33 @@ export declare class ProverClient implements EpochProverManager {
|
|
|
15
49
|
private log;
|
|
16
50
|
private running;
|
|
17
51
|
private agents;
|
|
52
|
+
/**
|
|
53
|
+
* The single broker facade shared by every orchestrator created from this client.
|
|
54
|
+
* Constructed lazily on `start()` and torn down on `stop()` — see the comment on
|
|
55
|
+
* `EpochProverFactory` for why a single shared facade is required.
|
|
56
|
+
*/
|
|
57
|
+
private facade;
|
|
18
58
|
private constructor();
|
|
59
|
+
/**
|
|
60
|
+
* Lazy-init the shared facade. The broker delivers each completed-job notification
|
|
61
|
+
* exactly once (drained on the first `getCompletedJobs` poll), so we cannot start
|
|
62
|
+
* a shared facade alongside the per-call facades that `createEpochProver` builds —
|
|
63
|
+
* they would race for notifications and one side would silently drop them. Starting
|
|
64
|
+
* the shared facade only on first use of one of the new factory methods keeps the
|
|
65
|
+
* legacy `createEpochProver` path race-free.
|
|
66
|
+
*/
|
|
67
|
+
private getFacade;
|
|
68
|
+
/**
|
|
69
|
+
* Legacy single-class epoch prover. Each call constructs its own
|
|
70
|
+
* `BrokerCircuitProverFacade`; the new factory methods (`createCheckpointSubTreeOrchestrator`,
|
|
71
|
+
* `createTopTreeOrchestrator`, `createEpochProvingContext`) share a single facade
|
|
72
|
+
* owned by `ProverClient`. Both APIs coexist while the prover-node migrates onto
|
|
73
|
+
* the new pair.
|
|
74
|
+
*/
|
|
19
75
|
createEpochProver(): EpochProver;
|
|
76
|
+
createEpochProvingContext(epochNumber: EpochNumber): EpochProvingContext;
|
|
77
|
+
createCheckpointSubTreeOrchestrator(epochContext: EpochProvingContext, checkpointConstants: CheckpointConstantData, l1ToL2Messages: Fr[], totalNumBlocks: number, headerOfLastBlockInPreviousCheckpoint: BlockHeader): Promise<CheckpointSubTreeOrchestrator>;
|
|
78
|
+
createTopTreeOrchestrator(): TopTreeOrchestrator;
|
|
20
79
|
getProverId(): EthAddress;
|
|
21
80
|
updateProverConfig(config: Partial<ProverClientConfig>): Promise<void>;
|
|
22
81
|
/**
|
|
@@ -38,5 +97,5 @@ export declare class ProverClient implements EpochProverManager {
|
|
|
38
97
|
private createAndStartAgents;
|
|
39
98
|
private stopAgents;
|
|
40
99
|
}
|
|
41
|
-
export declare function buildServerCircuitProver(config: ActualProverConfig & ACVMConfig & BBConfig, telemetry: TelemetryClient): Promise<ServerCircuitProver>;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
export declare function buildServerCircuitProver(config: Omit<ActualProverConfig, 'enqueueConcurrency'> & ACVMConfig & BBConfig, telemetry: TelemetryClient): Promise<ServerCircuitProver>;
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1jbGllbnQvcHJvdmVyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQUUsS0FBSyxRQUFRLEVBQTJDLE1BQU0sa0JBQWtCLENBQUM7QUFDM0csT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHaEUsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssV0FBVyxFQUNoQixLQUFLLGtCQUFrQixFQUN2QixLQUFLLHdCQUF3QixFQUM3QixLQUFLLGdCQUFnQixFQUNyQixLQUFLLGtCQUFrQixFQUV2QixLQUFLLHdCQUF3QixFQUM3QixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3ZELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQ3BHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRS9FLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBTS9FOzs7Ozs7Ozs7Ozs7OztHQWNHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQyxXQUFXLElBQUksVUFBVSxDQUFDO0lBQzFCOztPQUVHO0lBQ0gseUJBQXlCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxtQkFBbUIsQ0FBQztJQUN6RTs7T0FFRztJQUNILG1DQUFtQyxDQUNqQyxZQUFZLEVBQUUsbUJBQW1CLEVBQ2pDLG1CQUFtQixFQUFFLHNCQUFzQixFQUMzQyxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQ3BCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLHFDQUFxQyxFQUFFLFdBQVcsR0FDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQUM7SUFDMUMseUJBQXlCLElBQUksbUJBQW1CLENBQUM7Q0FDbEQ7QUFFRCxzSEFBc0g7QUFDdEgscUJBQWEsWUFBYSxZQUFXLGtCQUFrQixFQUFFLGtCQUFrQjtJQVd2RSxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxrQkFBa0I7SUFDMUIsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsV0FBVyxDQUFDO0lBQ3BCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxHQUFHO0lBakJiLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLE1BQU0sQ0FBc0I7SUFDcEM7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxNQUFNLENBQXdDO0lBRXRELE9BQU8sZUFTSDtJQUVKOzs7Ozs7O09BT0c7SUFDSCxPQUFPLENBQUMsU0FBUztJQWlCakI7Ozs7OztPQU1HO0lBQ0ksaUJBQWlCLElBQUksV0FBVyxDQW1CdEM7SUFFTSx5QkFBeUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLG1CQUFtQixDQUU5RTtJQUVNLG1DQUFtQyxDQUN4QyxZQUFZLEVBQUUsbUJBQW1CLEVBQ2pDLG1CQUFtQixFQUFFLHNCQUFzQixFQUMzQyxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQ3BCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLHFDQUFxQyxFQUFFLFdBQVcsR0FDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBZXhDO0lBRU0seUJBQXlCLElBQUksbUJBQW1CLENBUXREO0lBRU0sV0FBVyxJQUFJLFVBQVUsQ0FFL0I7SUFFSyxrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVkzRTtJQUVEOztPQUVHO0lBQ1UsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPbEM7SUFFRDs7T0FFRztJQUNVLElBQUksa0JBZWhCO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFvQixHQUFHLENBQ3JCLE1BQU0sRUFBRSxrQkFBa0IsRUFDMUIsVUFBVSxFQUFFLHdCQUF3QixHQUFHLHdCQUF3QixFQUMvRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLFNBQVMsR0FBRSxlQUFzQyx5QkFPbEQ7SUFFTSxtQkFBbUIsSUFBSSxrQkFBa0IsQ0FNL0M7WUFFYSxvQkFBb0I7WUFxQnBCLFVBQVU7Q0FHekI7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQ3RDLE1BQU0sRUFBRSxJQUFJLENBQUMsa0JBQWtCLEVBQUUsb0JBQW9CLENBQUMsR0FBRyxVQUFVLEdBQUcsUUFBUSxFQUM5RSxTQUFTLEVBQUUsZUFBZSxHQUN6QixPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FXOUIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-client.d.ts","sourceRoot":"","sources":["../../src/prover-client/prover-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA2C,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"prover-client.d.ts","sourceRoot":"","sources":["../../src/prover-client/prover-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,10 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { NativeACVMSimulator } from '@aztec/simulator/server';
|
|
5
5
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
6
6
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
7
|
+
import { CheckpointSubTreeOrchestrator } from '../orchestrator/checkpoint-sub-tree-orchestrator.js';
|
|
8
|
+
import { EpochProvingContext } from '../orchestrator/epoch-proving-context.js';
|
|
7
9
|
import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
|
|
10
|
+
import { TopTreeOrchestrator } from '../orchestrator/top-tree-orchestrator.js';
|
|
8
11
|
import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
|
|
9
12
|
import { InlineProofStore, createProofStore } from '../proving_broker/proof_store/index.js';
|
|
10
13
|
import { ProvingAgent } from '../proving_broker/proving_agent.js';
|
|
@@ -20,6 +23,11 @@ import { ServerEpochProver } from './server-epoch-prover.js';
|
|
|
20
23
|
log;
|
|
21
24
|
running;
|
|
22
25
|
agents;
|
|
26
|
+
/**
|
|
27
|
+
* The single broker facade shared by every orchestrator created from this client.
|
|
28
|
+
* Constructed lazily on `start()` and torn down on `stop()` — see the comment on
|
|
29
|
+
* `EpochProverFactory` for why a single shared facade is required.
|
|
30
|
+
*/ facade;
|
|
23
31
|
constructor(config, worldState, orchestratorClient, proofStore, failedProofStore, agentClient, telemetry = getTelemetryClient(), log = createLogger('prover-client:tx-prover')){
|
|
24
32
|
this.config = config;
|
|
25
33
|
this.worldState = worldState;
|
|
@@ -32,12 +40,44 @@ import { ServerEpochProver } from './server-epoch-prover.js';
|
|
|
32
40
|
this.running = false;
|
|
33
41
|
this.agents = [];
|
|
34
42
|
}
|
|
35
|
-
|
|
43
|
+
/**
|
|
44
|
+
* Lazy-init the shared facade. The broker delivers each completed-job notification
|
|
45
|
+
* exactly once (drained on the first `getCompletedJobs` poll), so we cannot start
|
|
46
|
+
* a shared facade alongside the per-call facades that `createEpochProver` builds —
|
|
47
|
+
* they would race for notifications and one side would silently drop them. Starting
|
|
48
|
+
* the shared facade only on first use of one of the new factory methods keeps the
|
|
49
|
+
* legacy `createEpochProver` path race-free.
|
|
50
|
+
*/ getFacade() {
|
|
51
|
+
if (!this.running) {
|
|
52
|
+
throw new Error('ProverClient is not running; call start() before constructing orchestrators.');
|
|
53
|
+
}
|
|
54
|
+
if (!this.facade) {
|
|
55
|
+
this.facade = new BrokerCircuitProverFacade(this.orchestratorClient, this.proofStore, this.failedProofStore, undefined, this.log.getBindings());
|
|
56
|
+
this.facade.start();
|
|
57
|
+
}
|
|
58
|
+
return this.facade;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Legacy single-class epoch prover. Each call constructs its own
|
|
62
|
+
* `BrokerCircuitProverFacade`; the new factory methods (`createCheckpointSubTreeOrchestrator`,
|
|
63
|
+
* `createTopTreeOrchestrator`, `createEpochProvingContext`) share a single facade
|
|
64
|
+
* owned by `ProverClient`. Both APIs coexist while the prover-node migrates onto
|
|
65
|
+
* the new pair.
|
|
66
|
+
*/ createEpochProver() {
|
|
36
67
|
const bindings = this.log.getBindings();
|
|
37
68
|
const facade = new BrokerCircuitProverFacade(this.orchestratorClient, this.proofStore, this.failedProofStore, undefined, bindings);
|
|
38
|
-
const orchestrator = new ProvingOrchestrator(this.worldState, facade, this.config.proverId, this.config.cancelJobsOnStop, this.telemetry, bindings);
|
|
69
|
+
const orchestrator = new ProvingOrchestrator(this.worldState, facade, this.config.proverId, this.config.cancelJobsOnStop, this.config.enqueueConcurrency, this.telemetry, bindings);
|
|
39
70
|
return new ServerEpochProver(facade, orchestrator);
|
|
40
71
|
}
|
|
72
|
+
createEpochProvingContext(epochNumber) {
|
|
73
|
+
return new EpochProvingContext(this.getFacade(), epochNumber, this.log.getBindings());
|
|
74
|
+
}
|
|
75
|
+
createCheckpointSubTreeOrchestrator(epochContext, checkpointConstants, l1ToL2Messages, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint) {
|
|
76
|
+
return CheckpointSubTreeOrchestrator.start(this.worldState, this.getFacade(), this.config.proverId, epochContext, this.config.cancelJobsOnStop, this.config.enqueueConcurrency, checkpointConstants, l1ToL2Messages, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint, this.telemetry, this.log.getBindings());
|
|
77
|
+
}
|
|
78
|
+
createTopTreeOrchestrator() {
|
|
79
|
+
return new TopTreeOrchestrator(this.getFacade(), this.config.proverId, this.config.enqueueConcurrency, this.telemetry, this.log.getBindings());
|
|
80
|
+
}
|
|
41
81
|
getProverId() {
|
|
42
82
|
return this.config.proverId;
|
|
43
83
|
}
|
|
@@ -69,6 +109,14 @@ import { ServerEpochProver } from './server-epoch-prover.js';
|
|
|
69
109
|
}
|
|
70
110
|
this.running = false;
|
|
71
111
|
await this.stopAgents();
|
|
112
|
+
if (this.facade) {
|
|
113
|
+
try {
|
|
114
|
+
await this.facade.stop();
|
|
115
|
+
} catch (err) {
|
|
116
|
+
this.log.error('Error stopping shared broker facade', err);
|
|
117
|
+
}
|
|
118
|
+
this.facade = undefined;
|
|
119
|
+
}
|
|
72
120
|
await tryStop(this.orchestratorClient);
|
|
73
121
|
}
|
|
74
122
|
/**
|
|
@@ -52,4 +52,4 @@ export declare class BrokerCircuitProverFacade implements ServerCircuitProver {
|
|
|
52
52
|
getRootRollupProof(input: RootRollupPrivateInputs, signal?: AbortSignal, epochNumber?: EpochNumber): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs, typeof RECURSIVE_PROOF_LENGTH>>;
|
|
53
53
|
private generateId;
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJva2VyX3Byb3Zlcl9mYWNhZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9icm9rZXJfcHJvdmVyX2ZhY2FkZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFDVixvQ0FBb0MsRUFDcEMsNkJBQTZCLEVBQzdCLHlDQUF5QyxFQUN6QyxzQkFBc0IsRUFDdkIsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR3ZGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxFQUlMLEtBQUssa0JBQWtCLEVBR3ZCLEtBQUssNkJBQTZCLEVBQ2xDLEtBQUssbUJBQW1CLEVBRXpCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsa0JBQWtCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNqSCxPQUFPLEVBQXNCLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUNWLDZCQUE2QixFQUM3Qix1QkFBdUIsRUFDdkIsd0NBQXdDLEVBQ3hDLGlDQUFpQyxFQUNqQyw0QkFBNEIsRUFDNUIseUNBQXlDLEVBQ3pDLG9DQUFvQyxFQUNwQyxrQ0FBa0MsRUFDbEMsb0NBQW9DLEVBQ3BDLDRCQUE0QixFQUM1QixpQ0FBaUMsRUFDakMsNENBQTRDLEVBQzVDLGdDQUFnQyxFQUNoQyxnQ0FBZ0MsRUFDaEMsK0JBQStCLEVBQy9CLCtCQUErQixFQUMvQix1QkFBdUIsRUFDdkIsc0JBQXNCLEVBQ3RCLDBCQUEwQixFQUMxQixvQkFBb0IsRUFDckIsTUFBTSxzQkFBc0IsQ0FBQztBQUk5QixPQUFPLEVBQW9CLEtBQUssVUFBVSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFpQjNFLHFCQUFhLHlCQUEwQixZQUFXLG1CQUFtQjtJQVFqRSxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQztJQUN6QixPQUFPLENBQUMsY0FBYztJQVZ4QixPQUFPLENBQUMsSUFBSSxDQUE0QztJQUN4RCxPQUFPLENBQUMsY0FBYyxDQUFDLENBQWlCO0lBQ3hDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBYztJQUM1QyxPQUFPLENBQUMsY0FBYyxDQUFnQztJQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ1UsTUFBTSxFQUFFLGtCQUFrQixFQUMxQixVQUFVLEdBQUUsVUFBbUMsRUFDL0MsZ0JBQWdCLENBQUMsd0JBQVksRUFDN0IsY0FBYyxTQUFPLEVBQzdCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFRDs7Ozs7T0FLRztJQUNILE9BQU8sQ0FBQyxxQkFBcUI7WUEwQ2YsVUFBVTtJQTBEakIsS0FBSyxTQVNYO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FZakM7WUFFYSxtQkFBbUI7WUF3RG5CLDZCQUE2QjtZQXVGN0IsdUJBQXVCO1lBb0J2Qix1QkFBdUI7SUFhckMsV0FBVyxDQUNULE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FBQyxjQUFjLENBQUMsT0FBTyxvQ0FBb0MsQ0FBQyxDQUFDLENBUXRFO0lBRUQsa0JBQWtCLENBQ2hCLE1BQU0sRUFBRSx1QkFBdUIsRUFDL0IsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBQyxrQkFBa0IsRUFBRSxPQUFPLHNCQUFzQixDQUFDLENBQUMsQ0FRM0Y7SUFFRCxxQkFBcUIsQ0FDbkIsS0FBSyxFQUFFLDBCQUEwQixFQUNqQyxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUFDLDZCQUE2QixDQUFDLG9CQUFvQixFQUFFLE9BQU8seUNBQXlDLENBQUMsQ0FBQyxDQVFoSDtJQUVELDJCQUEyQixDQUN6QixNQUFNLEVBQUUsZ0NBQWdDLEVBQ3hDLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFDcEIsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUN4QixPQUFPLENBQ1IsNkJBQTZCLENBQUMsK0JBQStCLEVBQUUsT0FBTyx5Q0FBeUMsQ0FBQyxDQUNqSCxDQVFBO0lBRUQsMkJBQTJCLENBQ3pCLGVBQWUsRUFBRSxnQ0FBZ0MsRUFDakQsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLHlDQUF5QyxDQUFDLENBQUMsQ0FRaEg7SUFFRCwwQkFBMEIsQ0FDeEIsTUFBTSxFQUFFLCtCQUErQixFQUN2QyxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUFDLDZCQUE2QixDQUFDLG9CQUFvQixFQUFFLE9BQU8seUNBQXlDLENBQUMsQ0FBQyxDQVFoSDtJQUVELGtCQUFrQixDQUNoQixNQUFNLEVBQUUsdUJBQXVCLEVBQy9CLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFDcEIsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUN4QixPQUFPLENBQUMsNkJBQTZCLENBQUMsa0JBQWtCLEVBQUUsT0FBTyw2QkFBNkIsQ0FBQyxDQUFDLENBUWxHO0lBRUQsNEJBQTRCLENBQzFCLEtBQUssRUFBRSxpQ0FBaUMsRUFDeEMsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLHlDQUF5QyxDQUFDLENBQUMsQ0FRbkg7SUFFRCxvQ0FBb0MsQ0FDbEMsS0FBSyxFQUFFLHlDQUF5QyxFQUNoRCxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUFDLDZCQUE2QixDQUFDLHVCQUF1QixFQUFFLE9BQU8seUNBQXlDLENBQUMsQ0FBQyxDQVFuSDtJQUVELG1DQUFtQyxDQUNqQyxLQUFLLEVBQUUsd0NBQXdDLEVBQy9DLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFDcEIsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUN4QixPQUFPLENBQUMsNkJBQTZCLENBQUMsdUJBQXVCLEVBQUUsT0FBTyx5Q0FBeUMsQ0FBQyxDQUFDLENBUW5IO0lBRUQsdUJBQXVCLENBQ3JCLEtBQUssRUFBRSw0QkFBNEIsRUFDbkMsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLHlDQUF5QyxDQUFDLENBQUMsQ0FRbkg7SUFFRCwrQkFBK0IsQ0FDN0IsS0FBSyxFQUFFLG9DQUFvQyxFQUMzQyxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUFDLDZCQUE2QixDQUFDLHVCQUF1QixFQUFFLE9BQU8seUNBQXlDLENBQUMsQ0FBQyxDQVFuSDtJQUVELHdCQUF3QixDQUN0QixLQUFLLEVBQUUsNkJBQTZCLEVBQ3BDLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFDcEIsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUN4QixPQUFPLENBQUMsNkJBQTZCLENBQUMsdUJBQXVCLEVBQUUsT0FBTyx5Q0FBeUMsQ0FBQyxDQUFDLENBUW5IO0lBRUQsNEJBQTRCLENBQzFCLEtBQUssRUFBRSxpQ0FBaUMsRUFDeEMsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FDUiw2QkFBNkIsQ0FBQyw0QkFBNEIsRUFBRSxPQUFPLHlDQUF5QyxDQUFDLENBQzlHLENBUUE7SUFFRCx1Q0FBdUMsQ0FDckMsS0FBSyxFQUFFLDRDQUE0QyxFQUNuRCxNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUNSLDZCQUE2QixDQUFDLDRCQUE0QixFQUFFLE9BQU8seUNBQXlDLENBQUMsQ0FDOUcsQ0FRQTtJQUVELCtCQUErQixDQUM3QixLQUFLLEVBQUUsb0NBQW9DLEVBQzNDLE1BQU0sQ0FBQyxFQUFFLFdBQVcsRUFDcEIsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUN4QixPQUFPLENBQ1IsNkJBQTZCLENBQUMsNEJBQTRCLEVBQUUsT0FBTyx5Q0FBeUMsQ0FBQyxDQUM5RyxDQVFBO0lBRUQsNkJBQTZCLENBQzNCLEtBQUssRUFBRSxrQ0FBa0MsRUFDekMsTUFBTSxDQUFDLEVBQUUsV0FBVyxFQUNwQixXQUFXLENBQUMsRUFBRSxXQUFXLEdBQ3hCLE9BQU8sQ0FDUiw2QkFBNkIsQ0FBQyw0QkFBNEIsRUFBRSxPQUFPLHlDQUF5QyxDQUFDLENBQzlHLENBUUE7SUFFRCxrQkFBa0IsQ0FDaEIsS0FBSyxFQUFFLHVCQUF1QixFQUM5QixNQUFNLENBQUMsRUFBRSxXQUFXLEVBQ3BCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FDeEIsT0FBTyxDQUFDLDZCQUE2QixDQUFDLHNCQUFzQixFQUFFLE9BQU8sc0JBQXNCLENBQUMsQ0FBQyxDQVEvRjtJQUVELE9BQU8sQ0FBQyxVQUFVO0NBUW5CIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broker_prover_facade.d.ts","sourceRoot":"","sources":["../../src/proving_broker/broker_prover_facade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oCAAoC,EACpC,6BAA6B,EAC7B,yCAAyC,EACzC,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"broker_prover_facade.d.ts","sourceRoot":"","sources":["../../src/proving_broker/broker_prover_facade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
1
2
|
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import {
|
|
3
|
+
import { chunk } from '@aztec/foundation/collection';
|
|
3
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
5
|
import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
5
6
|
import { truncate } from '@aztec/foundation/string';
|
|
6
7
|
import { makeProvingJobId } from '@aztec/stdlib/interfaces/server';
|
|
7
8
|
import { ProvingRequestType } from '@aztec/stdlib/proofs';
|
|
9
|
+
import { createHash } from 'node:crypto';
|
|
8
10
|
import { InlineProofStore } from './proof_store/index.js';
|
|
9
11
|
// Perform a snapshot sync every 30 seconds
|
|
10
12
|
const SNAPSHOT_SYNC_INTERVAL_MS = 30_000;
|
|
@@ -156,17 +158,13 @@ export class BrokerCircuitProverFacade {
|
|
|
156
158
|
// We collect all returned notifications and return them
|
|
157
159
|
const allCompleted = new Set();
|
|
158
160
|
try {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
161
|
+
const batches = ids.length > 0 ? chunk(ids, SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE) : [
|
|
162
|
+
[]
|
|
163
|
+
];
|
|
164
|
+
await asyncPool(1, batches, async (batch)=>{
|
|
165
|
+
const completed = await this.broker.getCompletedJobs(batch);
|
|
163
166
|
completed.forEach((id)=>allCompleted.add(id));
|
|
164
|
-
|
|
165
|
-
}
|
|
166
|
-
if (numRequests === 0) {
|
|
167
|
-
const final = await this.broker.getCompletedJobs([]);
|
|
168
|
-
final.forEach((id)=>allCompleted.add(id));
|
|
169
|
-
}
|
|
167
|
+
});
|
|
170
168
|
} catch (err) {
|
|
171
169
|
this.log.error(`Error thrown when requesting completed job notifications from the broker`, err);
|
|
172
170
|
}
|
|
@@ -266,12 +264,8 @@ export class BrokerCircuitProverFacade {
|
|
|
266
264
|
};
|
|
267
265
|
const toBeRetrieved = Array.from(this.jobsToRetrieve.values()).map((id)=>this.jobs.get(id)).filter((x)=>x !== undefined);
|
|
268
266
|
const totalJobsToRetrieve = toBeRetrieved.length;
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
const slice = toBeRetrieved.splice(0, MAX_CONCURRENT_JOB_SETTLED_REQUESTS);
|
|
272
|
-
const results = await Promise.all(slice.map((job)=>processJob(job)));
|
|
273
|
-
totalJobsRetrieved += results.filter((x)=>x).length;
|
|
274
|
-
}
|
|
267
|
+
const results = await asyncPool(MAX_CONCURRENT_JOB_SETTLED_REQUESTS, toBeRetrieved, (job)=>processJob(job));
|
|
268
|
+
const totalJobsRetrieved = results.filter((x)=>x).length;
|
|
275
269
|
if (totalJobsToRetrieve > 0) {
|
|
276
270
|
this.log.verbose(`Successfully retrieved ${totalJobsRetrieved} of ${totalJobsToRetrieve} jobs that should be ready, total ready jobs is now: ${this.jobsToRetrieve.size}`);
|
|
277
271
|
}
|
|
@@ -357,7 +351,7 @@ export class BrokerCircuitProverFacade {
|
|
|
357
351
|
return this.enqueueJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input, epochNumber), ProvingRequestType.ROOT_ROLLUP, input, epochNumber, signal);
|
|
358
352
|
}
|
|
359
353
|
generateId(type, inputs, epochNumber = EpochNumber.ZERO) {
|
|
360
|
-
const inputsHash = sha256(inputs.toBuffer());
|
|
361
|
-
return makeProvingJobId(epochNumber, type, inputsHash
|
|
354
|
+
const inputsHash = createHash('sha256').update(inputs.toBuffer()).digest('hex');
|
|
355
|
+
return makeProvingJobId(epochNumber, type, inputsHash);
|
|
362
356
|
}
|
|
363
357
|
}
|