@aztec/prover-node 0.76.1 → 0.76.3

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 (76) hide show
  1. package/dest/config.d.ts +1 -7
  2. package/dest/config.d.ts.map +1 -1
  3. package/dest/config.js +2 -23
  4. package/dest/factory.d.ts.map +1 -1
  5. package/dest/factory.js +3 -32
  6. package/dest/job/epoch-proving-job.d.ts +1 -0
  7. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  8. package/dest/job/epoch-proving-job.js +4 -1
  9. package/dest/monitors/epoch-monitor.d.ts +0 -1
  10. package/dest/monitors/epoch-monitor.d.ts.map +1 -1
  11. package/dest/monitors/epoch-monitor.js +2 -2
  12. package/dest/monitors/index.d.ts +0 -1
  13. package/dest/monitors/index.d.ts.map +1 -1
  14. package/dest/monitors/index.js +1 -2
  15. package/dest/prover-node-publisher.d.ts +0 -7
  16. package/dest/prover-node-publisher.d.ts.map +1 -1
  17. package/dest/prover-node-publisher.js +9 -10
  18. package/dest/prover-node.d.ts +12 -26
  19. package/dest/prover-node.d.ts.map +1 -1
  20. package/dest/prover-node.js +24 -89
  21. package/package.json +20 -20
  22. package/src/config.ts +1 -37
  23. package/src/factory.ts +2 -40
  24. package/src/job/epoch-proving-job.ts +4 -0
  25. package/src/monitors/epoch-monitor.ts +1 -2
  26. package/src/monitors/index.ts +0 -1
  27. package/src/prover-node-publisher.ts +8 -10
  28. package/src/prover-node.ts +29 -106
  29. package/dest/bond/bond-manager.d.ts +0 -22
  30. package/dest/bond/bond-manager.d.ts.map +0 -1
  31. package/dest/bond/bond-manager.js +0 -42
  32. package/dest/bond/config.d.ts +0 -8
  33. package/dest/bond/config.d.ts.map +0 -1
  34. package/dest/bond/config.js +0 -17
  35. package/dest/bond/escrow-contract.d.ts +0 -19
  36. package/dest/bond/escrow-contract.d.ts.map +0 -1
  37. package/dest/bond/escrow-contract.js +0 -32
  38. package/dest/bond/factory.d.ts +0 -6
  39. package/dest/bond/factory.d.ts.map +0 -1
  40. package/dest/bond/factory.js +0 -17
  41. package/dest/bond/index.d.ts +0 -3
  42. package/dest/bond/index.d.ts.map +0 -1
  43. package/dest/bond/index.js +0 -3
  44. package/dest/bond/token-contract.d.ts +0 -26
  45. package/dest/bond/token-contract.d.ts.map +0 -1
  46. package/dest/bond/token-contract.js +0 -58
  47. package/dest/monitors/claims-monitor.d.ts +0 -24
  48. package/dest/monitors/claims-monitor.d.ts.map +0 -1
  49. package/dest/monitors/claims-monitor.js +0 -54
  50. package/dest/quote-provider/http.d.ts +0 -15
  51. package/dest/quote-provider/http.d.ts.map +0 -1
  52. package/dest/quote-provider/http.js +0 -33
  53. package/dest/quote-provider/index.d.ts +0 -6
  54. package/dest/quote-provider/index.d.ts.map +0 -1
  55. package/dest/quote-provider/index.js +0 -2
  56. package/dest/quote-provider/simple.d.ts +0 -9
  57. package/dest/quote-provider/simple.d.ts.map +0 -1
  58. package/dest/quote-provider/simple.js +0 -11
  59. package/dest/quote-provider/utils.d.ts +0 -4
  60. package/dest/quote-provider/utils.d.ts.map +0 -1
  61. package/dest/quote-provider/utils.js +0 -8
  62. package/dest/quote-signer.d.ts +0 -13
  63. package/dest/quote-signer.d.ts.map +0 -1
  64. package/dest/quote-signer.js +0 -18
  65. package/src/bond/bond-manager.ts +0 -48
  66. package/src/bond/config.ts +0 -25
  67. package/src/bond/escrow-contract.ts +0 -50
  68. package/src/bond/factory.ts +0 -28
  69. package/src/bond/index.ts +0 -2
  70. package/src/bond/token-contract.ts +0 -72
  71. package/src/monitors/claims-monitor.ts +0 -69
  72. package/src/quote-provider/http.ts +0 -48
  73. package/src/quote-provider/index.ts +0 -8
  74. package/src/quote-provider/simple.ts +0 -15
  75. package/src/quote-provider/utils.ts +0 -10
  76. package/src/quote-signer.ts +0 -24
@@ -1,5 +1,5 @@
1
1
  import { __esDecorate, __runInitializers } from "tslib";
2
- import { EpochProofQuotePayload, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
2
+ import { EpochProvingJobTerminalState, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
3
3
  import { compact } from '@aztec/foundation/collection';
4
4
  import { memoize } from '@aztec/foundation/decorators';
5
5
  import { createLogger } from '@aztec/foundation/log';
@@ -23,7 +23,7 @@ let ProverNode = (() => {
23
23
  let _checkForTxs_decorators;
24
24
  let _gatherEpochData_decorators;
25
25
  return _a = class ProverNode {
26
- constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, quoteProvider, quoteSigner, claimsMonitor, epochsMonitor, bondManager, options = {}, telemetryClient = getTelemetryClient()) {
26
+ constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()) {
27
27
  this.prover = (__runInitializers(this, _instanceExtraInitializers), prover);
28
28
  this.publisher = publisher;
29
29
  this.l2BlockSource = l2BlockSource;
@@ -31,11 +31,7 @@ let ProverNode = (() => {
31
31
  this.contractDataSource = contractDataSource;
32
32
  this.worldState = worldState;
33
33
  this.coordination = coordination;
34
- this.quoteProvider = quoteProvider;
35
- this.quoteSigner = quoteSigner;
36
- this.claimsMonitor = claimsMonitor;
37
34
  this.epochsMonitor = epochsMonitor;
38
- this.bondManager = bondManager;
39
35
  this.telemetryClient = telemetryClient;
40
36
  this.log = createLogger('prover-node');
41
37
  this.dateProvider = new DateProvider();
@@ -61,81 +57,24 @@ let ProverNode = (() => {
61
57
  }
62
58
  return undefined;
63
59
  }
64
- async handleClaim(proofClaim) {
65
- if (proofClaim.epochToProve === this.latestEpochWeAreProving) {
66
- this.log.verbose(`Already proving claim for epoch ${proofClaim.epochToProve}`);
67
- return;
68
- }
69
- const provenEpoch = await this.l2BlockSource.getProvenL2EpochNumber();
70
- if (provenEpoch !== undefined && proofClaim.epochToProve <= provenEpoch) {
71
- this.log.verbose(`Claim for epoch ${proofClaim.epochToProve} is already proven`);
72
- return;
73
- }
74
- try {
75
- await this.startProof(proofClaim.epochToProve);
76
- this.latestEpochWeAreProving = proofClaim.epochToProve;
77
- }
78
- catch (err) {
79
- this.log.error(`Error handling claim for epoch ${proofClaim.epochToProve}`, err);
80
- }
81
- try {
82
- // Staked amounts are lowered after a claim, so this is a good time for doing a top-up if needed
83
- await this.bondManager.ensureBond();
84
- }
85
- catch (err) {
86
- this.log.error(`Error ensuring prover bond after handling claim for epoch ${proofClaim.epochToProve}`, err);
87
- }
88
- }
89
60
  /**
90
- * Handles the epoch number to prove when the prover node starts by checking if there
91
- * is an existing claim for it. If not, it creates and sends a quote for it.
92
- * @param epochNumber - The epoch immediately before the current one when the prover node starts.
93
- */
94
- async handleInitialEpochSync(epochNumber) {
95
- try {
96
- const claim = await this.publisher.getProofClaim();
97
- if (!claim || claim.epochToProve < epochNumber) {
98
- this.log.verbose(`Handling epoch ${epochNumber} completed as initial sync`);
99
- await this.handleEpochCompleted(epochNumber);
100
- }
101
- }
102
- catch (err) {
103
- this.log.error(`Error handling initial epoch sync`, err);
104
- }
105
- }
106
- /**
107
- * Handles an epoch being completed by sending a quote for proving it.
61
+ * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
108
62
  * @param epochNumber - The epoch number that was just completed.
109
63
  */
110
64
  async handleEpochCompleted(epochNumber) {
111
65
  try {
112
- // Gather data for the epoch
113
- const epochData = await this.gatherEpochData(epochNumber);
114
- const { blocks } = epochData;
115
- this.cachedEpochData = { epochNumber, ...epochData };
116
- // Construct a quote for the epoch
117
- const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
118
- if (!partialQuote) {
119
- this.log.info(`No quote produced for epoch ${epochNumber}`);
66
+ this.log.debug('jobs', JSON.stringify(this.jobs, null, 2));
67
+ const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
68
+ if (activeJobs.length > 0) {
69
+ this.log.info(`Not starting proof for ${epochNumber} since there are active jobs`);
120
70
  return;
121
71
  }
122
- // Ensure we have deposited enough funds for sending this quote
123
- await this.bondManager.ensureBond(partialQuote.bondAmount);
124
- // Assemble and sign full quote
125
- const quote = EpochProofQuotePayload.from({
126
- ...partialQuote,
127
- epochToProve: BigInt(epochNumber),
128
- prover: this.publisher.getSenderAddress(),
129
- validUntilSlot: partialQuote.validUntilSlot ?? BigInt(Number.MAX_SAFE_INTEGER), // Should we constrain this?
130
- });
131
- const signed = await this.quoteSigner.sign(quote);
132
- // Send it to the coordinator
133
- this.log.info(`Sending quote for epoch ${epochNumber} with blocks ${blocks[0].number} to ${blocks.at(-1).number}`, quote.toViemArgs());
134
- await this.doSendEpochProofQuote(signed);
72
+ // TODO: we probably want to skip starting a proof if we are too far into the current epoch
73
+ await this.startProof(epochNumber);
135
74
  }
136
75
  catch (err) {
137
76
  if (err instanceof EmptyEpochError) {
138
- this.log.info(`Not producing quote for ${epochNumber} since no blocks were found`);
77
+ this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
139
78
  }
140
79
  else {
141
80
  this.log.error(`Error handling epoch completed`, err);
@@ -143,15 +82,12 @@ let ProverNode = (() => {
143
82
  }
144
83
  }
145
84
  /**
146
- * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and sends
147
- * quotes for them, as well as monitors the claims for the epochs it has sent quotes for and starts proving jobs.
148
- * This method returns once the prover node has deposited an initial bond into the escrow contract.
85
+ * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
86
+ * starts proving jobs for them.
149
87
  */
150
- async start() {
88
+ start() {
151
89
  this.txFetcher.start();
152
- await this.bondManager.ensureBond();
153
90
  this.epochsMonitor.start(this);
154
- this.claimsMonitor.start(this);
155
91
  this.log.info('Started ProverNode', this.options);
156
92
  }
157
93
  /**
@@ -161,7 +97,6 @@ let ProverNode = (() => {
161
97
  this.log.info('Stopping ProverNode');
162
98
  await this.txFetcher.stop();
163
99
  await this.epochsMonitor.stop();
164
- await this.claimsMonitor.stop();
165
100
  await this.prover.stop();
166
101
  await tryStop(this.l2BlockSource);
167
102
  this.publisher.interrupt();
@@ -171,14 +106,6 @@ let ProverNode = (() => {
171
106
  await this.telemetryClient.stop();
172
107
  this.log.info('Stopped ProverNode');
173
108
  }
174
- /** Sends an epoch proof quote to the coordinator. */
175
- sendEpochProofQuote(quote) {
176
- this.log.info(`Sending quote for epoch`, quote.toViemArgs().quote);
177
- return this.doSendEpochProofQuote(quote);
178
- }
179
- doSendEpochProofQuote(quote) {
180
- return this.coordination.addEpochProofQuote(quote);
181
- }
182
109
  /**
183
110
  * Creates a proof for a block range. Returns once the proof has been submitted to L1.
184
111
  */
@@ -203,7 +130,16 @@ let ProverNode = (() => {
203
130
  * Returns an array of jobs being processed.
204
131
  */
205
132
  getJobs() {
206
- return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job]) => ({ uuid, status: job.getState() })));
133
+ return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job]) => ({
134
+ uuid,
135
+ status: job.getState(),
136
+ epochNumber: Number(job.getEpochNumber()),
137
+ })));
138
+ }
139
+ async getActiveJobsForEpoch(epochBigInt) {
140
+ const jobs = await this.getJobs();
141
+ const epochNumber = Number(epochBigInt);
142
+ return jobs.filter(job => job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
207
143
  }
208
144
  checkMaximumPendingJobs() {
209
145
  const { maxPendingJobs } = this.options;
@@ -283,7 +219,6 @@ let ProverNode = (() => {
283
219
  /** Extracted for testing purposes. */
284
220
  async triggerMonitors() {
285
221
  await this.epochsMonitor.work();
286
- await this.claimsMonitor.work();
287
222
  }
288
223
  },
289
224
  (() => {
@@ -307,4 +242,4 @@ class EmptyEpochError extends Error {
307
242
  this.name = 'EmptyEpochError';
308
243
  }
309
244
  }
310
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,sBAAsB,EAYtB,yBAAyB,EACzB,OAAO,GACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,UAAU,EAIV,kBAAkB,EAClB,SAAS,GACV,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,eAAe,EAA6B,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAgBjD;;;;;GAKG;IACU,UAAU;;;;;;;sBAAV,UAAU;YAerB,YACqB,MAA0B,EAC1B,SAA8B,EAC9B,aAA6C,EAC7C,mBAAwC,EACxC,kBAAsC,EACtC,UAAkC,EAClC,YAAiD,EACjD,aAA4B,EAC5B,WAAwB,EACxB,aAA4B,EAC5B,aAA2B,EAC3B,WAAwB,EAC3C,UAAsC,EAAE,EACrB,kBAAmC,kBAAkB,EAAE;gBAbvD,WAAM,IAhBhB,mDAAU,EAgBA,MAAM,EAAoB;gBAC1B,cAAS,GAAT,SAAS,CAAqB;gBAC9B,kBAAa,GAAb,aAAa,CAAgC;gBAC7C,wBAAmB,GAAnB,mBAAmB,CAAqB;gBACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;gBACtC,eAAU,GAAV,UAAU,CAAwB;gBAClC,iBAAY,GAAZ,YAAY,CAAqC;gBACjD,kBAAa,GAAb,aAAa,CAAe;gBAC5B,gBAAW,GAAX,WAAW,CAAa;gBACxB,kBAAa,GAAb,aAAa,CAAe;gBAC5B,kBAAa,GAAb,aAAa,CAAc;gBAC3B,gBAAW,GAAX,WAAW,CAAa;gBAExB,oBAAe,GAAf,eAAe,CAAwC;gBA5BpE,QAAG,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;gBAClC,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAC;gBAGlC,SAAI,GAAiC,IAAI,GAAG,EAAE,CAAC;gBAC/C,oBAAe,GAAsE,SAAS,CAAC;gBAyBrG,IAAI,CAAC,OAAO,GAAG;oBACb,iBAAiB,EAAE,IAAK;oBACxB,cAAc,EAAE,GAAG;oBACnB,yBAAyB,EAAE,EAAE;oBAC7B,oBAAoB,EAAE,KAAM;oBAC5B,qBAAqB,EAAE,IAAK;oBAC5B,8BAA8B,EAAE,GAAG;oBACnC,GAAG,OAAO,CAAC,OAAO,CAAC;iBACpB,CAAC;gBAEF,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBACpE,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACtD,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC9G,CAAC;YAEM,MAAM;gBACX,MAAM,WAAW,GAAG,IAAI,CAAC,YAAyC,CAAC;gBACnE,IAAI,OAAO,WAAW,CAAC,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC/E,OAAO,WAAW,CAAC;gBACrB,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,KAAK,CAAC,WAAW,CAAC,UAA2B;gBAC3C,IAAI,UAAU,CAAC,YAAY,KAAK,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAmC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;oBAC/E,OAAO;gBACT,CAAC;gBAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;gBACtE,IAAI,WAAW,KAAK,SAAS,IAAI,UAAU,CAAC,YAAY,IAAI,WAAW,EAAE,CAAC;oBACxE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,UAAU,CAAC,YAAY,oBAAoB,CAAC,CAAC;oBACjF,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBAC/C,IAAI,CAAC,uBAAuB,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,UAAU,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;gBACnF,CAAC;gBAED,IAAI,CAAC;oBACH,gGAAgG;oBAChG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBACtC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6DAA6D,UAAU,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC9G,CAAC;YACH,CAAC;YAED;;;;eAIG;YACH,KAAK,CAAC,sBAAsB,CAAC,WAAmB;gBAC9C,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;oBACnD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,GAAG,WAAW,EAAE,CAAC;wBAC/C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,WAAW,4BAA4B,CAAC,CAAC;wBAC5E,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YAED;;;eAGG;YACH,KAAK,CAAC,oBAAoB,CAAC,WAAmB;gBAC5C,IAAI,CAAC;oBACH,4BAA4B;oBAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;oBAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;oBAC7B,IAAI,CAAC,eAAe,GAAG,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,CAAC;oBAErD,kCAAkC;oBAClC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;oBACpF,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;wBAC5D,OAAO;oBACT,CAAC;oBAED,+DAA+D;oBAC/D,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;oBAE3D,+BAA+B;oBAC/B,MAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC;wBACxC,GAAG,YAAY;wBACf,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC;wBACjC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE;wBACzC,cAAc,EAAE,YAAY,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,4BAA4B;qBAC7G,CAAC,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAElD,6BAA6B;oBAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,2BAA2B,WAAW,gBAAgB,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,EACpG,KAAK,CAAC,UAAU,EAAE,CACnB,CAAC;oBACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,GAAG,YAAY,eAAe,EAAE,CAAC;wBACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,WAAW,6BAA6B,CAAC,CAAC;oBACrF,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;oBACxD,CAAC;gBACH,CAAC;YACH,CAAC;YAED;;;;eAIG;YACH,KAAK,CAAC,KAAK;gBACT,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,CAAC;YAED;;eAEG;YACH,KAAK,CAAC,IAAI;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACrC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACzB,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACzE,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC7B,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACtC,CAAC;YAED,qDAAqD;YAC9C,mBAAmB,CAAC,KAAsB;gBAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;gBACnE,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YAEO,qBAAqB,CAAC,KAAsB;gBAClD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,KAAK,CAAC,WAA4B;gBAC7C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC7D,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,UAAU,CAAC,WAA4B;gBAClD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC7D,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;YACzF,CAAC;YAED;;eAEG;YACI,SAAS;gBACd,OAAO,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YAED;;eAEG;YACI,OAAO;gBACZ,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACnH,CAAC;YAEO,uBAAuB;gBAC7B,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;gBACxC,OAAO,cAAc,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;YACjE,CAAC;YAGO,KAAK,CAAC,gBAAgB,CAAC,WAAmB;gBAChD,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,OAAO,CAAC,cAAc,kCAAkC,CAAC,CAAC;gBACjH,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBAErF,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;gBAEtC,2EAA2E;gBAC3E,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kCAAkC,WAAW,oBAAoB,SAAS,OAAO,OAAO,EAAE,CAAC,CAAC;gBAC7G,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;gBAEnD,kDAAkD;gBAClD,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CACvD,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,CACrB,CAAC;gBAEF,MAAM,OAAO,GAAG,GAAG,EAAE;oBACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC9B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC,CAAC;gBAEF,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,GAAG,yBAAyB,CAAC,WAAW,GAAG,EAAE,EAAE,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;gBACnG,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;gBAEvD,MAAM,GAAG,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,CAAC,CAAC;gBAC9G,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC;YAGO,cAAc;gBACpB,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YAC7C,CAAC;YAED,kHAAkH;YAE1G,KAAK,CAAC,WAAW;gBACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;gBAC9D,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,IAAI,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC7E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;oBAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,OAAO;oBACT,CAAC;oBACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBAC3D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,QAAQ,CAAC,MAAM,qBAAqB,WAAW,oBAAoB,CAAC,CAAC;oBAClG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,mEAAmE;oBACnH,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC;gBACrC,CAAC;YACH,CAAC;YAGO,KAAK,CAAC,eAAe,CAAC,WAAmB;gBAC/C,6CAA6C;gBAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBACpD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAEtD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YACzB,CAAC;YAEO,KAAK,CAAC,YAAY,CAAC,WAAmB;gBAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACvE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;gBACzC,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;YAEO,KAAK,CAAC,SAAS,CAAC,WAAmB,EAAE,MAAiB;gBAC5D,MAAM,SAAS,GAAa,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC/F,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAE5D,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;oBACpC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,CAAC,MAAM,kBAAkB,WAAW,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;oBAC7F,OAAO,GAAG,CAAC;gBACb,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBACvE,MAAM,eAAe,GAAG,SAAS;qBAC9B,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;qBAC5F,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,IAAI,KAAK,CAAC,2BAA2B,WAAW,KAAK,eAAe,EAAE,CAAC,CAAC;YAChF,CAAC;YAED,sCAAsC;YAC5B,uBAAuB,CAC/B,WAAmB,EACnB,QAA0B,EAC1B,MAAiB,EACjB,GAAS,EACT,sBAA8C,EAC9C,OAA4B;gBAE5B,OAAO,IAAI,eAAe,CACxB,IAAI,CAAC,UAAU,EACf,WAAW,EACX,MAAM,EACN,GAAG,EACH,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAC/B,sBAAsB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,OAAO,EACZ,QAAQ,EACR,EAAE,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAC9D,OAAO,CACR,CAAC;YACJ,CAAC;YAED,sCAAsC;YAC5B,KAAK,CAAC,eAAe;gBAC7B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC;;;;4CA1HA,SAAS,CAAC,6BAA6B,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;0CAqC7G,OAAO;uCAMP,SAAS,CAAC,wBAAwB,CAAC;2CAenC,SAAS,CAAC,4BAA4B,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAzD7G,iMAAc,gBAAgB,6DAkC7B;YAGD,2LAAQ,cAAc,6DAErB;YAID,kLAAc,WAAW,6DAYxB;YAGD,8LAAc,eAAe,6DAM5B;;;;;SA5RU,UAAU;AAwVvB,MAAM,eAAgB,SAAQ,KAAK;IACjC,YAAY,WAAmB;QAC7B,KAAK,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF"}
245
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-node",
3
- "version": "0.76.1",
3
+ "version": "0.76.3",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -53,25 +53,25 @@
53
53
  ]
54
54
  },
55
55
  "dependencies": {
56
- "@aztec/archiver": "0.76.1",
57
- "@aztec/bb-prover": "0.76.1",
58
- "@aztec/blob-sink": "0.76.1",
59
- "@aztec/circuit-types": "0.76.1",
60
- "@aztec/circuits.js": "0.76.1",
61
- "@aztec/epoch-cache": "0.76.1",
62
- "@aztec/ethereum": "0.76.1",
63
- "@aztec/foundation": "0.76.1",
64
- "@aztec/kv-store": "0.76.1",
65
- "@aztec/l1-artifacts": "0.76.1",
66
- "@aztec/noir-protocol-circuits-types": "0.76.1",
67
- "@aztec/p2p": "0.76.1",
68
- "@aztec/protocol-contracts": "0.76.1",
69
- "@aztec/prover-client": "0.76.1",
70
- "@aztec/sequencer-client": "0.76.1",
71
- "@aztec/simulator": "0.76.1",
72
- "@aztec/telemetry-client": "0.76.1",
73
- "@aztec/types": "0.76.1",
74
- "@aztec/world-state": "0.76.1",
56
+ "@aztec/archiver": "0.76.3",
57
+ "@aztec/bb-prover": "0.76.3",
58
+ "@aztec/blob-sink": "0.76.3",
59
+ "@aztec/circuit-types": "0.76.3",
60
+ "@aztec/circuits.js": "0.76.3",
61
+ "@aztec/epoch-cache": "0.76.3",
62
+ "@aztec/ethereum": "0.76.3",
63
+ "@aztec/foundation": "0.76.3",
64
+ "@aztec/kv-store": "0.76.3",
65
+ "@aztec/l1-artifacts": "0.76.3",
66
+ "@aztec/noir-protocol-circuits-types": "0.76.3",
67
+ "@aztec/p2p": "0.76.3",
68
+ "@aztec/protocol-contracts": "0.76.3",
69
+ "@aztec/prover-client": "0.76.3",
70
+ "@aztec/sequencer-client": "0.76.3",
71
+ "@aztec/simulator": "0.76.3",
72
+ "@aztec/telemetry-client": "0.76.3",
73
+ "@aztec/types": "0.76.3",
74
+ "@aztec/world-state": "0.76.3",
75
75
  "source-map-support": "^0.5.21",
76
76
  "tslib": "^2.4.0",
77
77
  "viem": "2.22.8"
package/src/config.ts CHANGED
@@ -1,11 +1,6 @@
1
1
  import { type ArchiverConfig, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver/config';
2
2
  import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover/config';
3
- import {
4
- type ConfigMappingsType,
5
- bigintConfigHelper,
6
- getConfigFromMappings,
7
- numberConfigHelper,
8
- } from '@aztec/foundation/config';
3
+ import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
9
4
  import { type DataStoreConfig, dataConfigMappings, getDataConfigFromEnv } from '@aztec/kv-store/config';
10
5
  import { type P2PConfig, getP2PConfigFromEnv, p2pConfigMappings } from '@aztec/p2p/config';
11
6
  import {
@@ -30,7 +25,6 @@ import {
30
25
  } from '@aztec/sequencer-client/config';
31
26
  import { type WorldStateConfig, getWorldStateConfigFromEnv, worldStateConfigMappings } from '@aztec/world-state/config';
32
27
 
33
- import { type ProverBondManagerConfig, proverBondManagerConfigMappings } from './bond/config.js';
34
28
  import {
35
29
  type ProverCoordinationConfig,
36
30
  getTxProviderConfigFromEnv,
@@ -45,8 +39,6 @@ export type ProverNodeConfig = ArchiverConfig &
45
39
  TxSenderConfig &
46
40
  DataStoreConfig &
47
41
  ProverCoordinationConfig &
48
- ProverBondManagerConfig &
49
- QuoteProviderConfig &
50
42
  SpecificProverNodeConfig;
51
43
 
52
44
  type SpecificProverNodeConfig = {
@@ -58,12 +50,6 @@ type SpecificProverNodeConfig = {
58
50
  txGatheringMaxParallelRequests: number;
59
51
  };
60
52
 
61
- export type QuoteProviderConfig = {
62
- quoteProviderBasisPointFee: number;
63
- quoteProviderBondAmount: bigint;
64
- quoteProviderUrl?: string;
65
- };
66
-
67
53
  const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
68
54
  proverNodeMaxPendingJobs: {
69
55
  env: 'PROVER_NODE_MAX_PENDING_JOBS',
@@ -97,24 +83,6 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
97
83
  },
98
84
  };
99
85
 
100
- const quoteProviderConfigMappings: ConfigMappingsType<QuoteProviderConfig> = {
101
- quoteProviderBasisPointFee: {
102
- env: 'QUOTE_PROVIDER_BASIS_POINT_FEE',
103
- description: 'The basis point fee to charge for providing quotes',
104
- ...numberConfigHelper(100),
105
- },
106
- quoteProviderBondAmount: {
107
- env: 'QUOTE_PROVIDER_BOND_AMOUNT',
108
- description: 'The bond amount to charge for providing quotes',
109
- ...bigintConfigHelper(1000n),
110
- },
111
- quoteProviderUrl: {
112
- env: 'QUOTE_PROVIDER_URL',
113
- description:
114
- 'The URL of the remote quote provider. Overrides QUOTE_PROVIDER_BASIS_POINT_FEE and QUOTE_PROVIDER_BOND_AMOUNT.',
115
- },
116
- };
117
-
118
86
  export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
119
87
  ...dataConfigMappings,
120
88
  ...archiverConfigMappings,
@@ -124,8 +92,6 @@ export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
124
92
  ...getPublisherConfigMappings('PROVER'),
125
93
  ...getTxSenderConfigMappings('PROVER'),
126
94
  ...proverCoordinationConfigMappings,
127
- ...quoteProviderConfigMappings,
128
- ...proverBondManagerConfigMappings,
129
95
  ...specificProverNodeConfigMappings,
130
96
  };
131
97
 
@@ -139,9 +105,7 @@ export function getProverNodeConfigFromEnv(): ProverNodeConfig {
139
105
  ...getPublisherConfigFromEnv('PROVER'),
140
106
  ...getTxSenderConfigFromEnv('PROVER'),
141
107
  ...getTxProviderConfigFromEnv(),
142
- ...getConfigFromMappings(quoteProviderConfigMappings),
143
108
  ...getConfigFromMappings(specificProverNodeConfigMappings),
144
- ...getConfigFromMappings(proverBondManagerConfigMappings),
145
109
  };
146
110
  }
147
111
 
package/src/factory.ts CHANGED
@@ -3,28 +3,18 @@ import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-
3
3
  import { type ProverCoordination, type ProvingJobBroker } from '@aztec/circuit-types';
4
4
  import { EpochCache } from '@aztec/epoch-cache';
5
5
  import { L1TxUtils, RollupContract, createEthereumChain, createL1Clients } from '@aztec/ethereum';
6
- import { Buffer32 } from '@aztec/foundation/buffer';
7
- import { EthAddress } from '@aztec/foundation/eth-address';
8
6
  import { type Logger, createLogger } from '@aztec/foundation/log';
9
7
  import { type DataStoreConfig } from '@aztec/kv-store/config';
10
- import { RollupAbi } from '@aztec/l1-artifacts';
11
8
  import { createProverClient } from '@aztec/prover-client';
12
9
  import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
13
10
  import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
14
11
  import { createWorldStateSynchronizer } from '@aztec/world-state';
15
12
 
16
- import { createPublicClient, getAddress, getContract, http } from 'viem';
17
-
18
- import { createBondManager } from './bond/factory.js';
19
- import { type ProverNodeConfig, type QuoteProviderConfig } from './config.js';
20
- import { ClaimsMonitor } from './monitors/claims-monitor.js';
13
+ import { type ProverNodeConfig } from './config.js';
21
14
  import { EpochMonitor } from './monitors/epoch-monitor.js';
22
15
  import { createProverCoordination } from './prover-coordination/factory.js';
23
16
  import { ProverNodePublisher } from './prover-node-publisher.js';
24
17
  import { ProverNode, type ProverNodeOptions } from './prover-node.js';
25
- import { HttpQuoteProvider } from './quote-provider/http.js';
26
- import { SimpleQuoteProvider } from './quote-provider/simple.js';
27
- import { QuoteSigner } from './quote-signer.js';
28
18
 
29
19
  /** Creates a new prover node given a config. */
30
20
  export async function createProverNode(
@@ -64,7 +54,7 @@ export async function createProverNode(
64
54
 
65
55
  const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
66
56
 
67
- // If config.p2pEnabled is true, createProverCoordination will create a p2p client where quotes will be shared and tx's requested
57
+ // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
68
58
  // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
69
59
  const proverCoordination = await createProverCoordination(config, {
70
60
  aztecNodeTxProvider: deps.aztecNodeTxProvider,
@@ -74,9 +64,6 @@ export async function createProverNode(
74
64
  telemetry,
75
65
  });
76
66
 
77
- const quoteProvider = createQuoteProvider(config);
78
- const quoteSigner = createQuoteSigner(config);
79
-
80
67
  const proverNodeConfig: ProverNodeOptions = {
81
68
  maxPendingJobs: config.proverNodeMaxPendingJobs,
82
69
  pollingIntervalMs: config.proverNodePollingIntervalMs,
@@ -86,12 +73,8 @@ export async function createProverNode(
86
73
  txGatheringTimeoutMs: config.txGatheringTimeoutMs,
87
74
  };
88
75
 
89
- const claimsMonitor = new ClaimsMonitor(publisher, proverNodeConfig, telemetry);
90
76
  const epochMonitor = new EpochMonitor(archiver, proverNodeConfig, telemetry);
91
77
 
92
- const escrowContractAddress = await rollupContract.getProofCommitmentEscrow();
93
- const bondManager = await createBondManager(EthAddress.fromString(escrowContractAddress), walletClient, config);
94
-
95
78
  return new ProverNode(
96
79
  prover,
97
80
  publisher,
@@ -100,29 +83,8 @@ export async function createProverNode(
100
83
  archiver,
101
84
  worldStateSynchronizer,
102
85
  proverCoordination,
103
- quoteProvider,
104
- quoteSigner,
105
- claimsMonitor,
106
86
  epochMonitor,
107
- bondManager,
108
87
  proverNodeConfig,
109
88
  telemetry,
110
89
  );
111
90
  }
112
-
113
- function createQuoteProvider(config: QuoteProviderConfig) {
114
- return config.quoteProviderUrl
115
- ? new HttpQuoteProvider(config.quoteProviderUrl)
116
- : new SimpleQuoteProvider(config.quoteProviderBasisPointFee, config.quoteProviderBondAmount);
117
- }
118
-
119
- function createQuoteSigner(config: ProverNodeConfig) {
120
- // REFACTOR: We need a package that just returns an instance of a rollup contract ready to use
121
- const { l1RpcUrl: rpcUrl, l1ChainId: chainId, l1Contracts } = config;
122
- const chain = createEthereumChain(rpcUrl, chainId);
123
- const client = createPublicClient({ chain: chain.chainInfo, transport: http(chain.rpcUrl) });
124
- const address = getAddress(l1Contracts.rollupAddress.toString());
125
- const rollupContract = getContract({ address, abi: RollupAbi, client });
126
- const privateKey = config.publisherPrivateKey;
127
- return QuoteSigner.new(Buffer32.fromString(privateKey), rollupContract);
128
- }
@@ -63,6 +63,10 @@ export class EpochProvingJob implements Traceable {
63
63
  return this.state;
64
64
  }
65
65
 
66
+ public getEpochNumber(): bigint {
67
+ return this.epochNumber;
68
+ }
69
+
66
70
  /**
67
71
  * Proves the given epoch and submits the proof to L1.
68
72
  */
@@ -10,7 +10,6 @@ import {
10
10
  } from '@aztec/telemetry-client';
11
11
 
12
12
  export interface EpochMonitorHandler {
13
- handleInitialEpochSync(epochNumber: bigint): Promise<void>;
14
13
  handleEpochCompleted(epochNumber: bigint): Promise<void>;
15
14
  }
16
15
 
@@ -48,7 +47,7 @@ export class EpochMonitor implements Traceable {
48
47
  if (!this.latestEpochNumber) {
49
48
  const epochNumber = await this.l2BlockSource.getL2EpochNumber();
50
49
  if (epochNumber > 0n) {
51
- await this.handler?.handleInitialEpochSync(epochNumber - 1n);
50
+ await this.handler?.handleEpochCompleted(epochNumber - 1n);
52
51
  }
53
52
  this.latestEpochNumber = epochNumber;
54
53
  return;
@@ -1,2 +1 @@
1
- export * from './claims-monitor.js';
2
1
  export * from './epoch-monitor.js';
@@ -85,10 +85,6 @@ export class ProverNodePublisher {
85
85
  return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
86
86
  }
87
87
 
88
- public getProofClaim() {
89
- return this.rollupContract.getProofClaim();
90
- }
91
-
92
88
  public async submitEpochProof(args: {
93
89
  epochNumber: number;
94
90
  fromBlock: number;
@@ -205,11 +201,12 @@ export class ProverNodePublisher {
205
201
 
206
202
  const txArgs = [
207
203
  {
208
- epochSize: argsArray[0],
209
- args: argsArray[1],
210
- fees: argsArray[2],
211
- blobPublicInputs: argsArray[3],
212
- aggregationObject: argsArray[4],
204
+ start: argsArray[0],
205
+ end: argsArray[1],
206
+ args: argsArray[2],
207
+ fees: argsArray[3],
208
+ blobPublicInputs: argsArray[4],
209
+ aggregationObject: argsArray[5],
213
210
  proof: proofHex,
214
211
  },
215
212
  ] as const;
@@ -252,7 +249,8 @@ export class ProverNodePublisher {
252
249
  proof: Proof;
253
250
  }) {
254
251
  return [
255
- BigInt(args.toBlock - args.fromBlock + 1),
252
+ BigInt(args.fromBlock),
253
+ BigInt(args.toBlock),
256
254
  [
257
255
  args.publicInputs.previousArchive.root.toString(),
258
256
  args.publicInputs.endArchive.root.toString(),