@aztec/sequencer-client 1.2.1 → 2.0.0-nightly.20250813

package/src/sequencer/timetable.ts

@@ -1,12 +1,12 @@
 import { createLogger } from '@aztec/aztec.js';
 
+import { DEFAULT_ATTESTATION_PROPAGATION_TIME } from '../config.js';
 import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 
 const MIN_EXECUTION_TIME = 1;
 const BLOCK_PREPARE_TIME = 1;
 const BLOCK_VALIDATION_TIME = 1;
-const ATTESTATION_PROPAGATION_TIME = 2;
 
 export class SequencerTimetable {
   /**
@@ -30,20 +30,40 @@ export class SequencerTimetable {
   public readonly blockPrepareTime: number = BLOCK_PREPARE_TIME;
 
   /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
-  public readonly attestationPropagationTime: number = ATTESTATION_PROPAGATION_TIME;
+  public readonly attestationPropagationTime: number;
 
   /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
   public readonly blockValidationTime: number = BLOCK_VALIDATION_TIME;
 
+  /** Ethereum slot duration in seconds */
+  public readonly ethereumSlotDuration: number;
+
+  /** Aztec slot duration in seconds (must be multiple of ethereum slot duration) */
+  public readonly aztecSlotDuration: number;
+
+  /** How late into an L1 slot we can send a tx to make sure it gets included in the immediate next block. Complement of l1PublishingTime. */
+  public readonly maxL1TxInclusionTimeIntoSlot: number;
+
+  /** Whether assertTimeLeft will throw if not enough time. */
+  public readonly enforce: boolean;
+
   constructor(
-    private readonly ethereumSlotDuration: number,
-    private readonly aztecSlotDuration: number,
-    private readonly maxL1TxInclusionTimeIntoSlot: number,
-    private readonly enforce: boolean = true,
+    opts: {
+      ethereumSlotDuration: number;
+      aztecSlotDuration: number;
+      maxL1TxInclusionTimeIntoSlot: number;
+      attestationPropagationTime?: number;
+      enforce: boolean;
+    },
     private readonly metrics?: SequencerMetrics,
     private readonly log = createLogger('sequencer:timetable'),
   ) {
+    this.ethereumSlotDuration = opts.ethereumSlotDuration;
+    this.aztecSlotDuration = opts.aztecSlotDuration;
+    this.maxL1TxInclusionTimeIntoSlot = opts.maxL1TxInclusionTimeIntoSlot;
+    this.attestationPropagationTime = opts.attestationPropagationTime ?? DEFAULT_ATTESTATION_PROPAGATION_TIME;
     this.l1PublishingTime = this.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
+    this.enforce = opts.enforce;
 
     // Assume zero-cost propagation time and faster runs in test environments where L1 slot duration is shortened
     if (this.ethereumSlotDuration < 8) {
@@ -58,13 +78,29 @@ export class SequencerTimetable {
       this.attestationPropagationTime * 2 +
       this.blockValidationTime +
       this.l1PublishingTime;
+
     const initializeDeadline = this.aztecSlotDuration - allWorkToDo;
+    this.initializeDeadline = initializeDeadline;
+
+    this.log.verbose(`Sequencer timetable initialized (${this.enforce ? 'enforced' : 'not enforced'})`, {
+      ethereumSlotDuration: this.ethereumSlotDuration,
+      aztecSlotDuration: this.aztecSlotDuration,
+      maxL1TxInclusionTimeIntoSlot: this.maxL1TxInclusionTimeIntoSlot,
+      l1PublishingTime: this.l1PublishingTime,
+      minExecutionTime: this.minExecutionTime,
+      blockPrepareTime: this.blockPrepareTime,
+      attestationPropagationTime: this.attestationPropagationTime,
+      blockValidationTime: this.blockValidationTime,
+      initializeDeadline: this.initializeDeadline,
+      enforce: this.enforce,
+      allWorkToDo,
+    });
+
     if (initializeDeadline <= 0) {
       throw new Error(
         `Block proposal initialize deadline cannot be negative (got ${initializeDeadline} from total time needed ${allWorkToDo} and a slot duration of ${this.aztecSlotDuration}).`,
       );
     }
-    this.initializeDeadline = initializeDeadline;
   }
 
   private get afterBlockBuildingTimeNeededWithoutReexec() {

package/src/sequencer/utils.ts

@@ -1,7 +1,3 @@
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import { CommitteeAttestation } from '@aztec/stdlib/block';
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
-
 export enum SequencerState {
   /**
    * Sequencer is stopped and not processing any txs from the pool.
@@ -37,41 +33,14 @@ export enum SequencerState {
   PUBLISHING_BLOCK = 'PUBLISHING_BLOCK',
 }
 
+export type SequencerStateWithSlot =
+  | SequencerState.INITIALIZING_PROPOSAL
+  | SequencerState.CREATING_BLOCK
+  | SequencerState.COLLECTING_ATTESTATIONS
+  | SequencerState.PUBLISHING_BLOCK;
+
 export type SequencerStateCallback = () => SequencerState;
 
 export function sequencerStateToNumber(state: SequencerState): number {
   return Object.values(SequencerState).indexOf(state);
 }
-
-/** Order Attestations
- *
- * Returns attestation signatures in the order of a series of provided ethereum addresses
- * The rollup smart contract expects attestations to appear in the order of the committee
- *
- * @todo: perform this logic within the memory attestation store instead?
- */
-export function orderAttestations(
-  attestations: BlockAttestation[],
-  orderAddresses: EthAddress[],
-): CommitteeAttestation[] {
-  // Create a map of sender addresses to BlockAttestations
-  const attestationMap = new Map<string, CommitteeAttestation>();
-
-  for (const attestation of attestations) {
-    const sender = attestation.getSender();
-    if (sender) {
-      attestationMap.set(
-        sender.toString(),
-        CommitteeAttestation.fromAddressAndSignature(sender, attestation.signature),
-      );
-    }
-  }
-
-  // Create the ordered array based on the orderAddresses, else return an empty attestation
-  const orderedAttestations = orderAddresses.map(address => {
-    const addressString = address.toString();
-    return attestationMap.get(addressString) || CommitteeAttestation.fromAddress(address);
-  });
-
-  return orderedAttestations;
-}