@aztec-labs/prover-node 7.0.0-nightly.20261107 → 7.0.0-nightly.20261109
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/job/epoch-session.d.ts +2 -3
- package/dest/job/epoch-session.d.ts.map +1 -1
- package/dest/job/epoch-session.js +6 -8
- package/dest/prover-node-publisher.d.ts +1 -1
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +2 -1
- package/dest/prover-node.js +2 -2
- package/dest/session-manager.d.ts +1 -1
- package/dest/session-manager.d.ts.map +1 -1
- package/dest/session-manager.js +2 -1
- package/package.json +19 -19
- package/src/job/epoch-session.ts +5 -8
- package/src/prover-node-publisher.ts +2 -1
- package/src/prover-node.ts +4 -4
- package/src/session-manager.ts +2 -1
|
@@ -107,8 +107,7 @@ export declare class EpochSession implements Traceable {
|
|
|
107
107
|
private topTreeJob;
|
|
108
108
|
/** Cancelled top-tree jobs whose teardown is still in flight. Awaited at session stop. */
|
|
109
109
|
private readonly pendingTopTreeCleanups;
|
|
110
|
-
private readonly
|
|
111
|
-
private resolveCompletion;
|
|
110
|
+
private readonly completion;
|
|
112
111
|
/** Stable reference; never mutated after construction. */
|
|
113
112
|
private readonly checkpoints;
|
|
114
113
|
constructor(spec: SessionSpec, checkpoints: readonly CheckpointProver[], deps: EpochSessionDeps);
|
|
@@ -159,4 +158,4 @@ export declare class EpochSession implements Traceable {
|
|
|
159
158
|
protected handleDeadline(): Promise<void>;
|
|
160
159
|
private toTopTreeHooks;
|
|
161
160
|
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtc2Vzc2lvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2pvYi9lcG9jaC1zZXNzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxXQUFXLEVBRVgsS0FBSyxXQUFXLEVBQ2hCLEtBQUssVUFBVSxFQUNoQixNQUFNLHNDQUFzQyxDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ3JFLE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUc1RixPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQVMsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFnQyxNQUFNLHNDQUFzQyxDQUFDO0FBQy9HLE9BQU8sRUFBYyxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLDhCQUE4QixDQUFDO0FBR2xHLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUQsT0FBTyxFQUFvQyxLQUFLLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXhGLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0FBRXJDLHdGQUFzRjtBQUN0RixNQUFNLE1BQU0sV0FBVyxHQUFHLE1BQU0sR0FBRyxTQUFTLENBQUM7QUFFN0M7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sV0FBVyxXQUFXO0lBQzFCLElBQUksRUFBRSxXQUFX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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-session.d.ts","sourceRoot":"","sources":["../../src/job/epoch-session.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"epoch-session.d.ts","sourceRoot":"","sources":["../../src/job/epoch-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -373,6 +373,7 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
|
373
373
|
var _dec, _initProto;
|
|
374
374
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
375
375
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
376
|
+
import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
|
|
376
377
|
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
377
378
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
378
379
|
import { TopTreeCancelledError } from '@aztec-labs/prover-client/orchestrator';
|
|
@@ -442,14 +443,14 @@ _dec = trackSpan('EpochSession.start', function() {
|
|
|
442
443
|
deadlineTimeoutHandler;
|
|
443
444
|
topTreeJob;
|
|
444
445
|
/** Cancelled top-tree jobs whose teardown is still in flight. Awaited at session stop. */ pendingTopTreeCleanups;
|
|
445
|
-
|
|
446
|
-
resolveCompletion;
|
|
446
|
+
completion;
|
|
447
447
|
/** Stable reference; never mutated after construction. */ checkpoints;
|
|
448
448
|
constructor(spec, checkpoints, deps){
|
|
449
449
|
this.spec = spec;
|
|
450
450
|
this.deps = deps;
|
|
451
451
|
this.state = (_initProto(this), 'initialized');
|
|
452
452
|
this.pendingTopTreeCleanups = [];
|
|
453
|
+
this.completion = promiseWithResolvers();
|
|
453
454
|
if (checkpoints.length === 0) {
|
|
454
455
|
throw new Error(`Cannot construct EpochSession for ${specKey(spec)}: empty checkpoint set`);
|
|
455
456
|
}
|
|
@@ -462,9 +463,6 @@ _dec = trackSpan('EpochSession.start', function() {
|
|
|
462
463
|
instanceId: `session-${spec.kind}-${spec.epochNumber}-${spec.fromSlot}-${spec.toSlot}`
|
|
463
464
|
});
|
|
464
465
|
this.tracer = deps.metrics.tracer;
|
|
465
|
-
this.completionPromise = new Promise((resolve)=>{
|
|
466
|
-
this.resolveCompletion = resolve;
|
|
467
|
-
});
|
|
468
466
|
this.scheduleDeadlineStop();
|
|
469
467
|
this.log.info(`Created EpochSession ${this.uuid}`, {
|
|
470
468
|
uuid: this.uuid,
|
|
@@ -495,7 +493,7 @@ _dec = trackSpan('EpochSession.start', function() {
|
|
|
495
493
|
return this.checkpoints;
|
|
496
494
|
}
|
|
497
495
|
/** Resolves when the session reaches a terminal state. */ whenDone() {
|
|
498
|
-
return this.
|
|
496
|
+
return this.completion.promise;
|
|
499
497
|
}
|
|
500
498
|
/** True if the session is in a terminal state. */ isTerminal() {
|
|
501
499
|
return EpochProvingJobTerminalState.includes(this.state);
|
|
@@ -542,7 +540,7 @@ _dec = trackSpan('EpochSession.start', function() {
|
|
|
542
540
|
} finally{
|
|
543
541
|
clearTimeout(this.deadlineTimeoutHandler);
|
|
544
542
|
await this.teardownTopTreeIfNeeded();
|
|
545
|
-
this.
|
|
543
|
+
this.completion.resolve(this.state);
|
|
546
544
|
}
|
|
547
545
|
return this.state;
|
|
548
546
|
}
|
|
@@ -574,7 +572,7 @@ _dec = trackSpan('EpochSession.start', function() {
|
|
|
574
572
|
this.pendingTopTreeCleanups.push(job);
|
|
575
573
|
}
|
|
576
574
|
await this.teardownTopTreeIfNeeded();
|
|
577
|
-
this.
|
|
575
|
+
this.completion.resolve(this.state);
|
|
578
576
|
}
|
|
579
577
|
async run() {
|
|
580
578
|
const timer = new Timer();
|
|
@@ -80,4 +80,4 @@ export declare class ProverNodePublisher {
|
|
|
80
80
|
private getEpochProofPublicInputsArgs;
|
|
81
81
|
private getSubmitEpochProofArgs;
|
|
82
82
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUtcHVibGlzaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLW5vZGUtcHVibGlzaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxXQUFXLEVBQThCLE1BQU0sc0JBQXNCLENBQUM7QUFFL0UsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUNuQixLQUFLLHlCQUF5QixFQUUvQixNQUFNLGdDQUFnQyxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVyRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWhFLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUc1RixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUUxRixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sOEJBQThCLENBQUM7QUFDeEYsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUF3RSxNQUFNLE1BQU0sQ0FBQztBQUl0RyxzRUFBc0U7QUFDdEUsTUFBTSxNQUFNLHNCQUFzQixHQUFHO0lBQ25DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZUFBZSxFQUFFLEVBQUUsQ0FBQztJQUNwQixVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQ2YsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osUUFBUSxFQUFFLEVBQUUsQ0FBQztJQUNiLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO0lBQzVCLEtBQUssRUFBRSxLQUFLLENBQUM7Q0FDZCxDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sc0JBQXNCLEdBQUcsV0FBVyxHQUFHLG1CQUFtQixHQUFHLFFBQVEsQ0FBQztBQUtsRixxQkFBYSxtQkFBbUI7SUFDOUIsT0FBTyxDQUFDLE9BQU8sQ0FBNkI7SUFFNUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFFdEIsU0FBUyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUM7SUFFekMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLEdBQUcsQ0FBQztJQUVyQyxTQUFnQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBRXJDLFlBQ0UsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEVBQ3hDLElBQUksRUFBRTtRQUNKLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNyQixxQkFBcUIsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUNuQyxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7S0FDN0IsRUFDRCxRQUFRLENBQUMsRUFBRSxjQUFjLEVBVTFCO0lBRU0saUJBQWlCLG1CQUV2QjtJQUVNLGdCQUFnQixlQUV0QjtJQUVZLGdCQUFnQixDQUFDLElBQUksRUFBRTtRQUNsQyxXQUFXLEVBQUUsV0FBVyxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNqQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7UUFDL0IsWUFBWSxFQUFFLHNCQUFzQixDQUFDO1FBQ3JDLEtBQUssRUFBRSxLQUFLLENBQUM7UUFDYixpQkFBaUIsRUFBRSxXQUFXLENBQUM7UUFDL0IsWUFBWSxFQUFFLHlCQUF5QixDQUFDO1FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLG1IQUFtSDtRQUNuSCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUN6QixtR0FBbUc7UUFDbkcsUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDO0tBQ2pCLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBdUZsQztZQUVhLDRCQUE0QjtJQXdGMUM7Ozs7T0FJRztJQUNVLDJCQUEyQixDQUFDLElBQUksRUFBRTtRQUM3QyxXQUFXLEVBQUUsV0FBVyxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNqQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7UUFDL0IsWUFBWSxFQUFFLHNCQUFzQixDQUFDO1FBQ3JDLEtBQUssRUFBRSxLQUFLLENBQUM7UUFDYixpQkFBaUIsRUFBRSxXQUFXLENBQUM7UUFDL0IsWUFBWSxFQUFFLHlCQUF5QixDQUFDO1FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLG1IQUFtSDtRQUNuSCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztLQUMxQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ2hCO0lBRUQsT0FBTyxDQUFDLDhCQUE4QjtZQW1CeEIsc0JBQXNCO1lBaUV0Qix3QkFBd0I7SUE4QnRDLE9BQU8sQ0FBQyw2QkFBNkI7SUF5QnJDLE9BQU8sQ0FBQyx1QkFBdUI7Q0E0QmhDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA8B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAE/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAErF,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
|
8
8
|
import { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
9
9
|
import { inspect } from '@aztec-labs/foundation/inspect';
|
|
10
10
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
11
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
11
12
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
12
13
|
import { getTelemetryClient } from '@aztec-labs/telemetry-client';
|
|
13
14
|
import { encodeFunctionData, formatEther, formatGwei } from 'viem';
|
|
@@ -319,7 +320,7 @@ export class ProverNodePublisher {
|
|
|
319
320
|
}
|
|
320
321
|
getSubmitEpochProofArgs(args, provenPrefixLength) {
|
|
321
322
|
// Returns arguments for EpochProofLib.sol -> submitEpochRootProof()
|
|
322
|
-
const proofHex =
|
|
323
|
+
const proofHex = bufferToHex(args.proof.withoutPublicInputs());
|
|
323
324
|
const argsArray = this.getEpochProofPublicInputsArgs(args);
|
|
324
325
|
return {
|
|
325
326
|
start: argsArray[0],
|
package/dest/prover-node.js
CHANGED
|
@@ -372,7 +372,7 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
|
372
372
|
}
|
|
373
373
|
var _initProto;
|
|
374
374
|
import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec-labs/foundation/branded-types';
|
|
375
|
-
import { assertRequired, compact, pick } from '@aztec-labs/foundation/collection';
|
|
375
|
+
import { assertRequired, compact, pick, unique } from '@aztec-labs/foundation/collection';
|
|
376
376
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
377
377
|
import { memoize } from '@aztec-labs/foundation/decorators';
|
|
378
378
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
@@ -728,7 +728,7 @@ import { SessionManager } from './session-manager.js';
|
|
|
728
728
|
return;
|
|
729
729
|
}
|
|
730
730
|
const l1Constants = await this.getL1Constants();
|
|
731
|
-
const affectedEpochs =
|
|
731
|
+
const affectedEpochs = unique(affected.map((p)=>Number(getEpochAtSlot(p.slotNumber, l1Constants)))).map((n)=>EpochNumber(n));
|
|
732
732
|
// The session manager cancels every affected session, which in turn calls
|
|
733
733
|
// publishingService.withdraw(uuid) for each candidate; no separate notification to the
|
|
734
734
|
// publishing service is needed.
|
|
@@ -189,4 +189,4 @@ export declare class SessionManager {
|
|
|
189
189
|
private isProvenChainEncompassing;
|
|
190
190
|
private getL1Constants;
|
|
191
191
|
}
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi1tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2Vzc2lvbi1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3JFLE9BQU8sRUFBZSxLQUFLLFdBQVcsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBR3JGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ3JFLE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUc1RixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BFLE9BQU8sRUFBbUMsS0FBSyxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQVEvRixPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRWpGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzdELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0UsT0FBTyxFQUNMLFlBQVksRUFDWixLQUFLLGdCQUFnQixFQUNyQixLQUFLLGlCQUFpQixFQUV0QixLQUFLLFdBQVcsRUFFakIsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTVFLHVDQUF1QztBQUN2QyxNQUFNLE1BQU0sZ0JBQWdCLEdBQ3hCO0lBQUUsSUFBSSxF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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"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"}
|
package/dest/session-manager.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
|
+
import { unique } from '@aztec-labs/foundation/collection';
|
|
2
3
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
3
4
|
import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
4
5
|
import { RunningPromise } from '@aztec-labs/foundation/running-promise';
|
|
@@ -532,7 +533,7 @@ import { EpochSession, specKey } from './job/epoch-session.js';
|
|
|
532
533
|
return getEpochAtSlot(header.getSlot(), await this.getL1Constants());
|
|
533
534
|
}
|
|
534
535
|
/** Distinct epochs with checkpoints in the store, ascending. The store drops an epoch once its window closes. */ storedEpochs() {
|
|
535
|
-
return
|
|
536
|
+
return unique(this.deps.checkpointStore.list().map((p)=>p.epochNumber));
|
|
536
537
|
}
|
|
537
538
|
checkpointsInEpoch(epoch, l1Constants) {
|
|
538
539
|
const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, l1Constants);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/prover-node",
|
|
3
|
-
"version": "7.0.0-nightly.
|
|
3
|
+
"version": "7.0.0-nightly.20261109",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -56,24 +56,24 @@
|
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"@aztec-foundation/l1-artifacts": "6.0.0-rc.7",
|
|
59
|
-
"@aztec-labs/archiver": "7.0.0-nightly.
|
|
60
|
-
"@aztec-labs/bb-prover": "7.0.0-nightly.
|
|
61
|
-
"@aztec-labs/blob-client": "7.0.0-nightly.
|
|
62
|
-
"@aztec-labs/blob-lib": "7.0.0-nightly.
|
|
63
|
-
"@aztec-labs/constants": "7.0.0-nightly.
|
|
64
|
-
"@aztec-labs/epoch-cache": "7.0.0-nightly.
|
|
65
|
-
"@aztec-labs/ethereum": "7.0.0-nightly.
|
|
66
|
-
"@aztec-labs/foundation": "7.0.0-nightly.
|
|
67
|
-
"@aztec-labs/node-keystore": "7.0.0-nightly.
|
|
68
|
-
"@aztec-labs/node-lib": "7.0.0-nightly.
|
|
69
|
-
"@aztec-labs/noir-protocol-circuits-types": "7.0.0-nightly.
|
|
70
|
-
"@aztec-labs/protocol-contracts": "7.0.0-nightly.
|
|
71
|
-
"@aztec-labs/prover-client": "7.0.0-nightly.
|
|
72
|
-
"@aztec-labs/sequencer-client": "7.0.0-nightly.
|
|
73
|
-
"@aztec-labs/simulator": "7.0.0-nightly.
|
|
74
|
-
"@aztec-labs/stdlib": "7.0.0-nightly.
|
|
75
|
-
"@aztec-labs/telemetry-client": "7.0.0-nightly.
|
|
76
|
-
"@aztec-labs/world-state": "7.0.0-nightly.
|
|
59
|
+
"@aztec-labs/archiver": "7.0.0-nightly.20261109",
|
|
60
|
+
"@aztec-labs/bb-prover": "7.0.0-nightly.20261109",
|
|
61
|
+
"@aztec-labs/blob-client": "7.0.0-nightly.20261109",
|
|
62
|
+
"@aztec-labs/blob-lib": "7.0.0-nightly.20261109",
|
|
63
|
+
"@aztec-labs/constants": "7.0.0-nightly.20261109",
|
|
64
|
+
"@aztec-labs/epoch-cache": "7.0.0-nightly.20261109",
|
|
65
|
+
"@aztec-labs/ethereum": "7.0.0-nightly.20261109",
|
|
66
|
+
"@aztec-labs/foundation": "7.0.0-nightly.20261109",
|
|
67
|
+
"@aztec-labs/node-keystore": "7.0.0-nightly.20261109",
|
|
68
|
+
"@aztec-labs/node-lib": "7.0.0-nightly.20261109",
|
|
69
|
+
"@aztec-labs/noir-protocol-circuits-types": "7.0.0-nightly.20261109",
|
|
70
|
+
"@aztec-labs/protocol-contracts": "7.0.0-nightly.20261109",
|
|
71
|
+
"@aztec-labs/prover-client": "7.0.0-nightly.20261109",
|
|
72
|
+
"@aztec-labs/sequencer-client": "7.0.0-nightly.20261109",
|
|
73
|
+
"@aztec-labs/simulator": "7.0.0-nightly.20261109",
|
|
74
|
+
"@aztec-labs/stdlib": "7.0.0-nightly.20261109",
|
|
75
|
+
"@aztec-labs/telemetry-client": "7.0.0-nightly.20261109",
|
|
76
|
+
"@aztec-labs/world-state": "7.0.0-nightly.20261109",
|
|
77
77
|
"source-map-support": "^0.5.21",
|
|
78
78
|
"tslib": "^2.4.0",
|
|
79
79
|
"viem": "2.57.1"
|
package/src/job/epoch-session.ts
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
} from '@aztec-labs/foundation/branded-types';
|
|
7
7
|
import type { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
8
8
|
import { type Logger, type LoggerBindings, createLogger } from '@aztec-labs/foundation/log';
|
|
9
|
+
import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
|
|
9
10
|
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
10
11
|
import { type DateProvider, Timer } from '@aztec-labs/foundation/timer';
|
|
11
12
|
import type { EpochProverFactory } from '@aztec-labs/prover-client';
|
|
@@ -126,8 +127,7 @@ export class EpochSession implements Traceable {
|
|
|
126
127
|
/** Cancelled top-tree jobs whose teardown is still in flight. Awaited at session stop. */
|
|
127
128
|
private readonly pendingTopTreeCleanups: TopTreeJob[] = [];
|
|
128
129
|
|
|
129
|
-
private readonly
|
|
130
|
-
private resolveCompletion!: (state: EpochProvingJobState) => void;
|
|
130
|
+
private readonly completion = promiseWithResolvers<EpochProvingJobState>();
|
|
131
131
|
|
|
132
132
|
/** Stable reference; never mutated after construction. */
|
|
133
133
|
private readonly checkpoints: readonly CheckpointProver[];
|
|
@@ -147,9 +147,6 @@ export class EpochSession implements Traceable {
|
|
|
147
147
|
instanceId: `session-${spec.kind}-${spec.epochNumber}-${spec.fromSlot}-${spec.toSlot}`,
|
|
148
148
|
});
|
|
149
149
|
this.tracer = deps.metrics.tracer;
|
|
150
|
-
this.completionPromise = new Promise(resolve => {
|
|
151
|
-
this.resolveCompletion = resolve;
|
|
152
|
-
});
|
|
153
150
|
this.scheduleDeadlineStop();
|
|
154
151
|
this.log.info(`Created EpochSession ${this.uuid}`, {
|
|
155
152
|
uuid: this.uuid,
|
|
@@ -189,7 +186,7 @@ export class EpochSession implements Traceable {
|
|
|
189
186
|
|
|
190
187
|
/** Resolves when the session reaches a terminal state. */
|
|
191
188
|
public whenDone(): Promise<EpochProvingJobState> {
|
|
192
|
-
return this.
|
|
189
|
+
return this.completion.promise;
|
|
193
190
|
}
|
|
194
191
|
|
|
195
192
|
/** True if the session is in a terminal state. */
|
|
@@ -249,7 +246,7 @@ export class EpochSession implements Traceable {
|
|
|
249
246
|
} finally {
|
|
250
247
|
clearTimeout(this.deadlineTimeoutHandler);
|
|
251
248
|
await this.teardownTopTreeIfNeeded();
|
|
252
|
-
this.
|
|
249
|
+
this.completion.resolve(this.state);
|
|
253
250
|
}
|
|
254
251
|
return this.state;
|
|
255
252
|
}
|
|
@@ -283,7 +280,7 @@ export class EpochSession implements Traceable {
|
|
|
283
280
|
this.pendingTopTreeCleanups.push(job);
|
|
284
281
|
}
|
|
285
282
|
await this.teardownTopTreeIfNeeded();
|
|
286
|
-
this.
|
|
283
|
+
this.completion.resolve(this.state);
|
|
287
284
|
}
|
|
288
285
|
|
|
289
286
|
private async run(): Promise<void> {
|
|
@@ -14,6 +14,7 @@ import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
|
14
14
|
import { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
15
15
|
import { inspect } from '@aztec-labs/foundation/inspect';
|
|
16
16
|
import { type Logger, type LoggerBindings, createLogger } from '@aztec-labs/foundation/log';
|
|
17
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
17
18
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
18
19
|
import type { PublisherConfig, TxSenderConfig } from '@aztec-labs/sequencer-client';
|
|
19
20
|
import type { Proof } from '@aztec-labs/stdlib/proofs';
|
|
@@ -484,7 +485,7 @@ export class ProverNodePublisher {
|
|
|
484
485
|
provenPrefixLength: number,
|
|
485
486
|
) {
|
|
486
487
|
// Returns arguments for EpochProofLib.sol -> submitEpochRootProof()
|
|
487
|
-
const proofHex: Hex =
|
|
488
|
+
const proofHex: Hex = bufferToHex(args.proof.withoutPublicInputs());
|
|
488
489
|
const argsArray = this.getEpochProofPublicInputsArgs(args);
|
|
489
490
|
return {
|
|
490
491
|
start: argsArray[0],
|
package/src/prover-node.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { Archiver } from '@aztec-labs/archiver';
|
|
|
2
2
|
import type { RollupContract } from '@aztec-labs/ethereum/contracts';
|
|
3
3
|
import type { Delayer } from '@aztec-labs/ethereum/l1-tx-utils';
|
|
4
4
|
import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec-labs/foundation/branded-types';
|
|
5
|
-
import { assertRequired, compact, pick } from '@aztec-labs/foundation/collection';
|
|
5
|
+
import { assertRequired, compact, pick, unique } from '@aztec-labs/foundation/collection';
|
|
6
6
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
7
7
|
import { memoize } from '@aztec-labs/foundation/decorators';
|
|
8
8
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
@@ -447,9 +447,9 @@ export class ProverNode implements L2BlockStreamEventHandler, ProverNodeApi, Tra
|
|
|
447
447
|
return;
|
|
448
448
|
}
|
|
449
449
|
const l1Constants = await this.getL1Constants();
|
|
450
|
-
const affectedEpochs =
|
|
451
|
-
|
|
452
|
-
)
|
|
450
|
+
const affectedEpochs = unique(affected.map(p => Number(getEpochAtSlot(p.slotNumber, l1Constants)))).map(n =>
|
|
451
|
+
EpochNumber(n),
|
|
452
|
+
);
|
|
453
453
|
// The session manager cancels every affected session, which in turn calls
|
|
454
454
|
// publishingService.withdraw(uuid) for each candidate; no separate notification to the
|
|
455
455
|
// publishing service is needed.
|
package/src/session-manager.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { RollupContract } from '@aztec-labs/ethereum/contracts';
|
|
2
2
|
import { BlockNumber, type EpochNumber } from '@aztec-labs/foundation/branded-types';
|
|
3
|
+
import { unique } from '@aztec-labs/foundation/collection';
|
|
3
4
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
4
5
|
import type { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
5
6
|
import { type Logger, type LoggerBindings, createLogger } from '@aztec-labs/foundation/log';
|
|
@@ -632,7 +633,7 @@ export class SessionManager {
|
|
|
632
633
|
|
|
633
634
|
/** Distinct epochs with checkpoints in the store, ascending. The store drops an epoch once its window closes. */
|
|
634
635
|
private storedEpochs(): EpochNumber[] {
|
|
635
|
-
return
|
|
636
|
+
return unique(this.deps.checkpointStore.list().map(p => p.epochNumber));
|
|
636
637
|
}
|
|
637
638
|
|
|
638
639
|
private checkpointsInEpoch(epoch: EpochNumber, l1Constants: L1RollupConstants): CheckpointProver[] {
|