@aztec/sequencer-client 0.0.1-commit.9d2bcf6d → 0.0.1-commit.9ebd450e8

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 +26 -7
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +52 -36
  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 +75 -48
  40. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  41. package/dest/publisher/sequencer-publisher.js +432 -139
  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 +42 -10
  46. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  47. package/dest/sequencer/checkpoint_proposal_job.js +531 -216
  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 +21 -8
  57. package/dest/sequencer/metrics.d.ts.map +1 -1
  58. package/dest/sequencer/metrics.js +110 -21
  59. package/dest/sequencer/sequencer.d.ts +43 -17
  60. package/dest/sequencer/sequencer.d.ts.map +1 -1
  61. package/dest/sequencer/sequencer.js +158 -96
  62. package/dest/sequencer/timetable.d.ts +17 -6
  63. package/dest/sequencer/timetable.d.ts.map +1 -1
  64. package/dest/sequencer/timetable.js +51 -46
  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 +11 -11
  70. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
  71. package/dest/test/mock_checkpoint_builder.js +45 -34
  72. package/dest/test/utils.d.ts +3 -3
  73. package/dest/test/utils.d.ts.map +1 -1
  74. package/dest/test/utils.js +5 -4
  75. package/package.json +27 -28
  76. package/src/client/sequencer-client.ts +81 -30
  77. package/src/config.ts +70 -46
  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 +499 -198
  91. package/src/sequencer/README.md +83 -13
  92. package/src/sequencer/chain_state_overrides.ts +87 -0
  93. package/src/sequencer/checkpoint_proposal_job.ts +678 -237
  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 +124 -26
  98. package/src/sequencer/sequencer.ts +227 -108
  99. package/src/sequencer/timetable.ts +70 -57
  100. package/src/sequencer/types.ts +1 -1
  101. package/src/test/index.ts +2 -4
  102. package/src/test/mock_checkpoint_builder.ts +63 -49
  103. package/src/test/utils.ts +5 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.0.1-commit.9d2bcf6d",
3
+ "version": "0.0.1-commit.9ebd450e8",
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.9d2bcf6d",
30
- "@aztec/bb-prover": "0.0.1-commit.9d2bcf6d",
31
- "@aztec/blob-client": "0.0.1-commit.9d2bcf6d",
32
- "@aztec/blob-lib": "0.0.1-commit.9d2bcf6d",
33
- "@aztec/constants": "0.0.1-commit.9d2bcf6d",
34
- "@aztec/epoch-cache": "0.0.1-commit.9d2bcf6d",
35
- "@aztec/ethereum": "0.0.1-commit.9d2bcf6d",
36
- "@aztec/foundation": "0.0.1-commit.9d2bcf6d",
37
- "@aztec/l1-artifacts": "0.0.1-commit.9d2bcf6d",
38
- "@aztec/merkle-tree": "0.0.1-commit.9d2bcf6d",
39
- "@aztec/node-keystore": "0.0.1-commit.9d2bcf6d",
40
- "@aztec/noir-acvm_js": "0.0.1-commit.9d2bcf6d",
41
- "@aztec/noir-contracts.js": "0.0.1-commit.9d2bcf6d",
42
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9d2bcf6d",
43
- "@aztec/noir-types": "0.0.1-commit.9d2bcf6d",
44
- "@aztec/p2p": "0.0.1-commit.9d2bcf6d",
45
- "@aztec/protocol-contracts": "0.0.1-commit.9d2bcf6d",
46
- "@aztec/prover-client": "0.0.1-commit.9d2bcf6d",
47
- "@aztec/simulator": "0.0.1-commit.9d2bcf6d",
48
- "@aztec/slasher": "0.0.1-commit.9d2bcf6d",
49
- "@aztec/stdlib": "0.0.1-commit.9d2bcf6d",
50
- "@aztec/telemetry-client": "0.0.1-commit.9d2bcf6d",
51
- "@aztec/validator-client": "0.0.1-commit.9d2bcf6d",
52
- "@aztec/validator-ha-signer": "0.0.1-commit.9d2bcf6d",
53
- "@aztec/world-state": "0.0.1-commit.9d2bcf6d",
29
+ "@aztec/aztec.js": "0.0.1-commit.9ebd450e8",
30
+ "@aztec/bb-prover": "0.0.1-commit.9ebd450e8",
31
+ "@aztec/blob-client": "0.0.1-commit.9ebd450e8",
32
+ "@aztec/blob-lib": "0.0.1-commit.9ebd450e8",
33
+ "@aztec/constants": "0.0.1-commit.9ebd450e8",
34
+ "@aztec/epoch-cache": "0.0.1-commit.9ebd450e8",
35
+ "@aztec/ethereum": "0.0.1-commit.9ebd450e8",
36
+ "@aztec/foundation": "0.0.1-commit.9ebd450e8",
37
+ "@aztec/l1-artifacts": "0.0.1-commit.9ebd450e8",
38
+ "@aztec/node-keystore": "0.0.1-commit.9ebd450e8",
39
+ "@aztec/noir-acvm_js": "0.0.1-commit.9ebd450e8",
40
+ "@aztec/noir-contracts.js": "0.0.1-commit.9ebd450e8",
41
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9ebd450e8",
42
+ "@aztec/noir-types": "0.0.1-commit.9ebd450e8",
43
+ "@aztec/p2p": "0.0.1-commit.9ebd450e8",
44
+ "@aztec/protocol-contracts": "0.0.1-commit.9ebd450e8",
45
+ "@aztec/prover-client": "0.0.1-commit.9ebd450e8",
46
+ "@aztec/simulator": "0.0.1-commit.9ebd450e8",
47
+ "@aztec/slasher": "0.0.1-commit.9ebd450e8",
48
+ "@aztec/stdlib": "0.0.1-commit.9ebd450e8",
49
+ "@aztec/telemetry-client": "0.0.1-commit.9ebd450e8",
50
+ "@aztec/validator-client": "0.0.1-commit.9ebd450e8",
51
+ "@aztec/validator-ha-signer": "0.0.1-commit.9ebd450e8",
52
+ "@aztec/world-state": "0.0.1-commit.9ebd450e8",
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.9d2bcf6d",
60
- "@aztec/kv-store": "0.0.1-commit.9d2bcf6d",
58
+ "@aztec/archiver": "0.0.1-commit.9ebd450e8",
59
+ "@aztec/kv-store": "0.0.1-commit.9ebd450e8",
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
@@ -11,59 +11,67 @@ import { EthAddress } from '@aztec/foundation/eth-address';
11
11
  import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
12
12
  import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
13
13
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
- import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
14
+ import {
15
+ type ChainConfig,
16
+ type PipelineConfig,
17
+ type SequencerConfig,
18
+ chainConfigMappings,
19
+ pipelineConfigMappings,
20
+ sharedSequencerConfigMappings,
21
+ } from '@aztec/stdlib/config';
15
22
  import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
23
+ import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
16
24
  import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
17
25
 
18
26
  import {
19
- type PublisherConfig,
20
- type TxSenderConfig,
21
- getPublisherConfigMappings,
22
- getTxSenderConfigMappings,
27
+ type SequencerPublisherConfig,
28
+ type SequencerTxSenderConfig,
29
+ sequencerPublisherConfigMappings,
30
+ sequencerTxSenderConfigMappings,
23
31
  } from './publisher/config.js';
24
32
 
25
33
  export * from './publisher/config.js';
26
34
  export type { SequencerConfig };
27
35
 
28
- export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
29
-
30
36
  /**
31
37
  * Default values for SequencerConfig.
32
38
  * Centralized location for all sequencer configuration defaults.
33
39
  */
34
- export const DefaultSequencerConfig: ResolvedSequencerConfig = {
40
+ export const DefaultSequencerConfig = {
35
41
  sequencerPollingIntervalMS: 500,
36
- maxTxsPerBlock: 32,
37
42
  minTxsPerBlock: 1,
38
43
  buildCheckpointIfEmpty: false,
39
44
  publishTxsWithProposals: false,
40
- maxL2BlockGas: 10e9,
41
- maxDABlockGas: 10e9,
42
- maxBlockSizeInBytes: 1024 * 1024,
45
+ perBlockAllocationMultiplier: 1.2,
46
+ redistributeCheckpointBudget: true,
43
47
  enforceTimeTable: true,
44
- attestationPropagationTime: DEFAULT_ATTESTATION_PROPAGATION_TIME,
48
+ attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
45
49
  secondsBeforeInvalidatingBlockAsCommitteeMember: 144, // 12 L1 blocks
46
50
  secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432, // 36 L1 blocks
47
51
  skipCollectingAttestations: false,
48
52
  skipInvalidateBlockAsProposer: false,
49
53
  broadcastInvalidBlockProposal: false,
50
54
  injectFakeAttestation: false,
55
+ injectHighSValueAttestation: false,
56
+ injectUnrecoverableSignatureAttestation: false,
51
57
  fishermanMode: false,
52
58
  shuffleAttestationOrdering: false,
53
59
  skipPushProposedBlocksToArchiver: false,
54
- };
60
+ skipPublishingCheckpointsPercent: 0,
61
+ } satisfies ResolvedSequencerConfig;
55
62
 
56
63
  /**
57
64
  * Configuration settings for the SequencerClient.
58
65
  */
59
- export type SequencerClientConfig = PublisherConfig &
66
+ export type SequencerClientConfig = SequencerPublisherConfig &
60
67
  KeyStoreConfig &
61
68
  ValidatorClientConfig &
62
- TxSenderConfig &
69
+ SequencerTxSenderConfig &
63
70
  SequencerConfig &
64
71
  L1ReaderConfig &
65
72
  ChainConfig &
66
- Pick<P2PConfig, 'txPublicSetupAllowList'> &
73
+ PipelineConfig &
74
+ Pick<P2PConfig, 'txPublicSetupAllowListExtend'> &
67
75
  Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
68
76
 
69
77
  export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
@@ -72,10 +80,10 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
72
80
  description: 'The number of ms to wait between polling for checking to build on the next slot.',
73
81
  ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS),
74
82
  },
75
- maxTxsPerBlock: {
76
- env: 'SEQ_MAX_TX_PER_BLOCK',
77
- description: 'The maximum number of txs to include in a block.',
78
- ...numberConfigHelper(DefaultSequencerConfig.maxTxsPerBlock),
83
+ maxTxsPerCheckpoint: {
84
+ env: 'SEQ_MAX_TX_PER_CHECKPOINT',
85
+ description: 'The maximum number of txs across all blocks in a checkpoint.',
86
+ parseEnv: (val: string) => parseInt(val, 10),
79
87
  },
80
88
  minTxsPerBlock: {
81
89
  env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -94,16 +102,29 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
94
102
  maxL2BlockGas: {
95
103
  env: 'SEQ_MAX_L2_BLOCK_GAS',
96
104
  description: 'The maximum L2 block gas.',
97
- ...numberConfigHelper(DefaultSequencerConfig.maxL2BlockGas),
105
+ parseEnv: (val: string) => parseInt(val, 10),
98
106
  },
99
107
  maxDABlockGas: {
100
108
  env: 'SEQ_MAX_DA_BLOCK_GAS',
101
109
  description: 'The maximum DA block gas.',
102
- ...numberConfigHelper(DefaultSequencerConfig.maxDABlockGas),
110
+ parseEnv: (val: string) => parseInt(val, 10),
111
+ },
112
+ perBlockAllocationMultiplier: {
113
+ env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
114
+ description:
115
+ 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' +
116
+ ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
117
+ ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier),
118
+ },
119
+ redistributeCheckpointBudget: {
120
+ env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
121
+ description:
122
+ 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
123
+ ...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget),
103
124
  },
104
125
  coinbase: {
105
126
  env: 'COINBASE',
106
- parseEnv: (val: string) => (val ? EthAddress.fromString(val) : undefined),
127
+ parseEnv: (val: string) => EthAddress.fromString(val),
107
128
  description: 'Recipient of block reward.',
108
129
  },
109
130
  feeRecipient: {
@@ -119,11 +140,6 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
119
140
  env: 'ACVM_BINARY_PATH',
120
141
  description: 'The path to the ACVM binary',
121
142
  },
122
- maxBlockSizeInBytes: {
123
- env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
124
- description: 'Max block size',
125
- ...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes),
126
- },
127
143
  enforceTimeTable: {
128
144
  env: 'SEQ_ENFORCE_TIME_TABLE',
129
145
  description: 'Whether to enforce the time table when building blocks',
@@ -137,12 +153,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
137
153
  l1PublishingTime: {
138
154
  env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
139
155
  description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
140
- parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
141
- },
142
- attestationPropagationTime: {
143
- env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
144
- description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
145
- ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime),
156
+ parseEnv: (val: string) => parseInt(val, 10),
146
157
  },
147
158
  fakeProcessingDelayPerTxMs: {
148
159
  description: 'Used for testing to introduce a fake delay after processing each tx',
@@ -181,6 +192,14 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
181
192
  description: 'Inject a fake attestation (for testing only)',
182
193
  ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation),
183
194
  },
195
+ injectHighSValueAttestation: {
196
+ description: 'Inject a malleable attestation with a high-s value (for testing only)',
197
+ ...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation),
198
+ },
199
+ injectUnrecoverableSignatureAttestation: {
200
+ description: 'Inject an attestation with an unrecoverable signature (for testing only)',
201
+ ...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation),
202
+ },
184
203
  fishermanMode: {
185
204
  env: 'FISHERMAN_MODE',
186
205
  description:
@@ -191,13 +210,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
191
210
  description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
192
211
  ...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering),
193
212
  },
194
- blockDurationMs: {
195
- env: 'SEQ_BLOCK_DURATION_MS',
196
- description:
197
- 'Duration per block in milliseconds when building multiple blocks per slot. ' +
198
- 'If undefined (default), builds a single block per slot using the full slot duration.',
199
- parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
200
- },
213
+ ...sharedSequencerConfigMappings,
201
214
  buildCheckpointIfEmpty: {
202
215
  env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
203
216
  description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
@@ -207,17 +220,28 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
207
220
  description: 'Skip pushing proposed blocks to archiver (default: true)',
208
221
  ...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver),
209
222
  },
210
- ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowList']),
223
+ minBlocksForCheckpoint: {
224
+ description: 'Minimum number of blocks required for a checkpoint proposal (test only)',
225
+ },
226
+ skipPublishingCheckpointsPercent: {
227
+ env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
228
+ description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
229
+ ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent),
230
+ },
231
+ ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowListExtend']),
211
232
  };
212
233
 
213
234
  export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
235
+ // chainConfigMappings must come first: its l1Contracts only maps rollupAddress,
236
+ // while l1ReaderConfigMappings (spread later) maps all L1 contract addresses.
237
+ ...chainConfigMappings,
214
238
  ...validatorClientConfigMappings,
215
239
  ...sequencerConfigMappings,
216
240
  ...keyStoreConfigMappings,
217
241
  ...l1ReaderConfigMappings,
218
- ...getTxSenderConfigMappings('SEQ'),
219
- ...getPublisherConfigMappings('SEQ'),
220
- ...chainConfigMappings,
242
+ ...sequencerTxSenderConfigMappings,
243
+ ...sequencerPublisherConfigMappings,
244
+ ...pipelineConfigMappings,
221
245
  ...pickConfigMappings(l1ContractsConfigMappings, ['ethereumSlotDuration', 'aztecSlotDuration', 'aztecEpochDuration']),
222
246
  };
223
247
 
@@ -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.