@aztec/sequencer-client 0.0.1-commit.aada20e3 → 0.0.1-commit.b2a5d0dd1
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/client/sequencer-client.d.ts +17 -7
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +63 -30
- package/dest/config.d.ts +26 -7
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +52 -36
- package/dest/global_variable_builder/fee_predictor.d.ts +37 -0
- package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -0
- package/dest/global_variable_builder/fee_predictor.js +128 -0
- package/dest/global_variable_builder/fee_provider.d.ts +21 -0
- package/dest/global_variable_builder/fee_provider.d.ts.map +1 -0
- package/dest/global_variable_builder/fee_provider.js +58 -0
- package/dest/global_variable_builder/global_builder.d.ts +15 -16
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +16 -50
- package/dest/global_variable_builder/index.d.ts +4 -2
- package/dest/global_variable_builder/index.d.ts.map +1 -1
- package/dest/global_variable_builder/index.js +2 -0
- package/dest/publisher/config.d.ts +47 -17
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +121 -42
- package/dest/publisher/index.d.ts +2 -1
- package/dest/publisher/index.d.ts.map +1 -1
- package/dest/publisher/l1_tx_failed_store/factory.d.ts +11 -0
- package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/factory.js +22 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +58 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +1 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +15 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +34 -0
- package/dest/publisher/l1_tx_failed_store/index.d.ts +4 -0
- package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/index.js +2 -0
- package/dest/publisher/sequencer-publisher-factory.d.ts +11 -5
- package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-factory.js +27 -3
- package/dest/publisher/sequencer-publisher.d.ts +75 -48
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +432 -139
- package/dest/sequencer/chain_state_overrides.d.ts +25 -0
- package/dest/sequencer/chain_state_overrides.d.ts.map +1 -0
- package/dest/sequencer/chain_state_overrides.js +39 -0
- package/dest/sequencer/checkpoint_proposal_job.d.ts +40 -10
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +527 -215
- package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts +34 -0
- package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts.map +1 -0
- package/dest/sequencer/checkpoint_proposal_job_metrics.js +72 -0
- package/dest/sequencer/checkpoint_voter.d.ts +1 -2
- package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_voter.js +2 -5
- package/dest/sequencer/events.d.ts +7 -1
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/metrics.d.ts +21 -8
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +110 -21
- package/dest/sequencer/sequencer.d.ts +43 -17
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +158 -96
- package/dest/sequencer/timetable.d.ts +17 -6
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +51 -46
- package/dest/sequencer/types.d.ts +2 -2
- package/dest/sequencer/types.d.ts.map +1 -1
- package/dest/test/index.d.ts +3 -5
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.d.ts +11 -11
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +45 -34
- package/dest/test/utils.d.ts +3 -3
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +5 -4
- package/package.json +27 -28
- package/src/client/sequencer-client.ts +81 -30
- package/src/config.ts +70 -46
- package/src/global_variable_builder/README.md +44 -0
- package/src/global_variable_builder/fee_predictor.ts +172 -0
- package/src/global_variable_builder/fee_provider.ts +75 -0
- package/src/global_variable_builder/global_builder.ts +27 -63
- package/src/global_variable_builder/index.ts +3 -1
- package/src/publisher/config.ts +157 -45
- package/src/publisher/index.ts +3 -0
- package/src/publisher/l1_tx_failed_store/factory.ts +32 -0
- package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +57 -0
- package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +46 -0
- package/src/publisher/l1_tx_failed_store/index.ts +3 -0
- package/src/publisher/sequencer-publisher-factory.ts +38 -9
- package/src/publisher/sequencer-publisher.ts +499 -198
- package/src/sequencer/README.md +83 -13
- package/src/sequencer/chain_state_overrides.ts +87 -0
- package/src/sequencer/checkpoint_proposal_job.ts +672 -236
- package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/events.ts +6 -1
- package/src/sequencer/metrics.ts +124 -26
- package/src/sequencer/sequencer.ts +227 -108
- package/src/sequencer/timetable.ts +70 -57
- package/src/sequencer/types.ts +1 -1
- package/src/test/index.ts +2 -4
- package/src/test/mock_checkpoint_builder.ts +63 -49
- package/src/test/utils.ts +5 -2
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
import {
|
|
3
|
+
CHECKPOINT_ASSEMBLE_TIME,
|
|
4
|
+
CHECKPOINT_INITIALIZATION_TIME,
|
|
5
|
+
type CheckpointTiming,
|
|
6
|
+
DEFAULT_P2P_PROPAGATION_TIME,
|
|
7
|
+
MIN_EXECUTION_TIME,
|
|
8
|
+
createCheckpointTimingModel,
|
|
9
|
+
} from '@aztec/stdlib/timetable';
|
|
2
10
|
|
|
3
|
-
import { DEFAULT_ATTESTATION_PROPAGATION_TIME as DEFAULT_P2P_PROPAGATION_TIME } from '../config.js';
|
|
4
11
|
import { SequencerTooSlowError } from './errors.js';
|
|
5
12
|
import type { SequencerMetrics } from './metrics.js';
|
|
6
13
|
import { SequencerState } from './utils.js';
|
|
7
14
|
|
|
8
|
-
export const MIN_EXECUTION_TIME = 2;
|
|
9
|
-
export const CHECKPOINT_INITIALIZATION_TIME = 1;
|
|
10
|
-
export const CHECKPOINT_ASSEMBLE_TIME = 1;
|
|
11
|
-
|
|
12
15
|
export class SequencerTimetable {
|
|
16
|
+
private readonly checkpointTiming: CheckpointTiming;
|
|
17
|
+
|
|
13
18
|
/**
|
|
14
19
|
* How late into the slot can we be to start working. Computed as the total time needed for assembling and publishing a block,
|
|
15
20
|
* assuming an execution time equal to `minExecutionTime`, subtracted from the slot duration. This means that, if the proposer
|
|
@@ -69,6 +74,15 @@ export class SequencerTimetable {
|
|
|
69
74
|
/** Maximum number of blocks that can be built in this slot configuration */
|
|
70
75
|
public readonly maxNumberOfBlocks: number;
|
|
71
76
|
|
|
77
|
+
/** Whether pipelining is enabled (checkpoint finalization deferred to next slot). */
|
|
78
|
+
public readonly pipelining: boolean;
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* How far into the target slot attestation collection can extend when pipelining.
|
|
82
|
+
* Covers validator re-execution (one block duration) plus one-way attestation return.
|
|
83
|
+
*/
|
|
84
|
+
public readonly pipeliningAttestationGracePeriod: number;
|
|
85
|
+
|
|
72
86
|
constructor(
|
|
73
87
|
opts: {
|
|
74
88
|
ethereumSlotDuration: number;
|
|
@@ -77,61 +91,41 @@ export class SequencerTimetable {
|
|
|
77
91
|
p2pPropagationTime?: number;
|
|
78
92
|
blockDurationMs?: number;
|
|
79
93
|
enforce: boolean;
|
|
94
|
+
pipelining?: boolean;
|
|
80
95
|
},
|
|
81
96
|
private readonly metrics?: SequencerMetrics,
|
|
82
|
-
private readonly log
|
|
97
|
+
private readonly log?: Logger,
|
|
83
98
|
) {
|
|
84
99
|
this.ethereumSlotDuration = opts.ethereumSlotDuration;
|
|
85
100
|
this.aztecSlotDuration = opts.aztecSlotDuration;
|
|
86
101
|
this.l1PublishingTime = opts.l1PublishingTime;
|
|
87
|
-
this.p2pPropagationTime = opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME;
|
|
88
102
|
this.blockDuration = opts.blockDurationMs ? opts.blockDurationMs / 1000 : undefined;
|
|
89
103
|
this.enforce = opts.enforce;
|
|
104
|
+
this.pipelining = opts.pipelining ?? false;
|
|
105
|
+
|
|
106
|
+
this.checkpointTiming = createCheckpointTimingModel({
|
|
107
|
+
aztecSlotDuration: this.aztecSlotDuration,
|
|
108
|
+
ethereumSlotDuration: this.ethereumSlotDuration,
|
|
109
|
+
blockDuration: this.blockDuration,
|
|
110
|
+
l1PublishingTime: this.l1PublishingTime,
|
|
111
|
+
p2pPropagationTime: opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME,
|
|
112
|
+
pipelining: this.pipelining,
|
|
113
|
+
});
|
|
90
114
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
this.checkpointInitializationTime = 0.5;
|
|
96
|
-
this.minExecutionTime = 1;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
// Min execution time cannot be less than the block duration if set
|
|
100
|
-
if (this.blockDuration !== undefined && this.minExecutionTime > this.blockDuration) {
|
|
101
|
-
this.minExecutionTime = this.blockDuration;
|
|
102
|
-
}
|
|
115
|
+
this.p2pPropagationTime = this.checkpointTiming.p2pPropagationTime;
|
|
116
|
+
this.checkpointAssembleTime = this.checkpointTiming.checkpointAssembleTime;
|
|
117
|
+
this.checkpointInitializationTime = this.checkpointTiming.checkpointInitializationTime;
|
|
118
|
+
this.minExecutionTime = this.checkpointTiming.minExecutionTime;
|
|
103
119
|
|
|
104
120
|
// Calculate initialization offset - estimate of time needed for sync + proposer check
|
|
105
121
|
// This is the baseline for all sub-slot deadlines
|
|
106
|
-
this.initializationOffset = this.checkpointInitializationTime;
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
this.
|
|
110
|
-
|
|
111
|
-
this.p2pPropagationTime * 2 + // Round-trip propagation
|
|
112
|
-
this.l1PublishingTime; // L1 publishing
|
|
113
|
-
|
|
114
|
-
// Calculate maximum number of blocks that fit in this slot
|
|
115
|
-
if (!this.blockDuration) {
|
|
116
|
-
this.maxNumberOfBlocks = 1; // Single block per slot
|
|
117
|
-
} else {
|
|
118
|
-
const timeReservedAtEnd =
|
|
119
|
-
this.blockDuration + // Last sub-slot for validator re-execution
|
|
120
|
-
this.checkpointFinalizationTime; // Checkpoint finalization
|
|
121
|
-
const timeAvailableForBlocks = this.aztecSlotDuration - this.initializationOffset - timeReservedAtEnd;
|
|
122
|
-
this.maxNumberOfBlocks = Math.floor(timeAvailableForBlocks / this.blockDuration);
|
|
123
|
-
}
|
|
122
|
+
this.initializationOffset = this.checkpointTiming.checkpointInitializationTime;
|
|
123
|
+
this.checkpointFinalizationTime = this.checkpointTiming.checkpointFinalizationTime;
|
|
124
|
+
this.pipeliningAttestationGracePeriod = this.checkpointTiming.pipeliningAttestationGracePeriod;
|
|
125
|
+
this.maxNumberOfBlocks = this.checkpointTiming.calculateMaxBlocksPerSlot();
|
|
126
|
+
this.initializeDeadline = this.checkpointTiming.initializeDeadline;
|
|
124
127
|
|
|
125
|
-
|
|
126
|
-
const minWorkToDo =
|
|
127
|
-
this.initializationOffset +
|
|
128
|
-
this.minExecutionTime * 2 + // Execution and reexecution
|
|
129
|
-
this.checkpointFinalizationTime;
|
|
130
|
-
|
|
131
|
-
const initializeDeadline = this.aztecSlotDuration - minWorkToDo;
|
|
132
|
-
this.initializeDeadline = initializeDeadline;
|
|
133
|
-
|
|
134
|
-
this.log.verbose(
|
|
128
|
+
this.log?.info(
|
|
135
129
|
`Sequencer timetable initialized with ${this.maxNumberOfBlocks} blocks per slot (${this.enforce ? 'enforced' : 'not enforced'})`,
|
|
136
130
|
{
|
|
137
131
|
ethereumSlotDuration: this.ethereumSlotDuration,
|
|
@@ -143,19 +137,37 @@ export class SequencerTimetable {
|
|
|
143
137
|
blockAssembleTime: this.checkpointAssembleTime,
|
|
144
138
|
initializeDeadline: this.initializeDeadline,
|
|
145
139
|
enforce: this.enforce,
|
|
146
|
-
|
|
140
|
+
pipelining: this.pipelining,
|
|
141
|
+
pipeliningAttestationGracePeriod: this.pipeliningAttestationGracePeriod,
|
|
142
|
+
minWorkToDo: this.checkpointTiming.minimumBuildSlotWork,
|
|
147
143
|
blockDuration: this.blockDuration,
|
|
148
144
|
maxNumberOfBlocks: this.maxNumberOfBlocks,
|
|
149
145
|
},
|
|
150
146
|
);
|
|
151
147
|
|
|
152
|
-
if (initializeDeadline <= 0) {
|
|
148
|
+
if (this.initializeDeadline <= 0) {
|
|
153
149
|
throw new Error(
|
|
154
|
-
`Block proposal initialize deadline cannot be negative (got ${initializeDeadline} from total time needed ${
|
|
150
|
+
`Block proposal initialize deadline cannot be negative (got ${this.initializeDeadline} from total time needed ${this.checkpointTiming.minimumBuildSlotWork} and a slot duration of ${this.aztecSlotDuration}).`,
|
|
155
151
|
);
|
|
156
152
|
}
|
|
157
153
|
}
|
|
158
154
|
|
|
155
|
+
public getCheckpointAssemblyDeadline(): number {
|
|
156
|
+
return this.checkpointTiming.checkpointAssemblyDeadline;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
public getCheckpointAttestationDeadline(): number {
|
|
160
|
+
return this.checkpointTiming.checkpointAttestationDeadline;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
public getCheckpointAttestationStartDeadline(): number {
|
|
164
|
+
return this.checkpointTiming.checkpointAttestationStartDeadline;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
public getCheckpointPublishingDeadline(): number {
|
|
168
|
+
return this.checkpointTiming.checkpointPublishingDeadline;
|
|
169
|
+
}
|
|
170
|
+
|
|
159
171
|
public getMaxAllowedTime(
|
|
160
172
|
state: Extract<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>,
|
|
161
173
|
): undefined;
|
|
@@ -178,10 +190,11 @@ export class SequencerTimetable {
|
|
|
178
190
|
case SequencerState.WAITING_UNTIL_NEXT_BLOCK:
|
|
179
191
|
return this.initializeDeadline + this.checkpointInitializationTime;
|
|
180
192
|
case SequencerState.ASSEMBLING_CHECKPOINT:
|
|
193
|
+
return this.getCheckpointAssemblyDeadline();
|
|
181
194
|
case SequencerState.COLLECTING_ATTESTATIONS:
|
|
182
|
-
return this.
|
|
195
|
+
return this.getCheckpointAttestationStartDeadline();
|
|
183
196
|
case SequencerState.PUBLISHING_CHECKPOINT:
|
|
184
|
-
return this.
|
|
197
|
+
return this.getCheckpointPublishingDeadline();
|
|
185
198
|
default: {
|
|
186
199
|
const _exhaustiveCheck: never = state;
|
|
187
200
|
throw new Error(`Unexpected state: ${state}`);
|
|
@@ -205,7 +218,7 @@ export class SequencerTimetable {
|
|
|
205
218
|
}
|
|
206
219
|
|
|
207
220
|
this.metrics?.recordStateTransitionBufferMs(Math.floor(bufferSeconds * 1000), newState);
|
|
208
|
-
this.log
|
|
221
|
+
this.log?.trace(`Enough time to transition to ${newState}`, { maxAllowedTime, secondsIntoSlot });
|
|
209
222
|
}
|
|
210
223
|
|
|
211
224
|
/**
|
|
@@ -241,7 +254,7 @@ export class SequencerTimetable {
|
|
|
241
254
|
const canStart = available >= this.minExecutionTime;
|
|
242
255
|
const deadline = secondsIntoSlot + available;
|
|
243
256
|
|
|
244
|
-
this.log
|
|
257
|
+
this.log?.verbose(
|
|
245
258
|
`${canStart ? 'Can' : 'Cannot'} start single-block checkpoint at ${secondsIntoSlot}s into slot`,
|
|
246
259
|
{ secondsIntoSlot, maxAllowed, available, deadline },
|
|
247
260
|
);
|
|
@@ -261,7 +274,7 @@ export class SequencerTimetable {
|
|
|
261
274
|
// Found an available sub-slot! Is this the last one?
|
|
262
275
|
const isLastBlock = subSlot === this.maxNumberOfBlocks;
|
|
263
276
|
|
|
264
|
-
this.log
|
|
277
|
+
this.log?.verbose(
|
|
265
278
|
`Can start ${isLastBlock ? 'last block' : 'block'} in sub-slot ${subSlot} with deadline ${deadline}s`,
|
|
266
279
|
{ secondsIntoSlot, deadline, timeUntilDeadline, subSlot, maxBlocks: this.maxNumberOfBlocks },
|
|
267
280
|
);
|
|
@@ -271,7 +284,7 @@ export class SequencerTimetable {
|
|
|
271
284
|
}
|
|
272
285
|
|
|
273
286
|
// No sub-slots available with enough time
|
|
274
|
-
this.log
|
|
287
|
+
this.log?.verbose(`No time left to start any more blocks`, {
|
|
275
288
|
secondsIntoSlot,
|
|
276
289
|
maxBlocks: this.maxNumberOfBlocks,
|
|
277
290
|
initializationOffset: this.initializationOffset,
|
package/src/sequencer/types.ts
CHANGED
|
@@ -2,5 +2,5 @@ import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
|
2
2
|
|
|
3
3
|
export type SequencerRollupConstants = Pick<
|
|
4
4
|
L1RollupConstants,
|
|
5
|
-
'ethereumSlotDuration' | 'l1GenesisTime' | 'slotDuration'
|
|
5
|
+
'ethereumSlotDuration' | 'l1GenesisTime' | 'slotDuration' | 'rollupManaLimit'
|
|
6
6
|
>;
|
package/src/test/index.ts
CHANGED
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
2
2
|
import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
3
3
|
import type { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
4
4
|
import type { FullNodeCheckpointsBuilder, ValidatorClient } from '@aztec/validator-client';
|
|
5
5
|
|
|
6
6
|
import { SequencerClient } from '../client/sequencer-client.js';
|
|
7
7
|
import type { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
8
|
-
import type { SequencerPublisher } from '../publisher/sequencer-publisher.js';
|
|
9
8
|
import { Sequencer } from '../sequencer/sequencer.js';
|
|
10
9
|
import type { SequencerTimetable } from '../sequencer/timetable.js';
|
|
11
10
|
|
|
12
11
|
class TestSequencer_ extends Sequencer {
|
|
13
12
|
declare public publicProcessorFactory: PublicProcessorFactory;
|
|
14
13
|
declare public timetable: SequencerTimetable;
|
|
15
|
-
declare public publisher: SequencerPublisher;
|
|
16
14
|
declare public publisherFactory: SequencerPublisherFactory;
|
|
17
15
|
declare public validatorClient: ValidatorClient;
|
|
18
16
|
declare public checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
@@ -22,7 +20,7 @@ export type TestSequencer = TestSequencer_;
|
|
|
22
20
|
|
|
23
21
|
class TestSequencerClient_ extends SequencerClient {
|
|
24
22
|
declare public sequencer: TestSequencer;
|
|
25
|
-
declare public publisherManager: PublisherManager<
|
|
23
|
+
declare public publisherManager: PublisherManager<L1TxUtils>;
|
|
26
24
|
}
|
|
27
25
|
|
|
28
26
|
export type TestSequencerClient = TestSequencerClient_;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { type BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
1
|
+
import { type BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { unfreeze } from '@aztec/foundation/types';
|
|
3
4
|
import { L2Block } from '@aztec/stdlib/block';
|
|
4
5
|
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
5
|
-
import { Gas } from '@aztec/stdlib/gas';
|
|
6
6
|
import type {
|
|
7
|
+
BlockBuilderOptions,
|
|
7
8
|
FullNodeBlockBuilderConfig,
|
|
8
9
|
ICheckpointBlockBuilder,
|
|
9
10
|
ICheckpointsBuilder,
|
|
10
11
|
MerkleTreeWriteOperations,
|
|
11
|
-
PublicProcessorLimits,
|
|
12
12
|
} from '@aztec/stdlib/interfaces/server';
|
|
13
13
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
14
14
|
import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
|
|
@@ -32,7 +32,7 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
32
32
|
public buildBlockCalls: Array<{
|
|
33
33
|
blockNumber: BlockNumber;
|
|
34
34
|
timestamp: bigint;
|
|
35
|
-
opts:
|
|
35
|
+
opts: BlockBuilderOptions;
|
|
36
36
|
}> = [];
|
|
37
37
|
/** Track all consumed transaction hashes across buildBlock calls */
|
|
38
38
|
public consumedTxHashes: Set<string> = new Set();
|
|
@@ -74,7 +74,7 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
74
74
|
pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
|
|
75
75
|
blockNumber: BlockNumber,
|
|
76
76
|
timestamp: bigint,
|
|
77
|
-
opts:
|
|
77
|
+
opts: BlockBuilderOptions,
|
|
78
78
|
): Promise<BuildBlockInCheckpointResult> {
|
|
79
79
|
this.buildBlockCalls.push({ blockNumber, timestamp, opts });
|
|
80
80
|
|
|
@@ -86,8 +86,10 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
86
86
|
let usedTxs: Tx[];
|
|
87
87
|
|
|
88
88
|
if (this.blockProvider) {
|
|
89
|
-
// Dynamic mode: get block from provider
|
|
90
|
-
block = this.blockProvider();
|
|
89
|
+
// Dynamic mode: get block from provider, cloning to avoid shared references across multiple buildBlock calls
|
|
90
|
+
block = L2Block.fromBuffer(this.blockProvider().toBuffer());
|
|
91
|
+
block.header.globalVariables.blockNumber = blockNumber;
|
|
92
|
+
await block.header.recomputeHash();
|
|
91
93
|
usedTxs = [];
|
|
92
94
|
this.builtBlocks.push(block);
|
|
93
95
|
} else {
|
|
@@ -113,81 +115,79 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
113
115
|
|
|
114
116
|
return {
|
|
115
117
|
block,
|
|
116
|
-
publicGas: Gas.empty(),
|
|
117
118
|
publicProcessorDuration: 0,
|
|
118
119
|
numTxs: block?.body?.txEffects?.length ?? usedTxs.length,
|
|
119
120
|
usedTxs,
|
|
120
121
|
failedTxs: [],
|
|
121
|
-
usedTxBlobFields: block?.body?.txEffects?.reduce((sum, tx) => sum + tx.getNumBlobFields(), 0) ?? 0,
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
completeCheckpoint(): Promise<Checkpoint> {
|
|
126
126
|
this.completeCheckpointCalled = true;
|
|
127
127
|
const allBlocks = this.blockProvider ? this.builtBlocks : this.blocks;
|
|
128
|
-
|
|
129
|
-
// Create a CheckpointHeader from the last block's header for testing
|
|
130
|
-
const checkpointHeader = this.createCheckpointHeader(lastBlock);
|
|
131
|
-
return Promise.resolve(
|
|
132
|
-
new Checkpoint(
|
|
133
|
-
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
134
|
-
checkpointHeader,
|
|
135
|
-
allBlocks,
|
|
136
|
-
this.checkpointNumber,
|
|
137
|
-
),
|
|
138
|
-
);
|
|
128
|
+
return this.buildCheckpoint(allBlocks);
|
|
139
129
|
}
|
|
140
130
|
|
|
141
131
|
getCheckpoint(): Promise<Checkpoint> {
|
|
142
132
|
this.getCheckpointCalled = true;
|
|
143
133
|
const builtBlocks = this.blockProvider ? this.builtBlocks : this.blocks.slice(0, this.blockIndex);
|
|
144
|
-
|
|
145
|
-
if (!lastBlock) {
|
|
134
|
+
if (builtBlocks.length === 0) {
|
|
146
135
|
throw new Error('No blocks built yet');
|
|
147
136
|
}
|
|
148
|
-
|
|
149
|
-
const checkpointHeader = this.createCheckpointHeader(lastBlock);
|
|
150
|
-
return Promise.resolve(
|
|
151
|
-
new Checkpoint(
|
|
152
|
-
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
153
|
-
checkpointHeader,
|
|
154
|
-
builtBlocks,
|
|
155
|
-
this.checkpointNumber,
|
|
156
|
-
),
|
|
157
|
-
);
|
|
137
|
+
return this.buildCheckpoint(builtBlocks);
|
|
158
138
|
}
|
|
159
139
|
|
|
160
|
-
/**
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
140
|
+
/** Builds a structurally valid Checkpoint from a list of blocks, fixing up indexes and archive chaining. */
|
|
141
|
+
private async buildCheckpoint(blocks: L2Block[]): Promise<Checkpoint> {
|
|
142
|
+
// Fix up indexWithinCheckpoint and archive chaining so the checkpoint passes structural validation.
|
|
143
|
+
for (let i = 0; i < blocks.length; i++) {
|
|
144
|
+
blocks[i].indexWithinCheckpoint = IndexWithinCheckpoint(i);
|
|
145
|
+
if (i > 0) {
|
|
146
|
+
unfreeze(blocks[i].header).lastArchive = blocks[i - 1].archive;
|
|
147
|
+
await blocks[i].header.recomputeHash();
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
const firstBlock = blocks[0];
|
|
152
|
+
const lastBlock = blocks[blocks.length - 1];
|
|
153
|
+
const gv = firstBlock.header.globalVariables;
|
|
154
|
+
|
|
155
|
+
const checkpointHeader = CheckpointHeader.empty({
|
|
156
|
+
lastArchiveRoot: firstBlock.header.lastArchive.root,
|
|
157
|
+
blockHeadersHash: Fr.random(),
|
|
170
158
|
slotNumber: gv.slotNumber,
|
|
171
159
|
timestamp: gv.timestamp,
|
|
172
160
|
coinbase: gv.coinbase,
|
|
173
161
|
feeRecipient: gv.feeRecipient,
|
|
174
162
|
gasFees: gv.gasFees,
|
|
175
|
-
totalManaUsed: header.totalManaUsed,
|
|
163
|
+
totalManaUsed: lastBlock.header.totalManaUsed,
|
|
176
164
|
});
|
|
165
|
+
|
|
166
|
+
return new Checkpoint(
|
|
167
|
+
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
168
|
+
checkpointHeader,
|
|
169
|
+
blocks,
|
|
170
|
+
this.checkpointNumber,
|
|
171
|
+
);
|
|
177
172
|
}
|
|
178
173
|
|
|
179
|
-
/**
|
|
180
|
-
|
|
181
|
-
this.blocks = [];
|
|
174
|
+
/** Resets per-checkpoint state (built blocks, consumed txs) while preserving config (blockProvider, seeded blocks). */
|
|
175
|
+
resetCheckpointState(): void {
|
|
182
176
|
this.builtBlocks = [];
|
|
183
|
-
this.usedTxsPerBlock = [];
|
|
184
177
|
this.blockIndex = 0;
|
|
185
|
-
this.buildBlockCalls = [];
|
|
186
178
|
this.consumedTxHashes.clear();
|
|
187
179
|
this.completeCheckpointCalled = false;
|
|
188
180
|
this.getCheckpointCalled = false;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/** Reset for reuse in another test */
|
|
184
|
+
reset(): void {
|
|
185
|
+
this.blocks = [];
|
|
186
|
+
this.usedTxsPerBlock = [];
|
|
187
|
+
this.buildBlockCalls = [];
|
|
189
188
|
this.errorOnBuild = undefined;
|
|
190
189
|
this.blockProvider = undefined;
|
|
190
|
+
this.resetCheckpointState();
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
193
|
|
|
@@ -205,6 +205,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
205
205
|
constants: CheckpointGlobalVariables;
|
|
206
206
|
l1ToL2Messages: Fr[];
|
|
207
207
|
previousCheckpointOutHashes: Fr[];
|
|
208
|
+
feeAssetPriceModifier: bigint;
|
|
208
209
|
}> = [];
|
|
209
210
|
public openCheckpointCalls: Array<{
|
|
210
211
|
checkpointNumber: CheckpointNumber;
|
|
@@ -212,6 +213,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
212
213
|
l1ToL2Messages: Fr[];
|
|
213
214
|
previousCheckpointOutHashes: Fr[];
|
|
214
215
|
existingBlocks: L2Block[];
|
|
216
|
+
feeAssetPriceModifier: bigint;
|
|
215
217
|
}> = [];
|
|
216
218
|
public updateConfigCalls: Array<Partial<FullNodeBlockBuilderConfig>> = [];
|
|
217
219
|
|
|
@@ -247,6 +249,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
247
249
|
slotDuration: 24,
|
|
248
250
|
l1ChainId: 1,
|
|
249
251
|
rollupVersion: 1,
|
|
252
|
+
rollupManaLimit: 200_000_000,
|
|
250
253
|
};
|
|
251
254
|
}
|
|
252
255
|
|
|
@@ -257,15 +260,24 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
257
260
|
startCheckpoint(
|
|
258
261
|
checkpointNumber: CheckpointNumber,
|
|
259
262
|
constants: CheckpointGlobalVariables,
|
|
263
|
+
feeAssetPriceModifier: bigint,
|
|
260
264
|
l1ToL2Messages: Fr[],
|
|
261
265
|
previousCheckpointOutHashes: Fr[],
|
|
262
266
|
_fork: MerkleTreeWriteOperations,
|
|
263
267
|
): Promise<ICheckpointBlockBuilder> {
|
|
264
|
-
this.startCheckpointCalls.push({
|
|
268
|
+
this.startCheckpointCalls.push({
|
|
269
|
+
checkpointNumber,
|
|
270
|
+
constants,
|
|
271
|
+
l1ToL2Messages,
|
|
272
|
+
previousCheckpointOutHashes,
|
|
273
|
+
feeAssetPriceModifier,
|
|
274
|
+
});
|
|
265
275
|
|
|
266
276
|
if (!this.checkpointBuilder) {
|
|
267
277
|
// Auto-create a builder if none was set
|
|
268
278
|
this.checkpointBuilder = new MockCheckpointBuilder(constants, checkpointNumber);
|
|
279
|
+
} else {
|
|
280
|
+
this.checkpointBuilder.resetCheckpointState();
|
|
269
281
|
}
|
|
270
282
|
|
|
271
283
|
return Promise.resolve(this.checkpointBuilder);
|
|
@@ -274,6 +286,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
274
286
|
openCheckpoint(
|
|
275
287
|
checkpointNumber: CheckpointNumber,
|
|
276
288
|
constants: CheckpointGlobalVariables,
|
|
289
|
+
feeAssetPriceModifier: bigint,
|
|
277
290
|
l1ToL2Messages: Fr[],
|
|
278
291
|
previousCheckpointOutHashes: Fr[],
|
|
279
292
|
_fork: MerkleTreeWriteOperations,
|
|
@@ -285,6 +298,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
285
298
|
l1ToL2Messages,
|
|
286
299
|
previousCheckpointOutHashes,
|
|
287
300
|
existingBlocks,
|
|
301
|
+
feeAssetPriceModifier,
|
|
288
302
|
});
|
|
289
303
|
|
|
290
304
|
if (!this.checkpointBuilder) {
|
package/src/test/utils.ts
CHANGED
|
@@ -56,6 +56,7 @@ export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Pr
|
|
|
56
56
|
export function mockPendingTxs(p2p: MockProxy<P2P>, txs: Tx[]): void {
|
|
57
57
|
p2p.getPendingTxCount.mockResolvedValue(txs.length);
|
|
58
58
|
p2p.iteratePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
|
|
59
|
+
p2p.iterateEligiblePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
|
|
59
60
|
}
|
|
60
61
|
|
|
61
62
|
/**
|
|
@@ -118,10 +119,11 @@ export function createCheckpointProposal(
|
|
|
118
119
|
block: L2Block,
|
|
119
120
|
checkpointSignature: Signature,
|
|
120
121
|
blockSignature?: Signature,
|
|
122
|
+
feeAssetPriceModifier: bigint = 0n,
|
|
121
123
|
): CheckpointProposal {
|
|
122
124
|
const txHashes = block.body.txEffects.map(tx => tx.txHash);
|
|
123
125
|
const checkpointHeader = createCheckpointHeaderFromBlock(block);
|
|
124
|
-
return new CheckpointProposal(checkpointHeader, block.archive.root, checkpointSignature, {
|
|
126
|
+
return new CheckpointProposal(checkpointHeader, block.archive.root, feeAssetPriceModifier, checkpointSignature, {
|
|
125
127
|
blockHeader: block.header,
|
|
126
128
|
indexWithinCheckpoint: block.indexWithinCheckpoint,
|
|
127
129
|
txHashes,
|
|
@@ -138,9 +140,10 @@ export function createCheckpointAttestation(
|
|
|
138
140
|
block: L2Block,
|
|
139
141
|
signature: Signature,
|
|
140
142
|
sender: EthAddress,
|
|
143
|
+
feeAssetPriceModifier: bigint = 0n,
|
|
141
144
|
): CheckpointAttestation {
|
|
142
145
|
const checkpointHeader = createCheckpointHeaderFromBlock(block);
|
|
143
|
-
const payload = new ConsensusPayload(checkpointHeader, block.archive.root);
|
|
146
|
+
const payload = new ConsensusPayload(checkpointHeader, block.archive.root, feeAssetPriceModifier);
|
|
144
147
|
const attestation = new CheckpointAttestation(payload, signature, signature);
|
|
145
148
|
// Set sender directly for testing (bypasses signature recovery)
|
|
146
149
|
(attestation as any).sender = sender;
|