@aztec/prover-node 0.0.0-test.1 → 0.0.1-commit.1142ef1
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/download-epoch-proving-job.d.ts +18 -0
- package/dest/actions/download-epoch-proving-job.d.ts.map +1 -0
- package/dest/actions/download-epoch-proving-job.js +37 -0
- package/dest/actions/index.d.ts +3 -0
- package/dest/actions/index.d.ts.map +1 -0
- package/dest/actions/index.js +2 -0
- package/dest/actions/rerun-epoch-proving-job.d.ts +11 -0
- package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -0
- package/dest/actions/rerun-epoch-proving-job.js +40 -0
- package/dest/actions/upload-epoch-proof-failure.d.ts +15 -0
- package/dest/actions/upload-epoch-proof-failure.d.ts.map +1 -0
- package/dest/actions/upload-epoch-proof-failure.js +78 -0
- package/dest/bin/run-failed-epoch.d.ts +2 -0
- package/dest/bin/run-failed-epoch.d.ts.map +1 -0
- package/dest/bin/run-failed-epoch.js +67 -0
- package/dest/config.d.ts +15 -11
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +83 -15
- package/dest/factory.d.ts +14 -12
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +105 -32
- package/dest/index.d.ts +3 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -1
- package/dest/job/epoch-proving-job-data.d.ts +18 -0
- package/dest/job/epoch-proving-job-data.d.ts.map +1 -0
- package/dest/job/epoch-proving-job-data.js +59 -0
- package/dest/job/epoch-proving-job.d.ts +26 -18
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +579 -96
- package/dest/metrics.d.ts +30 -5
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +103 -73
- package/dest/monitors/epoch-monitor.d.ts +5 -2
- package/dest/monitors/epoch-monitor.d.ts.map +1 -1
- package/dest/monitors/epoch-monitor.js +18 -13
- package/dest/monitors/index.d.ts +1 -1
- package/dest/prover-node-publisher.d.ts +14 -15
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +86 -81
- package/dest/prover-node.d.ts +49 -44
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +581 -129
- package/dest/prover-publisher-factory.d.ts +23 -0
- package/dest/prover-publisher-factory.d.ts.map +1 -0
- package/dest/prover-publisher-factory.js +26 -0
- package/dest/test/index.d.ts +5 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +1 -3
- package/package.json +39 -33
- package/src/actions/download-epoch-proving-job.ts +44 -0
- package/src/actions/index.ts +2 -0
- package/src/actions/rerun-epoch-proving-job.ts +61 -0
- package/src/actions/upload-epoch-proof-failure.ts +88 -0
- package/src/bin/run-failed-epoch.ts +77 -0
- package/src/config.ts +111 -25
- package/src/factory.ts +176 -44
- package/src/index.ts +2 -1
- package/src/job/epoch-proving-job-data.ts +82 -0
- package/src/job/epoch-proving-job.ts +255 -83
- package/src/metrics.ts +116 -73
- package/src/monitors/epoch-monitor.ts +20 -15
- package/src/prover-node-publisher.ts +133 -115
- package/src/prover-node.ts +223 -142
- package/src/prover-publisher-factory.ts +39 -0
- package/src/test/index.ts +7 -4
- package/dest/http.d.ts +0 -8
- package/dest/http.d.ts.map +0 -1
- package/dest/http.js +0 -9
- package/dest/prover-coordination/config.d.ts +0 -7
- package/dest/prover-coordination/config.d.ts.map +0 -1
- package/dest/prover-coordination/config.js +0 -11
- package/dest/prover-coordination/factory.d.ts +0 -22
- package/dest/prover-coordination/factory.d.ts.map +0 -1
- package/dest/prover-coordination/factory.js +0 -42
- package/dest/prover-coordination/index.d.ts +0 -3
- package/dest/prover-coordination/index.d.ts.map +0 -1
- package/dest/prover-coordination/index.js +0 -2
- package/src/http.ts +0 -13
- package/src/prover-coordination/config.ts +0 -17
- package/src/prover-coordination/factory.ts +0 -72
- package/src/prover-coordination/index.ts +0 -2
package/dest/factory.js
CHANGED
|
@@ -1,23 +1,78 @@
|
|
|
1
1
|
import { createArchiver } from '@aztec/archiver';
|
|
2
|
-
import {
|
|
2
|
+
import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
|
|
3
|
+
import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
|
|
3
4
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
4
|
-
import {
|
|
5
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
6
|
+
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
7
|
+
import { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
8
|
+
import { pick } from '@aztec/foundation/collection';
|
|
5
9
|
import { createLogger } from '@aztec/foundation/log';
|
|
10
|
+
import { DateProvider } from '@aztec/foundation/timer';
|
|
11
|
+
import { KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
|
|
12
|
+
import { trySnapshotSync } from '@aztec/node-lib/actions';
|
|
13
|
+
import { createForwarderL1TxUtilsFromEthSigner, createL1TxUtilsFromEthSignerWithStore } from '@aztec/node-lib/factories';
|
|
14
|
+
import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
|
|
6
15
|
import { createProverClient } from '@aztec/prover-client';
|
|
7
16
|
import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
|
|
8
|
-
import {
|
|
17
|
+
import { P2PClientType } from '@aztec/stdlib/p2p';
|
|
18
|
+
import { getPackageVersion } from '@aztec/stdlib/update-checker';
|
|
19
|
+
import { L1Metrics, getTelemetryClient } from '@aztec/telemetry-client';
|
|
9
20
|
import { createWorldStateSynchronizer } from '@aztec/world-state';
|
|
21
|
+
import { createPublicClient, fallback, http } from 'viem';
|
|
22
|
+
import { createKeyStoreForProver } from './config.js';
|
|
10
23
|
import { EpochMonitor } from './monitors/epoch-monitor.js';
|
|
11
|
-
import { createProverCoordination } from './prover-coordination/factory.js';
|
|
12
|
-
import { ProverNodePublisher } from './prover-node-publisher.js';
|
|
13
24
|
import { ProverNode } from './prover-node.js';
|
|
14
|
-
|
|
25
|
+
import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
26
|
+
/** Creates a new prover node given a config. */ export async function createProverNode(userConfig, deps = {}, options = {}) {
|
|
27
|
+
const config = {
|
|
28
|
+
...userConfig
|
|
29
|
+
};
|
|
15
30
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
16
|
-
const
|
|
31
|
+
const dateProvider = deps.dateProvider ?? new DateProvider();
|
|
32
|
+
const blobClient = await createBlobClientWithFileStores(config, createLogger('prover-node:blob-client:client'));
|
|
17
33
|
const log = deps.log ?? createLogger('prover-node');
|
|
18
|
-
|
|
34
|
+
// Build a key store from file if given or from environment otherwise
|
|
35
|
+
let keyStoreManager;
|
|
36
|
+
const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
|
|
37
|
+
if (keyStoreProvided) {
|
|
38
|
+
const keyStores = loadKeystores(config.keyStoreDirectory);
|
|
39
|
+
keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
|
|
40
|
+
} else {
|
|
41
|
+
const keyStore = createKeyStoreForProver(config);
|
|
42
|
+
if (keyStore) {
|
|
43
|
+
keyStoreManager = new KeystoreManager(keyStore);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
await keyStoreManager?.validateSigners();
|
|
47
|
+
// Extract the prover signers from the key store and verify that we have one.
|
|
48
|
+
const proverSigners = keyStoreManager?.createProverSigners();
|
|
49
|
+
if (proverSigners === undefined) {
|
|
50
|
+
throw new Error('Failed to create prover key store configuration');
|
|
51
|
+
} else if (proverSigners.signers.length === 0) {
|
|
52
|
+
throw new Error('No prover signers found in the key store');
|
|
53
|
+
} else if (!keyStoreProvided) {
|
|
54
|
+
log.warn('KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS');
|
|
55
|
+
}
|
|
56
|
+
log.info(`Creating prover with publishers ${proverSigners.signers.map((signer)=>signer.address.toString()).join()}`);
|
|
57
|
+
// Only consider user provided config if it is valid
|
|
58
|
+
const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
|
|
59
|
+
// ProverId: Take from key store if provided, otherwise from user config if valid, otherwise address of first signer
|
|
60
|
+
const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
|
|
61
|
+
// Now create the prover client configuration from this.
|
|
62
|
+
const proverClientConfig = {
|
|
63
|
+
...config,
|
|
64
|
+
proverId
|
|
65
|
+
};
|
|
66
|
+
await trySnapshotSync(config, log);
|
|
67
|
+
const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
|
|
68
|
+
const archiver = deps.archiver ?? await createArchiver(config, {
|
|
69
|
+
blobClient,
|
|
70
|
+
epochCache,
|
|
71
|
+
telemetry,
|
|
72
|
+
dateProvider
|
|
73
|
+
}, {
|
|
19
74
|
blockUntilSync: true
|
|
20
|
-
}
|
|
75
|
+
});
|
|
21
76
|
log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
|
|
22
77
|
const worldStateConfig = {
|
|
23
78
|
...config,
|
|
@@ -26,35 +81,53 @@ import { ProverNode } from './prover-node.js';
|
|
|
26
81
|
const worldStateSynchronizer = await createWorldStateSynchronizer(worldStateConfig, archiver, options.prefilledPublicData, telemetry);
|
|
27
82
|
await worldStateSynchronizer.start();
|
|
28
83
|
const broker = deps.broker ?? await createAndStartProvingBroker(config, telemetry);
|
|
29
|
-
const prover = await createProverClient(
|
|
30
|
-
const { l1RpcUrls: rpcUrls, l1ChainId: chainId
|
|
84
|
+
const prover = await createProverClient(proverClientConfig, worldStateSynchronizer, broker, telemetry);
|
|
85
|
+
const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
|
|
31
86
|
const chain = createEthereumChain(rpcUrls, chainId);
|
|
32
|
-
const
|
|
87
|
+
const publicClient = createPublicClient({
|
|
88
|
+
chain: chain.chainInfo,
|
|
89
|
+
transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
|
|
90
|
+
batch: false
|
|
91
|
+
}))),
|
|
92
|
+
pollingInterval: config.viemPollingIntervalMS
|
|
93
|
+
});
|
|
33
94
|
const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
|
|
34
|
-
const l1TxUtils = deps.l1TxUtils
|
|
35
|
-
|
|
95
|
+
const l1TxUtils = deps.l1TxUtils ? [
|
|
96
|
+
deps.l1TxUtils
|
|
97
|
+
] : config.publisherForwarderAddress ? await createForwarderL1TxUtilsFromEthSigner(publicClient, proverSigners.signers, config.publisherForwarderAddress, {
|
|
98
|
+
...config,
|
|
99
|
+
scope: 'prover'
|
|
100
|
+
}, {
|
|
36
101
|
telemetry,
|
|
37
|
-
|
|
38
|
-
|
|
102
|
+
logger: log.createChild('l1-tx-utils'),
|
|
103
|
+
dateProvider
|
|
104
|
+
}) : await createL1TxUtilsFromEthSignerWithStore(publicClient, proverSigners.signers, {
|
|
105
|
+
...config,
|
|
106
|
+
scope: 'prover'
|
|
107
|
+
}, {
|
|
108
|
+
telemetry,
|
|
109
|
+
logger: log.createChild('l1-tx-utils'),
|
|
110
|
+
dateProvider
|
|
39
111
|
});
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const proverCoordination = await createProverCoordination(config, {
|
|
44
|
-
aztecNodeTxProvider: deps.aztecNodeTxProvider,
|
|
45
|
-
worldStateSynchronizer,
|
|
46
|
-
archiver,
|
|
47
|
-
epochCache,
|
|
112
|
+
const publisherFactory = deps.publisherFactory ?? new ProverPublisherFactory(config, {
|
|
113
|
+
rollupContract,
|
|
114
|
+
publisherManager: new PublisherManager(l1TxUtils, config),
|
|
48
115
|
telemetry
|
|
49
116
|
});
|
|
117
|
+
const proofVerifier = new QueuedIVCVerifier(config, config.realProofs || config.debugForceTxProofVerification ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier(config.proverTestVerificationDelayMs));
|
|
118
|
+
const p2pClient = await createP2PClient(P2PClientType.Prover, config, archiver, proofVerifier, worldStateSynchronizer, epochCache, getPackageVersion() ?? '', dateProvider, telemetry, {
|
|
119
|
+
txCollectionNodeSources: deps.aztecNodeTxProvider ? [
|
|
120
|
+
new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')
|
|
121
|
+
] : []
|
|
122
|
+
});
|
|
123
|
+
await p2pClient.start();
|
|
50
124
|
const proverNodeConfig = {
|
|
51
|
-
|
|
52
|
-
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
53
|
-
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
54
|
-
txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
|
|
55
|
-
txGatheringIntervalMs: config.txGatheringIntervalMs,
|
|
56
|
-
txGatheringTimeoutMs: config.txGatheringTimeoutMs
|
|
125
|
+
...pick(config, 'proverNodeMaxPendingJobs', 'proverNodeMaxParallelBlocksPerEpoch', 'proverNodePollingIntervalMs', 'proverNodeEpochProvingDelayMs', 'txGatheringMaxParallelRequests', 'txGatheringIntervalMs', 'txGatheringTimeoutMs', 'proverNodeFailedEpochStore', 'proverNodeDisableProofPublish', 'dataDirectory', 'l1ChainId', 'rollupVersion')
|
|
57
126
|
};
|
|
58
|
-
const epochMonitor = await EpochMonitor.create(archiver,
|
|
59
|
-
|
|
127
|
+
const epochMonitor = await EpochMonitor.create(archiver, {
|
|
128
|
+
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
129
|
+
provingDelayMs: config.proverNodeEpochProvingDelayMs
|
|
130
|
+
}, telemetry);
|
|
131
|
+
const l1Metrics = new L1Metrics(telemetry.getMeter('ProverNodeL1Metrics'), publicClient, l1TxUtils.map((utils)=>utils.getSenderAddress()));
|
|
132
|
+
return new ProverNode(prover, publisherFactory, archiver, archiver, archiver, worldStateSynchronizer, p2pClient, epochMonitor, rollupContract, l1Metrics, proverNodeConfig, telemetry);
|
|
60
133
|
}
|
package/dest/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
export * from './actions/index.js';
|
|
1
2
|
export * from './config.js';
|
|
2
3
|
export * from './factory.js';
|
|
3
|
-
export * from './
|
|
4
|
+
export * from './monitors/index.js';
|
|
4
5
|
export * from './prover-node-publisher.js';
|
|
5
6
|
export * from './prover-node.js';
|
|
6
|
-
//# sourceMappingURL=
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGtCQUFrQixDQUFDIn0=
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { CommitteeAttestation } from '@aztec/stdlib/block';
|
|
4
|
+
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
5
|
+
import { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
6
|
+
/** All data from an epoch used in proving. */
|
|
7
|
+
export type EpochProvingJobData = {
|
|
8
|
+
epochNumber: EpochNumber;
|
|
9
|
+
checkpoints: Checkpoint[];
|
|
10
|
+
txs: Map<string, Tx>;
|
|
11
|
+
l1ToL2Messages: Record<CheckpointNumber, Fr[]>;
|
|
12
|
+
previousBlockHeader: BlockHeader;
|
|
13
|
+
attestations: CommitteeAttestation[];
|
|
14
|
+
};
|
|
15
|
+
export declare function validateEpochProvingJobData(data: EpochProvingJobData): void;
|
|
16
|
+
export declare function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer;
|
|
17
|
+
export declare function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData;
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtcHJvdmluZy1qb2ItZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2pvYi9lcG9jaC1wcm92aW5nLWpvYi1kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNoRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsOENBQThDO0FBQzlDLE1BQU0sTUFBTSxtQkFBbUIsR0FBRztJQUNoQyxXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLFdBQVcsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUMxQixHQUFHLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNyQixjQUFjLEVBQUUsTUFBTSxDQUFDLGdCQUFnQixFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDL0MsbUJBQW1CLEVBQUUsV0FBVyxDQUFDO0lBQ2pDLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0NBQ3RDLENBQUM7QUFFRix3QkFBZ0IsMkJBQTJCLENBQUMsSUFBSSxFQUFFLG1CQUFtQixRQWtCcEU7QUFFRCx3QkFBZ0IsNEJBQTRCLENBQUMsSUFBSSxFQUFFLG1CQUFtQixHQUFHLE1BQU0sQ0FzQjlFO0FBRUQsd0JBQWdCLDhCQUE4QixDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsbUJBQW1CLENBb0IvRSJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"epoch-proving-job-data.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEnD,8CAA8C;AAC9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,mBAAmB,EAAE,WAAW,CAAC;IACjC,YAAY,EAAE,oBAAoB,EAAE,CAAC;CACtC,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,mBAAmB,QAkBpE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAsB9E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAoB/E"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
4
|
+
import { CommitteeAttestation } from '@aztec/stdlib/block';
|
|
5
|
+
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
6
|
+
import { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
7
|
+
export function validateEpochProvingJobData(data) {
|
|
8
|
+
if (data.checkpoints.length === 0) {
|
|
9
|
+
throw new Error('No checkpoints to prove');
|
|
10
|
+
}
|
|
11
|
+
const firstBlockNumber = data.checkpoints[0].blocks[0].number;
|
|
12
|
+
const previousBlockNumber = data.previousBlockHeader.getBlockNumber();
|
|
13
|
+
if (previousBlockNumber + 1 !== firstBlockNumber) {
|
|
14
|
+
throw new Error(`Initial block number ${firstBlockNumber} does not match previous block header ${previousBlockNumber}`);
|
|
15
|
+
}
|
|
16
|
+
for (const checkpoint of data.checkpoints){
|
|
17
|
+
if (!(checkpoint.number in data.l1ToL2Messages)) {
|
|
18
|
+
throw new Error(`Missing L1 to L2 messages for checkpoint number ${checkpoint.number}`);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
export function serializeEpochProvingJobData(data) {
|
|
23
|
+
const checkpoints = data.checkpoints.map((checkpoint)=>checkpoint.toBuffer());
|
|
24
|
+
const txs = Array.from(data.txs.values()).map((tx)=>tx.toBuffer());
|
|
25
|
+
const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([checkpointNumber, messages])=>[
|
|
26
|
+
Number(checkpointNumber),
|
|
27
|
+
messages.length,
|
|
28
|
+
...messages
|
|
29
|
+
]);
|
|
30
|
+
const attestations = data.attestations.map((attestation)=>attestation.toBuffer());
|
|
31
|
+
return serializeToBuffer(data.epochNumber, data.previousBlockHeader, checkpoints.length, ...checkpoints, txs.length, ...txs, l1ToL2Messages.length, ...l1ToL2Messages, attestations.length, ...attestations);
|
|
32
|
+
}
|
|
33
|
+
export function deserializeEpochProvingJobData(buf) {
|
|
34
|
+
const reader = BufferReader.asReader(buf);
|
|
35
|
+
const epochNumber = EpochNumber(reader.readNumber());
|
|
36
|
+
const previousBlockHeader = reader.readObject(BlockHeader);
|
|
37
|
+
const checkpoints = reader.readVector(Checkpoint);
|
|
38
|
+
const txArray = reader.readVector(Tx);
|
|
39
|
+
const l1ToL2MessageCheckpointCount = reader.readNumber();
|
|
40
|
+
const l1ToL2Messages = {};
|
|
41
|
+
for(let i = 0; i < l1ToL2MessageCheckpointCount; i++){
|
|
42
|
+
const checkpointNumber = CheckpointNumber(reader.readNumber());
|
|
43
|
+
const messages = reader.readVector(Fr);
|
|
44
|
+
l1ToL2Messages[checkpointNumber] = messages;
|
|
45
|
+
}
|
|
46
|
+
const attestations = reader.readVector(CommitteeAttestation);
|
|
47
|
+
const txs = new Map(txArray.map((tx)=>[
|
|
48
|
+
tx.getTxHash().toString(),
|
|
49
|
+
tx
|
|
50
|
+
]));
|
|
51
|
+
return {
|
|
52
|
+
epochNumber,
|
|
53
|
+
previousBlockHeader,
|
|
54
|
+
checkpoints,
|
|
55
|
+
txs,
|
|
56
|
+
l1ToL2Messages,
|
|
57
|
+
attestations
|
|
58
|
+
};
|
|
59
|
+
}
|
|
@@ -1,54 +1,62 @@
|
|
|
1
|
+
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import type { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
2
|
-
import type {
|
|
3
|
-
import { type EpochProver, type EpochProvingJobState, type ForkMerkleTreeOperations } from '@aztec/stdlib/interfaces/server';
|
|
4
|
-
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
5
|
-
import type { Tx } from '@aztec/stdlib/tx';
|
|
3
|
+
import type { L2BlockSource } from '@aztec/stdlib/block';
|
|
4
|
+
import { type EpochProver, type EpochProvingJobState, EpochProvingJobTerminalState, type ForkMerkleTreeOperations } from '@aztec/stdlib/interfaces/server';
|
|
6
5
|
import { type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
7
|
-
import type {
|
|
6
|
+
import type { ProverNodeJobMetrics } from '../metrics.js';
|
|
8
7
|
import type { ProverNodePublisher } from '../prover-node-publisher.js';
|
|
8
|
+
import { type EpochProvingJobData } from './epoch-proving-job-data.js';
|
|
9
|
+
export type EpochProvingJobOptions = {
|
|
10
|
+
parallelBlockLimit?: number;
|
|
11
|
+
skipEpochCheck?: boolean;
|
|
12
|
+
skipSubmitProof?: boolean;
|
|
13
|
+
};
|
|
9
14
|
/**
|
|
10
|
-
* Job that grabs a range of blocks from the
|
|
15
|
+
* Job that grabs a range of blocks from the unfinalized chain from L1, gets their txs given their hashes,
|
|
11
16
|
* re-executes their public calls, generates a rollup proof, and submits it to L1. This job will update the
|
|
12
17
|
* world state as part of public call execution via the public processor.
|
|
13
18
|
*/
|
|
14
19
|
export declare class EpochProvingJob implements Traceable {
|
|
20
|
+
private data;
|
|
15
21
|
private dbProvider;
|
|
16
|
-
private epochNumber;
|
|
17
|
-
private blocks;
|
|
18
|
-
private txs;
|
|
19
22
|
private prover;
|
|
20
23
|
private publicProcessorFactory;
|
|
21
24
|
private publisher;
|
|
22
25
|
private l2BlockSource;
|
|
23
|
-
private l1ToL2MessageSource;
|
|
24
26
|
private metrics;
|
|
25
27
|
private deadline;
|
|
26
28
|
private config;
|
|
27
|
-
private cleanUp;
|
|
28
29
|
private state;
|
|
29
30
|
private log;
|
|
30
31
|
private uuid;
|
|
31
32
|
private runPromise;
|
|
33
|
+
private epochCheckPromise;
|
|
32
34
|
private deadlineTimeoutHandler;
|
|
33
35
|
readonly tracer: Tracer;
|
|
34
|
-
constructor(
|
|
35
|
-
parallelBlockLimit: number;
|
|
36
|
-
}, cleanUp?: (job: EpochProvingJob) => Promise<void>);
|
|
36
|
+
constructor(data: EpochProvingJobData, dbProvider: Pick<ForkMerkleTreeOperations, 'fork'>, prover: EpochProver, publicProcessorFactory: PublicProcessorFactory, publisher: Pick<ProverNodePublisher, 'submitEpochProof'>, l2BlockSource: L2BlockSource | undefined, metrics: ProverNodeJobMetrics, deadline: Date | undefined, config: EpochProvingJobOptions);
|
|
37
37
|
getId(): string;
|
|
38
38
|
getState(): EpochProvingJobState;
|
|
39
|
-
getEpochNumber():
|
|
39
|
+
getEpochNumber(): EpochNumber;
|
|
40
|
+
getDeadline(): Date | undefined;
|
|
41
|
+
getProvingData(): EpochProvingJobData;
|
|
42
|
+
private get epochNumber();
|
|
43
|
+
private get checkpoints();
|
|
44
|
+
private get txs();
|
|
45
|
+
private get attestations();
|
|
40
46
|
/**
|
|
41
47
|
* Proves the given epoch and submits the proof to L1.
|
|
42
48
|
*/
|
|
43
49
|
run(): Promise<void>;
|
|
50
|
+
private createFork;
|
|
44
51
|
private progressState;
|
|
45
52
|
private checkState;
|
|
46
|
-
stop(state?:
|
|
53
|
+
stop(state?: EpochProvingJobTerminalState): Promise<void>;
|
|
47
54
|
private scheduleDeadlineStop;
|
|
48
|
-
private
|
|
55
|
+
private scheduleEpochCheck;
|
|
56
|
+
private gatherPreviousBlockHeaders;
|
|
49
57
|
private getTxs;
|
|
50
58
|
private getL1ToL2Messages;
|
|
51
59
|
private processTxs;
|
|
52
60
|
}
|
|
53
61
|
export { type EpochProvingJobState };
|
|
54
|
-
//# sourceMappingURL=
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtcHJvdmluZy1qb2IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9qb2IvZXBvY2gtcHJvdmluZy1qb2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFlLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBUzNFLE9BQU8sS0FBSyxFQUFtQixzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXZGLE9BQU8sS0FBSyxFQUFjLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxvQkFBb0IsRUFDekIsNEJBQTRCLEVBQzVCLEtBQUssd0JBQXdCLEVBQzlCLE1BQU0saUNBQWlDLENBQUM7QUFJekMsT0FBTyxFQUFjLEtBQUssU0FBUyxFQUFFLEtBQUssTUFBTSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFJN0YsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBK0IsTUFBTSw2QkFBNkIsQ0FBQztBQUVwRyxNQUFNLE1BQU0sc0JBQXNCLEdBQUc7SUFDbkMsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDNUIsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3pCLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUMzQixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHFCQUFhLGVBQWdCLFlBQVcsU0FBUztJQVk3QyxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLHNCQUFzQjtJQUM5QixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxNQUFNO0lBbkJoQixPQUFPLENBQUMsS0FBSyxDQUF1QztJQUNwRCxPQUFPLENBQUMsR0FBRyxDQUFpRDtJQUM1RCxPQUFPLENBQUMsSUFBSSxDQUFTO0lBRXJCLE9BQU8sQ0FBQyxVQUFVLENBQTRCO0lBQzlDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBNkI7SUFDdEQsT0FBTyxDQUFDLHNCQUFzQixDQUE2QjtJQUUzRCxTQUFnQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRS9CLFlBQ1UsSUFBSSxFQUFFLG1CQUFtQixFQUN6QixVQUFVLEVBQUUsSUFBSSxDQUFDLHdCQUF3QixFQUFFLE1BQU0sQ0FBQyxFQUNsRCxNQUFNLEVBQUUsV0FBVyxFQUNuQixzQkFBc0IsRUFBRSxzQkFBc0IsRUFDOUMsU0FBUyxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxrQkFBa0IsQ0FBQyxFQUN4RCxhQUFhLEVBQUUsYUFBYSxHQUFHLFNBQVMsRUFDeEMsT0FBTyxFQUFFLG9CQUFvQixFQUM3QixRQUFRLEVBQUUsSUFBSSxHQUFHLFNBQVMsRUFDMUIsTUFBTSxFQUFFLHNCQUFzQixFQUt2QztJQUVNLEtBQUssSUFBSSxNQUFNLENBRXJCO0lBRU0sUUFBUSxJQUFJLG9CQUFvQixDQUV0QztJQUVNLGNBQWMsSUFBSSxXQUFXLENBRW5DO0lBRU0sV0FBVyxJQUFJLElBQUksR0FBRyxTQUFTLENBRXJDO0lBRU0sY0FBYyxJQUFJLG1CQUFtQixDQUUzQztJQUVELE9BQU8sS0FBSyxXQUFXLEdBRXRCO0lBRUQsT0FBTyxLQUFLLFdBQVcsR0FFdEI7SUFFRCxPQUFPLEtBQUssR0FBRyxHQUVkO0lBRUQsT0FBTyxLQUFLLFlBQVksR0FFdkI7SUFFRDs7T0FFRztJQUlVLEdBQUcsa0JBaUxmO1lBTWEsVUFBVTtJQWdCeEIsT0FBTyxDQUFDLGFBQWE7SUFLckIsT0FBTyxDQUFDLFVBQVU7SUFNTCxJQUFJLENBQUMsS0FBSyxHQUFFLDRCQUF3QyxpQkFNaEU7SUFFRCxPQUFPLENBQUMsb0JBQW9CO1lBd0JkLGtCQUFrQjtJQStCaEMsT0FBTyxDQUFDLDBCQUEwQjtJQUtsQyxPQUFPLENBQUMsTUFBTTtJQUlkLE9BQU8sQ0FBQyxpQkFBaUI7WUFJWCxVQUFVO0NBbUJ6QjtBQVNELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAS3E,OAAO,KAAK,EAAmB,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEvF,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,4BAA4B,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAI7F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,KAAK,mBAAmB,EAA+B,MAAM,6BAA6B,CAAC;AAEpG,MAAM,MAAM,sBAAsB,GAAG;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAY7C,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,GAAG,CAAiD;IAC5D,OAAO,CAAC,IAAI,CAAS;IAErB,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,sBAAsB,CAA6B;IAE3D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACU,IAAI,EAAE,mBAAmB,EACzB,UAAU,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,EAClD,MAAM,EAAE,WAAW,EACnB,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,EACxD,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,IAAI,GAAG,SAAS,EAC1B,MAAM,EAAE,sBAAsB,EAKvC;IAEM,KAAK,IAAI,MAAM,CAErB;IAEM,QAAQ,IAAI,oBAAoB,CAEtC;IAEM,cAAc,IAAI,WAAW,CAEnC;IAEM,WAAW,IAAI,IAAI,GAAG,SAAS,CAErC;IAEM,cAAc,IAAI,mBAAmB,CAE3C;IAED,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,GAAG,GAEd;IAED,OAAO,KAAK,YAAY,GAEvB;IAED;;OAEG;IAIU,GAAG,kBAiLf;YAMa,UAAU;IAgBxB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,UAAU;IAML,IAAI,CAAC,KAAK,GAAE,4BAAwC,iBAMhE;IAED,OAAO,CAAC,oBAAoB;YAwBd,kBAAkB;IA+BhC,OAAO,CAAC,0BAA0B;IAKlC,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,iBAAiB;YAIX,UAAU;CAmBzB;AASD,OAAO,EAAE,KAAK,oBAAoB,EAAE,CAAC"}
|