@aztec/sequencer-client 0.0.1-commit.f504929 → 0.0.1-commit.f81dbcf

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.
Files changed (59) hide show
  1. package/dest/client/sequencer-client.d.ts +12 -1
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +85 -13
  4. package/dest/config.d.ts +22 -3
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +14 -12
  7. package/dest/publisher/config.d.ts +1 -5
  8. package/dest/publisher/config.d.ts.map +1 -1
  9. package/dest/publisher/config.js +1 -6
  10. package/dest/publisher/index.d.ts +1 -2
  11. package/dest/publisher/index.d.ts.map +1 -1
  12. package/dest/publisher/sequencer-publisher-factory.d.ts +1 -1
  13. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  14. package/dest/publisher/sequencer-publisher-factory.js +0 -14
  15. package/dest/publisher/sequencer-publisher.d.ts +2 -12
  16. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  17. package/dest/publisher/sequencer-publisher.js +9 -258
  18. package/dest/sequencer/checkpoint_proposal_job.d.ts +2 -4
  19. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  20. package/dest/sequencer/checkpoint_proposal_job.js +55 -58
  21. package/dest/sequencer/sequencer.d.ts +7 -6
  22. package/dest/sequencer/sequencer.d.ts.map +1 -1
  23. package/dest/sequencer/sequencer.js +11 -13
  24. package/dest/sequencer/timetable.d.ts +4 -3
  25. package/dest/sequencer/timetable.d.ts.map +1 -1
  26. package/dest/sequencer/timetable.js +6 -7
  27. package/dest/sequencer/types.d.ts +2 -2
  28. package/dest/sequencer/types.d.ts.map +1 -1
  29. package/dest/test/mock_checkpoint_builder.d.ts +10 -8
  30. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
  31. package/dest/test/mock_checkpoint_builder.js +41 -30
  32. package/package.json +28 -28
  33. package/src/client/sequencer-client.ts +111 -12
  34. package/src/config.ts +17 -14
  35. package/src/publisher/config.ts +0 -9
  36. package/src/publisher/index.ts +0 -3
  37. package/src/publisher/sequencer-publisher-factory.ts +0 -15
  38. package/src/publisher/sequencer-publisher.ts +15 -237
  39. package/src/sequencer/checkpoint_proposal_job.ts +65 -65
  40. package/src/sequencer/sequencer.ts +12 -14
  41. package/src/sequencer/timetable.ts +7 -7
  42. package/src/sequencer/types.ts +1 -1
  43. package/src/test/mock_checkpoint_builder.ts +52 -47
  44. package/dest/publisher/l1_tx_failed_store/factory.d.ts +0 -11
  45. package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +0 -1
  46. package/dest/publisher/l1_tx_failed_store/factory.js +0 -22
  47. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +0 -59
  48. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +0 -1
  49. package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +0 -1
  50. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +0 -15
  51. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +0 -1
  52. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +0 -34
  53. package/dest/publisher/l1_tx_failed_store/index.d.ts +0 -4
  54. package/dest/publisher/l1_tx_failed_store/index.d.ts.map +0 -1
  55. package/dest/publisher/l1_tx_failed_store/index.js +0 -2
  56. package/src/publisher/l1_tx_failed_store/factory.ts +0 -32
  57. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +0 -55
  58. package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +0 -46
  59. package/src/publisher/l1_tx_failed_store/index.ts +0 -3
@@ -1,6 +1,8 @@
1
+ import { IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
1
2
  import { Fr } from '@aztec/foundation/curves/bn254';
3
+ import { unfreeze } from '@aztec/foundation/types';
4
+ import { L2Block } from '@aztec/stdlib/block';
2
5
  import { Checkpoint } from '@aztec/stdlib/checkpoint';
3
- import { Gas } from '@aztec/stdlib/gas';
4
6
  import { CheckpointHeader } from '@aztec/stdlib/rollup';
5
7
  import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
6
8
  /**
@@ -63,8 +65,10 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
63
65
  let block;
64
66
  let usedTxs;
65
67
  if (this.blockProvider) {
66
- // Dynamic mode: get block from provider
67
- block = this.blockProvider();
68
+ // Dynamic mode: get block from provider, cloning to avoid shared references across multiple buildBlock calls
69
+ block = L2Block.fromBuffer(this.blockProvider().toBuffer());
70
+ block.header.globalVariables.blockNumber = blockNumber;
71
+ await block.header.recomputeHash();
68
72
  usedTxs = [];
69
73
  this.builtBlocks.push(block);
70
74
  } else {
@@ -87,61 +91,63 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
87
91
  }
88
92
  return {
89
93
  block,
90
- publicGas: Gas.empty(),
91
94
  publicProcessorDuration: 0,
92
95
  numTxs: block?.body?.txEffects?.length ?? usedTxs.length,
93
96
  usedTxs,
94
- failedTxs: [],
95
- usedTxBlobFields: block?.body?.txEffects?.reduce((sum, tx)=>sum + tx.getNumBlobFields(), 0) ?? 0
97
+ failedTxs: []
96
98
  };
97
99
  }
98
100
  completeCheckpoint() {
99
101
  this.completeCheckpointCalled = true;
100
102
  const allBlocks = this.blockProvider ? this.builtBlocks : this.blocks;
101
- const lastBlock = allBlocks[allBlocks.length - 1];
102
- // Create a CheckpointHeader from the last block's header for testing
103
- const checkpointHeader = this.createCheckpointHeader(lastBlock);
104
- return Promise.resolve(new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, allBlocks, this.checkpointNumber));
103
+ return this.buildCheckpoint(allBlocks);
105
104
  }
106
105
  getCheckpoint() {
107
106
  this.getCheckpointCalled = true;
108
107
  const builtBlocks = this.blockProvider ? this.builtBlocks : this.blocks.slice(0, this.blockIndex);
109
- const lastBlock = builtBlocks[builtBlocks.length - 1];
110
- if (!lastBlock) {
108
+ if (builtBlocks.length === 0) {
111
109
  throw new Error('No blocks built yet');
112
110
  }
113
- // Create a CheckpointHeader from the last block's header for testing
114
- const checkpointHeader = this.createCheckpointHeader(lastBlock);
115
- return Promise.resolve(new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, builtBlocks, this.checkpointNumber));
116
- }
117
- /**
118
- * Creates a CheckpointHeader from a block's header for testing.
119
- * This is a simplified version that creates a minimal CheckpointHeader.
120
- */ createCheckpointHeader(block) {
121
- const header = block.header;
122
- const gv = header.globalVariables;
123
- return CheckpointHeader.empty({
124
- lastArchiveRoot: header.lastArchive.root,
111
+ return this.buildCheckpoint(builtBlocks);
112
+ }
113
+ /** Builds a structurally valid Checkpoint from a list of blocks, fixing up indexes and archive chaining. */ async buildCheckpoint(blocks) {
114
+ // Fix up indexWithinCheckpoint and archive chaining so the checkpoint passes structural validation.
115
+ for(let i = 0; i < blocks.length; i++){
116
+ blocks[i].indexWithinCheckpoint = IndexWithinCheckpoint(i);
117
+ if (i > 0) {
118
+ unfreeze(blocks[i].header).lastArchive = blocks[i - 1].archive;
119
+ await blocks[i].header.recomputeHash();
120
+ }
121
+ }
122
+ const firstBlock = blocks[0];
123
+ const lastBlock = blocks[blocks.length - 1];
124
+ const gv = firstBlock.header.globalVariables;
125
+ const checkpointHeader = CheckpointHeader.empty({
126
+ lastArchiveRoot: firstBlock.header.lastArchive.root,
125
127
  blockHeadersHash: Fr.random(),
126
128
  slotNumber: gv.slotNumber,
127
129
  timestamp: gv.timestamp,
128
130
  coinbase: gv.coinbase,
129
131
  feeRecipient: gv.feeRecipient,
130
132
  gasFees: gv.gasFees,
131
- totalManaUsed: header.totalManaUsed
133
+ totalManaUsed: lastBlock.header.totalManaUsed
132
134
  });
135
+ return new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, blocks, this.checkpointNumber);
133
136
  }
134
- /** Reset for reuse in another test */ reset() {
135
- this.blocks = [];
137
+ /** Resets per-checkpoint state (built blocks, consumed txs) while preserving config (blockProvider, seeded blocks). */ resetCheckpointState() {
136
138
  this.builtBlocks = [];
137
- this.usedTxsPerBlock = [];
138
139
  this.blockIndex = 0;
139
- this.buildBlockCalls = [];
140
140
  this.consumedTxHashes.clear();
141
141
  this.completeCheckpointCalled = false;
142
142
  this.getCheckpointCalled = false;
143
+ }
144
+ /** Reset for reuse in another test */ reset() {
145
+ this.blocks = [];
146
+ this.usedTxsPerBlock = [];
147
+ this.buildBlockCalls = [];
143
148
  this.errorOnBuild = undefined;
144
149
  this.blockProvider = undefined;
150
+ this.resetCheckpointState();
145
151
  }
146
152
  }
147
153
  /**
@@ -175,7 +181,8 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
175
181
  l1GenesisTime: 0n,
176
182
  slotDuration: 24,
177
183
  l1ChainId: 1,
178
- rollupVersion: 1
184
+ rollupVersion: 1,
185
+ rollupManaLimit: 200_000_000
179
186
  };
180
187
  }
181
188
  updateConfig(config) {
@@ -192,6 +199,8 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
192
199
  if (!this.checkpointBuilder) {
193
200
  // Auto-create a builder if none was set
194
201
  this.checkpointBuilder = new MockCheckpointBuilder(constants, checkpointNumber);
202
+ } else {
203
+ this.checkpointBuilder.resetCheckpointState();
195
204
  }
196
205
  return Promise.resolve(this.checkpointBuilder);
197
206
  }
@@ -207,6 +216,8 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
207
216
  if (!this.checkpointBuilder) {
208
217
  // Auto-create a builder if none was set
209
218
  this.checkpointBuilder = new MockCheckpointBuilder(constants, checkpointNumber);
219
+ } else {
220
+ this.checkpointBuilder.resetCheckpointState();
210
221
  }
211
222
  return Promise.resolve(this.checkpointBuilder);
212
223
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.0.1-commit.f504929",
3
+ "version": "0.0.1-commit.f81dbcf",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -26,38 +26,38 @@
26
26
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
27
27
  },
28
28
  "dependencies": {
29
- "@aztec/aztec.js": "0.0.1-commit.f504929",
30
- "@aztec/bb-prover": "0.0.1-commit.f504929",
31
- "@aztec/blob-client": "0.0.1-commit.f504929",
32
- "@aztec/blob-lib": "0.0.1-commit.f504929",
33
- "@aztec/constants": "0.0.1-commit.f504929",
34
- "@aztec/epoch-cache": "0.0.1-commit.f504929",
35
- "@aztec/ethereum": "0.0.1-commit.f504929",
36
- "@aztec/foundation": "0.0.1-commit.f504929",
37
- "@aztec/l1-artifacts": "0.0.1-commit.f504929",
38
- "@aztec/merkle-tree": "0.0.1-commit.f504929",
39
- "@aztec/node-keystore": "0.0.1-commit.f504929",
40
- "@aztec/noir-acvm_js": "0.0.1-commit.f504929",
41
- "@aztec/noir-contracts.js": "0.0.1-commit.f504929",
42
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f504929",
43
- "@aztec/noir-types": "0.0.1-commit.f504929",
44
- "@aztec/p2p": "0.0.1-commit.f504929",
45
- "@aztec/protocol-contracts": "0.0.1-commit.f504929",
46
- "@aztec/prover-client": "0.0.1-commit.f504929",
47
- "@aztec/simulator": "0.0.1-commit.f504929",
48
- "@aztec/slasher": "0.0.1-commit.f504929",
49
- "@aztec/stdlib": "0.0.1-commit.f504929",
50
- "@aztec/telemetry-client": "0.0.1-commit.f504929",
51
- "@aztec/validator-client": "0.0.1-commit.f504929",
52
- "@aztec/validator-ha-signer": "0.0.1-commit.f504929",
53
- "@aztec/world-state": "0.0.1-commit.f504929",
29
+ "@aztec/aztec.js": "0.0.1-commit.f81dbcf",
30
+ "@aztec/bb-prover": "0.0.1-commit.f81dbcf",
31
+ "@aztec/blob-client": "0.0.1-commit.f81dbcf",
32
+ "@aztec/blob-lib": "0.0.1-commit.f81dbcf",
33
+ "@aztec/constants": "0.0.1-commit.f81dbcf",
34
+ "@aztec/epoch-cache": "0.0.1-commit.f81dbcf",
35
+ "@aztec/ethereum": "0.0.1-commit.f81dbcf",
36
+ "@aztec/foundation": "0.0.1-commit.f81dbcf",
37
+ "@aztec/l1-artifacts": "0.0.1-commit.f81dbcf",
38
+ "@aztec/merkle-tree": "0.0.1-commit.f81dbcf",
39
+ "@aztec/node-keystore": "0.0.1-commit.f81dbcf",
40
+ "@aztec/noir-acvm_js": "0.0.1-commit.f81dbcf",
41
+ "@aztec/noir-contracts.js": "0.0.1-commit.f81dbcf",
42
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f81dbcf",
43
+ "@aztec/noir-types": "0.0.1-commit.f81dbcf",
44
+ "@aztec/p2p": "0.0.1-commit.f81dbcf",
45
+ "@aztec/protocol-contracts": "0.0.1-commit.f81dbcf",
46
+ "@aztec/prover-client": "0.0.1-commit.f81dbcf",
47
+ "@aztec/simulator": "0.0.1-commit.f81dbcf",
48
+ "@aztec/slasher": "0.0.1-commit.f81dbcf",
49
+ "@aztec/stdlib": "0.0.1-commit.f81dbcf",
50
+ "@aztec/telemetry-client": "0.0.1-commit.f81dbcf",
51
+ "@aztec/validator-client": "0.0.1-commit.f81dbcf",
52
+ "@aztec/validator-ha-signer": "0.0.1-commit.f81dbcf",
53
+ "@aztec/world-state": "0.0.1-commit.f81dbcf",
54
54
  "lodash.chunk": "^4.2.0",
55
55
  "tslib": "^2.4.0",
56
56
  "viem": "npm:@aztec/viem@2.38.2"
57
57
  },
58
58
  "devDependencies": {
59
- "@aztec/archiver": "0.0.1-commit.f504929",
60
- "@aztec/kv-store": "0.0.1-commit.f504929",
59
+ "@aztec/archiver": "0.0.1-commit.f81dbcf",
60
+ "@aztec/kv-store": "0.0.1-commit.f81dbcf",
61
61
  "@electric-sql/pglite": "^0.3.14",
62
62
  "@jest/globals": "^30.0.0",
63
63
  "@types/jest": "^30.0.0",
@@ -1,4 +1,5 @@
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';
@@ -18,10 +19,15 @@ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
18
19
  import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
19
20
  import { FullNodeCheckpointsBuilder, NodeKeystoreAdapter, type ValidatorClient } from '@aztec/validator-client';
20
21
 
21
- import { type SequencerClientConfig, getPublisherConfigFromSequencerConfig } from '../config.js';
22
+ import {
23
+ DefaultSequencerConfig,
24
+ type SequencerClientConfig,
25
+ getPublisherConfigFromSequencerConfig,
26
+ } from '../config.js';
22
27
  import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
23
28
  import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
24
29
  import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
30
+ import { SequencerTimetable } from '../sequencer/timetable.js';
25
31
 
26
32
  /**
27
33
  * Encapsulates the full sequencer and publisher.
@@ -137,17 +143,14 @@ export class SequencerClient {
137
143
  });
138
144
 
139
145
  const ethereumSlotDuration = config.ethereumSlotDuration;
140
- const l1Constants = { l1GenesisTime, slotDuration: Number(slotDuration), ethereumSlotDuration };
141
146
 
142
- const globalsBuilder = new GlobalVariableBuilder({ ...config, ...l1Constants, rollupVersion });
143
-
144
- let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
145
- if (sequencerManaLimit > rollupManaLimit) {
146
- log.warn(
147
- `Provided maxL2BlockGas ${sequencerManaLimit} is greater than the max allowed by L1. Setting limit to ${rollupManaLimit}.`,
148
- );
149
- sequencerManaLimit = rollupManaLimit;
150
- }
147
+ const globalsBuilder = new GlobalVariableBuilder({
148
+ ...config,
149
+ l1GenesisTime,
150
+ slotDuration: Number(slotDuration),
151
+ ethereumSlotDuration,
152
+ rollupVersion,
153
+ });
151
154
 
152
155
  // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
153
156
  // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
@@ -157,6 +160,15 @@ export class SequencerClient {
157
160
  const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
158
161
  const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
159
162
 
163
+ const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = computeBlockLimits(
164
+ config,
165
+ rollupManaLimit,
166
+ l1PublishingTime,
167
+ log,
168
+ );
169
+
170
+ const l1Constants = { l1GenesisTime, slotDuration: Number(slotDuration), ethereumSlotDuration, rollupManaLimit };
171
+
160
172
  const sequencer = new Sequencer(
161
173
  publisherFactory,
162
174
  validatorClient,
@@ -171,7 +183,7 @@ export class SequencerClient {
171
183
  deps.dateProvider,
172
184
  epochCache,
173
185
  rollupContract,
174
- { ...config, l1PublishingTime, maxL2BlockGas: sequencerManaLimit },
186
+ { ...config, l1PublishingTime, maxL2BlockGas, maxDABlockGas, maxTxsPerBlock },
175
187
  telemetryClient,
176
188
  log,
177
189
  );
@@ -234,3 +246,90 @@ export class SequencerClient {
234
246
  return this.sequencer.maxL2BlockGas;
235
247
  }
236
248
  }
249
+
250
+ /**
251
+ * Computes per-block L2 gas, DA gas, and TX count budgets based on the L1 rollup limits and the timetable.
252
+ * If the user explicitly set a limit, it is capped at the corresponding checkpoint limit.
253
+ * Otherwise, derives it as (checkpointLimit / maxBlocks) * multiplier, capped at the checkpoint limit.
254
+ */
255
+ export function computeBlockLimits(
256
+ config: SequencerClientConfig,
257
+ rollupManaLimit: number,
258
+ l1PublishingTime: number,
259
+ log: ReturnType<typeof createLogger>,
260
+ ): { maxL2BlockGas: number; maxDABlockGas: number; maxTxsPerBlock: number } {
261
+ const maxNumberOfBlocks = new SequencerTimetable({
262
+ ethereumSlotDuration: config.ethereumSlotDuration,
263
+ aztecSlotDuration: config.aztecSlotDuration,
264
+ l1PublishingTime,
265
+ p2pPropagationTime: config.attestationPropagationTime,
266
+ blockDurationMs: config.blockDurationMs,
267
+ enforce: config.enforceTimeTable ?? DefaultSequencerConfig.enforceTimeTable,
268
+ }).maxNumberOfBlocks;
269
+
270
+ const multiplier = config.perBlockAllocationMultiplier ?? DefaultSequencerConfig.perBlockAllocationMultiplier;
271
+
272
+ // Compute maxL2BlockGas
273
+ let maxL2BlockGas: number;
274
+ if (config.maxL2BlockGas !== undefined) {
275
+ if (config.maxL2BlockGas > rollupManaLimit) {
276
+ log.warn(
277
+ `Provided MAX_L2_BLOCK_GAS ${config.maxL2BlockGas} exceeds L1 rollup mana limit ${rollupManaLimit} (capping)`,
278
+ );
279
+ maxL2BlockGas = rollupManaLimit;
280
+ } else {
281
+ maxL2BlockGas = config.maxL2BlockGas;
282
+ }
283
+ } else {
284
+ maxL2BlockGas = Math.min(rollupManaLimit, Math.ceil((rollupManaLimit / maxNumberOfBlocks) * multiplier));
285
+ }
286
+
287
+ // Compute maxDABlockGas
288
+ const daCheckpointLimit = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
289
+ let maxDABlockGas: number;
290
+ if (config.maxDABlockGas !== undefined) {
291
+ if (config.maxDABlockGas > daCheckpointLimit) {
292
+ log.warn(
293
+ `Provided MAX_DA_BLOCK_GAS ${config.maxDABlockGas} exceeds DA checkpoint limit ${daCheckpointLimit} (capping)`,
294
+ );
295
+ maxDABlockGas = daCheckpointLimit;
296
+ } else {
297
+ maxDABlockGas = config.maxDABlockGas;
298
+ }
299
+ } else {
300
+ maxDABlockGas = Math.min(daCheckpointLimit, Math.ceil((daCheckpointLimit / maxNumberOfBlocks) * multiplier));
301
+ }
302
+
303
+ // Compute maxTxsPerBlock
304
+ const defaultMaxTxsPerBlock = 32;
305
+ let maxTxsPerBlock: number;
306
+ if (config.maxTxsPerBlock !== undefined) {
307
+ if (config.maxTxsPerCheckpoint !== undefined && config.maxTxsPerBlock > config.maxTxsPerCheckpoint) {
308
+ log.warn(
309
+ `Provided MAX_TX_PER_BLOCK ${config.maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`,
310
+ );
311
+ maxTxsPerBlock = config.maxTxsPerCheckpoint;
312
+ } else {
313
+ maxTxsPerBlock = config.maxTxsPerBlock;
314
+ }
315
+ } else if (config.maxTxsPerCheckpoint !== undefined) {
316
+ maxTxsPerBlock = Math.min(
317
+ config.maxTxsPerCheckpoint,
318
+ Math.ceil((config.maxTxsPerCheckpoint / maxNumberOfBlocks) * multiplier),
319
+ );
320
+ } else {
321
+ maxTxsPerBlock = defaultMaxTxsPerBlock;
322
+ }
323
+
324
+ log.info(`Computed block limits L2=${maxL2BlockGas} DA=${maxDABlockGas} maxTxs=${maxTxsPerBlock}`, {
325
+ maxL2BlockGas,
326
+ maxDABlockGas,
327
+ maxTxsPerBlock,
328
+ rollupManaLimit,
329
+ daCheckpointLimit,
330
+ maxNumberOfBlocks,
331
+ multiplier,
332
+ });
333
+
334
+ return { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock };
335
+ }
package/src/config.ts CHANGED
@@ -13,7 +13,6 @@ import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
13
13
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
14
  import {
15
15
  type ChainConfig,
16
- DEFAULT_MAX_TXS_PER_BLOCK,
17
16
  type SequencerConfig,
18
17
  chainConfigMappings,
19
18
  sharedSequencerConfigMappings,
@@ -36,15 +35,12 @@ export type { SequencerConfig };
36
35
  * Default values for SequencerConfig.
37
36
  * Centralized location for all sequencer configuration defaults.
38
37
  */
39
- export const DefaultSequencerConfig: ResolvedSequencerConfig = {
38
+ export const DefaultSequencerConfig = {
40
39
  sequencerPollingIntervalMS: 500,
41
- maxTxsPerBlock: DEFAULT_MAX_TXS_PER_BLOCK,
42
40
  minTxsPerBlock: 1,
43
41
  buildCheckpointIfEmpty: false,
44
42
  publishTxsWithProposals: false,
45
- maxL2BlockGas: 10e9,
46
- maxDABlockGas: 10e9,
47
- maxBlockSizeInBytes: 1024 * 1024,
43
+ perBlockAllocationMultiplier: 1.2,
48
44
  enforceTimeTable: true,
49
45
  attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
50
46
  secondsBeforeInvalidatingBlockAsCommitteeMember: 144, // 12 L1 blocks
@@ -59,7 +55,7 @@ export const DefaultSequencerConfig: ResolvedSequencerConfig = {
59
55
  shuffleAttestationOrdering: false,
60
56
  skipPushProposedBlocksToArchiver: false,
61
57
  skipPublishingCheckpointsPercent: 0,
62
- };
58
+ } satisfies ResolvedSequencerConfig;
63
59
 
64
60
  /**
65
61
  * Configuration settings for the SequencerClient.
@@ -80,6 +76,11 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
80
76
  description: 'The number of ms to wait between polling for checking to build on the next slot.',
81
77
  ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS),
82
78
  },
79
+ maxTxsPerCheckpoint: {
80
+ env: 'SEQ_MAX_TX_PER_CHECKPOINT',
81
+ description: 'The maximum number of txs across all blocks in a checkpoint.',
82
+ parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
83
+ },
83
84
  minTxsPerBlock: {
84
85
  env: 'SEQ_MIN_TX_PER_BLOCK',
85
86
  description: 'The minimum number of txs to include in a block.',
@@ -97,12 +98,19 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
97
98
  maxL2BlockGas: {
98
99
  env: 'SEQ_MAX_L2_BLOCK_GAS',
99
100
  description: 'The maximum L2 block gas.',
100
- ...numberConfigHelper(DefaultSequencerConfig.maxL2BlockGas),
101
+ parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
101
102
  },
102
103
  maxDABlockGas: {
103
104
  env: 'SEQ_MAX_DA_BLOCK_GAS',
104
105
  description: 'The maximum DA block gas.',
105
- ...numberConfigHelper(DefaultSequencerConfig.maxDABlockGas),
106
+ parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
107
+ },
108
+ perBlockAllocationMultiplier: {
109
+ env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
110
+ description:
111
+ 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' +
112
+ ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
113
+ ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier),
106
114
  },
107
115
  coinbase: {
108
116
  env: 'COINBASE',
@@ -122,11 +130,6 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
122
130
  env: 'ACVM_BINARY_PATH',
123
131
  description: 'The path to the ACVM binary',
124
132
  },
125
- maxBlockSizeInBytes: {
126
- env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
127
- description: 'Max block size',
128
- ...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes),
129
- },
130
133
  enforceTimeTable: {
131
134
  env: 'SEQ_ENFORCE_TIME_TABLE',
132
135
  description: 'Whether to enforce the time table when building blocks',
@@ -48,8 +48,6 @@ export type PublisherConfig = L1TxUtilsConfig &
48
48
  fishermanMode?: boolean;
49
49
  /** Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only) */
50
50
  publisherForwarderAddress?: EthAddress;
51
- /** Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path */
52
- l1TxFailedStore?: string;
53
51
  };
54
52
 
55
53
  export type ProverPublisherConfig = L1TxUtilsConfig &
@@ -64,8 +62,6 @@ export type SequencerPublisherConfig = L1TxUtilsConfig &
64
62
  fishermanMode?: boolean;
65
63
  sequencerPublisherAllowInvalidStates?: boolean;
66
64
  sequencerPublisherForwarderAddress?: EthAddress;
67
- /** Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path */
68
- l1TxFailedStore?: string;
69
65
  };
70
66
 
71
67
  export function getPublisherConfigFromProverConfig(config: ProverPublisherConfig): PublisherConfig {
@@ -81,7 +77,6 @@ export function getPublisherConfigFromSequencerConfig(config: SequencerPublisher
81
77
  ...config,
82
78
  publisherAllowInvalidStates: config.sequencerPublisherAllowInvalidStates,
83
79
  publisherForwarderAddress: config.sequencerPublisherForwarderAddress,
84
- l1TxFailedStore: config.l1TxFailedStore,
85
80
  };
86
81
  }
87
82
 
@@ -138,10 +133,6 @@ export const sequencerPublisherConfigMappings: ConfigMappingsType<SequencerPubli
138
133
  description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
139
134
  parseEnv: (val: string) => (val ? EthAddress.fromString(val) : undefined),
140
135
  },
141
- l1TxFailedStore: {
142
- env: 'L1_TX_FAILED_STORE',
143
- description: 'Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path',
144
- },
145
136
  };
146
137
 
147
138
  export const proverPublisherConfigMappings: ConfigMappingsType<ProverPublisherConfig & L1TxUtilsConfig> = {
@@ -3,6 +3,3 @@ export { SequencerPublisherFactory } from './sequencer-publisher-factory.js';
3
3
 
4
4
  // Used for tests
5
5
  export { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
6
-
7
- // Failed L1 tx store (optional, for test networks)
8
- export { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './l1_tx_failed_store/index.js';
@@ -81,23 +81,8 @@ export class SequencerPublisherFactory {
81
81
  const rollup = this.deps.rollupContract;
82
82
  const slashingProposerContract = await rollup.getSlashingProposer();
83
83
 
84
- const getNextPublisher = async (excludeAddresses: EthAddress[]): Promise<L1TxUtils | undefined> => {
85
- const exclusionFilter: PublisherFilter<L1TxUtils> = (utils: L1TxUtils) => {
86
- if (excludeAddresses.some(addr => addr.equals(utils.getSenderAddress()))) {
87
- return false;
88
- }
89
- return filter(utils);
90
- };
91
- try {
92
- return await this.deps.publisherManager.getAvailablePublisher(exclusionFilter);
93
- } catch {
94
- return undefined;
95
- }
96
- };
97
-
98
84
  const publisher = new SequencerPublisher(this.sequencerConfig, {
99
85
  l1TxUtils: l1Publisher,
100
- getNextPublisher,
101
86
  telemetry: this.deps.telemetry,
102
87
  blobClient: this.deps.blobClient,
103
88
  rollupContract: this.deps.rollupContract,