@aztec/sequencer-client 3.0.0-nightly.20251127 → 3.0.0-nightly.20251201.2

package/src/publisher/sequencer-publisher.ts

@@ -18,7 +18,6 @@ import {
   type TransactionStats,
   type ViemCommitteeAttestations,
   type ViemHeader,
-  type ViemStateReference,
   WEI_CONST,
   formatViemError,
   tryExtractEvent,
@@ -26,6 +25,7 @@ import {
 import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { sumBigint } from '@aztec/foundation/bigint';
 import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature, type ViemSignature } from '@aztec/foundation/eth-signature';
 import type { Fr } from '@aztec/foundation/fields';
@@ -38,7 +38,6 @@ import { CommitteeAttestation, CommitteeAttestationsAndSigners, type ValidateBlo
 import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import type { L1PublishBlockStats } from '@aztec/stdlib/stats';
-import { StateReference } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { type StateOverride, type TransactionReceipt, type TypedDataDefinition, encodeFunctionData, toHex } from 'viem';
@@ -52,8 +51,6 @@ type L1ProcessArgs = {
   header: CheckpointHeader;
   /** A root of the archive tree after the L2 block is applied. */
   archive: Buffer;
-  /** State reference after the L2 block is applied. */
-  stateReference: StateReference;
   /** L2 block blobs containing all tx effects. */
   blobs: Blob[];
   /** Attestations */
@@ -92,7 +89,7 @@ export type InvalidateBlockRequest = {
 interface RequestWithExpiry {
   action: Action;
   request: L1TxRequest;
-  lastValidL2Slot: bigint;
+  lastValidL2Slot: SlotNumber;
   gasConfig?: Pick<L1TxConfig, 'txTimeoutAt' | 'gasLimit'>;
   blobConfig?: L1BlobInputs;
   checkSuccess: (
@@ -109,7 +106,7 @@ export class SequencerPublisher {
   protected governanceLog = createLogger('sequencer:publisher:governance');
   protected slashingLog = createLogger('sequencer:publisher:slashing');
 
-  protected lastActions: Partial<Record<Action, bigint>> = {};
+  protected lastActions: Partial<Record<Action, SlotNumber>> = {};
 
   protected log: Logger;
   protected ethereumSlotDuration: bigint;
@@ -150,7 +147,7 @@ export class SequencerPublisher {
       epochCache: EpochCache;
       dateProvider: DateProvider;
       metrics: SequencerPublisherMetrics;
-      lastActions: Partial<Record<Action, bigint>>;
+      lastActions: Partial<Record<Action, SlotNumber>>;
       log?: Logger;
     },
   ) {
@@ -199,7 +196,7 @@ export class SequencerPublisher {
     this.requests.push(request);
   }
 
-  public getCurrentL2Slot(): bigint {
+  public getCurrentL2Slot(): SlotNumber {
     return this.epochCache.getEpochAndSlotNow().slot;
   }
 
@@ -344,7 +341,7 @@ export class SequencerPublisher {
     const ignoredErrors = ['SlotAlreadyInChain', 'InvalidProposer', 'InvalidArchive'];
 
     return this.rollupContract
-      .canProposeAtNextEthBlock(tipArchive.toBuffer(), msgSender.toString(), this.ethereumSlotDuration, {
+      .canProposeAtNextEthBlock(tipArchive.toBuffer(), msgSender.toString(), Number(this.ethereumSlotDuration), {
         forcePendingCheckpointNumber: opts.forcePendingBlockNumber,
       })
       .catch(err => {
@@ -521,10 +518,10 @@ export class SequencerPublisher {
     // so that the committee is recalculated correctly
     const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
     if (ignoreSignatures) {
-      const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber.toBigInt());
+      const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber);
       if (!committee) {
-        this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber.toBigInt()}`);
-        throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber.toBigInt()}`);
+        this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
+        throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
       }
       attestationsAndSigners.attestations = committee.map(committeeMember =>
         CommitteeAttestation.fromAddress(committeeMember),
@@ -539,7 +536,6 @@ export class SequencerPublisher {
       {
         header: block.getCheckpointHeader().toViem(),
         archive: toHex(block.archive.root.toBuffer()),
-        stateReference: block.header.state.toViem(),
         oracleInput: {
           feeAssetPriceModifier: 0n,
         },
@@ -555,7 +551,7 @@ export class SequencerPublisher {
   }
 
   private async enqueueCastSignalHelper(
-    slotNumber: bigint,
+    slotNumber: SlotNumber,
     timestamp: bigint,
     signalType: GovernanceSignalAction,
     payload: EthAddress,
@@ -648,7 +644,7 @@ export class SequencerPublisher {
    */
   public enqueueGovernanceCastSignal(
     governancePayload: EthAddress,
-    slotNumber: bigint,
+    slotNumber: SlotNumber,
     timestamp: bigint,
     signerAddress: EthAddress,
     signer: (msg: TypedDataDefinition) => Promise<`0x${string}`>,
@@ -667,7 +663,7 @@ export class SequencerPublisher {
   /** Enqueues all slashing actions as returned by the slasher client. */
   public async enqueueSlashingActions(
     actions: ProposerSlashAction[],
-    slotNumber: bigint,
+    slotNumber: SlotNumber,
     timestamp: bigint,
     signerAddress: EthAddress,
     signer: (msg: TypedDataDefinition) => Promise<`0x${string}`>,
@@ -807,7 +803,6 @@ export class SequencerPublisher {
     const proposeTxArgs = {
       header: checkpointHeader,
       archive: block.archive.root.toBuffer(),
-      stateReference: block.header.state,
       body: block.body.toBuffer(),
       blobs,
       attestationsAndSigners,
@@ -826,7 +821,7 @@ export class SequencerPublisher {
     } catch (err: any) {
       this.log.error(`Block validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
         ...block.getStats(),
-        slotNumber: block.header.globalVariables.slotNumber.toBigInt(),
+        slotNumber: block.header.globalVariables.slotNumber,
         forcePendingBlockNumber: opts.forcePendingBlockNumber,
       });
       throw err;
@@ -852,7 +847,7 @@ export class SequencerPublisher {
       action: `invalidate-by-${request.reason}`,
       request: request.request,
       gasConfig: { gasLimit, txTimeoutAt: opts.txTimeoutAt },
-      lastValidL2Slot: this.getCurrentL2Slot() + 2n,
+      lastValidL2Slot: SlotNumber(this.getCurrentL2Slot() + 2),
       checkSuccess: (_req, result) => {
         const success =
           result &&
@@ -873,7 +868,7 @@ export class SequencerPublisher {
     action: Action,
     request: L1TxRequest,
     checkSuccess: (receipt: TransactionReceipt) => boolean | undefined,
-    slotNumber: bigint,
+    slotNumber: SlotNumber,
     timestamp: bigint,
   ) {
     const logData = { slotNumber, timestamp, gasLimit: undefined as bigint | undefined };
@@ -985,7 +980,6 @@ export class SequencerPublisher {
       {
         header: encodedData.header.toViem(),
         archive: toHex(encodedData.archive),
-        stateReference: encodedData.stateReference.toViem(),
         oracleInput: {
           // We are currently not modifying these. See #9963
           feeAssetPriceModifier: 0n,
@@ -1013,7 +1007,6 @@ export class SequencerPublisher {
       {
         readonly header: ViemHeader;
         readonly archive: `0x${string}`;
-        readonly stateReference: ViemStateReference;
         readonly oracleInput: {
           readonly feeAssetPriceModifier: 0n;
         };
@@ -1128,7 +1121,7 @@ export class SequencerPublisher {
         to: this.rollupContract.address,
         data: rollupData,
       },
-      lastValidL2Slot: block.header.globalVariables.slotNumber.toBigInt(),
+      lastValidL2Slot: block.header.globalVariables.slotNumber,
       gasConfig: { ...opts, gasLimit },
       blobConfig: {
         blobs: encodedData.blobs.map(b => b.data),
@@ -1171,7 +1164,7 @@ export class SequencerPublisher {
             ...block.getStats(),
             receipt,
             txHash: receipt.transactionHash,
-            slotNumber: block.header.globalVariables.slotNumber.toBigInt(),
+            slotNumber: block.header.globalVariables.slotNumber,
           });
           return false;
         }

package/src/sequencer/block_builder.ts

@@ -47,7 +47,7 @@ export async function buildBlock(
 ): Promise<BuildBlockResult> {
   const blockBuildingTimer = new Timer();
   const blockNumber = newGlobalVariables.blockNumber;
-  const slot = newGlobalVariables.slotNumber.toBigInt();
+  const slot = newGlobalVariables.slotNumber;
   const msgCount = l1ToL2Messages.length;
   const stateReference = await worldStateFork.getStateReference();
   const archiveTree = await worldStateFork.getTreeInfo(MerkleTreeId.ARCHIVE);

package/src/sequencer/metrics.ts

@@ -1,5 +1,6 @@
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import type { RollupContract } from '@aztec/ethereum';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import {
   Attributes,
   type Gauge,
@@ -41,7 +42,7 @@ export class SequencerMetrics {
   private blockProposalPrecheckFailed: UpDownCounter;
   private slashingAttempts: UpDownCounter;
 
-  private lastSeenSlot?: bigint;
+  private lastSeenSlot?: SlotNumber;
 
   constructor(
     client: TelemetryClient,
@@ -185,7 +186,7 @@ export class SequencerMetrics {
     });
   }
 
-  incOpenSlot(slot: bigint, proposer: string) {
+  incOpenSlot(slot: SlotNumber, proposer: string) {
     // sequencer went through the loop a second time. Noop
     if (slot === this.lastSeenSlot) {
       return;

package/src/sequencer/sequencer.ts

@@ -2,6 +2,7 @@ import { L2Block } from '@aztec/aztec.js/block';
 import { BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import type { EpochCache } from '@aztec/epoch-cache';
 import { FormattedViemError, NoCommitteeError, type RollupContract } from '@aztec/ethereum';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { omit, pick } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -61,7 +62,7 @@ export type SequencerEvents = {
     oldState: SequencerState;
     newState: SequencerState;
     secondsIntoSlot?: number;
-    slotNumber?: bigint;
+    slotNumber?: SlotNumber;
   }) => void;
   ['proposer-rollup-check-failed']: (args: { reason: string }) => void;
   ['tx-count-check-failed']: (args: { minTxs: number; availableTxs: number }) => void;
@@ -100,10 +101,10 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
   private governanceProposerPayload: EthAddress | undefined;
 
   /** The last slot for which we attempted to vote when sync failed, to prevent duplicate attempts. */
-  private lastSlotForVoteWhenSyncFailed: bigint | undefined;
+  private lastSlotForVoteWhenSyncFailed: SlotNumber | undefined;
 
   /** The last slot for which we built a validation block in fisherman mode, to prevent duplicate attempts. */
-  private lastSlotForValidationBlock: bigint | undefined;
+  private lastSlotForValidationBlock: SlotNumber | undefined;
 
   /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */
   protected timetable!: SequencerTimetable;
@@ -465,7 +466,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
 
   /** Tries building a block proposal, and if successful, enqueues it for publishing. */
   private async tryBuildBlockAndEnqueuePublish(
-    slot: bigint,
+    slot: SlotNumber,
     proposer: EthAddress | undefined,
     newBlockNumber: number,
     publisher: SequencerPublisher,
@@ -553,13 +554,13 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
    * @param slotNumber - The current slot number.
    * @param force - Whether to force the transition even if the sequencer is stopped.
    */
-  setState(proposedState: SequencerStateWithSlot, slotNumber: bigint, opts?: { force?: boolean }): void;
+  setState(proposedState: SequencerStateWithSlot, slotNumber: SlotNumber, opts?: { force?: boolean }): void;
   setState(
     proposedState: Exclude<SequencerState, SequencerStateWithSlot>,
     slotNumber?: undefined,
     opts?: { force?: boolean },
   ): void;
-  setState(proposedState: SequencerState, slotNumber: bigint | undefined, opts: { force?: boolean } = {}): void {
+  setState(proposedState: SequencerState, slotNumber: SlotNumber | undefined, opts: { force?: boolean } = {}): void {
     if (this.state === SequencerState.STOPPING && proposedState !== SequencerState.STOPPED && !opts.force) {
       this.log.warn(`Cannot set sequencer to ${proposedState} as it is stopping.`);
       throw new SequencerInterruptedError();
@@ -600,7 +601,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     await this.p2pClient.deleteTxs(failedTxHashes);
   }
 
-  protected getBlockBuilderOptions(slot: number): PublicProcessorLimits {
+  protected getBlockBuilderOptions(slot: SlotNumber): PublicProcessorLimits {
     // Deadline for processing depends on whether we're proposing a block
     const secondsIntoSlot = this.getSecondsIntoSlot(slot);
     const processingEndTimeWithinSlot = this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
@@ -643,14 +644,14 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     await publisher.validateBlockHeader(proposalHeader, invalidateBlock);
 
     const blockNumber = newGlobalVariables.blockNumber;
-    const slot = proposalHeader.slotNumber.toBigInt();
+    const slot = proposalHeader.slotNumber;
     const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
 
     const workTimer = new Timer();
     this.setState(SequencerState.CREATING_BLOCK, slot);
 
     try {
-      const blockBuilderOptions = this.getBlockBuilderOptions(Number(slot));
+      const blockBuilderOptions = this.getBlockBuilderOptions(slot);
       const buildBlockRes = await this.blockBuilder.buildBlock(
         pendingTxs,
         l1ToL2Messages,
@@ -766,7 +767,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
 
     const numberOfRequiredAttestations = Math.floor((committee.length * 2) / 3) + 1;
 
-    const slotNumber = block.header.globalVariables.slotNumber.toBigInt();
+    const slotNumber = block.header.globalVariables.slotNumber;
     this.setState(SequencerState.COLLECTING_ATTESTATIONS, slotNumber);
 
     this.log.debug('Creating block proposal for validators');
@@ -778,7 +779,6 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       block.header.globalVariables.blockNumber,
       block.getCheckpointHeader(),
       block.archive.root,
-      block.header.state,
       txs,
       proposerAddress,
       blockProposalOptions,
@@ -837,7 +837,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
   /** Breaks the attestations before publishing based on attack configs */
   private manipulateAttestations(
     block: L2Block,
-    epoch: bigint,
+    epoch: EpochNumber,
     seed: bigint,
     committee: EthAddress[],
     attestations: CommitteeAttestation[],
@@ -896,10 +896,10 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     publisher: SequencerPublisher,
   ): Promise<void> {
     // Publishes new block to the network and awaits the tx to be mined
-    this.setState(SequencerState.PUBLISHING_BLOCK, block.header.globalVariables.slotNumber.toBigInt());
+    this.setState(SequencerState.PUBLISHING_BLOCK, block.header.globalVariables.slotNumber);
 
     // Time out tx at the end of the slot
-    const slot = block.header.globalVariables.slotNumber.toNumber();
+    const slot = block.header.globalVariables.slotNumber;
     const txTimeoutAt = new Date((this.getSlotStartBuildTimestamp(slot) + this.aztecSlotDuration) * 1000);
 
     const enqueued = await publisher.enqueueProposeL2Block(
@@ -921,7 +921,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
    * Returns whether all dependencies have caught up.
    * We don't check against the previous block submitted since it may have been reorg'd out.
    */
-  protected async checkSync(args: { ts: bigint; slot: bigint }): Promise<
+  protected async checkSync(args: { ts: bigint; slot: SlotNumber }): Promise<
     | {
         block?: L2Block;
         blockNumber: number;
@@ -1007,7 +1007,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
   protected enqueueGovernanceAndSlashingVotes(
     publisher: SequencerPublisher,
     attestorAddress: EthAddress,
-    slot: bigint,
+    slot: SlotNumber,
     timestamp: bigint,
   ): [Promise<boolean> | undefined, Promise<boolean> | undefined] {
     try {
@@ -1056,7 +1056,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
    * Checks if we are the proposer for the next slot.
    * @returns True if we can propose, and the proposer address (undefined if anyone can propose)
    */
-  protected async checkCanPropose(slot: bigint): Promise<[boolean, EthAddress | undefined]> {
+  protected async checkCanPropose(slot: SlotNumber): Promise<[boolean, EthAddress | undefined]> {
     let proposer: EthAddress | undefined;
 
     try {
@@ -1094,7 +1094,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
    * Tries to vote on slashing actions and governance when the sync check fails but we're past the max time for initializing a proposal.
    * This allows the sequencer to participate in governance/slashing votes even when it cannot build blocks.
    */
-  protected async tryVoteWhenSyncFails(args: { slot: bigint; ts: bigint }): Promise<void> {
+  protected async tryVoteWhenSyncFails(args: { slot: SlotNumber; ts: bigint }): Promise<void> {
     const { slot, ts } = args;
 
     // Prevent duplicate attempts in the same slot
@@ -1161,7 +1161,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
    */
   protected async considerInvalidatingBlock(
     syncedTo: NonNullable<Awaited<ReturnType<Sequencer['checkSync']>>>,
-    currentSlot: bigint,
+    currentSlot: SlotNumber,
   ): Promise<void> {
     const { pendingChainValidationStatus, l1Timestamp } = syncedTo;
     if (pendingChainValidationStatus.valid) {
@@ -1231,11 +1231,11 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     }
   }
 
-  private getSlotStartBuildTimestamp(slotNumber: number | bigint): number {
+  private getSlotStartBuildTimestamp(slotNumber: SlotNumber): number {
     return getSlotStartBuildTimestamp(slotNumber, this.l1Constants);
   }
 
-  private getSecondsIntoSlot(slotNumber: number | bigint): number {
+  private getSecondsIntoSlot(slotNumber: SlotNumber): number {
     const slotStartTimestamp = this.getSlotStartBuildTimestamp(slotNumber);
     return Number((this.dateProvider.now() / 1000 - slotStartTimestamp).toFixed(3));
   }