@aztec/sequencer-client 0.63.1 → 0.65.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.
@@ -70,6 +70,8 @@ let Sequencer = (() => {
70
70
  this.updateConfig(config);
71
71
  this.metrics = new SequencerMetrics(telemetry, () => this.state, 'Sequencer');
72
72
  this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
73
+ // Register the block builder with the validator client for re-execution
74
+ this.validatorClient?.registerBlockBuilder(this.buildBlock.bind(this));
73
75
  }
74
76
  get tracer() {
75
77
  return this.metrics.tracer;
@@ -120,11 +122,11 @@ let Sequencer = (() => {
120
122
  [SequencerState.IDLE]: this.aztecSlotDuration,
121
123
  [SequencerState.SYNCHRONIZING]: this.aztecSlotDuration,
122
124
  [SequencerState.PROPOSER_CHECK]: this.aztecSlotDuration, // We always want to allow the full slot to check if we are the proposer
123
- [SequencerState.WAITING_FOR_TXS]: 3,
124
- [SequencerState.CREATING_BLOCK]: 5,
125
- [SequencerState.PUBLISHING_BLOCK_TO_PEERS]: 5 + this.maxTxsPerBlock * 2, // if we take 5 seconds to create block, then 4 transactions at 2 seconds each
126
- [SequencerState.WAITING_FOR_ATTESTATIONS]: 5 + this.maxTxsPerBlock * 2 + 3, // it shouldn't take 3 seconds to publish to peers
127
- [SequencerState.PUBLISHING_BLOCK]: 5 + this.maxTxsPerBlock * 2 + 3 + 5, // wait 5 seconds for attestations
125
+ [SequencerState.WAITING_FOR_TXS]: 5,
126
+ [SequencerState.CREATING_BLOCK]: 7,
127
+ [SequencerState.PUBLISHING_BLOCK_TO_PEERS]: 7 + this.maxTxsPerBlock * 2, // if we take 5 seconds to create block, then 4 transactions at 2 seconds each
128
+ [SequencerState.WAITING_FOR_ATTESTATIONS]: 7 + this.maxTxsPerBlock * 2 + 3, // it shouldn't take 3 seconds to publish to peers
129
+ [SequencerState.PUBLISHING_BLOCK]: 7 + this.maxTxsPerBlock * 2 + 3 + 5, // wait 5 seconds for attestations
128
130
  };
129
131
  if (this.enforceTimeTable && newTimeTable[SequencerState.PUBLISHING_BLOCK] > this.aztecSlotDuration) {
130
132
  throw new Error('Sequencer cannot publish block in less than a slot');
@@ -137,7 +139,7 @@ let Sequencer = (() => {
137
139
  start() {
138
140
  this.runningPromise = new RunningPromise(this.work.bind(this), this.pollingIntervalMs);
139
141
  this.runningPromise.start();
140
- this.setState(SequencerState.IDLE, true /** force */);
142
+ this.setState(SequencerState.IDLE, 0, true /** force */);
141
143
  this.log.info('Sequencer started');
142
144
  return Promise.resolve();
143
145
  }
@@ -148,7 +150,7 @@ let Sequencer = (() => {
148
150
  this.log.debug(`Stopping sequencer`);
149
151
  await this.runningPromise?.stop();
150
152
  this.publisher.interrupt();
151
- this.setState(SequencerState.STOPPED, true /** force */);
153
+ this.setState(SequencerState.STOPPED, 0, true /** force */);
152
154
  this.log.info('Stopped sequencer');
153
155
  }
154
156
  /**
@@ -158,7 +160,7 @@ let Sequencer = (() => {
158
160
  this.log.info('Restarting sequencer');
159
161
  this.publisher.restart();
160
162
  this.runningPromise.start();
161
- this.setState(SequencerState.IDLE, true /** force */);
163
+ this.setState(SequencerState.IDLE, 0, true /** force */);
162
164
  }
163
165
  /**
164
166
  * Returns the current state of the sequencer.
@@ -176,7 +178,7 @@ let Sequencer = (() => {
176
178
  * - If our block for some reason is not included, revert the state
177
179
  */
178
180
  async doRealWork() {
179
- this.setState(SequencerState.SYNCHRONIZING);
181
+ this.setState(SequencerState.SYNCHRONIZING, 0);
180
182
  // Update state when the previous block has been synced
181
183
  const prevBlockSynced = await this.isBlockSynced();
182
184
  // Do not go forward with new block if the previous one has not been mined and processed
@@ -185,7 +187,7 @@ let Sequencer = (() => {
185
187
  return;
186
188
  }
187
189
  this.log.debug('Previous block has been mined and processed');
188
- this.setState(SequencerState.PROPOSER_CHECK);
190
+ this.setState(SequencerState.PROPOSER_CHECK, 0);
189
191
  const chainTip = await this.l2BlockSource.getBlock(-1);
190
192
  const historicalHeader = chainTip?.header;
191
193
  const newBlockNumber = (historicalHeader === undefined
@@ -206,7 +208,8 @@ let Sequencer = (() => {
206
208
  if (!this.shouldProposeBlock(historicalHeader, {})) {
207
209
  return;
208
210
  }
209
- this.setState(SequencerState.WAITING_FOR_TXS);
211
+ const secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration, Number(slot));
212
+ this.setState(SequencerState.WAITING_FOR_TXS, secondsIntoSlot);
210
213
  // Get txs to build the new block.
211
214
  const pendingTxs = this.p2pClient.getTxs('pending');
212
215
  if (!this.shouldProposeBlock(historicalHeader, { pendingTxsCount: pendingTxs.length })) {
@@ -236,7 +239,7 @@ let Sequencer = (() => {
236
239
  catch (err) {
237
240
  this.log.error(`Error assembling block`, err.stack);
238
241
  }
239
- this.setState(SequencerState.IDLE);
242
+ this.setState(SequencerState.IDLE, 0);
240
243
  }
241
244
  async work() {
242
245
  try {
@@ -252,7 +255,7 @@ let Sequencer = (() => {
252
255
  }
253
256
  }
254
257
  finally {
255
- this.setState(SequencerState.IDLE);
258
+ this.setState(SequencerState.IDLE, 0);
256
259
  }
257
260
  }
258
261
  /** Whether to skip the check of min txs per block if more than maxSecondsBetweenBlocks has passed since the previous block. */
@@ -296,12 +299,11 @@ let Sequencer = (() => {
296
299
  this.log.debug(`Enough time to transition to ${proposedState}, max allowed: ${this.timeTable[proposedState]}s, time into slot: ${secondsIntoSlot}s`);
297
300
  return true;
298
301
  }
299
- setState(proposedState, force = false) {
302
+ setState(proposedState, secondsIntoSlot, force = false) {
300
303
  if (this.state === SequencerState.STOPPED && force !== true) {
301
304
  this.log.warn(`Cannot set sequencer from ${this.state} to ${proposedState} as it is stopped. Set force=true to override.`);
302
305
  return;
303
306
  }
304
- const secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration);
305
307
  if (!this.doIHaveEnoughTimeLeft(proposedState, secondsIntoSlot)) {
306
308
  throw new SequencerTooSlowError(this.state, proposedState, this.timeTable[proposedState], secondsIntoSlot);
307
309
  }
@@ -357,33 +359,28 @@ let Sequencer = (() => {
357
359
  return true;
358
360
  }
359
361
  /**
360
- * @notice Build and propose a block to the chain
362
+ * Build a block
361
363
  *
362
- * @dev MUST throw instead of exiting early to ensure that world-state
363
- * is being rolled back if the block is dropped.
364
+ * Shared between the sequencer and the validator for re-execution
364
365
  *
365
366
  * @param validTxs - The valid transactions to construct the block from
366
- * @param proposalHeader - The partial header constructed for the proposal
367
+ * @param newGlobalVariables - The global variables for the new block
367
368
  * @param historicalHeader - The historical header of the parent
369
+ * @param interrupt - The interrupt callback, used to validate the block for submission and check if we should propose the block
368
370
  */
369
- async buildBlockAndAttemptToPublish(validTxs, proposalHeader, historicalHeader) {
370
- await this.publisher.validateBlockForSubmission(proposalHeader);
371
- const newGlobalVariables = proposalHeader.globalVariables;
372
- this.metrics.recordNewBlock(newGlobalVariables.blockNumber.toNumber(), validTxs.length);
373
- const workTimer = new Timer();
374
- this.setState(SequencerState.CREATING_BLOCK);
375
- this.log.info(`Building blockNumber=${newGlobalVariables.blockNumber.toNumber()} txCount=${validTxs.length} slotNumber=${newGlobalVariables.slotNumber.toNumber()}`);
376
- // Get l1 to l2 messages from the contract
371
+ async buildBlock(validTxs, newGlobalVariables, historicalHeader, interrupt) {
377
372
  this.log.debug('Requesting L1 to L2 messages from contract');
378
373
  const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(newGlobalVariables.blockNumber.toBigInt());
379
374
  this.log.verbose(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newGlobalVariables.blockNumber.toNumber()}`);
380
375
  const numRealTxs = validTxs.length;
381
376
  const blockSize = Math.max(2, numRealTxs);
377
+ // Sync to the previous block at least
378
+ await this.worldState.syncImmediate(newGlobalVariables.blockNumber.toNumber() - 1);
379
+ this.log.verbose(`Synced to previous block ${newGlobalVariables.blockNumber.toNumber() - 1}`);
382
380
  // NB: separating the dbs because both should update the state
383
381
  const publicProcessorFork = await this.worldState.fork();
384
382
  const orchestratorFork = await this.worldState.fork();
385
383
  try {
386
- // We create a fresh processor each time to reset any cached state (eg storage writes)
387
384
  const processor = this.publicProcessorFactory.create(publicProcessorFork, historicalHeader, newGlobalVariables);
388
385
  const blockBuildingTimer = new Timer();
389
386
  const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
@@ -394,6 +391,42 @@ let Sequencer = (() => {
394
391
  this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
395
392
  await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
396
393
  }
394
+ await interrupt?.(processedTxs);
395
+ // All real transactions have been added, set the block as full and complete the proving.
396
+ const block = await blockBuilder.setBlockCompleted();
397
+ return { block, publicProcessorDuration, numProcessedTxs: processedTxs.length, blockBuildingTimer };
398
+ }
399
+ finally {
400
+ // We create a fresh processor each time to reset any cached state (eg storage writes)
401
+ await publicProcessorFork.close();
402
+ await orchestratorFork.close();
403
+ }
404
+ }
405
+ /**
406
+ * @notice Build and propose a block to the chain
407
+ *
408
+ * @dev MUST throw instead of exiting early to ensure that world-state
409
+ * is being rolled back if the block is dropped.
410
+ *
411
+ * @param validTxs - The valid transactions to construct the block from
412
+ * @param proposalHeader - The partial header constructed for the proposal
413
+ * @param historicalHeader - The historical header of the parent
414
+ */
415
+ async buildBlockAndAttemptToPublish(validTxs, proposalHeader, historicalHeader) {
416
+ await this.publisher.validateBlockForSubmission(proposalHeader);
417
+ const newGlobalVariables = proposalHeader.globalVariables;
418
+ this.metrics.recordNewBlock(newGlobalVariables.blockNumber.toNumber(), validTxs.length);
419
+ const workTimer = new Timer();
420
+ const secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration, newGlobalVariables.slotNumber.toNumber());
421
+ this.setState(SequencerState.CREATING_BLOCK, secondsIntoSlot);
422
+ this.log.info(`Building blockNumber=${newGlobalVariables.blockNumber.toNumber()} txCount=${validTxs.length} slotNumber=${newGlobalVariables.slotNumber.toNumber()}`);
423
+ /**
424
+ * BuildBlock is shared between the sequencer and the validator for re-execution
425
+ * We use the interrupt callback to validate the block for submission and check if we should propose the block
426
+ *
427
+ * If we fail, we throw an error in order to roll back
428
+ */
429
+ const interrupt = async (processedTxs) => {
397
430
  await this.publisher.validateBlockForSubmission(proposalHeader);
398
431
  if (!this.shouldProposeBlock(historicalHeader, {
399
432
  validTxsCount: validTxs.length,
@@ -402,13 +435,14 @@ let Sequencer = (() => {
402
435
  // TODO: Roll back changes to world state
403
436
  throw new Error('Should not propose the block');
404
437
  }
405
- // All real transactions have been added, set the block as full and complete the proving.
406
- const block = await blockBuilder.setBlockCompleted();
438
+ };
439
+ try {
440
+ const { block, publicProcessorDuration, numProcessedTxs, blockBuildingTimer } = await this.buildBlock(validTxs, newGlobalVariables, historicalHeader, interrupt);
407
441
  // TODO(@PhilWindle) We should probably periodically check for things like another
408
442
  // block being published before ours instead of just waiting on our block
409
443
  await this.publisher.validateBlockForSubmission(block.header);
410
444
  const workDuration = workTimer.ms();
411
- this.log.verbose(`Assembled block ${block.number} (txEffectsHash: ${block.header.contentCommitment.txsEffectsHash.toString('hex')})`, {
445
+ this.log.info(`Assembled block ${block.number} (txEffectsHash: ${block.header.contentCommitment.txsEffectsHash.toString('hex')})`, {
412
446
  eventName: 'l2-block-built',
413
447
  creator: this.publisher.getSenderAddress().toString(),
414
448
  duration: workDuration,
@@ -417,29 +451,25 @@ let Sequencer = (() => {
417
451
  ...block.getStats(),
418
452
  });
419
453
  if (this.isFlushing) {
420
- this.log.verbose(`Flushing completed`);
454
+ this.log.info(`Flushing completed`);
421
455
  }
422
456
  const txHashes = validTxs.map(tx => tx.getTxHash());
423
457
  this.isFlushing = false;
424
458
  this.log.verbose('Collecting attestations');
459
+ const stopCollectingAttestationsTimer = this.metrics.startCollectingAttestationsTimer();
425
460
  const attestations = await this.collectAttestations(block, txHashes);
426
461
  this.log.verbose('Attestations collected');
462
+ stopCollectingAttestationsTimer();
427
463
  this.log.verbose('Collecting proof quotes');
428
464
  const proofQuote = await this.createProofClaimForPreviousEpoch(newGlobalVariables.slotNumber.toBigInt());
429
- this.log.verbose(proofQuote ? `Using proof quote ${inspect(proofQuote.payload)}` : 'No proof quote available');
430
- try {
431
- await this.publishL2Block(block, attestations, txHashes, proofQuote);
432
- this.metrics.recordPublishedBlock(workDuration);
433
- this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions duration=${Math.ceil(workDuration)}ms (Submitter: ${this.publisher.getSenderAddress()})`);
434
- }
435
- catch (err) {
436
- this.metrics.recordFailedBlock();
437
- throw err;
438
- }
465
+ this.log.info(proofQuote ? `Using proof quote ${inspect(proofQuote.payload)}` : 'No proof quote available');
466
+ await this.publishL2Block(block, attestations, txHashes, proofQuote);
467
+ this.metrics.recordPublishedBlock(workDuration);
468
+ this.log.info(`Submitted rollup block ${block.number} with ${numProcessedTxs} transactions duration=${Math.ceil(workDuration)}ms (Submitter: ${this.publisher.getSenderAddress()})`);
439
469
  }
440
- finally {
441
- await publicProcessorFork.close();
442
- await orchestratorFork.close();
470
+ catch (err) {
471
+ this.metrics.recordFailedBlock();
472
+ throw err;
443
473
  }
444
474
  }
445
475
  /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */
@@ -451,7 +481,7 @@ let Sequencer = (() => {
451
481
  const committee = await this.publisher.getCurrentEpochCommittee();
452
482
  this.log.debug(`Attesting committee length ${committee.length}`);
453
483
  if (committee.length === 0) {
454
- this.log.debug(`Attesting committee length is 0, skipping`);
484
+ this.log.verbose(`Attesting committee length is 0, skipping`);
455
485
  return undefined;
456
486
  }
457
487
  if (!this.validatorClient) {
@@ -460,14 +490,16 @@ let Sequencer = (() => {
460
490
  throw new Error(msg);
461
491
  }
462
492
  const numberOfRequiredAttestations = Math.floor((committee.length * 2) / 3) + 1;
463
- this.log.verbose('Creating block proposal');
493
+ this.log.info('Creating block proposal');
464
494
  const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
465
- this.setState(SequencerState.PUBLISHING_BLOCK_TO_PEERS);
466
- this.log.verbose('Broadcasting block proposal to validators');
495
+ let secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration, block.header.globalVariables.slotNumber.toNumber());
496
+ this.setState(SequencerState.PUBLISHING_BLOCK_TO_PEERS, secondsIntoSlot);
497
+ this.log.info('Broadcasting block proposal to validators');
467
498
  this.validatorClient.broadcastBlockProposal(proposal);
468
- this.setState(SequencerState.WAITING_FOR_ATTESTATIONS);
499
+ secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration, block.header.globalVariables.slotNumber.toNumber());
500
+ this.setState(SequencerState.WAITING_FOR_ATTESTATIONS, secondsIntoSlot);
469
501
  const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations);
470
- this.log.verbose(`Collected attestations from validators, number of attestations: ${attestations.length}`);
502
+ this.log.info(`Collected attestations from validators, number of attestations: ${attestations.length}`);
471
503
  // note: the smart contract requires that the signatures are provided in the order of the committee
472
504
  return orderAttestations(attestations, committee);
473
505
  }
@@ -481,7 +513,7 @@ let Sequencer = (() => {
481
513
  }
482
514
  // Get quotes for the epoch to be proven
483
515
  const quotes = await this.p2pClient.getEpochProofQuotes(epochToProve);
484
- this.log.verbose(`Retrieved ${quotes.length} quotes, slot: ${slotNumber}, epoch to prove: ${epochToProve}`);
516
+ this.log.info(`Retrieved ${quotes.length} quotes, slot: ${slotNumber}, epoch to prove: ${epochToProve}`);
485
517
  for (const quote of quotes) {
486
518
  this.log.verbose(inspect(quote.payload));
487
519
  }
@@ -489,7 +521,7 @@ let Sequencer = (() => {
489
521
  const validQuotesPromise = Promise.all(quotes.filter(x => x.payload.validUntilSlot >= slotNumber).map(x => this.publisher.validateProofQuote(x)));
490
522
  const validQuotes = (await validQuotesPromise).filter((q) => !!q);
491
523
  if (!validQuotes.length) {
492
- this.log.verbose(`Failed to find any valid proof quotes`);
524
+ this.log.warn(`Failed to find any valid proof quotes`);
493
525
  return undefined;
494
526
  }
495
527
  // pick the quote with the lowest fee
@@ -506,8 +538,9 @@ let Sequencer = (() => {
506
538
  * @param block - The L2Block to be published.
507
539
  */
508
540
  async publishL2Block(block, attestations, txHashes, proofQuote) {
541
+ const secondsIntoSlot = getSecondsIntoSlot(this.l1GenesisTime, this.aztecSlotDuration, block.header.globalVariables.slotNumber.toNumber());
509
542
  // Publishes new block to the network and awaits the tx to be mined
510
- this.setState(SequencerState.PUBLISHING_BLOCK);
543
+ this.setState(SequencerState.PUBLISHING_BLOCK, secondsIntoSlot);
511
544
  const publishedL2Block = await this.publisher.proposeL2Block(block, attestations, txHashes, proofQuote);
512
545
  if (!publishedL2Block) {
513
546
  throw new Error(`Failed to publish block ${block.number}`);
@@ -601,4 +634,4 @@ export { Sequencer };
601
634
  /**
602
635
  * State of the sequencer.
603
636
  */
604
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
637
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
@@ -48,5 +48,5 @@ export declare function sequencerStateToNumber(state: SequencerState): number;
48
48
  * @todo: perform this logic within the memory attestation store instead?
49
49
  */
50
50
  export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): Signature[];
51
- export declare function getSecondsIntoSlot(l1GenesisTime: number, aztecSlotDuration: number): number;
51
+ export declare function getSecondsIntoSlot(l1GenesisTime: number, aztecSlotDuration: number, slotNumber: number): number;
52
52
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,eAAe,oBAAoB;IACnC;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,yBAAyB,8BAA8B;IACvD;;OAEG;IACH,wBAAwB,6BAA6B;IACrD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CAkB7G;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAE3F"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,eAAe,oBAAoB;IACnC;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,yBAAyB,8BAA8B;IACvD;;OAEG;IACH,wBAAwB,6BAA6B;IACrD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CAkB7G;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/G"}
@@ -64,7 +64,8 @@ export function orderAttestations(attestations, orderAddresses) {
64
64
  });
65
65
  return orderedAttestations;
66
66
  }
67
- export function getSecondsIntoSlot(l1GenesisTime, aztecSlotDuration) {
68
- return (Date.now() / 1000 - l1GenesisTime) % aztecSlotDuration;
67
+ export function getSecondsIntoSlot(l1GenesisTime, aztecSlotDuration, slotNumber) {
68
+ const slotStartTimestamp = l1GenesisTime + slotNumber * aztecSlotDuration;
69
+ return Date.now() / 1000 - slotStartTimestamp;
69
70
  }
70
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RCxNQUFNLENBQU4sSUFBWSxjQXFDWDtBQXJDRCxXQUFZLGNBQWM7SUFDeEI7O09BRUc7SUFDSCxxQ0FBbUIsQ0FBQTtJQUNuQjs7T0FFRztJQUNILCtCQUFhLENBQUE7SUFDYjs7T0FFRztJQUNILGlEQUErQixDQUFBO0lBQy9COztPQUVHO0lBQ0gsbURBQWlDLENBQUE7SUFDakM7O09BRUc7SUFDSCxxREFBbUMsQ0FBQTtJQUNuQzs7T0FFRztJQUNILG1EQUFpQyxDQUFBO0lBQ2pDOztPQUVHO0lBQ0gseUVBQXVELENBQUE7SUFDdkQ7O09BRUc7SUFDSCx1RUFBcUQsQ0FBQTtJQUNyRDs7T0FFRztJQUNILHVEQUFxQyxDQUFBO0FBQ3ZDLENBQUMsRUFyQ1csY0FBYyxLQUFkLGNBQWMsUUFxQ3pCO0FBSUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEtBQXFCO0lBQzFELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDdEQsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxZQUFnQyxFQUFFLGNBQTRCO0lBQzlGLHdEQUF3RDtJQUN4RCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsRUFBNEIsQ0FBQztJQUUzRCxLQUFLLE1BQU0sV0FBVyxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sTUFBTSxHQUFHLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUN2QyxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ1gsY0FBYyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFRCx1RkFBdUY7SUFDdkYsTUFBTSxtQkFBbUIsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3ZELE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6QyxPQUFPLGNBQWMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsU0FBUyxJQUFJLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUMzRSxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sbUJBQW1CLENBQUM7QUFDN0IsQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxhQUFxQixFQUFFLGlCQUF5QjtJQUNqRixPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksR0FBRyxhQUFhLENBQUMsR0FBRyxpQkFBaUIsQ0FBQztBQUNqRSxDQUFDIn0=
71
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RCxNQUFNLENBQU4sSUFBWSxjQXFDWDtBQXJDRCxXQUFZLGNBQWM7SUFDeEI7O09BRUc7SUFDSCxxQ0FBbUIsQ0FBQTtJQUNuQjs7T0FFRztJQUNILCtCQUFhLENBQUE7SUFDYjs7T0FFRztJQUNILGlEQUErQixDQUFBO0lBQy9COztPQUVHO0lBQ0gsbURBQWlDLENBQUE7SUFDakM7O09BRUc7SUFDSCxxREFBbUMsQ0FBQTtJQUNuQzs7T0FFRztJQUNILG1EQUFpQyxDQUFBO0lBQ2pDOztPQUVHO0lBQ0gseUVBQXVELENBQUE7SUFDdkQ7O09BRUc7SUFDSCx1RUFBcUQsQ0FBQTtJQUNyRDs7T0FFRztJQUNILHVEQUFxQyxDQUFBO0FBQ3ZDLENBQUMsRUFyQ1csY0FBYyxLQUFkLGNBQWMsUUFxQ3pCO0FBSUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEtBQXFCO0lBQzFELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDdEQsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxZQUFnQyxFQUFFLGNBQTRCO0lBQzlGLHdEQUF3RDtJQUN4RCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsRUFBNEIsQ0FBQztJQUUzRCxLQUFLLE1BQU0sV0FBVyxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sTUFBTSxHQUFHLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUN2QyxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ1gsY0FBYyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFRCx1RkFBdUY7SUFDdkYsTUFBTSxtQkFBbUIsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3ZELE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6QyxPQUFPLGNBQWMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLEVBQUUsU0FBUyxJQUFJLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUMzRSxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sbUJBQW1CLENBQUM7QUFDN0IsQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxhQUFxQixFQUFFLGlCQUF5QixFQUFFLFVBQWtCO0lBQ3JHLE1BQU0sa0JBQWtCLEdBQUcsYUFBYSxHQUFHLFVBQVUsR0FBRyxpQkFBaUIsQ0FBQztJQUMxRSxPQUFPLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLEdBQUcsa0JBQWtCLENBQUM7QUFDaEQsQ0FBQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.63.1",
3
+ "version": "0.65.0",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "typedocOptions": {
@@ -24,24 +24,24 @@
24
24
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
25
25
  },
26
26
  "dependencies": {
27
- "@aztec/aztec.js": "0.63.1",
28
- "@aztec/bb-prover": "0.63.1",
29
- "@aztec/circuit-types": "0.63.1",
30
- "@aztec/circuits.js": "0.63.1",
31
- "@aztec/ethereum": "0.63.1",
32
- "@aztec/foundation": "0.63.1",
33
- "@aztec/l1-artifacts": "0.63.1",
34
- "@aztec/merkle-tree": "0.63.1",
35
- "@aztec/noir-contracts.js": "0.63.1",
36
- "@aztec/noir-protocol-circuits-types": "0.63.1",
37
- "@aztec/p2p": "0.63.1",
38
- "@aztec/protocol-contracts": "0.63.1",
39
- "@aztec/prover-client": "0.63.1",
40
- "@aztec/simulator": "0.63.1",
41
- "@aztec/telemetry-client": "0.63.1",
42
- "@aztec/types": "0.63.1",
43
- "@aztec/validator-client": "0.63.1",
44
- "@aztec/world-state": "0.63.1",
27
+ "@aztec/aztec.js": "0.65.0",
28
+ "@aztec/bb-prover": "0.65.0",
29
+ "@aztec/circuit-types": "0.65.0",
30
+ "@aztec/circuits.js": "0.65.0",
31
+ "@aztec/ethereum": "0.65.0",
32
+ "@aztec/foundation": "0.65.0",
33
+ "@aztec/l1-artifacts": "0.65.0",
34
+ "@aztec/merkle-tree": "0.65.0",
35
+ "@aztec/noir-contracts.js": "0.65.0",
36
+ "@aztec/noir-protocol-circuits-types": "0.65.0",
37
+ "@aztec/p2p": "0.65.0",
38
+ "@aztec/protocol-contracts": "0.65.0",
39
+ "@aztec/prover-client": "0.65.0",
40
+ "@aztec/simulator": "0.65.0",
41
+ "@aztec/telemetry-client": "0.65.0",
42
+ "@aztec/types": "0.65.0",
43
+ "@aztec/validator-client": "0.65.0",
44
+ "@aztec/world-state": "0.65.0",
45
45
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
46
46
  "@noir-lang/types": "portal:../../noir/packages/types",
47
47
  "lodash.chunk": "^4.2.0",
@@ -32,7 +32,7 @@ export class LightweightBlockBuilder implements BlockBuilder {
32
32
  constructor(private db: MerkleTreeWriteOperations, private telemetry: TelemetryClient) {}
33
33
 
34
34
  async startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void> {
35
- this.logger.verbose('Starting new block', { numTxs, globalVariables, l1ToL2Messages });
35
+ this.logger.verbose('Starting new block', { numTxs, globalVariables: globalVariables.toJSON(), l1ToL2Messages });
36
36
  this.numTxs = numTxs;
37
37
  this.globalVariables = globalVariables;
38
38
  this.l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
@@ -2,7 +2,7 @@ import { type L1ToL2MessageSource, type L2BlockSource, type WorldStateSynchroniz
2
2
  import { type ContractDataSource } from '@aztec/circuits.js';
3
3
  import { type EthAddress } from '@aztec/foundation/eth-address';
4
4
  import { type P2P } from '@aztec/p2p';
5
- import { PublicProcessorFactory, type SimulationProvider } from '@aztec/simulator';
5
+ import { PublicProcessorFactory } from '@aztec/simulator';
6
6
  import { type TelemetryClient } from '@aztec/telemetry-client';
7
7
  import { type ValidatorClient } from '@aztec/validator-client';
8
8
 
@@ -34,16 +34,27 @@ export class SequencerClient {
34
34
  */
35
35
  public static async new(
36
36
  config: SequencerClientConfig,
37
- validatorClient: ValidatorClient | undefined, // allowed to be undefined while we migrate
38
- p2pClient: P2P,
39
- worldStateSynchronizer: WorldStateSynchronizer,
40
- contractDataSource: ContractDataSource,
41
- l2BlockSource: L2BlockSource,
42
- l1ToL2MessageSource: L1ToL2MessageSource,
43
- _simulationProvider: SimulationProvider,
44
- telemetryClient: TelemetryClient,
37
+ deps: {
38
+ validatorClient: ValidatorClient | undefined; // allowed to be undefined while we migrate
39
+ p2pClient: P2P;
40
+ worldStateSynchronizer: WorldStateSynchronizer;
41
+ contractDataSource: ContractDataSource;
42
+ l2BlockSource: L2BlockSource;
43
+ l1ToL2MessageSource: L1ToL2MessageSource;
44
+ telemetry: TelemetryClient;
45
+ publisher?: L1Publisher;
46
+ },
45
47
  ) {
46
- const publisher = new L1Publisher(config, telemetryClient);
48
+ const {
49
+ validatorClient,
50
+ p2pClient,
51
+ worldStateSynchronizer,
52
+ contractDataSource,
53
+ l2BlockSource,
54
+ l1ToL2MessageSource,
55
+ telemetry: telemetryClient,
56
+ } = deps;
57
+ const publisher = deps.publisher ?? new L1Publisher(config, telemetryClient);
47
58
  const globalsBuilder = new GlobalVariableBuilder(config);
48
59
 
49
60
  const publicProcessorFactory = new PublicProcessorFactory(contractDataSource, telemetryClient);
package/src/index.ts CHANGED
@@ -4,4 +4,5 @@ export * from './publisher/index.js';
4
4
  export * from './sequencer/index.js';
5
5
 
6
6
  // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
7
+ // ISSUE(#9832)
7
8
  export * from './global_variable_builder/index.js';
@@ -1,2 +1,3 @@
1
1
  export { L1Publisher, L1SubmitEpochProofArgs } from './l1-publisher.js';
2
+ export * from './test-l1-publisher.js';
2
3
  export * from './config.js';