@aztec/prover-client 0.0.0-test.1 → 0.0.1-commit.023c3e5
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 +8 -8
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +12 -2
- package/dest/index.d.ts +1 -1
- package/dest/light/index.d.ts +2 -0
- package/dest/light/index.d.ts.map +1 -0
- package/dest/light/index.js +1 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts +47 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -0
- package/dest/light/lightweight_checkpoint_builder.js +200 -0
- package/dest/mocks/fixtures.d.ts +8 -8
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +36 -17
- package/dest/mocks/test_context.d.ts +43 -32
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +149 -87
- package/dest/orchestrator/block-building-helpers.d.ts +37 -30
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +170 -189
- package/dest/orchestrator/block-proving-state.d.ts +70 -48
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +282 -177
- package/dest/orchestrator/checkpoint-proving-state.d.ts +76 -0
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -0
- package/dest/orchestrator/checkpoint-proving-state.js +243 -0
- package/dest/orchestrator/epoch-proving-state.d.ts +43 -28
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +177 -73
- package/dest/orchestrator/index.d.ts +1 -1
- package/dest/orchestrator/orchestrator.d.ts +53 -35
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +855 -302
- package/dest/orchestrator/orchestrator_metrics.d.ts +1 -1
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator_metrics.js +2 -6
- package/dest/orchestrator/tx-proving-state.d.ts +15 -12
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +27 -44
- package/dest/prover-client/factory.d.ts +3 -3
- package/dest/prover-client/factory.d.ts.map +1 -1
- package/dest/prover-client/index.d.ts +1 -1
- package/dest/prover-client/prover-client.d.ts +5 -5
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +11 -7
- package/dest/prover-client/server-epoch-prover.d.ts +16 -12
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +11 -11
- package/dest/proving_broker/broker_prover_facade.d.ts +28 -19
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +62 -43
- package/dest/proving_broker/config.d.ts +23 -10
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +29 -6
- package/dest/proving_broker/factory.d.ts +2 -2
- package/dest/proving_broker/factory.d.ts.map +1 -1
- package/dest/proving_broker/factory.js +5 -1
- package/dest/proving_broker/fixtures.d.ts +3 -2
- package/dest/proving_broker/fixtures.d.ts.map +1 -1
- package/dest/proving_broker/fixtures.js +3 -2
- package/dest/proving_broker/index.d.ts +1 -1
- package/dest/proving_broker/proof_store/factory.d.ts +2 -2
- package/dest/proving_broker/proof_store/factory.js +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.js +1 -0
- package/dest/proving_broker/proof_store/index.d.ts +2 -1
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/index.js +1 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/proof_store.d.ts +1 -1
- package/dest/proving_broker/proving_agent.d.ts +8 -12
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +86 -65
- package/dest/proving_broker/proving_broker.d.ts +13 -4
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +40 -33
- package/dest/proving_broker/proving_broker_database/memory.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +5 -3
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +401 -11
- package/dest/proving_broker/proving_broker_database.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.js +15 -35
- package/dest/proving_broker/proving_job_controller.d.ts +11 -10
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +92 -62
- package/dest/proving_broker/rpc.d.ts +4 -6
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +1 -4
- package/dest/test/mock_proof_store.d.ts +9 -0
- package/dest/test/mock_proof_store.d.ts.map +1 -0
- package/dest/test/mock_proof_store.js +10 -0
- package/dest/test/mock_prover.d.ts +23 -17
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +38 -20
- package/package.json +33 -31
- package/src/config.ts +25 -9
- package/src/light/index.ts +1 -0
- package/src/light/lightweight_checkpoint_builder.ts +289 -0
- package/src/mocks/fixtures.ts +46 -40
- package/src/mocks/test_context.ts +223 -116
- package/src/orchestrator/block-building-helpers.ts +258 -334
- package/src/orchestrator/block-proving-state.ts +325 -231
- package/src/orchestrator/checkpoint-proving-state.ts +349 -0
- package/src/orchestrator/epoch-proving-state.ts +237 -111
- package/src/orchestrator/orchestrator.ts +653 -343
- package/src/orchestrator/orchestrator_metrics.ts +2 -6
- package/src/orchestrator/tx-proving-state.ts +48 -66
- package/src/prover-client/factory.ts +6 -2
- package/src/prover-client/prover-client.ts +41 -29
- package/src/prover-client/server-epoch-prover.ts +40 -22
- package/src/proving_broker/broker_prover_facade.ts +212 -131
- package/src/proving_broker/config.ts +34 -7
- package/src/proving_broker/factory.ts +2 -1
- package/src/proving_broker/fixtures.ts +8 -3
- package/src/proving_broker/proof_store/factory.ts +1 -1
- package/src/proving_broker/proof_store/gcs_proof_store.ts +5 -1
- package/src/proving_broker/proof_store/index.ts +1 -0
- package/src/proving_broker/proof_store/inline_proof_store.ts +1 -1
- package/src/proving_broker/proving_agent.ts +95 -66
- package/src/proving_broker/proving_broker.ts +57 -41
- package/src/proving_broker/proving_broker_database/memory.ts +3 -2
- package/src/proving_broker/proving_broker_database/persisted.ts +29 -13
- package/src/proving_broker/proving_broker_database.ts +2 -1
- package/src/proving_broker/proving_broker_instrumentation.ts +14 -35
- package/src/proving_broker/proving_job_controller.ts +100 -83
- package/src/proving_broker/rpc.ts +1 -6
- package/src/test/mock_proof_store.ts +14 -0
- package/src/test/mock_prover.ts +156 -64
- package/dest/bin/get-proof-inputs.d.ts +0 -2
- package/dest/bin/get-proof-inputs.d.ts.map +0 -1
- package/dest/bin/get-proof-inputs.js +0 -51
- package/dest/block_builder/index.d.ts +0 -6
- package/dest/block_builder/index.d.ts.map +0 -1
- package/dest/block_builder/index.js +0 -1
- package/dest/block_builder/light.d.ts +0 -33
- package/dest/block_builder/light.d.ts.map +0 -1
- package/dest/block_builder/light.js +0 -82
- package/dest/proving_broker/proving_agent_instrumentation.d.ts +0 -8
- package/dest/proving_broker/proving_agent_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent_instrumentation.js +0 -16
- package/src/bin/get-proof-inputs.ts +0 -59
- package/src/block_builder/index.ts +0 -6
- package/src/block_builder/light.ts +0 -101
- package/src/proving_broker/proving_agent_instrumentation.ts +0 -21
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import { BatchedBlobAccumulator } from '@aztec/blob-lib';
|
|
2
|
+
import { OUT_HASH_TREE_HEIGHT } from '@aztec/constants';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { MerkleTreeCalculator, UnbalancedTreeStore, shaMerkleHash } from '@aztec/foundation/trees';
|
|
5
|
+
import { CheckpointMergeRollupPrivateInputs, CheckpointPaddingRollupPrivateInputs, RootRollupPrivateInputs } from '@aztec/stdlib/rollup';
|
|
6
|
+
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
7
|
+
import { toProofData } from './block-building-helpers.js';
|
|
8
|
+
import { CheckpointProvingState } from './checkpoint-proving-state.js';
|
|
6
9
|
var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
|
|
7
10
|
PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_CREATED"] = 0] = "PROVING_STATE_CREATED";
|
|
8
11
|
PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_FULL"] = 1] = "PROVING_STATE_FULL";
|
|
@@ -17,106 +20,211 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
|
|
|
17
20
|
* Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
|
|
18
21
|
*/ export class EpochProvingState {
|
|
19
22
|
epochNumber;
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
totalNumCheckpoints;
|
|
24
|
+
finalBlobBatchingChallenges;
|
|
25
|
+
onCheckpointBlobAccumulatorSet;
|
|
22
26
|
completionCallback;
|
|
23
27
|
rejectionCallback;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
28
|
+
checkpointProofs;
|
|
29
|
+
checkpointPaddingProof;
|
|
30
|
+
rootRollupProof;
|
|
31
|
+
checkpoints;
|
|
32
|
+
startBlobAccumulator;
|
|
33
|
+
endBlobAccumulator;
|
|
34
|
+
finalBatchedBlob;
|
|
27
35
|
provingStateLifecycle;
|
|
28
|
-
// Map from tx hash to
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
constructor(epochNumber, firstBlockNumber, totalNumBlocks, completionCallback, rejectionCallback){
|
|
36
|
+
// Map from tx hash to chonk verifier proof promise. Used when kickstarting chonk verifier proofs before tx processing.
|
|
37
|
+
cachedChonkVerifierProofs;
|
|
38
|
+
constructor(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges, onCheckpointBlobAccumulatorSet, completionCallback, rejectionCallback){
|
|
32
39
|
this.epochNumber = epochNumber;
|
|
33
|
-
this.
|
|
34
|
-
this.
|
|
40
|
+
this.totalNumCheckpoints = totalNumCheckpoints;
|
|
41
|
+
this.finalBlobBatchingChallenges = finalBlobBatchingChallenges;
|
|
42
|
+
this.onCheckpointBlobAccumulatorSet = onCheckpointBlobAccumulatorSet;
|
|
35
43
|
this.completionCallback = completionCallback;
|
|
36
44
|
this.rejectionCallback = rejectionCallback;
|
|
45
|
+
this.checkpoints = [];
|
|
37
46
|
this.provingStateLifecycle = 0;
|
|
38
|
-
this.
|
|
39
|
-
this.
|
|
40
|
-
this.
|
|
47
|
+
this.cachedChonkVerifierProofs = new Map();
|
|
48
|
+
this.checkpointProofs = new UnbalancedTreeStore(totalNumCheckpoints);
|
|
49
|
+
this.startBlobAccumulator = BatchedBlobAccumulator.newWithChallenges(finalBlobBatchingChallenges);
|
|
41
50
|
}
|
|
42
51
|
// Adds a block to the proving state, returns its index
|
|
43
52
|
// Will update the proving life cycle if this is the last block
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
53
|
+
startNewCheckpoint(checkpointIndex, constants, totalNumBlocks, previousBlockHeader, lastArchiveSiblingPath, l1ToL2Messages, lastL1ToL2MessageTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath, newL1ToL2MessageTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath) {
|
|
54
|
+
if (checkpointIndex >= this.totalNumCheckpoints) {
|
|
55
|
+
throw new Error(`Unable to start a new checkpoint at index ${checkpointIndex}. Expected at most ${this.totalNumCheckpoints} checkpoints.`);
|
|
56
|
+
}
|
|
57
|
+
const checkpoint = new CheckpointProvingState(checkpointIndex, constants, totalNumBlocks, this.finalBlobBatchingChallenges, previousBlockHeader, lastArchiveSiblingPath, l1ToL2Messages, lastL1ToL2MessageTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath, newL1ToL2MessageTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath, this, this.onCheckpointBlobAccumulatorSet);
|
|
58
|
+
this.checkpoints[checkpointIndex] = checkpoint;
|
|
59
|
+
if (this.checkpoints.filter((c)=>!!c).length === this.totalNumCheckpoints) {
|
|
49
60
|
this.provingStateLifecycle = 1;
|
|
50
61
|
}
|
|
51
|
-
return
|
|
62
|
+
return checkpoint;
|
|
63
|
+
}
|
|
64
|
+
getCheckpointProvingState(index) {
|
|
65
|
+
return this.checkpoints[index];
|
|
66
|
+
}
|
|
67
|
+
getCheckpointProvingStateByBlockNumber(blockNumber) {
|
|
68
|
+
return this.checkpoints.find((c)=>c && Number(blockNumber) >= Number(c.firstBlockNumber) && Number(blockNumber) < Number(c.firstBlockNumber) + c.totalNumBlocks);
|
|
69
|
+
}
|
|
70
|
+
getBlockProvingStateByBlockNumber(blockNumber) {
|
|
71
|
+
return this.getCheckpointProvingStateByBlockNumber(blockNumber)?.getBlockProvingStateByBlockNumber(blockNumber);
|
|
52
72
|
}
|
|
53
73
|
// Returns true if this proving state is still valid, false otherwise
|
|
54
74
|
verifyState() {
|
|
55
75
|
return this.provingStateLifecycle === 0 || this.provingStateLifecycle === 1;
|
|
56
76
|
}
|
|
57
|
-
// Returns true if we are still able to accept
|
|
58
|
-
|
|
59
|
-
return this.
|
|
77
|
+
// Returns true if we are still able to accept checkpoints, false otherwise.
|
|
78
|
+
isAcceptingCheckpoints() {
|
|
79
|
+
return this.checkpoints.filter((c)=>!!c).length < this.totalNumCheckpoints;
|
|
60
80
|
}
|
|
61
|
-
|
|
62
|
-
return this.
|
|
81
|
+
setCheckpointRootRollupProof(checkpointIndex, provingOutput) {
|
|
82
|
+
return this.checkpointProofs.setLeaf(checkpointIndex, {
|
|
83
|
+
provingOutput
|
|
84
|
+
});
|
|
63
85
|
}
|
|
64
|
-
|
|
65
|
-
this.
|
|
86
|
+
tryStartProvingCheckpointMerge(location) {
|
|
87
|
+
if (this.checkpointProofs.getNode(location)?.isProving) {
|
|
88
|
+
return false;
|
|
89
|
+
} else {
|
|
90
|
+
this.checkpointProofs.setNode(location, {
|
|
91
|
+
isProving: true
|
|
92
|
+
});
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
66
95
|
}
|
|
67
|
-
|
|
68
|
-
this.
|
|
96
|
+
setCheckpointMergeRollupProof(location, provingOutput) {
|
|
97
|
+
this.checkpointProofs.setNode(location, {
|
|
98
|
+
provingOutput
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
tryStartProvingRootRollup() {
|
|
102
|
+
if (this.rootRollupProof?.isProving) {
|
|
103
|
+
return false;
|
|
104
|
+
} else {
|
|
105
|
+
this.rootRollupProof = {
|
|
106
|
+
isProving: true
|
|
107
|
+
};
|
|
108
|
+
return true;
|
|
109
|
+
}
|
|
69
110
|
}
|
|
70
|
-
|
|
71
|
-
this.
|
|
111
|
+
setRootRollupProof(provingOutput) {
|
|
112
|
+
this.rootRollupProof = {
|
|
113
|
+
provingOutput
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
tryStartProvingPaddingCheckpoint() {
|
|
117
|
+
if (this.checkpointPaddingProof?.isProving) {
|
|
118
|
+
return false;
|
|
119
|
+
} else {
|
|
120
|
+
this.checkpointPaddingProof = {
|
|
121
|
+
isProving: true
|
|
122
|
+
};
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
setCheckpointPaddingProof(provingOutput) {
|
|
127
|
+
this.checkpointPaddingProof = {
|
|
128
|
+
provingOutput
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
async accumulateCheckpointOutHashes() {
|
|
132
|
+
const treeCalculator = await MerkleTreeCalculator.create(OUT_HASH_TREE_HEIGHT, undefined, (left, right)=>Promise.resolve(shaMerkleHash(left, right)));
|
|
133
|
+
const computeOutHashHint = async (leaves)=>{
|
|
134
|
+
const tree = await treeCalculator.computeTree(leaves.map((l)=>l.toBuffer()));
|
|
135
|
+
const nextAvailableLeafIndex = leaves.length;
|
|
136
|
+
return {
|
|
137
|
+
treeSnapshot: new AppendOnlyTreeSnapshot(Fr.fromBuffer(tree.root), nextAvailableLeafIndex),
|
|
138
|
+
siblingPath: tree.getSiblingPath(nextAvailableLeafIndex).map(Fr.fromBuffer)
|
|
139
|
+
};
|
|
140
|
+
};
|
|
141
|
+
let hint = this.checkpoints[0]?.getOutHashHint();
|
|
142
|
+
const outHashes = [];
|
|
143
|
+
for(let i = 0; i < this.totalNumCheckpoints; i++){
|
|
144
|
+
const checkpoint = this.checkpoints[i];
|
|
145
|
+
if (!checkpoint) {
|
|
146
|
+
break;
|
|
147
|
+
}
|
|
148
|
+
// If hints are not set yet, it must be the first checkpoint. Compute the hints with an empty tree.
|
|
149
|
+
hint ??= await computeOutHashHint([]);
|
|
150
|
+
checkpoint.setOutHashHint(hint);
|
|
151
|
+
// Get the out hash for this checkpoint.
|
|
152
|
+
const outHash = checkpoint.accumulateBlockOutHashes();
|
|
153
|
+
if (!outHash) {
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
outHashes.push(outHash);
|
|
157
|
+
// Get or create hints for the next checkpoint.
|
|
158
|
+
hint = checkpoint.getOutHashHintForNextCheckpoint() ?? await computeOutHashHint(outHashes);
|
|
159
|
+
checkpoint.setOutHashHintForNextCheckpoint(hint);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
async setBlobAccumulators() {
|
|
163
|
+
let previousAccumulator = this.startBlobAccumulator;
|
|
164
|
+
// Accumulate blobs as far as we can for this epoch.
|
|
165
|
+
for(let i = 0; i < this.totalNumCheckpoints; i++){
|
|
166
|
+
const checkpoint = this.checkpoints[i];
|
|
167
|
+
if (!checkpoint) {
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
const endAccumulator = checkpoint.getEndBlobAccumulator() || await checkpoint.accumulateBlobs(previousAccumulator);
|
|
171
|
+
if (!endAccumulator) {
|
|
172
|
+
break;
|
|
173
|
+
}
|
|
174
|
+
previousAccumulator = endAccumulator;
|
|
175
|
+
// If this is the last checkpoint, set the end blob accumulator.
|
|
176
|
+
if (i === this.totalNumCheckpoints - 1) {
|
|
177
|
+
this.endBlobAccumulator = endAccumulator;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
async finalizeBatchedBlob() {
|
|
182
|
+
if (!this.endBlobAccumulator) {
|
|
183
|
+
throw new Error('End blob accumulator not ready.');
|
|
184
|
+
}
|
|
185
|
+
this.finalBatchedBlob = await this.endBlobAccumulator.finalize(true);
|
|
72
186
|
}
|
|
73
187
|
getParentLocation(location) {
|
|
74
|
-
return this.
|
|
188
|
+
return this.checkpointProofs.getParentLocation(location);
|
|
75
189
|
}
|
|
76
|
-
|
|
77
|
-
const [left, right] = this.
|
|
190
|
+
getCheckpointMergeRollupInputs(mergeLocation) {
|
|
191
|
+
const [left, right] = this.checkpointProofs.getChildren(mergeLocation).map((c)=>c?.provingOutput);
|
|
78
192
|
if (!left || !right) {
|
|
79
|
-
throw new Error('At
|
|
193
|
+
throw new Error('At least one child is not ready for the checkpoint merge rollup.');
|
|
80
194
|
}
|
|
81
|
-
return new
|
|
82
|
-
|
|
83
|
-
|
|
195
|
+
return new CheckpointMergeRollupPrivateInputs([
|
|
196
|
+
toProofData(left),
|
|
197
|
+
toProofData(right)
|
|
84
198
|
]);
|
|
85
199
|
}
|
|
86
|
-
getRootRollupInputs(
|
|
200
|
+
getRootRollupInputs() {
|
|
87
201
|
const [left, right] = this.#getChildProofsForRoot();
|
|
88
202
|
if (!left || !right) {
|
|
89
|
-
throw new Error('At
|
|
203
|
+
throw new Error('At least one child is not ready for the root rollup.');
|
|
90
204
|
}
|
|
91
|
-
return
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
]
|
|
96
|
-
proverId
|
|
205
|
+
return RootRollupPrivateInputs.from({
|
|
206
|
+
previousRollups: [
|
|
207
|
+
toProofData(left),
|
|
208
|
+
toProofData(right)
|
|
209
|
+
]
|
|
97
210
|
});
|
|
98
211
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
throw new Error('Epoch needs one completed block in order to be padded.');
|
|
102
|
-
}
|
|
103
|
-
return this.blocks[0].getPaddingBlockRootInputs(proverId);
|
|
104
|
-
}
|
|
105
|
-
// Returns a specific transaction proving state
|
|
106
|
-
getBlockProvingStateByBlockNumber(blockNumber) {
|
|
107
|
-
return this.blocks.find((block)=>block?.blockNumber === blockNumber);
|
|
212
|
+
getPaddingCheckpointInputs() {
|
|
213
|
+
return new CheckpointPaddingRollupPrivateInputs();
|
|
108
214
|
}
|
|
109
215
|
getEpochProofResult() {
|
|
110
|
-
|
|
216
|
+
const provingOutput = this.rootRollupProof?.provingOutput;
|
|
217
|
+
if (!provingOutput || !this.finalBatchedBlob) {
|
|
111
218
|
throw new Error('Unable to get epoch proof result. Root rollup is not ready.');
|
|
112
219
|
}
|
|
113
220
|
return {
|
|
114
|
-
proof:
|
|
115
|
-
publicInputs:
|
|
221
|
+
proof: provingOutput.proof.binaryProof,
|
|
222
|
+
publicInputs: provingOutput.inputs,
|
|
223
|
+
batchedBlobInputs: this.finalBatchedBlob
|
|
116
224
|
};
|
|
117
225
|
}
|
|
118
|
-
|
|
119
|
-
return this.
|
|
226
|
+
isReadyForCheckpointMerge(location) {
|
|
227
|
+
return !!this.checkpointProofs.getSibling(location)?.provingOutput;
|
|
120
228
|
}
|
|
121
229
|
// Returns true if we have sufficient inputs to execute the block root rollup
|
|
122
230
|
isReadyForRootRollup() {
|
|
@@ -151,13 +259,9 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
|
|
|
151
259
|
index: 0
|
|
152
260
|
};
|
|
153
261
|
// If there's only 1 block, its block root proof will be stored at the root.
|
|
154
|
-
return this.
|
|
155
|
-
this.
|
|
156
|
-
this.
|
|
157
|
-
] : this.
|
|
158
|
-
}
|
|
159
|
-
#getPreviousRollupData({ inputs, proof, verificationKey }) {
|
|
160
|
-
const leafIndex = getVKIndex(verificationKey.keyAsFields);
|
|
161
|
-
return new PreviousRollupBlockData(inputs, proof, verificationKey.keyAsFields, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
|
|
262
|
+
return this.totalNumCheckpoints === 1 ? [
|
|
263
|
+
this.checkpointProofs.getNode(rootLocation)?.provingOutput,
|
|
264
|
+
this.checkpointPaddingProof?.provingOutput
|
|
265
|
+
] : this.checkpointProofs.getChildren(rootLocation).map((c)=>c?.provingOutput);
|
|
162
266
|
}
|
|
163
267
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { ProvingOrchestrator } from './orchestrator.js';
|
|
2
|
-
//# sourceMappingURL=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sbUJBQW1CLENBQUMifQ==
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import { type
|
|
5
|
-
import {
|
|
1
|
+
import { BatchedBlob, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
|
|
2
|
+
import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { type LoggerBindings } from '@aztec/foundation/log';
|
|
5
|
+
import { EthAddress } from '@aztec/stdlib/block';
|
|
6
|
+
import type { EpochProver, ForkMerkleTreeOperations, ReadonlyWorldStateAccess, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
|
|
7
|
+
import type { Proof } from '@aztec/stdlib/proofs';
|
|
8
|
+
import { CheckpointConstantData, RootRollupPublicInputs } from '@aztec/stdlib/rollup';
|
|
9
|
+
import type { BlockHeader, ProcessedTx, Tx } from '@aztec/stdlib/tx';
|
|
10
|
+
import type { UInt64 } from '@aztec/stdlib/types';
|
|
6
11
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
12
|
+
import type { BlockProvingState } from './block-proving-state.js';
|
|
7
13
|
/**
|
|
8
14
|
* Implements an event driven proving scheduler to build the recursive proof tree. The idea being:
|
|
9
15
|
* 1. Transactions are provided to the scheduler post simulation.
|
|
@@ -21,59 +27,67 @@ export declare class ProvingOrchestrator implements EpochProver {
|
|
|
21
27
|
private dbProvider;
|
|
22
28
|
private prover;
|
|
23
29
|
private readonly proverId;
|
|
30
|
+
private readonly cancelJobsOnStop;
|
|
24
31
|
private provingState;
|
|
25
32
|
private pendingProvingJobs;
|
|
26
33
|
private provingPromise;
|
|
27
34
|
private metrics;
|
|
28
35
|
private dbs;
|
|
29
|
-
|
|
36
|
+
private logger;
|
|
37
|
+
constructor(dbProvider: ReadonlyWorldStateAccess & ForkMerkleTreeOperations, prover: ServerCircuitProver, proverId: EthAddress, cancelJobsOnStop?: boolean, telemetryClient?: TelemetryClient, bindings?: LoggerBindings);
|
|
30
38
|
get tracer(): Tracer;
|
|
31
|
-
getProverId():
|
|
39
|
+
getProverId(): EthAddress;
|
|
40
|
+
getNumActiveForks(): number;
|
|
32
41
|
stop(): Promise<void>;
|
|
33
|
-
startNewEpoch(epochNumber:
|
|
42
|
+
startNewEpoch(epochNumber: EpochNumber, totalNumCheckpoints: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges): void;
|
|
43
|
+
/**
|
|
44
|
+
* Starts a new checkpoint.
|
|
45
|
+
* @param checkpointIndex - The index of the checkpoint in the epoch.
|
|
46
|
+
* @param constants - The constants for this checkpoint.
|
|
47
|
+
* @param l1ToL2Messages - The set of L1 to L2 messages to be inserted at the beginning of this checkpoint.
|
|
48
|
+
* @param totalNumBlocks - The total number of blocks expected in the checkpoint (must be at least one).
|
|
49
|
+
* @param headerOfLastBlockInPreviousCheckpoint - The header of the last block in the previous checkpoint.
|
|
50
|
+
*/
|
|
51
|
+
startNewCheckpoint(checkpointIndex: number, constants: CheckpointConstantData, l1ToL2Messages: Fr[], totalNumBlocks: number, headerOfLastBlockInPreviousCheckpoint: BlockHeader): Promise<void>;
|
|
34
52
|
/**
|
|
35
53
|
* Starts off a new block
|
|
36
|
-
* @param
|
|
37
|
-
* @param
|
|
38
|
-
*
|
|
54
|
+
* @param blockNumber - The block number
|
|
55
|
+
* @param timestamp - The timestamp of the block. This is only required for constructing the private inputs for the
|
|
56
|
+
* block that doesn't have any txs.
|
|
57
|
+
* @param totalNumTxs - The total number of txs in the block
|
|
39
58
|
*/
|
|
40
|
-
startNewBlock(
|
|
59
|
+
startNewBlock(blockNumber: BlockNumber, timestamp: UInt64, totalNumTxs: number): Promise<void>;
|
|
41
60
|
/**
|
|
42
61
|
* The interface to add simulated transactions to the scheduler. This can only be called once per block.
|
|
43
62
|
* @param txs - The transactions to be proven
|
|
44
63
|
*/
|
|
45
64
|
addTxs(txs: ProcessedTx[]): Promise<void>;
|
|
46
65
|
/**
|
|
47
|
-
* Kickstarts
|
|
48
|
-
* Note that if the
|
|
66
|
+
* Kickstarts chonk verifier circuits for the specified txs. These will be used during epoch proving.
|
|
67
|
+
* Note that if the chonk verifier circuits are not started this way, they will be started nontheless after processing.
|
|
49
68
|
*/
|
|
50
|
-
|
|
69
|
+
startChonkVerifierCircuits(txs: Tx[]): Promise<void>;
|
|
51
70
|
/**
|
|
52
71
|
* Marks the block as completed.
|
|
53
72
|
* Computes the block header and updates the archive tree.
|
|
54
73
|
*/
|
|
55
|
-
setBlockCompleted(blockNumber:
|
|
56
|
-
|
|
57
|
-
getBlock(index: number): L2Block;
|
|
58
|
-
private buildBlock;
|
|
59
|
-
protected verifyBuiltBlockAgainstSyncedState(l2Block: L2Block, newArchive: AppendOnlyTreeSnapshot): Promise<void>;
|
|
74
|
+
setBlockCompleted(blockNumber: BlockNumber, expectedHeader?: BlockHeader): Promise<BlockHeader>;
|
|
75
|
+
protected verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void>;
|
|
60
76
|
/**
|
|
61
|
-
* Cancel any further proving
|
|
77
|
+
* Cancel any further proving.
|
|
78
|
+
* If cancelJobsOnStop is true, aborts all pending jobs with the broker (which marks them as 'Aborted').
|
|
79
|
+
* If cancelJobsOnStop is false (default), jobs remain in the broker queue and can be reused on restart/reorg.
|
|
62
80
|
*/
|
|
63
81
|
cancel(): void;
|
|
64
82
|
/**
|
|
65
83
|
* Returns the proof for the current epoch.
|
|
66
84
|
*/
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
85
|
+
finalizeEpoch(): Promise<{
|
|
86
|
+
publicInputs: RootRollupPublicInputs;
|
|
87
|
+
proof: Proof;
|
|
88
|
+
batchedBlobInputs: BatchedBlob;
|
|
70
89
|
}>;
|
|
71
|
-
|
|
72
|
-
* Starts the proving process for the given transaction and adds it to our state
|
|
73
|
-
* @param tx - The transaction whose proving we wish to commence
|
|
74
|
-
* @param provingState - The proving state being worked on
|
|
75
|
-
*/
|
|
76
|
-
private prepareTransaction;
|
|
90
|
+
private cleanupDBFork;
|
|
77
91
|
/**
|
|
78
92
|
* Enqueue a job to be scheduled
|
|
79
93
|
* @param provingState - The proving state object being operated on
|
|
@@ -81,22 +95,26 @@ export declare class ProvingOrchestrator implements EpochProver {
|
|
|
81
95
|
* @param job - The actual job, returns a promise notifying of the job's completion
|
|
82
96
|
*/
|
|
83
97
|
private deferredProving;
|
|
84
|
-
private
|
|
98
|
+
private updateL1ToL2MessageTree;
|
|
85
99
|
private prepareBaseRollupInputs;
|
|
86
100
|
private enqueueBaseRollup;
|
|
87
|
-
private
|
|
88
|
-
private
|
|
101
|
+
private getOrEnqueueChonkVerifier;
|
|
102
|
+
private doEnqueueChonkVerifier;
|
|
89
103
|
private enqueueMergeRollup;
|
|
90
104
|
private enqueueBlockRootRollup;
|
|
91
105
|
private enqueueBaseParityCircuit;
|
|
92
106
|
private checkAndEnqueueRootParityCircuit;
|
|
93
107
|
private enqueueRootParityCircuit;
|
|
94
108
|
private enqueueBlockMergeRollup;
|
|
109
|
+
private enqueueCheckpointRootRollup;
|
|
110
|
+
private enqueueCheckpointMergeRollup;
|
|
95
111
|
private enqueueEpochPadding;
|
|
96
112
|
private enqueueRootRollup;
|
|
97
113
|
private checkAndEnqueueNextMergeRollup;
|
|
98
114
|
private checkAndEnqueueBlockRootRollup;
|
|
99
115
|
private checkAndEnqueueNextBlockMergeRollup;
|
|
116
|
+
private checkAndEnqueueCheckpointRootRollup;
|
|
117
|
+
private checkAndEnqueueNextCheckpointMergeRollup;
|
|
100
118
|
private checkAndEnqueueRootRollup;
|
|
101
119
|
/**
|
|
102
120
|
* Executes the VM circuit for a public function, will enqueue the corresponding kernel if the
|
|
@@ -105,6 +123,6 @@ export declare class ProvingOrchestrator implements EpochProver {
|
|
|
105
123
|
* @param txIndex - The index of the transaction being proven
|
|
106
124
|
*/
|
|
107
125
|
private enqueueVM;
|
|
108
|
-
private
|
|
126
|
+
private checkAndEnqueueBaseRollup;
|
|
109
127
|
}
|
|
110
|
-
//# sourceMappingURL=
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JjaGVzdHJhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb3JjaGVzdHJhdG9yL29yY2hlc3RyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLDJCQUEyQixFQUFjLE1BQU0sdUJBQXVCLENBQUM7QUFRN0YsT0FBTyxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUzRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBTXZGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNqRCxPQUFPLEtBQUssRUFDVixXQUFXLEVBQ1gsd0JBQXdCLEVBR3hCLHdCQUF3QixFQUN4QixtQkFBbUIsRUFDcEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBTUwsc0JBQXNCLEVBS3RCLHNCQUFzQixFQUN2QixNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUVMLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFJWixNQUFNLHlCQUF5QixDQUFDO0FBZWpDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFXbEU7Ozs7Ozs7OztHQVNHO0FBRUg7O0dBRUc7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXO0lBV25ELE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxNQUFNO0lB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
|