@aztec/prover-node 0.69.0 → 0.69.1
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 +3 -0
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +16 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +4 -1
- package/dest/job/epoch-proving-job.d.ts +3 -3
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +10 -17
- package/dest/prover-node.d.ts +9 -2
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +83 -13
- package/package.json +17 -17
- package/src/config.ts +18 -0
- package/src/factory.ts +3 -0
- package/src/job/epoch-proving-job.ts +8 -25
- package/src/prover-node.ts +105 -12
package/dest/config.d.ts
CHANGED
|
@@ -14,6 +14,9 @@ type SpecificProverNodeConfig = {
|
|
|
14
14
|
proverNodeMaxPendingJobs: number;
|
|
15
15
|
proverNodePollingIntervalMs: number;
|
|
16
16
|
proverNodeMaxParallelBlocksPerEpoch: number;
|
|
17
|
+
txGatheringTimeoutMs: number;
|
|
18
|
+
txGatheringIntervalMs: number;
|
|
19
|
+
txGatheringMaxParallelRequests: number;
|
|
17
20
|
};
|
|
18
21
|
export type QuoteProviderConfig = {
|
|
19
22
|
quoteProviderBasisPointFee: number;
|
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,wBAAwB,CAAC;AAC/G,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAKpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAAwD,MAAM,2BAA2B,CAAC;AAExH,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;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoD,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAKpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAAwD,MAAM,2BAA2B,CAAC;AAExH,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;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,8BAA8B,EAAE,MAAM,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B,EAAE,MAAM,CAAC;IACnC,uBAAuB,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAqDF,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
|
@@ -24,6 +24,21 @@ const specificProverNodeConfigMappings = {
|
|
|
24
24
|
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
25
25
|
...numberConfigHelper(32),
|
|
26
26
|
},
|
|
27
|
+
txGatheringTimeoutMs: {
|
|
28
|
+
env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
|
|
29
|
+
description: 'The maximum amount of time to wait for tx data to be available',
|
|
30
|
+
...numberConfigHelper(60000),
|
|
31
|
+
},
|
|
32
|
+
txGatheringIntervalMs: {
|
|
33
|
+
env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
|
|
34
|
+
description: 'How often to check that tx data is available',
|
|
35
|
+
...numberConfigHelper(1000),
|
|
36
|
+
},
|
|
37
|
+
txGatheringMaxParallelRequests: {
|
|
38
|
+
env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
|
|
39
|
+
description: 'How many txs to load up a time',
|
|
40
|
+
...numberConfigHelper(100),
|
|
41
|
+
},
|
|
27
42
|
};
|
|
28
43
|
const quoteProviderConfigMappings = {
|
|
29
44
|
quoteProviderBasisPointFee: {
|
|
@@ -80,4 +95,4 @@ export function getProverNodeAgentConfigFromEnv() {
|
|
|
80
95
|
...getConfigFromMappings(bbConfigMappings),
|
|
81
96
|
};
|
|
82
97
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLHNCQUFzQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFL0csT0FBTyxFQUdMLHlCQUF5QixFQUN6QiwwQkFBMEIsR0FDM0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxPQUFPLEVBRUwsa0JBQWtCLEVBQ2xCLHFCQUFxQixFQUNyQixrQkFBa0IsR0FDbkIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQXdCLGtCQUFrQixFQUFFLG9CQUFvQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDeEcsT0FBTyxFQUFrQixtQkFBbUIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzNGLE9BQU8sRUFFTCxnQkFBZ0IsRUFDaEIsZ0JBQWdCLEVBQ2hCLDBCQUEwQixHQUMzQixNQUFNLDZCQUE2QixDQUFDO0FBQ3JDLE9BQU8sRUFHTCx5QkFBeUIsRUFDekIsMEJBQTBCLEVBQzFCLHdCQUF3QixFQUN4Qix5QkFBeUIsR0FDMUIsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN4QyxPQUFPLEVBQXlCLDBCQUEwQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFeEgsT0FBTyxFQUFnQywrQkFBK0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2pHLE9BQU8sRUFFTCwwQkFBMEIsRUFDMUIsZ0NBQWdDLEdBQ2pDLE1BQU0saUNBQWlDLENBQUM7QUE2QnpDLE1BQU0sZ0NBQWdDLEdBQWlEO0lBQ3JGLHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw4QkFBOEI7UUFDbkMsV0FBVyxFQUFFLHdEQUF3RDtRQUNyRSxHQUFHLGtCQUFrQixDQUFDLEVBQUUsQ0FBQztLQUMxQjtJQUNELDJCQUEyQixFQUFFO1FBQzNCLEdBQUcsRUFBRSxpQ0FBaUM7UUFDdEMs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
|
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;AAItF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,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;AAO/D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AAI9E,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,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CACtB,
|
|
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;AAItF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,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;AAO/D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AAI9E,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,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CACtB,uBAgEP"}
|
package/dest/factory.js
CHANGED
|
@@ -47,6 +47,9 @@ export async function createProverNode(config, deps = {}) {
|
|
|
47
47
|
maxPendingJobs: config.proverNodeMaxPendingJobs,
|
|
48
48
|
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
49
49
|
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
50
|
+
txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
|
|
51
|
+
txGatheringIntervalMs: config.txGatheringIntervalMs,
|
|
52
|
+
txGatheringTimeoutMs: config.txGatheringTimeoutMs,
|
|
50
53
|
};
|
|
51
54
|
const claimsMonitor = new ClaimsMonitor(publisher, telemetry, proverNodeConfig);
|
|
52
55
|
const epochMonitor = new EpochMonitor(archiver, telemetry, proverNodeConfig);
|
|
@@ -70,4 +73,4 @@ function createQuoteSigner(config) {
|
|
|
70
73
|
const privateKey = config.publisherPrivateKey;
|
|
71
74
|
return QuoteSigner.new(Buffer32.fromString(privateKey), rollupContract);
|
|
72
75
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBaUIsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEVBQWUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFekUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzdELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUM1RSxPQUFPLEVBQUUsVUFBVSxFQUEwQixNQUFNLGtCQUFrQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxnREFBZ0Q7QUFDaEQsTUFBTSxDQUFDLEtBQUssVUFBVSxnQkFBZ0IsQ0FDcEMsTUFBMEMsRUFDMUMsT0FPSSxFQUFFO0lBRU4sTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLG1CQUFtQixFQUFFLENBQUM7SUFDOUQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsSUFBSSxZQUFZLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDcEQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsSUFBSSxDQUFDLE1BQU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxTQUFTLEVBQUUsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3RHLEdBQUcsQ0FBQyxPQUFPLENBQUMsd0NBQXdDLE1BQU0sUUFBUSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUV2RixNQUFNLGdCQUFnQixHQUFHLEVBQUUsR0FBRyxNQUFNLEVBQUUsMEJBQTBCLEVBQUUsS0FBSyxFQUFFLENBQUM7SUFDMUUsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLDRCQUE0QixDQUFDLGdCQUFnQixFQUFFLFFBQVEsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUN6RyxNQUFNLHNCQUFzQixDQUFDLEtBQUssRUFBRSxDQUFDO0lBRXJDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLDJCQUEyQixDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sTUFBTSxHQUFHLE1BQU0sa0JBQWtCLENBQUMsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztJQUUzRixtRkFBbUY7SUFDbkYsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLFdBQVcsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFFdkUsTUFBTSxVQUFVLEdBQUcsTUFBTSxVQUFVLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRXJGLGlJQUFpSTtJQUNqSSxpR0FBaUc7SUFDakcsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLHdCQUF3QixDQUFDLE1BQU0sRUFBRTtRQUNoRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsbUJBQW1CO1FBQzdDLHNCQUFzQjtRQUN0QixRQUFRO1FBQ1IsVUFBVTtRQUNWLFNBQVM7S0FDVixDQUFDLENBQUM7SUFFSCxNQUFNLGFBQWEsR0FBRyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNsRCxNQUFNLFdBQVcsR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUU5QyxNQUFNLGdCQUFnQixHQUFzQjtRQUMxQyxjQUFjLEVBQUUsTUFBTSxDQUFDLHdCQUF3QjtRQUMvQyxpQkFBaUIsRUFBRSxNQUFNLENBQUMsMkJBQTJCO1FBQ3JELHlCQUF5QixFQUFFLE1BQU0sQ0FBQyxtQ0FBbUM7UUFDckUsOEJBQThCLEVBQUUsTUFBTSxDQUFDLDhCQUE4QjtRQUNyRSxxQkFBcUIsRUFBRSxNQUFNLENBQUMscUJBQXFCO1FBQ25ELG9CQUFvQixFQUFFLE1BQU0sQ0FBQyxvQkFBb0I7S0FDbEQsQ0FBQztJQUVGLE1BQU0sYUFBYSxHQUFHLElBQUksYUFBYSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztJQUNoRixNQUFNLFlBQVksR0FBRyxJQUFJLFlBQVksQ0FBQyxRQUFRLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFFN0UsTUFBTSxjQUFjLEdBQUcsU0FBUyxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDckQsTUFBTSxZQUFZLEdBQUcsU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQzNDLE1BQU0sV0FBVyxHQUFHLE1BQU0saUJBQWlCLENBQUMsY0FBYyxFQUFFLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUVsRixPQUFPLElBQUksVUFBVSxDQUNuQixNQUFNLEVBQ04sU0FBUyxFQUNULFFBQVEsRUFDUixRQUFRLEVBQ1IsUUFBUSxFQUNSLHNCQUFzQixFQUN0QixrQkFBa0IsRUFDbEIsYUFBYSxFQUNiLFdBQVcsRUFDWCxhQUFhLEVBQ2IsWUFBWSxFQUNaLFdBQVcsRUFDWCxTQUFTLEVBQ1QsZ0JBQWdCLENBQ2pCLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxNQUEyQjtJQUN0RCxPQUFPLE1BQU0sQ0FBQyxnQkFBZ0I7UUFDNUIsQ0FBQyxDQUFDLElBQUksaUJBQWlCLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDO1FBQ2hELENBQUMsQ0FBQyxJQUFJLG1CQUFtQixDQUFDLE1BQU0sQ0FBQywwQkFBMEIsRUFBRSxNQUFNLENBQUMsdUJBQXVCLENBQUMsQ0FBQztBQUNqRyxDQUFDO0FBRUQsU0FBUyxpQkFBaUIsQ0FBQyxNQUF3QjtJQUNqRCw4RkFBOEY7SUFDOUYsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsR0FBRyxNQUFNLENBQUM7SUFDckUsTUFBTSxLQUFLLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ25ELE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQzdGLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDakUsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUN4RSxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsbUJBQW1CLENBQUM7SUFDOUMsT0FBTyxXQUFXLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDMUUsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type EpochProver, type EpochProvingJobState, type ForkMerkleTreeOperations, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type
|
|
1
|
+
import { type EpochProver, type EpochProvingJobState, type ForkMerkleTreeOperations, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type Tx } 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 Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
@@ -12,12 +12,12 @@ export declare class EpochProvingJob implements Traceable {
|
|
|
12
12
|
private dbProvider;
|
|
13
13
|
private epochNumber;
|
|
14
14
|
private blocks;
|
|
15
|
+
private txs;
|
|
15
16
|
private prover;
|
|
16
17
|
private publicProcessorFactory;
|
|
17
18
|
private publisher;
|
|
18
19
|
private l2BlockSource;
|
|
19
20
|
private l1ToL2MessageSource;
|
|
20
|
-
private coordination;
|
|
21
21
|
private metrics;
|
|
22
22
|
private config;
|
|
23
23
|
private cleanUp;
|
|
@@ -26,7 +26,7 @@ export declare class EpochProvingJob implements Traceable {
|
|
|
26
26
|
private uuid;
|
|
27
27
|
private runPromise;
|
|
28
28
|
readonly tracer: Tracer;
|
|
29
|
-
constructor(dbProvider: ForkMerkleTreeOperations, epochNumber: bigint, blocks: L2Block[], prover: EpochProver, publicProcessorFactory: PublicProcessorFactory, publisher: L1Publisher, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource,
|
|
29
|
+
constructor(dbProvider: ForkMerkleTreeOperations, epochNumber: bigint, blocks: L2Block[], txs: Tx[], prover: EpochProver, publicProcessorFactory: PublicProcessorFactory, publisher: L1Publisher, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, metrics: ProverNodeMetrics, config?: {
|
|
30
30
|
parallelBlockLimit: number;
|
|
31
31
|
}, cleanUp?: (job: EpochProvingJob) => Promise<void>);
|
|
32
32
|
getId(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/job/epoch-proving-job.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAI7F,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD;;;;GAIG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAU7C,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IApBjB,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,GAAG,CAAiD;IAC5D,OAAO,CAAC,IAAI,CAAS;IAErB,OAAO,CAAC,UAAU,CAA4B;IAE9C,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGrB,UAAU,EAAE,wBAAwB,EACpC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,EAAE,EACjB,GAAG,EAAE,EAAE,EAAE,EACT,MAAM,EAAE,WAAW,EACnB,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,WAAW,EACtB,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,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;IAM7E,KAAK,IAAI,MAAM;IAIf,QAAQ,IAAI,oBAAoB;IAIvC;;OAEG;IAIU,GAAG;IA4EH,IAAI;IAQjB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,iBAAiB;YAIX,UAAU;CAWzB;AAED,OAAO,EAAE,KAAK,oBAAoB,EAAE,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
|
-
import { EmptyTxValidator, } from '@aztec/circuit-types';
|
|
3
2
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
4
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
4
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
@@ -16,16 +15,16 @@ let EpochProvingJob = (() => {
|
|
|
16
15
|
let _instanceExtraInitializers = [];
|
|
17
16
|
let _run_decorators;
|
|
18
17
|
return _a = class EpochProvingJob {
|
|
19
|
-
constructor(dbProvider, epochNumber, blocks, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource,
|
|
18
|
+
constructor(dbProvider, epochNumber, blocks, txs, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource, metrics, config = { parallelBlockLimit: 32 }, cleanUp = () => Promise.resolve()) {
|
|
20
19
|
this.dbProvider = (__runInitializers(this, _instanceExtraInitializers), dbProvider);
|
|
21
20
|
this.epochNumber = epochNumber;
|
|
22
21
|
this.blocks = blocks;
|
|
22
|
+
this.txs = txs;
|
|
23
23
|
this.prover = prover;
|
|
24
24
|
this.publicProcessorFactory = publicProcessorFactory;
|
|
25
25
|
this.publisher = publisher;
|
|
26
26
|
this.l2BlockSource = l2BlockSource;
|
|
27
27
|
this.l1ToL2MessageSource = l1ToL2MessageSource;
|
|
28
|
-
this.coordination = coordination;
|
|
29
28
|
this.metrics = metrics;
|
|
30
29
|
this.config = config;
|
|
31
30
|
this.cleanUp = cleanUp;
|
|
@@ -63,10 +62,8 @@ let EpochProvingJob = (() => {
|
|
|
63
62
|
this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks);
|
|
64
63
|
await asyncPool(this.config.parallelBlockLimit, this.blocks, async (block) => {
|
|
65
64
|
const globalVariables = block.header.globalVariables;
|
|
66
|
-
const
|
|
67
|
-
const txCount = block.body.numberOfTxsIncludingPadded;
|
|
65
|
+
const txs = this.getTxs(block);
|
|
68
66
|
const l1ToL2Messages = await this.getL1ToL2Messages(block);
|
|
69
|
-
const txs = await this.getTxs(txHashes, block.number);
|
|
70
67
|
const previousHeader = await this.getBlockHeader(block.number - 1);
|
|
71
68
|
this.log.verbose(`Starting processing block ${block.number}`, {
|
|
72
69
|
number: block.number,
|
|
@@ -84,7 +81,7 @@ let EpochProvingJob = (() => {
|
|
|
84
81
|
// Process public fns
|
|
85
82
|
const db = await this.dbProvider.fork(block.number - 1);
|
|
86
83
|
const publicProcessor = this.publicProcessorFactory.create(db, previousHeader, globalVariables, true);
|
|
87
|
-
const processed = await this.processTxs(publicProcessor, txs
|
|
84
|
+
const processed = await this.processTxs(publicProcessor, txs);
|
|
88
85
|
await this.prover.addTxs(processed);
|
|
89
86
|
await db.close();
|
|
90
87
|
this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
|
|
@@ -126,19 +123,15 @@ let EpochProvingJob = (() => {
|
|
|
126
123
|
}
|
|
127
124
|
return this.l2BlockSource.getBlockHeader(blockNumber);
|
|
128
125
|
}
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
if (notFound.length) {
|
|
133
|
-
throw new Error(`Txs not found for block ${blockNumber}: ${notFound.map(([txHash]) => txHash.toString()).join(', ')}`);
|
|
134
|
-
}
|
|
135
|
-
return txs.map(([_, tx]) => tx);
|
|
126
|
+
getTxs(block) {
|
|
127
|
+
const txHashes = block.body.txEffects.map(tx => tx.txHash.toBigInt());
|
|
128
|
+
return this.txs.filter(tx => txHashes.includes(tx.getTxHash().toBigInt()));
|
|
136
129
|
}
|
|
137
130
|
getL1ToL2Messages(block) {
|
|
138
131
|
return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
|
|
139
132
|
}
|
|
140
|
-
async processTxs(publicProcessor, txs
|
|
141
|
-
const [processedTxs, failedTxs] = await publicProcessor.process(txs
|
|
133
|
+
async processTxs(publicProcessor, txs) {
|
|
134
|
+
const [processedTxs, failedTxs] = await publicProcessor.process(txs);
|
|
142
135
|
if (failedTxs.length) {
|
|
143
136
|
throw new Error(`Failed to process txs: ${failedTxs.map(({ tx, error }) => `${tx.getTxHash()} (${error})`).join(', ')}`);
|
|
144
137
|
}
|
|
@@ -156,4 +149,4 @@ let EpochProvingJob = (() => {
|
|
|
156
149
|
_a;
|
|
157
150
|
})();
|
|
158
151
|
export { EpochProvingJob };
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# 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 P2PClientType, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
1
|
+
import { type EpochProofClaim, type EpochProofQuote, type EpochProverManager, type L1ToL2MessageSource, type L2Block, type L2BlockSource, type P2PClientType, type ProverCoordination, type ProverNodeApi, type Service, type Tx, 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 P2P } from '@aztec/p2p';
|
|
@@ -15,6 +15,9 @@ export type ProverNodeOptions = {
|
|
|
15
15
|
pollingIntervalMs: number;
|
|
16
16
|
maxPendingJobs: number;
|
|
17
17
|
maxParallelBlocksPerEpoch: number;
|
|
18
|
+
txGatheringTimeoutMs: number;
|
|
19
|
+
txGatheringIntervalMs: number;
|
|
20
|
+
txGatheringMaxParallelRequests: number;
|
|
18
21
|
};
|
|
19
22
|
/**
|
|
20
23
|
* An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
|
|
@@ -40,6 +43,7 @@ export declare class ProverNode implements ClaimsMonitorHandler, EpochMonitorHan
|
|
|
40
43
|
private dateProvider;
|
|
41
44
|
private latestEpochWeAreProving;
|
|
42
45
|
private jobs;
|
|
46
|
+
private cachedEpochData;
|
|
43
47
|
private options;
|
|
44
48
|
private metrics;
|
|
45
49
|
readonly tracer: Tracer;
|
|
@@ -91,8 +95,11 @@ export declare class ProverNode implements ClaimsMonitorHandler, EpochMonitorHan
|
|
|
91
95
|
}[]>;
|
|
92
96
|
private checkMaximumPendingJobs;
|
|
93
97
|
private createProvingJob;
|
|
98
|
+
private gatherEpochData;
|
|
99
|
+
private gatherBlocks;
|
|
100
|
+
private gatherTxs;
|
|
94
101
|
/** Extracted for testing purposes. */
|
|
95
|
-
protected doCreateEpochProvingJob(epochNumber: bigint, blocks: L2Block[], publicProcessorFactory: PublicProcessorFactory, cleanUp: () => Promise<void>): EpochProvingJob;
|
|
102
|
+
protected doCreateEpochProvingJob(epochNumber: bigint, blocks: L2Block[], txs: Tx[], publicProcessorFactory: PublicProcessorFactory, cleanUp: () => Promise<void>): EpochProvingJob;
|
|
96
103
|
/** Extracted for testing purposes. */
|
|
97
104
|
protected triggerMonitors(): Promise<void>;
|
|
98
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,sBAAsB,EAE5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
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
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
2
|
import { EpochProofQuotePayload, tryStop, } from '@aztec/circuit-types';
|
|
3
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
3
4
|
import { compact } from '@aztec/foundation/collection';
|
|
5
|
+
import { TimeoutError } from '@aztec/foundation/error';
|
|
4
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
7
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
5
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
6
9
|
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
7
10
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
@@ -17,6 +20,7 @@ let ProverNode = (() => {
|
|
|
17
20
|
var _a;
|
|
18
21
|
let _instanceExtraInitializers = [];
|
|
19
22
|
let _createProvingJob_decorators;
|
|
23
|
+
let _gatherEpochData_decorators;
|
|
20
24
|
return _a = class ProverNode {
|
|
21
25
|
constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, quoteProvider, quoteSigner, claimsMonitor, epochsMonitor, bondManager, telemetryClient, options = {}) {
|
|
22
26
|
this.prover = (__runInitializers(this, _instanceExtraInitializers), prover);
|
|
@@ -35,10 +39,14 @@ let ProverNode = (() => {
|
|
|
35
39
|
this.log = createLogger('prover-node');
|
|
36
40
|
this.dateProvider = new DateProvider();
|
|
37
41
|
this.jobs = new Map();
|
|
42
|
+
this.cachedEpochData = undefined;
|
|
38
43
|
this.options = {
|
|
39
44
|
pollingIntervalMs: 1000,
|
|
40
45
|
maxPendingJobs: 100,
|
|
41
46
|
maxParallelBlocksPerEpoch: 32,
|
|
47
|
+
txGatheringTimeoutMs: 60000,
|
|
48
|
+
txGatheringIntervalMs: 1000,
|
|
49
|
+
txGatheringMaxParallelRequests: 100,
|
|
42
50
|
...compact(options),
|
|
43
51
|
};
|
|
44
52
|
this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
|
|
@@ -99,12 +107,11 @@ let ProverNode = (() => {
|
|
|
99
107
|
*/
|
|
100
108
|
async handleEpochCompleted(epochNumber) {
|
|
101
109
|
try {
|
|
110
|
+
// Gather data for the epoch
|
|
111
|
+
const epochData = await this.gatherEpochData(epochNumber);
|
|
112
|
+
const { blocks } = epochData;
|
|
113
|
+
this.cachedEpochData = { epochNumber, ...epochData };
|
|
102
114
|
// Construct a quote for the epoch
|
|
103
|
-
const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
|
|
104
|
-
if (blocks.length === 0) {
|
|
105
|
-
this.log.info(`No blocks found for epoch ${epochNumber}`);
|
|
106
|
-
return;
|
|
107
|
-
}
|
|
108
115
|
const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
|
|
109
116
|
if (!partialQuote) {
|
|
110
117
|
this.log.info(`No quote produced for epoch ${epochNumber}`);
|
|
@@ -198,10 +205,8 @@ let ProverNode = (() => {
|
|
|
198
205
|
throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
|
|
199
206
|
}
|
|
200
207
|
// Gather blocks for this epoch
|
|
201
|
-
const
|
|
202
|
-
|
|
203
|
-
throw new Error(`No blocks found for epoch ${epochNumber}`);
|
|
204
|
-
}
|
|
208
|
+
const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
|
|
209
|
+
const { blocks, txs } = cachedEpochData ?? (await this.gatherEpochData(epochNumber));
|
|
205
210
|
const fromBlock = blocks[0].number;
|
|
206
211
|
const toBlock = blocks.at(-1).number;
|
|
207
212
|
// Fast forward world state to right before the target block and get a fork
|
|
@@ -213,13 +218,76 @@ let ProverNode = (() => {
|
|
|
213
218
|
this.jobs.delete(job.getId());
|
|
214
219
|
return Promise.resolve();
|
|
215
220
|
};
|
|
216
|
-
const job = this.doCreateEpochProvingJob(epochNumber, blocks, publicProcessorFactory, cleanUp);
|
|
221
|
+
const job = this.doCreateEpochProvingJob(epochNumber, blocks, txs, publicProcessorFactory, cleanUp);
|
|
217
222
|
this.jobs.set(job.getId(), job);
|
|
218
223
|
return job;
|
|
219
224
|
}
|
|
225
|
+
async gatherEpochData(epochNumber) {
|
|
226
|
+
// Gather blocks for this epoch and their txs
|
|
227
|
+
const blocks = await this.gatherBlocks(epochNumber);
|
|
228
|
+
const txs = await this.gatherTxs(epochNumber, blocks);
|
|
229
|
+
return { blocks, txs };
|
|
230
|
+
}
|
|
231
|
+
async gatherBlocks(epochNumber) {
|
|
232
|
+
const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
|
|
233
|
+
if (blocks.length === 0) {
|
|
234
|
+
throw new Error(`No blocks found for epoch ${epochNumber}`);
|
|
235
|
+
}
|
|
236
|
+
return blocks;
|
|
237
|
+
}
|
|
238
|
+
async gatherTxs(epochNumber, blocks) {
|
|
239
|
+
let txsToFind = [];
|
|
240
|
+
const txHashToBlock = new Map();
|
|
241
|
+
const results = new Map();
|
|
242
|
+
for (const block of blocks) {
|
|
243
|
+
for (const tx of block.body.txEffects) {
|
|
244
|
+
txsToFind.push(tx.txHash);
|
|
245
|
+
txHashToBlock.set(tx.txHash.toString(), block.number);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
const totalTxsRequired = txsToFind.length;
|
|
249
|
+
this.log.info(`Gathering a total of ${totalTxsRequired} txs for epoch=${epochNumber} made up of ${blocks.length} blocks`, { epochNumber });
|
|
250
|
+
let iteration = 0;
|
|
251
|
+
try {
|
|
252
|
+
await retryUntil(async () => {
|
|
253
|
+
const batch = [...txsToFind];
|
|
254
|
+
txsToFind = [];
|
|
255
|
+
const batchResults = await asyncPool(this.options.txGatheringMaxParallelRequests, batch, async (txHash) => {
|
|
256
|
+
const tx = await this.coordination.getTxByHash(txHash);
|
|
257
|
+
return [txHash, tx];
|
|
258
|
+
});
|
|
259
|
+
let found = 0;
|
|
260
|
+
for (const [txHash, maybeTx] of batchResults) {
|
|
261
|
+
if (maybeTx) {
|
|
262
|
+
found++;
|
|
263
|
+
results.set(txHash.toString(), maybeTx);
|
|
264
|
+
}
|
|
265
|
+
else {
|
|
266
|
+
txsToFind.push(txHash);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
this.log.verbose(`Gathered ${found}/${batch.length} txs in iteration ${iteration} for epoch ${epochNumber}. In total ${results.size}/${totalTxsRequired} have been retrieved.`, { epochNumber });
|
|
270
|
+
iteration++;
|
|
271
|
+
// stop when we found all transactions
|
|
272
|
+
return txsToFind.length === 0;
|
|
273
|
+
}, 'Gather txs', this.options.txGatheringTimeoutMs / 1000, this.options.txGatheringIntervalMs / 1000);
|
|
274
|
+
}
|
|
275
|
+
catch (err) {
|
|
276
|
+
if (err && err instanceof TimeoutError) {
|
|
277
|
+
const notFoundList = txsToFind
|
|
278
|
+
.map(txHash => `${txHash.toString()} (block ${txHashToBlock.get(txHash.toString())})`)
|
|
279
|
+
.join(', ');
|
|
280
|
+
throw new Error(`Txs not found for epoch ${epochNumber}: ${notFoundList}`);
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
throw err;
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
return Array.from(results.values());
|
|
287
|
+
}
|
|
220
288
|
/** Extracted for testing purposes. */
|
|
221
|
-
doCreateEpochProvingJob(epochNumber, blocks, publicProcessorFactory, cleanUp) {
|
|
222
|
-
return new EpochProvingJob(this.worldState, epochNumber, blocks, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.
|
|
289
|
+
doCreateEpochProvingJob(epochNumber, blocks, txs, publicProcessorFactory, cleanUp) {
|
|
290
|
+
return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, { parallelBlockLimit: this.options.maxParallelBlocksPerEpoch }, cleanUp);
|
|
223
291
|
}
|
|
224
292
|
/** Extracted for testing purposes. */
|
|
225
293
|
async triggerMonitors() {
|
|
@@ -230,10 +298,12 @@ let ProverNode = (() => {
|
|
|
230
298
|
(() => {
|
|
231
299
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
232
300
|
_createProvingJob_decorators = [trackSpan('ProverNode.createProvingJob', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
|
|
301
|
+
_gatherEpochData_decorators = [trackSpan('ProverNode.gatherEpochData', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
|
|
233
302
|
__esDecorate(_a, null, _createProvingJob_decorators, { kind: "method", name: "createProvingJob", static: false, private: false, access: { has: obj => "createProvingJob" in obj, get: obj => obj.createProvingJob }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
303
|
+
__esDecorate(_a, null, _gatherEpochData_decorators, { kind: "method", name: "gatherEpochData", static: false, private: false, access: { has: obj => "gatherEpochData" in obj, get: obj => obj.gatherEpochData }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
234
304
|
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
235
305
|
})(),
|
|
236
306
|
_a;
|
|
237
307
|
})();
|
|
238
308
|
export { ProverNode };
|
|
239
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
|
309
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,sBAAsB,EAYtB,OAAO,GACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAqD,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGnH,OAAO,EAAE,eAAe,EAA6B,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAejD;;;;;GAKG;IACU,UAAU;;;;;sBAAV,UAAU;YAYrB,YACmB,MAA0B,EAC1B,SAAsB,EACtB,aAA6C,EAC7C,mBAAwC,EACxC,kBAAsC,EACtC,UAAkC,EAClC,YAAiD,EACjD,aAA4B,EAC5B,WAAwB,EACxB,aAA4B,EAC5B,aAA2B,EAC3B,WAAwB,EACxB,eAAgC,EACjD,UAAsC,EAAE;gBAbvB,WAAM,IAbd,mDAAU,EAaF,MAAM,EAAoB;gBAC1B,cAAS,GAAT,SAAS,CAAa;gBACtB,kBAAa,GAAb,aAAa,CAAgC;gBAC7C,wBAAmB,GAAnB,mBAAmB,CAAqB;gBACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;gBACtC,eAAU,GAAV,UAAU,CAAwB;gBAClC,iBAAY,GAAZ,YAAY,CAAqC;gBACjD,kBAAa,GAAb,aAAa,CAAe;gBAC5B,gBAAW,GAAX,WAAW,CAAa;gBACxB,kBAAa,GAAb,aAAa,CAAe;gBAC5B,kBAAa,GAAb,aAAa,CAAc;gBAC3B,gBAAW,GAAX,WAAW,CAAa;gBACxB,oBAAe,GAAf,eAAe,CAAiB;gBAxB3C,QAAG,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;gBAClC,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAC;gBAGlC,SAAI,GAAiC,IAAI,GAAG,EAAE,CAAC;gBAC/C,oBAAe,GAAsE,SAAS,CAAC;gBAsBrG,IAAI,CAAC,OAAO,GAAG;oBACb,iBAAiB,EAAE,IAAK;oBACxB,cAAc,EAAE,GAAG;oBACnB,yBAAyB,EAAE,EAAE;oBAC7B,oBAAoB,EAAE,KAAM;oBAC5B,qBAAqB,EAAE,IAAK;oBAC5B,8BAA8B,EAAE,GAAG;oBACnC,GAAG,OAAO,CAAC,OAAO,CAAC;iBACpB,CAAC;gBAEF,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBACpE,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACxD,CAAC;YAEM,MAAM;gBACX,MAAM,WAAW,GAAG,IAAI,CAAC,YAAyC,CAAC;gBACnE,IAAI,OAAO,WAAW,CAAC,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC/E,OAAO,WAAW,CAAC;gBACrB,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,KAAK,CAAC,WAAW,CAAC,UAA2B;gBAC3C,IAAI,UAAU,CAAC,YAAY,KAAK,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAmC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;oBAC/E,OAAO;gBACT,CAAC;gBAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;gBACtE,IAAI,WAAW,KAAK,SAAS,IAAI,UAAU,CAAC,YAAY,IAAI,WAAW,EAAE,CAAC;oBACxE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,UAAU,CAAC,YAAY,oBAAoB,CAAC,CAAC;oBACjF,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBAC/C,IAAI,CAAC,uBAAuB,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,UAAU,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;gBACnF,CAAC;gBAED,IAAI,CAAC;oBACH,gGAAgG;oBAChG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBACtC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6DAA6D,UAAU,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC9G,CAAC;YACH,CAAC;YAED;;;;eAIG;YACH,KAAK,CAAC,sBAAsB,CAAC,WAAmB;gBAC9C,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;oBACnD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,GAAG,WAAW,EAAE,CAAC;wBAC/C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,WAAW,4BAA4B,CAAC,CAAC;wBAC5E,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YAED;;;eAGG;YACH,KAAK,CAAC,oBAAoB,CAAC,WAAmB;gBAC5C,IAAI,CAAC;oBACH,4BAA4B;oBAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;oBAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;oBAC7B,IAAI,CAAC,eAAe,GAAG,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,CAAC;oBAErD,kCAAkC;oBAClC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;oBACpF,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;wBAC5D,OAAO;oBACT,CAAC;oBAED,+DAA+D;oBAC/D,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;oBAE3D,+BAA+B;oBAC/B,MAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC;wBACxC,GAAG,YAAY;wBACf,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC;wBACjC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE;wBACzC,cAAc,EAAE,YAAY,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,4BAA4B;qBAC7G,CAAC,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAElD,6BAA6B;oBAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,2BAA2B,WAAW,gBAAgB,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,EACpG,KAAK,CAAC,UAAU,EAAE,CACnB,CAAC;oBACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;YAED;;;;eAIG;YACH,KAAK,CAAC,KAAK;gBACT,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,CAAC;YAED;;eAEG;YACH,KAAK,CAAC,IAAI;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACrC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACzB,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACzE,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC7B,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACtC,CAAC;YAED,qDAAqD;YAC9C,mBAAmB,CAAC,KAAsB;gBAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;gBACnE,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YAEO,qBAAqB,CAAC,KAAsB;gBAClD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,KAAK,CAAC,WAA4B;gBAC7C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC7D,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,UAAU,CAAC,WAA4B;gBAClD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC7D,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;YACzF,CAAC;YAED;;eAEG;YACI,SAAS;gBACd,OAAO,IAAI,CAAC,MAAM,CAAC;YACrB,CAAC;YAED;;eAEG;YACI,OAAO;gBACZ,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACnH,CAAC;YAEO,uBAAuB;gBAC7B,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;gBACxC,OAAO,cAAc,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;YACjE,CAAC;YAGO,KAAK,CAAC,gBAAgB,CAAC,WAAmB;gBAChD,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,OAAO,CAAC,cAAc,kCAAkC,CAAC,CAAC;gBACjH,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;gBAErF,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;gBAEtC,2EAA2E;gBAC3E,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kCAAkC,WAAW,oBAAoB,SAAS,OAAO,OAAO,EAAE,CAAC,CAAC;gBAC7G,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;gBAEnD,kDAAkD;gBAClD,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CACvD,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,CACrB,CAAC;gBAEF,MAAM,OAAO,GAAG,GAAG,EAAE;oBACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC9B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC,CAAC;gBAEF,MAAM,GAAG,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,CAAC,CAAC;gBACpG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC;YAGO,KAAK,CAAC,eAAe,CAAC,WAAmB;gBAC/C,6CAA6C;gBAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBACpD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAEtD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YACzB,CAAC;YAEO,KAAK,CAAC,YAAY,CAAC,WAAmB;gBAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACvE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;YAEO,KAAK,CAAC,SAAS,CAAC,WAAmB,EAAE,MAAiB;gBAC5D,IAAI,SAAS,GAAa,EAAE,CAAC;gBAC7B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;gBAChD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAc,CAAC;gBAEtC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC3B,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;wBACtC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;wBAC1B,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC;gBACH,CAAC;gBAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wBAAwB,gBAAgB,kBAAkB,WAAW,eAAe,MAAM,CAAC,MAAM,SAAS,EAC1G,EAAE,WAAW,EAAE,CAChB,CAAC;gBAEF,IAAI,SAAS,GAAG,CAAC,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,UAAU,CACd,KAAK,IAAI,EAAE;wBACT,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;wBAC7B,SAAS,GAAG,EAAE,CAAC;wBACf,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,8BAA8B,EAAE,KAAK,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;4BACtG,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;4BACvD,OAAO,CAAC,MAAM,EAAE,EAAE,CAAU,CAAC;wBAC/B,CAAC,CAAC,CAAC;wBACH,IAAI,KAAK,GAAG,CAAC,CAAC;wBACd,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,YAAY,EAAE,CAAC;4BAC7C,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,EAAE,CAAC;gCACR,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;4BAC1C,CAAC;iCAAM,CAAC;gCACN,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BACzB,CAAC;wBACH,CAAC;wBAED,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,YAAY,KAAK,IAAI,KAAK,CAAC,MAAM,qBAAqB,SAAS,cAAc,WAAW,cAAc,OAAO,CAAC,IAAI,IAAI,gBAAgB,uBAAuB,EAC7J,EAAE,WAAW,EAAE,CAChB,CAAC;wBACF,SAAS,EAAE,CAAC;wBAEZ,sCAAsC;wBACtC,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;oBAChC,CAAC,EACD,YAAY,EACZ,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAK,EACzC,IAAI,CAAC,OAAO,CAAC,qBAAqB,GAAG,IAAK,CAC3C,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,GAAG,IAAI,GAAG,YAAY,YAAY,EAAE,CAAC;wBACvC,MAAM,YAAY,GAAG,SAAS;6BAC3B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC;6BACrF,IAAI,CAAC,IAAI,CAAC,CAAC;wBACd,MAAM,IAAI,KAAK,CAAC,2BAA2B,WAAW,KAAK,YAAY,EAAE,CAAC,CAAC;oBAC7E,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,CAAC;oBACZ,CAAC;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACtC,CAAC;YAED,sCAAsC;YAC5B,uBAAuB,CAC/B,WAAmB,EACnB,MAAiB,EACjB,GAAS,EACT,sBAA8C,EAC9C,OAA4B;gBAE5B,OAAO,IAAI,eAAe,CACxB,IAAI,CAAC,UAAU,EACf,WAAW,EACX,MAAM,EACN,GAAG,EACH,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAC/B,sBAAsB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,OAAO,EACZ,EAAE,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAC9D,OAAO,CACR,CAAC;YACJ,CAAC;YAED,sCAAsC;YAC5B,KAAK,CAAC,eAAe;gBAC7B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC;;;;4CAhJA,SAAS,CAAC,6BAA6B,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;2CAkC7G,SAAS,CAAC,4BAA4B,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAjC7G,iMAAc,gBAAgB,6DA+B7B;YAGD,8LAAc,eAAe,6DAM5B;;;;;SA1PU,UAAU"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-node",
|
|
3
|
-
"version": "0.69.
|
|
3
|
+
"version": "0.69.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -52,22 +52,22 @@
|
|
|
52
52
|
]
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@aztec/archiver": "0.69.
|
|
56
|
-
"@aztec/bb-prover": "0.69.
|
|
57
|
-
"@aztec/circuit-types": "0.69.
|
|
58
|
-
"@aztec/circuits.js": "0.69.
|
|
59
|
-
"@aztec/epoch-cache": "0.69.
|
|
60
|
-
"@aztec/ethereum": "0.69.
|
|
61
|
-
"@aztec/foundation": "0.69.
|
|
62
|
-
"@aztec/kv-store": "0.69.
|
|
63
|
-
"@aztec/l1-artifacts": "0.69.
|
|
64
|
-
"@aztec/p2p": "0.69.
|
|
65
|
-
"@aztec/prover-client": "0.69.
|
|
66
|
-
"@aztec/sequencer-client": "0.69.
|
|
67
|
-
"@aztec/simulator": "0.69.
|
|
68
|
-
"@aztec/telemetry-client": "0.69.
|
|
69
|
-
"@aztec/types": "0.69.
|
|
70
|
-
"@aztec/world-state": "0.69.
|
|
55
|
+
"@aztec/archiver": "0.69.1",
|
|
56
|
+
"@aztec/bb-prover": "0.69.1",
|
|
57
|
+
"@aztec/circuit-types": "0.69.1",
|
|
58
|
+
"@aztec/circuits.js": "0.69.1",
|
|
59
|
+
"@aztec/epoch-cache": "0.69.1",
|
|
60
|
+
"@aztec/ethereum": "0.69.1",
|
|
61
|
+
"@aztec/foundation": "0.69.1",
|
|
62
|
+
"@aztec/kv-store": "0.69.1",
|
|
63
|
+
"@aztec/l1-artifacts": "0.69.1",
|
|
64
|
+
"@aztec/p2p": "0.69.1",
|
|
65
|
+
"@aztec/prover-client": "0.69.1",
|
|
66
|
+
"@aztec/sequencer-client": "0.69.1",
|
|
67
|
+
"@aztec/simulator": "0.69.1",
|
|
68
|
+
"@aztec/telemetry-client": "0.69.1",
|
|
69
|
+
"@aztec/types": "0.69.1",
|
|
70
|
+
"@aztec/world-state": "0.69.1",
|
|
71
71
|
"source-map-support": "^0.5.21",
|
|
72
72
|
"tslib": "^2.4.0",
|
|
73
73
|
"viem": "^2.7.15"
|
package/src/config.ts
CHANGED
|
@@ -53,6 +53,9 @@ type SpecificProverNodeConfig = {
|
|
|
53
53
|
proverNodeMaxPendingJobs: number;
|
|
54
54
|
proverNodePollingIntervalMs: number;
|
|
55
55
|
proverNodeMaxParallelBlocksPerEpoch: number;
|
|
56
|
+
txGatheringTimeoutMs: number;
|
|
57
|
+
txGatheringIntervalMs: number;
|
|
58
|
+
txGatheringMaxParallelRequests: number;
|
|
56
59
|
};
|
|
57
60
|
|
|
58
61
|
export type QuoteProviderConfig = {
|
|
@@ -77,6 +80,21 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
|
|
|
77
80
|
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
78
81
|
...numberConfigHelper(32),
|
|
79
82
|
},
|
|
83
|
+
txGatheringTimeoutMs: {
|
|
84
|
+
env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
|
|
85
|
+
description: 'The maximum amount of time to wait for tx data to be available',
|
|
86
|
+
...numberConfigHelper(60_000),
|
|
87
|
+
},
|
|
88
|
+
txGatheringIntervalMs: {
|
|
89
|
+
env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
|
|
90
|
+
description: 'How often to check that tx data is available',
|
|
91
|
+
...numberConfigHelper(1_000),
|
|
92
|
+
},
|
|
93
|
+
txGatheringMaxParallelRequests: {
|
|
94
|
+
env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
|
|
95
|
+
description: 'How many txs to load up a time',
|
|
96
|
+
...numberConfigHelper(100),
|
|
97
|
+
},
|
|
80
98
|
};
|
|
81
99
|
|
|
82
100
|
const quoteProviderConfigMappings: ConfigMappingsType<QuoteProviderConfig> = {
|
package/src/factory.ts
CHANGED
|
@@ -71,6 +71,9 @@ export async function createProverNode(
|
|
|
71
71
|
maxPendingJobs: config.proverNodeMaxPendingJobs,
|
|
72
72
|
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
73
73
|
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
74
|
+
txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
|
|
75
|
+
txGatheringIntervalMs: config.txGatheringIntervalMs,
|
|
76
|
+
txGatheringTimeoutMs: config.txGatheringTimeoutMs,
|
|
74
77
|
};
|
|
75
78
|
|
|
76
79
|
const claimsMonitor = new ClaimsMonitor(publisher, telemetry, proverNodeConfig);
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
EmptyTxValidator,
|
|
3
2
|
type EpochProver,
|
|
4
3
|
type EpochProvingJobState,
|
|
5
4
|
type ForkMerkleTreeOperations,
|
|
@@ -7,9 +6,7 @@ import {
|
|
|
7
6
|
type L2Block,
|
|
8
7
|
type L2BlockSource,
|
|
9
8
|
type ProcessedTx,
|
|
10
|
-
type ProverCoordination,
|
|
11
9
|
type Tx,
|
|
12
|
-
type TxHash,
|
|
13
10
|
} from '@aztec/circuit-types';
|
|
14
11
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
15
12
|
import { createLogger } from '@aztec/foundation/log';
|
|
@@ -41,12 +38,12 @@ export class EpochProvingJob implements Traceable {
|
|
|
41
38
|
private dbProvider: ForkMerkleTreeOperations,
|
|
42
39
|
private epochNumber: bigint,
|
|
43
40
|
private blocks: L2Block[],
|
|
41
|
+
private txs: Tx[],
|
|
44
42
|
private prover: EpochProver,
|
|
45
43
|
private publicProcessorFactory: PublicProcessorFactory,
|
|
46
44
|
private publisher: L1Publisher,
|
|
47
45
|
private l2BlockSource: L2BlockSource,
|
|
48
46
|
private l1ToL2MessageSource: L1ToL2MessageSource,
|
|
49
|
-
private coordination: ProverCoordination,
|
|
50
47
|
private metrics: ProverNodeMetrics,
|
|
51
48
|
private config: { parallelBlockLimit: number } = { parallelBlockLimit: 32 },
|
|
52
49
|
private cleanUp: (job: EpochProvingJob) => Promise<void> = () => Promise.resolve(),
|
|
@@ -92,10 +89,8 @@ export class EpochProvingJob implements Traceable {
|
|
|
92
89
|
|
|
93
90
|
await asyncPool(this.config.parallelBlockLimit, this.blocks, async block => {
|
|
94
91
|
const globalVariables = block.header.globalVariables;
|
|
95
|
-
const
|
|
96
|
-
const txCount = block.body.numberOfTxsIncludingPadded;
|
|
92
|
+
const txs = this.getTxs(block);
|
|
97
93
|
const l1ToL2Messages = await this.getL1ToL2Messages(block);
|
|
98
|
-
const txs = await this.getTxs(txHashes, block.number);
|
|
99
94
|
const previousHeader = await this.getBlockHeader(block.number - 1);
|
|
100
95
|
|
|
101
96
|
this.log.verbose(`Starting processing block ${block.number}`, {
|
|
@@ -115,7 +110,7 @@ export class EpochProvingJob implements Traceable {
|
|
|
115
110
|
// Process public fns
|
|
116
111
|
const db = await this.dbProvider.fork(block.number - 1);
|
|
117
112
|
const publicProcessor = this.publicProcessorFactory.create(db, previousHeader, globalVariables, true);
|
|
118
|
-
const processed = await this.processTxs(publicProcessor, txs
|
|
113
|
+
const processed = await this.processTxs(publicProcessor, txs);
|
|
119
114
|
await this.prover.addTxs(processed);
|
|
120
115
|
await db.close();
|
|
121
116
|
this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
|
|
@@ -162,29 +157,17 @@ export class EpochProvingJob implements Traceable {
|
|
|
162
157
|
return this.l2BlockSource.getBlockHeader(blockNumber);
|
|
163
158
|
}
|
|
164
159
|
|
|
165
|
-
private
|
|
166
|
-
const
|
|
167
|
-
|
|
168
|
-
);
|
|
169
|
-
const notFound = txs.filter(([_, tx]) => !tx);
|
|
170
|
-
if (notFound.length) {
|
|
171
|
-
throw new Error(
|
|
172
|
-
`Txs not found for block ${blockNumber}: ${notFound.map(([txHash]) => txHash.toString()).join(', ')}`,
|
|
173
|
-
);
|
|
174
|
-
}
|
|
175
|
-
return txs.map(([_, tx]) => tx!);
|
|
160
|
+
private getTxs(block: L2Block): Tx[] {
|
|
161
|
+
const txHashes = block.body.txEffects.map(tx => tx.txHash.toBigInt());
|
|
162
|
+
return this.txs.filter(tx => txHashes.includes(tx.getTxHash().toBigInt()));
|
|
176
163
|
}
|
|
177
164
|
|
|
178
165
|
private getL1ToL2Messages(block: L2Block) {
|
|
179
166
|
return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
|
|
180
167
|
}
|
|
181
168
|
|
|
182
|
-
private async processTxs(
|
|
183
|
-
|
|
184
|
-
txs: Tx[],
|
|
185
|
-
totalNumberOfTxs: number,
|
|
186
|
-
): Promise<ProcessedTx[]> {
|
|
187
|
-
const [processedTxs, failedTxs] = await publicProcessor.process(txs, totalNumberOfTxs, new EmptyTxValidator());
|
|
169
|
+
private async processTxs(publicProcessor: PublicProcessor, txs: Tx[]): Promise<ProcessedTx[]> {
|
|
170
|
+
const [processedTxs, failedTxs] = await publicProcessor.process(txs);
|
|
188
171
|
|
|
189
172
|
if (failedTxs.length) {
|
|
190
173
|
throw new Error(
|
package/src/prover-node.ts
CHANGED
|
@@ -10,12 +10,17 @@ import {
|
|
|
10
10
|
type ProverCoordination,
|
|
11
11
|
type ProverNodeApi,
|
|
12
12
|
type Service,
|
|
13
|
+
type Tx,
|
|
14
|
+
type TxHash,
|
|
13
15
|
type WorldStateSynchronizer,
|
|
14
16
|
tryStop,
|
|
15
17
|
} from '@aztec/circuit-types';
|
|
16
18
|
import { type ContractDataSource } from '@aztec/circuits.js';
|
|
19
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
17
20
|
import { compact } from '@aztec/foundation/collection';
|
|
21
|
+
import { TimeoutError } from '@aztec/foundation/error';
|
|
18
22
|
import { createLogger } from '@aztec/foundation/log';
|
|
23
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
19
24
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
20
25
|
import { type Maybe } from '@aztec/foundation/types';
|
|
21
26
|
import { type P2P } from '@aztec/p2p';
|
|
@@ -35,6 +40,9 @@ export type ProverNodeOptions = {
|
|
|
35
40
|
pollingIntervalMs: number;
|
|
36
41
|
maxPendingJobs: number;
|
|
37
42
|
maxParallelBlocksPerEpoch: number;
|
|
43
|
+
txGatheringTimeoutMs: number;
|
|
44
|
+
txGatheringIntervalMs: number;
|
|
45
|
+
txGatheringMaxParallelRequests: number;
|
|
38
46
|
};
|
|
39
47
|
|
|
40
48
|
/**
|
|
@@ -49,6 +57,7 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
49
57
|
|
|
50
58
|
private latestEpochWeAreProving: bigint | undefined;
|
|
51
59
|
private jobs: Map<string, EpochProvingJob> = new Map();
|
|
60
|
+
private cachedEpochData: { epochNumber: bigint; blocks: L2Block[]; txs: Tx[] } | undefined = undefined;
|
|
52
61
|
private options: ProverNodeOptions;
|
|
53
62
|
private metrics: ProverNodeMetrics;
|
|
54
63
|
|
|
@@ -74,6 +83,9 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
74
83
|
pollingIntervalMs: 1_000,
|
|
75
84
|
maxPendingJobs: 100,
|
|
76
85
|
maxParallelBlocksPerEpoch: 32,
|
|
86
|
+
txGatheringTimeoutMs: 60_000,
|
|
87
|
+
txGatheringIntervalMs: 1_000,
|
|
88
|
+
txGatheringMaxParallelRequests: 100,
|
|
77
89
|
...compact(options),
|
|
78
90
|
};
|
|
79
91
|
|
|
@@ -139,13 +151,12 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
139
151
|
*/
|
|
140
152
|
async handleEpochCompleted(epochNumber: bigint): Promise<void> {
|
|
141
153
|
try {
|
|
142
|
-
//
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
return;
|
|
147
|
-
}
|
|
154
|
+
// Gather data for the epoch
|
|
155
|
+
const epochData = await this.gatherEpochData(epochNumber);
|
|
156
|
+
const { blocks } = epochData;
|
|
157
|
+
this.cachedEpochData = { epochNumber, ...epochData };
|
|
148
158
|
|
|
159
|
+
// Construct a quote for the epoch
|
|
149
160
|
const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
|
|
150
161
|
if (!partialQuote) {
|
|
151
162
|
this.log.info(`No quote produced for epoch ${epochNumber}`);
|
|
@@ -256,10 +267,9 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
256
267
|
}
|
|
257
268
|
|
|
258
269
|
// Gather blocks for this epoch
|
|
259
|
-
const
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
}
|
|
270
|
+
const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
|
|
271
|
+
const { blocks, txs } = cachedEpochData ?? (await this.gatherEpochData(epochNumber));
|
|
272
|
+
|
|
263
273
|
const fromBlock = blocks[0].number;
|
|
264
274
|
const toBlock = blocks.at(-1)!.number;
|
|
265
275
|
|
|
@@ -279,15 +289,98 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
279
289
|
return Promise.resolve();
|
|
280
290
|
};
|
|
281
291
|
|
|
282
|
-
const job = this.doCreateEpochProvingJob(epochNumber, blocks, publicProcessorFactory, cleanUp);
|
|
292
|
+
const job = this.doCreateEpochProvingJob(epochNumber, blocks, txs, publicProcessorFactory, cleanUp);
|
|
283
293
|
this.jobs.set(job.getId(), job);
|
|
284
294
|
return job;
|
|
285
295
|
}
|
|
286
296
|
|
|
297
|
+
@trackSpan('ProverNode.gatherEpochData', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))
|
|
298
|
+
private async gatherEpochData(epochNumber: bigint) {
|
|
299
|
+
// Gather blocks for this epoch and their txs
|
|
300
|
+
const blocks = await this.gatherBlocks(epochNumber);
|
|
301
|
+
const txs = await this.gatherTxs(epochNumber, blocks);
|
|
302
|
+
|
|
303
|
+
return { blocks, txs };
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
private async gatherBlocks(epochNumber: bigint) {
|
|
307
|
+
const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
|
|
308
|
+
if (blocks.length === 0) {
|
|
309
|
+
throw new Error(`No blocks found for epoch ${epochNumber}`);
|
|
310
|
+
}
|
|
311
|
+
return blocks;
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
private async gatherTxs(epochNumber: bigint, blocks: L2Block[]) {
|
|
315
|
+
let txsToFind: TxHash[] = [];
|
|
316
|
+
const txHashToBlock = new Map<string, number>();
|
|
317
|
+
const results = new Map<string, Tx>();
|
|
318
|
+
|
|
319
|
+
for (const block of blocks) {
|
|
320
|
+
for (const tx of block.body.txEffects) {
|
|
321
|
+
txsToFind.push(tx.txHash);
|
|
322
|
+
txHashToBlock.set(tx.txHash.toString(), block.number);
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
const totalTxsRequired = txsToFind.length;
|
|
327
|
+
this.log.info(
|
|
328
|
+
`Gathering a total of ${totalTxsRequired} txs for epoch=${epochNumber} made up of ${blocks.length} blocks`,
|
|
329
|
+
{ epochNumber },
|
|
330
|
+
);
|
|
331
|
+
|
|
332
|
+
let iteration = 0;
|
|
333
|
+
try {
|
|
334
|
+
await retryUntil(
|
|
335
|
+
async () => {
|
|
336
|
+
const batch = [...txsToFind];
|
|
337
|
+
txsToFind = [];
|
|
338
|
+
const batchResults = await asyncPool(this.options.txGatheringMaxParallelRequests, batch, async txHash => {
|
|
339
|
+
const tx = await this.coordination.getTxByHash(txHash);
|
|
340
|
+
return [txHash, tx] as const;
|
|
341
|
+
});
|
|
342
|
+
let found = 0;
|
|
343
|
+
for (const [txHash, maybeTx] of batchResults) {
|
|
344
|
+
if (maybeTx) {
|
|
345
|
+
found++;
|
|
346
|
+
results.set(txHash.toString(), maybeTx);
|
|
347
|
+
} else {
|
|
348
|
+
txsToFind.push(txHash);
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
this.log.verbose(
|
|
353
|
+
`Gathered ${found}/${batch.length} txs in iteration ${iteration} for epoch ${epochNumber}. In total ${results.size}/${totalTxsRequired} have been retrieved.`,
|
|
354
|
+
{ epochNumber },
|
|
355
|
+
);
|
|
356
|
+
iteration++;
|
|
357
|
+
|
|
358
|
+
// stop when we found all transactions
|
|
359
|
+
return txsToFind.length === 0;
|
|
360
|
+
},
|
|
361
|
+
'Gather txs',
|
|
362
|
+
this.options.txGatheringTimeoutMs / 1_000,
|
|
363
|
+
this.options.txGatheringIntervalMs / 1_000,
|
|
364
|
+
);
|
|
365
|
+
} catch (err) {
|
|
366
|
+
if (err && err instanceof TimeoutError) {
|
|
367
|
+
const notFoundList = txsToFind
|
|
368
|
+
.map(txHash => `${txHash.toString()} (block ${txHashToBlock.get(txHash.toString())})`)
|
|
369
|
+
.join(', ');
|
|
370
|
+
throw new Error(`Txs not found for epoch ${epochNumber}: ${notFoundList}`);
|
|
371
|
+
} else {
|
|
372
|
+
throw err;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
return Array.from(results.values());
|
|
377
|
+
}
|
|
378
|
+
|
|
287
379
|
/** Extracted for testing purposes. */
|
|
288
380
|
protected doCreateEpochProvingJob(
|
|
289
381
|
epochNumber: bigint,
|
|
290
382
|
blocks: L2Block[],
|
|
383
|
+
txs: Tx[],
|
|
291
384
|
publicProcessorFactory: PublicProcessorFactory,
|
|
292
385
|
cleanUp: () => Promise<void>,
|
|
293
386
|
) {
|
|
@@ -295,12 +388,12 @@ export class ProverNode implements ClaimsMonitorHandler, EpochMonitorHandler, Pr
|
|
|
295
388
|
this.worldState,
|
|
296
389
|
epochNumber,
|
|
297
390
|
blocks,
|
|
391
|
+
txs,
|
|
298
392
|
this.prover.createEpochProver(),
|
|
299
393
|
publicProcessorFactory,
|
|
300
394
|
this.publisher,
|
|
301
395
|
this.l2BlockSource,
|
|
302
396
|
this.l1ToL2MessageSource,
|
|
303
|
-
this.coordination,
|
|
304
397
|
this.metrics,
|
|
305
398
|
{ parallelBlockLimit: this.options.maxParallelBlocksPerEpoch },
|
|
306
399
|
cleanUp,
|