@aztec/prover-node 0.65.2 → 0.66.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.
- package/dest/config.d.ts +4 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +6 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +5 -4
- package/dest/job/epoch-proving-job.d.ts +7 -4
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +25 -32
- package/dest/prover-node.d.ts +3 -2
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +5 -10
- package/package.json +16 -16
- package/src/config.ts +14 -7
- package/src/factory.ts +6 -5
- package/src/job/epoch-proving-job.ts +24 -44
- package/src/prover-node.ts +6 -20
package/dest/config.d.ts
CHANGED
|
@@ -9,9 +9,11 @@ import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-clie
|
|
|
9
9
|
import { type WorldStateConfig } from '@aztec/world-state';
|
|
10
10
|
import { type ProverBondManagerConfig } from './bond/config.js';
|
|
11
11
|
import { type ProverCoordinationConfig } from './prover-coordination/config.js';
|
|
12
|
-
export type ProverNodeConfig = ArchiverConfig & ProverClientConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & ProverCoordinationConfig & ProverBondManagerConfig & QuoteProviderConfig &
|
|
12
|
+
export type ProverNodeConfig = ArchiverConfig & ProverClientConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & ProverCoordinationConfig & ProverBondManagerConfig & QuoteProviderConfig & SpecificProverNodeConfig;
|
|
13
|
+
type SpecificProverNodeConfig = {
|
|
13
14
|
proverNodeMaxPendingJobs: number;
|
|
14
15
|
proverNodePollingIntervalMs: number;
|
|
16
|
+
proverNodeMaxParallelBlocksPerEpoch: number;
|
|
15
17
|
};
|
|
16
18
|
export type QuoteProviderConfig = {
|
|
17
19
|
quoteProviderBasisPointFee: number;
|
|
@@ -22,4 +24,5 @@ export declare const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConf
|
|
|
22
24
|
export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;
|
|
23
25
|
export declare function getProverNodeBrokerConfigFromEnv(): ProverBrokerConfig;
|
|
24
26
|
export declare function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig & ACVMConfig;
|
|
27
|
+
export {};
|
|
25
28
|
//# sourceMappingURL=config.d.ts.map
|
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,EAAE,KAAK,cAAc,EAAoD,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,YAAY,CAAC;AACpF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAKpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,gBAAgB,EAAwD,MAAM,oBAAoB,CAAC;AAEjH,OAAO,EAAE,KAAK,uBAAuB,EAAmC,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,KAAK,wBAAwB,EAG9B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,kBAAkB,GAClB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,uBAAuB,GACvB,mBAAmB,GAAG;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoD,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,YAAY,CAAC;AACpF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAKpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,gBAAgB,EAAwD,MAAM,oBAAoB,CAAC;AAEjH,OAAO,EAAE,KAAK,uBAAuB,EAAmC,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,KAAK,wBAAwB,EAG9B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,kBAAkB,GAClB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,uBAAuB,GACvB,mBAAmB,GACnB,wBAAwB,CAAC;AAE3B,KAAK,wBAAwB,GAAG;IAC9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B,EAAE,MAAM,CAAC;IACnC,uBAAuB,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAsCF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAc7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F"}
|
package/dest/config.js
CHANGED
|
@@ -19,6 +19,11 @@ const specificProverNodeConfigMappings = {
|
|
|
19
19
|
description: 'The interval in milliseconds to poll for new jobs',
|
|
20
20
|
...numberConfigHelper(1000),
|
|
21
21
|
},
|
|
22
|
+
proverNodeMaxParallelBlocksPerEpoch: {
|
|
23
|
+
env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
|
|
24
|
+
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
25
|
+
...numberConfigHelper(32),
|
|
26
|
+
},
|
|
22
27
|
};
|
|
23
28
|
const quoteProviderConfigMappings = {
|
|
24
29
|
quoteProviderBasisPointFee: {
|
|
@@ -75,4 +80,4 @@ export function getProverNodeAgentConfigFromEnv() {
|
|
|
75
80
|
...getConfigFromMappings(bbConfigMappings),
|
|
76
81
|
};
|
|
77
82
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLHNCQUFzQixFQUFFLHdCQUF3QixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFeEcsT0FBTyxFQUdMLHlCQUF5QixFQUN6QiwwQkFBMEIsR0FDM0IsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBRUwsa0JBQWtCLEVBQ2xCLHFCQUFxQixFQUNyQixrQkFBa0IsR0FDbkIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQXdCLGtCQUFrQixFQUFFLG9CQUFvQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDeEcsT0FBTyxFQUFrQixtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNwRixPQUFPLEVBRUwsZ0JBQWdCLEVBQ2hCLGdCQUFnQixFQUNoQiwwQkFBMEIsR0FDM0IsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBR0wseUJBQXlCLEVBQ3pCLDBCQUEwQixFQUMxQix3QkFBd0IsRUFDeEIseUJBQXlCLEdBQzFCLE1BQU0seUJBQXlCLENBQUM7QUFDakMsT0FBTyxFQUF5QiwwQkFBMEIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWpILE9BQU8sRUFBZ0MsK0JBQStCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRyxPQUFPLEVBRUwsMEJBQTBCLEVBQzFCLGdDQUFnQyxHQUNqQyxNQUFNLGlDQUFpQyxDQUFDO0FBMEJ6QyxNQUFNLGdDQUFnQyxHQUFpRDtJQUNyRix3QkFBd0IsRUFBRTtRQUN4QixHQUFHLEVBQUUsOEJBQThCO1FBQ25DLFdBQVcsRUFBRSx3REFBd0Q7UUFDckUsR0FBRyxrQkFBa0IsQ0FBQyxFQUFFLENBQUM7S0FDMUI7SUFDRCwyQkFBMkIsRUFBRTtRQUMzQixHQUFHLEVBQUUsaUNBQWlDO1FBQ3RDLFdBQVcsRUFBRSxtREFBbUQ7UUFDaEUsR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUM7S0FDNUI7SUFDRCxtQ0FBbUMsRUFBRTtRQUNuQyxHQUFHLEVBQUUsMkNBQTJDO1FBQ2hELFdBQVcsRUFBRSw0RUFBNEU7UUFDekYsR0FBRyxrQkFBa0IsQ0FBQyxFQUFFLENBQUM7S0FDMUI7Q0FDRixDQUFDO0FBRUYsTUFBTSwyQkFBMkIsR0FBNEM7SUFDM0UsMEJBQTBCLEVBQUU7UUFDMUIsR0FBRyxFQUFFLGdDQUFnQztRQUNyQyxXQUFXLEVBQUUsb0RBQW9EO1FBQ2pFLEdBQUcsa0JBQWtCLENBQUMsR0FBRyxDQUFDO0tBQzNCO0lBQ0QsdUJBQXVCLEVBQUU7UUFDdkIsR0FBRyxFQUFFLDRCQUE0QjtRQUNqQyxXQUFXLEVBQUUsZ0RBQWdEO1FBQzdELEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDO0tBQzdCO0lBQ0QsZ0JBQWdCLEVBQUU7UUFDaEIsR0FBRyxFQUFFLG9CQUFvQjtRQUN6QixXQUFXLEVBQ1QsZ0hBQWdIO0tBQ25IO0NBQ0YsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUF5QztJQUM1RSxHQUFHLGtCQUFrQjtJQUNyQixHQUFHLHNCQUFzQjtJQUN6QixHQUFHLDBCQUEwQjtJQUM3QixHQUFHLGlCQUFpQjtJQUNwQixHQUFHLHdCQUF3QjtJQUMzQixHQUFHLDBCQUEwQixDQUFDLFFBQVEsQ0FBQztJQUN2QyxHQUFHLHlCQUF5QixDQUFDLFFBQVEsQ0FBQztJQUN0QyxHQUFHLGdDQUFnQztJQUNuQyxHQUFHLDJCQUEyQjtJQUM5QixHQUFHLCtCQUErQjtJQUNsQyxHQUFHLGdDQUFnQztDQUNwQyxDQUFDO0FBRUYsTUFBTSxVQUFVLDBCQUEwQjtJQUN4QyxPQUFPO1FBQ0wsR0FBRyxvQkFBb0IsRUFBRTtRQUN6QixHQUFHLHdCQUF3QixFQUFFO1FBQzdCLEdBQUcsZ0JBQWdCLEVBQUU7UUFDckIsR0FBRyxtQkFBbUIsRUFBRTtRQUN4QixHQUFHLDBCQUEwQixFQUFFO1FBQy9CLEdBQUcseUJBQXlCLENBQUMsUUFBUSxDQUFDO1FBQ3RDLEdBQUcsd0JBQXdCLENBQUMsUUFBUSxDQUFDO1FBQ3JDLEdBQUcsMEJBQTBCLEVBQUU7UUFDL0IsR0FBRyxxQkFBcUIsQ0FBQywyQkFBMkIsQ0FBQztRQUNyRCxHQUFHLHFCQUFxQixDQUFDLGdDQUFnQyxDQUFDO1FBQzFELEdBQUcscUJBQXFCLENBQUMsK0JBQStCLENBQUM7S0FDMUQsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsZ0NBQWdDO0lBQzlDLE9BQU87UUFDTCxHQUFHLHFCQUFxQixDQUFDLDBCQUEwQixDQUFDO0tBQ3JELENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLCtCQUErQjtJQUM3QyxPQUFPO1FBQ0wsR0FBRyxxQkFBcUIsQ0FBQyx5QkFBeUIsQ0FBQztRQUNuRCxHQUFHLHFCQUFxQixDQUFDLGdCQUFnQixDQUFDO0tBQzNDLENBQUM7QUFDSixDQUFDIn0=
|
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,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGtF,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAQ/D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AAK9E,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGtF,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAQ/D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AAK9E,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAKtE,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CACtB,uBA8DP"}
|
package/dest/factory.js
CHANGED
|
@@ -25,11 +25,11 @@ export async function createProverNode(config, deps = {}) {
|
|
|
25
25
|
const log = deps.log ?? createDebugLogger('aztec:prover');
|
|
26
26
|
const archiver = deps.archiver ?? (await createArchiver(config, telemetry, { blockUntilSync: true }));
|
|
27
27
|
log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
|
|
28
|
-
const worldStateConfig = { ...config, worldStateProvenBlocksOnly:
|
|
28
|
+
const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
|
|
29
29
|
const worldStateSynchronizer = await createWorldStateSynchronizer(worldStateConfig, archiver, telemetry);
|
|
30
30
|
await worldStateSynchronizer.start();
|
|
31
|
-
const broker = deps.broker ?? (await createAndStartProvingBroker(config));
|
|
32
|
-
const prover = await createProverClient(config, broker, telemetry);
|
|
31
|
+
const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
|
|
32
|
+
const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
|
|
33
33
|
// REFACTOR: Move publisher out of sequencer package and into an L1-related package
|
|
34
34
|
const publisher = deps.publisher ?? new L1Publisher(config, telemetry);
|
|
35
35
|
// If config.p2pEnabled is true, createProverCoordination will create a p2p client where quotes will be shared and tx's requested
|
|
@@ -45,6 +45,7 @@ export async function createProverNode(config, deps = {}) {
|
|
|
45
45
|
const proverNodeConfig = {
|
|
46
46
|
maxPendingJobs: config.proverNodeMaxPendingJobs,
|
|
47
47
|
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
48
|
+
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
48
49
|
};
|
|
49
50
|
const claimsMonitor = new ClaimsMonitor(publisher, proverNodeConfig);
|
|
50
51
|
const epochMonitor = new EpochMonitor(archiver, proverNodeConfig);
|
|
@@ -70,4 +71,4 @@ function createQuoteSigner(config) {
|
|
|
70
71
|
const privateKey = config.publisherPrivateKey;
|
|
71
72
|
return QuoteSigner.new(Buffer32.fromString(privateKey), rollupContract);
|
|
72
73
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBaUIsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBb0IsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU1RSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDMUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXRELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDNUIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRXpFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXRELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDNUUsT0FBTyxFQUFFLFVB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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type EpochProver, type EpochProvingJobState, type
|
|
1
|
+
import { type EpochProver, type EpochProvingJobState, type ForkMerkleTreeOperations, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProverCoordination } from '@aztec/circuit-types';
|
|
2
2
|
import { type L1Publisher } from '@aztec/sequencer-client';
|
|
3
3
|
import { type PublicProcessorFactory } from '@aztec/simulator';
|
|
4
4
|
import { type ProverNodeMetrics } from '../metrics.js';
|
|
@@ -8,7 +8,7 @@ import { type ProverNodeMetrics } from '../metrics.js';
|
|
|
8
8
|
* world state as part of public call execution via the public processor.
|
|
9
9
|
*/
|
|
10
10
|
export declare class EpochProvingJob {
|
|
11
|
-
private
|
|
11
|
+
private dbProvider;
|
|
12
12
|
private epochNumber;
|
|
13
13
|
private blocks;
|
|
14
14
|
private prover;
|
|
@@ -18,12 +18,15 @@ export declare class EpochProvingJob {
|
|
|
18
18
|
private l1ToL2MessageSource;
|
|
19
19
|
private coordination;
|
|
20
20
|
private metrics;
|
|
21
|
+
private config;
|
|
21
22
|
private cleanUp;
|
|
22
23
|
private state;
|
|
23
24
|
private log;
|
|
24
25
|
private uuid;
|
|
25
26
|
private runPromise;
|
|
26
|
-
constructor(
|
|
27
|
+
constructor(dbProvider: ForkMerkleTreeOperations, epochNumber: bigint, blocks: L2Block[], prover: EpochProver, publicProcessorFactory: PublicProcessorFactory, publisher: L1Publisher, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, coordination: ProverCoordination, metrics: ProverNodeMetrics, config?: {
|
|
28
|
+
parallelBlockLimit: number;
|
|
29
|
+
}, cleanUp?: (job: EpochProvingJob) => Promise<void>);
|
|
27
30
|
getId(): string;
|
|
28
31
|
getState(): EpochProvingJobState;
|
|
29
32
|
/**
|
|
@@ -31,10 +34,10 @@ export declare class EpochProvingJob {
|
|
|
31
34
|
*/
|
|
32
35
|
run(): Promise<void>;
|
|
33
36
|
stop(): Promise<void>;
|
|
37
|
+
private getBlockHeader;
|
|
34
38
|
private getTxs;
|
|
35
39
|
private getL1ToL2Messages;
|
|
36
40
|
private processTxs;
|
|
37
|
-
private addPaddingTxState;
|
|
38
41
|
}
|
|
39
42
|
export { type EpochProvingJobState };
|
|
40
43
|
//# sourceMappingURL=epoch-proving-job.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,
|
|
1
|
+
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,kBAAkB,EAGxB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAIrF,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD;;;;GAIG;AACH,qBAAa,eAAe;IAQxB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IAlBjB,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,GAAG,CAAgD;IAC3D,OAAO,CAAC,IAAI,CAAS;IAErB,OAAO,CAAC,UAAU,CAA4B;gBAGpC,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,EAAE,EACjB,MAAM,EAAE,WAAW,EACnB,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,WAAW,EACtB,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,GAAE;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAA+B,EACnE,OAAO,GAAE,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAA2B;IAK7E,KAAK,IAAI,MAAM;IAIf,QAAQ,IAAI,oBAAoB;IAIvC;;OAEG;IACU,GAAG;IAwEH,IAAI;IAQjB,OAAO,CAAC,cAAc;YAOR,MAAM;IAWpB,OAAO,CAAC,iBAAiB;YAIX,UAAU;CAoBzB;AAED,OAAO,EAAE,KAAK,oBAAoB,EAAE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EmptyTxValidator,
|
|
2
|
-
import {
|
|
1
|
+
import { EmptyTxValidator, } from '@aztec/circuit-types';
|
|
2
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
3
3
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
5
5
|
import { Timer } from '@aztec/foundation/timer';
|
|
@@ -10,8 +10,8 @@ import * as crypto from 'node:crypto';
|
|
|
10
10
|
* world state as part of public call execution via the public processor.
|
|
11
11
|
*/
|
|
12
12
|
export class EpochProvingJob {
|
|
13
|
-
constructor(
|
|
14
|
-
this.
|
|
13
|
+
constructor(dbProvider, epochNumber, blocks, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource, coordination, metrics, config = { parallelBlockLimit: 32 }, cleanUp = () => Promise.resolve()) {
|
|
14
|
+
this.dbProvider = dbProvider;
|
|
15
15
|
this.epochNumber = epochNumber;
|
|
16
16
|
this.blocks = blocks;
|
|
17
17
|
this.prover = prover;
|
|
@@ -21,6 +21,7 @@ export class EpochProvingJob {
|
|
|
21
21
|
this.l1ToL2MessageSource = l1ToL2MessageSource;
|
|
22
22
|
this.coordination = coordination;
|
|
23
23
|
this.metrics = metrics;
|
|
24
|
+
this.config = config;
|
|
24
25
|
this.cleanUp = cleanUp;
|
|
25
26
|
this.state = 'initialized';
|
|
26
27
|
this.log = createDebugLogger('aztec:epoch-proving-job');
|
|
@@ -38,24 +39,21 @@ export class EpochProvingJob {
|
|
|
38
39
|
async run() {
|
|
39
40
|
const epochNumber = Number(this.epochNumber);
|
|
40
41
|
const epochSize = this.blocks.length;
|
|
41
|
-
|
|
42
|
+
const firstBlockNumber = this.blocks[0].number;
|
|
43
|
+
this.log.info(`Starting epoch proving job`, { firstBlockNumber, epochSize, epochNumber, uuid: this.uuid });
|
|
42
44
|
this.state = 'processing';
|
|
43
45
|
const timer = new Timer();
|
|
44
46
|
const { promise, resolve } = promiseWithResolvers();
|
|
45
47
|
this.runPromise = promise;
|
|
46
48
|
try {
|
|
47
|
-
this.prover.startNewEpoch(epochNumber, epochSize);
|
|
48
|
-
|
|
49
|
-
let previousHeader = this.blocks[0].number === 1
|
|
50
|
-
? this.db.getInitialHeader()
|
|
51
|
-
: await this.l2BlockSource.getBlockHeader(this.blocks[0].number - 1);
|
|
52
|
-
for (const block of this.blocks) {
|
|
53
|
-
// Gather all data to prove this block
|
|
49
|
+
this.prover.startNewEpoch(epochNumber, firstBlockNumber, epochSize);
|
|
50
|
+
await asyncPool(this.config.parallelBlockLimit, this.blocks, async (block) => {
|
|
54
51
|
const globalVariables = block.header.globalVariables;
|
|
55
52
|
const txHashes = block.body.txEffects.map(tx => tx.txHash);
|
|
56
53
|
const txCount = block.body.numberOfTxsIncludingPadded;
|
|
57
54
|
const l1ToL2Messages = await this.getL1ToL2Messages(block);
|
|
58
55
|
const txs = await this.getTxs(txHashes);
|
|
56
|
+
const previousHeader = await this.getBlockHeader(block.number - 1);
|
|
59
57
|
this.log.verbose(`Starting block processing`, {
|
|
60
58
|
number: block.number,
|
|
61
59
|
blockHash: block.hash().toString(),
|
|
@@ -70,24 +68,21 @@ export class EpochProvingJob {
|
|
|
70
68
|
// Start block proving
|
|
71
69
|
await this.prover.startNewBlock(txCount, globalVariables, l1ToL2Messages);
|
|
72
70
|
// Process public fns
|
|
73
|
-
const
|
|
71
|
+
const db = await this.dbProvider.fork(block.number - 1);
|
|
72
|
+
const publicProcessor = this.publicProcessorFactory.create(db, previousHeader, globalVariables);
|
|
74
73
|
await this.processTxs(publicProcessor, txs, txCount);
|
|
74
|
+
await db.close();
|
|
75
75
|
this.log.verbose(`Processed all txs for block`, {
|
|
76
76
|
blockNumber: block.number,
|
|
77
77
|
blockHash: block.hash().toString(),
|
|
78
78
|
uuid: this.uuid,
|
|
79
79
|
});
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
// Mark block as completed and update archive tree
|
|
85
|
-
await this.prover.setBlockCompleted(block.header);
|
|
86
|
-
previousHeader = block.header;
|
|
87
|
-
}
|
|
80
|
+
// Mark block as completed to pad it
|
|
81
|
+
await this.prover.setBlockCompleted(block.number, block.header);
|
|
82
|
+
});
|
|
88
83
|
this.state = 'awaiting-prover';
|
|
89
84
|
const { publicInputs, proof } = await this.prover.finaliseEpoch();
|
|
90
|
-
this.log.info(`Finalised proof for epoch`, { epochNumber, uuid: this.uuid });
|
|
85
|
+
this.log.info(`Finalised proof for epoch`, { epochNumber, uuid: this.uuid, duration: timer.ms() });
|
|
91
86
|
this.state = 'publishing-proof';
|
|
92
87
|
const [fromBlock, toBlock] = [this.blocks[0].number, this.blocks.at(-1).number];
|
|
93
88
|
await this.publisher.submitEpochProof({ fromBlock, toBlock, epochNumber, publicInputs, proof });
|
|
@@ -110,6 +105,13 @@ export class EpochProvingJob {
|
|
|
110
105
|
await this.runPromise;
|
|
111
106
|
}
|
|
112
107
|
}
|
|
108
|
+
/* Returns the header for the given block number, or undefined for block zero. */
|
|
109
|
+
getBlockHeader(blockNumber) {
|
|
110
|
+
if (blockNumber === 0) {
|
|
111
|
+
return undefined;
|
|
112
|
+
}
|
|
113
|
+
return this.l2BlockSource.getBlockHeader(blockNumber);
|
|
114
|
+
}
|
|
113
115
|
async getTxs(txHashes) {
|
|
114
116
|
const txs = await Promise.all(txHashes.map(txHash => this.coordination.getTxByHash(txHash).then(tx => [txHash, tx])));
|
|
115
117
|
const notFound = txs.filter(([_, tx]) => !tx);
|
|
@@ -128,14 +130,5 @@ export class EpochProvingJob {
|
|
|
128
130
|
}
|
|
129
131
|
return processedTxs;
|
|
130
132
|
}
|
|
131
|
-
async addPaddingTxState() {
|
|
132
|
-
const emptyKernelOutput = KernelCircuitPublicInputs.empty();
|
|
133
|
-
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, emptyKernelOutput.end.noteHashes);
|
|
134
|
-
await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, emptyKernelOutput.end.nullifiers.map(n => n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
135
|
-
const allPublicDataWrites = emptyKernelOutput.end.publicDataWrites
|
|
136
|
-
.filter(write => !write.isEmpty())
|
|
137
|
-
.map(({ leafSlot, value }) => new PublicDataTreeLeaf(leafSlot, value));
|
|
138
|
-
await this.db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, allPublicDataWrites.map(x => x.toBuffer()), 0);
|
|
139
|
-
}
|
|
140
133
|
}
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"epoch-proving-job.js","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"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"}
|
package/dest/prover-node.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type EpochProofClaim, type EpochProofQuote, type EpochProverManager, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type
|
|
1
|
+
import { type EpochProofClaim, type EpochProofQuote, type EpochProverManager, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProverCache, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
2
2
|
import { type ContractDataSource } from '@aztec/circuits.js';
|
|
3
3
|
import { type Maybe } from '@aztec/foundation/types';
|
|
4
4
|
import { type L1Publisher } from '@aztec/sequencer-client';
|
|
@@ -14,6 +14,7 @@ import { type QuoteSigner } from './quote-signer.js';
|
|
|
14
14
|
export type ProverNodeOptions = {
|
|
15
15
|
pollingIntervalMs: number;
|
|
16
16
|
maxPendingJobs: number;
|
|
17
|
+
maxParallelBlocksPerEpoch: number;
|
|
17
18
|
};
|
|
18
19
|
/**
|
|
19
20
|
* An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
|
|
@@ -89,7 +90,7 @@ export declare class ProverNode implements ClaimsMonitorHandler, EpochMonitorHan
|
|
|
89
90
|
private checkMaximumPendingJobs;
|
|
90
91
|
private createProvingJob;
|
|
91
92
|
/** Extracted for testing purposes. */
|
|
92
|
-
protected doCreateEpochProvingJob(epochNumber: bigint, blocks: L2Block[],
|
|
93
|
+
protected doCreateEpochProvingJob(epochNumber: bigint, blocks: L2Block[], proverCache: ProverCache, publicProcessorFactory: PublicProcessorFactory, cleanUp: () => Promise<void>): EpochProvingJob;
|
|
93
94
|
/** Extracted for testing purposes. */
|
|
94
95
|
protected triggerMonitors(): Promise<void>;
|
|
95
96
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
package/dest/prover-node.js
CHANGED
|
@@ -32,6 +32,7 @@ export class ProverNode {
|
|
|
32
32
|
this.options = {
|
|
33
33
|
pollingIntervalMs: 1000,
|
|
34
34
|
maxPendingJobs: 100,
|
|
35
|
+
maxParallelBlocksPerEpoch: 32,
|
|
35
36
|
...compact(options),
|
|
36
37
|
};
|
|
37
38
|
this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
|
|
@@ -188,28 +189,22 @@ export class ProverNode {
|
|
|
188
189
|
// Fast forward world state to right before the target block and get a fork
|
|
189
190
|
this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
|
|
190
191
|
await this.worldState.syncImmediate(fromBlock - 1);
|
|
191
|
-
// NB: separated the dbs as both a block builder and public processor need to track and update tree state
|
|
192
|
-
// see public_processor.ts for context
|
|
193
|
-
const publicDb = await this.worldState.fork(fromBlock - 1);
|
|
194
|
-
const proverDb = await this.worldState.fork(fromBlock - 1);
|
|
195
192
|
// Create a processor using the forked world state
|
|
196
193
|
const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.telemetryClient);
|
|
197
194
|
const epochHash = sha256(Buffer.concat(blocks.map(block => block.hash().toBuffer())));
|
|
198
195
|
const proverCache = await this.proverCacheManager.openCache(epochNumber, epochHash);
|
|
199
196
|
const cleanUp = async () => {
|
|
200
|
-
await publicDb.close();
|
|
201
|
-
await proverDb.close();
|
|
202
197
|
await proverCache.close();
|
|
203
198
|
await this.proverCacheManager.removeStaleCaches(epochNumber);
|
|
204
199
|
this.jobs.delete(job.getId());
|
|
205
200
|
};
|
|
206
|
-
const job = this.doCreateEpochProvingJob(epochNumber, blocks,
|
|
201
|
+
const job = this.doCreateEpochProvingJob(epochNumber, blocks, proverCache, publicProcessorFactory, cleanUp);
|
|
207
202
|
this.jobs.set(job.getId(), job);
|
|
208
203
|
return job;
|
|
209
204
|
}
|
|
210
205
|
/** Extracted for testing purposes. */
|
|
211
|
-
doCreateEpochProvingJob(epochNumber, blocks,
|
|
212
|
-
return new EpochProvingJob(
|
|
206
|
+
doCreateEpochProvingJob(epochNumber, blocks, proverCache, publicProcessorFactory, cleanUp) {
|
|
207
|
+
return new EpochProvingJob(this.worldState, epochNumber, blocks, this.prover.createEpochProver(proverCache), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.coordination, this.metrics, { parallelBlockLimit: this.options.maxParallelBlocksPerEpoch }, cleanUp);
|
|
213
208
|
}
|
|
214
209
|
/** Extracted for testing purposes. */
|
|
215
210
|
async triggerMonitors() {
|
|
@@ -217,4 +212,4 @@ export class ProverNode {
|
|
|
217
212
|
await this.claimsMonitor.work();
|
|
218
213
|
}
|
|
219
214
|
}
|
|
220
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-node",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.66.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js"
|
|
@@ -52,21 +52,21 @@
|
|
|
52
52
|
]
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@aztec/archiver": "0.
|
|
56
|
-
"@aztec/bb-prover": "0.
|
|
57
|
-
"@aztec/circuit-types": "0.
|
|
58
|
-
"@aztec/circuits.js": "0.
|
|
59
|
-
"@aztec/ethereum": "0.
|
|
60
|
-
"@aztec/foundation": "0.
|
|
61
|
-
"@aztec/kv-store": "0.
|
|
62
|
-
"@aztec/l1-artifacts": "0.
|
|
63
|
-
"@aztec/p2p": "0.
|
|
64
|
-
"@aztec/prover-client": "0.
|
|
65
|
-
"@aztec/sequencer-client": "0.
|
|
66
|
-
"@aztec/simulator": "0.
|
|
67
|
-
"@aztec/telemetry-client": "0.
|
|
68
|
-
"@aztec/types": "0.
|
|
69
|
-
"@aztec/world-state": "0.
|
|
55
|
+
"@aztec/archiver": "0.66.0",
|
|
56
|
+
"@aztec/bb-prover": "0.66.0",
|
|
57
|
+
"@aztec/circuit-types": "0.66.0",
|
|
58
|
+
"@aztec/circuits.js": "0.66.0",
|
|
59
|
+
"@aztec/ethereum": "0.66.0",
|
|
60
|
+
"@aztec/foundation": "0.66.0",
|
|
61
|
+
"@aztec/kv-store": "0.66.0",
|
|
62
|
+
"@aztec/l1-artifacts": "0.66.0",
|
|
63
|
+
"@aztec/p2p": "0.66.0",
|
|
64
|
+
"@aztec/prover-client": "0.66.0",
|
|
65
|
+
"@aztec/sequencer-client": "0.66.0",
|
|
66
|
+
"@aztec/simulator": "0.66.0",
|
|
67
|
+
"@aztec/telemetry-client": "0.66.0",
|
|
68
|
+
"@aztec/types": "0.66.0",
|
|
69
|
+
"@aztec/world-state": "0.66.0",
|
|
70
70
|
"source-map-support": "^0.5.21",
|
|
71
71
|
"tslib": "^2.4.0",
|
|
72
72
|
"viem": "^2.7.15"
|
package/src/config.ts
CHANGED
|
@@ -46,10 +46,14 @@ export type ProverNodeConfig = ArchiverConfig &
|
|
|
46
46
|
DataStoreConfig &
|
|
47
47
|
ProverCoordinationConfig &
|
|
48
48
|
ProverBondManagerConfig &
|
|
49
|
-
QuoteProviderConfig &
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
QuoteProviderConfig &
|
|
50
|
+
SpecificProverNodeConfig;
|
|
51
|
+
|
|
52
|
+
type SpecificProverNodeConfig = {
|
|
53
|
+
proverNodeMaxPendingJobs: number;
|
|
54
|
+
proverNodePollingIntervalMs: number;
|
|
55
|
+
proverNodeMaxParallelBlocksPerEpoch: number;
|
|
56
|
+
};
|
|
53
57
|
|
|
54
58
|
export type QuoteProviderConfig = {
|
|
55
59
|
quoteProviderBasisPointFee: number;
|
|
@@ -57,9 +61,7 @@ export type QuoteProviderConfig = {
|
|
|
57
61
|
quoteProviderUrl?: string;
|
|
58
62
|
};
|
|
59
63
|
|
|
60
|
-
const specificProverNodeConfigMappings: ConfigMappingsType<
|
|
61
|
-
Pick<ProverNodeConfig, 'proverNodePollingIntervalMs' | 'proverNodeMaxPendingJobs'>
|
|
62
|
-
> = {
|
|
64
|
+
const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
|
|
63
65
|
proverNodeMaxPendingJobs: {
|
|
64
66
|
env: 'PROVER_NODE_MAX_PENDING_JOBS',
|
|
65
67
|
description: 'The maximum number of pending jobs for the prover node',
|
|
@@ -70,6 +72,11 @@ const specificProverNodeConfigMappings: ConfigMappingsType<
|
|
|
70
72
|
description: 'The interval in milliseconds to poll for new jobs',
|
|
71
73
|
...numberConfigHelper(1000),
|
|
72
74
|
},
|
|
75
|
+
proverNodeMaxParallelBlocksPerEpoch: {
|
|
76
|
+
env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
|
|
77
|
+
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
78
|
+
...numberConfigHelper(32),
|
|
79
|
+
},
|
|
73
80
|
};
|
|
74
81
|
|
|
75
82
|
const quoteProviderConfigMappings: ConfigMappingsType<QuoteProviderConfig> = {
|
package/src/factory.ts
CHANGED
|
@@ -21,7 +21,7 @@ import { ClaimsMonitor } from './monitors/claims-monitor.js';
|
|
|
21
21
|
import { EpochMonitor } from './monitors/epoch-monitor.js';
|
|
22
22
|
import { ProverCacheManager } from './prover-cache/cache_manager.js';
|
|
23
23
|
import { createProverCoordination } from './prover-coordination/factory.js';
|
|
24
|
-
import { ProverNode } from './prover-node.js';
|
|
24
|
+
import { ProverNode, type ProverNodeOptions } from './prover-node.js';
|
|
25
25
|
import { HttpQuoteProvider } from './quote-provider/http.js';
|
|
26
26
|
import { SimpleQuoteProvider } from './quote-provider/simple.js';
|
|
27
27
|
import { QuoteSigner } from './quote-signer.js';
|
|
@@ -43,12 +43,12 @@ export async function createProverNode(
|
|
|
43
43
|
const archiver = deps.archiver ?? (await createArchiver(config, telemetry, { blockUntilSync: true }));
|
|
44
44
|
log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
|
|
45
45
|
|
|
46
|
-
const worldStateConfig = { ...config, worldStateProvenBlocksOnly:
|
|
46
|
+
const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
|
|
47
47
|
const worldStateSynchronizer = await createWorldStateSynchronizer(worldStateConfig, archiver, telemetry);
|
|
48
48
|
await worldStateSynchronizer.start();
|
|
49
49
|
|
|
50
|
-
const broker = deps.broker ?? (await createAndStartProvingBroker(config));
|
|
51
|
-
const prover = await createProverClient(config, broker, telemetry);
|
|
50
|
+
const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
|
|
51
|
+
const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
|
|
52
52
|
|
|
53
53
|
// REFACTOR: Move publisher out of sequencer package and into an L1-related package
|
|
54
54
|
const publisher = deps.publisher ?? new L1Publisher(config, telemetry);
|
|
@@ -65,9 +65,10 @@ export async function createProverNode(
|
|
|
65
65
|
const quoteProvider = createQuoteProvider(config);
|
|
66
66
|
const quoteSigner = createQuoteSigner(config);
|
|
67
67
|
|
|
68
|
-
const proverNodeConfig = {
|
|
68
|
+
const proverNodeConfig: ProverNodeOptions = {
|
|
69
69
|
maxPendingJobs: config.proverNodeMaxPendingJobs,
|
|
70
70
|
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
71
|
+
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
71
72
|
};
|
|
72
73
|
|
|
73
74
|
const claimsMonitor = new ClaimsMonitor(publisher, proverNodeConfig);
|
|
@@ -2,17 +2,16 @@ import {
|
|
|
2
2
|
EmptyTxValidator,
|
|
3
3
|
type EpochProver,
|
|
4
4
|
type EpochProvingJobState,
|
|
5
|
+
type ForkMerkleTreeOperations,
|
|
5
6
|
type L1ToL2MessageSource,
|
|
6
7
|
type L2Block,
|
|
7
8
|
type L2BlockSource,
|
|
8
|
-
MerkleTreeId,
|
|
9
|
-
type MerkleTreeWriteOperations,
|
|
10
9
|
type ProcessedTx,
|
|
11
10
|
type ProverCoordination,
|
|
12
11
|
type Tx,
|
|
13
12
|
type TxHash,
|
|
14
13
|
} from '@aztec/circuit-types';
|
|
15
|
-
import {
|
|
14
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
16
15
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
17
16
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
18
17
|
import { Timer } from '@aztec/foundation/timer';
|
|
@@ -36,7 +35,7 @@ export class EpochProvingJob {
|
|
|
36
35
|
private runPromise: Promise<void> | undefined;
|
|
37
36
|
|
|
38
37
|
constructor(
|
|
39
|
-
private
|
|
38
|
+
private dbProvider: ForkMerkleTreeOperations,
|
|
40
39
|
private epochNumber: bigint,
|
|
41
40
|
private blocks: L2Block[],
|
|
42
41
|
private prover: EpochProver,
|
|
@@ -46,6 +45,7 @@ export class EpochProvingJob {
|
|
|
46
45
|
private l1ToL2MessageSource: L1ToL2MessageSource,
|
|
47
46
|
private coordination: ProverCoordination,
|
|
48
47
|
private metrics: ProverNodeMetrics,
|
|
48
|
+
private config: { parallelBlockLimit: number } = { parallelBlockLimit: 32 },
|
|
49
49
|
private cleanUp: (job: EpochProvingJob) => Promise<void> = () => Promise.resolve(),
|
|
50
50
|
) {
|
|
51
51
|
this.uuid = crypto.randomUUID();
|
|
@@ -65,7 +65,8 @@ export class EpochProvingJob {
|
|
|
65
65
|
public async run() {
|
|
66
66
|
const epochNumber = Number(this.epochNumber);
|
|
67
67
|
const epochSize = this.blocks.length;
|
|
68
|
-
|
|
68
|
+
const firstBlockNumber = this.blocks[0].number;
|
|
69
|
+
this.log.info(`Starting epoch proving job`, { firstBlockNumber, epochSize, epochNumber, uuid: this.uuid });
|
|
69
70
|
this.state = 'processing';
|
|
70
71
|
const timer = new Timer();
|
|
71
72
|
|
|
@@ -73,21 +74,15 @@ export class EpochProvingJob {
|
|
|
73
74
|
this.runPromise = promise;
|
|
74
75
|
|
|
75
76
|
try {
|
|
76
|
-
this.prover.startNewEpoch(epochNumber, epochSize);
|
|
77
|
+
this.prover.startNewEpoch(epochNumber, firstBlockNumber, epochSize);
|
|
77
78
|
|
|
78
|
-
|
|
79
|
-
let previousHeader =
|
|
80
|
-
this.blocks[0].number === 1
|
|
81
|
-
? this.db.getInitialHeader()
|
|
82
|
-
: await this.l2BlockSource.getBlockHeader(this.blocks[0].number - 1);
|
|
83
|
-
|
|
84
|
-
for (const block of this.blocks) {
|
|
85
|
-
// Gather all data to prove this block
|
|
79
|
+
await asyncPool(this.config.parallelBlockLimit, this.blocks, async block => {
|
|
86
80
|
const globalVariables = block.header.globalVariables;
|
|
87
81
|
const txHashes = block.body.txEffects.map(tx => tx.txHash);
|
|
88
82
|
const txCount = block.body.numberOfTxsIncludingPadded;
|
|
89
83
|
const l1ToL2Messages = await this.getL1ToL2Messages(block);
|
|
90
84
|
const txs = await this.getTxs(txHashes);
|
|
85
|
+
const previousHeader = await this.getBlockHeader(block.number - 1);
|
|
91
86
|
|
|
92
87
|
this.log.verbose(`Starting block processing`, {
|
|
93
88
|
number: block.number,
|
|
@@ -105,27 +100,23 @@ export class EpochProvingJob {
|
|
|
105
100
|
await this.prover.startNewBlock(txCount, globalVariables, l1ToL2Messages);
|
|
106
101
|
|
|
107
102
|
// Process public fns
|
|
108
|
-
const
|
|
103
|
+
const db = await this.dbProvider.fork(block.number - 1);
|
|
104
|
+
const publicProcessor = this.publicProcessorFactory.create(db, previousHeader, globalVariables);
|
|
109
105
|
await this.processTxs(publicProcessor, txs, txCount);
|
|
106
|
+
await db.close();
|
|
110
107
|
this.log.verbose(`Processed all txs for block`, {
|
|
111
108
|
blockNumber: block.number,
|
|
112
109
|
blockHash: block.hash().toString(),
|
|
113
110
|
uuid: this.uuid,
|
|
114
111
|
});
|
|
115
112
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// Mark block as completed and update archive tree
|
|
122
|
-
await this.prover.setBlockCompleted(block.header);
|
|
123
|
-
previousHeader = block.header;
|
|
124
|
-
}
|
|
113
|
+
// Mark block as completed to pad it
|
|
114
|
+
await this.prover.setBlockCompleted(block.number, block.header);
|
|
115
|
+
});
|
|
125
116
|
|
|
126
117
|
this.state = 'awaiting-prover';
|
|
127
118
|
const { publicInputs, proof } = await this.prover.finaliseEpoch();
|
|
128
|
-
this.log.info(`Finalised proof for epoch`, { epochNumber, uuid: this.uuid });
|
|
119
|
+
this.log.info(`Finalised proof for epoch`, { epochNumber, uuid: this.uuid, duration: timer.ms() });
|
|
129
120
|
|
|
130
121
|
this.state = 'publishing-proof';
|
|
131
122
|
const [fromBlock, toBlock] = [this.blocks[0].number, this.blocks.at(-1)!.number];
|
|
@@ -150,6 +141,14 @@ export class EpochProvingJob {
|
|
|
150
141
|
}
|
|
151
142
|
}
|
|
152
143
|
|
|
144
|
+
/* Returns the header for the given block number, or undefined for block zero. */
|
|
145
|
+
private getBlockHeader(blockNumber: number) {
|
|
146
|
+
if (blockNumber === 0) {
|
|
147
|
+
return undefined;
|
|
148
|
+
}
|
|
149
|
+
return this.l2BlockSource.getBlockHeader(blockNumber);
|
|
150
|
+
}
|
|
151
|
+
|
|
153
152
|
private async getTxs(txHashes: TxHash[]): Promise<Tx[]> {
|
|
154
153
|
const txs = await Promise.all(
|
|
155
154
|
txHashes.map(txHash => this.coordination.getTxByHash(txHash).then(tx => [txHash, tx] as const)),
|
|
@@ -185,25 +184,6 @@ export class EpochProvingJob {
|
|
|
185
184
|
|
|
186
185
|
return processedTxs;
|
|
187
186
|
}
|
|
188
|
-
|
|
189
|
-
private async addPaddingTxState() {
|
|
190
|
-
const emptyKernelOutput = KernelCircuitPublicInputs.empty();
|
|
191
|
-
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, emptyKernelOutput.end.noteHashes);
|
|
192
|
-
await this.db.batchInsert(
|
|
193
|
-
MerkleTreeId.NULLIFIER_TREE,
|
|
194
|
-
emptyKernelOutput.end.nullifiers.map(n => n.toBuffer()),
|
|
195
|
-
NULLIFIER_SUBTREE_HEIGHT,
|
|
196
|
-
);
|
|
197
|
-
const allPublicDataWrites = emptyKernelOutput.end.publicDataWrites
|
|
198
|
-
.filter(write => !write.isEmpty())
|
|
199
|
-
.map(({ leafSlot, value }) => new PublicDataTreeLeaf(leafSlot, value));
|
|
200
|
-
|
|
201
|
-
await this.db.batchInsert(
|
|
202
|
-
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
203
|
-
allPublicDataWrites.map(x => x.toBuffer()),
|
|
204
|
-
0,
|
|
205
|
-
);
|
|
206
|
-
}
|
|
207
187
|
}
|
|
208
188
|
|
|
209
189
|
export { type EpochProvingJobState };
|
package/src/prover-node.ts
CHANGED
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
type L1ToL2MessageSource,
|
|
7
7
|
type L2Block,
|
|
8
8
|
type L2BlockSource,
|
|
9
|
-
type MerkleTreeWriteOperations,
|
|
10
9
|
type ProverCache,
|
|
11
10
|
type ProverCoordination,
|
|
12
11
|
type ProverNodeApi,
|
|
@@ -35,6 +34,7 @@ import { type QuoteSigner } from './quote-signer.js';
|
|
|
35
34
|
export type ProverNodeOptions = {
|
|
36
35
|
pollingIntervalMs: number;
|
|
37
36
|
maxPendingJobs: number;
|
|
37
|
+
maxParallelBlocksPerEpoch: number;
|
|
38
38
|
};
|
|
39
39
|
|
|
40
40
|
/**
|
|
@@ -71,6 +71,7 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
71
71
|
this.options = {
|
|
72
72
|
pollingIntervalMs: 1_000,
|
|
73
73
|
maxPendingJobs: 100,
|
|
74
|
+
maxParallelBlocksPerEpoch: 32,
|
|
74
75
|
...compact(options),
|
|
75
76
|
};
|
|
76
77
|
|
|
@@ -246,10 +247,6 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
246
247
|
// Fast forward world state to right before the target block and get a fork
|
|
247
248
|
this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
|
|
248
249
|
await this.worldState.syncImmediate(fromBlock - 1);
|
|
249
|
-
// NB: separated the dbs as both a block builder and public processor need to track and update tree state
|
|
250
|
-
// see public_processor.ts for context
|
|
251
|
-
const publicDb = await this.worldState.fork(fromBlock - 1);
|
|
252
|
-
const proverDb = await this.worldState.fork(fromBlock - 1);
|
|
253
250
|
|
|
254
251
|
// Create a processor using the forked world state
|
|
255
252
|
const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.telemetryClient);
|
|
@@ -258,22 +255,12 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
258
255
|
const proverCache = await this.proverCacheManager.openCache(epochNumber, epochHash);
|
|
259
256
|
|
|
260
257
|
const cleanUp = async () => {
|
|
261
|
-
await publicDb.close();
|
|
262
|
-
await proverDb.close();
|
|
263
258
|
await proverCache.close();
|
|
264
259
|
await this.proverCacheManager.removeStaleCaches(epochNumber);
|
|
265
260
|
this.jobs.delete(job.getId());
|
|
266
261
|
};
|
|
267
262
|
|
|
268
|
-
const job = this.doCreateEpochProvingJob(
|
|
269
|
-
epochNumber,
|
|
270
|
-
blocks,
|
|
271
|
-
publicDb,
|
|
272
|
-
proverDb,
|
|
273
|
-
proverCache,
|
|
274
|
-
publicProcessorFactory,
|
|
275
|
-
cleanUp,
|
|
276
|
-
);
|
|
263
|
+
const job = this.doCreateEpochProvingJob(epochNumber, blocks, proverCache, publicProcessorFactory, cleanUp);
|
|
277
264
|
this.jobs.set(job.getId(), job);
|
|
278
265
|
return job;
|
|
279
266
|
}
|
|
@@ -282,23 +269,22 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
282
269
|
protected doCreateEpochProvingJob(
|
|
283
270
|
epochNumber: bigint,
|
|
284
271
|
blocks: L2Block[],
|
|
285
|
-
publicDb: MerkleTreeWriteOperations,
|
|
286
|
-
proverDb: MerkleTreeWriteOperations,
|
|
287
272
|
proverCache: ProverCache,
|
|
288
273
|
publicProcessorFactory: PublicProcessorFactory,
|
|
289
274
|
cleanUp: () => Promise<void>,
|
|
290
275
|
) {
|
|
291
276
|
return new EpochProvingJob(
|
|
292
|
-
|
|
277
|
+
this.worldState,
|
|
293
278
|
epochNumber,
|
|
294
279
|
blocks,
|
|
295
|
-
this.prover.createEpochProver(
|
|
280
|
+
this.prover.createEpochProver(proverCache),
|
|
296
281
|
publicProcessorFactory,
|
|
297
282
|
this.publisher,
|
|
298
283
|
this.l2BlockSource,
|
|
299
284
|
this.l1ToL2MessageSource,
|
|
300
285
|
this.coordination,
|
|
301
286
|
this.metrics,
|
|
287
|
+
{ parallelBlockLimit: this.options.maxParallelBlocksPerEpoch },
|
|
302
288
|
cleanUp,
|
|
303
289
|
);
|
|
304
290
|
}
|