@aztec/sequencer-client 0.70.0 → 0.71.0

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.
@@ -4,8 +4,7 @@ import { createEthereumChain } from '@aztec/ethereum';
4
4
  import { EthAddress } from '@aztec/foundation/eth-address';
5
5
  import { createLogger } from '@aztec/foundation/log';
6
6
  import { SlashFactoryAbi } from '@aztec/l1-artifacts';
7
- import { WithTracer } from '@aztec/telemetry-client';
8
- import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
7
+ import { WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
9
8
  import { createPublicClient, getAddress, getContract, http, } from 'viem';
10
9
  /**
11
10
  * Enum defining the possible states of the Slasher client.
@@ -43,7 +42,7 @@ export var SlasherClientState;
43
42
  * slashing only the first, because the "lifetime" of the second would have passed after that vote
44
43
  */
45
44
  export class SlasherClient extends WithTracer {
46
- constructor(config, store, l2BlockSource, telemetry = new NoopTelemetryClient(), log = createLogger('slasher')) {
45
+ constructor(config, store, l2BlockSource, telemetry = getTelemetryClient(), log = createLogger('slasher')) {
47
46
  super(telemetry, 'slasher');
48
47
  this.config = config;
49
48
  this.store = store;
@@ -302,4 +301,4 @@ export class SlasherClient extends WithTracer {
302
301
  this.log.debug(`Moved to state ${SlasherClientState[this.currentState]}`);
303
302
  }
304
303
  }
305
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"slasher_client.js","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"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"}
304
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"slasher_client.js","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,10 @@ import { type PublicProcessorFactory } from '@aztec/simulator/server';
2
2
  import { SequencerClient } from '../client/sequencer-client.js';
3
3
  import { type L1Publisher } from '../publisher/l1-publisher.js';
4
4
  import { Sequencer } from '../sequencer/sequencer.js';
5
- import { type SequencerState } from '../sequencer/utils.js';
5
+ import { type SequencerTimetable } from '../sequencer/timetable.js';
6
6
  declare class TestSequencer_ extends Sequencer {
7
7
  publicProcessorFactory: PublicProcessorFactory;
8
- timeTable: Record<SequencerState, number>;
9
- processTxTime: number;
8
+ timetable: SequencerTimetable;
10
9
  publisher: L1Publisher;
11
10
  }
12
11
  export type TestSequencer = TestSequencer_;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,cAAM,cAAe,SAAQ,SAAS;IACpB,sBAAsB,EAAG,sBAAsB,CAAC;IAChD,SAAS,EAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC3C,aAAa,EAAG,MAAM,CAAC;IACvB,SAAS,EAAG,WAAW,CAAC;CACzC;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IAChC,SAAS,EAAG,aAAa,CAAC;CAC3C;AAED,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEvD,cAAc,wBAAwB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,cAAM,cAAe,SAAQ,SAAS;IACpB,sBAAsB,EAAG,sBAAsB,CAAC;IAChD,SAAS,EAAG,kBAAkB,CAAC;IAC/B,SAAS,EAAG,WAAW,CAAC;CACzC;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IAChC,SAAS,EAAG,aAAa,CAAC;CAC3C;AAED,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEvD,cAAc,wBAAwB,CAAC"}
@@ -5,4 +5,4 @@ class TestSequencer_ extends Sequencer {
5
5
  class TestSequencerClient_ extends SequencerClient {
6
6
  }
7
7
  export * from './test-l1-publisher.js';
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3RELE1BQU0sY0FBZSxTQUFRLFNBQVM7Q0FLckM7QUFJRCxNQUFNLG9CQUFxQixTQUFRLGVBQWU7Q0FFakQ7QUFJRCxjQUFjLHdCQUF3QixDQUFDIn0=
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3RELE1BQU0sY0FBZSxTQUFRLFNBQVM7Q0FJckM7QUFJRCxNQUFNLG9CQUFxQixTQUFRLGVBQWU7Q0FFakQ7QUFJRCxjQUFjLHdCQUF3QixDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.70.0",
3
+ "version": "0.71.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -28,25 +28,25 @@
28
28
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
29
29
  },
30
30
  "dependencies": {
31
- "@aztec/aztec.js": "0.70.0",
32
- "@aztec/bb-prover": "0.70.0",
33
- "@aztec/blob-sink": "0.70.0",
34
- "@aztec/circuit-types": "0.70.0",
35
- "@aztec/circuits.js": "0.70.0",
36
- "@aztec/ethereum": "0.70.0",
37
- "@aztec/foundation": "0.70.0",
38
- "@aztec/l1-artifacts": "0.70.0",
39
- "@aztec/merkle-tree": "0.70.0",
40
- "@aztec/noir-contracts.js": "0.70.0",
41
- "@aztec/noir-protocol-circuits-types": "0.70.0",
42
- "@aztec/p2p": "0.70.0",
43
- "@aztec/protocol-contracts": "0.70.0",
44
- "@aztec/prover-client": "0.70.0",
45
- "@aztec/simulator": "0.70.0",
46
- "@aztec/telemetry-client": "0.70.0",
47
- "@aztec/types": "0.70.0",
48
- "@aztec/validator-client": "0.70.0",
49
- "@aztec/world-state": "0.70.0",
31
+ "@aztec/aztec.js": "0.71.0",
32
+ "@aztec/bb-prover": "0.71.0",
33
+ "@aztec/blob-sink": "0.71.0",
34
+ "@aztec/circuit-types": "0.71.0",
35
+ "@aztec/circuits.js": "0.71.0",
36
+ "@aztec/ethereum": "0.71.0",
37
+ "@aztec/foundation": "0.71.0",
38
+ "@aztec/l1-artifacts": "0.71.0",
39
+ "@aztec/merkle-tree": "0.71.0",
40
+ "@aztec/noir-contracts.js": "0.71.0",
41
+ "@aztec/noir-protocol-circuits-types": "0.71.0",
42
+ "@aztec/p2p": "0.71.0",
43
+ "@aztec/protocol-contracts": "0.71.0",
44
+ "@aztec/prover-client": "0.71.0",
45
+ "@aztec/simulator": "0.71.0",
46
+ "@aztec/telemetry-client": "0.71.0",
47
+ "@aztec/types": "0.71.0",
48
+ "@aztec/validator-client": "0.71.0",
49
+ "@aztec/world-state": "0.71.0",
50
50
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
51
51
  "@noir-lang/types": "portal:../../noir/packages/types",
52
52
  "lodash.chunk": "^4.2.0",
@@ -104,8 +104,8 @@ export class SequencerClient {
104
104
  contractDataSource,
105
105
  l1Constants,
106
106
  deps.dateProvider,
107
- telemetryClient,
108
107
  { ...config, maxL1TxInclusionTimeIntoSlot },
108
+ telemetryClient,
109
109
  );
110
110
  await validatorClient?.start();
111
111
  await sequencer.start();
package/src/config.ts CHANGED
@@ -47,7 +47,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
47
47
  transactionPollingIntervalMS: {
48
48
  env: 'SEQ_TX_POLLING_INTERVAL_MS',
49
49
  description: 'The number of ms to wait between polling for pending txs.',
50
- ...numberConfigHelper(1_000),
50
+ ...numberConfigHelper(500),
51
51
  },
52
52
  maxTxsPerBlock: {
53
53
  env: 'SEQ_MAX_TX_PER_BLOCK',
@@ -36,8 +36,7 @@ import { type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
36
36
  import { InterruptibleSleep } from '@aztec/foundation/sleep';
37
37
  import { Timer } from '@aztec/foundation/timer';
38
38
  import { EmpireBaseAbi, RollupAbi, SlasherAbi } from '@aztec/l1-artifacts';
39
- import { type TelemetryClient } from '@aztec/telemetry-client';
40
- import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
39
+ import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
41
40
 
42
41
  import pick from 'lodash.pick';
43
42
  import {
@@ -209,7 +208,7 @@ export class L1Publisher {
209
208
  this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
210
209
  this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
211
210
 
212
- const telemetry = deps.telemetry ?? new NoopTelemetryClient();
211
+ const telemetry = deps.telemetry ?? getTelemetryClient();
213
212
  this.blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config.blobSinkUrl);
214
213
 
215
214
  this.metrics = new L1PublisherMetrics(telemetry, 'L1Publisher');
@@ -33,11 +33,9 @@ import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
33
33
  import { type P2P } from '@aztec/p2p';
34
34
  import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder';
35
35
  import { type PublicProcessorFactory } from '@aztec/simulator/server';
36
- import { Attributes, type TelemetryClient, type Tracer, trackSpan } from '@aztec/telemetry-client';
36
+ import { Attributes, type TelemetryClient, type Tracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
37
37
  import { type ValidatorClient } from '@aztec/validator-client';
38
38
 
39
- import assert from 'assert';
40
-
41
39
  import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
42
40
  import { type L1Publisher, VoteType } from '../publisher/l1-publisher.js';
43
41
  import { type SlasherClient } from '../slasher/slasher_client.js';
@@ -45,24 +43,11 @@ import { createValidatorsForBlockBuilding } from '../tx_validator/tx_validator_f
45
43
  import { getDefaultAllowedSetupFunctions } from './allowed.js';
46
44
  import { type SequencerConfig } from './config.js';
47
45
  import { SequencerMetrics } from './metrics.js';
46
+ import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
48
47
  import { SequencerState, orderAttestations } from './utils.js';
49
48
 
50
49
  export { SequencerState };
51
50
 
52
- export class SequencerTooSlowError extends Error {
53
- constructor(
54
- public readonly currentState: SequencerState,
55
- public readonly proposedState: SequencerState,
56
- public readonly maxAllowedTime: number,
57
- public readonly currentTime: number,
58
- ) {
59
- super(
60
- `Too far into slot to transition to ${proposedState} (max allowed: ${maxAllowedTime}s, time into slot: ${currentTime}s)`,
61
- );
62
- this.name = 'SequencerTooSlowError';
63
- }
64
- }
65
-
66
51
  type SequencerRollupConstants = Pick<L1RollupConstants, 'ethereumSlotDuration' | 'l1GenesisTime' | 'slotDuration'>;
67
52
 
68
53
  /**
@@ -78,7 +63,7 @@ export class Sequencer {
78
63
  private runningPromise?: RunningPromise;
79
64
  private pollingIntervalMs: number = 1000;
80
65
  private maxTxsPerBlock = 32;
81
- private minTxsPerBLock = 1;
66
+ private minTxsPerBlock = 1;
82
67
  private maxL1TxInclusionTimeIntoSlot = 0;
83
68
  // TODO: zero values should not be allowed for the following 2 values in PROD
84
69
  private _coinbase = EthAddress.ZERO;
@@ -86,17 +71,13 @@ export class Sequencer {
86
71
  private state = SequencerState.STOPPED;
87
72
  private allowedInSetup: AllowedElement[] = getDefaultAllowedSetupFunctions();
88
73
  private maxBlockSizeInBytes: number = 1024 * 1024;
89
- private maxBlockGas: Gas = new Gas(10e9, 10e9);
90
- protected processTxTime: number = 12;
91
- private attestationPropagationTime: number = 2;
74
+ private maxBlockGas: Gas = new Gas(100e9, 100e9);
92
75
  private metrics: SequencerMetrics;
93
76
  private isFlushing: boolean = false;
94
77
 
95
- /**
96
- * The maximum number of seconds that the sequencer can be into a slot to transition to a particular state.
97
- * For example, in order to transition into WAITING_FOR_ATTESTATIONS, the sequencer can be at most 3 seconds into the slot.
98
- */
99
- protected timeTable!: Record<SequencerState, number>;
78
+ /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */
79
+ protected timetable!: SequencerTimetable;
80
+
100
81
  protected enforceTimeTable: boolean = false;
101
82
 
102
83
  constructor(
@@ -113,8 +94,8 @@ export class Sequencer {
113
94
  protected contractDataSource: ContractDataSource,
114
95
  protected l1Constants: SequencerRollupConstants,
115
96
  protected dateProvider: DateProvider,
116
- telemetry: TelemetryClient,
117
97
  protected config: SequencerConfig = {},
98
+ telemetry: TelemetryClient = getTelemetryClient(),
118
99
  protected log = createLogger('sequencer'),
119
100
  ) {
120
101
  this.updateConfig(config);
@@ -145,7 +126,7 @@ export class Sequencer {
145
126
  this.maxTxsPerBlock = config.maxTxsPerBlock;
146
127
  }
147
128
  if (config.minTxsPerBlock !== undefined) {
148
- this.minTxsPerBLock = config.minTxsPerBlock;
129
+ this.minTxsPerBlock = config.minTxsPerBlock;
149
130
  }
150
131
  if (config.maxDABlockGas !== undefined) {
151
132
  this.maxBlockGas = new Gas(config.maxDABlockGas, this.maxBlockGas.l2Gas);
@@ -182,78 +163,15 @@ export class Sequencer {
182
163
  }
183
164
 
184
165
  private setTimeTable() {
185
- // How late into the slot can we be to start working
186
- const initialTime = 2;
187
-
188
- // How long it takes to get ready to start building
189
- const blockPrepareTime = 1;
190
-
191
- // How long it takes to for proposals and attestations to travel across the p2p layer (one-way)
192
- const attestationPropagationTime = 2;
193
- this.attestationPropagationTime = attestationPropagationTime;
194
-
195
- // How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
196
- // but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
197
- // we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
198
- const l1PublishingTime = this.l1Constants.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
199
-
200
- // How much time we spend validating and processing a block after building it,
201
- // and assembling the proposal to send to attestors
202
- const blockValidationTime = 1;
203
-
204
- // How much time we have left in the slot for actually processing txs and building the block.
205
- const remainingTimeInSlot =
206
- this.aztecSlotDuration -
207
- initialTime -
208
- blockPrepareTime -
209
- blockValidationTime -
210
- 2 * attestationPropagationTime -
211
- l1PublishingTime;
212
-
213
- // Check that we actually have time left for processing txs
214
- if (this.enforceTimeTable && remainingTimeInSlot < 0) {
215
- throw new Error(`Not enough time for block building in ${this.aztecSlotDuration}s slot`);
216
- }
217
-
218
- // How much time we have for actually processing txs. Note that we need both the sequencer and the validators to execute txs.
219
- const processTxsTime = remainingTimeInSlot / 2;
220
- this.processTxTime = processTxsTime;
221
-
222
- // Sanity check
223
- const totalSlotTime =
224
- initialTime + // Archiver, world-state, and p2p sync
225
- blockPrepareTime + // Setup globals, initial checks, etc
226
- processTxsTime + // Processing public txs for building the block
227
- blockValidationTime + // Validating the block produced
228
- attestationPropagationTime + // Propagating the block proposal to validators
229
- processTxsTime + // Validators run public txs before signing
230
- attestationPropagationTime + // Attestations fly back to the proposer
231
- l1PublishingTime; // The publish tx sits on the L1 mempool waiting to be picked up
232
-
233
- assert(
234
- totalSlotTime === this.aztecSlotDuration,
235
- `Computed total slot time does not match slot duration: ${totalSlotTime}s`,
166
+ this.timetable = new SequencerTimetable(
167
+ this.l1Constants.ethereumSlotDuration,
168
+ this.aztecSlotDuration,
169
+ this.maxL1TxInclusionTimeIntoSlot,
170
+ this.enforceTimeTable,
171
+ this.metrics,
172
+ this.log,
236
173
  );
237
-
238
- const newTimeTable: Record<SequencerState, number> = {
239
- // No checks needed for any of these transitions
240
- [SequencerState.STOPPED]: this.aztecSlotDuration,
241
- [SequencerState.IDLE]: this.aztecSlotDuration,
242
- [SequencerState.SYNCHRONIZING]: this.aztecSlotDuration,
243
- // We always want to allow the full slot to check if we are the proposer
244
- [SequencerState.PROPOSER_CHECK]: this.aztecSlotDuration,
245
- // How late we can start initializing a new block proposal
246
- [SequencerState.INITIALIZING_PROPOSAL]: initialTime,
247
- // When we start building a block
248
- [SequencerState.CREATING_BLOCK]: initialTime + blockPrepareTime,
249
- // We start collecting attestations after building the block
250
- [SequencerState.COLLECTING_ATTESTATIONS]: initialTime + blockPrepareTime + processTxsTime + blockValidationTime,
251
- // We publish the block after collecting attestations
252
- [SequencerState.PUBLISHING_BLOCK]: this.aztecSlotDuration - l1PublishingTime,
253
- };
254
-
255
- this.log.verbose(`Sequencer time table updated with ${processTxsTime}s for processing txs`, newTimeTable);
256
- this.timeTable = newTimeTable;
174
+ this.log.verbose(`Sequencer timetable updated`, { enforceTimeTable: this.enforceTimeTable });
257
175
  }
258
176
 
259
177
  /**
@@ -349,8 +267,8 @@ export class Sequencer {
349
267
 
350
268
  // Check the pool has enough txs to build a block
351
269
  const pendingTxCount = this.p2pClient.getPendingTxCount();
352
- if (pendingTxCount < this.minTxsPerBLock && !this.isFlushing) {
353
- this.log.verbose(`Not enough txs to propose block. Got ${pendingTxCount} min ${this.minTxsPerBLock}.`, {
270
+ if (pendingTxCount < this.minTxsPerBlock && !this.isFlushing) {
271
+ this.log.verbose(`Not enough txs to propose block. Got ${pendingTxCount} min ${this.minTxsPerBlock}.`, {
354
272
  slot,
355
273
  blockNumber: newBlockNumber,
356
274
  });
@@ -427,29 +345,6 @@ export class Sequencer {
427
345
  }
428
346
  }
429
347
 
430
- doIHaveEnoughTimeLeft(proposedState: SequencerState, secondsIntoSlot: number): boolean {
431
- if (!this.enforceTimeTable) {
432
- return true;
433
- }
434
-
435
- const maxAllowedTime = this.timeTable[proposedState];
436
- if (maxAllowedTime === this.aztecSlotDuration) {
437
- return true;
438
- }
439
-
440
- const bufferSeconds = maxAllowedTime - secondsIntoSlot;
441
-
442
- if (bufferSeconds < 0) {
443
- this.log.debug(`Too far into slot to transition to ${proposedState}`, { maxAllowedTime, secondsIntoSlot });
444
- return false;
445
- }
446
-
447
- this.metrics.recordStateTransitionBufferMs(Math.floor(bufferSeconds * 1000), proposedState);
448
-
449
- this.log.trace(`Enough time to transition to ${proposedState}`, { maxAllowedTime, secondsIntoSlot });
450
- return true;
451
- }
452
-
453
348
  /**
454
349
  * Sets the sequencer state and checks if we have enough time left in the slot to transition to the new state.
455
350
  * @param proposedState - The new state to transition to.
@@ -465,9 +360,7 @@ export class Sequencer {
465
360
  return;
466
361
  }
467
362
  const secondsIntoSlot = this.getSecondsIntoSlot(currentSlotNumber);
468
- if (!this.doIHaveEnoughTimeLeft(proposedState, secondsIntoSlot)) {
469
- throw new SequencerTooSlowError(this.state, proposedState, this.timeTable[proposedState], secondsIntoSlot);
470
- }
363
+ this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
471
364
  this.log.debug(`Transitioning from ${this.state} to ${proposedState}`);
472
365
  this.state = proposedState;
473
366
  }
@@ -482,7 +375,7 @@ export class Sequencer {
482
375
  * @param historicalHeader - The historical header of the parent
483
376
  * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
484
377
  */
485
- private async buildBlock(
378
+ protected async buildBlock(
486
379
  pendingTxs: Iterable<Tx>,
487
380
  newGlobalVariables: GlobalVariables,
488
381
  historicalHeader?: BlockHeader,
@@ -521,13 +414,11 @@ export class Sequencer {
521
414
  const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
522
415
  await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages);
523
416
 
524
- // When building a block as a proposer, we set the deadline for tx processing to the start of the
525
- // CREATING_BLOCK phase, plus the expected time for tx processing. When validating, we start counting
526
- // the time for tx processing from the start of the COLLECTING_ATTESTATIONS phase plus the attestation
527
- // propagation time. See the comments in setTimeTable for more details.
417
+ // Deadline for processing depends on whether we're proposing a block
418
+ const secondsIntoSlot = this.getSecondsIntoSlot(slot);
528
419
  const processingEndTimeWithinSlot = opts.validateOnly
529
- ? this.timeTable[SequencerState.COLLECTING_ATTESTATIONS] + this.attestationPropagationTime + this.processTxTime
530
- : this.timeTable[SequencerState.CREATING_BLOCK] + this.processTxTime;
420
+ ? this.timetable.getValidatorReexecTimeEnd(secondsIntoSlot)
421
+ : this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
531
422
 
532
423
  // Deadline is only set if enforceTimeTable is enabled.
533
424
  const deadline = this.enforceTimeTable
@@ -552,7 +443,12 @@ export class Sequencer {
552
443
  // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
553
444
  // of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
554
445
  // publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
555
- const limits = { deadline, maxTransactions: this.maxTxsPerBlock, maxBlockSize: this.maxBlockSizeInBytes };
446
+ const proposerLimits = {
447
+ maxTransactions: this.maxTxsPerBlock,
448
+ maxBlockSize: this.maxBlockSizeInBytes,
449
+ maxBlockGas: this.maxBlockGas,
450
+ };
451
+ const limits = opts.validateOnly ? { deadline } : { deadline, ...proposerLimits };
556
452
  const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() =>
557
453
  processor.process(pendingTxs, limits, validators),
558
454
  );
@@ -566,11 +462,11 @@ export class Sequencer {
566
462
  if (
567
463
  !opts.validateOnly && // We check for minTxCount only if we are proposing a block, not if we are validating it
568
464
  !this.isFlushing && // And we skip the check when flushing, since we want all pending txs to go out, no matter if too few
569
- this.minTxsPerBLock !== undefined &&
570
- processedTxs.length < this.minTxsPerBLock
465
+ this.minTxsPerBlock !== undefined &&
466
+ processedTxs.length < this.minTxsPerBlock
571
467
  ) {
572
468
  this.log.warn(
573
- `Block ${blockNumber} has too few txs to be proposed (got ${processedTxs.length} but required ${this.minTxsPerBLock})`,
469
+ `Block ${blockNumber} has too few txs to be proposed (got ${processedTxs.length} but required ${this.minTxsPerBlock})`,
574
470
  { slot, blockNumber, processedTxCount: processedTxs.length },
575
471
  );
576
472
  throw new Error(`Block has too few successful txs to be proposed`);
@@ -606,7 +502,8 @@ export class Sequencer {
606
502
  await publicProcessorFork.close();
607
503
  await orchestratorFork.close();
608
504
  } catch (err) {
609
- this.log.error(`Error closing forks`, err);
505
+ // This can happen if the sequencer is stopped before we hit this timeout.
506
+ this.log.warn(`Error closing forks for block processing`, err);
610
507
  }
611
508
  }, 5000);
612
509
  }
@@ -750,7 +647,15 @@ export class Sequencer {
750
647
  this.log.debug('Broadcasting block proposal to validators');
751
648
  this.validatorClient.broadcastBlockProposal(proposal);
752
649
 
753
- const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations);
650
+ const attestationTimeAllowed = this.enforceTimeTable
651
+ ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_BLOCK)!
652
+ : this.aztecSlotDuration;
653
+ const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
654
+ const attestations = await this.validatorClient.collectAttestations(
655
+ proposal,
656
+ numberOfRequiredAttestations,
657
+ attestationDeadline,
658
+ );
754
659
 
755
660
  // note: the smart contract requires that the signatures are provided in the order of the committee
756
661
  return orderAttestations(attestations, committee);
@@ -0,0 +1,123 @@
1
+ import { createLogger } from '@aztec/aztec.js';
2
+
3
+ import { type SequencerMetrics } from './metrics.js';
4
+ import { SequencerState } from './utils.js';
5
+
6
+ export class SequencerTimetable {
7
+ /** How late into the slot can we be to start working */
8
+ public readonly initialTime = 3;
9
+
10
+ /** How long it takes to get ready to start building */
11
+ public readonly blockPrepareTime = 1;
12
+
13
+ /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
14
+ public readonly attestationPropagationTime = 2;
15
+
16
+ /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
17
+ public readonly blockValidationTime = 1;
18
+
19
+ /**
20
+ * How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
21
+ * but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
22
+ * we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
23
+ */
24
+ public readonly l1PublishingTime;
25
+
26
+ constructor(
27
+ private readonly ethereumSlotDuration: number,
28
+ private readonly aztecSlotDuration: number,
29
+ private readonly maxL1TxInclusionTimeIntoSlot: number,
30
+ private readonly enforce: boolean = true,
31
+ private readonly metrics?: SequencerMetrics,
32
+ private readonly log = createLogger('sequencer:timetable'),
33
+ ) {
34
+ this.l1PublishingTime = this.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
35
+ }
36
+
37
+ private get afterBlockBuildingTimeNeededWithoutReexec() {
38
+ return this.blockValidationTime + this.attestationPropagationTime * 2 + this.l1PublishingTime;
39
+ }
40
+
41
+ public getBlockProposalExecTimeEnd(secondsIntoSlot: number): number {
42
+ // We are N seconds into the slot. We need to account for `afterBlockBuildingTimeNeededWithoutReexec` seconds,
43
+ // send then split the remaining time between the re-execution and the block building.
44
+ const maxAllowed = this.aztecSlotDuration - this.afterBlockBuildingTimeNeededWithoutReexec;
45
+ const available = maxAllowed - secondsIntoSlot;
46
+ const executionTimeEnd = secondsIntoSlot + available / 2;
47
+ this.log.debug(`Block proposal execution time deadline is ${executionTimeEnd}`, {
48
+ secondsIntoSlot,
49
+ maxAllowed,
50
+ available,
51
+ executionTimeEnd,
52
+ });
53
+ return executionTimeEnd;
54
+ }
55
+
56
+ private get afterBlockReexecTimeNeeded() {
57
+ return this.attestationPropagationTime + this.l1PublishingTime;
58
+ }
59
+
60
+ public getValidatorReexecTimeEnd(secondsIntoSlot: number): number {
61
+ // We need to leave for `afterBlockReexecTimeNeeded` seconds available.
62
+ const validationTimeEnd = this.aztecSlotDuration - this.afterBlockReexecTimeNeeded;
63
+ this.log.debug(`Validator re-execution time deadline is ${validationTimeEnd}`, {
64
+ secondsIntoSlot,
65
+ validationTimeEnd,
66
+ });
67
+ return validationTimeEnd;
68
+ }
69
+
70
+ public getMaxAllowedTime(state: SequencerState): number | undefined {
71
+ switch (state) {
72
+ case SequencerState.STOPPED:
73
+ case SequencerState.IDLE:
74
+ case SequencerState.SYNCHRONIZING:
75
+ case SequencerState.PROPOSER_CHECK:
76
+ return; // We don't really care about times for this states
77
+ case SequencerState.INITIALIZING_PROPOSAL:
78
+ return this.initialTime;
79
+ case SequencerState.CREATING_BLOCK:
80
+ return this.initialTime + this.blockPrepareTime;
81
+ case SequencerState.COLLECTING_ATTESTATIONS:
82
+ return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.attestationPropagationTime;
83
+ case SequencerState.PUBLISHING_BLOCK:
84
+ return this.aztecSlotDuration - this.l1PublishingTime;
85
+ default: {
86
+ const _exhaustiveCheck: never = state;
87
+ throw new Error(`Unexpected state: ${state}`);
88
+ }
89
+ }
90
+ }
91
+
92
+ public assertTimeLeft(newState: SequencerState, secondsIntoSlot: number) {
93
+ if (!this.enforce) {
94
+ return;
95
+ }
96
+
97
+ const maxAllowedTime = this.getMaxAllowedTime(newState);
98
+ if (maxAllowedTime === undefined) {
99
+ return;
100
+ }
101
+
102
+ const bufferSeconds = maxAllowedTime - secondsIntoSlot;
103
+ if (bufferSeconds < 0) {
104
+ throw new SequencerTooSlowError(newState, maxAllowedTime, secondsIntoSlot);
105
+ }
106
+
107
+ this.metrics?.recordStateTransitionBufferMs(Math.floor(bufferSeconds * 1000), newState);
108
+ this.log.trace(`Enough time to transition to ${newState}`, { maxAllowedTime, secondsIntoSlot });
109
+ }
110
+ }
111
+
112
+ export class SequencerTooSlowError extends Error {
113
+ constructor(
114
+ public readonly proposedState: SequencerState,
115
+ public readonly maxAllowedTime: number,
116
+ public readonly currentTime: number,
117
+ ) {
118
+ super(
119
+ `Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`,
120
+ );
121
+ this.name = 'SequencerTooSlowError';
122
+ }
123
+ }