@aztec/prover-client 0.0.1-commit.9ef841308 → 0.0.1-commit.a5db02d
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 +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +4 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts +1 -1
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
- package/dest/light/lightweight_checkpoint_builder.js +15 -5
- package/dest/mocks/test_context.d.ts +11 -11
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +21 -26
- package/dest/orchestrator/block-building-helpers.d.ts +1 -1
- package/dest/orchestrator/checkpoint-proving-state.d.ts +20 -36
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/checkpoint-proving-state.js +22 -120
- package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts +161 -0
- package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts.map +1 -0
- package/dest/orchestrator/{orchestrator.js → checkpoint-sub-tree-orchestrator.js} +267 -451
- package/dest/orchestrator/chonk-cache.d.ts +39 -0
- package/dest/orchestrator/chonk-cache.d.ts.map +1 -0
- package/dest/orchestrator/chonk-cache.js +80 -0
- package/dest/orchestrator/index.d.ts +4 -2
- package/dest/orchestrator/index.d.ts.map +1 -1
- package/dest/orchestrator/index.js +3 -1
- package/dest/orchestrator/proving-scheduler.d.ts +81 -0
- package/dest/orchestrator/proving-scheduler.d.ts.map +1 -0
- package/dest/orchestrator/proving-scheduler.js +120 -0
- package/dest/orchestrator/top-tree-orchestrator.d.ts +88 -0
- package/dest/orchestrator/top-tree-orchestrator.d.ts.map +1 -0
- package/dest/orchestrator/top-tree-orchestrator.js +232 -0
- package/dest/orchestrator/top-tree-proving-state.d.ts +61 -0
- package/dest/orchestrator/top-tree-proving-state.d.ts.map +1 -0
- package/dest/orchestrator/top-tree-proving-state.js +185 -0
- package/dest/orchestrator/tx-proving-state.d.ts +3 -3
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/prover-client/prover-client.d.ts +61 -4
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +54 -7
- package/dest/proving_broker/broker_prover_facade.d.ts +3 -3
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +5 -0
- package/dest/proving_broker/config.d.ts +8 -72
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +2 -2
- package/dest/proving_broker/index.d.ts +2 -1
- package/dest/proving_broker/index.d.ts.map +1 -1
- package/dest/proving_broker/index.js +1 -0
- package/dest/proving_broker/proving_broker.d.ts +2 -2
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +92 -24
- package/dest/proving_broker/proving_broker_database/memory.d.ts +3 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +10 -0
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +13 -2
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +32 -5
- package/dest/proving_broker/proving_broker_database.d.ts +15 -1
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/dest/proving_broker/rpc.d.ts +3 -1
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +80 -24
- package/dest/test/epoch_settlement.d.ts +36 -0
- package/dest/test/epoch_settlement.d.ts.map +1 -0
- package/dest/test/epoch_settlement.js +52 -0
- package/dest/test/index.d.ts +2 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +1 -0
- package/dest/test/mock_prover.d.ts +1 -1
- package/dest/test/mock_prover.js +2 -2
- package/package.json +19 -18
- package/src/config.ts +5 -0
- package/src/light/lightweight_checkpoint_builder.ts +16 -6
- package/src/mocks/test_context.ts +21 -40
- package/src/orchestrator/checkpoint-proving-state.ts +21 -162
- package/src/orchestrator/{orchestrator.ts → checkpoint-sub-tree-orchestrator.ts} +415 -661
- package/src/orchestrator/chonk-cache.ts +99 -0
- package/src/orchestrator/index.ts +8 -1
- package/src/orchestrator/proving-scheduler.ts +160 -0
- package/src/orchestrator/top-tree-orchestrator.ts +384 -0
- package/src/orchestrator/top-tree-proving-state.ts +219 -0
- package/src/orchestrator/tx-proving-state.ts +3 -3
- package/src/prover-client/prover-client.ts +128 -18
- package/src/proving_broker/broker_prover_facade.ts +4 -2
- package/src/proving_broker/config.ts +2 -1
- package/src/proving_broker/index.ts +1 -0
- package/src/proving_broker/proving_broker.ts +84 -22
- package/src/proving_broker/proving_broker_database/memory.ts +10 -0
- package/src/proving_broker/proving_broker_database/persisted.ts +42 -7
- package/src/proving_broker/proving_broker_database.ts +16 -0
- package/src/proving_broker/rpc.ts +36 -24
- package/src/test/epoch_settlement.ts +82 -0
- package/src/test/index.ts +1 -0
- package/src/test/mock_prover.ts +2 -2
- package/dest/orchestrator/epoch-proving-state.d.ts +0 -75
- package/dest/orchestrator/epoch-proving-state.d.ts.map +0 -1
- package/dest/orchestrator/epoch-proving-state.js +0 -269
- package/dest/orchestrator/orchestrator.d.ts +0 -130
- package/dest/orchestrator/orchestrator.d.ts.map +0 -1
- package/dest/prover-client/server-epoch-prover.d.ts +0 -32
- package/dest/prover-client/server-epoch-prover.d.ts.map +0 -1
- package/dest/prover-client/server-epoch-prover.js +0 -40
- package/src/orchestrator/epoch-proving-state.ts +0 -380
- package/src/prover-client/server-epoch-prover.ts +0 -69
|
@@ -41,7 +41,11 @@ class SingleEpochDatabase {
|
|
|
41
41
|
return this.store.estimateSize();
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
async batchWrite(
|
|
44
|
+
async batchWrite(
|
|
45
|
+
jobs: ProvingJob[],
|
|
46
|
+
results: Array<[ProvingJobId, ProvingJobSettledResult]>,
|
|
47
|
+
deletedResults: ProvingJobId[] = [],
|
|
48
|
+
) {
|
|
45
49
|
await this.store.transactionAsync(async () => {
|
|
46
50
|
for (const job of jobs) {
|
|
47
51
|
await this.jobs.set(job.id, jsonStringify(job));
|
|
@@ -49,6 +53,11 @@ class SingleEpochDatabase {
|
|
|
49
53
|
for (const [id, result] of results) {
|
|
50
54
|
await this.jobResults.set(id, jsonStringify(result));
|
|
51
55
|
}
|
|
56
|
+
// Deletes are applied after sets so that, if a set and a delete for the same id land in one
|
|
57
|
+
// batch (e.g. an abort immediately followed by a revive's result-delete), the delete wins.
|
|
58
|
+
for (const id of deletedResults) {
|
|
59
|
+
await this.jobResults.delete(id);
|
|
60
|
+
}
|
|
52
61
|
});
|
|
53
62
|
}
|
|
54
63
|
|
|
@@ -66,6 +75,11 @@ class SingleEpochDatabase {
|
|
|
66
75
|
await this.jobResults.set(id, jsonStringify(result));
|
|
67
76
|
}
|
|
68
77
|
|
|
78
|
+
async setProvingJobAborted(id: ProvingJobId): Promise<void> {
|
|
79
|
+
const result: ProvingJobSettledResult = { status: 'aborted' };
|
|
80
|
+
await this.jobResults.set(id, jsonStringify(result));
|
|
81
|
+
}
|
|
82
|
+
|
|
69
83
|
async setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void> {
|
|
70
84
|
const result: ProvingJobSettledResult = { status: 'fulfilled', value };
|
|
71
85
|
await this.jobResults.set(id, jsonStringify(result));
|
|
@@ -80,10 +94,19 @@ class SingleEpochDatabase {
|
|
|
80
94
|
}
|
|
81
95
|
}
|
|
82
96
|
|
|
97
|
+
/**
|
|
98
|
+
* An item queued for a batched write. A {@link ProvingJob} adds/updates a job; a `[id, result]`
|
|
99
|
+
* tuple sets a job's settled result; a `[id, undefined]` tuple deletes a job's result. Deletes ride
|
|
100
|
+
* the same queue as writes so they stay FIFO-ordered against them: a revive's result-delete must
|
|
101
|
+
* land after the abort that preceded it, otherwise a still-queued abort could flush later and
|
|
102
|
+
* resurrect the cancelled state on disk.
|
|
103
|
+
*/
|
|
104
|
+
type BrokerWrite = ProvingJob | [ProvingJobId, ProvingJobSettledResult | undefined];
|
|
105
|
+
|
|
83
106
|
export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
84
107
|
private metrics: LmdbMetrics;
|
|
85
108
|
|
|
86
|
-
private batchQueue: BatchQueue<
|
|
109
|
+
private batchQueue: BatchQueue<BrokerWrite, number>;
|
|
87
110
|
|
|
88
111
|
public readonly tracer: Tracer;
|
|
89
112
|
|
|
@@ -112,12 +135,16 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
112
135
|
}
|
|
113
136
|
|
|
114
137
|
// exposed for testing
|
|
115
|
-
public async commitWrites(items: Array<
|
|
138
|
+
public async commitWrites(items: Array<BrokerWrite>, epochNumber: number) {
|
|
116
139
|
const jobsToAdd = items.filter((item): item is ProvingJob => 'id' in item);
|
|
117
|
-
const
|
|
140
|
+
const resultOps = items.filter((item): item is [ProvingJobId, ProvingJobSettledResult | undefined] =>
|
|
141
|
+
Array.isArray(item),
|
|
142
|
+
);
|
|
143
|
+
const resultsToSet = resultOps.filter((op): op is [ProvingJobId, ProvingJobSettledResult] => op[1] !== undefined);
|
|
144
|
+
const resultsToDelete = resultOps.filter(op => op[1] === undefined).map(([id]) => id);
|
|
118
145
|
|
|
119
146
|
const db = await this.getEpochDatabase(EpochNumber(epochNumber));
|
|
120
|
-
await db.batchWrite(jobsToAdd,
|
|
147
|
+
await db.batchWrite(jobsToAdd, resultsToSet, resultsToDelete);
|
|
121
148
|
}
|
|
122
149
|
|
|
123
150
|
private async estimateSize() {
|
|
@@ -154,7 +181,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
154
181
|
const db = await openVersionedStoreAt(
|
|
155
182
|
fullDirectory,
|
|
156
183
|
SingleEpochDatabase.SCHEMA_VERSION,
|
|
157
|
-
config.
|
|
184
|
+
config.rollupAddress,
|
|
158
185
|
config.dataStoreMapSizeKb,
|
|
159
186
|
);
|
|
160
187
|
const epochDb = new SingleEpochDatabase(db);
|
|
@@ -207,6 +234,14 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
207
234
|
return this.batchQueue.put([id, { status: 'rejected', reason }], getEpochFromProvingJobId(id));
|
|
208
235
|
}
|
|
209
236
|
|
|
237
|
+
setProvingJobAborted(id: ProvingJobId): Promise<void> {
|
|
238
|
+
return this.batchQueue.put([id, { status: 'aborted' }], getEpochFromProvingJobId(id));
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
deleteProvingJobResult(id: ProvingJobId): Promise<void> {
|
|
242
|
+
return this.batchQueue.put([id, undefined], getEpochFromProvingJobId(id));
|
|
243
|
+
}
|
|
244
|
+
|
|
210
245
|
setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void> {
|
|
211
246
|
return this.batchQueue.put([id, { status: 'fulfilled', value }], getEpochFromProvingJobId(id));
|
|
212
247
|
}
|
|
@@ -222,7 +257,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
222
257
|
const db = await openVersionedStoreAt(
|
|
223
258
|
newEpochDirectory,
|
|
224
259
|
SingleEpochDatabase.SCHEMA_VERSION,
|
|
225
|
-
this.config.
|
|
260
|
+
this.config.rollupAddress,
|
|
226
261
|
this.config.dataStoreMapSizeKb,
|
|
227
262
|
);
|
|
228
263
|
epochDb = new SingleEpochDatabase(db);
|
|
@@ -38,6 +38,22 @@ export interface ProvingBrokerDatabase {
|
|
|
38
38
|
*/
|
|
39
39
|
setProvingJobError(id: ProvingJobId, err: string): Promise<void>;
|
|
40
40
|
|
|
41
|
+
/**
|
|
42
|
+
* Records that a proof request was cancelled. Unlike a result or error this is not terminal:
|
|
43
|
+
* re-enqueuing the same job id revives it, so the aborted state can survive a restart without
|
|
44
|
+
* permanently blocking the proof.
|
|
45
|
+
* @param id - The ID of the cancelled proof request
|
|
46
|
+
*/
|
|
47
|
+
setProvingJobAborted(id: ProvingJobId): Promise<void>;
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Clears any stored result for a proof request, returning it to the pending state while keeping
|
|
51
|
+
* the job itself. Used when reviving an aborted job so the revival is persisted and a restart
|
|
52
|
+
* cannot resurrect the stale aborted state.
|
|
53
|
+
* @param id - The ID of the proof request whose result should be cleared
|
|
54
|
+
*/
|
|
55
|
+
deleteProvingJobResult(id: ProvingJobId): Promise<void>;
|
|
56
|
+
|
|
41
57
|
/**
|
|
42
58
|
* Closes the database
|
|
43
59
|
*/
|
|
@@ -18,6 +18,15 @@ import { makeTracedFetch } from '@aztec/telemetry-client';
|
|
|
18
18
|
|
|
19
19
|
import { z } from 'zod';
|
|
20
20
|
|
|
21
|
+
/** Indefinite backoff for broker communication: 1, 1, 1, 2, 4, 4, 4, ... seconds. */
|
|
22
|
+
export function* proverBrokerBackoff() {
|
|
23
|
+
const v = [1, 1, 1, 2, 4];
|
|
24
|
+
let i = 0;
|
|
25
|
+
while (true) {
|
|
26
|
+
yield v[Math.min(i++, v.length - 1)];
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
21
30
|
const ProvingJobFilterSchema = z.object({
|
|
22
31
|
allowList: z.array(z.nativeEnum(ProvingRequestType)),
|
|
23
32
|
});
|
|
@@ -28,26 +37,29 @@ const GetProvingJobResponse = z.object({
|
|
|
28
37
|
});
|
|
29
38
|
|
|
30
39
|
export const ProvingJobProducerSchema: ApiSchemaFor<ProvingJobProducer> = {
|
|
31
|
-
enqueueProvingJob: z.function(
|
|
32
|
-
getProvingJobStatus: z.function(
|
|
33
|
-
cancelProvingJob: z.function(
|
|
34
|
-
getCompletedJobs: z.function(
|
|
40
|
+
enqueueProvingJob: z.function({ input: z.tuple([ProvingJob]), output: ProvingJobStatus }),
|
|
41
|
+
getProvingJobStatus: z.function({ input: z.tuple([ProvingJobId]), output: ProvingJobStatus }),
|
|
42
|
+
cancelProvingJob: z.function({ input: z.tuple([ProvingJobId]), output: z.void() }),
|
|
43
|
+
getCompletedJobs: z.function({ input: z.tuple([z.array(ProvingJobId)]), output: z.array(ProvingJobId) }),
|
|
35
44
|
};
|
|
36
45
|
|
|
37
46
|
export const ProvingJobConsumerSchema: ApiSchemaFor<ProvingJobConsumer> = {
|
|
38
|
-
getProvingJob: z.function(
|
|
39
|
-
|
|
40
|
-
.
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
.
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
getProvingJob: z.function({
|
|
48
|
+
input: z.tuple([optional(ProvingJobFilterSchema)]),
|
|
49
|
+
output: GetProvingJobResponse.optional(),
|
|
50
|
+
}),
|
|
51
|
+
reportProvingJobError: z.function({
|
|
52
|
+
input: z.tuple([ProvingJobId, z.string(), optional(z.boolean()), optional(ProvingJobFilterSchema)]),
|
|
53
|
+
output: GetProvingJobResponse.optional(),
|
|
54
|
+
}),
|
|
55
|
+
reportProvingJobProgress: z.function({
|
|
56
|
+
input: z.tuple([ProvingJobId, z.number(), optional(ProvingJobFilterSchema)]),
|
|
57
|
+
output: GetProvingJobResponse.optional(),
|
|
58
|
+
}),
|
|
59
|
+
reportProvingJobSuccess: z.function({
|
|
60
|
+
input: z.tuple([ProvingJobId, ProofUri, optional(ProvingJobFilterSchema)]),
|
|
61
|
+
output: GetProvingJobResponse.optional(),
|
|
62
|
+
}),
|
|
51
63
|
};
|
|
52
64
|
|
|
53
65
|
export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {
|
|
@@ -56,10 +68,10 @@ export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {
|
|
|
56
68
|
};
|
|
57
69
|
|
|
58
70
|
export const ProvingJobBrokerDebugSchema: ApiSchemaFor<ProvingJobBrokerDebug> = {
|
|
59
|
-
replayProvingJob: z
|
|
60
|
-
.
|
|
61
|
-
|
|
62
|
-
|
|
71
|
+
replayProvingJob: z.function({
|
|
72
|
+
input: z.tuple([ProvingJobId, z.nativeEnum(ProvingRequestType), EpochNumberSchema, ProofUri]),
|
|
73
|
+
output: ProvingJobStatus,
|
|
74
|
+
}),
|
|
63
75
|
};
|
|
64
76
|
|
|
65
77
|
export const ProvingJobBrokerSchemaWithDebug: ApiSchemaFor<ProvingJobBroker & ProvingJobBrokerDebug> = {
|
|
@@ -70,7 +82,7 @@ export const ProvingJobBrokerSchemaWithDebug: ApiSchemaFor<ProvingJobBroker & Pr
|
|
|
70
82
|
export function createProvingJobBrokerClient(
|
|
71
83
|
url: string,
|
|
72
84
|
versions: Partial<ComponentsVersions>,
|
|
73
|
-
fetch = makeTracedFetch(
|
|
85
|
+
fetch = makeTracedFetch(proverBrokerBackoff, false),
|
|
74
86
|
): ProvingJobBroker {
|
|
75
87
|
return createSafeJsonRpcClient(url, ProvingJobBrokerSchema, {
|
|
76
88
|
namespaceMethods: 'proverBroker',
|
|
@@ -82,7 +94,7 @@ export function createProvingJobBrokerClient(
|
|
|
82
94
|
export function createProvingJobProducerClient(
|
|
83
95
|
url: string,
|
|
84
96
|
versions: Partial<ComponentsVersions>,
|
|
85
|
-
fetch = makeTracedFetch(
|
|
97
|
+
fetch = makeTracedFetch(proverBrokerBackoff, false),
|
|
86
98
|
): ProvingJobProducer {
|
|
87
99
|
return createSafeJsonRpcClient(url, ProvingJobProducerSchema, {
|
|
88
100
|
namespaceMethods: 'provingJobProducer',
|
|
@@ -94,7 +106,7 @@ export function createProvingJobProducerClient(
|
|
|
94
106
|
export function createProvingJobConsumerClient(
|
|
95
107
|
url: string,
|
|
96
108
|
versions: Partial<ComponentsVersions>,
|
|
97
|
-
fetch = makeTracedFetch(
|
|
109
|
+
fetch = makeTracedFetch(proverBrokerBackoff, false),
|
|
98
110
|
): ProvingJobConsumer {
|
|
99
111
|
return createSafeJsonRpcClient(url, ProvingJobConsumerSchema, {
|
|
100
112
|
namespaceMethods: 'provingJobConsumer',
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import type { RollupCheatCodes } from '@aztec/ethereum/test';
|
|
2
|
+
import type { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
5
|
+
import type { L2BlockSource } from '@aztec/stdlib/block';
|
|
6
|
+
import { computeEpochOutHash } from '@aztec/stdlib/messaging';
|
|
7
|
+
|
|
8
|
+
/** Arguments for {@link settleEpochOutbox}. */
|
|
9
|
+
export type SettleEpochOutboxArgs = {
|
|
10
|
+
/** Cheat codes used to write the computed out hash directly into the L1 Outbox storage. */
|
|
11
|
+
rollupCheatCodes: RollupCheatCodes;
|
|
12
|
+
/** Source of checkpointed L2 blocks for the epoch being settled. */
|
|
13
|
+
l2BlockSource: L2BlockSource;
|
|
14
|
+
/** Epoch to settle. */
|
|
15
|
+
epoch: EpochNumber;
|
|
16
|
+
/**
|
|
17
|
+
* When set, only checkpoints up to and including this number are covered. Used to settle a partial
|
|
18
|
+
* epoch (the AZIP-14 Outbox keeps one root per `numCheckpointsInEpoch`, so a prefix of an epoch can
|
|
19
|
+
* be settled and consumed before the epoch completes). When omitted, every checkpointed block in the
|
|
20
|
+
* epoch is covered.
|
|
21
|
+
*/
|
|
22
|
+
maxCheckpoint?: CheckpointNumber;
|
|
23
|
+
log: Logger;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Computes the epoch out hash over the checkpointed blocks of an epoch (optionally only up to
|
|
28
|
+
* `maxCheckpoint`) and writes it into the L1 Outbox via cheat codes. This is the synthetic,
|
|
29
|
+
* no-prover equivalent of an epoch root proof landing on L1: it makes the L2-to-L1 messages in the
|
|
30
|
+
* covered checkpoints consumable. It does NOT advance the rollup's proven tip — callers
|
|
31
|
+
* `markAsProven` separately so a single prove call can settle multiple epochs before marking proven.
|
|
32
|
+
*
|
|
33
|
+
* Used by the test-only proving drivers: the `AutomineSequencer`'s auto-settle loop and the standalone
|
|
34
|
+
* `EpochTestSettler`. Lives here (rather than in either consumer) so both share one implementation.
|
|
35
|
+
*
|
|
36
|
+
* @returns The last checkpoint number covered by the settled range, or `undefined` if the epoch has
|
|
37
|
+
* no checkpointed blocks (within the `maxCheckpoint` bound).
|
|
38
|
+
*/
|
|
39
|
+
export async function settleEpochOutbox({
|
|
40
|
+
rollupCheatCodes,
|
|
41
|
+
l2BlockSource,
|
|
42
|
+
epoch,
|
|
43
|
+
maxCheckpoint,
|
|
44
|
+
log,
|
|
45
|
+
}: SettleEpochOutboxArgs): Promise<CheckpointNumber | undefined> {
|
|
46
|
+
let blocks = await l2BlockSource.getBlocks({ epoch, onlyCheckpointed: true });
|
|
47
|
+
if (maxCheckpoint !== undefined) {
|
|
48
|
+
blocks = blocks.filter(block => block.checkpointNumber <= maxCheckpoint);
|
|
49
|
+
}
|
|
50
|
+
if (blocks.length === 0) {
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
log.info(
|
|
55
|
+
`Settling epoch ${epoch}${maxCheckpoint !== undefined ? ` up to checkpoint ${maxCheckpoint}` : ''} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`,
|
|
56
|
+
{ epoch, maxCheckpoint, blocks: blocks.map(block => block.toBlockInfo()) },
|
|
57
|
+
);
|
|
58
|
+
|
|
59
|
+
const messagesInEpoch: Fr[][][][] = [];
|
|
60
|
+
// Undefined (not SlotNumber.ZERO) so a first checkpointed block at slot 0 still opens checkpoint 0.
|
|
61
|
+
let previousSlotNumber: SlotNumber | undefined;
|
|
62
|
+
let checkpointIndex = -1;
|
|
63
|
+
|
|
64
|
+
for (const block of blocks) {
|
|
65
|
+
const slotNumber = block.header.globalVariables.slotNumber;
|
|
66
|
+
if (slotNumber !== previousSlotNumber) {
|
|
67
|
+
checkpointIndex++;
|
|
68
|
+
messagesInEpoch[checkpointIndex] = [];
|
|
69
|
+
previousSlotNumber = slotNumber;
|
|
70
|
+
}
|
|
71
|
+
messagesInEpoch[checkpointIndex].push(block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs));
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const outHash = computeEpochOutHash(messagesInEpoch);
|
|
75
|
+
if (!outHash.isZero()) {
|
|
76
|
+
await rollupCheatCodes.insertOutbox(epoch, messagesInEpoch.length, outHash.toBigInt());
|
|
77
|
+
} else {
|
|
78
|
+
log.info(`No L2 to L1 messages in epoch ${epoch}`, { epoch });
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
return blocks.at(-1)?.checkpointNumber;
|
|
82
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { settleEpochOutbox, type SettleEpochOutboxArgs } from './epoch_settlement.js';
|
package/src/test/mock_prover.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
AVM_V2_PROOF_LENGTH_IN_FIELDS,
|
|
3
3
|
NESTED_RECURSIVE_PROOF_LENGTH,
|
|
4
4
|
NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
|
|
5
5
|
RECURSIVE_PROOF_LENGTH,
|
|
@@ -104,7 +104,7 @@ export class MockProver implements ServerCircuitProver {
|
|
|
104
104
|
constructor() {}
|
|
105
105
|
|
|
106
106
|
getAvmProof(_inputs: AvmCircuitInputs, _signal?: AbortSignal, _epochNumber?: number) {
|
|
107
|
-
return Promise.resolve(makeEmptyRecursiveProof(
|
|
107
|
+
return Promise.resolve(makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS));
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
getBaseParityProof(_inputs: ParityBasePrivateInputs, _signal?: AbortSignal, _epochNumber?: number) {
|
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
import { BatchedBlob, type FinalBlobBatchingChallenges } from '@aztec/blob-lib';
|
|
2
|
-
import { type ARCHIVE_HEIGHT, type L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
|
|
3
|
-
import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
4
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
|
-
import type { Tuple } from '@aztec/foundation/serialize';
|
|
6
|
-
import { type TreeNodeLocation } from '@aztec/foundation/trees';
|
|
7
|
-
import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
|
|
8
|
-
import type { Proof } from '@aztec/stdlib/proofs';
|
|
9
|
-
import { CheckpointConstantData, CheckpointMergeRollupPrivateInputs, CheckpointPaddingRollupPrivateInputs, CheckpointRollupPublicInputs, PublicChonkVerifierPublicInputs, RootRollupPrivateInputs, type RootRollupPublicInputs } from '@aztec/stdlib/rollup';
|
|
10
|
-
import { AppendOnlyTreeSnapshot, type MerkleTreeId } from '@aztec/stdlib/trees';
|
|
11
|
-
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
12
|
-
import { CheckpointProvingState } from './checkpoint-proving-state.js';
|
|
13
|
-
export type TreeSnapshots = Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
|
|
14
|
-
export type ProvingResult = {
|
|
15
|
-
status: 'success';
|
|
16
|
-
} | {
|
|
17
|
-
status: 'failure';
|
|
18
|
-
reason: string;
|
|
19
|
-
};
|
|
20
|
-
/**
|
|
21
|
-
* The current state of the proving schedule for an epoch.
|
|
22
|
-
* Contains the raw inputs and intermediate state to generate every constituent proof in the tree.
|
|
23
|
-
* Carries an identifier so we can identify if the proving state is discarded and a new one started.
|
|
24
|
-
* Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
|
|
25
|
-
*/
|
|
26
|
-
export declare class EpochProvingState {
|
|
27
|
-
#private;
|
|
28
|
-
readonly epochNumber: EpochNumber;
|
|
29
|
-
readonly totalNumCheckpoints: number;
|
|
30
|
-
private readonly finalBlobBatchingChallenges;
|
|
31
|
-
private onCheckpointBlobAccumulatorSet;
|
|
32
|
-
private completionCallback;
|
|
33
|
-
private rejectionCallback;
|
|
34
|
-
private checkpointProofs;
|
|
35
|
-
private checkpointPaddingProof;
|
|
36
|
-
private rootRollupProof;
|
|
37
|
-
private checkpoints;
|
|
38
|
-
private startBlobAccumulator;
|
|
39
|
-
private endBlobAccumulator;
|
|
40
|
-
private finalBatchedBlob;
|
|
41
|
-
private provingStateLifecycle;
|
|
42
|
-
readonly cachedChonkVerifierProofs: Map<string, Promise<PublicInputsAndRecursiveProof<PublicChonkVerifierPublicInputs, 480>>>;
|
|
43
|
-
constructor(epochNumber: EpochNumber, totalNumCheckpoints: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges, onCheckpointBlobAccumulatorSet: (checkpoint: CheckpointProvingState) => Promise<void>, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void);
|
|
44
|
-
startNewCheckpoint(checkpointIndex: number, constants: CheckpointConstantData, totalNumBlocks: number, previousBlockHeader: BlockHeader, lastArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, l1ToL2Messages: Fr[], lastL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>): CheckpointProvingState;
|
|
45
|
-
getCheckpointProvingState(index: number): CheckpointProvingState | undefined;
|
|
46
|
-
getCheckpointProvingStateByBlockNumber(blockNumber: BlockNumber): CheckpointProvingState | undefined;
|
|
47
|
-
getBlockProvingStateByBlockNumber(blockNumber: BlockNumber): import("./block-proving-state.js").BlockProvingState | undefined;
|
|
48
|
-
verifyState(): boolean;
|
|
49
|
-
isAcceptingCheckpoints(): boolean;
|
|
50
|
-
setCheckpointRootRollupProof(checkpointIndex: number, provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
|
|
51
|
-
tryStartProvingCheckpointMerge(location: TreeNodeLocation): boolean;
|
|
52
|
-
setCheckpointMergeRollupProof(location: TreeNodeLocation, provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
53
|
-
tryStartProvingRootRollup(): boolean;
|
|
54
|
-
setRootRollupProof(provingOutput: PublicInputsAndRecursiveProof<RootRollupPublicInputs>): void;
|
|
55
|
-
tryStartProvingPaddingCheckpoint(): boolean;
|
|
56
|
-
setCheckpointPaddingProof(provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
57
|
-
accumulateCheckpointOutHashes(): Promise<void>;
|
|
58
|
-
setBlobAccumulators(): Promise<void>;
|
|
59
|
-
finalizeBatchedBlob(): Promise<void>;
|
|
60
|
-
getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
|
|
61
|
-
getCheckpointMergeRollupInputs(mergeLocation: TreeNodeLocation): CheckpointMergeRollupPrivateInputs;
|
|
62
|
-
getRootRollupInputs(): RootRollupPrivateInputs;
|
|
63
|
-
getPaddingCheckpointInputs(): CheckpointPaddingRollupPrivateInputs;
|
|
64
|
-
getEpochProofResult(): {
|
|
65
|
-
proof: Proof;
|
|
66
|
-
publicInputs: RootRollupPublicInputs;
|
|
67
|
-
batchedBlobInputs: BatchedBlob;
|
|
68
|
-
};
|
|
69
|
-
isReadyForCheckpointMerge(location: TreeNodeLocation): boolean;
|
|
70
|
-
isReadyForRootRollup(): boolean;
|
|
71
|
-
cancel(): void;
|
|
72
|
-
reject(reason: string): void;
|
|
73
|
-
resolve(result: ProvingResult): void;
|
|
74
|
-
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtcHJvdmluZy1zdGF0ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yY2hlc3RyYXRvci9lcG9jaC1wcm92aW5nLXN0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQTBCLEtBQUssMkJBQTJCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RyxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBQ25CLEtBQUssNkNBQTZDLEVBRWxELEtBQUsseUNBQXlDLEVBRS9DLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUVMLEtBQUssZ0JBQWdCLEVBR3RCLE1BQU0seUJBQXlCLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLGtDQUFrQyxFQUNsQyxvQ0FBb0MsRUFDcEMsNEJBQTRCLEVBQzVCLCtCQUErQixFQUMvQix1QkFBdUIsRUFDdkIsS0FBSyxzQkFBc0IsRUFDNUIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsS0FBSyxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUlwRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV2RSxNQUFNLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FB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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/epoch-proving-state.ts"],"names":[],"mappings":"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"}
|