@aztec-labs/prover-node 6.0.0-rc.3 → 6.0.0-rc.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/actions/upload-epoch-proof-failure.d.ts +1 -1
- package/dest/actions/upload-epoch-proof-failure.d.ts.map +1 -1
- package/dest/actions/upload-epoch-proof-failure.js +1 -0
- package/dest/config.d.ts +2 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +5 -0
- package/dest/factory.d.ts +1 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +9 -15
- package/dest/gas_constants.d.ts +14 -0
- package/dest/gas_constants.d.ts.map +1 -0
- package/dest/gas_constants.js +14 -0
- package/dest/job/checkpoint-prover.d.ts +1 -1
- package/dest/job/checkpoint-prover.d.ts.map +1 -1
- package/dest/job/checkpoint-prover.js +6 -0
- package/dest/metrics.d.ts +4 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +5 -8
- package/dest/proof-publishing-service.d.ts +12 -2
- package/dest/proof-publishing-service.d.ts.map +1 -1
- package/dest/proof-publishing-service.js +40 -2
- package/dest/prover-node-publisher.d.ts +5 -2
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +81 -16
- package/dest/prover-node.d.ts +1 -1
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +8 -1
- package/dest/prover-publisher-factory.d.ts +6 -2
- package/dest/prover-publisher-factory.d.ts.map +1 -1
- package/dest/prover-publisher-factory.js +7 -2
- package/dest/session-manager.d.ts +6 -1
- package/dest/session-manager.d.ts.map +1 -1
- package/dest/session-manager.js +5 -3
- package/package.json +22 -23
- package/src/actions/upload-epoch-proof-failure.ts +1 -0
- package/src/config.ts +8 -0
- package/src/factory.ts +13 -22
- package/src/gas_constants.ts +19 -0
- package/src/job/checkpoint-prover.ts +8 -0
- package/src/metrics.ts +10 -10
- package/src/proof-publishing-service.ts +55 -3
- package/src/prover-node-publisher.ts +96 -21
- package/src/prover-node.ts +7 -0
- package/src/prover-publisher-factory.ts +7 -2
- package/src/session-manager.ts +10 -3
|
@@ -12,4 +12,4 @@ type UploadEpochProofConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
|
|
|
12
12
|
*/
|
|
13
13
|
export declare function uploadEpochProofFailure(location: string, jobId: string, jobData: EpochProvingJobData, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadEpochProofConfig, log: Logger): Promise<string>;
|
|
14
14
|
export {};
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWVwb2NoLXByb29mLWZhaWx1cmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3VwbG9hZC1lcG9jaC1wcm9vZi1mYWlsdXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBdUIsS0FBSyxRQUFRLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUcxRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBUW5FLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFnQyxNQUFNLGtDQUFrQyxDQUFDO0FBRTFHLEtBQUssc0JBQXNCLEdBQUcsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsQ0FBQztBQUt4SDs7OztHQUlHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxRQUFRLEVBQUUsTUFBTSxFQUNoQixLQUFLLEVBQUUsTUFBTSxFQUNiLE9BQU8sRUFBRSxtQkFBbUIsRUFDNUIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsVUFBVSxFQUFFLHNCQUFzQixFQUNsQyxNQUFNLEVBQUUsc0JBQXNCLEVBQzlCLEdBQUcsRUFBRSxNQUFNLG1CQXVDWiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-epoch-proof-failure.d.ts","sourceRoot":"","sources":["../../src/actions/upload-epoch-proof-failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"upload-epoch-proof-failure.d.ts","sourceRoot":"","sources":["../../src/actions/upload-epoch-proof-failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAQnE,OAAO,EAAE,KAAK,mBAAmB,EAAgC,MAAM,kCAAkC,CAAC;AAE1G,KAAK,sBAAsB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAKxH;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,sBAAsB,EAC9B,GAAG,EAAE,MAAM,mBAuCZ"}
|
|
@@ -6,6 +6,7 @@ import { buildSnapshotMetadata, createBackups } from '@aztec-labs/node-lib/actio
|
|
|
6
6
|
import { createFileStore } from '@aztec-labs/stdlib/file-store';
|
|
7
7
|
import { getBasePath, uploadSnapshotData } from '@aztec-labs/stdlib/snapshots';
|
|
8
8
|
import { WORLD_STATE_DB_VERSION } from '@aztec-labs/world-state';
|
|
9
|
+
import { Buffer } from 'buffer';
|
|
9
10
|
import { mkdtemp } from 'fs/promises';
|
|
10
11
|
import { tmpdir } from 'os';
|
|
11
12
|
import { dirname, join } from 'path';
|
package/dest/config.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export type SpecificProverNodeConfig = {
|
|
|
16
16
|
proverNodeFailedEpochStore: string | undefined;
|
|
17
17
|
proverNodeEpochProvingDelayMs: number | undefined;
|
|
18
18
|
proverNodeDisableProofPublish?: boolean;
|
|
19
|
+
proverNodeDisableFullEpochProving?: boolean;
|
|
19
20
|
txGatheringTimeoutMs: number;
|
|
20
21
|
txGatheringIntervalMs: number;
|
|
21
22
|
txGatheringBatchSize: number;
|
|
@@ -28,4 +29,4 @@ export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;
|
|
|
28
29
|
export declare function getProverNodeBrokerConfigFromEnv(): ProverBrokerConfig;
|
|
29
30
|
export declare function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig & ACVMConfig;
|
|
30
31
|
export declare function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN6RSxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwrQkFBK0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUEwQixNQUFNLGtDQUFrQyxDQUFDO0FBRS9GLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2hFLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUE0QixNQUFNLDZCQUE2QixDQUFDO0FBQzlGLE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUN0QixLQUFLLGtCQUFrQixFQUd4QixNQUFNLHlDQUF5QyxDQUFDO0FBQ2pELE9BQU8sRUFDTCxLQUFLLHNCQUFzQixFQUc1QixNQUFNLGtDQUFrQyxDQUFDO0FBQzFDLE9BQU8sRUFDTCxLQUFLLHFCQUFxQixFQUMxQixLQUFLLG9CQUFvQixFQUcxQixNQUFNLHFDQUFxQyxDQUFDO0FBQzdDLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSw2QkFBNkIsQ0FBQztBQUV2RixNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsc0JBQXNCLEdBQ25ELHFCQUFxQixHQUNyQixvQkFBb0IsR0FDcEIsZUFBZSxHQUNmLGNBQWMsR0FDZCx3QkFBd0IsR0FDeEIsSUFBSSxDQUFDLGdCQUFnQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRTFDLE1BQU0sTUFBTSx3QkFBd0IsR0FBRztJQUNyQyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMsMkJBQTJCLEVBQUUsTUFBTSxDQUFDO0lBQ3BDLG1DQUFtQyxFQUFFLE1BQU0sQ0FBQztJQUM1QywwQkFBMEIsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQy9DLDZCQUE2QixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDbEQsNkJBQTZCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDeEMsaUNBQWlDLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDNUMsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IscUNBQXFDLEVBQUUsTUFBTSxDQUFDO0lBQzlDLDRCQUE0QixDQUFDLEVBQUUsVUFBVSxDQUFDO0NBQzNDLENBQUM7QUFFRixlQUFPLE1BQU0sZ0NBQWdDLEVBQUUsa0JBQWtCLENBQUMsd0JBQXdCLENBa0V6RixDQUFDO0FBRUYsZUFBTyxNQUFNLHdCQUF3QixFQUFFLGtCQUFrQixDQUFDLGdCQUFnQixDQVF6RSxDQUFDO0FBRUYsd0JBQWdCLDBCQUEwQixJQUFJLGdCQUFnQixDQUU3RDtBQUVELHdCQUFnQixnQ0FBZ0MsSUFBSSxrQkFBa0IsQ0FJckU7QUFFRCx3QkFBZ0IsK0JBQStCLElBQUksaUJBQWlCLEdBQUcsUUFBUSxHQUFHLFVBQVUsQ0FLM0Y7QUEwREQsd0JBQWdCLHVCQUF1QixDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxRQUFRLEdBQUcsU0FBUyxDQVN0RiJ9
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,kCAAkC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,6BAA6B,CAAC;AAC9F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,KAAK,sBAAsB,EAG5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAG1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,6BAA6B,CAAC;AAEvF,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GACnD,qBAAqB,GACrB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,wBAAwB,GACxB,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,UAAU,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,kCAAkC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,6BAA6B,CAAC;AAC9F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,KAAK,sBAAsB,EAG5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAG1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,6BAA6B,CAAC;AAEvF,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GACnD,qBAAqB,GACrB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,wBAAwB,GACxB,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,UAAU,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAkEzF,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAQzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AA0DD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAStF"}
|
package/dest/config.js
CHANGED
|
@@ -57,6 +57,11 @@ export const specificProverNodeConfigMappings = {
|
|
|
57
57
|
description: 'Whether the prover node skips publishing proofs to L1',
|
|
58
58
|
...booleanConfigHelper(false)
|
|
59
59
|
},
|
|
60
|
+
proverNodeDisableFullEpochProving: {
|
|
61
|
+
env: 'PROVER_NODE_DISABLE_FULL_EPOCH_PROVING',
|
|
62
|
+
description: 'Whether the prover node skips proving complete epochs on its own. It still proves partial epochs requested ' + 'through the startProof admin API, e.g. by a sidecar that pays for early withdrawal proofs.',
|
|
63
|
+
...booleanConfigHelper(false)
|
|
64
|
+
},
|
|
60
65
|
proofSubmissionTargetAddress: {
|
|
61
66
|
env: 'PROVER_NODE_PROOF_SUBMISSION_TARGET_ADDRESS',
|
|
62
67
|
description: 'Optional L1 address the submitEpochRootProof tx is sent to. Must expose the identical submitEpochRootProof ABI ' + 'and forward to the rollup. Defaults to the rollup address.',
|
package/dest/factory.d.ts
CHANGED
|
@@ -33,4 +33,4 @@ export type ProverNodeDeps = {
|
|
|
33
33
|
};
|
|
34
34
|
/** Creates a new prover node subsystem given a config and dependencies */
|
|
35
35
|
export declare function createProverNode(userConfig: SpecificProverNodeConfig & ProverConfig & ProverClientUserConfig & ProverPublisherConfig & ProverTxSenderConfig, deps: ProverNodeDeps): Promise<ProverNode>;
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSW5FLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUc3RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sNEJBQTRCLENBQUM7QUFDdkUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzVELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RCxPQUFPLEVBQTJCLEtBQUssc0JBQXNCLEVBQXNCLE1BQU0sMkJBQTJCLENBQUM7QUFFckgsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssb0JBQW9CLEVBRzFCLE1BQU0sOEJBQThCLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQ1YsV0FBVyxFQUNYLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsT0FBTyxFQUNQLHNCQUFzQixFQUN2QixNQUFNLHNDQUFzQyxDQUFDO0FBQzlDLE9BQU8sRUFBYSxLQUFLLGVBQWUsRUFBc0IsTUFBTSw4QkFBOEIsQ0FBQztBQUduRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFdkUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQixTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFDNUIsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixnQkFBZ0IsQ0FBQyxFQUFFLHNCQUFzQixDQUFDO0lBQzFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzFCLFNBQVMsQ0FBQyxFQUFFLFNBQVMsQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsc0JBQXNCLEVBQUUsc0JBQXNCLENBQUM7SUFDL0MsU0FBUyxFQUFFO1FBQUUsYUFBYSxJQUFJLFdBQVcsQ0FBQTtLQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9ELFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztJQUNoQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsZUFBZSxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQ2xDLGlGQUFpRjtJQUNqRixZQUFZLEVBQUUsWUFBWSxDQUFDO0NBQzVCLENBQUM7QUFFRiwwRUFBMEU7QUFDMUUsd0JBQXNCLGdCQUFnQixDQUNwQyxVQUFVLEVBQUUsd0JBQXdCLEdBQ2xDLFlBQVksR0FDWixzQkFBc0IsR0FDdEIscUJBQXFCLEdBQ3JCLG9CQUFvQixFQUN0QixJQUFJLEVBQUUsY0FBYyx1QkF5SHJCIn0=
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAG7D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAA2B,KAAK,sBAAsB,EAAsB,MAAM,2BAA2B,CAAC;AAErH,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAG1B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,OAAO,EACP,sBAAsB,EACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAa,KAAK,eAAe,EAAsB,MAAM,8BAA8B,CAAC;AAGnG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE;QAAE,aAAa,IAAI,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,mBAAmB,CAAC;IAChC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,iFAAiF;IACjF,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,0EAA0E;AAC1E,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,wBAAwB,GAClC,YAAY,GACZ,sBAAsB,GACtB,qBAAqB,GACrB,oBAAoB,EACtB,IAAI,EAAE,cAAc,uBAyHrB"}
|
package/dest/factory.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Blob } from '@aztec-labs/blob-lib';
|
|
2
1
|
import { createEthereumChain } from '@aztec-labs/ethereum/chain';
|
|
3
2
|
import { makeL1HttpTransport } from '@aztec-labs/ethereum/client';
|
|
4
3
|
import { RollupContract } from '@aztec-labs/ethereum/contracts';
|
|
@@ -6,12 +5,13 @@ import { PublisherManager } from '@aztec-labs/ethereum/publisher-manager';
|
|
|
6
5
|
import { pick } from '@aztec-labs/foundation/collection';
|
|
7
6
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
8
7
|
import { DateProvider } from '@aztec-labs/foundation/timer';
|
|
9
|
-
import {
|
|
8
|
+
import { createL1TxUtilsFromSigners } from '@aztec-labs/node-lib/factories';
|
|
10
9
|
import { createProverClient } from '@aztec-labs/prover-client';
|
|
11
10
|
import { createAndStartProvingBroker } from '@aztec-labs/prover-client/broker';
|
|
12
|
-
import { getPublisherConfigFromProverConfig } from '@aztec-labs/sequencer-client';
|
|
11
|
+
import { PublisherManagerMetrics, getPublisherConfigFromProverConfig } from '@aztec-labs/sequencer-client';
|
|
13
12
|
import { L1Metrics, getTelemetryClient } from '@aztec-labs/telemetry-client';
|
|
14
13
|
import { createPublicClient } from 'viem';
|
|
14
|
+
import { SUBMIT_EPOCH_PROOF_REFERENCE_SEND } from './gas_constants.js';
|
|
15
15
|
import { ProverNode } from './prover-node.js';
|
|
16
16
|
import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
17
17
|
/** Creates a new prover node subsystem given a config and dependencies */ export async function createProverNode(userConfig, deps) {
|
|
@@ -54,15 +54,7 @@ import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
|
54
54
|
const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
|
|
55
55
|
const l1TxUtils = deps.l1TxUtils ? [
|
|
56
56
|
deps.l1TxUtils
|
|
57
|
-
] :
|
|
58
|
-
...config,
|
|
59
|
-
scope: 'prover'
|
|
60
|
-
}, {
|
|
61
|
-
telemetry,
|
|
62
|
-
logger: log.createChild('l1-tx-utils'),
|
|
63
|
-
dateProvider,
|
|
64
|
-
kzg: Blob.getViemKzgInstance()
|
|
65
|
-
}) : await createL1TxUtilsFromSigners(publicClient, proverSigners.signers, {
|
|
57
|
+
] : await createL1TxUtilsFromSigners(publicClient, proverSigners.signers, {
|
|
66
58
|
...config,
|
|
67
59
|
scope: 'prover'
|
|
68
60
|
}, {
|
|
@@ -91,14 +83,16 @@ import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
|
91
83
|
proofSubmissionTarget: config.proofSubmissionTargetAddress,
|
|
92
84
|
publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), {
|
|
93
85
|
bindings: log.getBindings(),
|
|
94
|
-
funder: funderL1TxUtils
|
|
86
|
+
funder: funderL1TxUtils,
|
|
87
|
+
metrics: new PublisherManagerMetrics(telemetry, 'prover'),
|
|
88
|
+
referenceSend: config.proverNodeDisableProofPublish ? undefined : SUBMIT_EPOCH_PROOF_REFERENCE_SEND
|
|
95
89
|
}),
|
|
96
90
|
telemetry
|
|
97
91
|
});
|
|
98
92
|
const proverNodeConfig = {
|
|
99
|
-
...pick(config, 'proverNodeMaxPendingJobs', 'proverNodeMaxParallelBlocksPerEpoch', 'proverNodePollingIntervalMs', 'proverNodeEpochProvingDelayMs', 'txGatheringMaxParallelRequests', 'txGatheringIntervalMs', 'txGatheringTimeoutMs', 'proverNodeFailedEpochStore', 'proverNodeDisableProofPublish', 'dataDirectory', 'l1ChainId', 'rollupVersion')
|
|
93
|
+
...pick(config, 'proverNodeMaxPendingJobs', 'proverNodeMaxParallelBlocksPerEpoch', 'proverNodePollingIntervalMs', 'proverNodeEpochProvingDelayMs', 'txGatheringMaxParallelRequests', 'txGatheringIntervalMs', 'txGatheringTimeoutMs', 'proverNodeFailedEpochStore', 'proverNodeDisableProofPublish', 'proverNodeDisableFullEpochProving', 'dataDirectory', 'l1ChainId', 'rollupVersion')
|
|
100
94
|
};
|
|
101
|
-
const l1Metrics = new L1Metrics(telemetry.getMeter('ProverNodeL1Metrics'), publicClient, l1TxUtils.
|
|
95
|
+
const l1Metrics = new L1Metrics(telemetry.getMeter('ProverNodeL1Metrics'), publicClient, l1TxUtils.length, 'prover');
|
|
102
96
|
// Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
|
|
103
97
|
const delayer = l1TxUtils[0]?.delayer;
|
|
104
98
|
return new ProverNode(prover, publisherFactory, archiver, archiver, archiver, worldStateSynchronizer, p2pClient, rollupContract, l1Metrics, deps.avmSimulator, proverNodeConfig, telemetry, delayer, dateProvider);
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { SendCostRequirement } from '@aztec-labs/ethereum/l1-tx-utils';
|
|
2
|
+
import type { ReferenceSend } from '@aztec-labs/ethereum/publisher-manager';
|
|
3
|
+
/**
|
|
4
|
+
* Worst-case gas limit of an epoch proof submission, used to check that a publisher can afford sending a finished proof.
|
|
5
|
+
* Measured on testnet v6 (Sepolia after Glamsterdam): the first `submitEpochRootProof` of an epoch used at most 2.51M
|
|
6
|
+
* gas, sent with a 3.06M gas limit after the gas limit buffer (20% by default). Proofs sent through a forwarder contract
|
|
7
|
+
* use about 2.89M gas, so roughly 3.5M once the buffer is added.
|
|
8
|
+
*/
|
|
9
|
+
export declare const SUBMIT_EPOCH_PROOF_GAS = 3500000n;
|
|
10
|
+
/** Affordability requirement of an epoch proof submission, which carries no blobs. */
|
|
11
|
+
export declare const SUBMIT_EPOCH_PROOF_REQUIREMENT: SendCostRequirement;
|
|
12
|
+
/** Send the periodic publisher balance check prices to report whether a prover can afford to submit an epoch proof. */
|
|
13
|
+
export declare const SUBMIT_EPOCH_PROOF_REFERENCE_SEND: ReferenceSend;
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX2NvbnN0YW50cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2dhc19jb25zdGFudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUU1RTs7Ozs7R0FLRztBQUNILGVBQU8sTUFBTSxzQkFBc0IsV0FBYSxDQUFDO0FBRWpELHNGQUFzRjtBQUN0RixlQUFPLE1BQU0sOEJBQThCLEVBQUUsbUJBQXdFLENBQUM7QUFFdEgsdUhBQXVIO0FBQ3ZILGVBQU8sTUFBTSxpQ0FBaUMsRUFBRSxhQUcvQyxDQUFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gas_constants.d.ts","sourceRoot":"","sources":["../src/gas_constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAE5E;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,WAAa,CAAC;AAEjD,sFAAsF;AACtF,eAAO,MAAM,8BAA8B,EAAE,mBAAwE,CAAC;AAEtH,uHAAuH;AACvH,eAAO,MAAM,iCAAiC,EAAE,aAG/C,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worst-case gas limit of an epoch proof submission, used to check that a publisher can afford sending a finished proof.
|
|
3
|
+
* Measured on testnet v6 (Sepolia after Glamsterdam): the first `submitEpochRootProof` of an epoch used at most 2.51M
|
|
4
|
+
* gas, sent with a 3.06M gas limit after the gas limit buffer (20% by default). Proofs sent through a forwarder contract
|
|
5
|
+
* use about 2.89M gas, so roughly 3.5M once the buffer is added.
|
|
6
|
+
*/ export const SUBMIT_EPOCH_PROOF_GAS = 3_500_000n;
|
|
7
|
+
/** Affordability requirement of an epoch proof submission, which carries no blobs. */ export const SUBMIT_EPOCH_PROOF_REQUIREMENT = {
|
|
8
|
+
gasLimit: SUBMIT_EPOCH_PROOF_GAS,
|
|
9
|
+
blobCount: 0
|
|
10
|
+
};
|
|
11
|
+
/** Send the periodic publisher balance check prices to report whether a prover can afford to submit an epoch proof. */ export const SUBMIT_EPOCH_PROOF_REFERENCE_SEND = {
|
|
12
|
+
name: 'epoch proof',
|
|
13
|
+
requirement: SUBMIT_EPOCH_PROOF_REQUIREMENT
|
|
14
|
+
};
|
|
@@ -178,4 +178,4 @@ export declare class CheckpointProver {
|
|
|
178
178
|
private processTxs;
|
|
179
179
|
private createFork;
|
|
180
180
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludC1wcm92ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9qb2IvY2hlY2twb2ludC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNoRixPQUFPLEVBQWUsS0FBSyxXQUFXLEVBQUUsS0FBSyxVQUFVLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUN0RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUFTLE1BQU0sOEJBQThCLENBQUM7QUFHeEUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEtBQUssRUFFVix1QkFBdUIsRUFDdkIsVUFBVSxFQUNYLE1BQU0sd0NBQXdDLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQW1CLHNCQUFzQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFHNUYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFHbEcsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFlLEVBQUUsRUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBRWxGLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZUFBZSxD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint-prover.d.ts","sourceRoot":"","sources":["../../src/job/checkpoint-prover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"checkpoint-prover.d.ts","sourceRoot":"","sources":["../../src/job/checkpoint-prover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MAX_L1_TO_L2_MSGS_PER_BLOCK } from '@aztec-labs/constants';
|
|
1
2
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
3
|
import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
|
|
3
4
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
@@ -352,6 +353,11 @@ import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
|
|
|
352
353
|
if (blockEndLeafCount < previousBlockLeafCount) {
|
|
353
354
|
throw new Error(`Block ${block.number} L1 to L2 leaf count ${blockEndLeafCount} is below its parent's ${previousBlockLeafCount}`);
|
|
354
355
|
}
|
|
356
|
+
// The live p2p path enforces this cap; the Ethereum-ingest path must too, or an over-cap block
|
|
357
|
+
// is accepted here and only fails later in bundle construction.
|
|
358
|
+
if (blockEndLeafCount - previousBlockLeafCount > MAX_L1_TO_L2_MSGS_PER_BLOCK) {
|
|
359
|
+
throw new Error(`Block ${block.number} consumes ${blockEndLeafCount - previousBlockLeafCount} L1 to L2 messages, above the per-block cap of ${MAX_L1_TO_L2_MSGS_PER_BLOCK}`);
|
|
360
|
+
}
|
|
355
361
|
const blockMessages = this.l1ToL2Messages.slice(previousBlockLeafCount - checkpointStartLeafCount, blockEndLeafCount - checkpointStartLeafCount);
|
|
356
362
|
previousBlockLeafCount = blockEndLeafCount;
|
|
357
363
|
return blockMessages;
|
package/dest/metrics.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export declare class ProverNodeJobMetrics {
|
|
|
18
18
|
private checkpointProvingDuration;
|
|
19
19
|
private checkpointBlocks;
|
|
20
20
|
private checkpointTransactions;
|
|
21
|
+
private proofSubmissionUnaffordable;
|
|
21
22
|
/** Observable gauges for live state. Registered via `observeState(...)` once the
|
|
22
23
|
* CheckpointStore and SessionManager are available. */
|
|
23
24
|
private activeCheckpoints;
|
|
@@ -30,6 +31,8 @@ export declare class ProverNodeJobMetrics {
|
|
|
30
31
|
recordBlockProcessing(durationMs: number): void;
|
|
31
32
|
recordCheckpointProcessing(durationMs: number, numBlocks: number, numTxs: number): void;
|
|
32
33
|
recordCheckpointProving(durationMs: number): void;
|
|
34
|
+
/** Records a finished epoch proof held back from submission because no publisher could afford sending it. */
|
|
35
|
+
recordProofSubmissionUnaffordable(): void;
|
|
33
36
|
/**
|
|
34
37
|
* Registers observable gauges for the prover-node's live state: how many canonical
|
|
35
38
|
* checkpoint provers are in the store, and how many epoch sessions are live (broken
|
|
@@ -76,13 +79,11 @@ export declare class ProverNodePublisherMetrics {
|
|
|
76
79
|
private txGasEstimated;
|
|
77
80
|
private gasPriceEstimated;
|
|
78
81
|
private txTotalFeeEstimated;
|
|
79
|
-
private senderBalance;
|
|
80
82
|
private meter;
|
|
81
83
|
constructor(client: TelemetryClient, name?: string, logger?: import("@aztec-labs/foundation/log").Logger);
|
|
82
84
|
recordFailedTx(): void;
|
|
83
85
|
recordSubmitProof(durationMs: number, stats: L1PublishProofStats): void;
|
|
84
86
|
recordEstimatedSubmitProof(stats: EstimatedSubmitProofStats): void;
|
|
85
|
-
recordSenderBalance(wei: bigint, senderAddress: string): void;
|
|
86
87
|
private recordTx;
|
|
87
88
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQWtCLE1BQU0sMEJBQTBCLENBQUM7QUFDcEYsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUNWLEtBQUssU0FBUyxFQUNkLEtBQUssS0FBSyxFQUdWLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFDWCxLQUFLLGFBQWEsRUFFbkIsTUFBTSw4QkFBOEIsQ0FBQztBQUd0QyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRCxxQkFBYSxvQkFBb0I7SUFzQjdCLE9BQU8sQ0FBQyxLQUFLO2FBQ0csTUFBTSxFQUFFLE1BQU07SUFDOUIsT0FBTyxDQUFDLE1BQU07SUF2QmhCLGtCQUFrQixFQUFFLFNBQVMsQ0FBQztJQUM5QixxQkFBcUIsRUFBRSxLQUFLLENBQUM7SUFDN0IsZ0JBQWdCLEVBQUUsS0FBSyxDQUFDO0lBQ3hCLHNCQUFzQixFQUFFLEtBQUssQ0FBQztJQUU5QixPQUFPLENBQUMsc0JBQXNCLENBQVE7SUFDdEMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBWTtJQUNoRCxPQUFPLENBQUMseUJBQXlCLENBQVk7SUFDN0MsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBQ3BDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBWTtJQUMxQyxPQUFPLENBQUMsMkJBQTJCLENBQWdCO0lBRW5EOzREQUN3RDtJQUN4RCxPQUFPLENBQUMsaUJBQWlC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
|
package/dest/metrics.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EAGV,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAEnB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,qBAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EAGV,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAEnB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,qBAAa,oBAAoB;IAsB7B,OAAO,CAAC,KAAK;aACG,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,MAAM;IAvBhB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,qBAAqB,EAAE,KAAK,CAAC;IAC7B,gBAAgB,EAAE,KAAK,CAAC;IACxB,sBAAsB,EAAE,KAAK,CAAC;IAE9B,OAAO,CAAC,sBAAsB,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,4BAA4B,CAAY;IAChD,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,gBAAgB,CAAY;IACpC,OAAO,CAAC,sBAAsB,CAAY;IAC1C,OAAO,CAAC,2BAA2B,CAAgB;IAEnD;4DACwD;IACxD,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,aAAa,CAA0D;IAC/E,OAAO,CAAC,oBAAoB,CAAyB;IAErD,YACU,KAAK,EAAE,KAAK,EACJ,MAAM,EAAE,MAAM,EACtB,MAAM,8CAAgD,EAiB/D;IAEM,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAKrG;IAEM,oBAAoB,CAAC,UAAU,EAAE,MAAM,QAE7C;IAEM,qBAAqB,CAAC,UAAU,EAAE,MAAM,QAE9C;IAEM,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAItF;IAEM,uBAAuB,CAAC,UAAU,EAAE,MAAM,QAEhD;IAED,6GAA6G;IACtG,iCAAiC,SAEvC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI,CAuB1F;IAED,mFAAmF;IAC5E,kBAAkB,IAAI,IAAI,CAQhC;CACF;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;IAElC,YACU,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,8CAAgD,EAK/D;IAEY,KAAK,kBAIjB;IAEM,IAAI,SAEV;IAED,OAAO,CAAC,OAAO,CAwBb;CACH;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,0BAA0B;aAkBnB,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAnBhB,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,cAAc,CAAY;IAClC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,mBAAmB,CAAY;IAEvC,OAAO,CAAC,KAAK,CAAQ;IAErB,YACkB,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,8CAAgD,EA8B/D;IAED,cAAc,SAKb;IAED,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,QAE/D;IAEM,0BAA0B,CAAC,KAAK,EAAE,yBAAyB,QAkBjE;IAED,OAAO,CAAC,QAAQ;CAuCjB"}
|
package/dest/metrics.js
CHANGED
|
@@ -15,6 +15,7 @@ export class ProverNodeJobMetrics {
|
|
|
15
15
|
checkpointProvingDuration;
|
|
16
16
|
checkpointBlocks;
|
|
17
17
|
checkpointTransactions;
|
|
18
|
+
proofSubmissionUnaffordable;
|
|
18
19
|
/** Observable gauges for live state. Registered via `observeState(...)` once the
|
|
19
20
|
* CheckpointStore and SessionManager are available. */ activeCheckpoints;
|
|
20
21
|
activeEpochSessions;
|
|
@@ -35,6 +36,7 @@ export class ProverNodeJobMetrics {
|
|
|
35
36
|
this.checkpointProvingDuration = this.meter.createHistogram(Metrics.PROVER_NODE_CHECKPOINT_PROVING_DURATION);
|
|
36
37
|
this.checkpointBlocks = this.meter.createHistogram(Metrics.PROVER_NODE_CHECKPOINT_BLOCKS);
|
|
37
38
|
this.checkpointTransactions = this.meter.createHistogram(Metrics.PROVER_NODE_CHECKPOINT_TRANSACTIONS);
|
|
39
|
+
this.proofSubmissionUnaffordable = createUpDownCounterWithDefault(this.meter, Metrics.PROVER_NODE_PROOF_SUBMISSION_UNAFFORDABLE_COUNT);
|
|
38
40
|
}
|
|
39
41
|
recordProvingJob(totalTimeMs, numCheckpoints, numBlocks, numTxs) {
|
|
40
42
|
this.provingJobDuration.record(totalTimeMs / 1000);
|
|
@@ -56,6 +58,9 @@ export class ProverNodeJobMetrics {
|
|
|
56
58
|
recordCheckpointProving(durationMs) {
|
|
57
59
|
this.checkpointProvingDuration.record(Math.ceil(durationMs));
|
|
58
60
|
}
|
|
61
|
+
/** Records a finished epoch proof held back from submission because no publisher could afford sending it. */ recordProofSubmissionUnaffordable() {
|
|
62
|
+
this.proofSubmissionUnaffordable.add(1);
|
|
63
|
+
}
|
|
59
64
|
/**
|
|
60
65
|
* Registers observable gauges for the prover-node's live state: how many canonical
|
|
61
66
|
* checkpoint provers are in the store, and how many epoch sessions are live (broken
|
|
@@ -172,7 +177,6 @@ export class ProverNodePublisherMetrics {
|
|
|
172
177
|
txGasEstimated;
|
|
173
178
|
gasPriceEstimated;
|
|
174
179
|
txTotalFeeEstimated;
|
|
175
|
-
senderBalance;
|
|
176
180
|
meter;
|
|
177
181
|
constructor(client, name = 'ProverNode', logger = createLogger('prover-node:publisher:metrics')){
|
|
178
182
|
this.client = client;
|
|
@@ -198,7 +202,6 @@ export class ProverNodePublisherMetrics {
|
|
|
198
202
|
this.txGasEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_GAS);
|
|
199
203
|
this.gasPriceEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_GAS_PRICE);
|
|
200
204
|
this.txTotalFeeEstimated = this.meter.createHistogram(Metrics.PROVER_NODE_ESTIMATED_SUBMISSION_TOTAL_FEE);
|
|
201
|
-
this.senderBalance = this.meter.createGauge(Metrics.L1_PUBLISHER_BALANCE);
|
|
202
205
|
}
|
|
203
206
|
recordFailedTx() {
|
|
204
207
|
this.txCount.add(1, {
|
|
@@ -225,12 +228,6 @@ export class ProverNodePublisherMetrics {
|
|
|
225
228
|
// ignore
|
|
226
229
|
}
|
|
227
230
|
}
|
|
228
|
-
recordSenderBalance(wei, senderAddress) {
|
|
229
|
-
const eth = parseFloat(formatEther(wei, 'wei'));
|
|
230
|
-
this.senderBalance.record(eth, {
|
|
231
|
-
[Attributes.SENDER_ADDRESS]: senderAddress
|
|
232
|
-
});
|
|
233
|
-
}
|
|
234
231
|
recordTx(durationMs, stats) {
|
|
235
232
|
const attributes = {
|
|
236
233
|
[Attributes.L1_TX_TYPE]: 'submitProof',
|
|
@@ -7,6 +7,7 @@ import type { DateProvider } from '@aztec-labs/foundation/timer';
|
|
|
7
7
|
import type { L2BlockSource } from '@aztec-labs/stdlib/block';
|
|
8
8
|
import type { Proof } from '@aztec-labs/stdlib/proofs';
|
|
9
9
|
import type { CheckpointHeader, RootRollupPublicInputs } from '@aztec-labs/stdlib/rollup';
|
|
10
|
+
import type { ProverNodeJobMetrics } from './metrics.js';
|
|
10
11
|
import type { ProverNodePublisher } from './prover-node-publisher.js';
|
|
11
12
|
import type { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
12
13
|
/** A single proof candidate offered to the publishing service by an `EpochSession`. */
|
|
@@ -47,7 +48,9 @@ export type PublishCandidate = {
|
|
|
47
48
|
};
|
|
48
49
|
/**
|
|
49
50
|
* Terminal outcome for a candidate. The promise from `submit()` resolves with one of these. `'already-submitted'`
|
|
50
|
-
* means L1 already holds a proof of this length from this prover for the epoch, so nothing was sent.
|
|
51
|
+
* means L1 already holds a proof of this length from this prover for the epoch, so nothing was sent. For a full
|
|
52
|
+
* candidate, only a full-epoch registration counts: a proof registered while the epoch was still open is non-full,
|
|
53
|
+
* so a full candidate is resent to replace it.
|
|
51
54
|
*/
|
|
52
55
|
export type PublishOutcome = 'published' | 'already-submitted' | 'superseded' | 'failed' | 'withdrawn' | 'expired';
|
|
53
56
|
/** Subset of `ProverPublisherFactory` the service uses — single async `create()` call. */
|
|
@@ -64,6 +67,7 @@ export type ProofPublishingServiceDeps = {
|
|
|
64
67
|
l2BlockSource: Pick<L2BlockSource, 'getBlockNumber'>;
|
|
65
68
|
dateProvider: DateProvider;
|
|
66
69
|
config: ProofPublishingServiceConfig;
|
|
70
|
+
metrics?: Pick<ProverNodeJobMetrics, 'recordProofSubmissionUnaffordable'>;
|
|
67
71
|
bindings?: LoggerBindings;
|
|
68
72
|
};
|
|
69
73
|
/**
|
|
@@ -103,6 +107,10 @@ export declare class ProofPublishingService {
|
|
|
103
107
|
/** Tracks the candidate currently being published. Set while drain is awaiting the L1 publish. */
|
|
104
108
|
private inFlight;
|
|
105
109
|
private stopped;
|
|
110
|
+
/** Candidates for which the lack of an affordable publisher has already been logged. */
|
|
111
|
+
private readonly unaffordableCandidates;
|
|
112
|
+
/** Pending drain retry after a failed publisher acquisition, so repeated failures never stack up retry timers. */
|
|
113
|
+
private retryTimer;
|
|
106
114
|
constructor(deps: ProofPublishingServiceDeps);
|
|
107
115
|
/**
|
|
108
116
|
* Offers a proof candidate to the service. The returned promise resolves once the
|
|
@@ -134,6 +142,8 @@ export declare class ProofPublishingService {
|
|
|
134
142
|
*/
|
|
135
143
|
stop(): Promise<void>;
|
|
136
144
|
private scheduleDrain;
|
|
145
|
+
/** Schedules a drain after the delay, unless a retry is already pending. */
|
|
146
|
+
private scheduleRetry;
|
|
137
147
|
private drain;
|
|
138
148
|
/**
|
|
139
149
|
* Picks the winning candidate for a given epoch. Partial candidates whose `endBlock` is
|
|
@@ -162,4 +172,4 @@ export declare class ProofPublishingService {
|
|
|
162
172
|
protected handleExpiry(candidateId: string): void;
|
|
163
173
|
private readProvenBlockNumber;
|
|
164
174
|
}
|
|
165
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvb2YtcHVibGlzaGluZy1zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvb2YtcHVibGlzaGluZy1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFaEYsT0FBTyxFQUFFLFdBQVcsRUFBRSxLQUFLLGdCQUFnQixFQUFFLEtBQUssV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDNUcsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBRTVGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTFGLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU1RSx1RkFBdUY7QUFDdkYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHNGQUFzRjtJQUN0RixFQUFFLEVBQUUsTUFBTSxDQUFDO0lBQ1gsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQjs7Ozs7OztPQU9HO0lBQ0gsSUFBSSxFQUFFLE1BQU0s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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proof-publishing-service.d.ts","sourceRoot":"","sources":["../src/proof-publishing-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"proof-publishing-service.d.ts","sourceRoot":"","sources":["../src/proof-publishing-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { NoAffordablePublisherError } from '@aztec-labs/ethereum/publisher-manager';
|
|
1
2
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
3
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
3
4
|
import { promiseWithResolvers } from '@aztec-labs/foundation/promise';
|
|
@@ -7,6 +8,7 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
7
8
|
* in the queue and the drain is re-scheduled after this delay; if the failure persists
|
|
8
9
|
* the candidate's own `deadline` timer caps the total wait.
|
|
9
10
|
*/ const PUBLISHER_ACQUIRE_RETRY_DELAY_MS = 1_000;
|
|
11
|
+
/** Backoff when no publisher can afford the submission: a balance only changes with a new L1 block or a top-up. */ const PUBLISHER_UNAFFORDABLE_RETRY_DELAY_MS = 12_000;
|
|
10
12
|
/**
|
|
11
13
|
* Central owner of L1 proof submission. Sessions offer their proofs here as
|
|
12
14
|
* `PublishCandidate`s; the service serialises one publish at a time, picks the
|
|
@@ -41,11 +43,14 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
41
43
|
*/ drainQueue;
|
|
42
44
|
/** Tracks the candidate currently being published. Set while drain is awaiting the L1 publish. */ inFlight;
|
|
43
45
|
stopped;
|
|
46
|
+
/** Candidates for which the lack of an affordable publisher has already been logged. */ unaffordableCandidates;
|
|
47
|
+
/** Pending drain retry after a failed publisher acquisition, so repeated failures never stack up retry timers. */ retryTimer;
|
|
44
48
|
constructor(deps){
|
|
45
49
|
this.deps = deps;
|
|
46
50
|
this.epochs = new Map();
|
|
47
51
|
this.drainQueue = new SerialQueue();
|
|
48
52
|
this.stopped = false;
|
|
53
|
+
this.unaffordableCandidates = new Set();
|
|
49
54
|
this.log = createLogger('prover-node:proof-publishing-service', deps.bindings);
|
|
50
55
|
this.drainQueue.start();
|
|
51
56
|
}
|
|
@@ -120,6 +125,8 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
120
125
|
* resolves remaining queued candidates as `'withdrawn'`.
|
|
121
126
|
*/ async stop() {
|
|
122
127
|
this.stopped = true;
|
|
128
|
+
clearTimeout(this.retryTimer);
|
|
129
|
+
this.retryTimer = undefined;
|
|
123
130
|
await this.drainQueue.end();
|
|
124
131
|
// Anything still parked in a bucket never ran through drain — resolve it as withdrawn so
|
|
125
132
|
// callers awaiting `submit()` aren't left hanging.
|
|
@@ -139,6 +146,15 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
139
146
|
this.log.error(`Drain task threw`, err);
|
|
140
147
|
});
|
|
141
148
|
}
|
|
149
|
+
/** Schedules a drain after the delay, unless a retry is already pending. */ scheduleRetry(delayMs) {
|
|
150
|
+
if (this.stopped || this.retryTimer) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
this.retryTimer = setTimeout(()=>{
|
|
154
|
+
this.retryTimer = undefined;
|
|
155
|
+
this.scheduleDrain();
|
|
156
|
+
}, delayMs);
|
|
157
|
+
}
|
|
142
158
|
async drain() {
|
|
143
159
|
if (this.stopped) {
|
|
144
160
|
return;
|
|
@@ -203,8 +219,29 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
203
219
|
async publishWinner(epoch, winner, bucket) {
|
|
204
220
|
let publisher;
|
|
205
221
|
try {
|
|
206
|
-
publisher = await this.deps.publisherFactory.create(
|
|
222
|
+
publisher = await this.deps.publisherFactory.create({
|
|
223
|
+
requireAffordableSubmission: !this.deps.config.skipSubmitProof
|
|
224
|
+
});
|
|
207
225
|
} catch (err) {
|
|
226
|
+
if (err instanceof NoAffordablePublisherError) {
|
|
227
|
+
// The candidate may have expired or been withdrawn while the publisher was being acquired.
|
|
228
|
+
if (!bucket.candidates.has(winner.id)) {
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
// Logged once per candidate: retrying every few seconds until a top-up or the deadline would spam errors.
|
|
232
|
+
if (!this.unaffordableCandidates.has(winner.id)) {
|
|
233
|
+
this.unaffordableCandidates.add(winner.id);
|
|
234
|
+
this.deps.metrics?.recordProofSubmissionUnaffordable();
|
|
235
|
+
this.log.error(`Holding back the proof for candidate ${winner.id}: no publisher can afford submitting it, ` + `${err.describeFunding()}; retrying`, err, {
|
|
236
|
+
candidateId: winner.id,
|
|
237
|
+
epoch: winner.epoch,
|
|
238
|
+
retryDelayMs: PUBLISHER_UNAFFORDABLE_RETRY_DELAY_MS,
|
|
239
|
+
...err.toLogContext()
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
this.scheduleRetry(PUBLISHER_UNAFFORDABLE_RETRY_DELAY_MS);
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
208
245
|
// Treat this as transient: the publisher pool may be temporarily exhausted
|
|
209
246
|
// (every signer busy, funding tx in flight, etc.). Leave the candidate queued and
|
|
210
247
|
// schedule another drain after a short backoff. If the failure persists past the
|
|
@@ -215,7 +252,7 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
215
252
|
retryDelayMs: PUBLISHER_ACQUIRE_RETRY_DELAY_MS,
|
|
216
253
|
err
|
|
217
254
|
});
|
|
218
|
-
|
|
255
|
+
this.scheduleRetry(PUBLISHER_ACQUIRE_RETRY_DELAY_MS);
|
|
219
256
|
return;
|
|
220
257
|
}
|
|
221
258
|
this.inFlight = {
|
|
@@ -284,6 +321,7 @@ import { SerialQueue } from '@aztec-labs/foundation/queue';
|
|
|
284
321
|
}
|
|
285
322
|
bucket.candidates.delete(id);
|
|
286
323
|
bucket.resolvers.delete(id);
|
|
324
|
+
this.unaffordableCandidates.delete(id);
|
|
287
325
|
if (resolve) {
|
|
288
326
|
this.log.info(`Candidate ${id} resolved as ${outcome}`, {
|
|
289
327
|
candidateId: id,
|
|
@@ -23,7 +23,9 @@ export type L1SubmitEpochProofArgs = {
|
|
|
23
23
|
};
|
|
24
24
|
/**
|
|
25
25
|
* Result of a proof submission attempt. `'already-submitted'` means this prover had already registered a proof of
|
|
26
|
-
* the same length for the epoch on L1, so nothing was sent; it is not a failure.
|
|
26
|
+
* the same length for the epoch on L1, so nothing was sent; it is not a failure. For a full proof, only a full-epoch
|
|
27
|
+
* registration counts: a proof registered while the epoch was still open is non-full, so a full proof is resent to
|
|
28
|
+
* replace it.
|
|
27
29
|
*/
|
|
28
30
|
export type SubmitEpochProofResult = 'published' | 'already-submitted' | 'failed';
|
|
29
31
|
export declare class ProverNodePublisher {
|
|
@@ -74,7 +76,8 @@ export declare class ProverNodePublisher {
|
|
|
74
76
|
}): Promise<void>;
|
|
75
77
|
private encodeSubmitEpochProofCalldata;
|
|
76
78
|
private sendSubmitEpochProofTx;
|
|
79
|
+
private getOutOfGasRetryGasLimit;
|
|
77
80
|
private getEpochProofPublicInputsArgs;
|
|
78
81
|
private getSubmitEpochProofArgs;
|
|
79
82
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUtcHVibGlzaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLW5vZGUtcHVibGlzaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxXQUFXLEVBQThCLE1BQU0sc0JBQXNCLENBQUM7QUFFL0UsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUNuQixLQUFLLHlCQUF5QixFQUUvQixNQUFNLGdDQUFnQyxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVyRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWhFLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUU1RixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUUxRixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sOEJBQThCLENBQUM7QUFDeEYsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUF3RSxNQUFNLE1BQU0sQ0FBQztBQUl0RyxzRUFBc0U7QUFDdEUsTUFBTSxNQUFNLHNCQUFzQixHQUFHO0lBQ25DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZUFBZSxFQUFFLEVBQUUsQ0FBQztJQUNwQixVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQ2YsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osUUFBUSxFQUFFLEVBQUUsQ0FBQztJQUNiLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO0lBQzVCLEtBQUssRUFBRSxLQUFLLENBQUM7Q0FDZCxDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sc0JBQXNCLEdBQUcsV0FBVyxHQUFHLG1CQUFtQixHQUFHLFFBQVEsQ0FBQztBQUtsRixxQkFBYSxtQkFBbUI7SUFDOUIsT0FBTyxDQUFDLE9BQU8sQ0FBNkI7SUFFNUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFFdEIsU0FBUyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUM7SUFFekMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLEdBQUcsQ0FBQztJQUVyQyxTQUFnQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBRXJDLFlBQ0UsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEVBQ3hDLElBQUksRUFBRTtRQUNKLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNyQixxQkFBcUIsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUNuQyxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7S0FDN0IsRUFDRCxRQUFRLENBQUMsRUFBRSxjQUFjLEVBVTFCO0lBRU0saUJBQWlCLG1CQUV2QjtJQUVNLGdCQUFnQixlQUV0QjtJQUVZLGdCQUFnQixDQUFDLElBQUksRUFBRTtRQUNsQyxXQUFXLEVBQUUsV0FBVyxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNqQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7UUFDL0IsWUFBWSxFQUFFLHNCQUFzQixDQUFDO1FBQ3JDLEtBQUssRUFBRSxLQUFLLENBQUM7UUFDYixpQkFBaUIsRUFBRSxXQUFXLENBQUM7UUFDL0IsWUFBWSxFQUFFLHlCQUF5QixDQUFDO1FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLG1IQUFtSDtRQUNuSCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUN6QixtR0FBbUc7UUFDbkcsUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDO0tBQ2pCLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBdUZsQztZQUVhLDRCQUE0QjtJQXdGMUM7Ozs7T0FJRztJQUNVLDJCQUEyQixDQUFDLElBQUksRUFBRTtRQUM3QyxXQUFXLEVBQUUsV0FBVyxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNqQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUM7UUFDL0IsWUFBWSxFQUFFLHNCQUFzQixDQUFDO1FBQ3JDLEtBQUssRUFBRSxLQUFLLENBQUM7UUFDYixpQkFBaUIsRUFBRSxXQUFXLENBQUM7UUFDL0IsWUFBWSxFQUFFLHlCQUF5QixDQUFDO1FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO1FBQzVCLG1IQUFtSDtRQUNuSCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztLQUMxQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ2hCO0lBRUQsT0FBTyxDQUFDLDhCQUE4QjtZQW1CeEIsc0JBQXNCO1lBaUV0Qix3QkFBd0I7SUE4QnRDLE9BQU8sQ0FBQyw2QkFBNkI7SUF5QnJDLE9BQU8sQ0FBQyx1QkFBdUI7Q0E0QmhDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA8B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAE/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAErF,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA8B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAE/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAErF,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAE1F,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,KAAK,GAAG,EAAwE,MAAM,MAAM,CAAC;AAItG,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAAG,WAAW,GAAG,mBAAmB,GAAG,QAAQ,CAAC;AAKlF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAS,CAAC,qBAAqB,EAAE,GAAG,CAAC;IAErC,SAAgB,SAAS,EAAE,SAAS,CAAC;IAErC,YACE,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,qBAAqB,CAAC,EAAE,UAAU,CAAC;QACnC,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EACD,QAAQ,CAAC,EAAE,cAAc,EAU1B;IAEM,iBAAiB,mBAEvB;IAEM,gBAAgB,eAEtB;IAEY,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,EAAE,gBAAgB,CAAC;QACjC,YAAY,EAAE,gBAAgB,CAAC;QAC/B,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,yBAAyB,CAAC;QACxC,OAAO,EAAE,gBAAgB,EAAE,CAAC;QAC5B,mHAAmH;QACnH,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,mGAAmG;QACnG,QAAQ,CAAC,EAAE,IAAI,CAAC;KACjB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAuFlC;YAEa,4BAA4B;IAwF1C;;;;OAIG;IACU,2BAA2B,CAAC,IAAI,EAAE;QAC7C,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,EAAE,gBAAgB,CAAC;QACjC,YAAY,EAAE,gBAAgB,CAAC;QAC/B,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,yBAAyB,CAAC;QACxC,OAAO,EAAE,gBAAgB,EAAE,CAAC;QAC5B,mHAAmH;QACnH,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsChB;IAED,OAAO,CAAC,8BAA8B;YAmBxB,sBAAsB;YAiEtB,wBAAwB;IA8BtC,OAAO,CAAC,6BAA6B;IAyBrC,OAAO,CAAC,uBAAuB;CA4BhC"}
|