@aztec/sequencer-client 0.0.1-commit.0c875d939 → 0.0.1-commit.0ec55a70b

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 (103) hide show
  1. package/dest/client/sequencer-client.d.ts +17 -7
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +63 -30
  4. package/dest/config.d.ts +27 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +55 -30
  7. package/dest/global_variable_builder/fee_predictor.d.ts +37 -0
  8. package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -0
  9. package/dest/global_variable_builder/fee_predictor.js +128 -0
  10. package/dest/global_variable_builder/fee_provider.d.ts +21 -0
  11. package/dest/global_variable_builder/fee_provider.d.ts.map +1 -0
  12. package/dest/global_variable_builder/fee_provider.js +58 -0
  13. package/dest/global_variable_builder/global_builder.d.ts +15 -16
  14. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  15. package/dest/global_variable_builder/global_builder.js +16 -50
  16. package/dest/global_variable_builder/index.d.ts +4 -2
  17. package/dest/global_variable_builder/index.d.ts.map +1 -1
  18. package/dest/global_variable_builder/index.js +2 -0
  19. package/dest/publisher/config.d.ts +47 -17
  20. package/dest/publisher/config.d.ts.map +1 -1
  21. package/dest/publisher/config.js +121 -42
  22. package/dest/publisher/index.d.ts +2 -1
  23. package/dest/publisher/index.d.ts.map +1 -1
  24. package/dest/publisher/l1_tx_failed_store/factory.d.ts +11 -0
  25. package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +1 -0
  26. package/dest/publisher/l1_tx_failed_store/factory.js +22 -0
  27. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +58 -0
  28. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -0
  29. package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +1 -0
  30. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +15 -0
  31. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -0
  32. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +34 -0
  33. package/dest/publisher/l1_tx_failed_store/index.d.ts +4 -0
  34. package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -0
  35. package/dest/publisher/l1_tx_failed_store/index.js +2 -0
  36. package/dest/publisher/sequencer-publisher-factory.d.ts +11 -5
  37. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  38. package/dest/publisher/sequencer-publisher-factory.js +27 -3
  39. package/dest/publisher/sequencer-publisher.d.ts +68 -48
  40. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  41. package/dest/publisher/sequencer-publisher.js +421 -137
  42. package/dest/sequencer/chain_state_overrides.d.ts +25 -0
  43. package/dest/sequencer/chain_state_overrides.d.ts.map +1 -0
  44. package/dest/sequencer/chain_state_overrides.js +39 -0
  45. package/dest/sequencer/checkpoint_proposal_job.d.ts +46 -10
  46. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  47. package/dest/sequencer/checkpoint_proposal_job.js +700 -220
  48. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts +34 -0
  49. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts.map +1 -0
  50. package/dest/sequencer/checkpoint_proposal_job_metrics.js +72 -0
  51. package/dest/sequencer/checkpoint_voter.d.ts +1 -2
  52. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
  53. package/dest/sequencer/checkpoint_voter.js +2 -5
  54. package/dest/sequencer/events.d.ts +7 -1
  55. package/dest/sequencer/events.d.ts.map +1 -1
  56. package/dest/sequencer/metrics.d.ts +20 -8
  57. package/dest/sequencer/metrics.d.ts.map +1 -1
  58. package/dest/sequencer/metrics.js +92 -21
  59. package/dest/sequencer/sequencer.d.ts +53 -19
  60. package/dest/sequencer/sequencer.d.ts.map +1 -1
  61. package/dest/sequencer/sequencer.js +188 -102
  62. package/dest/sequencer/timetable.d.ts +17 -3
  63. package/dest/sequencer/timetable.d.ts.map +1 -1
  64. package/dest/sequencer/timetable.js +51 -43
  65. package/dest/sequencer/types.d.ts +2 -2
  66. package/dest/sequencer/types.d.ts.map +1 -1
  67. package/dest/test/index.d.ts +3 -5
  68. package/dest/test/index.d.ts.map +1 -1
  69. package/dest/test/mock_checkpoint_builder.d.ts +7 -9
  70. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
  71. package/dest/test/mock_checkpoint_builder.js +39 -30
  72. package/dest/test/utils.d.ts +1 -1
  73. package/dest/test/utils.d.ts.map +1 -1
  74. package/dest/test/utils.js +7 -6
  75. package/package.json +27 -28
  76. package/src/client/sequencer-client.ts +81 -30
  77. package/src/config.ts +68 -35
  78. package/src/global_variable_builder/README.md +44 -0
  79. package/src/global_variable_builder/fee_predictor.ts +172 -0
  80. package/src/global_variable_builder/fee_provider.ts +75 -0
  81. package/src/global_variable_builder/global_builder.ts +27 -63
  82. package/src/global_variable_builder/index.ts +3 -1
  83. package/src/publisher/config.ts +157 -45
  84. package/src/publisher/index.ts +3 -0
  85. package/src/publisher/l1_tx_failed_store/factory.ts +32 -0
  86. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +57 -0
  87. package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +46 -0
  88. package/src/publisher/l1_tx_failed_store/index.ts +3 -0
  89. package/src/publisher/sequencer-publisher-factory.ts +38 -9
  90. package/src/publisher/sequencer-publisher.ts +474 -197
  91. package/src/sequencer/README.md +82 -13
  92. package/src/sequencer/chain_state_overrides.ts +87 -0
  93. package/src/sequencer/checkpoint_proposal_job.ts +866 -241
  94. package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
  95. package/src/sequencer/checkpoint_voter.ts +1 -12
  96. package/src/sequencer/events.ts +6 -1
  97. package/src/sequencer/metrics.ts +108 -25
  98. package/src/sequencer/sequencer.ts +262 -116
  99. package/src/sequencer/timetable.ts +64 -52
  100. package/src/sequencer/types.ts +1 -1
  101. package/src/test/index.ts +2 -4
  102. package/src/test/mock_checkpoint_builder.ts +51 -48
  103. package/src/test/utils.ts +28 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.0.1-commit.0c875d939",
3
+ "version": "0.0.1-commit.0ec55a70b",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -26,38 +26,37 @@
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.0c875d939",
30
- "@aztec/bb-prover": "0.0.1-commit.0c875d939",
31
- "@aztec/blob-client": "0.0.1-commit.0c875d939",
32
- "@aztec/blob-lib": "0.0.1-commit.0c875d939",
33
- "@aztec/constants": "0.0.1-commit.0c875d939",
34
- "@aztec/epoch-cache": "0.0.1-commit.0c875d939",
35
- "@aztec/ethereum": "0.0.1-commit.0c875d939",
36
- "@aztec/foundation": "0.0.1-commit.0c875d939",
37
- "@aztec/l1-artifacts": "0.0.1-commit.0c875d939",
38
- "@aztec/merkle-tree": "0.0.1-commit.0c875d939",
39
- "@aztec/node-keystore": "0.0.1-commit.0c875d939",
40
- "@aztec/noir-acvm_js": "0.0.1-commit.0c875d939",
41
- "@aztec/noir-contracts.js": "0.0.1-commit.0c875d939",
42
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0c875d939",
43
- "@aztec/noir-types": "0.0.1-commit.0c875d939",
44
- "@aztec/p2p": "0.0.1-commit.0c875d939",
45
- "@aztec/protocol-contracts": "0.0.1-commit.0c875d939",
46
- "@aztec/prover-client": "0.0.1-commit.0c875d939",
47
- "@aztec/simulator": "0.0.1-commit.0c875d939",
48
- "@aztec/slasher": "0.0.1-commit.0c875d939",
49
- "@aztec/stdlib": "0.0.1-commit.0c875d939",
50
- "@aztec/telemetry-client": "0.0.1-commit.0c875d939",
51
- "@aztec/validator-client": "0.0.1-commit.0c875d939",
52
- "@aztec/validator-ha-signer": "0.0.1-commit.0c875d939",
53
- "@aztec/world-state": "0.0.1-commit.0c875d939",
29
+ "@aztec/aztec.js": "0.0.1-commit.0ec55a70b",
30
+ "@aztec/bb-prover": "0.0.1-commit.0ec55a70b",
31
+ "@aztec/blob-client": "0.0.1-commit.0ec55a70b",
32
+ "@aztec/blob-lib": "0.0.1-commit.0ec55a70b",
33
+ "@aztec/constants": "0.0.1-commit.0ec55a70b",
34
+ "@aztec/epoch-cache": "0.0.1-commit.0ec55a70b",
35
+ "@aztec/ethereum": "0.0.1-commit.0ec55a70b",
36
+ "@aztec/foundation": "0.0.1-commit.0ec55a70b",
37
+ "@aztec/l1-artifacts": "0.0.1-commit.0ec55a70b",
38
+ "@aztec/node-keystore": "0.0.1-commit.0ec55a70b",
39
+ "@aztec/noir-acvm_js": "0.0.1-commit.0ec55a70b",
40
+ "@aztec/noir-contracts.js": "0.0.1-commit.0ec55a70b",
41
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.0ec55a70b",
42
+ "@aztec/noir-types": "0.0.1-commit.0ec55a70b",
43
+ "@aztec/p2p": "0.0.1-commit.0ec55a70b",
44
+ "@aztec/protocol-contracts": "0.0.1-commit.0ec55a70b",
45
+ "@aztec/prover-client": "0.0.1-commit.0ec55a70b",
46
+ "@aztec/simulator": "0.0.1-commit.0ec55a70b",
47
+ "@aztec/slasher": "0.0.1-commit.0ec55a70b",
48
+ "@aztec/stdlib": "0.0.1-commit.0ec55a70b",
49
+ "@aztec/telemetry-client": "0.0.1-commit.0ec55a70b",
50
+ "@aztec/validator-client": "0.0.1-commit.0ec55a70b",
51
+ "@aztec/validator-ha-signer": "0.0.1-commit.0ec55a70b",
52
+ "@aztec/world-state": "0.0.1-commit.0ec55a70b",
54
53
  "lodash.chunk": "^4.2.0",
55
54
  "tslib": "^2.4.0",
56
55
  "viem": "npm:@aztec/viem@2.38.2"
57
56
  },
58
57
  "devDependencies": {
59
- "@aztec/archiver": "0.0.1-commit.0c875d939",
60
- "@aztec/kv-store": "0.0.1-commit.0c875d939",
58
+ "@aztec/archiver": "0.0.1-commit.0ec55a70b",
59
+ "@aztec/kv-store": "0.0.1-commit.0ec55a70b",
61
60
  "@electric-sql/pglite": "^0.3.14",
62
61
  "@jest/globals": "^30.0.0",
63
62
  "@types/jest": "^30.0.0",
@@ -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 { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
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';
@@ -13,13 +14,12 @@ import type { P2P } from '@aztec/p2p';
13
14
  import type { SlasherClientInterface } from '@aztec/slasher';
14
15
  import type { L2BlockSink, L2BlockSource } 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 { SequencerClientConfig } from '../config.js';
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<L1TxUtilsWithBlobs>,
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
  /**
@@ -62,8 +63,10 @@ export class SequencerClient {
62
63
  blobClient: BlobClientInterface;
63
64
  dateProvider: DateProvider;
64
65
  epochCache?: EpochCache;
65
- l1TxUtils: L1TxUtilsWithBlobs[];
66
+ l1TxUtils: L1TxUtils[];
67
+ funderL1TxUtils?: L1TxUtils;
66
68
  nodeKeyStore: KeystoreManager;
69
+ globalVariableBuilder: GlobalVariableBuilder;
67
70
  },
68
71
  ) {
69
72
  const {
@@ -85,12 +88,14 @@ export class SequencerClient {
85
88
  publicClient,
86
89
  l1TxUtils.map(x => x.getSenderAddress()),
87
90
  );
88
- const publisherManager = new PublisherManager(l1TxUtils, config, log.getBindings());
91
+ const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
92
+ bindings: log.getBindings(),
93
+ funder: deps.funderL1TxUtils,
94
+ });
89
95
  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
90
- const [l1GenesisTime, slotDuration, rollupVersion, rollupManaLimit] = await Promise.all([
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
 
@@ -107,15 +112,11 @@ export class SequencerClient {
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
- let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
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,10 @@ 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 = { l1GenesisTime, slotDuration: Number(slotDuration), ethereumSlotDuration, rollupManaLimit };
149
+
155
150
  const sequencer = new Sequencer(
156
151
  publisherFactory,
157
152
  validatorClient,
@@ -166,14 +161,17 @@ export class SequencerClient {
166
161
  deps.dateProvider,
167
162
  epochCache,
168
163
  rollupContract,
169
- { ...config, l1PublishingTime, maxL2BlockGas: sequencerManaLimit },
164
+ { ...config, l1PublishingTime, maxL2BlockGas, maxDABlockGas, maxTxsPerBlock },
170
165
  telemetryClient,
171
166
  log,
172
167
  );
173
168
 
174
- await sequencer.init();
169
+ sequencer.init();
170
+
171
+ // Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
172
+ const delayer = l1TxUtils[0]?.delayer;
175
173
 
176
- return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics);
174
+ return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer);
177
175
  }
178
176
 
179
177
  /**
@@ -191,7 +189,7 @@ export class SequencerClient {
191
189
  await this.validatorClient?.start();
192
190
  this.sequencer.start();
193
191
  this.l1Metrics?.start();
194
- await this.publisherManager.loadState();
192
+ await this.publisherManager.start();
195
193
  }
196
194
 
197
195
  /**
@@ -200,14 +198,29 @@ export class SequencerClient {
200
198
  public async stop() {
201
199
  await this.sequencer.stop();
202
200
  await this.validatorClient?.stop();
203
- this.publisherManager.interrupt();
201
+ await this.publisherManager.stop();
204
202
  this.l1Metrics?.stop();
205
203
  }
206
204
 
205
+ /** Triggers an immediate run of the sequencer, bypassing the polling interval. */
206
+ public trigger() {
207
+ return this.sequencer.trigger();
208
+ }
209
+
207
210
  public getSequencer(): Sequencer {
208
211
  return this.sequencer;
209
212
  }
210
213
 
214
+ /** Updates the publisher factory's node keystore adapter after a keystore reload. */
215
+ public updatePublisherNodeKeyStore(adapter: NodeKeystoreAdapter): void {
216
+ this.sequencer.updatePublisherNodeKeyStore(adapter);
217
+ }
218
+
219
+ /** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */
220
+ getDelayer(): Delayer | undefined {
221
+ return this.delayer_;
222
+ }
223
+
211
224
  get validatorAddresses(): EthAddress[] | undefined {
212
225
  return this.sequencer.getValidatorAddresses();
213
226
  }
@@ -216,3 +229,41 @@ export class SequencerClient {
216
229
  return this.sequencer.maxL2BlockGas;
217
230
  }
218
231
  }
232
+
233
+ /**
234
+ * Caps operator-provided per-block limits at checkpoint-level limits.
235
+ * Returns undefined for any limit the operator didn't set — the checkpoint builder handles redistribution.
236
+ */
237
+ function capPerBlockLimits(
238
+ config: SequencerClientConfig,
239
+ rollupManaLimit: number,
240
+ log: ReturnType<typeof createLogger>,
241
+ ): { maxL2BlockGas: number | undefined; maxDABlockGas: number | undefined; maxTxsPerBlock: number | undefined } {
242
+ let maxL2BlockGas = config.maxL2BlockGas;
243
+ if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
244
+ log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
245
+ maxL2BlockGas = rollupManaLimit;
246
+ }
247
+
248
+ let maxDABlockGas = config.maxDABlockGas;
249
+ if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
250
+ log.warn(
251
+ `Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`,
252
+ );
253
+ maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
254
+ }
255
+
256
+ let maxTxsPerBlock = config.maxTxsPerBlock;
257
+ if (
258
+ maxTxsPerBlock !== undefined &&
259
+ config.maxTxsPerCheckpoint !== undefined &&
260
+ maxTxsPerBlock > config.maxTxsPerCheckpoint
261
+ ) {
262
+ log.warn(
263
+ `Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`,
264
+ );
265
+ maxTxsPerBlock = config.maxTxsPerCheckpoint;
266
+ }
267
+
268
+ return { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock };
269
+ }
package/src/config.ts CHANGED
@@ -5,6 +5,7 @@ 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';
@@ -13,8 +14,11 @@ import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
13
14
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
15
  import {
15
16
  type ChainConfig,
17
+ DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
18
+ type PipelineConfig,
16
19
  type SequencerConfig,
17
20
  chainConfigMappings,
21
+ pipelineConfigMappings,
18
22
  sharedSequencerConfigMappings,
19
23
  } from '@aztec/stdlib/config';
20
24
  import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
@@ -22,10 +26,10 @@ import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
22
26
  import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
23
27
 
24
28
  import {
25
- type PublisherConfig,
26
- type TxSenderConfig,
27
- getPublisherConfigMappings,
28
- getTxSenderConfigMappings,
29
+ type SequencerPublisherConfig,
30
+ type SequencerTxSenderConfig,
31
+ sequencerPublisherConfigMappings,
32
+ sequencerTxSenderConfigMappings,
29
33
  } from './publisher/config.js';
30
34
 
31
35
  export * from './publisher/config.js';
@@ -35,15 +39,13 @@ export type { SequencerConfig };
35
39
  * Default values for SequencerConfig.
36
40
  * Centralized location for all sequencer configuration defaults.
37
41
  */
38
- export const DefaultSequencerConfig: ResolvedSequencerConfig = {
42
+ export const DefaultSequencerConfig = {
39
43
  sequencerPollingIntervalMS: 500,
40
- maxTxsPerBlock: 32,
41
44
  minTxsPerBlock: 1,
42
45
  buildCheckpointIfEmpty: false,
43
46
  publishTxsWithProposals: false,
44
- maxL2BlockGas: 10e9,
45
- maxDABlockGas: 10e9,
46
- maxBlockSizeInBytes: 1024 * 1024,
47
+ perBlockAllocationMultiplier: 1.2,
48
+ redistributeCheckpointBudget: true,
47
49
  enforceTimeTable: true,
48
50
  attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
49
51
  secondsBeforeInvalidatingBlockAsCommitteeMember: 144, // 12 L1 blocks
@@ -52,22 +54,27 @@ export const DefaultSequencerConfig: ResolvedSequencerConfig = {
52
54
  skipInvalidateBlockAsProposer: false,
53
55
  broadcastInvalidBlockProposal: false,
54
56
  injectFakeAttestation: false,
57
+ injectHighSValueAttestation: false,
58
+ injectUnrecoverableSignatureAttestation: false,
55
59
  fishermanMode: false,
56
60
  shuffleAttestationOrdering: false,
57
61
  skipPushProposedBlocksToArchiver: false,
58
- };
62
+ skipPublishingCheckpointsPercent: 0,
63
+ maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
64
+ } satisfies ResolvedSequencerConfig;
59
65
 
60
66
  /**
61
67
  * Configuration settings for the SequencerClient.
62
68
  */
63
- export type SequencerClientConfig = PublisherConfig &
69
+ export type SequencerClientConfig = SequencerPublisherConfig &
64
70
  KeyStoreConfig &
65
71
  ValidatorClientConfig &
66
- TxSenderConfig &
72
+ SequencerTxSenderConfig &
67
73
  SequencerConfig &
68
74
  L1ReaderConfig &
69
75
  ChainConfig &
70
- Pick<P2PConfig, 'txPublicSetupAllowList'> &
76
+ PipelineConfig &
77
+ Pick<P2PConfig, 'txPublicSetupAllowListExtend'> &
71
78
  Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
72
79
 
73
80
  export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
@@ -76,10 +83,10 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
76
83
  description: 'The number of ms to wait between polling for checking to build on the next slot.',
77
84
  ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS),
78
85
  },
79
- maxTxsPerBlock: {
80
- env: 'SEQ_MAX_TX_PER_BLOCK',
81
- description: 'The maximum number of txs to include in a block.',
82
- ...numberConfigHelper(DefaultSequencerConfig.maxTxsPerBlock),
86
+ maxTxsPerCheckpoint: {
87
+ env: 'SEQ_MAX_TX_PER_CHECKPOINT',
88
+ description: 'The maximum number of txs across all blocks in a checkpoint.',
89
+ ...optionalNumberConfigHelper(),
83
90
  },
84
91
  minTxsPerBlock: {
85
92
  env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -98,16 +105,29 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
98
105
  maxL2BlockGas: {
99
106
  env: 'SEQ_MAX_L2_BLOCK_GAS',
100
107
  description: 'The maximum L2 block gas.',
101
- ...numberConfigHelper(DefaultSequencerConfig.maxL2BlockGas),
108
+ ...optionalNumberConfigHelper(),
102
109
  },
103
110
  maxDABlockGas: {
104
111
  env: 'SEQ_MAX_DA_BLOCK_GAS',
105
112
  description: 'The maximum DA block gas.',
106
- ...numberConfigHelper(DefaultSequencerConfig.maxDABlockGas),
113
+ ...optionalNumberConfigHelper(),
114
+ },
115
+ perBlockAllocationMultiplier: {
116
+ env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
117
+ description:
118
+ 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' +
119
+ ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
120
+ ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier),
121
+ },
122
+ redistributeCheckpointBudget: {
123
+ env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
124
+ description:
125
+ 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
126
+ ...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget),
107
127
  },
108
128
  coinbase: {
109
129
  env: 'COINBASE',
110
- parseEnv: (val: string) => (val ? EthAddress.fromString(val) : undefined),
130
+ parseEnv: (val: string) => EthAddress.fromString(val),
111
131
  description: 'Recipient of block reward.',
112
132
  },
113
133
  feeRecipient: {
@@ -123,11 +143,6 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
123
143
  env: 'ACVM_BINARY_PATH',
124
144
  description: 'The path to the ACVM binary',
125
145
  },
126
- maxBlockSizeInBytes: {
127
- env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
128
- description: 'Max block size',
129
- ...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes),
130
- },
131
146
  enforceTimeTable: {
132
147
  env: 'SEQ_ENFORCE_TIME_TABLE',
133
148
  description: 'Whether to enforce the time table when building blocks',
@@ -141,12 +156,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
141
156
  l1PublishingTime: {
142
157
  env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
143
158
  description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
144
- parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
145
- },
146
- attestationPropagationTime: {
147
- env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
148
- description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
149
- ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime),
159
+ ...optionalNumberConfigHelper(),
150
160
  },
151
161
  fakeProcessingDelayPerTxMs: {
152
162
  description: 'Used for testing to introduce a fake delay after processing each tx',
@@ -185,6 +195,14 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
185
195
  description: 'Inject a fake attestation (for testing only)',
186
196
  ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation),
187
197
  },
198
+ injectHighSValueAttestation: {
199
+ description: 'Inject a malleable attestation with a high-s value (for testing only)',
200
+ ...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation),
201
+ },
202
+ injectUnrecoverableSignatureAttestation: {
203
+ description: 'Inject an attestation with an unrecoverable signature (for testing only)',
204
+ ...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation),
205
+ },
188
206
  fishermanMode: {
189
207
  env: 'FISHERMAN_MODE',
190
208
  description:
@@ -205,17 +223,32 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
205
223
  description: 'Skip pushing proposed blocks to archiver (default: true)',
206
224
  ...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver),
207
225
  },
208
- ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowList']),
226
+ minBlocksForCheckpoint: {
227
+ description: 'Minimum number of blocks required for a checkpoint proposal (test only)',
228
+ },
229
+ skipPublishingCheckpointsPercent: {
230
+ env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
231
+ description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
232
+ ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent),
233
+ },
234
+ skipBroadcastProposals: {
235
+ description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
236
+ ...booleanConfigHelper(false),
237
+ },
238
+ ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowListExtend']),
209
239
  };
210
240
 
211
241
  export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
242
+ // chainConfigMappings must come first: its l1Contracts only maps rollupAddress,
243
+ // while l1ReaderConfigMappings (spread later) maps all L1 contract addresses.
244
+ ...chainConfigMappings,
212
245
  ...validatorClientConfigMappings,
213
246
  ...sequencerConfigMappings,
214
247
  ...keyStoreConfigMappings,
215
248
  ...l1ReaderConfigMappings,
216
- ...getTxSenderConfigMappings('SEQ'),
217
- ...getPublisherConfigMappings('SEQ'),
218
- ...chainConfigMappings,
249
+ ...sequencerTxSenderConfigMappings,
250
+ ...sequencerPublisherConfigMappings,
251
+ ...pipelineConfigMappings,
219
252
  ...pickConfigMappings(l1ContractsConfigMappings, ['ethereumSlotDuration', 'aztecSlotDuration', 'aztecEpochDuration']),
220
253
  };
221
254
 
@@ -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.