@aztec/prover-client 0.72.1 → 0.74.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.js +3 -3
- package/dest/mocks/test_context.d.ts +2 -2
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +6 -6
- package/dest/orchestrator/block-building-helpers.d.ts +3 -3
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +14 -13
- package/dest/orchestrator/block-proving-state.d.ts +6 -6
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +27 -25
- 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 +11 -8
- package/dest/orchestrator/orchestrator.d.ts +1 -1
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +59 -59
- package/dest/orchestrator/tx-proving-state.d.ts +2 -2
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +14 -14
- package/dest/prover-client/server-epoch-prover.d.ts +1 -1
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +2 -2
- package/dest/proving_broker/broker_prover_facade.js +3 -3
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +3 -4
- package/dest/proving_broker/proving_broker_database/memory.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +3 -3
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +12 -12
- package/dest/proving_broker/proving_broker_database.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/package.json +11 -11
- package/src/bin/get-proof-inputs.ts +2 -2
- package/src/mocks/test_context.ts +9 -7
- package/src/orchestrator/block-building-helpers.ts +13 -14
- package/src/orchestrator/block-proving-state.ts +26 -24
- package/src/orchestrator/epoch-proving-state.ts +10 -7
- package/src/orchestrator/orchestrator.ts +65 -60
- package/src/orchestrator/tx-proving-state.ts +14 -14
- package/src/prover-client/server-epoch-prover.ts +2 -2
- package/src/proving_broker/broker_prover_facade.ts +3 -3
- package/src/proving_broker/proof_store/inline_proof_store.ts +1 -1
- package/src/proving_broker/proving_broker.ts +2 -4
- package/src/proving_broker/proving_broker_database/memory.ts +2 -2
- package/src/proving_broker/proving_broker_database/persisted.ts +15 -15
- package/src/proving_broker/proving_broker_database.ts +1 -1
|
@@ -2,7 +2,7 @@ import { __esDecorate, __runInitializers } from "tslib";
|
|
|
2
2
|
import { L2Block, MerkleTreeId, toNumBlobFields, } from '@aztec/circuit-types';
|
|
3
3
|
import { AVM_PROOF_LENGTH_IN_FIELDS, AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, BaseParityInputs, Fr, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, VerificationKeyData, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
4
4
|
import { EmptyBlockRootRollupInputs, PrivateBaseRollupInputs, SingleTxBlockRootRollupInputs, TubeInputs, } from '@aztec/circuits.js/rollup';
|
|
5
|
-
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
|
+
import { padArrayEnd, timesParallel } from '@aztec/foundation/collection';
|
|
6
6
|
import { AbortError } from '@aztec/foundation/error';
|
|
7
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
8
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
@@ -146,16 +146,16 @@ let ProvingOrchestrator = (() => {
|
|
|
146
146
|
* Kickstarts tube circuits for the specified txs. These will be used during epoch proving.
|
|
147
147
|
* Note that if the tube circuits are not started this way, they will be started nontheless after processing.
|
|
148
148
|
*/
|
|
149
|
-
startTubeCircuits(txs) {
|
|
149
|
+
async startTubeCircuits(txs) {
|
|
150
150
|
if (!this.provingState?.verifyState()) {
|
|
151
151
|
throw new Error(`Invalid proving state, call startNewEpoch before starting tube circuits`);
|
|
152
152
|
}
|
|
153
153
|
for (const tx of txs) {
|
|
154
|
-
const txHash = tx.getTxHash().toString();
|
|
154
|
+
const txHash = (await tx.getTxHash()).toString();
|
|
155
155
|
const tubeInputs = new TubeInputs(tx.clientIvcProof);
|
|
156
156
|
const tubeProof = promiseWithResolvers();
|
|
157
157
|
logger.debug(`Starting tube circuit for tx ${txHash}`);
|
|
158
|
-
this.doEnqueueTube(txHash, tubeInputs, proof => tubeProof.resolve(proof));
|
|
158
|
+
this.doEnqueueTube(txHash, tubeInputs, proof => Promise.resolve(tubeProof.resolve(proof)));
|
|
159
159
|
this.provingState?.cachedTubeProofs.set(txHash, tubeProof.promise);
|
|
160
160
|
}
|
|
161
161
|
}
|
|
@@ -180,7 +180,7 @@ let ProvingOrchestrator = (() => {
|
|
|
180
180
|
logger.verbose(`Block ${blockNumber} completed. Assembling header.`);
|
|
181
181
|
await this.buildBlock(provingState, expectedHeader);
|
|
182
182
|
// If the proofs were faster than the block building, then we need to try the block root rollup again here
|
|
183
|
-
this.checkAndEnqueueBlockRootRollup(provingState);
|
|
183
|
+
await this.checkAndEnqueueBlockRootRollup(provingState);
|
|
184
184
|
return provingState.block;
|
|
185
185
|
}
|
|
186
186
|
/** Returns the block as built for a given index. */
|
|
@@ -203,7 +203,7 @@ let ProvingOrchestrator = (() => {
|
|
|
203
203
|
logger.error(`Block header mismatch: header=${header} expectedHeader=${expectedHeader}`);
|
|
204
204
|
throw new Error('Block header mismatch');
|
|
205
205
|
}
|
|
206
|
-
logger.verbose(`Updating archive tree with block ${provingState.blockNumber} header ${header.hash().toString()}`);
|
|
206
|
+
logger.verbose(`Updating archive tree with block ${provingState.blockNumber} header ${(await header.hash()).toString()}`);
|
|
207
207
|
await db.updateArchive(header);
|
|
208
208
|
// Assemble the L2 block
|
|
209
209
|
const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
|
|
@@ -309,11 +309,11 @@ let ProvingOrchestrator = (() => {
|
|
|
309
309
|
}
|
|
310
310
|
};
|
|
311
311
|
// let the callstack unwind before adding the job to the queue
|
|
312
|
-
setImmediate(safeJob);
|
|
312
|
+
setImmediate(() => void safeJob());
|
|
313
313
|
}
|
|
314
314
|
async prepareBaseParityInputs(l1ToL2Messages, db) {
|
|
315
315
|
const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 'Too many L1 to L2 messages');
|
|
316
|
-
const baseParityInputs =
|
|
316
|
+
const baseParityInputs = await timesParallel(NUM_BASE_PARITY_PER_ROOT_PARITY, async (i) => BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, await getVKTreeRoot()));
|
|
317
317
|
const l1ToL2MessageSubtreeSiblingPath = assertLength(await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db), L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH);
|
|
318
318
|
// Update the local trees to include the new l1 to l2 messages
|
|
319
319
|
await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
|
|
@@ -347,14 +347,14 @@ let ProvingOrchestrator = (() => {
|
|
|
347
347
|
}
|
|
348
348
|
// Executes the base rollup circuit and stored the output as intermediate state for the parent merge/root circuit
|
|
349
349
|
// Executes the next level of merge if all inputs are available
|
|
350
|
-
enqueueBaseRollup(provingState, txIndex) {
|
|
350
|
+
async enqueueBaseRollup(provingState, txIndex) {
|
|
351
351
|
if (!provingState.verifyState()) {
|
|
352
352
|
logger.debug('Not running base rollup, state invalid');
|
|
353
353
|
return;
|
|
354
354
|
}
|
|
355
355
|
const txProvingState = provingState.getTxProvingState(txIndex);
|
|
356
356
|
const { processedTx } = txProvingState;
|
|
357
|
-
const { rollupType, inputs } = txProvingState.getBaseRollupTypeAndInputs();
|
|
357
|
+
const { rollupType, inputs } = await txProvingState.getBaseRollupTypeAndInputs();
|
|
358
358
|
logger.debug(`Enqueuing deferred proving base rollup for ${processedTx.hash.toString()}`);
|
|
359
359
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, `ProvingOrchestrator.prover.${inputs instanceof PrivateBaseRollupInputs ? 'getPrivateBaseRollupProof' : 'getPublicBaseRollupProof'}`, {
|
|
360
360
|
[Attributes.TX_HASH]: processedTx.hash.toString(),
|
|
@@ -367,15 +367,15 @@ let ProvingOrchestrator = (() => {
|
|
|
367
367
|
else {
|
|
368
368
|
return this.prover.getPublicBaseRollupProof(inputs, signal, provingState.epochNumber);
|
|
369
369
|
}
|
|
370
|
-
}), result => {
|
|
370
|
+
}), async (result) => {
|
|
371
371
|
logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
|
|
372
372
|
validatePartialState(result.inputs.end, txProvingState.treeSnapshots);
|
|
373
373
|
const leafLocation = provingState.setBaseRollupProof(txIndex, result);
|
|
374
374
|
if (provingState.totalNumTxs === 1) {
|
|
375
|
-
this.checkAndEnqueueBlockRootRollup(provingState);
|
|
375
|
+
await this.checkAndEnqueueBlockRootRollup(provingState);
|
|
376
376
|
}
|
|
377
377
|
else {
|
|
378
|
-
this.checkAndEnqueueNextMergeRollup(provingState, leafLocation);
|
|
378
|
+
await this.checkAndEnqueueNextMergeRollup(provingState, leafLocation);
|
|
379
379
|
}
|
|
380
380
|
});
|
|
381
381
|
}
|
|
@@ -388,11 +388,11 @@ let ProvingOrchestrator = (() => {
|
|
|
388
388
|
}
|
|
389
389
|
const txProvingState = provingState.getTxProvingState(txIndex);
|
|
390
390
|
const txHash = txProvingState.processedTx.hash.toString();
|
|
391
|
-
const handleResult = (result) => {
|
|
391
|
+
const handleResult = async (result) => {
|
|
392
392
|
logger.debug(`Got tube proof for tx index: ${txIndex}`, { txHash });
|
|
393
393
|
txProvingState.setTubeProof(result);
|
|
394
394
|
this.provingState?.cachedTubeProofs.delete(txHash);
|
|
395
|
-
this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
|
|
395
|
+
await this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
|
|
396
396
|
};
|
|
397
397
|
if (this.provingState?.cachedTubeProofs.has(txHash)) {
|
|
398
398
|
logger.debug(`Tube proof already enqueued for tx index: ${txIndex}`, { txHash });
|
|
@@ -415,28 +415,28 @@ let ProvingOrchestrator = (() => {
|
|
|
415
415
|
}
|
|
416
416
|
// Executes the merge rollup circuit and stored the output as intermediate state for the parent merge/block root circuit
|
|
417
417
|
// Enqueues the next level of merge if all inputs are available
|
|
418
|
-
enqueueMergeRollup(provingState, location) {
|
|
418
|
+
async enqueueMergeRollup(provingState, location) {
|
|
419
419
|
if (!provingState.verifyState()) {
|
|
420
420
|
logger.debug('Not running merge rollup. State no longer valid.');
|
|
421
421
|
return;
|
|
422
422
|
}
|
|
423
|
-
const inputs = provingState.getMergeRollupInputs(location);
|
|
423
|
+
const inputs = await provingState.getMergeRollupInputs(location);
|
|
424
424
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getMergeRollupProof', {
|
|
425
425
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
426
426
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'merge-rollup',
|
|
427
|
-
}, signal => this.prover.getMergeRollupProof(inputs, signal, provingState.epochNumber)), result => {
|
|
427
|
+
}, signal => this.prover.getMergeRollupProof(inputs, signal, provingState.epochNumber)), async (result) => {
|
|
428
428
|
provingState.setMergeRollupProof(location, result);
|
|
429
|
-
this.checkAndEnqueueNextMergeRollup(provingState, location);
|
|
429
|
+
await this.checkAndEnqueueNextMergeRollup(provingState, location);
|
|
430
430
|
});
|
|
431
431
|
}
|
|
432
432
|
// Executes the block root rollup circuit
|
|
433
|
-
enqueueBlockRootRollup(provingState) {
|
|
433
|
+
async enqueueBlockRootRollup(provingState) {
|
|
434
434
|
if (!provingState.verifyState()) {
|
|
435
435
|
logger.debug('Not running block root rollup, state no longer valid');
|
|
436
436
|
return;
|
|
437
437
|
}
|
|
438
438
|
provingState.blockRootRollupStarted = true;
|
|
439
|
-
const { rollupType, inputs } = provingState.getBlockRootRollupTypeAndInputs(this.proverId);
|
|
439
|
+
const { rollupType, inputs } = await provingState.getBlockRootRollupTypeAndInputs(this.proverId);
|
|
440
440
|
logger.debug(`Enqueuing ${rollupType} for block ${provingState.blockNumber} with ${provingState.newL1ToL2Messages.length} l1 to l2 msgs.`);
|
|
441
441
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockRootRollupProof', {
|
|
442
442
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
@@ -451,10 +451,10 @@ let ProvingOrchestrator = (() => {
|
|
|
451
451
|
else {
|
|
452
452
|
return this.prover.getBlockRootRollupProof(inputs, signal, provingState.epochNumber);
|
|
453
453
|
}
|
|
454
|
-
}), result => {
|
|
454
|
+
}), async (result) => {
|
|
455
455
|
provingState.setBlockRootRollupProof(result);
|
|
456
|
-
const header = provingState.buildHeaderFromProvingOutputs(logger);
|
|
457
|
-
if (!header.hash().equals(provingState.block.header.hash())) {
|
|
456
|
+
const header = await provingState.buildHeaderFromProvingOutputs(logger);
|
|
457
|
+
if (!(await header.hash()).equals(await provingState.block.header.hash())) {
|
|
458
458
|
logger.error(`Block header mismatch\nCircuit:${inspect(header)}\nComputed:${inspect(provingState.block.header)}`);
|
|
459
459
|
provingState.reject(`Block header hash mismatch`);
|
|
460
460
|
}
|
|
@@ -463,10 +463,10 @@ let ProvingOrchestrator = (() => {
|
|
|
463
463
|
const epochProvingState = this.provingState;
|
|
464
464
|
const leafLocation = epochProvingState.setBlockRootRollupProof(provingState.index, result);
|
|
465
465
|
if (epochProvingState.totalNumBlocks === 1) {
|
|
466
|
-
this.enqueueEpochPadding(epochProvingState);
|
|
466
|
+
await this.enqueueEpochPadding(epochProvingState);
|
|
467
467
|
}
|
|
468
468
|
else {
|
|
469
|
-
this.checkAndEnqueueNextBlockMergeRollup(epochProvingState, leafLocation);
|
|
469
|
+
await this.checkAndEnqueueNextBlockMergeRollup(epochProvingState, leafLocation);
|
|
470
470
|
}
|
|
471
471
|
});
|
|
472
472
|
}
|
|
@@ -480,73 +480,73 @@ let ProvingOrchestrator = (() => {
|
|
|
480
480
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBaseParityProof', {
|
|
481
481
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
482
482
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'base-parity',
|
|
483
|
-
}, signal => this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber)), provingOutput => {
|
|
483
|
+
}, signal => this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber)), async (provingOutput) => {
|
|
484
484
|
provingState.setBaseParityProof(index, provingOutput);
|
|
485
|
-
this.checkAndEnqueueRootParityCircuit(provingState);
|
|
485
|
+
await this.checkAndEnqueueRootParityCircuit(provingState);
|
|
486
486
|
});
|
|
487
487
|
}
|
|
488
|
-
checkAndEnqueueRootParityCircuit(provingState) {
|
|
488
|
+
async checkAndEnqueueRootParityCircuit(provingState) {
|
|
489
489
|
if (!provingState.isReadyForRootParity()) {
|
|
490
490
|
return;
|
|
491
491
|
}
|
|
492
|
-
this.enqueueRootParityCircuit(provingState);
|
|
492
|
+
await this.enqueueRootParityCircuit(provingState);
|
|
493
493
|
}
|
|
494
494
|
// Runs the root parity circuit ans stored the outputs
|
|
495
495
|
// Enqueues the root rollup proof if all inputs are available
|
|
496
|
-
enqueueRootParityCircuit(provingState) {
|
|
496
|
+
async enqueueRootParityCircuit(provingState) {
|
|
497
497
|
if (!provingState.verifyState()) {
|
|
498
498
|
logger.debug('Not running root parity. State no longer valid.');
|
|
499
499
|
return;
|
|
500
500
|
}
|
|
501
|
-
const inputs = provingState.getRootParityInputs();
|
|
501
|
+
const inputs = await provingState.getRootParityInputs();
|
|
502
502
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootParityProof', {
|
|
503
503
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
504
504
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-parity',
|
|
505
|
-
}, signal => this.prover.getRootParityProof(inputs, signal, provingState.epochNumber)), result => {
|
|
505
|
+
}, signal => this.prover.getRootParityProof(inputs, signal, provingState.epochNumber)), async (result) => {
|
|
506
506
|
provingState.setRootParityProof(result);
|
|
507
|
-
this.checkAndEnqueueBlockRootRollup(provingState);
|
|
507
|
+
await this.checkAndEnqueueBlockRootRollup(provingState);
|
|
508
508
|
});
|
|
509
509
|
}
|
|
510
510
|
// Executes the block merge rollup circuit and stored the output as intermediate state for the parent merge/block root circuit
|
|
511
511
|
// Enqueues the next level of merge if all inputs are available
|
|
512
|
-
enqueueBlockMergeRollup(provingState, location) {
|
|
512
|
+
async enqueueBlockMergeRollup(provingState, location) {
|
|
513
513
|
if (!provingState.verifyState()) {
|
|
514
514
|
logger.debug('Not running block merge rollup. State no longer valid.');
|
|
515
515
|
return;
|
|
516
516
|
}
|
|
517
|
-
const inputs = provingState.getBlockMergeRollupInputs(location);
|
|
517
|
+
const inputs = await provingState.getBlockMergeRollupInputs(location);
|
|
518
518
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockMergeRollupProof', {
|
|
519
519
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
520
520
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'block-merge-rollup',
|
|
521
|
-
}, signal => this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber)), result => {
|
|
521
|
+
}, signal => this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber)), async (result) => {
|
|
522
522
|
provingState.setBlockMergeRollupProof(location, result);
|
|
523
|
-
this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
|
|
523
|
+
await this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
|
|
524
524
|
});
|
|
525
525
|
}
|
|
526
|
-
enqueueEpochPadding(provingState) {
|
|
526
|
+
async enqueueEpochPadding(provingState) {
|
|
527
527
|
if (!provingState.verifyState()) {
|
|
528
528
|
logger.debug('Not running epoch padding. State no longer valid.');
|
|
529
529
|
return;
|
|
530
530
|
}
|
|
531
531
|
logger.debug('Padding epoch proof with an empty block root proof.');
|
|
532
|
-
const inputs = provingState.getPaddingBlockRootInputs(this.proverId);
|
|
532
|
+
const inputs = await provingState.getPaddingBlockRootInputs(this.proverId);
|
|
533
533
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getEmptyBlockRootRollupProof', {
|
|
534
534
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
535
535
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'empty-block-root-rollup',
|
|
536
|
-
}, signal => this.prover.getEmptyBlockRootRollupProof(inputs, signal, provingState.epochNumber)), result => {
|
|
536
|
+
}, signal => this.prover.getEmptyBlockRootRollupProof(inputs, signal, provingState.epochNumber)), async (result) => {
|
|
537
537
|
logger.debug('Completed proof for padding block root.');
|
|
538
538
|
provingState.setPaddingBlockRootProof(result);
|
|
539
|
-
this.checkAndEnqueueRootRollup(provingState);
|
|
539
|
+
await this.checkAndEnqueueRootRollup(provingState);
|
|
540
540
|
});
|
|
541
541
|
}
|
|
542
542
|
// Executes the root rollup circuit
|
|
543
|
-
enqueueRootRollup(provingState) {
|
|
543
|
+
async enqueueRootRollup(provingState) {
|
|
544
544
|
if (!provingState.verifyState()) {
|
|
545
545
|
logger.debug('Not running root rollup, state no longer valid');
|
|
546
546
|
return;
|
|
547
547
|
}
|
|
548
548
|
logger.debug(`Preparing root rollup`);
|
|
549
|
-
const inputs = provingState.getRootRollupInputs(this.proverId);
|
|
549
|
+
const inputs = await provingState.getRootRollupInputs(this.proverId);
|
|
550
550
|
this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootRollupProof', {
|
|
551
551
|
[Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
|
|
552
552
|
[Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-rollup',
|
|
@@ -556,19 +556,19 @@ let ProvingOrchestrator = (() => {
|
|
|
556
556
|
provingState.resolve({ status: 'success' });
|
|
557
557
|
});
|
|
558
558
|
}
|
|
559
|
-
checkAndEnqueueNextMergeRollup(provingState, currentLocation) {
|
|
559
|
+
async checkAndEnqueueNextMergeRollup(provingState, currentLocation) {
|
|
560
560
|
if (!provingState.isReadyForMergeRollup(currentLocation)) {
|
|
561
561
|
return;
|
|
562
562
|
}
|
|
563
563
|
const parentLocation = provingState.getParentLocation(currentLocation);
|
|
564
564
|
if (parentLocation.level === 0) {
|
|
565
|
-
this.checkAndEnqueueBlockRootRollup(provingState);
|
|
565
|
+
await this.checkAndEnqueueBlockRootRollup(provingState);
|
|
566
566
|
}
|
|
567
567
|
else {
|
|
568
|
-
this.enqueueMergeRollup(provingState, parentLocation);
|
|
568
|
+
await this.enqueueMergeRollup(provingState, parentLocation);
|
|
569
569
|
}
|
|
570
570
|
}
|
|
571
|
-
checkAndEnqueueBlockRootRollup(provingState) {
|
|
571
|
+
async checkAndEnqueueBlockRootRollup(provingState) {
|
|
572
572
|
if (!provingState.isReadyForBlockRootRollup()) {
|
|
573
573
|
logger.debug('Not ready for root rollup');
|
|
574
574
|
return;
|
|
@@ -588,26 +588,26 @@ let ProvingOrchestrator = (() => {
|
|
|
588
588
|
?.close()
|
|
589
589
|
.then(() => this.dbs.delete(blockNumber))
|
|
590
590
|
.catch(err => logger.error(`Error closing db for block ${blockNumber}`, err));
|
|
591
|
-
this.enqueueBlockRootRollup(provingState);
|
|
591
|
+
await this.enqueueBlockRootRollup(provingState);
|
|
592
592
|
}
|
|
593
|
-
checkAndEnqueueNextBlockMergeRollup(provingState, currentLocation) {
|
|
593
|
+
async checkAndEnqueueNextBlockMergeRollup(provingState, currentLocation) {
|
|
594
594
|
if (!provingState.isReadyForBlockMerge(currentLocation)) {
|
|
595
595
|
return;
|
|
596
596
|
}
|
|
597
597
|
const parentLocation = provingState.getParentLocation(currentLocation);
|
|
598
598
|
if (parentLocation.level === 0) {
|
|
599
|
-
this.checkAndEnqueueRootRollup(provingState);
|
|
599
|
+
await this.checkAndEnqueueRootRollup(provingState);
|
|
600
600
|
}
|
|
601
601
|
else {
|
|
602
|
-
this.enqueueBlockMergeRollup(provingState, parentLocation);
|
|
602
|
+
await this.enqueueBlockMergeRollup(provingState, parentLocation);
|
|
603
603
|
}
|
|
604
604
|
}
|
|
605
|
-
checkAndEnqueueRootRollup(provingState) {
|
|
605
|
+
async checkAndEnqueueRootRollup(provingState) {
|
|
606
606
|
if (!provingState.isReadyForRootRollup()) {
|
|
607
607
|
logger.debug('Not ready for root rollup');
|
|
608
608
|
return;
|
|
609
609
|
}
|
|
610
|
-
this.enqueueRootRollup(provingState);
|
|
610
|
+
await this.enqueueRootRollup(provingState);
|
|
611
611
|
}
|
|
612
612
|
/**
|
|
613
613
|
* Executes the VM circuit for a public function, will enqueue the corresponding kernel if the
|
|
@@ -644,20 +644,20 @@ let ProvingOrchestrator = (() => {
|
|
|
644
644
|
}
|
|
645
645
|
}
|
|
646
646
|
});
|
|
647
|
-
this.deferredProving(provingState, doAvmProving, proofAndVk => {
|
|
647
|
+
this.deferredProving(provingState, doAvmProving, async (proofAndVk) => {
|
|
648
648
|
logger.debug(`Proven VM for tx index: ${txIndex}`);
|
|
649
649
|
txProvingState.setAvmProof(proofAndVk);
|
|
650
|
-
this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
|
|
650
|
+
await this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
|
|
651
651
|
});
|
|
652
652
|
}
|
|
653
|
-
checkAndEnqueueNextTxCircuit(provingState, txIndex) {
|
|
653
|
+
async checkAndEnqueueNextTxCircuit(provingState, txIndex) {
|
|
654
654
|
const txProvingState = provingState.getTxProvingState(txIndex);
|
|
655
655
|
if (!txProvingState.ready()) {
|
|
656
656
|
return;
|
|
657
657
|
}
|
|
658
658
|
// We must have completed all proving (tube proof and (if required) vm proof are generated), we now move to the base rollup.
|
|
659
659
|
logger.debug(`Public functions completed for tx ${txIndex} enqueueing base rollup`);
|
|
660
|
-
this.enqueueBaseRollup(provingState, txIndex);
|
|
660
|
+
await this.enqueueBaseRollup(provingState, txIndex);
|
|
661
661
|
}
|
|
662
662
|
},
|
|
663
663
|
(() => {
|
|
@@ -685,4 +685,4 @@ let ProvingOrchestrator = (() => {
|
|
|
685
685
|
_a;
|
|
686
686
|
})();
|
|
687
687
|
export { ProvingOrchestrator };
|
|
688
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
|
|
688
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,13 @@ export declare class TxProvingState {
|
|
|
18
18
|
ready(): boolean;
|
|
19
19
|
getTubeInputs(): TubeInputs;
|
|
20
20
|
getAvmInputs(): import("@aztec/circuits.js").AvmCircuitInputs;
|
|
21
|
-
getBaseRollupTypeAndInputs(): {
|
|
21
|
+
getBaseRollupTypeAndInputs(): Promise<{
|
|
22
22
|
rollupType: string;
|
|
23
23
|
inputs: PublicBaseRollupInputs;
|
|
24
24
|
} | {
|
|
25
25
|
rollupType: string;
|
|
26
26
|
inputs: PrivateBaseRollupInputs;
|
|
27
|
-
}
|
|
27
|
+
}>;
|
|
28
28
|
setTubeProof(tubeProofAndVk: ProofAndVerificationKey<typeof TUBE_PROOF_LENGTH>): void;
|
|
29
29
|
setAvmProof(avmProofAndVk: ProofAndVerificationKey<typeof AVM_PROOF_LENGTH_IN_FIELDS>): void;
|
|
30
30
|
}
|
|
@@ -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;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;
|
|
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;IAIN,0BAA0B;;;;;;;IAchC,YAAY,CAAC,cAAc,EAAE,uBAAuB,CAAC,OAAO,iBAAiB,CAAC;IAI9E,WAAW,CAAC,aAAa,EAAE,uBAAuB,CAAC,OAAO,0BAA0B,CAAC;CAqE7F"}
|
|
@@ -27,17 +27,17 @@ export class TxProvingState {
|
|
|
27
27
|
getAvmInputs() {
|
|
28
28
|
return this.processedTx.avmProvingRequest.inputs;
|
|
29
29
|
}
|
|
30
|
-
getBaseRollupTypeAndInputs() {
|
|
30
|
+
async getBaseRollupTypeAndInputs() {
|
|
31
31
|
if (this.requireAvmProof) {
|
|
32
32
|
return {
|
|
33
33
|
rollupType: 'public-base-rollup',
|
|
34
|
-
inputs: __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPublicBaseInputs).call(this),
|
|
34
|
+
inputs: await __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPublicBaseInputs).call(this),
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
return {
|
|
39
39
|
rollupType: 'private-base-rollup',
|
|
40
|
-
inputs: __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPrivateBaseInputs).call(this),
|
|
40
|
+
inputs: await __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getPrivateBaseInputs).call(this),
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -48,17 +48,17 @@ export class TxProvingState {
|
|
|
48
48
|
this.avm = avmProofAndVk;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
_TxProvingState_instances = new WeakSet(), _TxProvingState_getPrivateBaseInputs = function _TxProvingState_getPrivateBaseInputs() {
|
|
51
|
+
_TxProvingState_instances = new WeakSet(), _TxProvingState_getPrivateBaseInputs = async function _TxProvingState_getPrivateBaseInputs() {
|
|
52
52
|
if (!this.tube) {
|
|
53
53
|
throw new Error('Tx not ready for proving base rollup.');
|
|
54
54
|
}
|
|
55
|
-
const vkData = __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getTubeVkData).call(this);
|
|
55
|
+
const vkData = await __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getTubeVkData).call(this);
|
|
56
56
|
const tubeData = new PrivateTubeData(this.processedTx.data.toPrivateToRollupKernelCircuitPublicInputs(), this.tube.proof, vkData);
|
|
57
57
|
if (!(this.baseRollupHints instanceof PrivateBaseRollupHints)) {
|
|
58
58
|
throw new Error('Mismatched base rollup hints, expected private base rollup hints');
|
|
59
59
|
}
|
|
60
60
|
return new PrivateBaseRollupInputs(tubeData, this.baseRollupHints);
|
|
61
|
-
}, _TxProvingState_getPublicBaseInputs = function _TxProvingState_getPublicBaseInputs() {
|
|
61
|
+
}, _TxProvingState_getPublicBaseInputs = async function _TxProvingState_getPublicBaseInputs() {
|
|
62
62
|
if (!this.processedTx.avmProvingRequest) {
|
|
63
63
|
throw new Error('Should create private base rollup for a tx not requiring avm proof.');
|
|
64
64
|
}
|
|
@@ -68,25 +68,25 @@ _TxProvingState_instances = new WeakSet(), _TxProvingState_getPrivateBaseInputs
|
|
|
68
68
|
if (!this.avm) {
|
|
69
69
|
throw new Error('Tx not ready for proving base rollup: avm proof undefined');
|
|
70
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.
|
|
71
|
+
const tubeData = new PublicTubeData(this.processedTx.data.toPrivateToPublicKernelCircuitPublicInputs(), this.tube.proof, await __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getTubeVkData).call(this));
|
|
72
|
+
const avmProofData = new AvmProofData(this.processedTx.avmProvingRequest.inputs.publicInputs, this.avm.proof, await __classPrivateFieldGet(this, _TxProvingState_instances, "m", _TxProvingState_getAvmVkData).call(this));
|
|
73
73
|
if (!(this.baseRollupHints instanceof PublicBaseRollupHints)) {
|
|
74
74
|
throw new Error('Mismatched base rollup hints, expected public base rollup hints');
|
|
75
75
|
}
|
|
76
76
|
return new PublicBaseRollupInputs(tubeData, avmProofData, this.baseRollupHints);
|
|
77
|
-
}, _TxProvingState_getTubeVkData = function _TxProvingState_getTubeVkData() {
|
|
77
|
+
}, _TxProvingState_getTubeVkData = async function _TxProvingState_getTubeVkData() {
|
|
78
78
|
let vkIndex = TUBE_VK_INDEX;
|
|
79
79
|
try {
|
|
80
|
-
vkIndex = getVKIndex(this.tube.verificationKey);
|
|
80
|
+
vkIndex = await getVKIndex(this.tube.verificationKey);
|
|
81
81
|
}
|
|
82
82
|
catch (_ignored) {
|
|
83
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
84
|
}
|
|
85
|
-
const vkPath = getVKSiblingPath(vkIndex);
|
|
85
|
+
const vkPath = await getVKSiblingPath(vkIndex);
|
|
86
86
|
return new VkWitnessData(this.tube.verificationKey, vkIndex, vkPath);
|
|
87
|
-
}, _TxProvingState_getAvmVkData = function _TxProvingState_getAvmVkData() {
|
|
87
|
+
}, _TxProvingState_getAvmVkData = async function _TxProvingState_getAvmVkData() {
|
|
88
88
|
const vkIndex = AVM_VK_INDEX;
|
|
89
|
-
const vkPath = getVKSiblingPath(vkIndex);
|
|
89
|
+
const vkPath = await getVKSiblingPath(vkIndex);
|
|
90
90
|
return new VkWitnessData(this.avm.verificationKey, AVM_VK_INDEX, vkPath);
|
|
91
91
|
};
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvdHgtcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE9BQU8sRUFFTCxZQUFZLEVBR1osYUFBYSxFQUNiLGFBQWEsR0FDZCxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFDTCxZQUFZLEVBRVosc0JBQXNCLEVBQ3RCLHVCQUF1QixFQUN2QixlQUFlLEVBQ2YscUJBQXFCLEVBQ3JCLHNCQUFzQixFQUN0QixjQUFjLEVBQ2QsVUFBVSxHQUNYLE1BQU0sMkJBQTJCLENBQUM7QUFDbkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBRXZGOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUl6QixZQUNrQixXQUF3QixFQUN2QixlQUFnQyxFQUNqQyxhQUF3RDs7UUFGeEQsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFDdkIsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2pDLGtCQUFhLEdBQWIsYUFBYSxDQUEyQztJQUN2RSxDQUFDO0lBRUosSUFBSSxlQUFlO1FBQ2pCLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUM7SUFDOUMsQ0FBQztJQUVNLEtBQUs7UUFDVixPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVNLGFBQWE7UUFDbEIsT0FBTyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFTSxZQUFZO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBa0IsQ0FBQyxNQUFNLENB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
|