@aztec/prover-node 5.0.0-private.20260319 → 5.0.0-rc.1
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/README.md +506 -0
- package/dest/actions/download-epoch-proving-job.js +1 -1
- package/dest/actions/rerun-epoch-proving-job.d.ts +4 -3
- package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -1
- package/dest/actions/rerun-epoch-proving-job.js +103 -21
- package/dest/bin/run-failed-epoch.js +1 -3
- package/dest/checkpoint-store.d.ts +83 -0
- package/dest/checkpoint-store.d.ts.map +1 -0
- package/dest/checkpoint-store.js +181 -0
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +1 -1
- package/dest/factory.d.ts +1 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +22 -8
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/job/checkpoint-prover.d.ts +134 -0
- package/dest/job/checkpoint-prover.d.ts.map +1 -0
- package/dest/job/checkpoint-prover.js +350 -0
- package/dest/job/epoch-session.d.ts +146 -0
- package/dest/job/epoch-session.d.ts.map +1 -0
- package/dest/job/epoch-session.js +709 -0
- package/dest/job/top-tree-job.d.ts +82 -0
- package/dest/job/top-tree-job.d.ts.map +1 -0
- package/dest/job/top-tree-job.js +152 -0
- package/dest/metrics.d.ts +29 -5
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +73 -9
- package/dest/monitors/epoch-monitor.js +6 -2
- package/dest/proof-publishing-service.d.ts +159 -0
- package/dest/proof-publishing-service.d.ts.map +1 -0
- package/dest/proof-publishing-service.js +334 -0
- package/dest/prover-node-publisher.d.ts +18 -11
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +195 -57
- package/dest/prover-node.d.ts +96 -68
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +382 -227
- package/dest/prover-publisher-factory.d.ts +2 -2
- package/dest/prover-publisher-factory.d.ts.map +1 -1
- package/dest/prover-publisher-factory.js +3 -3
- package/dest/session-manager.d.ts +158 -0
- package/dest/session-manager.d.ts.map +1 -0
- package/dest/session-manager.js +452 -0
- package/dest/test/index.d.ts +7 -6
- package/dest/test/index.d.ts.map +1 -1
- package/package.json +23 -23
- package/src/actions/download-epoch-proving-job.ts +1 -1
- package/src/actions/rerun-epoch-proving-job.ts +114 -28
- package/src/bin/run-failed-epoch.ts +1 -2
- package/src/checkpoint-store.ts +213 -0
- package/src/config.ts +2 -1
- package/src/factory.ts +18 -10
- package/src/index.ts +1 -0
- package/src/job/checkpoint-prover.ts +465 -0
- package/src/job/epoch-session.ts +424 -0
- package/src/job/top-tree-job.ts +227 -0
- package/src/metrics.ts +88 -12
- package/src/monitors/epoch-monitor.ts +2 -2
- package/src/proof-publishing-service.ts +424 -0
- package/src/prover-node-publisher.ts +220 -67
- package/src/prover-node.ts +439 -249
- package/src/prover-publisher-factory.ts +3 -3
- package/src/session-manager.ts +552 -0
- package/src/test/index.ts +6 -6
- package/dest/job/epoch-proving-job.d.ts +0 -63
- package/dest/job/epoch-proving-job.d.ts.map +0 -1
- package/dest/job/epoch-proving-job.js +0 -762
- package/src/job/epoch-proving-job.ts +0 -465
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import type { BatchedBlob } from '@aztec/blob-lib/types';
|
|
2
|
+
import type { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
4
|
+
import { type PromiseWithResolvers } from '@aztec/foundation/promise';
|
|
5
|
+
import type { EpochProverFactory } from '@aztec/prover-client';
|
|
6
|
+
import type { Proof } from '@aztec/stdlib/proofs';
|
|
7
|
+
import type { RootRollupPublicInputs } from '@aztec/stdlib/rollup';
|
|
8
|
+
import type { ProverNodeJobMetrics } from '../metrics.js';
|
|
9
|
+
import type { CheckpointProver } from './checkpoint-prover.js';
|
|
10
|
+
/** Result of a successful top-tree run. */
|
|
11
|
+
export type TopTreeProof = {
|
|
12
|
+
publicInputs: RootRollupPublicInputs;
|
|
13
|
+
proof: Proof;
|
|
14
|
+
batchedBlobInputs: BatchedBlob;
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Hooks for tests to interpose around the underlying `topTree.prove(...)` call without
|
|
18
|
+
* monkey-patching the orchestrator.
|
|
19
|
+
*/
|
|
20
|
+
export type TopTreeJobHooks = {
|
|
21
|
+
/** Called immediately before the top tree's `prove` runs. */
|
|
22
|
+
beforeProve?: () => Promise<void> | void;
|
|
23
|
+
/** Called after `prove` returns successfully (not on failure / cancellation). */
|
|
24
|
+
afterProve?: () => Promise<void> | void;
|
|
25
|
+
/**
|
|
26
|
+
* If set, called instead of running the underlying prove. Receives a thunk that
|
|
27
|
+
* runs the real call. Lets tests substitute a synthetic proof or delay/throw without
|
|
28
|
+
* re-implementing the rest of the finalize flow.
|
|
29
|
+
*/
|
|
30
|
+
proveOverride?: (defaultProve: () => Promise<TopTreeProof>) => Promise<TopTreeProof>;
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* Self-contained top-tree job. Constructed from a snapshot of `CheckpointProver`s; runs
|
|
34
|
+
* `topTree.prove(...)` against their pending `blockProofs` promises and exposes the
|
|
35
|
+
* final epoch proof via `result`.
|
|
36
|
+
*
|
|
37
|
+
*/
|
|
38
|
+
export declare class TopTreeJob {
|
|
39
|
+
private readonly epochNumber;
|
|
40
|
+
private readonly deps;
|
|
41
|
+
/** Resolves with the final proof on success; rejects on cancellation or any prove error. */
|
|
42
|
+
readonly result: PromiseWithResolvers<TopTreeProof>;
|
|
43
|
+
/** Snapshot of checkpoint jobs the top tree is built from, in checkpoint-number order. */
|
|
44
|
+
readonly snapshot: readonly CheckpointProver[];
|
|
45
|
+
private readonly topTree;
|
|
46
|
+
private readonly fromCheckpoint;
|
|
47
|
+
private readonly toCheckpoint;
|
|
48
|
+
private cancelled;
|
|
49
|
+
/** Tracks the cancel-driven background teardown so `whenDone()` can await it. */
|
|
50
|
+
private cancelPromise?;
|
|
51
|
+
private readonly executionTimer;
|
|
52
|
+
constructor(epochNumber: EpochNumber, snapshot: readonly CheckpointProver[], deps: {
|
|
53
|
+
proverFactory: EpochProverFactory;
|
|
54
|
+
metrics: ProverNodeJobMetrics;
|
|
55
|
+
log: Logger;
|
|
56
|
+
hooks?: TopTreeJobHooks;
|
|
57
|
+
});
|
|
58
|
+
/** Range covered by this attempt — useful for logging and L1 submission. */
|
|
59
|
+
getRange(): {
|
|
60
|
+
fromCheckpoint: CheckpointNumber;
|
|
61
|
+
toCheckpoint: CheckpointNumber;
|
|
62
|
+
count: number;
|
|
63
|
+
};
|
|
64
|
+
isCancelled(): boolean;
|
|
65
|
+
/** Wall-time since construction — used by the owning job for metrics. */
|
|
66
|
+
elapsedMs(): number;
|
|
67
|
+
/** Kicks off the prove. Returns the result promise (also available as `result.promise`). */
|
|
68
|
+
start(): Promise<TopTreeProof>;
|
|
69
|
+
/**
|
|
70
|
+
* Cancels the in-flight prove. Idempotent. Rejects the result promise with
|
|
71
|
+
* `TopTreeCancelledError`, then kicks off the underlying orchestrator's teardown
|
|
72
|
+
* in the background so callers don't block on it. The teardown promise is exposed
|
|
73
|
+
* via `whenDone()` — the parent collects the cancelled job and awaits all
|
|
74
|
+
* pending top-tree teardowns at the end of the epoch.
|
|
75
|
+
*/
|
|
76
|
+
cancel(): void;
|
|
77
|
+
/** Resolves once the cancel-driven teardown of the underlying orchestrator has unwound. */
|
|
78
|
+
whenDone(): Promise<void>;
|
|
79
|
+
private runCancel;
|
|
80
|
+
private run;
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9wLXRyZWUtam9iLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvam9iL3RvcC10cmVlLWpvYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxvQkFBb0IsRUFBd0IsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBTy9ELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRCwyQ0FBMkM7QUFDM0MsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixZQUFZLEVBQUUsc0JBQXNCLENBQUM7SUFDckMsS0FBSyxFQUFFLEtBQUssQ0FBQztJQUNiLGlCQUFpQixFQUFFLFdBQVcsQ0FBQztDQUNoQyxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FBRztJQUM1Qiw2REFBNkQ7SUFDN0QsV0FBVyxDQUFDLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQ3pDLGlGQUFpRjtJQUNqRixVQUFVLENBQUMsRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUM7SUFDeEM7Ozs7T0FJRztJQUNILGFBQWEsQ0FBQyxFQUFFLENBQUMsWUFBWSxFQUFFLE1BQU0sT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztDQUN0RixDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxxQkFBYSxVQUFVO0lBZ0JuQixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFFNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBakJ2Qiw0RkFBNEY7SUFDNUYsUUFBUSxDQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQyxZQUFZLENBQUMsQ0FBMEI7SUFFN0UsMEZBQTBGO0lBQzFGLFFBQVEsQ0FBQyxRQUFRLEVBQUUsU0FBUyxnQkFBZ0IsRUFBRSxDQUFDO0lBRS9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFzQjtJQUM5QyxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBbUI7SUFDbEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQW1CO0lBQ2hELE9BQU8sQ0FBQyxTQUFTLENBQVM7SUFDMUIsaUZBQWlGO0lBQ2pGLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBZ0I7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWU7SUFFOUMsWUFDbUIsV0FBVyxFQUFFLFdBQVcsRUFDekMsUUFBUSxFQUFFLFNBQVMsZ0JBQWdCLEVBQUUsRUFDcEIsSUFBSSxFQUFFO1FBQ3JCLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQztRQUNsQyxPQUFPLEVBQUUsb0JBQW9CLENBQUM7UUFDOUIsR0FBRyxFQUFFLE1BQU0sQ0FBQztRQUNaLEtBQUssQ0FBQyxFQUFFLGVBQWUsQ0FBQztLQUN6QixFQThCRjtJQUVELDhFQUE0RTtJQUNyRSxRQUFRLElBQUk7UUFBRSxjQUFjLEVBQUUsZ0JBQWdCLENBQUM7UUFBQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FFckc7SUFFTSxXQUFXLElBQUksT0FBTyxDQUU1QjtJQUVELDJFQUF5RTtJQUNsRSxTQUFTLElBQUksTUFBTSxDQUV6QjtJQUVELDRGQUE0RjtJQUNyRixLQUFLLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUdwQztJQUVEOzs7Ozs7T0FNRztJQUNJLE1BQU0sSUFBSSxJQUFJLENBbUJwQjtJQUVELDJGQUEyRjtJQUM5RSxRQUFRLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlyQztZQUVhLFNBQVM7WUFhVCxHQUFHO0NBdURsQiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"top-tree-job.d.ts","sourceRoot":"","sources":["../../src/job/top-tree-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,oBAAoB,EAAwB,MAAM,2BAA2B,CAAC;AAE5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAO/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,2CAA2C;AAC3C,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,EAAE,sBAAsB,CAAC;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,EAAE,WAAW,CAAC;CAChC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACzC,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACxC;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CACtF,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAU;IAgBnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAjBvB,4FAA4F;IAC5F,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAA0B;IAE7E,0FAA0F;IAC1F,QAAQ,CAAC,QAAQ,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAE/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,iFAAiF;IACjF,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAe;IAE9C,YACmB,WAAW,EAAE,WAAW,EACzC,QAAQ,EAAE,SAAS,gBAAgB,EAAE,EACpB,IAAI,EAAE;QACrB,aAAa,EAAE,kBAAkB,CAAC;QAClC,OAAO,EAAE,oBAAoB,CAAC;QAC9B,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,eAAe,CAAC;KACzB,EA8BF;IAED,8EAA4E;IACrE,QAAQ,IAAI;QAAE,cAAc,EAAE,gBAAgB,CAAC;QAAC,YAAY,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAErG;IAEM,WAAW,IAAI,OAAO,CAE5B;IAED,2EAAyE;IAClE,SAAS,IAAI,MAAM,CAEzB;IAED,4FAA4F;IACrF,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC,CAGpC;IAED;;;;;;OAMG;IACI,MAAM,IAAI,IAAI,CAmBpB;IAED,2FAA2F;IAC9E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAIrC;YAEa,SAAS;YAaT,GAAG;CAuDlB"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
2
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
3
|
+
import { buildFinalBlobChallenges } from '@aztec/prover-client/helpers';
|
|
4
|
+
import { TopTreeCancelledError } from '@aztec/prover-client/orchestrator';
|
|
5
|
+
/**
|
|
6
|
+
* Self-contained top-tree job. Constructed from a snapshot of `CheckpointProver`s; runs
|
|
7
|
+
* `topTree.prove(...)` against their pending `blockProofs` promises and exposes the
|
|
8
|
+
* final epoch proof via `result`.
|
|
9
|
+
*
|
|
10
|
+
*/ export class TopTreeJob {
|
|
11
|
+
epochNumber;
|
|
12
|
+
deps;
|
|
13
|
+
/** Resolves with the final proof on success; rejects on cancellation or any prove error. */ result;
|
|
14
|
+
/** Snapshot of checkpoint jobs the top tree is built from, in checkpoint-number order. */ snapshot;
|
|
15
|
+
topTree;
|
|
16
|
+
fromCheckpoint;
|
|
17
|
+
toCheckpoint;
|
|
18
|
+
cancelled;
|
|
19
|
+
/** Tracks the cancel-driven background teardown so `whenDone()` can await it. */ cancelPromise;
|
|
20
|
+
executionTimer;
|
|
21
|
+
constructor(epochNumber, snapshot, deps){
|
|
22
|
+
this.epochNumber = epochNumber;
|
|
23
|
+
this.deps = deps;
|
|
24
|
+
this.result = promiseWithResolvers();
|
|
25
|
+
this.cancelled = false;
|
|
26
|
+
this.executionTimer = new Timer();
|
|
27
|
+
if (snapshot.length === 0) {
|
|
28
|
+
throw new Error(`Cannot construct TopTreeJob for epoch ${epochNumber}: empty snapshot`);
|
|
29
|
+
}
|
|
30
|
+
for(let i = 1; i < snapshot.length; i++){
|
|
31
|
+
const prev = snapshot[i - 1].checkpoint.number;
|
|
32
|
+
const curr = snapshot[i].checkpoint.number;
|
|
33
|
+
if (curr !== prev + 1) {
|
|
34
|
+
throw new Error(`Cannot construct TopTreeJob for epoch ${epochNumber}: checkpoint numbers must be contiguous, got gap between ${prev} and ${curr}`);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
this.snapshot = snapshot;
|
|
38
|
+
this.fromCheckpoint = snapshot[0].checkpoint.number;
|
|
39
|
+
this.toCheckpoint = snapshot[snapshot.length - 1].checkpoint.number;
|
|
40
|
+
this.topTree = deps.proverFactory.createTopTreeOrchestrator();
|
|
41
|
+
deps.log.info(`Created TopTreeJob for epoch ${epochNumber} covering checkpoints ${this.fromCheckpoint}..${this.toCheckpoint}`, {
|
|
42
|
+
epochNumber,
|
|
43
|
+
fromCheckpoint: this.fromCheckpoint,
|
|
44
|
+
toCheckpoint: this.toCheckpoint,
|
|
45
|
+
checkpointCount: snapshot.length
|
|
46
|
+
});
|
|
47
|
+
// Mark the result's rejection branch as observed so a cancellation before any
|
|
48
|
+
// consumer awaits does not surface as unhandled.
|
|
49
|
+
this.result.promise.catch(()=>{});
|
|
50
|
+
}
|
|
51
|
+
/** Range covered by this attempt — useful for logging and L1 submission. */ getRange() {
|
|
52
|
+
return {
|
|
53
|
+
fromCheckpoint: this.fromCheckpoint,
|
|
54
|
+
toCheckpoint: this.toCheckpoint,
|
|
55
|
+
count: this.snapshot.length
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
isCancelled() {
|
|
59
|
+
return this.cancelled;
|
|
60
|
+
}
|
|
61
|
+
/** Wall-time since construction — used by the owning job for metrics. */ elapsedMs() {
|
|
62
|
+
return this.executionTimer.ms();
|
|
63
|
+
}
|
|
64
|
+
/** Kicks off the prove. Returns the result promise (also available as `result.promise`). */ start() {
|
|
65
|
+
void this.run();
|
|
66
|
+
return this.result.promise;
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Cancels the in-flight prove. Idempotent. Rejects the result promise with
|
|
70
|
+
* `TopTreeCancelledError`, then kicks off the underlying orchestrator's teardown
|
|
71
|
+
* in the background so callers don't block on it. The teardown promise is exposed
|
|
72
|
+
* via `whenDone()` — the parent collects the cancelled job and awaits all
|
|
73
|
+
* pending top-tree teardowns at the end of the epoch.
|
|
74
|
+
*/ cancel() {
|
|
75
|
+
if (this.cancelled) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this.cancelled = true;
|
|
79
|
+
this.deps.log.info(`Cancelling TopTreeJob for epoch ${this.epochNumber} (checkpoints ${this.fromCheckpoint}..${this.toCheckpoint})`, {
|
|
80
|
+
epochNumber: this.epochNumber,
|
|
81
|
+
fromCheckpoint: this.fromCheckpoint,
|
|
82
|
+
toCheckpoint: this.toCheckpoint,
|
|
83
|
+
elapsedMs: this.executionTimer.ms()
|
|
84
|
+
});
|
|
85
|
+
this.result.reject(new TopTreeCancelledError());
|
|
86
|
+
// Fire and forget: parent awaits the cancel-driven teardown via whenDone(); the
|
|
87
|
+
// chained .catch swallows rejections so the unawaited promise doesn't surface
|
|
88
|
+
// as an unhandled rejection.
|
|
89
|
+
this.cancelPromise = this.runCancel().catch(()=>{});
|
|
90
|
+
}
|
|
91
|
+
/** Resolves once the cancel-driven teardown of the underlying orchestrator has unwound. */ async whenDone() {
|
|
92
|
+
if (this.cancelPromise) {
|
|
93
|
+
await this.cancelPromise;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async runCancel() {
|
|
97
|
+
try {
|
|
98
|
+
this.topTree.cancel({
|
|
99
|
+
abortJobs: true
|
|
100
|
+
});
|
|
101
|
+
} catch (err) {
|
|
102
|
+
this.deps.log.error('Error cancelling top tree', err);
|
|
103
|
+
}
|
|
104
|
+
try {
|
|
105
|
+
await this.topTree.stop();
|
|
106
|
+
} catch (err) {
|
|
107
|
+
this.deps.log.error('Error stopping top tree', err);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
async run() {
|
|
111
|
+
try {
|
|
112
|
+
const blobTimer = new Timer();
|
|
113
|
+
const blobFieldsPerCheckpoint = this.snapshot.map((j)=>j.checkpoint.toBlobFields());
|
|
114
|
+
const finalBlobBatchingChallenges = await buildFinalBlobChallenges(blobFieldsPerCheckpoint);
|
|
115
|
+
this.deps.metrics.recordBlobProcessing(blobTimer.ms());
|
|
116
|
+
this.deps.log.verbose(`Built final blob batching challenges for epoch ${this.epochNumber} in ${blobTimer.ms()}ms`, {
|
|
117
|
+
epochNumber: this.epochNumber,
|
|
118
|
+
checkpointCount: this.snapshot.length,
|
|
119
|
+
durationMs: blobTimer.ms()
|
|
120
|
+
});
|
|
121
|
+
const checkpointData = this.snapshot.map((j)=>({
|
|
122
|
+
blockProofs: j.whenBlockProofsReady(),
|
|
123
|
+
l2ToL1MsgsPerBlock: j.checkpoint.blocks.map((b)=>b.body.txEffects.map((tx)=>tx.l2ToL1Msgs)),
|
|
124
|
+
blobFields: j.checkpoint.toBlobFields(),
|
|
125
|
+
previousBlockHeader: j.previousBlockHeader,
|
|
126
|
+
previousArchiveSiblingPath: j.previousArchiveSiblingPath
|
|
127
|
+
}));
|
|
128
|
+
const defaultProve = ()=>this.topTree.prove(this.epochNumber, this.snapshot.length, finalBlobBatchingChallenges, checkpointData);
|
|
129
|
+
await this.deps.hooks?.beforeProve?.();
|
|
130
|
+
const proveTimer = new Timer();
|
|
131
|
+
this.deps.log.info(`Starting top-tree prove for epoch ${this.epochNumber} (checkpoints ${this.fromCheckpoint}..${this.toCheckpoint})`, {
|
|
132
|
+
epochNumber: this.epochNumber,
|
|
133
|
+
fromCheckpoint: this.fromCheckpoint,
|
|
134
|
+
toCheckpoint: this.toCheckpoint,
|
|
135
|
+
checkpointCount: this.snapshot.length
|
|
136
|
+
});
|
|
137
|
+
const proof = await (this.deps.hooks?.proveOverride ? this.deps.hooks.proveOverride(defaultProve) : defaultProve());
|
|
138
|
+
await this.deps.hooks?.afterProve?.();
|
|
139
|
+
this.deps.log.info(`Top-tree prove succeeded for epoch ${this.epochNumber} in ${proveTimer.ms()}ms`, {
|
|
140
|
+
epochNumber: this.epochNumber,
|
|
141
|
+
fromCheckpoint: this.fromCheckpoint,
|
|
142
|
+
toCheckpoint: this.toCheckpoint,
|
|
143
|
+
durationMs: proveTimer.ms(),
|
|
144
|
+
totalElapsedMs: this.executionTimer.ms()
|
|
145
|
+
});
|
|
146
|
+
this.result.resolve(proof);
|
|
147
|
+
} catch (err) {
|
|
148
|
+
// Cancel paths surface as TopTreeCancelledError; everything else propagates as-is.
|
|
149
|
+
this.result.reject(err);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
package/dest/metrics.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import type { RollupContract } from '@aztec/ethereum/contracts';
|
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { L1PublishProofStats } from '@aztec/stdlib/stats';
|
|
4
4
|
import { type Gauge, type Histogram, type Meter, type TelemetryClient, type Tracer, type UpDownCounter } from '@aztec/telemetry-client';
|
|
5
|
+
import type { CheckpointStore } from './checkpoint-store.js';
|
|
6
|
+
import type { SessionManager } from './session-manager.js';
|
|
5
7
|
export declare class ProverNodeJobMetrics {
|
|
6
8
|
private meter;
|
|
7
9
|
readonly tracer: Tracer;
|
|
@@ -12,17 +14,29 @@ export declare class ProverNodeJobMetrics {
|
|
|
12
14
|
provingJobBlocks: Gauge;
|
|
13
15
|
provingJobTransactions: Gauge;
|
|
14
16
|
private blobProcessingDuration;
|
|
15
|
-
private chonkVerifierDuration;
|
|
16
17
|
private blockProcessingDuration;
|
|
17
18
|
private checkpointProcessingDuration;
|
|
18
|
-
|
|
19
|
+
/** Observable gauges for live state. Registered via `observeState(...)` once the
|
|
20
|
+
* CheckpointStore and SessionManager are available. */
|
|
21
|
+
private activeCheckpoints;
|
|
22
|
+
private activeEpochSessions;
|
|
23
|
+
private stateObserver;
|
|
24
|
+
private stateObservedMetrics;
|
|
19
25
|
constructor(meter: Meter, tracer: Tracer, logger?: import("@aztec/foundation/log").Logger);
|
|
20
26
|
recordProvingJob(executionTimeMs: number, totalTimeMs: number, numCheckpoints: number, numBlocks: number, numTxs: number): void;
|
|
21
27
|
recordBlobProcessing(durationMs: number): void;
|
|
22
|
-
recordChonkVerifier(durationMs: number): void;
|
|
23
28
|
recordBlockProcessing(durationMs: number): void;
|
|
24
29
|
recordCheckpointProcessing(durationMs: number): void;
|
|
25
|
-
|
|
30
|
+
/**
|
|
31
|
+
* Registers observable gauges for the prover-node's live state: how many canonical
|
|
32
|
+
* checkpoint provers are in the store, and how many epoch sessions are live (broken
|
|
33
|
+
* down by kind). Idempotent — repeated calls re-arm with the latest references.
|
|
34
|
+
*
|
|
35
|
+
* Call this once the `SessionManager` has been constructed (i.e. inside `ProverNode.start()`).
|
|
36
|
+
*/
|
|
37
|
+
observeState(checkpointStore: CheckpointStore, sessionManager: SessionManager): void;
|
|
38
|
+
/** Tears down the observable callback registered by `observeState`. Idempotent. */
|
|
39
|
+
stopObservingState(): void;
|
|
26
40
|
}
|
|
27
41
|
export declare class ProverNodeRewardsMetrics {
|
|
28
42
|
private meter;
|
|
@@ -38,6 +52,12 @@ export declare class ProverNodeRewardsMetrics {
|
|
|
38
52
|
stop(): void;
|
|
39
53
|
private observe;
|
|
40
54
|
}
|
|
55
|
+
export type EstimatedSubmitProofStats = {
|
|
56
|
+
gasLimit: bigint;
|
|
57
|
+
baseFeePerGas: bigint;
|
|
58
|
+
maxPriorityFeePerGas: bigint;
|
|
59
|
+
estimatedTotalFee: bigint;
|
|
60
|
+
};
|
|
41
61
|
export declare class ProverNodePublisherMetrics {
|
|
42
62
|
readonly client: TelemetryClient;
|
|
43
63
|
private logger;
|
|
@@ -50,12 +70,16 @@ export declare class ProverNodePublisherMetrics {
|
|
|
50
70
|
txBlobDataGasUsed: Histogram;
|
|
51
71
|
txBlobDataGasCost: Histogram;
|
|
52
72
|
txTotalFee: Histogram;
|
|
73
|
+
private txGasEstimated;
|
|
74
|
+
private gasPriceEstimated;
|
|
75
|
+
private txTotalFeeEstimated;
|
|
53
76
|
private senderBalance;
|
|
54
77
|
private meter;
|
|
55
78
|
constructor(client: TelemetryClient, name?: string, logger?: import("@aztec/foundation/log").Logger);
|
|
56
79
|
recordFailedTx(): void;
|
|
57
80
|
recordSubmitProof(durationMs: number, stats: L1PublishProofStats): void;
|
|
81
|
+
recordEstimatedSubmitProof(stats: EstimatedSubmitProofStats): void;
|
|
58
82
|
recordSenderBalance(wei: bigint, senderAddress: string): void;
|
|
59
83
|
private recordTx;
|
|
60
84
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQWtCLE1BQU0scUJBQXFCLENBQUM7QUFDL0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUNWLEtBQUssU0FBUyxFQUNkLEtBQUssS0FBSyxFQUdWLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFDWCxLQUFLLGFBQWEsRUFFbkIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRCxxQkFBYSxvQkFBb0I7SUFtQjdCLE9BQU8sQ0FBQyxLQUFLO2FBQ0csTUFBTSxFQUFFLE1BQU07SUFDOUIsT0FBTyxDQUFDLE1BQU07SUFwQmhCLDRCQUE0QixFQUFFLFNBQVMsQ0FBQztJQUN4QyxrQkFBa0IsRUFBRSxTQUFTLENBQUM7SUFDOUIscUJBQXFCLEVBQUUsS0FBSyxDQUFDO0lBQzdCLGdCQUFnQixFQUFFLEtBQUssQ0FBQztJQUN4QixzQkFBc0IsRUFBRSxLQUFLLENBQUM7SUFFOUIsT0FBTyxDQUFDLHNCQUFzQixDQUFRO0lBQ3RDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBWTtJQUMzQyxPQUFPLENBQUMsNEJBQTRCLENBQVk7SUFFaEQ7NERBQ3dEO0lBQ3hELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBOEI7SUFDdkQsT0FBTyxDQUFDLG1CQUFtQixDQUE4QjtJQUN6RCxPQUFPLENBQUMsYUFBYSxDQUEwRDtJQUMvRSxPQUFPLENBQUMsb0JBQW9C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
|
package/dest/metrics.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EAGV,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAEnB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"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"}
|
package/dest/metrics.js
CHANGED
|
@@ -11,24 +11,26 @@ export class ProverNodeJobMetrics {
|
|
|
11
11
|
provingJobBlocks;
|
|
12
12
|
provingJobTransactions;
|
|
13
13
|
blobProcessingDuration;
|
|
14
|
-
chonkVerifierDuration;
|
|
15
14
|
blockProcessingDuration;
|
|
16
15
|
checkpointProcessingDuration;
|
|
17
|
-
|
|
16
|
+
/** Observable gauges for live state. Registered via `observeState(...)` once the
|
|
17
|
+
* CheckpointStore and SessionManager are available. */ activeCheckpoints;
|
|
18
|
+
activeEpochSessions;
|
|
19
|
+
stateObserver;
|
|
20
|
+
stateObservedMetrics;
|
|
18
21
|
constructor(meter, tracer, logger = createLogger('prover-node:publisher:metrics')){
|
|
19
22
|
this.meter = meter;
|
|
20
23
|
this.tracer = tracer;
|
|
21
24
|
this.logger = logger;
|
|
25
|
+
this.stateObservedMetrics = [];
|
|
22
26
|
this.proverEpochExecutionDuration = this.meter.createHistogram(Metrics.PROVER_NODE_EXECUTION_DURATION);
|
|
23
27
|
this.provingJobDuration = this.meter.createHistogram(Metrics.PROVER_NODE_JOB_DURATION);
|
|
24
28
|
this.provingJobCheckpoints = this.meter.createGauge(Metrics.PROVER_NODE_JOB_CHECKPOINTS);
|
|
25
29
|
this.provingJobBlocks = this.meter.createGauge(Metrics.PROVER_NODE_JOB_BLOCKS);
|
|
26
30
|
this.provingJobTransactions = this.meter.createGauge(Metrics.PROVER_NODE_JOB_TRANSACTIONS);
|
|
27
31
|
this.blobProcessingDuration = this.meter.createGauge(Metrics.PROVER_NODE_BLOB_PROCESSING_LAST_DURATION);
|
|
28
|
-
this.chonkVerifierDuration = this.meter.createGauge(Metrics.PROVER_NODE_CHONK_VERIFIER_LAST_DURATION);
|
|
29
32
|
this.blockProcessingDuration = this.meter.createHistogram(Metrics.PROVER_NODE_BLOCK_PROCESSING_DURATION);
|
|
30
33
|
this.checkpointProcessingDuration = this.meter.createHistogram(Metrics.PROVER_NODE_CHECKPOINT_PROCESSING_DURATION);
|
|
31
|
-
this.allCheckpointsProcessingDuration = this.meter.createGauge(Metrics.PROVER_NODE_ALL_CHECKPOINTS_PROCESSING_LAST_DURATION);
|
|
32
34
|
}
|
|
33
35
|
recordProvingJob(executionTimeMs, totalTimeMs, numCheckpoints, numBlocks, numTxs) {
|
|
34
36
|
this.proverEpochExecutionDuration.record(Math.ceil(executionTimeMs));
|
|
@@ -40,17 +42,57 @@ export class ProverNodeJobMetrics {
|
|
|
40
42
|
recordBlobProcessing(durationMs) {
|
|
41
43
|
this.blobProcessingDuration.record(Math.ceil(durationMs));
|
|
42
44
|
}
|
|
43
|
-
recordChonkVerifier(durationMs) {
|
|
44
|
-
this.chonkVerifierDuration.record(Math.ceil(durationMs));
|
|
45
|
-
}
|
|
46
45
|
recordBlockProcessing(durationMs) {
|
|
47
46
|
this.blockProcessingDuration.record(Math.ceil(durationMs));
|
|
48
47
|
}
|
|
49
48
|
recordCheckpointProcessing(durationMs) {
|
|
50
49
|
this.checkpointProcessingDuration.record(Math.ceil(durationMs));
|
|
51
50
|
}
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
/**
|
|
52
|
+
* Registers observable gauges for the prover-node's live state: how many canonical
|
|
53
|
+
* checkpoint provers are in the store, and how many epoch sessions are live (broken
|
|
54
|
+
* down by kind). Idempotent — repeated calls re-arm with the latest references.
|
|
55
|
+
*
|
|
56
|
+
* Call this once the `SessionManager` has been constructed (i.e. inside `ProverNode.start()`).
|
|
57
|
+
*/ observeState(checkpointStore, sessionManager) {
|
|
58
|
+
this.stopObservingState();
|
|
59
|
+
this.activeCheckpoints = this.meter.createObservableGauge(Metrics.PROVER_NODE_ACTIVE_CHECKPOINTS);
|
|
60
|
+
this.activeEpochSessions = this.meter.createObservableGauge(Metrics.PROVER_NODE_ACTIVE_EPOCH_SESSIONS);
|
|
61
|
+
this.stateObserver = (observer)=>{
|
|
62
|
+
observer.observe(this.activeCheckpoints, checkpointStore.listCanonical().length);
|
|
63
|
+
let full = 0;
|
|
64
|
+
let partial = 0;
|
|
65
|
+
for (const session of sessionManager.allSessions()){
|
|
66
|
+
if (session.isTerminal()) {
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
if (session.getKind() === 'full') {
|
|
70
|
+
full++;
|
|
71
|
+
} else {
|
|
72
|
+
partial++;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
observer.observe(this.activeEpochSessions, full, {
|
|
76
|
+
[Attributes.EPOCH_SESSION_KIND]: 'full'
|
|
77
|
+
});
|
|
78
|
+
observer.observe(this.activeEpochSessions, partial, {
|
|
79
|
+
[Attributes.EPOCH_SESSION_KIND]: 'partial'
|
|
80
|
+
});
|
|
81
|
+
};
|
|
82
|
+
this.stateObservedMetrics = [
|
|
83
|
+
this.activeCheckpoints,
|
|
84
|
+
this.activeEpochSessions
|
|
85
|
+
];
|
|
86
|
+
this.meter.addBatchObservableCallback(this.stateObserver, this.stateObservedMetrics);
|
|
87
|
+
}
|
|
88
|
+
/** Tears down the observable callback registered by `observeState`. Idempotent. */ stopObservingState() {
|
|
89
|
+
if (this.stateObserver) {
|
|
90
|
+
this.meter.removeBatchObservableCallback(this.stateObserver, this.stateObservedMetrics);
|
|
91
|
+
this.stateObserver = undefined;
|
|
92
|
+
this.stateObservedMetrics = [];
|
|
93
|
+
this.activeCheckpoints = undefined;
|
|
94
|
+
this.activeEpochSessions = undefined;
|
|
95
|
+
}
|
|
54
96
|
}
|
|
55
97
|
}
|
|
56
98
|
export class ProverNodeRewardsMetrics {
|
|
@@ -119,6 +161,9 @@ export class ProverNodePublisherMetrics {
|
|
|
119
161
|
txBlobDataGasUsed;
|
|
120
162
|
txBlobDataGasCost;
|
|
121
163
|
txTotalFee;
|
|
164
|
+
txGasEstimated;
|
|
165
|
+
gasPriceEstimated;
|
|
166
|
+
txTotalFeeEstimated;
|
|
122
167
|
senderBalance;
|
|
123
168
|
meter;
|
|
124
169
|
constructor(client, name = 'ProverNode', logger = createLogger('prover-node:publisher:metrics')){
|
|
@@ -142,6 +187,9 @@ export class ProverNodePublisherMetrics {
|
|
|
142
187
|
this.txBlobDataGasUsed = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_USED);
|
|
143
188
|
this.txBlobDataGasCost = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_COST);
|
|
144
189
|
this.txTotalFee = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_TOTAL_FEE);
|
|
190
|
+
this.txGasEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_GAS);
|
|
191
|
+
this.gasPriceEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_GAS_PRICE);
|
|
192
|
+
this.txTotalFeeEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_TOTAL_FEE);
|
|
145
193
|
this.senderBalance = this.meter.createGauge(Metrics.L1_PUBLISHER_BALANCE);
|
|
146
194
|
}
|
|
147
195
|
recordFailedTx() {
|
|
@@ -153,6 +201,22 @@ export class ProverNodePublisherMetrics {
|
|
|
153
201
|
recordSubmitProof(durationMs, stats) {
|
|
154
202
|
this.recordTx(durationMs, stats);
|
|
155
203
|
}
|
|
204
|
+
recordEstimatedSubmitProof(stats) {
|
|
205
|
+
const attributes = {
|
|
206
|
+
[Attributes.L1_TX_TYPE]: 'submitProof'
|
|
207
|
+
};
|
|
208
|
+
this.txGasEstimated.record(Number(stats.gasLimit), attributes);
|
|
209
|
+
try {
|
|
210
|
+
this.gasPriceEstimated.record(parseInt(formatEther(stats.baseFeePerGas + stats.maxPriorityFeePerGas, 'gwei'), 10));
|
|
211
|
+
} catch {
|
|
212
|
+
// ignore
|
|
213
|
+
}
|
|
214
|
+
try {
|
|
215
|
+
this.txTotalFeeEstimated.record(parseFloat(formatEther(stats.estimatedTotalFee)));
|
|
216
|
+
} catch {
|
|
217
|
+
// ignore
|
|
218
|
+
}
|
|
219
|
+
}
|
|
156
220
|
recordSenderBalance(wei, senderAddress) {
|
|
157
221
|
const eth = parseFloat(formatEther(wei, 'wei'));
|
|
158
222
|
this.senderBalance.record(eth, {
|
|
@@ -87,9 +87,13 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
async getEpochNumberToProve() {
|
|
90
|
-
const lastBlockProven = await this.l2BlockSource.
|
|
90
|
+
const lastBlockProven = await this.l2BlockSource.getBlockNumber({
|
|
91
|
+
tag: 'proven'
|
|
92
|
+
}) ?? BlockNumber.ZERO;
|
|
91
93
|
const firstBlockToProve = BlockNumber(lastBlockProven + 1);
|
|
92
|
-
const firstBlockHeaderToProve = await this.l2BlockSource.
|
|
94
|
+
const firstBlockHeaderToProve = (await this.l2BlockSource.getBlockData({
|
|
95
|
+
number: firstBlockToProve
|
|
96
|
+
}))?.header;
|
|
93
97
|
if (!firstBlockHeaderToProve) {
|
|
94
98
|
return {
|
|
95
99
|
epochToProve: undefined,
|