@aztec/prover-node 1.0.0-nightly.20250618 → 1.0.0-nightly.20250620

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 (5) hide show
  1. package/dest/metrics.d.ts +1 -1
  2. package/dest/metrics.d.ts.map +1 -1
  3. package/dest/metrics.js +10 -7
  4. package/package.json +23 -23
  5. package/src/metrics.ts +9 -6
package/dest/metrics.d.ts CHANGED
@@ -21,7 +21,7 @@ export declare class ProverNodeRewardsMetrics {
21
21
  private rewards;
22
22
  private accumulatedRewards;
23
23
  private prevEpoch;
24
- private proofSubmissionWindow;
24
+ private proofSubmissionEpochs;
25
25
  constructor(meter: Meter, coinbase: EthAddress, rollup: RollupContract, logger?: import("@aztec/foundation/log").Logger);
26
26
  start(): Promise<void>;
27
27
  stop(): void;
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,iBAAiB,CAAC;AACtD,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;IAO7B,OAAO,CAAC,KAAK;aACG,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,MAAM;IARhB,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,KAAK,CAAC;IACxB,sBAAsB,EAAE,KAAK,CAAC;gBAGpB,KAAK,EAAE,KAAK,EACJ,MAAM,EAAE,MAAM,EACtB,MAAM,yCAAgD;IAsBzD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAMxG;AAED,qBAAa,wBAAwB;IAOjC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,qBAAqB,CAAM;gBAGzB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,yCAAgD;IAanD,KAAK;IAKX,IAAI;IAIX,OAAO,CAAC,OAAO,CAsBb;CACH;AAED,qBAAa,0BAA0B;aAenB,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAhBhB,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;IAC7B,UAAU,EAAE,SAAS,CAAC;IAEtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAQ;gBAGH,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,yCAAgD;IAoEhE,cAAc;IAOd,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIzD,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAO7D,OAAO,CAAC,QAAQ;CAuCjB"}
1
+ {"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,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;IAO7B,OAAO,CAAC,KAAK;aACG,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,MAAM;IARhB,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,KAAK,CAAC;IACxB,sBAAsB,EAAE,KAAK,CAAC;gBAGpB,KAAK,EAAE,KAAK,EACJ,MAAM,EAAE,MAAM,EACtB,MAAM,yCAAgD;IAsBzD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAMxG;AAED,qBAAa,wBAAwB;IAOjC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,qBAAqB,CAAK;gBAGxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,yCAAgD;IAanD,KAAK;IAMX,IAAI;IAIX,OAAO,CAAC,OAAO,CAwBb;CACH;AAED,qBAAa,0BAA0B;aAenB,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAhBhB,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;IAC7B,UAAU,EAAE,SAAS,CAAC;IAEtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAQ;gBAGH,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,yCAAgD;IAoEhE,cAAc;IAOd,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIzD,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAO7D,OAAO,CAAC,QAAQ;CAuCjB"}
package/dest/metrics.js CHANGED
@@ -47,19 +47,21 @@ export class ProverNodeRewardsMetrics {
47
47
  rewards;
48
48
  accumulatedRewards;
49
49
  prevEpoch;
50
- proofSubmissionWindow;
50
+ proofSubmissionEpochs;
51
51
  constructor(meter, coinbase, rollup, logger = createLogger('prover-node:publisher:metrics')){
52
52
  this.meter = meter;
53
53
  this.coinbase = coinbase;
54
54
  this.rollup = rollup;
55
55
  this.logger = logger;
56
56
  this.prevEpoch = -1n;
57
- this.proofSubmissionWindow = 0n;
57
+ this.proofSubmissionEpochs = 0;
58
58
  this.observe = async (observer)=>{
59
- const slot = await this.rollup.getSlotNumber();
60
- // look at the prev epoch so that we get an accurate value, after proof submission window has closed
61
- if (slot > this.proofSubmissionWindow) {
62
- const closedEpoch = await this.rollup.getEpochNumberForSlotNumber(slot - this.proofSubmissionWindow);
59
+ const epoch = await this.rollup.getEpochNumber();
60
+ if (epoch > this.proofSubmissionEpochs) {
61
+ // look at the prev epoch so that we get an accurate value, after proof submission window has closed
62
+ // For example, if proof submission window is 1 epoch, and we are in epoch 2, we should be looking at epoch 0.
63
+ // Similarly, if the proof submission window is 0, and we are in epoch 1, we should be looking at epoch 0.
64
+ const closedEpoch = epoch - BigInt(this.proofSubmissionEpochs) - 1n;
63
65
  const rewards = await this.rollup.getSpecificProverRewardsForEpoch(closedEpoch, this.coinbase);
64
66
  const fmt = parseFloat(formatUnits(rewards, 18));
65
67
  observer.observe(this.rewards, fmt, {
@@ -84,7 +86,8 @@ export class ProverNodeRewardsMetrics {
84
86
  });
85
87
  }
86
88
  async start() {
87
- this.proofSubmissionWindow = await this.rollup.getProofSubmissionWindow();
89
+ const proofSubmissionEpochs = await this.rollup.getProofSubmissionEpochs();
90
+ this.proofSubmissionEpochs = Number(proofSubmissionEpochs);
88
91
  this.meter.addBatchObservableCallback(this.observe, [
89
92
  this.rewards
90
93
  ]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-node",
3
- "version": "1.0.0-nightly.20250618",
3
+ "version": "1.0.0-nightly.20250620",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -56,37 +56,37 @@
56
56
  ]
57
57
  },
58
58
  "dependencies": {
59
- "@aztec/archiver": "1.0.0-nightly.20250618",
60
- "@aztec/bb-prover": "1.0.0-nightly.20250618",
61
- "@aztec/blob-lib": "1.0.0-nightly.20250618",
62
- "@aztec/blob-sink": "1.0.0-nightly.20250618",
63
- "@aztec/constants": "1.0.0-nightly.20250618",
64
- "@aztec/epoch-cache": "1.0.0-nightly.20250618",
65
- "@aztec/ethereum": "1.0.0-nightly.20250618",
66
- "@aztec/foundation": "1.0.0-nightly.20250618",
67
- "@aztec/kv-store": "1.0.0-nightly.20250618",
68
- "@aztec/l1-artifacts": "1.0.0-nightly.20250618",
69
- "@aztec/node-lib": "1.0.0-nightly.20250618",
70
- "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250618",
71
- "@aztec/p2p": "1.0.0-nightly.20250618",
72
- "@aztec/protocol-contracts": "1.0.0-nightly.20250618",
73
- "@aztec/prover-client": "1.0.0-nightly.20250618",
74
- "@aztec/sequencer-client": "1.0.0-nightly.20250618",
75
- "@aztec/simulator": "1.0.0-nightly.20250618",
76
- "@aztec/stdlib": "1.0.0-nightly.20250618",
77
- "@aztec/telemetry-client": "1.0.0-nightly.20250618",
78
- "@aztec/world-state": "1.0.0-nightly.20250618",
59
+ "@aztec/archiver": "1.0.0-nightly.20250620",
60
+ "@aztec/bb-prover": "1.0.0-nightly.20250620",
61
+ "@aztec/blob-lib": "1.0.0-nightly.20250620",
62
+ "@aztec/blob-sink": "1.0.0-nightly.20250620",
63
+ "@aztec/constants": "1.0.0-nightly.20250620",
64
+ "@aztec/epoch-cache": "1.0.0-nightly.20250620",
65
+ "@aztec/ethereum": "1.0.0-nightly.20250620",
66
+ "@aztec/foundation": "1.0.0-nightly.20250620",
67
+ "@aztec/kv-store": "1.0.0-nightly.20250620",
68
+ "@aztec/l1-artifacts": "1.0.0-nightly.20250620",
69
+ "@aztec/node-lib": "1.0.0-nightly.20250620",
70
+ "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250620",
71
+ "@aztec/p2p": "1.0.0-nightly.20250620",
72
+ "@aztec/protocol-contracts": "1.0.0-nightly.20250620",
73
+ "@aztec/prover-client": "1.0.0-nightly.20250620",
74
+ "@aztec/sequencer-client": "1.0.0-nightly.20250620",
75
+ "@aztec/simulator": "1.0.0-nightly.20250620",
76
+ "@aztec/stdlib": "1.0.0-nightly.20250620",
77
+ "@aztec/telemetry-client": "1.0.0-nightly.20250620",
78
+ "@aztec/world-state": "1.0.0-nightly.20250620",
79
79
  "source-map-support": "^0.5.21",
80
80
  "tslib": "^2.4.0",
81
81
  "viem": "2.23.7"
82
82
  },
83
83
  "devDependencies": {
84
84
  "@jest/globals": "^30.0.0",
85
- "@types/jest": "^29.5.0",
85
+ "@types/jest": "^30.0.0",
86
86
  "@types/node": "^22.15.17",
87
87
  "@types/source-map-support": "^0.5.10",
88
88
  "jest": "^30.0.0",
89
- "jest-mock-extended": "^3.0.3",
89
+ "jest-mock-extended": "^4.0.0",
90
90
  "ts-node": "^10.9.1",
91
91
  "typescript": "^5.3.3"
92
92
  },
package/src/metrics.ts CHANGED
@@ -61,7 +61,7 @@ export class ProverNodeRewardsMetrics {
61
61
  private rewards: ObservableGauge;
62
62
  private accumulatedRewards: UpDownCounter;
63
63
  private prevEpoch = -1n;
64
- private proofSubmissionWindow = 0n;
64
+ private proofSubmissionEpochs = 0;
65
65
 
66
66
  constructor(
67
67
  private meter: Meter,
@@ -81,7 +81,8 @@ export class ProverNodeRewardsMetrics {
81
81
  }
82
82
 
83
83
  public async start() {
84
- this.proofSubmissionWindow = await this.rollup.getProofSubmissionWindow();
84
+ const proofSubmissionEpochs = await this.rollup.getProofSubmissionEpochs();
85
+ this.proofSubmissionEpochs = Number(proofSubmissionEpochs);
85
86
  this.meter.addBatchObservableCallback(this.observe, [this.rewards]);
86
87
  }
87
88
 
@@ -90,11 +91,13 @@ export class ProverNodeRewardsMetrics {
90
91
  }
91
92
 
92
93
  private observe = async (observer: BatchObservableResult): Promise<void> => {
93
- const slot = await this.rollup.getSlotNumber();
94
+ const epoch = await this.rollup.getEpochNumber();
94
95
 
95
- // look at the prev epoch so that we get an accurate value, after proof submission window has closed
96
- if (slot > this.proofSubmissionWindow) {
97
- const closedEpoch = await this.rollup.getEpochNumberForSlotNumber(slot - this.proofSubmissionWindow);
96
+ if (epoch > this.proofSubmissionEpochs) {
97
+ // look at the prev epoch so that we get an accurate value, after proof submission window has closed
98
+ // For example, if proof submission window is 1 epoch, and we are in epoch 2, we should be looking at epoch 0.
99
+ // Similarly, if the proof submission window is 0, and we are in epoch 1, we should be looking at epoch 0.
100
+ const closedEpoch = epoch - BigInt(this.proofSubmissionEpochs) - 1n;
98
101
  const rewards = await this.rollup.getSpecificProverRewardsForEpoch(closedEpoch, this.coinbase);
99
102
 
100
103
  const fmt = parseFloat(formatUnits(rewards, 18));