@aztec/sequencer-client 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240
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 +282 -21
- package/dest/client/sequencer-client.d.ts +19 -9
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +67 -33
- package/dest/config.d.ts +29 -7
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +77 -39
- 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 +14 -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/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- 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-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 +94 -68
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +446 -363
- package/dest/sequencer/automine/automine_factory.d.ts +54 -0
- package/dest/sequencer/automine/automine_factory.d.ts.map +1 -0
- package/dest/sequencer/automine/automine_factory.js +84 -0
- package/dest/sequencer/automine/automine_sequencer.d.ts +151 -0
- package/dest/sequencer/automine/automine_sequencer.d.ts.map +1 -0
- package/dest/sequencer/automine/automine_sequencer.js +506 -0
- package/dest/sequencer/chain_state_overrides.d.ts +61 -0
- package/dest/sequencer/chain_state_overrides.d.ts.map +1 -0
- package/dest/sequencer/chain_state_overrides.js +98 -0
- package/dest/sequencer/checkpoint_proposal_job.d.ts +81 -13
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +874 -195
- 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 +3 -3
- package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_voter.js +34 -13
- package/dest/sequencer/events.d.ts +47 -2
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/index.d.ts +3 -2
- package/dest/sequencer/index.d.ts.map +1 -1
- package/dest/sequencer/index.js +2 -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/sequencer.d.ts +87 -26
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +408 -135
- 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 +23 -19
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +67 -38
- package/dest/test/utils.d.ts +8 -8
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +17 -15
- package/package.json +29 -28
- package/src/client/sequencer-client.ts +92 -35
- package/src/config.ts +103 -49
- 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 +26 -63
- package/src/global_variable_builder/index.ts +3 -1
- package/src/index.ts +5 -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-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 +540 -460
- package/src/sequencer/README.md +152 -450
- package/src/sequencer/automine/README.md +46 -0
- package/src/sequencer/automine/automine_factory.ts +145 -0
- package/src/sequencer/automine/automine_sequencer.ts +592 -0
- package/src/sequencer/chain_state_overrides.ts +162 -0
- package/src/sequencer/checkpoint_proposal_job.ts +1088 -219
- package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
- package/src/sequencer/checkpoint_voter.ts +31 -17
- package/src/sequencer/events.ts +50 -2
- package/src/sequencer/index.ts +2 -1
- package/src/sequencer/metrics.ts +164 -39
- package/src/sequencer/sequencer.ts +509 -147
- 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 +122 -78
- package/src/test/utils.ts +50 -22
- package/dest/sequencer/block_builder.d.ts +0 -26
- package/dest/sequencer/block_builder.d.ts.map +0 -1
- package/dest/sequencer/block_builder.js +0 -129
- package/src/sequencer/block_builder.ts +0 -216
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
2
|
+
import { MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT } from '@aztec/constants';
|
|
2
3
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
3
4
|
import { isAnvilTestChain } from '@aztec/ethereum/chain';
|
|
4
5
|
import { getPublicClient } from '@aztec/ethereum/client';
|
|
5
6
|
import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
6
|
-
import {
|
|
7
|
+
import { type Delayer, L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
7
8
|
import { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
8
9
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
9
10
|
import { createLogger } from '@aztec/foundation/log';
|
|
@@ -11,15 +12,14 @@ import type { DateProvider } from '@aztec/foundation/timer';
|
|
|
11
12
|
import type { KeystoreManager } from '@aztec/node-keystore';
|
|
12
13
|
import type { P2P } from '@aztec/p2p';
|
|
13
14
|
import type { SlasherClientInterface } from '@aztec/slasher';
|
|
14
|
-
import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
15
|
+
import type { L2BlockSink, L2BlockSource, ProposedCheckpointSink } from '@aztec/stdlib/block';
|
|
15
16
|
import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
16
|
-
import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
|
|
17
17
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
18
18
|
import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
|
|
19
19
|
import { FullNodeCheckpointsBuilder, NodeKeystoreAdapter, type ValidatorClient } from '@aztec/validator-client';
|
|
20
20
|
|
|
21
|
-
import type
|
|
22
|
-
import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
|
|
21
|
+
import { type SequencerClientConfig, getPublisherConfigFromSequencerConfig } from '../config.js';
|
|
22
|
+
import type { GlobalVariableBuilder } from '../global_variable_builder/index.js';
|
|
23
23
|
import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
24
24
|
import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
|
|
25
25
|
|
|
@@ -28,11 +28,12 @@ import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
|
|
|
28
28
|
*/
|
|
29
29
|
export class SequencerClient {
|
|
30
30
|
constructor(
|
|
31
|
-
protected publisherManager: PublisherManager<
|
|
31
|
+
protected publisherManager: PublisherManager<L1TxUtils>,
|
|
32
32
|
protected sequencer: Sequencer,
|
|
33
33
|
protected checkpointsBuilder: FullNodeCheckpointsBuilder,
|
|
34
34
|
protected validatorClient?: ValidatorClient,
|
|
35
35
|
private l1Metrics?: L1Metrics,
|
|
36
|
+
private delayer_?: Delayer,
|
|
36
37
|
) {}
|
|
37
38
|
|
|
38
39
|
/**
|
|
@@ -55,15 +56,17 @@ export class SequencerClient {
|
|
|
55
56
|
worldStateSynchronizer: WorldStateSynchronizer;
|
|
56
57
|
slasherClient: SlasherClientInterface | undefined;
|
|
57
58
|
checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
58
|
-
l2BlockSource: L2BlockSource & L2BlockSink;
|
|
59
|
+
l2BlockSource: L2BlockSource & L2BlockSink & ProposedCheckpointSink;
|
|
59
60
|
l1ToL2MessageSource: L1ToL2MessageSource;
|
|
60
61
|
telemetry: TelemetryClient;
|
|
61
62
|
publisherFactory?: SequencerPublisherFactory;
|
|
62
63
|
blobClient: BlobClientInterface;
|
|
63
64
|
dateProvider: DateProvider;
|
|
64
65
|
epochCache?: EpochCache;
|
|
65
|
-
l1TxUtils:
|
|
66
|
+
l1TxUtils: L1TxUtils[];
|
|
67
|
+
funderL1TxUtils?: L1TxUtils;
|
|
66
68
|
nodeKeyStore: KeystoreManager;
|
|
69
|
+
globalVariableBuilder: GlobalVariableBuilder;
|
|
67
70
|
},
|
|
68
71
|
) {
|
|
69
72
|
const {
|
|
@@ -85,37 +88,35 @@ export class SequencerClient {
|
|
|
85
88
|
publicClient,
|
|
86
89
|
l1TxUtils.map(x => x.getSenderAddress()),
|
|
87
90
|
);
|
|
88
|
-
const publisherManager = new PublisherManager(l1TxUtils, config)
|
|
89
|
-
|
|
90
|
-
|
|
91
|
+
const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
|
|
92
|
+
bindings: log.getBindings(),
|
|
93
|
+
funder: deps.funderL1TxUtils,
|
|
94
|
+
});
|
|
95
|
+
const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
|
|
96
|
+
const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
|
|
91
97
|
rollupContract.getL1GenesisTime(),
|
|
92
98
|
rollupContract.getSlotDuration(),
|
|
93
|
-
rollupContract.getVersion(),
|
|
94
99
|
rollupContract.getManaLimit().then(Number),
|
|
95
100
|
] as const);
|
|
96
101
|
|
|
97
102
|
const governanceProposerContract = new GovernanceProposerContract(
|
|
98
103
|
publicClient,
|
|
99
|
-
config.
|
|
104
|
+
config.governanceProposerAddress.toString(),
|
|
100
105
|
);
|
|
101
106
|
const epochCache =
|
|
102
107
|
deps.epochCache ??
|
|
103
108
|
(await EpochCache.create(
|
|
104
|
-
config.
|
|
109
|
+
config.rollupAddress,
|
|
105
110
|
{
|
|
106
111
|
l1RpcUrls: rpcUrls,
|
|
107
112
|
l1ChainId: chainId,
|
|
108
113
|
viemPollingIntervalMS: config.viemPollingIntervalMS,
|
|
109
114
|
ethereumSlotDuration: config.ethereumSlotDuration,
|
|
115
|
+
enableProposerPipelining: config.enableProposerPipelining,
|
|
110
116
|
},
|
|
111
117
|
{ dateProvider: deps.dateProvider },
|
|
112
118
|
));
|
|
113
119
|
|
|
114
|
-
const slashFactoryContract = new SlashFactoryContract(
|
|
115
|
-
publicClient,
|
|
116
|
-
config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString(),
|
|
117
|
-
);
|
|
118
|
-
|
|
119
120
|
const publisherFactory =
|
|
120
121
|
deps.publisherFactory ??
|
|
121
122
|
new SequencerPublisherFactory(config, {
|
|
@@ -123,7 +124,6 @@ export class SequencerClient {
|
|
|
123
124
|
blobClient: deps.blobClient,
|
|
124
125
|
epochCache,
|
|
125
126
|
governanceProposerContract,
|
|
126
|
-
slashFactoryContract,
|
|
127
127
|
rollupContract,
|
|
128
128
|
dateProvider: deps.dateProvider,
|
|
129
129
|
publisherManager,
|
|
@@ -132,17 +132,8 @@ export class SequencerClient {
|
|
|
132
132
|
});
|
|
133
133
|
|
|
134
134
|
const ethereumSlotDuration = config.ethereumSlotDuration;
|
|
135
|
-
const l1Constants = { l1GenesisTime, slotDuration: Number(slotDuration), ethereumSlotDuration };
|
|
136
|
-
|
|
137
|
-
const globalsBuilder = new GlobalVariableBuilder({ ...config, ...l1Constants, rollupVersion });
|
|
138
135
|
|
|
139
|
-
|
|
140
|
-
if (sequencerManaLimit > rollupManaLimit) {
|
|
141
|
-
log.warn(
|
|
142
|
-
`Provided maxL2BlockGas ${sequencerManaLimit} is greater than the max allowed by L1. Setting limit to ${rollupManaLimit}.`,
|
|
143
|
-
);
|
|
144
|
-
sequencerManaLimit = rollupManaLimit;
|
|
145
|
-
}
|
|
136
|
+
const globalsBuilder = deps.globalVariableBuilder;
|
|
146
137
|
|
|
147
138
|
// When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
|
|
148
139
|
// Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
|
|
@@ -152,6 +143,16 @@ export class SequencerClient {
|
|
|
152
143
|
const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
|
|
153
144
|
const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
|
|
154
145
|
|
|
146
|
+
const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = capPerBlockLimits(config, rollupManaLimit, log);
|
|
147
|
+
|
|
148
|
+
const l1Constants = {
|
|
149
|
+
l1GenesisTime,
|
|
150
|
+
slotDuration: Number(slotDuration),
|
|
151
|
+
ethereumSlotDuration,
|
|
152
|
+
rollupManaLimit,
|
|
153
|
+
epochDuration: config.aztecEpochDuration,
|
|
154
|
+
};
|
|
155
|
+
|
|
155
156
|
const sequencer = new Sequencer(
|
|
156
157
|
publisherFactory,
|
|
157
158
|
validatorClient,
|
|
@@ -166,14 +167,17 @@ export class SequencerClient {
|
|
|
166
167
|
deps.dateProvider,
|
|
167
168
|
epochCache,
|
|
168
169
|
rollupContract,
|
|
169
|
-
{ ...config, l1PublishingTime, maxL2BlockGas
|
|
170
|
+
{ ...config, l1PublishingTime, maxL2BlockGas, maxDABlockGas, maxTxsPerBlock },
|
|
170
171
|
telemetryClient,
|
|
171
172
|
log,
|
|
172
173
|
);
|
|
173
174
|
|
|
174
|
-
|
|
175
|
+
sequencer.init();
|
|
176
|
+
|
|
177
|
+
// Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
|
|
178
|
+
const delayer = l1TxUtils[0]?.delayer;
|
|
175
179
|
|
|
176
|
-
return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics);
|
|
180
|
+
return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer);
|
|
177
181
|
}
|
|
178
182
|
|
|
179
183
|
/**
|
|
@@ -191,7 +195,7 @@ export class SequencerClient {
|
|
|
191
195
|
await this.validatorClient?.start();
|
|
192
196
|
this.sequencer.start();
|
|
193
197
|
this.l1Metrics?.start();
|
|
194
|
-
await this.publisherManager.
|
|
198
|
+
await this.publisherManager.start();
|
|
195
199
|
}
|
|
196
200
|
|
|
197
201
|
/**
|
|
@@ -200,14 +204,29 @@ export class SequencerClient {
|
|
|
200
204
|
public async stop() {
|
|
201
205
|
await this.sequencer.stop();
|
|
202
206
|
await this.validatorClient?.stop();
|
|
203
|
-
this.publisherManager.
|
|
207
|
+
await this.publisherManager.stop();
|
|
204
208
|
this.l1Metrics?.stop();
|
|
205
209
|
}
|
|
206
210
|
|
|
211
|
+
/** Triggers an immediate run of the sequencer, bypassing the polling interval. */
|
|
212
|
+
public trigger() {
|
|
213
|
+
return this.sequencer.trigger();
|
|
214
|
+
}
|
|
215
|
+
|
|
207
216
|
public getSequencer(): Sequencer {
|
|
208
217
|
return this.sequencer;
|
|
209
218
|
}
|
|
210
219
|
|
|
220
|
+
/** Updates the publisher factory's node keystore adapter after a keystore reload. */
|
|
221
|
+
public updatePublisherNodeKeyStore(adapter: NodeKeystoreAdapter): void {
|
|
222
|
+
this.sequencer.updatePublisherNodeKeyStore(adapter);
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
/** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */
|
|
226
|
+
getDelayer(): Delayer | undefined {
|
|
227
|
+
return this.delayer_;
|
|
228
|
+
}
|
|
229
|
+
|
|
211
230
|
get validatorAddresses(): EthAddress[] | undefined {
|
|
212
231
|
return this.sequencer.getValidatorAddresses();
|
|
213
232
|
}
|
|
@@ -216,3 +235,41 @@ export class SequencerClient {
|
|
|
216
235
|
return this.sequencer.maxL2BlockGas;
|
|
217
236
|
}
|
|
218
237
|
}
|
|
238
|
+
|
|
239
|
+
/**
|
|
240
|
+
* Caps operator-provided per-block limits at checkpoint-level limits.
|
|
241
|
+
* Returns undefined for any limit the operator didn't set — the checkpoint builder handles redistribution.
|
|
242
|
+
*/
|
|
243
|
+
function capPerBlockLimits(
|
|
244
|
+
config: SequencerClientConfig,
|
|
245
|
+
rollupManaLimit: number,
|
|
246
|
+
log: ReturnType<typeof createLogger>,
|
|
247
|
+
): { maxL2BlockGas: number | undefined; maxDABlockGas: number | undefined; maxTxsPerBlock: number | undefined } {
|
|
248
|
+
let maxL2BlockGas = config.maxL2BlockGas;
|
|
249
|
+
if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
|
|
250
|
+
log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
|
|
251
|
+
maxL2BlockGas = rollupManaLimit;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
let maxDABlockGas = config.maxDABlockGas;
|
|
255
|
+
if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
|
|
256
|
+
log.warn(
|
|
257
|
+
`Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`,
|
|
258
|
+
);
|
|
259
|
+
maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
let maxTxsPerBlock = config.maxTxsPerBlock;
|
|
263
|
+
if (
|
|
264
|
+
maxTxsPerBlock !== undefined &&
|
|
265
|
+
config.maxTxsPerCheckpoint !== undefined &&
|
|
266
|
+
maxTxsPerBlock > config.maxTxsPerCheckpoint
|
|
267
|
+
) {
|
|
268
|
+
log.warn(
|
|
269
|
+
`Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`,
|
|
270
|
+
);
|
|
271
|
+
maxTxsPerBlock = config.maxTxsPerCheckpoint;
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
return { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock };
|
|
275
|
+
}
|
package/src/config.ts
CHANGED
|
@@ -5,66 +5,78 @@ import {
|
|
|
5
5
|
booleanConfigHelper,
|
|
6
6
|
getConfigFromMappings,
|
|
7
7
|
numberConfigHelper,
|
|
8
|
+
optionalNumberConfigHelper,
|
|
8
9
|
pickConfigMappings,
|
|
9
10
|
} from '@aztec/foundation/config';
|
|
10
11
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
11
12
|
import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
|
|
12
13
|
import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
|
|
13
14
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
14
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
type ChainConfig,
|
|
17
|
+
DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
|
|
18
|
+
type PipelineConfig,
|
|
19
|
+
type SequencerConfig,
|
|
20
|
+
chainConfigMappings,
|
|
21
|
+
pipelineConfigMappings,
|
|
22
|
+
sharedSequencerConfigMappings,
|
|
23
|
+
} from '@aztec/stdlib/config';
|
|
15
24
|
import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
|
|
25
|
+
import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
|
|
16
26
|
import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
|
|
17
27
|
|
|
18
28
|
import {
|
|
19
|
-
type
|
|
20
|
-
type
|
|
21
|
-
|
|
22
|
-
|
|
29
|
+
type SequencerPublisherConfig,
|
|
30
|
+
type SequencerTxSenderConfig,
|
|
31
|
+
sequencerPublisherConfigMappings,
|
|
32
|
+
sequencerTxSenderConfigMappings,
|
|
23
33
|
} from './publisher/config.js';
|
|
24
34
|
|
|
25
35
|
export * from './publisher/config.js';
|
|
26
36
|
export type { SequencerConfig };
|
|
27
37
|
|
|
28
|
-
export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
|
|
29
|
-
|
|
30
38
|
/**
|
|
31
39
|
* Default values for SequencerConfig.
|
|
32
40
|
* Centralized location for all sequencer configuration defaults.
|
|
33
41
|
*/
|
|
34
|
-
export const DefaultSequencerConfig
|
|
42
|
+
export const DefaultSequencerConfig = {
|
|
35
43
|
sequencerPollingIntervalMS: 500,
|
|
36
|
-
maxTxsPerBlock: 32,
|
|
37
44
|
minTxsPerBlock: 1,
|
|
38
45
|
buildCheckpointIfEmpty: false,
|
|
39
46
|
publishTxsWithProposals: false,
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
maxBlockSizeInBytes: 1024 * 1024,
|
|
47
|
+
perBlockAllocationMultiplier: 1.2,
|
|
48
|
+
redistributeCheckpointBudget: true,
|
|
43
49
|
enforceTimeTable: true,
|
|
44
|
-
attestationPropagationTime:
|
|
50
|
+
attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
|
|
45
51
|
secondsBeforeInvalidatingBlockAsCommitteeMember: 144, // 12 L1 blocks
|
|
46
52
|
secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432, // 36 L1 blocks
|
|
47
53
|
skipCollectingAttestations: false,
|
|
48
54
|
skipInvalidateBlockAsProposer: false,
|
|
55
|
+
skipWaitForValidParentCheckpointOnL1: false,
|
|
49
56
|
broadcastInvalidBlockProposal: false,
|
|
57
|
+
broadcastInvalidCheckpointProposalOnly: false,
|
|
50
58
|
injectFakeAttestation: false,
|
|
59
|
+
injectHighSValueAttestation: false,
|
|
60
|
+
injectUnrecoverableSignatureAttestation: false,
|
|
51
61
|
fishermanMode: false,
|
|
52
62
|
shuffleAttestationOrdering: false,
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
63
|
+
skipPushProposedBlocksToArchiver: false,
|
|
64
|
+
skipPublishingCheckpointsPercent: 0,
|
|
65
|
+
maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
|
|
66
|
+
} satisfies ResolvedSequencerConfig;
|
|
56
67
|
|
|
57
68
|
/**
|
|
58
69
|
* Configuration settings for the SequencerClient.
|
|
59
70
|
*/
|
|
60
|
-
export type SequencerClientConfig =
|
|
71
|
+
export type SequencerClientConfig = SequencerPublisherConfig &
|
|
61
72
|
KeyStoreConfig &
|
|
62
73
|
ValidatorClientConfig &
|
|
63
|
-
|
|
74
|
+
SequencerTxSenderConfig &
|
|
64
75
|
SequencerConfig &
|
|
65
76
|
L1ReaderConfig &
|
|
66
77
|
ChainConfig &
|
|
67
|
-
|
|
78
|
+
PipelineConfig &
|
|
79
|
+
Pick<P2PConfig, 'txPublicSetupAllowListExtend'> &
|
|
68
80
|
Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
|
|
69
81
|
|
|
70
82
|
export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
@@ -73,10 +85,10 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
73
85
|
description: 'The number of ms to wait between polling for checking to build on the next slot.',
|
|
74
86
|
...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS),
|
|
75
87
|
},
|
|
76
|
-
|
|
77
|
-
env: '
|
|
78
|
-
description: 'The maximum number of txs
|
|
79
|
-
...
|
|
88
|
+
maxTxsPerCheckpoint: {
|
|
89
|
+
env: 'SEQ_MAX_TX_PER_CHECKPOINT',
|
|
90
|
+
description: 'The maximum number of txs across all blocks in a checkpoint.',
|
|
91
|
+
...optionalNumberConfigHelper(),
|
|
80
92
|
},
|
|
81
93
|
minTxsPerBlock: {
|
|
82
94
|
env: 'SEQ_MIN_TX_PER_BLOCK',
|
|
@@ -95,16 +107,29 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
95
107
|
maxL2BlockGas: {
|
|
96
108
|
env: 'SEQ_MAX_L2_BLOCK_GAS',
|
|
97
109
|
description: 'The maximum L2 block gas.',
|
|
98
|
-
...
|
|
110
|
+
...optionalNumberConfigHelper(),
|
|
99
111
|
},
|
|
100
112
|
maxDABlockGas: {
|
|
101
113
|
env: 'SEQ_MAX_DA_BLOCK_GAS',
|
|
102
114
|
description: 'The maximum DA block gas.',
|
|
103
|
-
...
|
|
115
|
+
...optionalNumberConfigHelper(),
|
|
116
|
+
},
|
|
117
|
+
perBlockAllocationMultiplier: {
|
|
118
|
+
env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
|
|
119
|
+
description:
|
|
120
|
+
'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' +
|
|
121
|
+
' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
|
|
122
|
+
...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier),
|
|
123
|
+
},
|
|
124
|
+
redistributeCheckpointBudget: {
|
|
125
|
+
env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
|
|
126
|
+
description:
|
|
127
|
+
'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
|
|
128
|
+
...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget),
|
|
104
129
|
},
|
|
105
130
|
coinbase: {
|
|
106
131
|
env: 'COINBASE',
|
|
107
|
-
parseEnv: (val: string) =>
|
|
132
|
+
parseEnv: (val: string) => EthAddress.fromString(val),
|
|
108
133
|
description: 'Recipient of block reward.',
|
|
109
134
|
},
|
|
110
135
|
feeRecipient: {
|
|
@@ -120,11 +145,6 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
120
145
|
env: 'ACVM_BINARY_PATH',
|
|
121
146
|
description: 'The path to the ACVM binary',
|
|
122
147
|
},
|
|
123
|
-
maxBlockSizeInBytes: {
|
|
124
|
-
env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
|
|
125
|
-
description: 'Max block size',
|
|
126
|
-
...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes),
|
|
127
|
-
},
|
|
128
148
|
enforceTimeTable: {
|
|
129
149
|
env: 'SEQ_ENFORCE_TIME_TABLE',
|
|
130
150
|
description: 'Whether to enforce the time table when building blocks',
|
|
@@ -138,12 +158,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
138
158
|
l1PublishingTime: {
|
|
139
159
|
env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
|
|
140
160
|
description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
|
|
141
|
-
|
|
142
|
-
},
|
|
143
|
-
attestationPropagationTime: {
|
|
144
|
-
env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
|
|
145
|
-
description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
|
|
146
|
-
...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime),
|
|
161
|
+
...optionalNumberConfigHelper(),
|
|
147
162
|
},
|
|
148
163
|
fakeProcessingDelayPerTxMs: {
|
|
149
164
|
description: 'Used for testing to introduce a fake delay after processing each tx',
|
|
@@ -174,14 +189,37 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
174
189
|
description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
|
|
175
190
|
...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer),
|
|
176
191
|
},
|
|
192
|
+
skipWaitForValidParentCheckpointOnL1: {
|
|
193
|
+
description:
|
|
194
|
+
'Bypass the parent checkpoint validity check before submitting a pipelined checkpoint, ' +
|
|
195
|
+
'allowing the proposer to publish even when the parent landed on L1 with invalid attestations (for testing only)',
|
|
196
|
+
...booleanConfigHelper(DefaultSequencerConfig.skipWaitForValidParentCheckpointOnL1),
|
|
197
|
+
},
|
|
177
198
|
broadcastInvalidBlockProposal: {
|
|
178
199
|
description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
|
|
179
200
|
...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal),
|
|
180
201
|
},
|
|
202
|
+
invalidBlockProposalIndexWithinCheckpoint: {
|
|
203
|
+
description: 'Broadcast an invalid block proposal only at this indexWithinCheckpoint (for testing only)',
|
|
204
|
+
...optionalNumberConfigHelper(),
|
|
205
|
+
},
|
|
206
|
+
broadcastInvalidCheckpointProposalOnly: {
|
|
207
|
+
description:
|
|
208
|
+
'Broadcast invalid checkpoint proposals while keeping the underlying block proposals valid (for testing only). When unset, the checkpoint follows broadcastInvalidBlockProposal.',
|
|
209
|
+
...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidCheckpointProposalOnly),
|
|
210
|
+
},
|
|
181
211
|
injectFakeAttestation: {
|
|
182
212
|
description: 'Inject a fake attestation (for testing only)',
|
|
183
213
|
...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation),
|
|
184
214
|
},
|
|
215
|
+
injectHighSValueAttestation: {
|
|
216
|
+
description: 'Inject a malleable attestation with a high-s value (for testing only)',
|
|
217
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation),
|
|
218
|
+
},
|
|
219
|
+
injectUnrecoverableSignatureAttestation: {
|
|
220
|
+
description: 'Inject an attestation with an unrecoverable signature (for testing only)',
|
|
221
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation),
|
|
222
|
+
},
|
|
185
223
|
fishermanMode: {
|
|
186
224
|
env: 'FISHERMAN_MODE',
|
|
187
225
|
description:
|
|
@@ -192,34 +230,50 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
|
|
|
192
230
|
description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
|
|
193
231
|
...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering),
|
|
194
232
|
},
|
|
195
|
-
|
|
196
|
-
env: 'SEQ_BLOCK_DURATION_MS',
|
|
197
|
-
description:
|
|
198
|
-
'Duration per block in milliseconds when building multiple blocks per slot. ' +
|
|
199
|
-
'If undefined (default), builds a single block per slot using the full slot duration.',
|
|
200
|
-
parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
|
|
201
|
-
},
|
|
233
|
+
...sharedSequencerConfigMappings,
|
|
202
234
|
buildCheckpointIfEmpty: {
|
|
203
235
|
env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
|
|
204
236
|
description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
|
|
205
237
|
...booleanConfigHelper(DefaultSequencerConfig.buildCheckpointIfEmpty),
|
|
206
238
|
},
|
|
207
|
-
// TODO(palla/mbps): Change default to false once block sync is stable
|
|
208
239
|
skipPushProposedBlocksToArchiver: {
|
|
209
240
|
description: 'Skip pushing proposed blocks to archiver (default: true)',
|
|
210
241
|
...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver),
|
|
211
242
|
},
|
|
212
|
-
|
|
243
|
+
minBlocksForCheckpoint: {
|
|
244
|
+
description: 'Minimum number of blocks required for a checkpoint proposal (test only)',
|
|
245
|
+
},
|
|
246
|
+
skipPublishingCheckpointsPercent: {
|
|
247
|
+
env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
|
|
248
|
+
description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
|
|
249
|
+
...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent),
|
|
250
|
+
},
|
|
251
|
+
skipBroadcastProposals: {
|
|
252
|
+
description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
|
|
253
|
+
...booleanConfigHelper(false),
|
|
254
|
+
},
|
|
255
|
+
skipBroadcastCheckpointProposal: {
|
|
256
|
+
description:
|
|
257
|
+
'Skip broadcasting only the CheckpointProposal via gossipsub when proposer; the held last block is broadcast ' +
|
|
258
|
+
'standalone instead so peers still receive it as a proposed-but-uncheckpointed tip (for testing only)',
|
|
259
|
+
...booleanConfigHelper(false),
|
|
260
|
+
},
|
|
261
|
+
pauseProposingForSlots: {
|
|
262
|
+
description:
|
|
263
|
+
'List of slots for which the sequencer will not produce a proposal (for testing only). Attestation paths are unaffected.',
|
|
264
|
+
},
|
|
265
|
+
...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowListExtend']),
|
|
213
266
|
};
|
|
214
267
|
|
|
215
268
|
export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
|
|
269
|
+
...chainConfigMappings,
|
|
216
270
|
...validatorClientConfigMappings,
|
|
217
271
|
...sequencerConfigMappings,
|
|
218
272
|
...keyStoreConfigMappings,
|
|
219
273
|
...l1ReaderConfigMappings,
|
|
220
|
-
...
|
|
221
|
-
...
|
|
222
|
-
...
|
|
274
|
+
...sequencerTxSenderConfigMappings,
|
|
275
|
+
...sequencerPublisherConfigMappings,
|
|
276
|
+
...pipelineConfigMappings,
|
|
223
277
|
...pickConfigMappings(l1ContractsConfigMappings, ['ethereumSlotDuration', 'aztecSlotDuration', 'aztecEpochDuration']),
|
|
224
278
|
};
|
|
225
279
|
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
# Fee Prediction
|
|
2
|
+
|
|
3
|
+
The `FeePredictor` predicts min fees for upcoming L2 slots based on the current L1
|
|
4
|
+
oracle state and an assumed mana usage pattern.
|
|
5
|
+
|
|
6
|
+
## Prediction Window
|
|
7
|
+
|
|
8
|
+
The prediction covers `LAG = 2` entries (the next available slot plus 1 more).
|
|
9
|
+
A new oracle update can activate at `startSlot + LAG`, so only the first LAG entries
|
|
10
|
+
are guaranteed stable. Beyond that, L1 fees could change unpredictably.
|
|
11
|
+
|
|
12
|
+
Each entry uses:
|
|
13
|
+
|
|
14
|
+
- The **actual L1 fees** the oracle would return for that slot's timestamp (pre or post,
|
|
15
|
+
depending on whether the slot is before or after `slotOfChange`).
|
|
16
|
+
- A **configurable congestion assumption** (`ManaUsageEstimate`): none (0 mana), target
|
|
17
|
+
(steady state), or limit (worst case, 2x target).
|
|
18
|
+
|
|
19
|
+
The client picks `max(predicted[0..LAG-1])` as their `maxFeesPerGas`.
|
|
20
|
+
|
|
21
|
+
```
|
|
22
|
+
predicted[0] → fee at next slot (current oracle + current congestion)
|
|
23
|
+
predicted[1] → fee at next slot + 1 (congestion may change based on usage estimate)
|
|
24
|
+
```
|
|
25
|
+
|
|
26
|
+
## Why LAG and not LIFETIME?
|
|
27
|
+
|
|
28
|
+
The L1 gas oracle has two timing constants:
|
|
29
|
+
|
|
30
|
+
- **LAG = 2 slots**: when new fees are queued, they activate LAG slots later
|
|
31
|
+
- **LIFETIME = 5 slots**: after an oracle update, the next update is rejected until
|
|
32
|
+
`slotOfChange + (LIFETIME - LAG)` slots have passed
|
|
33
|
+
|
|
34
|
+
If the oracle cooldown has already elapsed (i.e., no recent update), a new update can
|
|
35
|
+
be enqueued at any moment. Its new values would activate LAG slots later. This means
|
|
36
|
+
predictions beyond LAG slots could be invalidated by an oracle update that happens
|
|
37
|
+
right after we query.
|
|
38
|
+
|
|
39
|
+
With a LIFETIME-sized window, we'd give a false sense of coverage: the prediction
|
|
40
|
+
would look like it covers 6 slots, but slots beyond LAG could be wrong if an update
|
|
41
|
+
is enqueued after the prediction is computed.
|
|
42
|
+
|
|
43
|
+
By limiting to LAG entries, we guarantee that all predicted L1 fees are the ones that
|
|
44
|
+
will actually be used — no oracle update can change them within this window.
|