@aztec/sequencer-client 0.0.1-commit.2ed92850 → 0.0.1-commit.3100065
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/README.md +281 -21
- package/dest/client/sequencer-client.d.ts +34 -11
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +77 -39
- package/dest/config.d.ts +32 -6
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +94 -46
- 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 +138 -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 +80 -0
- package/dest/global_variable_builder/global_builder.d.ts +13 -28
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +9 -66
- 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 +51 -17
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +131 -42
- package/dest/publisher/index.d.ts +2 -1
- package/dest/publisher/index.d.ts.map +1 -1
- package/dest/publisher/l1_to_l2_messaging.d.ts +21 -0
- package/dest/publisher/l1_to_l2_messaging.d.ts.map +1 -0
- package/dest/publisher/l1_to_l2_messaging.js +70 -0
- 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-bundle-simulator.d.ts +96 -0
- package/dest/publisher/sequencer-bundle-simulator.d.ts.map +1 -0
- package/dest/publisher/sequencer-bundle-simulator.js +198 -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-metrics.d.ts +1 -1
- package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-metrics.js +12 -4
- package/dest/publisher/sequencer-publisher.d.ts +107 -68
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +545 -363
- package/dest/publisher/write_json.d.ts +11 -0
- package/dest/publisher/write_json.d.ts.map +1 -0
- package/dest/publisher/write_json.js +57 -0
- package/dest/sequencer/automine/automine_factory.d.ts +56 -0
- package/dest/sequencer/automine/automine_factory.d.ts.map +1 -0
- package/dest/sequencer/automine/automine_factory.js +85 -0
- package/dest/sequencer/automine/automine_sequencer.d.ts +189 -0
- package/dest/sequencer/automine/automine_sequencer.d.ts.map +1 -0
- package/dest/sequencer/automine/automine_sequencer.js +690 -0
- package/dest/sequencer/automine/index.d.ts +3 -0
- package/dest/sequencer/automine/index.d.ts.map +1 -0
- package/dest/sequencer/automine/index.js +2 -0
- package/dest/sequencer/checkpoint_proposal_job.d.ts +101 -22
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +922 -286
- 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/errors.d.ts +1 -8
- package/dest/sequencer/errors.d.ts.map +1 -1
- package/dest/sequencer/errors.js +0 -9
- package/dest/sequencer/events.d.ts +62 -5
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/metrics.d.ts +23 -8
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +142 -36
- package/dest/sequencer/requests_tracker.d.ts +22 -0
- package/dest/sequencer/requests_tracker.d.ts.map +1 -0
- package/dest/sequencer/requests_tracker.js +33 -0
- package/dest/sequencer/sequencer.d.ts +181 -44
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +614 -216
- package/dest/sequencer/types.d.ts +2 -2
- package/dest/sequencer/types.d.ts.map +1 -1
- package/dest/test/index.d.ts +5 -7
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.d.ts +12 -12
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +45 -36
- package/dest/test/utils.d.ts +17 -3
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +28 -9
- package/package.json +28 -28
- package/src/client/sequencer-client.ts +110 -47
- package/src/config.ts +120 -55
- package/src/global_variable_builder/README.md +44 -0
- package/src/global_variable_builder/fee_predictor.ts +182 -0
- package/src/global_variable_builder/fee_provider.ts +97 -0
- package/src/global_variable_builder/global_builder.ts +20 -89
- package/src/global_variable_builder/index.ts +3 -1
- package/src/publisher/config.ts +173 -40
- package/src/publisher/index.ts +3 -0
- package/src/publisher/l1_to_l2_messaging.ts +85 -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-bundle-simulator.ts +254 -0
- package/src/publisher/sequencer-publisher-factory.ts +38 -9
- package/src/publisher/sequencer-publisher-metrics.ts +7 -3
- package/src/publisher/sequencer-publisher.ts +635 -460
- package/src/publisher/write_json.ts +78 -0
- package/src/sequencer/automine/README.md +60 -0
- package/src/sequencer/automine/automine_factory.ts +152 -0
- package/src/sequencer/automine/automine_sequencer.ts +796 -0
- package/src/sequencer/automine/index.ts +6 -0
- package/src/sequencer/checkpoint_proposal_job.ts +1133 -326
- package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/errors.ts +0 -15
- package/src/sequencer/events.ts +66 -5
- package/src/sequencer/metrics.ts +164 -39
- package/src/sequencer/requests_tracker.ts +43 -0
- package/src/sequencer/sequencer.ts +729 -242
- package/src/sequencer/types.ts +1 -1
- package/src/test/index.ts +4 -6
- package/src/test/mock_checkpoint_builder.ts +65 -53
- package/src/test/utils.ts +64 -10
- package/dest/sequencer/timetable.d.ts +0 -90
- package/dest/sequencer/timetable.d.ts.map +0 -1
- package/dest/sequencer/timetable.js +0 -226
- package/src/sequencer/README.md +0 -531
- package/src/sequencer/timetable.ts +0 -282
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' | 'epochDuration'
|
|
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
|
+
import type { ProposerTimetable } from '@aztec/stdlib/timetable';
|
|
4
5
|
import type { FullNodeCheckpointsBuilder, ValidatorClient } from '@aztec/validator-client';
|
|
5
6
|
|
|
6
7
|
import { SequencerClient } from '../client/sequencer-client.js';
|
|
7
8
|
import type { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
8
|
-
import type { SequencerPublisher } from '../publisher/sequencer-publisher.js';
|
|
9
9
|
import { Sequencer } from '../sequencer/sequencer.js';
|
|
10
|
-
import type { SequencerTimetable } from '../sequencer/timetable.js';
|
|
11
10
|
|
|
12
11
|
class TestSequencer_ extends Sequencer {
|
|
13
12
|
declare public publicProcessorFactory: PublicProcessorFactory;
|
|
14
|
-
declare public timetable:
|
|
15
|
-
declare public publisher: SequencerPublisher;
|
|
13
|
+
declare public timetable: ProposerTimetable;
|
|
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,20 +1,19 @@
|
|
|
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 {
|
|
3
|
+
import { unfreeze } from '@aztec/foundation/types';
|
|
4
4
|
import { L2Block } from '@aztec/stdlib/block';
|
|
5
5
|
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
6
|
-
import { Gas } from '@aztec/stdlib/gas';
|
|
7
6
|
import type {
|
|
7
|
+
BlockBuilderOptions,
|
|
8
8
|
FullNodeBlockBuilderConfig,
|
|
9
9
|
ICheckpointBlockBuilder,
|
|
10
10
|
ICheckpointsBuilder,
|
|
11
11
|
MerkleTreeWriteOperations,
|
|
12
|
-
PublicProcessorLimits,
|
|
13
12
|
} from '@aztec/stdlib/interfaces/server';
|
|
14
13
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
15
14
|
import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
|
|
16
15
|
import type { CheckpointGlobalVariables, Tx } from '@aztec/stdlib/tx';
|
|
17
|
-
import type {
|
|
16
|
+
import type { BuildBlockInCheckpointResult } from '@aztec/validator-client';
|
|
18
17
|
|
|
19
18
|
/**
|
|
20
19
|
* A fake CheckpointBuilder for testing that implements the same interface as the real one.
|
|
@@ -33,7 +32,7 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
33
32
|
public buildBlockCalls: Array<{
|
|
34
33
|
blockNumber: BlockNumber;
|
|
35
34
|
timestamp: bigint;
|
|
36
|
-
opts:
|
|
35
|
+
opts: BlockBuilderOptions;
|
|
37
36
|
}> = [];
|
|
38
37
|
/** Track all consumed transaction hashes across buildBlock calls */
|
|
39
38
|
public consumedTxHashes: Set<string> = new Set();
|
|
@@ -75,8 +74,8 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
75
74
|
pendingTxs: Iterable<Tx> | AsyncIterable<Tx>,
|
|
76
75
|
blockNumber: BlockNumber,
|
|
77
76
|
timestamp: bigint,
|
|
78
|
-
opts:
|
|
79
|
-
): Promise<
|
|
77
|
+
opts: BlockBuilderOptions,
|
|
78
|
+
): Promise<BuildBlockInCheckpointResult> {
|
|
80
79
|
this.buildBlockCalls.push({ blockNumber, timestamp, opts });
|
|
81
80
|
|
|
82
81
|
if (this.errorOnBuild) {
|
|
@@ -87,8 +86,10 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
87
86
|
let usedTxs: Tx[];
|
|
88
87
|
|
|
89
88
|
if (this.blockProvider) {
|
|
90
|
-
// Dynamic mode: get block from provider
|
|
91
|
-
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();
|
|
92
93
|
usedTxs = [];
|
|
93
94
|
this.builtBlocks.push(block);
|
|
94
95
|
} else {
|
|
@@ -114,82 +115,79 @@ export class MockCheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
114
115
|
|
|
115
116
|
return {
|
|
116
117
|
block,
|
|
117
|
-
publicGas: Gas.empty(),
|
|
118
118
|
publicProcessorDuration: 0,
|
|
119
119
|
numTxs: block?.body?.txEffects?.length ?? usedTxs.length,
|
|
120
|
-
blockBuildingTimer: new Timer(),
|
|
121
120
|
usedTxs,
|
|
122
121
|
failedTxs: [],
|
|
123
|
-
usedTxBlobFields: block?.body?.txEffects?.reduce((sum, tx) => sum + tx.getNumBlobFields(), 0) ?? 0,
|
|
124
122
|
};
|
|
125
123
|
}
|
|
126
124
|
|
|
127
125
|
completeCheckpoint(): Promise<Checkpoint> {
|
|
128
126
|
this.completeCheckpointCalled = true;
|
|
129
127
|
const allBlocks = this.blockProvider ? this.builtBlocks : this.blocks;
|
|
130
|
-
|
|
131
|
-
// Create a CheckpointHeader from the last block's header for testing
|
|
132
|
-
const checkpointHeader = this.createCheckpointHeader(lastBlock);
|
|
133
|
-
return Promise.resolve(
|
|
134
|
-
new Checkpoint(
|
|
135
|
-
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
136
|
-
checkpointHeader,
|
|
137
|
-
allBlocks,
|
|
138
|
-
this.checkpointNumber,
|
|
139
|
-
),
|
|
140
|
-
);
|
|
128
|
+
return this.buildCheckpoint(allBlocks);
|
|
141
129
|
}
|
|
142
130
|
|
|
143
131
|
getCheckpoint(): Promise<Checkpoint> {
|
|
144
132
|
this.getCheckpointCalled = true;
|
|
145
133
|
const builtBlocks = this.blockProvider ? this.builtBlocks : this.blocks.slice(0, this.blockIndex);
|
|
146
|
-
|
|
147
|
-
if (!lastBlock) {
|
|
134
|
+
if (builtBlocks.length === 0) {
|
|
148
135
|
throw new Error('No blocks built yet');
|
|
149
136
|
}
|
|
150
|
-
|
|
151
|
-
const checkpointHeader = this.createCheckpointHeader(lastBlock);
|
|
152
|
-
return Promise.resolve(
|
|
153
|
-
new Checkpoint(
|
|
154
|
-
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
155
|
-
checkpointHeader,
|
|
156
|
-
builtBlocks,
|
|
157
|
-
this.checkpointNumber,
|
|
158
|
-
),
|
|
159
|
-
);
|
|
137
|
+
return this.buildCheckpoint(builtBlocks);
|
|
160
138
|
}
|
|
161
139
|
|
|
162
|
-
/**
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
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(),
|
|
172
158
|
slotNumber: gv.slotNumber,
|
|
173
159
|
timestamp: gv.timestamp,
|
|
174
160
|
coinbase: gv.coinbase,
|
|
175
161
|
feeRecipient: gv.feeRecipient,
|
|
176
162
|
gasFees: gv.gasFees,
|
|
177
|
-
totalManaUsed: header.totalManaUsed,
|
|
163
|
+
totalManaUsed: lastBlock.header.totalManaUsed,
|
|
178
164
|
});
|
|
165
|
+
|
|
166
|
+
return new Checkpoint(
|
|
167
|
+
makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1),
|
|
168
|
+
checkpointHeader,
|
|
169
|
+
blocks,
|
|
170
|
+
this.checkpointNumber,
|
|
171
|
+
);
|
|
179
172
|
}
|
|
180
173
|
|
|
181
|
-
/**
|
|
182
|
-
|
|
183
|
-
this.blocks = [];
|
|
174
|
+
/** Resets per-checkpoint state (built blocks, consumed txs) while preserving config (blockProvider, seeded blocks). */
|
|
175
|
+
resetCheckpointState(): void {
|
|
184
176
|
this.builtBlocks = [];
|
|
185
|
-
this.usedTxsPerBlock = [];
|
|
186
177
|
this.blockIndex = 0;
|
|
187
|
-
this.buildBlockCalls = [];
|
|
188
178
|
this.consumedTxHashes.clear();
|
|
189
179
|
this.completeCheckpointCalled = false;
|
|
190
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 = [];
|
|
191
188
|
this.errorOnBuild = undefined;
|
|
192
189
|
this.blockProvider = undefined;
|
|
190
|
+
this.resetCheckpointState();
|
|
193
191
|
}
|
|
194
192
|
}
|
|
195
193
|
|
|
@@ -207,6 +205,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
207
205
|
constants: CheckpointGlobalVariables;
|
|
208
206
|
l1ToL2Messages: Fr[];
|
|
209
207
|
previousCheckpointOutHashes: Fr[];
|
|
208
|
+
feeAssetPriceModifier: bigint;
|
|
210
209
|
}> = [];
|
|
211
210
|
public openCheckpointCalls: Array<{
|
|
212
211
|
checkpointNumber: CheckpointNumber;
|
|
@@ -214,6 +213,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
214
213
|
l1ToL2Messages: Fr[];
|
|
215
214
|
previousCheckpointOutHashes: Fr[];
|
|
216
215
|
existingBlocks: L2Block[];
|
|
216
|
+
feeAssetPriceModifier: bigint;
|
|
217
217
|
}> = [];
|
|
218
218
|
public updateConfigCalls: Array<Partial<FullNodeBlockBuilderConfig>> = [];
|
|
219
219
|
|
|
@@ -249,6 +249,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
249
249
|
slotDuration: 24,
|
|
250
250
|
l1ChainId: 1,
|
|
251
251
|
rollupVersion: 1,
|
|
252
|
+
rollupManaLimit: 200_000_000,
|
|
252
253
|
};
|
|
253
254
|
}
|
|
254
255
|
|
|
@@ -259,15 +260,24 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
259
260
|
startCheckpoint(
|
|
260
261
|
checkpointNumber: CheckpointNumber,
|
|
261
262
|
constants: CheckpointGlobalVariables,
|
|
263
|
+
feeAssetPriceModifier: bigint,
|
|
262
264
|
l1ToL2Messages: Fr[],
|
|
263
265
|
previousCheckpointOutHashes: Fr[],
|
|
264
266
|
_fork: MerkleTreeWriteOperations,
|
|
265
267
|
): Promise<ICheckpointBlockBuilder> {
|
|
266
|
-
this.startCheckpointCalls.push({
|
|
268
|
+
this.startCheckpointCalls.push({
|
|
269
|
+
checkpointNumber,
|
|
270
|
+
constants,
|
|
271
|
+
l1ToL2Messages,
|
|
272
|
+
previousCheckpointOutHashes,
|
|
273
|
+
feeAssetPriceModifier,
|
|
274
|
+
});
|
|
267
275
|
|
|
268
276
|
if (!this.checkpointBuilder) {
|
|
269
277
|
// Auto-create a builder if none was set
|
|
270
278
|
this.checkpointBuilder = new MockCheckpointBuilder(constants, checkpointNumber);
|
|
279
|
+
} else {
|
|
280
|
+
this.checkpointBuilder.resetCheckpointState();
|
|
271
281
|
}
|
|
272
282
|
|
|
273
283
|
return Promise.resolve(this.checkpointBuilder);
|
|
@@ -276,6 +286,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
276
286
|
openCheckpoint(
|
|
277
287
|
checkpointNumber: CheckpointNumber,
|
|
278
288
|
constants: CheckpointGlobalVariables,
|
|
289
|
+
feeAssetPriceModifier: bigint,
|
|
279
290
|
l1ToL2Messages: Fr[],
|
|
280
291
|
previousCheckpointOutHashes: Fr[],
|
|
281
292
|
_fork: MerkleTreeWriteOperations,
|
|
@@ -287,6 +298,7 @@ export class MockCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
287
298
|
l1ToL2Messages,
|
|
288
299
|
previousCheckpointOutHashes,
|
|
289
300
|
existingBlocks,
|
|
301
|
+
feeAssetPriceModifier,
|
|
290
302
|
});
|
|
291
303
|
|
|
292
304
|
if (!this.checkpointBuilder) {
|
package/src/test/utils.ts
CHANGED
|
@@ -8,9 +8,22 @@ import { Signature } from '@aztec/foundation/eth-signature';
|
|
|
8
8
|
import type { P2P } from '@aztec/p2p';
|
|
9
9
|
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
10
10
|
import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
|
|
11
|
+
import { DEFAULT_BLOCK_DURATION_MS } from '@aztec/stdlib/config';
|
|
12
|
+
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
11
13
|
import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
|
|
12
14
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
13
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
TEST_COORDINATION_SIGNATURE_CONTEXT,
|
|
17
|
+
makeAppendOnlyTreeSnapshot,
|
|
18
|
+
mockTxForRollup,
|
|
19
|
+
} from '@aztec/stdlib/testing';
|
|
20
|
+
import {
|
|
21
|
+
DEFAULT_CHECKPOINT_PROPOSAL_INIT_TIME,
|
|
22
|
+
DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME,
|
|
23
|
+
DEFAULT_MIN_BLOCK_DURATION,
|
|
24
|
+
DEFAULT_P2P_PROPAGATION_TIME,
|
|
25
|
+
ProposerTimetable,
|
|
26
|
+
} from '@aztec/stdlib/timetable';
|
|
14
27
|
import { BlockHeader, GlobalVariables, type Tx, makeProcessedTxFromPrivateOnlyTx } from '@aztec/stdlib/tx';
|
|
15
28
|
|
|
16
29
|
import type { MockProxy } from 'jest-mock-extended';
|
|
@@ -18,6 +31,28 @@ import type { MockProxy } from 'jest-mock-extended';
|
|
|
18
31
|
// Re-export mock classes from their dedicated file
|
|
19
32
|
export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint_builder.js';
|
|
20
33
|
|
|
34
|
+
/**
|
|
35
|
+
* Builds a {@link ProposerTimetable} for tests from a millisecond block duration and optional budgets,
|
|
36
|
+
* filling unset budgets with the shared `DEFAULT_*` values the sequencer config layer applies. Mirrors how
|
|
37
|
+
* the sequencer constructs its timetable so tests exercise the same budget resolution.
|
|
38
|
+
*/
|
|
39
|
+
export function makeProposerTimetable(opts: {
|
|
40
|
+
l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration' | 'ethereumSlotDuration'>;
|
|
41
|
+
blockDurationMs?: number;
|
|
42
|
+
minBlockDuration?: number;
|
|
43
|
+
p2pPropagationTime?: number;
|
|
44
|
+
checkpointProposalPrepareTime?: number;
|
|
45
|
+
}): ProposerTimetable {
|
|
46
|
+
return new ProposerTimetable({
|
|
47
|
+
l1Constants: opts.l1Constants,
|
|
48
|
+
blockDuration: (opts.blockDurationMs ?? DEFAULT_BLOCK_DURATION_MS) / 1000,
|
|
49
|
+
minBlockDuration: opts.minBlockDuration ?? DEFAULT_MIN_BLOCK_DURATION,
|
|
50
|
+
p2pPropagationTime: opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME,
|
|
51
|
+
checkpointProposalPrepareTime: opts.checkpointProposalPrepareTime ?? DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME,
|
|
52
|
+
checkpointProposalInitTime: DEFAULT_CHECKPOINT_PROPOSAL_INIT_TIME,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
|
|
21
56
|
/**
|
|
22
57
|
* Creates a mock transaction with a specific seed for deterministic testing
|
|
23
58
|
*/
|
|
@@ -55,7 +90,9 @@ export async function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Pr
|
|
|
55
90
|
*/
|
|
56
91
|
export function mockPendingTxs(p2p: MockProxy<P2P>, txs: Tx[]): void {
|
|
57
92
|
p2p.getPendingTxCount.mockResolvedValue(txs.length);
|
|
93
|
+
p2p.hasEligiblePendingTxs.mockImplementation(minCount => Promise.resolve(txs.length >= minCount));
|
|
58
94
|
p2p.iteratePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
|
|
95
|
+
p2p.iterateEligiblePendingTxs.mockImplementation(() => mockTxIterator(Promise.resolve(txs)));
|
|
59
96
|
}
|
|
60
97
|
|
|
61
98
|
/**
|
|
@@ -93,6 +130,7 @@ function createCheckpointHeaderFromBlock(block: L2Block): CheckpointHeader {
|
|
|
93
130
|
gv.feeRecipient,
|
|
94
131
|
gv.gasFees,
|
|
95
132
|
block.header.totalManaUsed,
|
|
133
|
+
block.header.totalFees,
|
|
96
134
|
);
|
|
97
135
|
}
|
|
98
136
|
|
|
@@ -108,6 +146,7 @@ export function createBlockProposal(block: L2Block, signature: Signature): Block
|
|
|
108
146
|
block.archive.root,
|
|
109
147
|
txHashes,
|
|
110
148
|
signature,
|
|
149
|
+
TEST_COORDINATION_SIGNATURE_CONTEXT,
|
|
111
150
|
);
|
|
112
151
|
}
|
|
113
152
|
|
|
@@ -118,15 +157,23 @@ export function createCheckpointProposal(
|
|
|
118
157
|
block: L2Block,
|
|
119
158
|
checkpointSignature: Signature,
|
|
120
159
|
blockSignature?: Signature,
|
|
160
|
+
feeAssetPriceModifier: bigint = 0n,
|
|
121
161
|
): CheckpointProposal {
|
|
122
162
|
const txHashes = block.body.txEffects.map(tx => tx.txHash);
|
|
123
163
|
const checkpointHeader = createCheckpointHeaderFromBlock(block);
|
|
124
|
-
return new CheckpointProposal(
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
164
|
+
return new CheckpointProposal(
|
|
165
|
+
checkpointHeader,
|
|
166
|
+
block.archive.root,
|
|
167
|
+
feeAssetPriceModifier,
|
|
168
|
+
checkpointSignature,
|
|
169
|
+
TEST_COORDINATION_SIGNATURE_CONTEXT,
|
|
170
|
+
{
|
|
171
|
+
blockHeader: block.header,
|
|
172
|
+
indexWithinCheckpoint: block.indexWithinCheckpoint,
|
|
173
|
+
txHashes,
|
|
174
|
+
signature: blockSignature ?? checkpointSignature, // Use checkpoint signature as block signature if not provided
|
|
175
|
+
},
|
|
176
|
+
);
|
|
130
177
|
}
|
|
131
178
|
|
|
132
179
|
/**
|
|
@@ -138,12 +185,19 @@ export function createCheckpointAttestation(
|
|
|
138
185
|
block: L2Block,
|
|
139
186
|
signature: Signature,
|
|
140
187
|
sender: EthAddress,
|
|
188
|
+
feeAssetPriceModifier: bigint = 0n,
|
|
141
189
|
): CheckpointAttestation {
|
|
142
190
|
const checkpointHeader = createCheckpointHeaderFromBlock(block);
|
|
143
|
-
const payload = new ConsensusPayload(
|
|
191
|
+
const payload = new ConsensusPayload(
|
|
192
|
+
checkpointHeader,
|
|
193
|
+
block.archive.root,
|
|
194
|
+
feeAssetPriceModifier,
|
|
195
|
+
TEST_COORDINATION_SIGNATURE_CONTEXT,
|
|
196
|
+
);
|
|
144
197
|
const attestation = new CheckpointAttestation(payload, signature, signature);
|
|
145
|
-
//
|
|
146
|
-
(attestation as any).
|
|
198
|
+
// Bypass signature recovery for testing since we use random signatures
|
|
199
|
+
(attestation as any).getSender = () => sender;
|
|
200
|
+
(attestation as any).getProposer = () => sender;
|
|
147
201
|
return attestation;
|
|
148
202
|
}
|
|
149
203
|
|
|
@@ -1,90 +0,0 @@
|
|
|
1
|
-
import type { SequencerMetrics } from './metrics.js';
|
|
2
|
-
import { SequencerState } from './utils.js';
|
|
3
|
-
export declare const MIN_EXECUTION_TIME = 2;
|
|
4
|
-
export declare const CHECKPOINT_INITIALIZATION_TIME = 1;
|
|
5
|
-
export declare const CHECKPOINT_ASSEMBLE_TIME = 1;
|
|
6
|
-
export declare class SequencerTimetable {
|
|
7
|
-
private readonly metrics?;
|
|
8
|
-
private readonly log;
|
|
9
|
-
/**
|
|
10
|
-
* How late into the slot can we be to start working. Computed as the total time needed for assembling and publishing a block,
|
|
11
|
-
* assuming an execution time equal to `minExecutionTime`, subtracted from the slot duration. This means that, if the proposer
|
|
12
|
-
* starts building at this time, and all times hold, it will have at least `minExecutionTime` to execute txs for the block.
|
|
13
|
-
*/
|
|
14
|
-
readonly initializeDeadline: number;
|
|
15
|
-
/**
|
|
16
|
-
* Fixed time offset (in seconds) when the first sub-slot starts, used as baseline for all block deadlines.
|
|
17
|
-
* This is an estimate of how long initialization (sync + proposer check) typically takes.
|
|
18
|
-
* If actual initialization takes longer/shorter, blocks just get less/more time accordingly.
|
|
19
|
-
*/
|
|
20
|
-
readonly initializationOffset: number;
|
|
21
|
-
/**
|
|
22
|
-
* Total time needed to finalize and publish a checkpoint, including:
|
|
23
|
-
* - Assembling the checkpoint
|
|
24
|
-
* - Round-trip p2p propagation for the checkpoint proposal and its corresponding attestations
|
|
25
|
-
* - Publishing to L1
|
|
26
|
-
*/
|
|
27
|
-
readonly checkpointFinalizationTime: number;
|
|
28
|
-
/**
|
|
29
|
-
* How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
|
|
30
|
-
* but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
|
|
31
|
-
* we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
|
|
32
|
-
*/
|
|
33
|
-
readonly l1PublishingTime: number;
|
|
34
|
-
/**
|
|
35
|
-
* What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline)
|
|
36
|
-
* Defaults to half of the block duration if set, otherwise a constant.
|
|
37
|
-
*/
|
|
38
|
-
readonly minExecutionTime: number;
|
|
39
|
-
/** How long it takes to get ready to start building */
|
|
40
|
-
readonly checkpointInitializationTime: number;
|
|
41
|
-
/** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
|
|
42
|
-
readonly p2pPropagationTime: number;
|
|
43
|
-
/** How much time we spend assembling a checkpoint after building the last block */
|
|
44
|
-
readonly checkpointAssembleTime: number;
|
|
45
|
-
/** Ethereum slot duration in seconds */
|
|
46
|
-
readonly ethereumSlotDuration: number;
|
|
47
|
-
/** Aztec slot duration in seconds (must be multiple of ethereum slot duration) */
|
|
48
|
-
readonly aztecSlotDuration: number;
|
|
49
|
-
/** Whether assertTimeLeft will throw if not enough time. */
|
|
50
|
-
readonly enforce: boolean;
|
|
51
|
-
/** Duration per block when building multiple blocks per slot (undefined = single block per slot) */
|
|
52
|
-
readonly blockDuration: number | undefined;
|
|
53
|
-
/** Maximum number of blocks that can be built in this slot configuration */
|
|
54
|
-
readonly maxNumberOfBlocks: number;
|
|
55
|
-
constructor(opts: {
|
|
56
|
-
ethereumSlotDuration: number;
|
|
57
|
-
aztecSlotDuration: number;
|
|
58
|
-
l1PublishingTime: number;
|
|
59
|
-
p2pPropagationTime?: number;
|
|
60
|
-
blockDurationMs?: number;
|
|
61
|
-
enforce: boolean;
|
|
62
|
-
}, metrics?: SequencerMetrics | undefined, log?: import("@aztec/aztec.js/log").Logger);
|
|
63
|
-
getMaxAllowedTime(state: Extract<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>): undefined;
|
|
64
|
-
getMaxAllowedTime(state: Exclude<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>): number;
|
|
65
|
-
getMaxAllowedTime(state: SequencerState): number | undefined;
|
|
66
|
-
assertTimeLeft(newState: SequencerState, secondsIntoSlot: number): void;
|
|
67
|
-
/**
|
|
68
|
-
* Determines if we can start building the next block and returns its deadline.
|
|
69
|
-
*
|
|
70
|
-
* The timetable divides the slot into fixed sub-slots. This method finds the next
|
|
71
|
-
* available sub-slot that has enough time remaining to build a block.
|
|
72
|
-
*
|
|
73
|
-
* @param secondsIntoSlot - Current time (seconds into the slot)
|
|
74
|
-
* @returns Object with canStart flag, deadline, and whether this is the last block
|
|
75
|
-
*/
|
|
76
|
-
canStartNextBlock(secondsIntoSlot: number): {
|
|
77
|
-
canStart: true;
|
|
78
|
-
deadline: undefined;
|
|
79
|
-
isLastBlock: true;
|
|
80
|
-
} | {
|
|
81
|
-
canStart: false;
|
|
82
|
-
deadline: undefined;
|
|
83
|
-
isLastBlock: false;
|
|
84
|
-
} | {
|
|
85
|
-
canStart: boolean;
|
|
86
|
-
deadline: number;
|
|
87
|
-
isLastBlock: boolean;
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXRhYmxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3RpbWV0YWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTVDLGVBQU8sTUFBTSxrQkFBa0IsSUFBSSxDQUFDO0FBQ3BDLGVBQU8sTUFBTSw4QkFBOEIsSUFBSSxDQUFDO0FBQ2hELGVBQU8sTUFBTSx3QkFBd0IsSUFBSSxDQUFDO0FBRTFDLHFCQUFhLGtCQUFrQjtJQXFFM0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBckV0Qjs7OztPQUlHO0lBQ0gsU0FBZ0Isa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBRTNDOzs7O09BSUc7SUFDSCxTQUFnQixvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFFN0M7Ozs7O09BS0c7SUFDSCxTQUFnQiwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFFbkQ7Ozs7T0FJRztJQUNILFNBQWdCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUV6Qzs7O09BR0c7SUFDSCxTQUFnQixnQkFBZ0IsRUFBRSxNQUFNLENBQXNCO0lBRTlELHVEQUF1RDtJQUN2RCxTQUFnQiw0QkFBNEIsRUFBRSxNQUFNLENBQWtDO0lBRXRGLG1HQUFtRztJQUNuRyxTQUFnQixrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFFM0MsbUZBQW1GO0lBQ25GLFNBQWdCLHNCQUFzQixFQUFFLE1BQU0sQ0FBNEI7SUFFMUUsd0NBQXdDO0lBQ3hDLFNBQWdCLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUU3QyxrRkFBa0Y7SUFDbEYsU0FBZ0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBRTFDLDREQUE0RDtJQUM1RCxTQUFnQixPQUFPLEVBQUUsT0FBTyxDQUFDO0lBRWpDLG9HQUFvRztJQUNwRyxTQUFnQixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUVsRCw0RUFBNEU7SUFDNUUsU0FBZ0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBRTFDLFlBQ0UsSUFBSSxFQUFFO1FBQ0osb0JBQW9CLEVBQUUsTUFBTSxDQUFDO1FBQzdCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUMxQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7UUFDekIsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDNUIsZUFBZSxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3pCLE9BQU8sRUFBRSxPQUFPLENBQUM7S0FDbEIsRUFDZ0IsT0FBTyxDQUFDLDhCQUFrQixFQUMxQixHQUFHLHVDQUFzQyxFQTJFM0Q7SUFFTSxpQkFBaUIsQ0FDdEIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxjQUFjLEVBQUUsY0FBYyxDQUFDLE9BQU8sR0FBRyxjQUFjLENBQUMsSUFBSSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsR0FDMUcsU0FBUyxDQUFDO0lBQ04saUJBQWlCLENBQ3RCLEtBQUssRUFBRSxPQUFPLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxPQUFPLEdBQUcsY0FBYyxDQUFDLElBQUksR0FBRyxjQUFjLENBQUMsYUFBYSxDQUFDLEdBQzFHLE1BQU0sQ0FBQztJQUNILGlCQUFpQixDQUFDLEtBQUssRUFBRSxjQUFjLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQTJCN0QsY0FBYyxDQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLE1BQU0sUUFpQnRFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSSxpQkFBaUIsQ0FDdEIsZUFBZSxFQUFFLE1BQU0sR0FFckI7UUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDO1FBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQztRQUFDLFdBQVcsRUFBRSxJQUFJLENBQUE7S0FBRSxHQUMxRDtRQUFFLFFBQVEsRUFBRSxLQUFLLENBQUM7UUFBQyxRQUFRLEVBQUUsU0FBUyxDQUFDO1FBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQTtLQUFFLEdBQzVEO1FBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQztRQUFDLFFBQVEsRUFBRSxNQUFNLENBQUM7UUFBQyxXQUFXLEVBQUUsT0FBTyxDQUFBO0tBQUUsQ0F3RGhFO0NBQ0YifQ==
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAChD,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAE1C,qBAAa,kBAAkB;IAqE3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IArEtB;;;;OAIG;IACH,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;OAIG;IACH,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C;;;;;OAKG;IACH,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD;;;;OAIG;IACH,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IAEzC;;;OAGG;IACH,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,uDAAuD;IACvD,SAAgB,4BAA4B,EAAE,MAAM,CAAkC;IAEtF,mGAAmG;IACnG,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C,mFAAmF;IACnF,SAAgB,sBAAsB,EAAE,MAAM,CAA4B;IAE1E,wCAAwC;IACxC,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C,kFAAkF;IAClF,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,4DAA4D;IAC5D,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,oGAAoG;IACpG,SAAgB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAElD,4EAA4E;IAC5E,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,YACE,IAAI,EAAE;QACJ,oBAAoB,EAAE,MAAM,CAAC;QAC7B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,EAAE,OAAO,CAAC;KAClB,EACgB,OAAO,CAAC,8BAAkB,EAC1B,GAAG,uCAAsC,EA2E3D;IAEM,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,SAAS,CAAC;IACN,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,MAAM,CAAC;IACH,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;IA2B7D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,QAiBtE;IAED;;;;;;;;OAQG;IACI,iBAAiB,CACtB,eAAe,EAAE,MAAM,GAErB;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE,GAC1D;QAAE,QAAQ,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,GAC5D;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAwDhE;CACF"}
|