@aztec/prover-client 0.69.1 → 0.71.0
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/bin/get-proof-inputs.d.ts +2 -0
- package/dest/bin/get-proof-inputs.d.ts.map +1 -0
- package/dest/bin/get-proof-inputs.js +50 -0
- package/dest/block_builder/light.d.ts +3 -5
- package/dest/block_builder/light.d.ts.map +1 -1
- package/dest/block_builder/light.js +9 -22
- package/dest/config.d.ts +2 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +3 -2
- package/dest/mocks/fixtures.d.ts +1 -1
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +2 -2
- package/dest/mocks/test_context.d.ts +1 -1
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +11 -12
- package/dest/orchestrator/block-building-helpers.d.ts +15 -29
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +51 -58
- package/dest/orchestrator/block-proving-state.d.ts +40 -44
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +149 -85
- package/dest/orchestrator/epoch-proving-state.d.ts +23 -30
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +92 -65
- package/dest/orchestrator/orchestrator.d.ts +17 -48
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +208 -351
- package/dest/orchestrator/tx-proving-state.d.ts +10 -6
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +57 -46
- package/dest/prover-agent/memory-proving-queue.d.ts +4 -4
- package/dest/prover-agent/memory-proving-queue.d.ts.map +1 -1
- package/dest/prover-agent/memory-proving-queue.js +5 -5
- package/dest/prover-agent/prover-agent.d.ts +0 -2
- package/dest/prover-agent/prover-agent.d.ts.map +1 -1
- package/dest/prover-agent/prover-agent.js +7 -9
- package/dest/prover-client/factory.d.ts.map +1 -1
- package/dest/prover-client/factory.js +3 -3
- package/dest/prover-client/prover-client.d.ts +4 -2
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +16 -15
- package/dest/prover-client/server-epoch-prover.d.ts +25 -0
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -0
- package/dest/prover-client/server-epoch-prover.js +40 -0
- package/dest/proving_broker/broker_prover_facade.d.ts +19 -7
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +271 -49
- package/dest/proving_broker/config.d.ts +61 -0
- package/dest/proving_broker/config.d.ts.map +1 -0
- package/dest/proving_broker/config.js +83 -0
- package/dest/proving_broker/factory.d.ts +1 -1
- package/dest/proving_broker/factory.d.ts.map +1 -1
- package/dest/proving_broker/factory.js +4 -7
- package/dest/proving_broker/fixtures.d.ts +5 -0
- package/dest/proving_broker/fixtures.d.ts.map +1 -0
- package/dest/proving_broker/fixtures.js +12 -0
- 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 +3 -2
- package/dest/proving_broker/proof_store/factory.d.ts +6 -0
- package/dest/proving_broker/proof_store/factory.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/factory.js +39 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +13 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.js +46 -0
- package/dest/proving_broker/proof_store/index.d.ts +4 -0
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/index.js +4 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +14 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/inline_proof_store.js +37 -0
- package/dest/proving_broker/{proof_store.d.ts → proof_store/proof_store.d.ts} +1 -12
- package/dest/proving_broker/proof_store/proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/proof_store.js +2 -0
- package/dest/proving_broker/proving_agent.d.ts +4 -4
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +5 -5
- package/dest/proving_broker/proving_broker.d.ts +16 -12
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +307 -274
- package/dest/proving_broker/proving_broker_database/memory.d.ts +4 -2
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +17 -4
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +10 -6
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +106 -14
- package/dest/proving_broker/proving_broker_database.d.ts +7 -3
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +4 -4
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +4 -4
- package/dest/test/mock_prover.d.ts +8 -8
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +9 -10
- package/package.json +14 -12
- package/src/bin/get-proof-inputs.ts +60 -0
- package/src/block_builder/light.ts +7 -31
- package/src/config.ts +4 -4
- package/src/mocks/fixtures.ts +1 -1
- package/src/mocks/test_context.ts +9 -11
- package/src/orchestrator/block-building-helpers.ts +360 -402
- package/src/orchestrator/block-proving-state.ts +251 -121
- package/src/orchestrator/epoch-proving-state.ts +159 -88
- package/src/orchestrator/orchestrator.ts +262 -542
- package/src/orchestrator/tx-proving-state.ts +30 -18
- package/src/prover-agent/memory-proving-queue.ts +12 -16
- package/src/prover-agent/prover-agent.ts +14 -8
- package/src/prover-client/factory.ts +2 -3
- package/src/prover-client/prover-client.ts +17 -20
- package/src/prover-client/server-epoch-prover.ts +44 -0
- package/src/proving_broker/broker_prover_facade.ts +347 -67
- package/src/proving_broker/config.ts +93 -0
- package/src/proving_broker/factory.ts +11 -10
- package/src/proving_broker/fixtures.ts +14 -0
- package/src/proving_broker/index.ts +2 -1
- package/src/proving_broker/proof_store/factory.ts +42 -0
- package/src/proving_broker/proof_store/gcs_proof_store.ts +72 -0
- package/src/proving_broker/proof_store/index.ts +3 -0
- package/src/proving_broker/{proof_store.ts → proof_store/inline_proof_store.ts} +1 -44
- package/src/proving_broker/proof_store/proof_store.ts +54 -0
- package/src/proving_broker/proving_agent.ts +11 -5
- package/src/proving_broker/proving_broker.ts +122 -73
- package/src/proving_broker/proving_broker_database/memory.ts +24 -4
- package/src/proving_broker/proving_broker_database/persisted.ts +142 -20
- package/src/proving_broker/proving_broker_database.ts +8 -3
- package/src/proving_broker/proving_job_controller.ts +5 -5
- package/src/proving_broker/rpc.ts +2 -3
- package/src/test/mock_prover.ts +12 -18
- package/dest/proving_broker/proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store.js +0 -37
|
@@ -7,6 +7,7 @@ import { type BaseRollupHints, PrivateBaseRollupInputs, PublicBaseRollupInputs,
|
|
|
7
7
|
* Also stores the inputs to the base rollup for this transaction and the tree snapshots
|
|
8
8
|
*/
|
|
9
9
|
export declare class TxProvingState {
|
|
10
|
+
#private;
|
|
10
11
|
readonly processedTx: ProcessedTx;
|
|
11
12
|
private readonly baseRollupHints;
|
|
12
13
|
readonly treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
|
|
@@ -17,11 +18,14 @@ export declare class TxProvingState {
|
|
|
17
18
|
ready(): boolean;
|
|
18
19
|
getTubeInputs(): TubeInputs;
|
|
19
20
|
getAvmInputs(): import("@aztec/circuits.js").AvmCircuitInputs;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
getBaseRollupTypeAndInputs(): {
|
|
22
|
+
rollupType: string;
|
|
23
|
+
inputs: PublicBaseRollupInputs;
|
|
24
|
+
} | {
|
|
25
|
+
rollupType: string;
|
|
26
|
+
inputs: PrivateBaseRollupInputs;
|
|
27
|
+
};
|
|
28
|
+
setTubeProof(tubeProofAndVk: ProofAndVerificationKey<typeof TUBE_PROOF_LENGTH>): void;
|
|
29
|
+
setAvmProof(avmProofAndVk: ProofAndVerificationKey<typeof AVM_PROOF_LENGTH_IN_FIELDS>): void;
|
|
26
30
|
}
|
|
27
31
|
//# sourceMappingURL=tx-proving-state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/tx-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"tx-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/tx-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEzG,OAAO,EACL,KAAK,0BAA0B,EAE/B,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EAGvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,eAAe,EAEpB,uBAAuB,EAGvB,sBAAsB,EAEtB,UAAU,EACX,MAAM,2BAA2B,CAAC;AAGnC;;;;GAIG;AACH,qBAAa,cAAc;;aAKP,WAAW,EAAE,WAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe;aAChB,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAN1E,OAAO,CAAC,IAAI,CAAC,CAAoD;IACjE,OAAO,CAAC,GAAG,CAAC,CAA6D;gBAGvD,WAAW,EAAE,WAAW,EACvB,eAAe,EAAE,eAAe,EACjC,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAG1E,IAAI,eAAe,YAElB;IAEM,KAAK;IAIL,aAAa;IAIb,YAAY;IAIZ,0BAA0B;;;;;;;IAc1B,YAAY,CAAC,cAAc,EAAE,uBAAuB,CAAC,OAAO,iBAAiB,CAAC;IAI9E,WAAW,CAAC,aAAa,EAAE,uBAAuB,CAAC,OAAO,0BAA0B,CAAC;CAqE7F"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
var _TxProvingState_instances, _TxProvingState_getPrivateBaseInputs, _TxProvingState_getPublicBaseInputs, _TxProvingState_getTubeVkData, _TxProvingState_getAvmVkData;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
1
3
|
import { AVM_VK_INDEX, TUBE_VK_INDEX, VkWitnessData, } from '@aztec/circuits.js';
|
|
2
4
|
import { AvmProofData, PrivateBaseRollupHints, PrivateBaseRollupInputs, PrivateTubeData, PublicBaseRollupHints, PublicBaseRollupInputs, PublicTubeData, TubeInputs, } from '@aztec/circuits.js/rollup';
|
|
3
|
-
import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types';
|
|
5
|
+
import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks';
|
|
4
6
|
/**
|
|
5
7
|
* Helper class to manage the proving cycle of a transaction
|
|
6
8
|
* This includes the public VMs and the public kernels
|
|
@@ -8,6 +10,7 @@ import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-type
|
|
|
8
10
|
*/
|
|
9
11
|
export class TxProvingState {
|
|
10
12
|
constructor(processedTx, baseRollupHints, treeSnapshots) {
|
|
13
|
+
_TxProvingState_instances.add(this);
|
|
11
14
|
this.processedTx = processedTx;
|
|
12
15
|
this.baseRollupHints = baseRollupHints;
|
|
13
16
|
this.treeSnapshots = treeSnapshots;
|
|
@@ -24,58 +27,66 @@ export class TxProvingState {
|
|
|
24
27
|
getAvmInputs() {
|
|
25
28
|
return this.processedTx.avmProvingRequest.inputs;
|
|
26
29
|
}
|
|
27
|
-
|
|
30
|
+
getBaseRollupTypeAndInputs() {
|
|
28
31
|
if (this.requireAvmProof) {
|
|
29
|
-
|
|
32
|
+
return {
|
|
33
|
+
rollupType: 'public-base-rollup',
|
|
34
|
+
inputs: __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPublicBaseInputs).call(this),
|
|
35
|
+
};
|
|
30
36
|
}
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
else {
|
|
38
|
+
return {
|
|
39
|
+
rollupType: 'private-base-rollup',
|
|
40
|
+
inputs: __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPrivateBaseInputs).call(this),
|
|
41
|
+
};
|
|
33
42
|
}
|
|
34
|
-
const vkData = this.getTubeVkData();
|
|
35
|
-
const tubeData = new PrivateTubeData(this.processedTx.data.toPrivateToRollupKernelCircuitPublicInputs(), this.tube.proof, vkData);
|
|
36
|
-
if (!(this.baseRollupHints instanceof PrivateBaseRollupHints)) {
|
|
37
|
-
throw new Error('Mismatched base rollup hints, expected private base rollup hints');
|
|
38
|
-
}
|
|
39
|
-
return new PrivateBaseRollupInputs(tubeData, this.baseRollupHints);
|
|
40
|
-
}
|
|
41
|
-
getPublicBaseInputs() {
|
|
42
|
-
if (!this.processedTx.avmProvingRequest) {
|
|
43
|
-
throw new Error('Should create private base rollup for a tx not requiring avm proof.');
|
|
44
|
-
}
|
|
45
|
-
if (!this.tube) {
|
|
46
|
-
throw new Error('Tx not ready for proving base rollup: tube proof undefined');
|
|
47
|
-
}
|
|
48
|
-
if (!this.avm) {
|
|
49
|
-
throw new Error('Tx not ready for proving base rollup: avm proof undefined');
|
|
50
|
-
}
|
|
51
|
-
const tubeData = new PublicTubeData(this.processedTx.data.toPublicKernelCircuitPublicInputs(), this.tube.proof, this.getTubeVkData());
|
|
52
|
-
const avmProofData = new AvmProofData(this.processedTx.avmProvingRequest.inputs.output, this.avm.proof, this.getAvmVkData());
|
|
53
|
-
if (!(this.baseRollupHints instanceof PublicBaseRollupHints)) {
|
|
54
|
-
throw new Error('Mismatched base rollup hints, expected public base rollup hints');
|
|
55
|
-
}
|
|
56
|
-
return new PublicBaseRollupInputs(tubeData, avmProofData, this.baseRollupHints);
|
|
57
43
|
}
|
|
58
|
-
|
|
44
|
+
setTubeProof(tubeProofAndVk) {
|
|
59
45
|
this.tube = tubeProofAndVk;
|
|
60
46
|
}
|
|
61
|
-
|
|
47
|
+
setAvmProof(avmProofAndVk) {
|
|
62
48
|
this.avm = avmProofAndVk;
|
|
63
49
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
catch (_ignored) {
|
|
70
|
-
// TODO(#7410) The VK for the tube won't be in the tree for now, so we manually set it to the tube vk index
|
|
71
|
-
}
|
|
72
|
-
const vkPath = getVKSiblingPath(vkIndex);
|
|
73
|
-
return new VkWitnessData(this.tube.verificationKey, vkIndex, vkPath);
|
|
50
|
+
}
|
|
51
|
+
_TxProvingState_instances = new WeakSet(), _TxProvingState_getPrivateBaseInputs = function _TxProvingState_getPrivateBaseInputs() {
|
|
52
|
+
if (!this.tube) {
|
|
53
|
+
throw new Error('Tx not ready for proving base rollup.');
|
|
74
54
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
55
|
+
const vkData = __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getTubeVkData).call(this);
|
|
56
|
+
const tubeData = new PrivateTubeData(this.processedTx.data.toPrivateToRollupKernelCircuitPublicInputs(), this.tube.proof, vkData);
|
|
57
|
+
if (!(this.baseRollupHints instanceof PrivateBaseRollupHints)) {
|
|
58
|
+
throw new Error('Mismatched base rollup hints, expected private base rollup hints');
|
|
79
59
|
}
|
|
80
|
-
|
|
81
|
-
|
|
60
|
+
return new PrivateBaseRollupInputs(tubeData, this.baseRollupHints);
|
|
61
|
+
}, _TxProvingState_getPublicBaseInputs = function _TxProvingState_getPublicBaseInputs() {
|
|
62
|
+
if (!this.processedTx.avmProvingRequest) {
|
|
63
|
+
throw new Error('Should create private base rollup for a tx not requiring avm proof.');
|
|
64
|
+
}
|
|
65
|
+
if (!this.tube) {
|
|
66
|
+
throw new Error('Tx not ready for proving base rollup: tube proof undefined');
|
|
67
|
+
}
|
|
68
|
+
if (!this.avm) {
|
|
69
|
+
throw new Error('Tx not ready for proving base rollup: avm proof undefined');
|
|
70
|
+
}
|
|
71
|
+
const tubeData = new PublicTubeData(this.processedTx.data.toPrivateToPublicKernelCircuitPublicInputs(), this.tube.proof, __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getTubeVkData).call(this));
|
|
72
|
+
const avmProofData = new AvmProofData(this.processedTx.avmProvingRequest.inputs.output, this.avm.proof, __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getAvmVkData).call(this));
|
|
73
|
+
if (!(this.baseRollupHints instanceof PublicBaseRollupHints)) {
|
|
74
|
+
throw new Error('Mismatched base rollup hints, expected public base rollup hints');
|
|
75
|
+
}
|
|
76
|
+
return new PublicBaseRollupInputs(tubeData, avmProofData, this.baseRollupHints);
|
|
77
|
+
}, _TxProvingState_getTubeVkData = function _TxProvingState_getTubeVkData() {
|
|
78
|
+
let vkIndex = TUBE_VK_INDEX;
|
|
79
|
+
try {
|
|
80
|
+
vkIndex = getVKIndex(this.tube.verificationKey);
|
|
81
|
+
}
|
|
82
|
+
catch (_ignored) {
|
|
83
|
+
// TODO(#7410) The VK for the tube won't be in the tree for now, so we manually set it to the tube vk index
|
|
84
|
+
}
|
|
85
|
+
const vkPath = getVKSiblingPath(vkIndex);
|
|
86
|
+
return new VkWitnessData(this.tube.verificationKey, vkIndex, vkPath);
|
|
87
|
+
}, _TxProvingState_getAvmVkData = function _TxProvingState_getAvmVkData() {
|
|
88
|
+
const vkIndex = AVM_VK_INDEX;
|
|
89
|
+
const vkPath = getVKSiblingPath(vkIndex);
|
|
90
|
+
return new VkWitnessData(this.avm.verificationKey, AVM_VK_INDEX, vkPath);
|
|
91
|
+
};
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvdHgtcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE9BQU8sRUFFTCxZQUFZLEVBR1osYUFBYSxFQUNiLGFBQWEsR0FDZCxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFDTCxZQUFZLEVBRVosc0JBQXNCLEVBQ3RCLHVCQUF1QixFQUN2QixlQUFlLEVBQ2YscUJBQXFCLEVBQ3JCLHNCQUFzQixFQUN0QixjQUFjLEVBQ2QsVUFBVSxHQUNYLE1BQU0sMkJBQTJCLENBQUM7QUFDbkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBRXZGOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUl6QixZQUNrQixXQUF3QixFQUN2QixlQUFnQyxFQUNqQyxhQUF3RDs7UUFGeEQsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFDdkIsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2pDLGtCQUFhLEdBQWIsYUFBYSxDQUEyQztJQUN2RSxDQUFDO0lBRUosSUFBSSxlQUFlO1FBQ2pCLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUM7SUFDOUMsQ0FBQztJQUVNLEtBQUs7UUFDVixPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVNLGFBQWE7UUFDbEIsT0FBTyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFTSxZQUFZO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBa0IsQ0FBQyxNQUFNLENB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
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type ProofAndVerificationKey, type ProvingJob, type ProvingJobSource, type ProvingRequestResultFor, ProvingRequestType, type PublicInputsAndRecursiveProof, type ServerCircuitProver } from '@aztec/circuit-types';
|
|
2
|
-
import type { AVM_PROOF_LENGTH_IN_FIELDS, AvmCircuitInputs, BaseParityInputs, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, ParityPublicInputs,
|
|
3
|
-
import { type BaseOrMergeRollupPublicInputs, type BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, type BlockRootRollupInputs, type EmptyBlockRootRollupInputs, type MergeRollupInputs, type PrivateBaseRollupInputs, type PublicBaseRollupInputs, type RootRollupInputs, type RootRollupPublicInputs, type TubeInputs } from '@aztec/circuits.js/rollup';
|
|
2
|
+
import type { AVM_PROOF_LENGTH_IN_FIELDS, AvmCircuitInputs, BaseParityInputs, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, ParityPublicInputs, RECURSIVE_PROOF_LENGTH, RootParityInputs, TUBE_PROOF_LENGTH } from '@aztec/circuits.js';
|
|
3
|
+
import { type BaseOrMergeRollupPublicInputs, type BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, type BlockRootRollupInputs, type EmptyBlockRootRollupInputs, type MergeRollupInputs, type PrivateBaseRollupInputs, type PublicBaseRollupInputs, type RootRollupInputs, type RootRollupPublicInputs, type SingleTxBlockRootRollupInputs, type TubeInputs } from '@aztec/circuits.js/rollup';
|
|
4
4
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
5
|
-
import { type ProofStore } from '../proving_broker/proof_store.js';
|
|
5
|
+
import { type ProofStore } from '../proving_broker/proof_store/index.js';
|
|
6
6
|
/**
|
|
7
7
|
* A helper class that sits in between services that need proofs created and agents that can create them.
|
|
8
8
|
* The queue accumulates jobs and provides them to agents prioritized by block number.
|
|
@@ -35,7 +35,6 @@ export declare class MemoryProvingQueue implements ServerCircuitProver, ProvingJ
|
|
|
35
35
|
isJobRunning(jobId: string): boolean;
|
|
36
36
|
private poll;
|
|
37
37
|
private enqueue;
|
|
38
|
-
getEmptyPrivateKernelProof(inputs: PrivateKernelEmptyInputData, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<PrivateToRollupKernelCircuitPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
39
38
|
getTubeProof(inputs: TubeInputs, signal?: AbortSignal, epochNumber?: number): Promise<ProofAndVerificationKey<typeof TUBE_PROOF_LENGTH>>;
|
|
40
39
|
/**
|
|
41
40
|
* Creates a proof for the given input.
|
|
@@ -59,6 +58,7 @@ export declare class MemoryProvingQueue implements ServerCircuitProver, ProvingJ
|
|
|
59
58
|
* @param input - Input to the circuit.
|
|
60
59
|
*/
|
|
61
60
|
getBlockRootRollupProof(inputs: BlockRootRollupInputs, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
61
|
+
getSingleTxBlockRootRollupProof(inputs: SingleTxBlockRootRollupInputs, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
62
62
|
getEmptyBlockRootRollupProof(inputs: EmptyBlockRootRollupInputs, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
63
63
|
/**
|
|
64
64
|
* Creates a proof for the given input.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-proving-queue.d.ts","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,UAAU,EAEf,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,EAC5B,kBAAkB,EAClB,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,gBAAgB,EAChB,6BAA6B,EAC7B,yCAAyC,EACzC,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"memory-proving-queue.d.ts","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
6
6
|
import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
7
7
|
import { PriorityMemoryQueue } from '@aztec/foundation/queue';
|
|
8
8
|
import { trackSpan } from '@aztec/telemetry-client';
|
|
9
|
-
import { InlineProofStore } from '../proving_broker/proof_store.js';
|
|
9
|
+
import { InlineProofStore } from '../proving_broker/proof_store/index.js';
|
|
10
10
|
import { ProvingQueueMetrics } from './queue_metrics.js';
|
|
11
11
|
const MAX_RETRIES = 3;
|
|
12
12
|
const defaultIdGenerator = () => randomBytes(4).toString('hex');
|
|
@@ -178,9 +178,6 @@ let MemoryProvingQueue = (() => {
|
|
|
178
178
|
}
|
|
179
179
|
return promise.then(({ result }) => result);
|
|
180
180
|
}
|
|
181
|
-
getEmptyPrivateKernelProof(inputs, signal, epochNumber) {
|
|
182
|
-
return this.enqueue(ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs, signal, epochNumber);
|
|
183
|
-
}
|
|
184
181
|
getTubeProof(inputs, signal, epochNumber) {
|
|
185
182
|
return this.enqueue(ProvingRequestType.TUBE_PROOF, inputs, signal, epochNumber);
|
|
186
183
|
}
|
|
@@ -218,6 +215,9 @@ let MemoryProvingQueue = (() => {
|
|
|
218
215
|
getBlockRootRollupProof(inputs, signal, epochNumber) {
|
|
219
216
|
return this.enqueue(ProvingRequestType.BLOCK_ROOT_ROLLUP, inputs, signal, epochNumber);
|
|
220
217
|
}
|
|
218
|
+
getSingleTxBlockRootRollupProof(inputs, signal, epochNumber) {
|
|
219
|
+
return this.enqueue(ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP, inputs, signal, epochNumber);
|
|
220
|
+
}
|
|
221
221
|
getEmptyBlockRootRollupProof(inputs, signal, epochNumber) {
|
|
222
222
|
return this.enqueue(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, inputs, signal, epochNumber);
|
|
223
223
|
}
|
|
@@ -257,4 +257,4 @@ let MemoryProvingQueue = (() => {
|
|
|
257
257
|
_a;
|
|
258
258
|
})();
|
|
259
259
|
export { MemoryProvingQueue };
|
|
260
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory-proving-queue.js","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory-proving-queue.js","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,6 @@ export declare class ProverAgent implements ProverAgentApi, Traceable {
|
|
|
11
11
|
private maxConcurrency;
|
|
12
12
|
/** How long to wait between jobs */
|
|
13
13
|
private pollIntervalMs;
|
|
14
|
-
/** Telemetry client */
|
|
15
|
-
private telemetry;
|
|
16
14
|
/** Logger */
|
|
17
15
|
private log;
|
|
18
16
|
private inFlightPromises;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-agent.d.ts","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAInB,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,
|
|
1
|
+
{"version":3,"file":"prover-agent.d.ts","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAInB,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAYjC;;GAEG;AACH,qBAAa,WAAY,YAAW,cAAc,EAAE,SAAS;;IAQzD,iDAAiD;IACjD,OAAO,CAAC,aAAa;IACrB,8DAA8D;IAC9D,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IAGtB,aAAa;IACb,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,gBAAgB,CAAsC;IAC9D,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,mBAAmB,CAA0B;IAErD,SAAgB,MAAM,EAAE,MAAM,CAAC;;IAG7B,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,8DAA8D;IACtD,cAAc,SAAI;IAC1B,oCAAoC;IAC5B,cAAc,SAAM;IAC5B,uBAAuB;IACvB,SAAS,GAAE,eAAsC;IACjD,aAAa;IACL,GAAG,yCAA6C;IAK1D,iBAAiB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS;IAQT,cAAc,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAMzD,KAAK,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IA2DlC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAeb,IAAI;IAiClB,OAAO,CAAC,QAAQ;CAyDjB"}
|
|
@@ -3,9 +3,8 @@ import { ProvingRequestType, makeProvingRequestResult, } from '@aztec/circuit-ty
|
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
5
5
|
import { elapsed } from '@aztec/foundation/timer';
|
|
6
|
-
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
7
|
-
import {
|
|
8
|
-
import { InlineProofStore } from '../proving_broker/proof_store.js';
|
|
6
|
+
import { Attributes, getTelemetryClient, trackSpan, } from '@aztec/telemetry-client';
|
|
7
|
+
import { InlineProofStore } from '../proving_broker/proof_store/index.js';
|
|
9
8
|
const PRINT_THRESHOLD_NS = 6e10; // 60 seconds
|
|
10
9
|
/**
|
|
11
10
|
* A helper class that encapsulates a circuit prover and connects it to a job source.
|
|
@@ -23,14 +22,13 @@ let ProverAgent = (() => {
|
|
|
23
22
|
/** How long to wait between jobs */
|
|
24
23
|
pollIntervalMs = 100,
|
|
25
24
|
/** Telemetry client */
|
|
26
|
-
telemetry =
|
|
25
|
+
telemetry = getTelemetryClient(),
|
|
27
26
|
/** Logger */
|
|
28
27
|
log = createLogger('prover-client:prover-agent')) {
|
|
29
28
|
_ProverAgent_instances.add(this);
|
|
30
29
|
this.circuitProver = (__runInitializers(this, _instanceExtraInitializers), circuitProver);
|
|
31
30
|
this.maxConcurrency = maxConcurrency;
|
|
32
31
|
this.pollIntervalMs = pollIntervalMs;
|
|
33
|
-
this.telemetry = telemetry;
|
|
34
32
|
this.log = log;
|
|
35
33
|
this.inFlightPromises = new Map();
|
|
36
34
|
this.proofInputsDatabase = new InlineProofStore();
|
|
@@ -162,6 +160,9 @@ let ProverAgent = (() => {
|
|
|
162
160
|
case ProvingRequestType.BLOCK_ROOT_ROLLUP: {
|
|
163
161
|
return this.circuitProver.getBlockRootRollupProof(inputs);
|
|
164
162
|
}
|
|
163
|
+
case ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP: {
|
|
164
|
+
return this.circuitProver.getSingleTxBlockRootRollupProof(inputs);
|
|
165
|
+
}
|
|
165
166
|
case ProvingRequestType.BLOCK_MERGE_ROLLUP: {
|
|
166
167
|
return this.circuitProver.getBlockMergeRollupProof(inputs);
|
|
167
168
|
}
|
|
@@ -174,9 +175,6 @@ let ProverAgent = (() => {
|
|
|
174
175
|
case ProvingRequestType.ROOT_PARITY: {
|
|
175
176
|
return this.circuitProver.getRootParityProof(inputs);
|
|
176
177
|
}
|
|
177
|
-
case ProvingRequestType.PRIVATE_KERNEL_EMPTY: {
|
|
178
|
-
return this.circuitProver.getEmptyPrivateKernelProof(inputs);
|
|
179
|
-
}
|
|
180
178
|
case ProvingRequestType.TUBE_PROOF: {
|
|
181
179
|
return this.circuitProver.getTubeProof(inputs);
|
|
182
180
|
}
|
|
@@ -203,4 +201,4 @@ let ProverAgent = (() => {
|
|
|
203
201
|
_a;
|
|
204
202
|
})();
|
|
205
203
|
export { ProverAgent };
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-agent.js","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":";AAAA,OAAO,EAML,kBAAkB,EAElB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EACL,UAAU,EAIV,kBAAkB,EAClB,SAAS,GACV,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,aAAa;AAQ9C;;GAEG;IACU,WAAW;;;;sBAAX,WAAW;YAOtB;YACE,iDAAiD;YACzC,aAAkC;YAC1C,8DAA8D;YACtD,iBAAiB,CAAC;YAC1B,oCAAoC;YAC5B,iBAAiB,GAAG;YAC5B,uBAAuB;YACvB,YAA6B,kBAAkB,EAAE;YACjD,aAAa;YACL,MAAM,YAAY,CAAC,4BAA4B,CAAC;;gBARhD,kBAAa,IATZ,mDAAW,EASZ,aAAa,EAAqB;gBAElC,mBAAc,GAAd,cAAc,CAAI;gBAElB,mBAAc,GAAd,cAAc,CAAM;gBAIpB,QAAG,GAAH,GAAG,CAA6C;gBAhBlD,qBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;gBAEtD,wBAAmB,GAAG,IAAI,gBAAgB,EAAE,CAAC;gBAgBnD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YACnD,CAAC;YAED,iBAAiB,CAAC,cAAsB;gBACtC,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,CAAC;gBACD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;gBACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC;YAED,gBAAgB,CAAC,aAAkC;gBACjD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACrC,CAAC;YAED,SAAS;gBACP,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,sDAAW,MAAf,IAAI,CAAa,CAAC,CAAC;YAC5C,CAAC;YAMD,cAAc;gBACZ,OAAO,OAAO,CAAC,OAAO,CACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAC3G,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,SAA2B;gBAC/B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC9C,CAAC;gBAED,IAAI,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAExC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CACtC,KAAK,IAAI,EAAE;oBACT,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;wBACjD,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnC,CAAC;oBAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;oBAEpC,IAAI,GAAG,GAAG,SAAS,IAAI,kBAAkB,EAAE,CAAC;wBAC1C,wCAAwC;wBACxC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;4BACnC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;iCACpD,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,SAAS,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;iCAC/D,IAAI,CAAC,GAAG,CAAC,CAAC;4BACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,gBAAgB,CAAC,IAAI,oBAAoB,IAAI,EAAE,CAAC,CAAC;wBAC/F,CAAC;wBACD,SAAS,GAAG,GAAG,CAAC;oBAClB,CAAC;oBAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;wBACxD,IAAI,CAAC;4BACH,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,CAAC;4BAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;gCACT,6DAA6D;gCAC7D,OAAO;4BACT,CAAC;4BAED,IAAI,CAAC;gCACH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gCAC9F,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE;oCAChC,EAAE,EAAE,GAAG,CAAC,EAAE;oCACV,IAAI,EAAE,GAAG,CAAC,IAAI;oCACd,OAAO;iCACR,CAAC,CAAC;4BACL,CAAC;4BAAC,OAAO,GAAG,EAAE,CAAC;gCACb,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,8BAA8B,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,KAAM,GAAa,CAAC,KAAK,EAAE,CAC9F,CAAC;4BACJ,CAAC;wBACH,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;wBAC5C,CAAC;oBACH,CAAC;gBACH,CAAC,EACD,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,cAAc,CACpB,CAAC;gBAEF,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YACzE,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,CAAC;oBACtC,OAAO;gBACT,CAAC;gBAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;gBAEhC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACjC,CAAC;YAMO,KAAK,CAAC,IAAI,CAAC,SAA2B,EAAE,GAAe;gBAC7D,IAAI,CAAC;oBACH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,GAAG,CAAC,EAAE,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;wBAChF,KAAK,EAAE,GAAG,CAAC,EAAE;wBACb,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC;qBACtC,CAAC,CAAC;oBACH,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;oBACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC3E,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC5D,IAAI,uBAAA,IAAI,sDAAW,MAAf,IAAI,CAAa,EAAE,CAAC;wBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,4BAA4B,GAAG,CAAC,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC;wBAC3G,MAAM,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;oBACpF,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,2BAA2B,GAAG,CAAC,EAAE,SAAS,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,mBAAmB,CAC3G,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC1C,IAAI,uBAAA,IAAI,sDAAW,MAAf,IAAI,CAAa,EAAE,CAAC;wBACtB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;4BACjF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+CAA+C,GAAG,CAAC,EAAE,SAAS,IAAI,KAAK,GAAG,EAAE,CAAC,CAAC;wBAC9F,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,GAAG,CAAC,EAAE,SAAS,IAAI,KAAK,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;wBACxF,CAAC;wBACD,MAAM,MAAM,GAAI,GAAW,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;wBACpD,MAAM,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,2BAA2B,GAAG,CAAC,EAAE,SAAS,IAAI,oBAAqB,GAAW,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;oBAClH,CAAC;gBACH,CAAC;YACH,CAAC;YAEO,QAAQ,CAAC,OAAyB;gBACxC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBACjC,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;wBAClC,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBAChD,CAAC;oBAED,KAAK,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC;wBAC5C,OAAO,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;oBAC9D,CAAC;oBAED,KAAK,kBAAkB,CAAC,kBAAkB,CAAC,CAAC,CAAC;wBAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;oBAC7D,CAAC;oBAED,KAAK,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;wBACrC,OAAO,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC;oBAED,KAAK,kBAAkB,CAAC,uBAAuB,CAAC,CAAC,CAAC;wBAChD,OAAO,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;oBACjE,CAAC;oBAED,KAAK,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAAC;wBAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;oBAC5D,CAAC;oBAED,KAAK,kBAAkB,CAAC,2BAA2B,CAAC,CAAC,CAAC;wBACpD,OAAO,IAAI,CAAC,aAAa,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;oBACpE,CAAC;oBAED,KAAK,kBAAkB,CAAC,kBAAkB,CAAC,CAAC,CAAC;wBAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;oBAC7D,CAAC;oBAED,KAAK,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;wBACpC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;oBAED,KAAK,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;wBACpC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;oBAED,KAAK,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;wBACpC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;oBAED,KAAK,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;wBACnC,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACjD,CAAC;oBAED,OAAO,CAAC,CAAC,CAAC;wBACR,MAAM,WAAW,GAAU,IAAI,CAAC;wBAChC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;;;;YA5KC,OAAO,IAAI,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,KAAK,CAAC;QACnD,CAAC;;;gCA8EA,SAAS,CAAC,kBAAkB,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;oBAClD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,EAAE;oBACnC,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC;iBAC5D,CAAC,CAAC;YACH,6JAAc,IAAI,6DA+BjB;;;;;SAzJU,WAAW"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-client/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-client/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,gBAAgB,EACxB,SAAS,GAAE,eAAsC,yBAGlD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
2
2
|
import { ProverClient } from './prover-client.js';
|
|
3
|
-
export function createProverClient(config, worldState, broker, telemetry =
|
|
3
|
+
export function createProverClient(config, worldState, broker, telemetry = getTelemetryClient()) {
|
|
4
4
|
return ProverClient.new(config, worldState, broker, telemetry);
|
|
5
5
|
}
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92ZXItY2xpZW50L2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBR25GLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRCxNQUFNLFVBQVUsa0JBQWtCLENBQ2hDLE1BQTBCLEVBQzFCLFVBQW9DLEVBQ3BDLE1BQXdCLEVBQ3hCLFlBQTZCLGtCQUFrQixFQUFFO0lBRWpELE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztBQUNqRSxDQUFDIn0=
|
|
@@ -7,12 +7,14 @@ import { type ProverClientConfig } from '../config.js';
|
|
|
7
7
|
export declare class ProverClient implements EpochProverManager {
|
|
8
8
|
private config;
|
|
9
9
|
private worldState;
|
|
10
|
-
private telemetry;
|
|
11
10
|
private orchestratorClient;
|
|
12
11
|
private agentClient?;
|
|
12
|
+
private telemetry;
|
|
13
13
|
private log;
|
|
14
14
|
private running;
|
|
15
15
|
private agents;
|
|
16
|
+
private proofStore;
|
|
17
|
+
private failedProofStore;
|
|
16
18
|
private constructor();
|
|
17
19
|
createEpochProver(): EpochProver;
|
|
18
20
|
getProverId(): Fr;
|
|
@@ -31,7 +33,7 @@ export declare class ProverClient implements EpochProverManager {
|
|
|
31
33
|
* @param worldState - An instance of the world state
|
|
32
34
|
* @returns An instance of the prover, constructed and started.
|
|
33
35
|
*/
|
|
34
|
-
static new(config: ProverClientConfig, worldState: ForkMerkleTreeOperations, broker: ProvingJobBroker, telemetry
|
|
36
|
+
static new(config: ProverClientConfig, worldState: ForkMerkleTreeOperations, broker: ProvingJobBroker, telemetry?: TelemetryClient): Promise<ProverClient>;
|
|
35
37
|
getProvingJobSource(): ProvingJobConsumer;
|
|
36
38
|
private createAndStartAgents;
|
|
37
39
|
private stopAgents;
|
|
@@ -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;AAC3G,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIxC,OAAO,EAAE,KAAK,eAAe,
|
|
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;AAC3G,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIxC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAOvD,sHAAsH;AACtH,qBAAa,YAAa,YAAW,kBAAkB;IAQnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAZb,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,OAAO;IAYA,iBAAiB,IAAI,WAAW;IAMhC,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5E;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;OAEG;IACU,IAAI;IAQjB;;;;;OAKG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,gBAAgB,EACxB,SAAS,GAAE,eAAsC;IAO5C,mBAAmB,IAAI,kBAAkB;YAQlC,oBAAoB;YA2BpB,UAAU;CAGzB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,GAAG,UAAU,GAAG,QAAQ,EAClD,SAAS,EAAE,eAAe,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAU9B"}
|
|
@@ -2,27 +2,31 @@ import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
|
|
|
2
2
|
import { Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { times } from '@aztec/foundation/collection';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { NativeACVMSimulator } from '@aztec/simulator';
|
|
5
|
+
import { NativeACVMSimulator } from '@aztec/simulator/server';
|
|
6
|
+
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
6
7
|
import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
|
|
7
8
|
import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
|
|
8
|
-
import { InlineProofStore } from '../proving_broker/proof_store.js';
|
|
9
|
+
import { InlineProofStore, createProofStore } from '../proving_broker/proof_store/index.js';
|
|
9
10
|
import { ProvingAgent } from '../proving_broker/proving_agent.js';
|
|
11
|
+
import { ServerEpochProver } from './server-epoch-prover.js';
|
|
10
12
|
/** Manages proving of epochs by orchestrating the proving of individual blocks relying on a pool of prover agents. */
|
|
11
13
|
export class ProverClient {
|
|
12
|
-
constructor(config, worldState,
|
|
14
|
+
constructor(config, worldState, orchestratorClient, agentClient, telemetry = getTelemetryClient(), log = createLogger('prover-client:tx-prover')) {
|
|
13
15
|
this.config = config;
|
|
14
16
|
this.worldState = worldState;
|
|
15
|
-
this.telemetry = telemetry;
|
|
16
17
|
this.orchestratorClient = orchestratorClient;
|
|
17
18
|
this.agentClient = agentClient;
|
|
19
|
+
this.telemetry = telemetry;
|
|
18
20
|
this.log = log;
|
|
19
21
|
this.running = false;
|
|
20
22
|
this.agents = [];
|
|
21
|
-
|
|
22
|
-
|
|
23
|
+
this.proofStore = new InlineProofStore();
|
|
24
|
+
this.failedProofStore = this.config.failedProofStore ? createProofStore(this.config.failedProofStore) : undefined;
|
|
23
25
|
}
|
|
24
26
|
createEpochProver() {
|
|
25
|
-
|
|
27
|
+
const facade = new BrokerCircuitProverFacade(this.orchestratorClient, this.proofStore, this.failedProofStore);
|
|
28
|
+
const orchestrator = new ProvingOrchestrator(this.worldState, facade, this.config.proverId, this.telemetry);
|
|
29
|
+
return new ServerEpochProver(facade, orchestrator);
|
|
26
30
|
}
|
|
27
31
|
getProverId() {
|
|
28
32
|
return this.config.proverId ?? Fr.ZERO;
|
|
@@ -34,9 +38,6 @@ export class ProverClient {
|
|
|
34
38
|
await this.stopAgents();
|
|
35
39
|
await this.createAndStartAgents();
|
|
36
40
|
}
|
|
37
|
-
if (!this.config.realProofs && newConfig.realProofs) {
|
|
38
|
-
// TODO(palla/prover-node): Reset padding tx here once we cache it at this class
|
|
39
|
-
}
|
|
40
41
|
this.config = newConfig;
|
|
41
42
|
}
|
|
42
43
|
/**
|
|
@@ -65,8 +66,8 @@ export class ProverClient {
|
|
|
65
66
|
* @param worldState - An instance of the world state
|
|
66
67
|
* @returns An instance of the prover, constructed and started.
|
|
67
68
|
*/
|
|
68
|
-
static async new(config, worldState, broker, telemetry) {
|
|
69
|
-
const prover = new ProverClient(config, worldState,
|
|
69
|
+
static async new(config, worldState, broker, telemetry = getTelemetryClient()) {
|
|
70
|
+
const prover = new ProverClient(config, worldState, broker, broker, telemetry);
|
|
70
71
|
await prover.start();
|
|
71
72
|
return prover;
|
|
72
73
|
}
|
|
@@ -85,7 +86,7 @@ export class ProverClient {
|
|
|
85
86
|
}
|
|
86
87
|
const proofStore = new InlineProofStore();
|
|
87
88
|
const prover = await buildServerCircuitProver(this.config, this.telemetry);
|
|
88
|
-
this.agents = times(this.config.proverAgentCount, () => new ProvingAgent(this.agentClient, proofStore, prover,
|
|
89
|
+
this.agents = times(this.config.proverAgentCount, () => new ProvingAgent(this.agentClient, proofStore, prover, [], this.config.proverAgentPollIntervalMs, this.telemetry));
|
|
89
90
|
await Promise.all(this.agents.map(agent => agent.start()));
|
|
90
91
|
}
|
|
91
92
|
async stopAgents() {
|
|
@@ -99,6 +100,6 @@ export function buildServerCircuitProver(config, telemetry) {
|
|
|
99
100
|
const simulationProvider = config.acvmBinaryPath
|
|
100
101
|
? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
|
|
101
102
|
: undefined;
|
|
102
|
-
return Promise.resolve(new TestCircuitProver(
|
|
103
|
+
return Promise.resolve(new TestCircuitProver(simulationProvider, config, telemetry));
|
|
103
104
|
}
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92ZXItY2xpZW50L3Byb3Zlci1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFrQyxvQkFBb0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBVzNHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzlELE9BQU8sRUFBd0Isa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUduRixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUN0RixPQUFPLEVBQUUsZ0JBQWdCLEVBQW1CLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDN0csT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTdELHNIQUFzSDtBQUN0SCxNQUFNLE9BQU8sWUFBWTtJQU92QixZQUNVLE1BQTBCLEVBQzFCLFVBQW9DLEVBQ3BDLGtCQUFzQyxFQUN0QyxXQUFnQyxFQUNoQyxZQUE2QixrQkFBa0IsRUFBRSxFQUNqRCxNQUFNLFlBQVksQ0FBQyx5QkFBeUIsQ0FBQztRQUw3QyxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUMxQixlQUFVLEdBQVYsVUFBVSxDQUEwQjtRQUNwQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLGdCQUFXLEdBQVgsV0FBVyxD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
|