@aztec/prover-node 0.76.4 → 0.77.0-testnet-ignition.17

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.
Files changed (45) hide show
  1. package/dest/config.d.ts +5 -2
  2. package/dest/config.d.ts.map +1 -1
  3. package/dest/config.js +24 -30
  4. package/dest/factory.d.ts +6 -3
  5. package/dest/factory.d.ts.map +1 -1
  6. package/dest/factory.js +21 -14
  7. package/dest/http.d.ts +1 -1
  8. package/dest/http.d.ts.map +1 -1
  9. package/dest/http.js +2 -4
  10. package/dest/index.js +0 -1
  11. package/dest/job/epoch-proving-job.d.ts +7 -4
  12. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  13. package/dest/job/epoch-proving-job.js +233 -193
  14. package/dest/metrics.d.ts +5 -2
  15. package/dest/metrics.d.ts.map +1 -1
  16. package/dest/metrics.js +50 -25
  17. package/dest/monitors/epoch-monitor.d.ts +22 -3
  18. package/dest/monitors/epoch-monitor.d.ts.map +1 -1
  19. package/dest/monitors/epoch-monitor.js +102 -48
  20. package/dest/monitors/index.js +0 -1
  21. package/dest/prover-coordination/config.js +2 -3
  22. package/dest/prover-coordination/factory.d.ts +5 -5
  23. package/dest/prover-coordination/factory.d.ts.map +1 -1
  24. package/dest/prover-coordination/factory.js +11 -8
  25. package/dest/prover-coordination/index.js +0 -1
  26. package/dest/prover-node-publisher.d.ts +5 -4
  27. package/dest/prover-node-publisher.d.ts.map +1 -1
  28. package/dest/prover-node-publisher.js +60 -52
  29. package/dest/prover-node.d.ts +12 -7
  30. package/dest/prover-node.d.ts.map +1 -1
  31. package/dest/prover-node.js +237 -224
  32. package/dest/test/index.d.ts +2 -2
  33. package/dest/test/index.d.ts.map +1 -1
  34. package/dest/test/index.js +2 -1
  35. package/package.json +21 -22
  36. package/src/config.ts +23 -31
  37. package/src/factory.ts +17 -8
  38. package/src/http.ts +2 -2
  39. package/src/job/epoch-proving-job.ts +11 -13
  40. package/src/metrics.ts +26 -5
  41. package/src/monitors/epoch-monitor.ts +57 -12
  42. package/src/prover-coordination/factory.ts +9 -12
  43. package/src/prover-node-publisher.ts +21 -14
  44. package/src/prover-node.ts +24 -22
  45. package/src/test/index.ts +2 -2
@@ -1,215 +1,255 @@
1
- import { __esDecorate, __runInitializers } from "tslib";
2
- import { EpochProvingJobTerminalState, } from '@aztec/circuit-types';
1
+ function _ts_decorate(decorators, target, key, desc) {
2
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
+ else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
6
+ }
3
7
  import { asyncPool } from '@aztec/foundation/async-pool';
4
8
  import { createLogger } from '@aztec/foundation/log';
5
9
  import { promiseWithResolvers } from '@aztec/foundation/promise';
6
10
  import { Timer } from '@aztec/foundation/timer';
11
+ import { EpochProvingJobTerminalState } from '@aztec/stdlib/interfaces/server';
7
12
  import { Attributes, trackSpan } from '@aztec/telemetry-client';
8
13
  import * as crypto from 'node:crypto';
9
14
  /**
10
15
  * Job that grabs a range of blocks from the unfinalised chain from L1, gets their txs given their hashes,
11
16
  * re-executes their public calls, generates a rollup proof, and submits it to L1. This job will update the
12
17
  * world state as part of public call execution via the public processor.
13
- */
14
- let EpochProvingJob = (() => {
15
- var _a;
16
- let _instanceExtraInitializers = [];
17
- let _run_decorators;
18
- return _a = class EpochProvingJob {
19
- constructor(dbProvider, epochNumber, blocks, txs, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource, metrics, deadline, config = { parallelBlockLimit: 32 }, cleanUp = () => Promise.resolve()) {
20
- this.dbProvider = (__runInitializers(this, _instanceExtraInitializers), dbProvider);
21
- this.epochNumber = epochNumber;
22
- this.blocks = blocks;
23
- this.txs = txs;
24
- this.prover = prover;
25
- this.publicProcessorFactory = publicProcessorFactory;
26
- this.publisher = publisher;
27
- this.l2BlockSource = l2BlockSource;
28
- this.l1ToL2MessageSource = l1ToL2MessageSource;
29
- this.metrics = metrics;
30
- this.deadline = deadline;
31
- this.config = config;
32
- this.cleanUp = cleanUp;
33
- this.state = 'initialized';
34
- this.log = createLogger('prover-node:epoch-proving-job');
35
- this.uuid = crypto.randomUUID();
36
- this.tracer = metrics.client.getTracer('EpochProvingJob');
37
- }
38
- getId() {
39
- return this.uuid;
18
+ */ export class EpochProvingJob {
19
+ dbProvider;
20
+ epochNumber;
21
+ blocks;
22
+ txs;
23
+ prover;
24
+ publicProcessorFactory;
25
+ publisher;
26
+ l2BlockSource;
27
+ l1ToL2MessageSource;
28
+ metrics;
29
+ deadline;
30
+ config;
31
+ cleanUp;
32
+ state;
33
+ log;
34
+ uuid;
35
+ runPromise;
36
+ deadlineTimeoutHandler;
37
+ tracer;
38
+ constructor(dbProvider, epochNumber, blocks, txs, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource, metrics, deadline, config = {
39
+ parallelBlockLimit: 32
40
+ }, cleanUp = ()=>Promise.resolve()){
41
+ this.dbProvider = dbProvider;
42
+ this.epochNumber = epochNumber;
43
+ this.blocks = blocks;
44
+ this.txs = txs;
45
+ this.prover = prover;
46
+ this.publicProcessorFactory = publicProcessorFactory;
47
+ this.publisher = publisher;
48
+ this.l2BlockSource = l2BlockSource;
49
+ this.l1ToL2MessageSource = l1ToL2MessageSource;
50
+ this.metrics = metrics;
51
+ this.deadline = deadline;
52
+ this.config = config;
53
+ this.cleanUp = cleanUp;
54
+ this.state = 'initialized';
55
+ this.log = createLogger('prover-node:epoch-proving-job');
56
+ this.uuid = crypto.randomUUID();
57
+ this.tracer = metrics.client.getTracer('EpochProvingJob');
58
+ }
59
+ getId() {
60
+ return this.uuid;
61
+ }
62
+ getState() {
63
+ return this.state;
64
+ }
65
+ getEpochNumber() {
66
+ return this.epochNumber;
67
+ }
68
+ /**
69
+ * Proves the given epoch and submits the proof to L1.
70
+ */ async run() {
71
+ this.scheduleDeadlineStop();
72
+ const epochNumber = Number(this.epochNumber);
73
+ const epochSizeBlocks = this.blocks.length;
74
+ const epochSizeTxs = this.blocks.reduce((total, current)=>total + current.body.txEffects.length, 0);
75
+ const [fromBlock, toBlock] = [
76
+ this.blocks[0].number,
77
+ this.blocks.at(-1).number
78
+ ];
79
+ this.log.info(`Starting epoch ${epochNumber} proving job with blocks ${fromBlock} to ${toBlock}`, {
80
+ fromBlock,
81
+ toBlock,
82
+ epochSizeBlocks,
83
+ epochNumber,
84
+ uuid: this.uuid
85
+ });
86
+ this.progressState('processing');
87
+ const timer = new Timer();
88
+ const { promise, resolve } = promiseWithResolvers();
89
+ this.runPromise = promise;
90
+ try {
91
+ this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks);
92
+ await this.prover.startTubeCircuits(this.txs);
93
+ await asyncPool(this.config.parallelBlockLimit, this.blocks, async (block)=>{
94
+ this.checkState();
95
+ const globalVariables = block.header.globalVariables;
96
+ const txs = await this.getTxs(block);
97
+ const l1ToL2Messages = await this.getL1ToL2Messages(block);
98
+ const previousHeader = await this.getBlockHeader(block.number - 1);
99
+ this.log.verbose(`Starting processing block ${block.number}`, {
100
+ number: block.number,
101
+ blockHash: (await block.hash()).toString(),
102
+ lastArchive: block.header.lastArchive.root,
103
+ noteHashTreeRoot: block.header.state.partial.noteHashTree.root,
104
+ nullifierTreeRoot: block.header.state.partial.nullifierTree.root,
105
+ publicDataTreeRoot: block.header.state.partial.publicDataTree.root,
106
+ previousHeader: previousHeader.hash(),
107
+ uuid: this.uuid,
108
+ ...globalVariables
109
+ });
110
+ // Start block proving
111
+ await this.prover.startNewBlock(globalVariables, l1ToL2Messages, previousHeader);
112
+ // Process public fns
113
+ const db = await this.dbProvider.fork(block.number - 1);
114
+ const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, true);
115
+ const processed = await this.processTxs(publicProcessor, txs);
116
+ await this.prover.addTxs(processed);
117
+ await db.close();
118
+ this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
119
+ blockNumber: block.number,
120
+ blockHash: (await block.hash()).toString(),
121
+ uuid: this.uuid
122
+ });
123
+ // Mark block as completed to pad it
124
+ await this.prover.setBlockCompleted(block.number, block.header);
125
+ });
126
+ const executionTime = timer.ms();
127
+ this.progressState('awaiting-prover');
128
+ const { publicInputs, proof } = await this.prover.finaliseEpoch();
129
+ this.log.info(`Finalised proof for epoch ${epochNumber}`, {
130
+ epochNumber,
131
+ uuid: this.uuid,
132
+ duration: timer.ms()
133
+ });
134
+ this.progressState('publishing-proof');
135
+ const success = await this.publisher.submitEpochProof({
136
+ fromBlock,
137
+ toBlock,
138
+ epochNumber,
139
+ publicInputs,
140
+ proof
141
+ });
142
+ if (!success) {
143
+ throw new Error('Failed to submit epoch proof to L1');
40
144
  }
41
- getState() {
42
- return this.state;
145
+ this.log.info(`Submitted proof for epoch ${epochNumber} (blocks ${fromBlock} to ${toBlock})`, {
146
+ epochNumber,
147
+ uuid: this.uuid
148
+ });
149
+ this.state = 'completed';
150
+ this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
151
+ } catch (err) {
152
+ if (err && err.name === 'HaltExecutionError') {
153
+ this.log.warn(`Halted execution of epoch ${epochNumber} prover job`, {
154
+ uuid: this.uuid,
155
+ epochNumber
156
+ });
157
+ return;
43
158
  }
44
- getEpochNumber() {
45
- return this.epochNumber;
159
+ this.log.error(`Error running epoch ${epochNumber} prover job`, err, {
160
+ uuid: this.uuid,
161
+ epochNumber
162
+ });
163
+ this.state = 'failed';
164
+ } finally{
165
+ clearTimeout(this.deadlineTimeoutHandler);
166
+ await this.cleanUp(this);
167
+ await this.prover.stop();
168
+ resolve();
169
+ }
170
+ }
171
+ progressState(state) {
172
+ this.checkState();
173
+ this.state = state;
174
+ }
175
+ checkState() {
176
+ if (this.state === 'timed-out' || this.state === 'stopped' || this.state === 'failed') {
177
+ throw new HaltExecutionError(this.state);
178
+ }
179
+ }
180
+ async stop(state = 'stopped') {
181
+ this.state = state;
182
+ this.prover.cancel();
183
+ // TODO(palla/prover): Stop the publisher as well
184
+ if (this.runPromise) {
185
+ await this.runPromise;
186
+ }
187
+ }
188
+ scheduleDeadlineStop() {
189
+ const deadline = this.deadline;
190
+ if (deadline) {
191
+ const timeout = deadline.getTime() - Date.now();
192
+ if (timeout <= 0) {
193
+ throw new Error('Cannot start job with deadline in the past');
46
194
  }
47
- /**
48
- * Proves the given epoch and submits the proof to L1.
49
- */
50
- async run() {
51
- this.scheduleDeadlineStop();
52
- const epochNumber = Number(this.epochNumber);
53
- const epochSizeBlocks = this.blocks.length;
54
- const epochSizeTxs = this.blocks.reduce((total, current) => total + current.body.txEffects.length, 0);
55
- const [fromBlock, toBlock] = [this.blocks[0].number, this.blocks.at(-1).number];
56
- this.log.info(`Starting epoch ${epochNumber} proving job with blocks ${fromBlock} to ${toBlock}`, {
57
- fromBlock,
58
- toBlock,
59
- epochSizeBlocks,
60
- epochNumber,
195
+ this.deadlineTimeoutHandler = setTimeout(()=>{
196
+ if (EpochProvingJobTerminalState.includes(this.state)) {
197
+ return;
198
+ }
199
+ this.log.warn('Stopping job due to deadline hit', {
61
200
  uuid: this.uuid,
201
+ epochNumber: this.epochNumber
62
202
  });
63
- this.progressState('processing');
64
- const timer = new Timer();
65
- const { promise, resolve } = promiseWithResolvers();
66
- this.runPromise = promise;
67
- try {
68
- this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks);
69
- await this.prover.startTubeCircuits(this.txs);
70
- await asyncPool(this.config.parallelBlockLimit, this.blocks, async (block) => {
71
- this.checkState();
72
- const globalVariables = block.header.globalVariables;
73
- const txs = await this.getTxs(block);
74
- const l1ToL2Messages = await this.getL1ToL2Messages(block);
75
- const previousHeader = (await this.getBlockHeader(block.number - 1));
76
- this.log.verbose(`Starting processing block ${block.number}`, {
77
- number: block.number,
78
- blockHash: (await block.hash()).toString(),
79
- lastArchive: block.header.lastArchive.root,
80
- noteHashTreeRoot: block.header.state.partial.noteHashTree.root,
81
- nullifierTreeRoot: block.header.state.partial.nullifierTree.root,
82
- publicDataTreeRoot: block.header.state.partial.publicDataTree.root,
83
- previousHeader: previousHeader.hash(),
84
- uuid: this.uuid,
85
- ...globalVariables,
86
- });
87
- // Start block proving
88
- await this.prover.startNewBlock(globalVariables, l1ToL2Messages, previousHeader);
89
- // Process public fns
90
- const db = await this.dbProvider.fork(block.number - 1);
91
- const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, true);
92
- const processed = await this.processTxs(publicProcessor, txs);
93
- await this.prover.addTxs(processed);
94
- await db.close();
95
- this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
96
- blockNumber: block.number,
97
- blockHash: (await block.hash()).toString(),
98
- uuid: this.uuid,
99
- });
100
- // Mark block as completed to pad it
101
- await this.prover.setBlockCompleted(block.number, block.header);
102
- });
103
- const executionTime = timer.ms();
104
- this.progressState('awaiting-prover');
105
- const { publicInputs, proof } = await this.prover.finaliseEpoch();
106
- this.log.info(`Finalised proof for epoch ${epochNumber}`, { epochNumber, uuid: this.uuid, duration: timer.ms() });
107
- this.progressState('publishing-proof');
108
- const success = await this.publisher.submitEpochProof({ fromBlock, toBlock, epochNumber, publicInputs, proof });
109
- if (!success) {
110
- throw new Error('Failed to submit epoch proof to L1');
111
- }
112
- this.log.info(`Submitted proof for epoch ${epochNumber} (blocks ${fromBlock} to ${toBlock})`, {
113
- epochNumber,
203
+ this.stop('timed-out').catch((err)=>{
204
+ this.log.error('Error stopping job', err, {
114
205
  uuid: this.uuid,
206
+ epochNumber: this.epochNumber
115
207
  });
116
- this.state = 'completed';
117
- this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
118
- }
119
- catch (err) {
120
- if (err && err.name === 'HaltExecutionError') {
121
- this.log.warn(`Halted execution of epoch ${epochNumber} prover job`, { uuid: this.uuid, epochNumber });
122
- return;
123
- }
124
- this.log.error(`Error running epoch ${epochNumber} prover job`, err, { uuid: this.uuid, epochNumber });
125
- this.state = 'failed';
126
- }
127
- finally {
128
- clearTimeout(this.deadlineTimeoutHandler);
129
- await this.cleanUp(this);
130
- await this.prover.stop();
131
- resolve();
132
- }
133
- }
134
- progressState(state) {
135
- this.checkState();
136
- this.state = state;
137
- }
138
- checkState() {
139
- if (this.state === 'timed-out' || this.state === 'stopped' || this.state === 'failed') {
140
- throw new HaltExecutionError(this.state);
141
- }
142
- }
143
- async stop(state = 'stopped') {
144
- this.state = state;
145
- this.prover.cancel();
146
- // TODO(palla/prover): Stop the publisher as well
147
- if (this.runPromise) {
148
- await this.runPromise;
149
- }
150
- }
151
- scheduleDeadlineStop() {
152
- const deadline = this.deadline;
153
- if (deadline) {
154
- const timeout = deadline.getTime() - Date.now();
155
- if (timeout <= 0) {
156
- throw new Error('Cannot start job with deadline in the past');
157
- }
158
- this.deadlineTimeoutHandler = setTimeout(() => {
159
- if (EpochProvingJobTerminalState.includes(this.state)) {
160
- return;
161
- }
162
- this.log.warn('Stopping job due to deadline hit', { uuid: this.uuid, epochNumber: this.epochNumber });
163
- this.stop('timed-out').catch(err => {
164
- this.log.error('Error stopping job', err, { uuid: this.uuid, epochNumber: this.epochNumber });
165
- });
166
- }, timeout);
167
- }
168
- }
169
- /* Returns the header for the given block number, or the genesis block for block zero. */
170
- async getBlockHeader(blockNumber) {
171
- if (blockNumber === 0) {
172
- return (await this.dbProvider.fork()).getInitialHeader();
173
- }
174
- return this.l2BlockSource.getBlockHeader(blockNumber);
175
- }
176
- async getTxs(block) {
177
- const txHashes = block.body.txEffects.map(tx => tx.txHash.toBigInt());
178
- const txsAndHashes = await Promise.all(this.txs.map(async (tx) => ({ tx, hash: await tx.getTxHash() })));
179
- return txsAndHashes
180
- .filter(txAndHash => txHashes.includes(txAndHash.hash.toBigInt()))
181
- .map(txAndHash => txAndHash.tx);
182
- }
183
- getL1ToL2Messages(block) {
184
- return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
185
- }
186
- async processTxs(publicProcessor, txs) {
187
- const { deadline } = this;
188
- const [processedTxs, failedTxs] = await publicProcessor.process(txs, { deadline });
189
- if (failedTxs.length) {
190
- throw new Error(`Txs failed processing: ${failedTxs.map(({ tx, error }) => `${tx.getTxHash()} (${error})`).join(', ')}`);
191
- }
192
- if (processedTxs.length !== txs.length) {
193
- throw new Error(`Failed to process all txs: processed ${processedTxs.length} out of ${txs.length}`);
194
- }
195
- return processedTxs;
196
- }
197
- },
198
- (() => {
199
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
200
- _run_decorators = [trackSpan('EpochProvingJob.run', function () {
201
- return { [Attributes.EPOCH_NUMBER]: Number(this.epochNumber) };
202
- })];
203
- __esDecorate(_a, null, _run_decorators, { kind: "method", name: "run", static: false, private: false, access: { has: obj => "run" in obj, get: obj => obj.run }, metadata: _metadata }, null, _instanceExtraInitializers);
204
- if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
205
- })(),
206
- _a;
207
- })();
208
- export { EpochProvingJob };
208
+ });
209
+ }, timeout);
210
+ }
211
+ }
212
+ /* Returns the header for the given block number, or the genesis block for block zero. */ async getBlockHeader(blockNumber) {
213
+ if (blockNumber === 0) {
214
+ return (await this.dbProvider.fork()).getInitialHeader();
215
+ }
216
+ return this.l2BlockSource.getBlockHeader(blockNumber);
217
+ }
218
+ async getTxs(block) {
219
+ const txHashes = block.body.txEffects.map((tx)=>tx.txHash.toBigInt());
220
+ const txsAndHashes = await Promise.all(this.txs.map(async (tx)=>({
221
+ tx,
222
+ hash: await tx.getTxHash()
223
+ })));
224
+ return txsAndHashes.filter((txAndHash)=>txHashes.includes(txAndHash.hash.toBigInt())).map((txAndHash)=>txAndHash.tx);
225
+ }
226
+ getL1ToL2Messages(block) {
227
+ return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
228
+ }
229
+ async processTxs(publicProcessor, txs) {
230
+ const { deadline } = this;
231
+ const [processedTxs, failedTxs] = await publicProcessor.process(txs, {
232
+ deadline
233
+ });
234
+ if (failedTxs.length) {
235
+ throw new Error(`Txs failed processing: ${failedTxs.map(({ tx, error })=>`${tx.getTxHash()} (${error})`).join(', ')}`);
236
+ }
237
+ if (processedTxs.length !== txs.length) {
238
+ throw new Error(`Failed to process all txs: processed ${processedTxs.length} out of ${txs.length}`);
239
+ }
240
+ return processedTxs;
241
+ }
242
+ }
243
+ _ts_decorate([
244
+ trackSpan('EpochProvingJob.run', function() {
245
+ return {
246
+ [Attributes.EPOCH_NUMBER]: Number(this.epochNumber)
247
+ };
248
+ })
249
+ ], EpochProvingJob.prototype, "run", null);
209
250
  class HaltExecutionError extends Error {
210
- constructor(state) {
251
+ constructor(state){
211
252
  super(`Halted execution due to state ${state}`);
212
253
  this.name = 'HaltExecutionError';
213
254
  }
214
255
  }
215
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"epoch-proving-job.js","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"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"}
package/dest/metrics.d.ts CHANGED
@@ -1,7 +1,8 @@
1
- import { type L1PublishProofStats } from '@aztec/circuit-types/stats';
1
+ import type { L1PublishProofStats } from '@aztec/stdlib/stats';
2
2
  import { type Histogram, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client';
3
3
  export declare class ProverNodeMetrics {
4
4
  readonly client: TelemetryClient;
5
+ private logger;
5
6
  proverEpochExecutionDuration: Histogram;
6
7
  provingJobDuration: Histogram;
7
8
  provingJobBlocks: Histogram;
@@ -14,10 +15,12 @@ export declare class ProverNodeMetrics {
14
15
  txCalldataGas: Histogram;
15
16
  txBlobDataGasUsed: Histogram;
16
17
  txBlobDataGasCost: Histogram;
17
- constructor(client: TelemetryClient, name?: string);
18
+ private senderBalance;
19
+ constructor(client: TelemetryClient, name?: string, logger?: import("@aztec/foundation/log").Logger);
18
20
  recordFailedTx(): void;
19
21
  recordSubmitProof(durationMs: number, stats: L1PublishProofStats): void;
20
22
  recordProvingJob(executionTimeMs: number, totalTimeMs: number, numBlocks: number, numTxs: number): void;
23
+ recordSenderBalance(wei: bigint, senderAddress: string): void;
21
24
  private recordTx;
22
25
  }
23
26
  //# sourceMappingURL=metrics.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAEL,KAAK,SAAS,EAEd,KAAK,eAAe,EACpB,KAAK,aAAa,EAEnB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,iBAAiB;aAeA,MAAM,EAAE,eAAe;IAdnD,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,sBAAsB,EAAE,SAAS,CAAC;IAElC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,EAAE,SAAS,CAAC;gBAED,MAAM,EAAE,eAAe,EAAE,IAAI,SAAe;IAoExE,cAAc;IAOd,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIzD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOvG,OAAO,CAAC,QAAQ;CA6BjB"}
1
+ {"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,eAAe,EACpB,KAAK,aAAa,EAEnB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,iBAAiB;aAkBV,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAnBhB,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,sBAAsB,EAAE,SAAS,CAAC;IAElC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,EAAE,SAAS,CAAC;IAE7B,OAAO,CAAC,aAAa,CAAQ;gBAGX,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,yCAAgD;IA2EhE,cAAc;IAOd,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIzD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOhG,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAO7D,OAAO,CAAC,QAAQ;CA6BjB"}