@aztec/prover-node 0.72.1 → 0.74.0

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 (44) hide show
  1. package/dest/bond/escrow-contract.d.ts +2 -5
  2. package/dest/bond/escrow-contract.d.ts.map +1 -1
  3. package/dest/bond/escrow-contract.js +1 -1
  4. package/dest/bond/factory.d.ts +3 -6
  5. package/dest/bond/factory.d.ts.map +1 -1
  6. package/dest/bond/factory.js +2 -4
  7. package/dest/bond/token-contract.d.ts +2 -5
  8. package/dest/bond/token-contract.d.ts.map +1 -1
  9. package/dest/bond/token-contract.js +1 -1
  10. package/dest/factory.d.ts +4 -2
  11. package/dest/factory.d.ts.map +1 -1
  12. package/dest/factory.js +13 -9
  13. package/dest/index.d.ts +3 -2
  14. package/dest/index.d.ts.map +1 -1
  15. package/dest/index.js +4 -3
  16. package/dest/job/epoch-proving-job.d.ts +2 -2
  17. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  18. package/dest/job/epoch-proving-job.js +14 -8
  19. package/dest/metrics.d.ts +13 -1
  20. package/dest/metrics.d.ts.map +1 -1
  21. package/dest/metrics.js +74 -2
  22. package/dest/monitors/claims-monitor.d.ts +2 -2
  23. package/dest/monitors/claims-monitor.d.ts.map +1 -1
  24. package/dest/monitors/claims-monitor.js +1 -1
  25. package/dest/prover-node-publisher.d.ts +67 -0
  26. package/dest/prover-node-publisher.d.ts.map +1 -0
  27. package/dest/prover-node-publisher.js +185 -0
  28. package/dest/prover-node.d.ts +3 -3
  29. package/dest/prover-node.d.ts.map +1 -1
  30. package/dest/prover-node.js +1 -1
  31. package/dest/test/index.d.ts +2 -2
  32. package/dest/test/index.d.ts.map +1 -1
  33. package/package.json +18 -18
  34. package/src/bond/escrow-contract.ts +2 -15
  35. package/src/bond/factory.ts +4 -24
  36. package/src/bond/token-contract.ts +2 -15
  37. package/src/factory.ts +16 -9
  38. package/src/index.ts +3 -2
  39. package/src/job/epoch-proving-job.ts +15 -9
  40. package/src/metrics.ts +107 -1
  41. package/src/monitors/claims-monitor.ts +3 -2
  42. package/src/prover-node-publisher.ts +281 -0
  43. package/src/prover-node.ts +2 -2
  44. package/src/test/index.ts +2 -2
@@ -51,4 +51,4 @@ let ClaimsMonitor = (() => {
51
51
  _a;
52
52
  })();
53
53
  export { ClaimsMonitor };
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhaW1zLW1vbml0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9uaXRvcnMvY2xhaW1zLW1vbml0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbkUsT0FBTyxFQUlMLGtCQUFrQixFQUNsQixTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztJQU1wQixhQUFhOzs7O3NCQUFiLGFBQWE7WUFTeEIsWUFDbUIsV0FBd0IsRUFDakMsT0FBc0MsRUFDOUMsWUFBNkIsa0JBQWtCLEVBQUU7Z0JBRmhDLGdCQUFXLElBVm5CLG1EQUFhLEVBVUwsV0FBVyxFQUFhO2dCQUNqQyxZQUFPLEdBQVAsT0FBTyxDQUErQjtnQkFUeEMsUUFBRyxHQUFHLFlBQVksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO2dCQVl2RCxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxTQUFTLENBQUMsZUFBZSxDQUFDLENBQUM7Z0JBQ25ELElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7WUFDM0csQ0FBQztZQUVNLEtBQUssQ0FBQyxPQUE2QjtnQkFDeEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7Z0JBQ3ZCLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQzVCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLDZDQUE2QyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNqSCxDQUFDO1lBRU0sS0FBSyxDQUFDLElBQUk7Z0JBQ2YsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FBQztnQkFDM0MsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNqQyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1lBQ3pDLENBQUM7WUFHTSxLQUFLLENBQUMsSUFBSTtnQkFDZixNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsYUFBYSxFQUFFLENBQUM7Z0JBQzFELElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztvQkFDaEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztvQkFDdkMsT0FBTztnQkFDVCxDQUFDO2dCQUVELElBQUksSUFBSSxDQUFDLG9CQUFvQixLQUFLLFNBQVMsSUFBSSxVQUFVLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO29CQUNuRyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyw2QkFBNkIsVUFBVSxDQUFDLFlBQVksT0FBTyxVQUFVLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDbEgsSUFBSSxVQUFVLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxFQUFFLENBQUM7d0JBQzVELE1BQU0sSUFBSSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7b0JBQzlDLENBQUM7b0JBQ0QsSUFBSSxDQUFDLG9CQUFvQixHQUFHLFVBQVUsQ0FBQyxZQUFZLENBQUM7Z0JBQ3RELENBQUM7WUFDSCxDQUFDO1lBRVMsZ0JBQWdCO2dCQUN4QixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUM3QyxDQUFDOzs7O2dDQW5CQSxTQUFTLENBQUMsb0JBQW9CLENBQUM7WUFDaEMsNkpBQWEsSUFBSSw2REFjaEI7Ozs7O1NBN0NVLGFBQWEifQ==
54
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhaW1zLW1vbml0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9uaXRvcnMvY2xhaW1zLW1vbml0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkUsT0FBTyxFQUlMLGtCQUFrQixFQUNsQixTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztJQVFwQixhQUFhOzs7O3NCQUFiLGFBQWE7WUFTeEIsWUFDbUIsV0FBZ0MsRUFDekMsT0FBc0MsRUFDOUMsWUFBNkIsa0JBQWtCLEVBQUU7Z0JBRmhDLGdCQUFXLElBVm5CLG1EQUFhLEVBVUwsV0FBVyxFQUFxQjtnQkFDekMsWUFBTyxHQUFQLE9BQU8sQ0FBK0I7Z0JBVHhDLFFBQUcsR0FBRyxZQUFZLENBQUMsNEJBQTRCLENBQUMsQ0FBQztnQkFZdkQsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUNuRCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksY0FBYyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBQzNHLENBQUM7WUFFTSxLQUFLLENBQUMsT0FBNkI7Z0JBQ3hDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO2dCQUN2QixJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUM1QixJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyw2Q0FBNkMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDakgsQ0FBQztZQUVNLEtBQUssQ0FBQyxJQUFJO2dCQUNmLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLHdCQUF3QixDQUFDLENBQUM7Z0JBQzNDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDakMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQztZQUN6QyxDQUFDO1lBR00sS0FBSyxDQUFDLElBQUk7Z0JBQ2YsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLGFBQWEsRUFBRSxDQUFDO2dCQUMxRCxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUM7b0JBQ3ZDLE9BQU87Z0JBQ1QsQ0FBQztnQkFFRCxJQUFJLElBQUksQ0FBQyxvQkFBb0IsS0FBSyxTQUFTLElBQUksVUFBVSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztvQkFDbkcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsNkJBQTZCLFVBQVUsQ0FBQyxZQUFZLE9BQU8sVUFBVSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQ2xILElBQUksVUFBVSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUMsRUFBRSxDQUFDO3dCQUM1RCxNQUFNLElBQUksQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUM5QyxDQUFDO29CQUNELElBQUksQ0FBQyxvQkFBb0IsR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO2dCQUN0RCxDQUFDO1lBQ0gsQ0FBQztZQUVTLGdCQUFnQjtnQkFDeEIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixFQUFFLENBQUM7WUFDN0MsQ0FBQzs7OztnQ0FuQkEsU0FBUyxDQUFDLG9CQUFvQixDQUFDO1lBQ2hDLDZKQUFhLElBQUksNkRBY2hCOzs7OztTQTdDVSxhQUFhIn0=
@@ -0,0 +1,67 @@
1
+ import { AZTEC_MAX_EPOCH_DURATION, type Proof } from '@aztec/circuits.js';
2
+ import { type FeeRecipient, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
3
+ import { type L1TxUtils, type RollupContract } from '@aztec/ethereum';
4
+ import { EthAddress } from '@aztec/foundation/eth-address';
5
+ import { Fr } from '@aztec/foundation/fields';
6
+ import { type Tuple } from '@aztec/foundation/serialize';
7
+ import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-client';
8
+ import { type TelemetryClient } from '@aztec/telemetry-client';
9
+ /**
10
+ * Stats for a sent transaction.
11
+ */
12
+ /** Arguments to the submitEpochProof method of the rollup contract */
13
+ export type L1SubmitEpochProofArgs = {
14
+ epochSize: number;
15
+ previousArchive: Fr;
16
+ endArchive: Fr;
17
+ previousBlockHash: Fr;
18
+ endBlockHash: Fr;
19
+ endTimestamp: Fr;
20
+ outHash: Fr;
21
+ proverId: Fr;
22
+ fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>;
23
+ proof: Proof;
24
+ };
25
+ export declare class ProverNodePublisher {
26
+ private interruptibleSleep;
27
+ private sleepTimeMs;
28
+ private interrupted;
29
+ private metrics;
30
+ protected log: import("@aztec/foundation/log").Logger;
31
+ protected rollupContract: RollupContract;
32
+ readonly l1TxUtils: L1TxUtils;
33
+ constructor(config: TxSenderConfig & PublisherConfig, deps: {
34
+ rollupContract: RollupContract;
35
+ l1TxUtils: L1TxUtils;
36
+ telemetry?: TelemetryClient;
37
+ });
38
+ /**
39
+ * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
40
+ * Be warned, the call may return false even if the tx subsequently gets successfully mined.
41
+ * In practice this shouldn't matter, as we'll only ever be calling `interrupt` when we know it's going to fail.
42
+ * A call to `restart` is required before you can continue publishing.
43
+ */
44
+ interrupt(): void;
45
+ /** Restarts the publisher after calling `interrupt`. */
46
+ restart(): void;
47
+ getSenderAddress(): EthAddress;
48
+ getProofClaim(): Promise<{
49
+ epochToProve: bigint;
50
+ basisPointFee: bigint;
51
+ bondAmount: bigint;
52
+ bondProvider: EthAddress;
53
+ proposerClaimant: EthAddress;
54
+ } | undefined>;
55
+ submitEpochProof(args: {
56
+ epochNumber: number;
57
+ fromBlock: number;
58
+ toBlock: number;
59
+ publicInputs: RootRollupPublicInputs;
60
+ proof: Proof;
61
+ }): Promise<boolean>;
62
+ private validateEpochProofSubmission;
63
+ private sendSubmitEpochProofTx;
64
+ private getSubmitEpochProofArgs;
65
+ protected sleepOrInterrupted(): Promise<void>;
66
+ }
67
+ //# sourceMappingURL=prover-node-publisher.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,wBAAwB,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAC3F,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAI5E,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,iBAAiB,EAAE,EAAE,CAAC;IACtB,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAoB;IAEnC,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAYH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,gBAAgB;IAIhB,aAAa;;;;;;;IAIP,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YA0CN,4BAA4B;YAyD5B,sBAAsB;IAmDpC,OAAO,CAAC,uBAAuB;cA8Bf,kBAAkB;CAGnC"}
@@ -0,0 +1,185 @@
1
+ import { AGGREGATION_OBJECT_LENGTH, AZTEC_MAX_EPOCH_DURATION } from '@aztec/circuits.js';
2
+ import { makeTuple } from '@aztec/foundation/array';
3
+ import { areArraysEqual, times } from '@aztec/foundation/collection';
4
+ import { EthAddress } from '@aztec/foundation/eth-address';
5
+ import { Fr } from '@aztec/foundation/fields';
6
+ import { createLogger } from '@aztec/foundation/log';
7
+ import { serializeToBuffer } from '@aztec/foundation/serialize';
8
+ import { InterruptibleSleep } from '@aztec/foundation/sleep';
9
+ import { Timer } from '@aztec/foundation/timer';
10
+ import { RollupAbi } from '@aztec/l1-artifacts';
11
+ import { getTelemetryClient } from '@aztec/telemetry-client';
12
+ import { encodeFunctionData } from 'viem';
13
+ import { ProverNodeMetrics } from './metrics.js';
14
+ export class ProverNodePublisher {
15
+ constructor(config, deps) {
16
+ this.interruptibleSleep = new InterruptibleSleep();
17
+ this.interrupted = false;
18
+ this.log = createLogger('prover-node:l1-tx-publisher');
19
+ this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60000;
20
+ const telemetry = deps.telemetry ?? getTelemetryClient();
21
+ this.metrics = new ProverNodeMetrics(telemetry, 'ProverNode');
22
+ this.rollupContract = deps.rollupContract;
23
+ this.l1TxUtils = deps.l1TxUtils;
24
+ }
25
+ /**
26
+ * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
27
+ * Be warned, the call may return false even if the tx subsequently gets successfully mined.
28
+ * In practice this shouldn't matter, as we'll only ever be calling `interrupt` when we know it's going to fail.
29
+ * A call to `restart` is required before you can continue publishing.
30
+ */
31
+ interrupt() {
32
+ this.interrupted = true;
33
+ this.interruptibleSleep.interrupt();
34
+ }
35
+ /** Restarts the publisher after calling `interrupt`. */
36
+ restart() {
37
+ this.interrupted = false;
38
+ }
39
+ getSenderAddress() {
40
+ return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
41
+ }
42
+ getProofClaim() {
43
+ return this.rollupContract.getProofClaim();
44
+ }
45
+ async submitEpochProof(args) {
46
+ const { epochNumber, fromBlock, toBlock } = args;
47
+ const ctx = { epochNumber, fromBlock, toBlock };
48
+ if (!this.interrupted) {
49
+ const timer = new Timer();
50
+ // Validate epoch proof range and hashes are correct before submitting
51
+ await this.validateEpochProofSubmission(args);
52
+ const txReceipt = await this.sendSubmitEpochProofTx(args);
53
+ if (!txReceipt) {
54
+ return false;
55
+ }
56
+ // Tx was mined successfully
57
+ if (txReceipt.status) {
58
+ const tx = await this.l1TxUtils.getTransactionStats(txReceipt.transactionHash);
59
+ const stats = {
60
+ gasPrice: txReceipt.effectiveGasPrice,
61
+ gasUsed: txReceipt.gasUsed,
62
+ transactionHash: txReceipt.transactionHash,
63
+ calldataGas: tx.calldataGas,
64
+ calldataSize: tx.calldataSize,
65
+ sender: tx.sender,
66
+ blobDataGas: 0n,
67
+ blobGasUsed: 0n,
68
+ eventName: 'proof-published-to-l1',
69
+ };
70
+ this.log.info(`Published epoch proof to L1 rollup contract`, { ...stats, ...ctx });
71
+ this.metrics.recordSubmitProof(timer.ms(), stats);
72
+ return true;
73
+ }
74
+ this.metrics.recordFailedTx();
75
+ this.log.error(`Rollup.submitEpochProof tx status failed: ${txReceipt.transactionHash}`, ctx);
76
+ await this.sleepOrInterrupted();
77
+ }
78
+ this.log.verbose('L2 block data syncing interrupted while processing blocks.', ctx);
79
+ return false;
80
+ }
81
+ async validateEpochProofSubmission(args) {
82
+ const { fromBlock, toBlock, publicInputs, proof } = args;
83
+ // Check that the block numbers match the expected epoch to be proven
84
+ const { pendingBlockNumber: pending, provenBlockNumber: proven } = await this.rollupContract.getTips();
85
+ if (proven !== BigInt(fromBlock) - 1n) {
86
+ throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as proven block is ${proven}`);
87
+ }
88
+ if (toBlock > pending) {
89
+ throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as pending block is ${pending}`);
90
+ }
91
+ // Check the block hash and archive for the immediate block before the epoch
92
+ const blockLog = await this.rollupContract.getBlock(proven);
93
+ if (publicInputs.previousArchive.root.toString() !== blockLog.archive) {
94
+ throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchive.root.toString()} !== ${blockLog.archive}`);
95
+ }
96
+ // TODO: Remove zero check once we inject the proper zero blockhash
97
+ if (blockLog.blockHash !== Fr.ZERO.toString() && publicInputs.previousBlockHash.toString() !== blockLog.blockHash) {
98
+ throw new Error(`Previous block hash mismatch: ${publicInputs.previousBlockHash.toString()} !== ${blockLog.blockHash}`);
99
+ }
100
+ // Check the block hash and archive for the last block in the epoch
101
+ const endBlockLog = await this.rollupContract.getBlock(BigInt(toBlock));
102
+ if (publicInputs.endArchive.root.toString() !== endBlockLog.archive) {
103
+ throw new Error(`End archive root mismatch: ${publicInputs.endArchive.root.toString()} !== ${endBlockLog.archive}`);
104
+ }
105
+ if (publicInputs.endBlockHash.toString() !== endBlockLog.blockHash) {
106
+ throw new Error(`End block hash mismatch: ${publicInputs.endBlockHash.toString()} !== ${endBlockLog.blockHash}`);
107
+ }
108
+ // Compare the public inputs computed by the contract with the ones injected
109
+ const rollupPublicInputs = await this.rollupContract.getEpochProofPublicInputs(this.getSubmitEpochProofArgs(args));
110
+ const aggregationObject = proof.isEmpty()
111
+ ? times(AGGREGATION_OBJECT_LENGTH, Fr.zero)
112
+ : proof.extractAggregationObject();
113
+ const argsPublicInputs = [...publicInputs.toFields(), ...aggregationObject];
114
+ if (!areArraysEqual(rollupPublicInputs.map(Fr.fromHexString), argsPublicInputs, (a, b) => a.equals(b))) {
115
+ const fmt = (inputs) => inputs.map(x => x.toString()).join(', ');
116
+ throw new Error(`Root rollup public inputs mismatch:\nRollup: ${fmt(rollupPublicInputs)}\nComputed:${fmt(argsPublicInputs)}`);
117
+ }
118
+ }
119
+ async sendSubmitEpochProofTx(args) {
120
+ const proofHex = `0x${args.proof.withoutPublicInputs().toString('hex')}`;
121
+ const argsArray = this.getSubmitEpochProofArgs(args);
122
+ const txArgs = [
123
+ {
124
+ epochSize: argsArray[0],
125
+ args: argsArray[1],
126
+ fees: argsArray[2],
127
+ blobPublicInputs: argsArray[3],
128
+ aggregationObject: argsArray[4],
129
+ proof: proofHex,
130
+ },
131
+ ];
132
+ this.log.info(`SubmitEpochProof proofSize=${args.proof.withoutPublicInputs().length} bytes`);
133
+ const data = encodeFunctionData({
134
+ abi: RollupAbi,
135
+ functionName: 'submitEpochRootProof',
136
+ args: txArgs,
137
+ });
138
+ try {
139
+ const { receipt } = await this.l1TxUtils.sendAndMonitorTransaction({
140
+ to: this.rollupContract.address,
141
+ data,
142
+ });
143
+ return receipt;
144
+ }
145
+ catch (err) {
146
+ this.log.error(`Rollup submit epoch proof failed`, err);
147
+ const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
148
+ args: [...txArgs],
149
+ functionName: 'submitEpochRootProof',
150
+ abi: RollupAbi,
151
+ address: this.rollupContract.address,
152
+ },
153
+ /*blobInputs*/ undefined,
154
+ /*stateOverride*/ []);
155
+ this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
156
+ return undefined;
157
+ }
158
+ }
159
+ getSubmitEpochProofArgs(args) {
160
+ return [
161
+ BigInt(args.toBlock - args.fromBlock + 1),
162
+ [
163
+ args.publicInputs.previousArchive.root.toString(),
164
+ args.publicInputs.endArchive.root.toString(),
165
+ args.publicInputs.previousBlockHash.toString(),
166
+ args.publicInputs.endBlockHash.toString(),
167
+ args.publicInputs.endTimestamp.toString(),
168
+ args.publicInputs.outHash.toString(),
169
+ args.publicInputs.proverId.toString(),
170
+ ],
171
+ makeTuple(AZTEC_MAX_EPOCH_DURATION * 2, i => i % 2 === 0
172
+ ? args.publicInputs.fees[i / 2].recipient.toField().toString()
173
+ : args.publicInputs.fees[(i - 1) / 2].value.toString()),
174
+ `0x${args.publicInputs.blobPublicInputs
175
+ .filter((_, i) => i < args.toBlock - args.fromBlock + 1)
176
+ .map(b => b.toString())
177
+ .join(``)}`,
178
+ `0x${serializeToBuffer(args.proof.extractAggregationObject()).toString('hex')}`,
179
+ ];
180
+ }
181
+ async sleepOrInterrupted() {
182
+ await this.interruptibleSleep.sleep(this.sleepTimeMs);
183
+ }
184
+ }
185
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node-publisher.js","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"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"}
@@ -2,13 +2,13 @@ import { type EpochProofClaim, type EpochProofQuote, type EpochProverManager, ty
2
2
  import { type ContractDataSource } from '@aztec/circuits.js';
3
3
  import { type Maybe } from '@aztec/foundation/types';
4
4
  import { type P2P } from '@aztec/p2p';
5
- import { type L1Publisher } from '@aztec/sequencer-client';
6
5
  import { PublicProcessorFactory } from '@aztec/simulator/server';
7
6
  import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
8
7
  import { type BondManager } from './bond/bond-manager.js';
9
8
  import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
10
9
  import { type ClaimsMonitor, type ClaimsMonitorHandler } from './monitors/claims-monitor.js';
11
10
  import { type EpochMonitor, type EpochMonitorHandler } from './monitors/epoch-monitor.js';
11
+ import { type ProverNodePublisher } from './prover-node-publisher.js';
12
12
  import { type QuoteProvider } from './quote-provider/index.js';
13
13
  import { type QuoteSigner } from './quote-signer.js';
14
14
  export type ProverNodeOptions = {
@@ -27,7 +27,7 @@ export type ProverNodeOptions = {
27
27
  */
28
28
  export declare class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, ProverNodeApi, Traceable {
29
29
  protected readonly prover: EpochProverManager;
30
- protected readonly publisher: L1Publisher;
30
+ protected readonly publisher: ProverNodePublisher;
31
31
  protected readonly l2BlockSource: L2BlockSource & Maybe<Service>;
32
32
  protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
33
33
  protected readonly contractDataSource: ContractDataSource;
@@ -47,7 +47,7 @@ export declare class ProverNode implements ClaimsMonitorHandler, EpochMonitorHan
47
47
  private options;
48
48
  private metrics;
49
49
  readonly tracer: Tracer;
50
- constructor(prover: EpochProverManager, publisher: L1Publisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Maybe<Service>, quoteProvider: QuoteProvider, quoteSigner: QuoteSigner, claimsMonitor: ClaimsMonitor, epochsMonitor: EpochMonitor, bondManager: BondManager, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
50
+ constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Maybe<Service>, quoteProvider: QuoteProvider, quoteSigner: QuoteSigner, claimsMonitor: ClaimsMonitor, epochsMonitor: EpochMonitor, bondManager: BondManager, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
51
51
  getP2P(): P2P<P2PClientType.Prover> | undefined;
52
52
  handleClaim(proofClaim: EpochProofClaim): Promise<void>;
53
53
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,EAAE,EAEP,KAAK,sBAAsB,EAG5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAQ7D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAExF,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB,EAAE,MAAM,CAAC;IAClC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,8BAA8B,EAAE,MAAM,CAAC;CACxC,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAW,YAAW,oBAAoB,EAAE,mBAAmB,EAAE,aAAa,EAAE,SAAS;IAalG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;IAC3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IACzD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,sBAAsB;IACrD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY;IAC9C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAE3C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAzBrD,OAAO,CAAC,GAAG,CAA+B;IAC1C,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,uBAAuB,CAAqB;IACpD,OAAO,CAAC,IAAI,CAA2C;IACvD,OAAO,CAAC,eAAe,CAAgF;IACvG,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAoB;IAEnC,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGV,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,WAAW,EACtB,aAAa,EAAE,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,EAC7C,mBAAmB,EAAE,mBAAmB,EACxC,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,sBAAsB,EAClC,YAAY,EAAE,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,EACjD,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,YAAY,EAC3B,WAAW,EAAE,WAAW,EAC3C,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,EACrB,eAAe,GAAE,eAAsC;IAgBrE,MAAM;IAQP,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B7D;;;;OAIG;IACG,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYhE;;;OAGG;IACG,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyC9D;;;;OAIG;IACG,KAAK;IAOX;;OAEG;IACG,IAAI;IAcV,qDAAqD;IAC9C,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,OAAO,CAAC,qBAAqB;IAI7B;;OAEG;IACU,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAK/C;;OAEG;IACU,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAKpD;;OAEG;IACI,SAAS;IAIhB;;OAEG;IACI,OAAO,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,oBAAoB,CAAA;KAAE,EAAE,CAAC;IAI3E,OAAO,CAAC,uBAAuB;YAMjB,gBAAgB;IAqC9B,OAAO,CAAC,cAAc;YAKR,eAAe;YAQf,YAAY;YAQZ,SAAS;IAiEvB,sCAAsC;IACtC,SAAS,CAAC,uBAAuB,CAC/B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,IAAI,GAAG,SAAS,EAC1B,MAAM,EAAE,OAAO,EAAE,EACjB,GAAG,EAAE,EAAE,EAAE,EACT,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAmB9B,sCAAsC;cACtB,eAAe;CAIhC"}
1
+ {"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
@@ -326,4 +326,4 @@ class EmptyEpochError extends Error {
326
326
  this.name = 'EmptyEpochError';
327
327
  }
328
328
  }
329
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
329
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import { type EpochProverManager } from '@aztec/circuit-types';
2
- import { type L1Publisher } from '@aztec/sequencer-client';
2
+ import { type ProverNodePublisher } from '../prover-node-publisher.js';
3
3
  import { ProverNode } from '../prover-node.js';
4
4
  declare class TestProverNode_ extends ProverNode {
5
5
  prover: EpochProverManager;
6
- publisher: L1Publisher;
6
+ publisher: ProverNodePublisher;
7
7
  }
8
8
  export type TestProverNode = TestProverNode_;
9
9
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,WAAW,CAAC;CACzC;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,mBAAmB,CAAC;CACjD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-node",
3
- "version": "0.72.1",
3
+ "version": "0.74.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -53,23 +53,23 @@
53
53
  ]
54
54
  },
55
55
  "dependencies": {
56
- "@aztec/archiver": "0.72.1",
57
- "@aztec/bb-prover": "0.72.1",
58
- "@aztec/blob-sink": "0.72.1",
59
- "@aztec/circuit-types": "0.72.1",
60
- "@aztec/circuits.js": "0.72.1",
61
- "@aztec/epoch-cache": "0.72.1",
62
- "@aztec/ethereum": "0.72.1",
63
- "@aztec/foundation": "0.72.1",
64
- "@aztec/kv-store": "0.72.1",
65
- "@aztec/l1-artifacts": "0.72.1",
66
- "@aztec/p2p": "0.72.1",
67
- "@aztec/prover-client": "0.72.1",
68
- "@aztec/sequencer-client": "0.72.1",
69
- "@aztec/simulator": "0.72.1",
70
- "@aztec/telemetry-client": "0.72.1",
71
- "@aztec/types": "0.72.1",
72
- "@aztec/world-state": "0.72.1",
56
+ "@aztec/archiver": "0.74.0",
57
+ "@aztec/bb-prover": "0.74.0",
58
+ "@aztec/blob-sink": "0.74.0",
59
+ "@aztec/circuit-types": "0.74.0",
60
+ "@aztec/circuits.js": "0.74.0",
61
+ "@aztec/epoch-cache": "0.74.0",
62
+ "@aztec/ethereum": "0.74.0",
63
+ "@aztec/foundation": "0.74.0",
64
+ "@aztec/kv-store": "0.74.0",
65
+ "@aztec/l1-artifacts": "0.74.0",
66
+ "@aztec/p2p": "0.74.0",
67
+ "@aztec/prover-client": "0.74.0",
68
+ "@aztec/sequencer-client": "0.74.0",
69
+ "@aztec/simulator": "0.74.0",
70
+ "@aztec/telemetry-client": "0.74.0",
71
+ "@aztec/types": "0.74.0",
72
+ "@aztec/world-state": "0.74.0",
73
73
  "source-map-support": "^0.5.21",
74
74
  "tslib": "^2.4.0",
75
75
  "viem": "2.22.8"
@@ -1,17 +1,13 @@
1
1
  import { EthAddress } from '@aztec/circuits.js';
2
+ import { type L1Clients } from '@aztec/ethereum';
2
3
  import { IProofCommitmentEscrowAbi } from '@aztec/l1-artifacts';
3
4
 
4
5
  import {
5
6
  type Chain,
6
- type Client,
7
7
  type GetContractReturnType,
8
8
  type HttpTransport,
9
9
  type PrivateKeyAccount,
10
- type PublicActions,
11
- type PublicRpcSchema,
12
- type WalletActions,
13
10
  type WalletClient,
14
- type WalletRpcSchema,
15
11
  getContract,
16
12
  } from 'viem';
17
13
 
@@ -21,16 +17,7 @@ export class EscrowContract {
21
17
  WalletClient<HttpTransport, Chain, PrivateKeyAccount>
22
18
  >;
23
19
 
24
- constructor(
25
- private readonly client: Client<
26
- HttpTransport,
27
- Chain,
28
- PrivateKeyAccount,
29
- [...WalletRpcSchema, ...PublicRpcSchema],
30
- PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>
31
- >,
32
- address: EthAddress,
33
- ) {
20
+ constructor(private readonly client: L1Clients['walletClient'], address: EthAddress) {
34
21
  this.escrow = getContract({ address: address.toString(), abi: IProofCommitmentEscrowAbi, client });
35
22
  }
36
23
 
@@ -1,19 +1,6 @@
1
- import { EthAddress } from '@aztec/circuits.js';
1
+ import { type EthAddress } from '@aztec/circuits.js';
2
+ import { type L1Clients } from '@aztec/ethereum';
2
3
  import { compact } from '@aztec/foundation/collection';
3
- import { type RollupAbi } from '@aztec/l1-artifacts';
4
-
5
- import {
6
- type Chain,
7
- type Client,
8
- type GetContractReturnType,
9
- type HttpTransport,
10
- type PrivateKeyAccount,
11
- type PublicActions,
12
- type PublicRpcSchema,
13
- type WalletActions,
14
- type WalletClient,
15
- type WalletRpcSchema,
16
- } from 'viem';
17
4
 
18
5
  import { BondManager } from './bond-manager.js';
19
6
  import { type ProverBondManagerConfig, getProverBondManagerConfigFromEnv } from './config.js';
@@ -21,21 +8,14 @@ import { EscrowContract } from './escrow-contract.js';
21
8
  import { TokenContract } from './token-contract.js';
22
9
 
23
10
  export async function createBondManager(
24
- rollupContract: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, Chain, PrivateKeyAccount>>,
25
- client: Client<
26
- HttpTransport,
27
- Chain,
28
- PrivateKeyAccount,
29
- [...WalletRpcSchema, ...PublicRpcSchema],
30
- PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>
31
- >,
11
+ escrowContractAddress: EthAddress,
12
+ client: L1Clients['walletClient'],
32
13
  overrides: Partial<ProverBondManagerConfig> = {},
33
14
  ) {
34
15
  const config = { ...getProverBondManagerConfigFromEnv(), ...compact(overrides) };
35
16
  const { proverMinimumEscrowAmount: minimumStake, proverTargetEscrowAmount: maybeTargetStake } = config;
36
17
  const targetStake = maybeTargetStake ?? minimumStake * 2n;
37
18
 
38
- const escrowContractAddress = EthAddress.fromString(await rollupContract.read.PROOF_COMMITMENT_ESCROW());
39
19
  const escrow = new EscrowContract(client, escrowContractAddress);
40
20
 
41
21
  const tokenContractAddress = await escrow.getTokenAddress();
@@ -1,18 +1,14 @@
1
1
  import { EthAddress } from '@aztec/circuits.js';
2
+ import { type L1Clients } from '@aztec/ethereum';
2
3
  import { createLogger } from '@aztec/foundation/log';
3
4
  import { IERC20Abi, TestERC20Abi } from '@aztec/l1-artifacts';
4
5
 
5
6
  import {
6
7
  type Chain,
7
- type Client,
8
8
  type GetContractReturnType,
9
9
  type HttpTransport,
10
10
  type PrivateKeyAccount,
11
- type PublicActions,
12
- type PublicRpcSchema,
13
- type WalletActions,
14
11
  type WalletClient,
15
- type WalletRpcSchema,
16
12
  getContract,
17
13
  } from 'viem';
18
14
 
@@ -23,16 +19,7 @@ export class TokenContract {
23
19
  private token: GetContractReturnType<typeof IERC20Abi, WalletClient<HttpTransport, Chain, PrivateKeyAccount>>;
24
20
  private logger = createLogger('prover-node:token-contract');
25
21
 
26
- constructor(
27
- private readonly client: Client<
28
- HttpTransport,
29
- Chain,
30
- PrivateKeyAccount,
31
- [...WalletRpcSchema, ...PublicRpcSchema],
32
- PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>
33
- >,
34
- address: EthAddress,
35
- ) {
22
+ constructor(private readonly client: L1Clients['walletClient'], address: EthAddress) {
36
23
  this.token = getContract({ address: address.toString(), abi: IERC20Abi, client });
37
24
  }
38
25