@aztec/sequencer-client 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/src/sequencer/timetable.ts

@@ -1,6 +1,7 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 
 import { DEFAULT_ATTESTATION_PROPAGATION_TIME } from '../config.js';
+import { SequencerTooSlowError } from './errors.js';
 import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 
@@ -136,9 +137,17 @@ export class SequencerTimetable {
     return validationTimeEnd;
   }
 
+  public getMaxAllowedTime(
+    state: Extract<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>,
+  ): undefined;
+  public getMaxAllowedTime(
+    state: Exclude<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>,
+  ): number;
+  public getMaxAllowedTime(state: SequencerState): number | undefined;
   public getMaxAllowedTime(state: SequencerState): number | undefined {
     switch (state) {
       case SequencerState.STOPPED:
+      case SequencerState.STOPPING:
       case SequencerState.IDLE:
       case SequencerState.SYNCHRONIZING:
         return; // We don't really care about times for this states
@@ -177,16 +186,3 @@ export class SequencerTimetable {
     this.log.trace(`Enough time to transition to ${newState}`, { maxAllowedTime, secondsIntoSlot });
   }
 }
-
-export class SequencerTooSlowError extends Error {
-  constructor(
-    public readonly proposedState: SequencerState,
-    public readonly maxAllowedTime: number,
-    public readonly currentTime: number,
-  ) {
-    super(
-      `Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`,
-    );
-    this.name = 'SequencerTooSlowError';
-  }
-}

package/src/sequencer/utils.ts

@@ -1,35 +1,21 @@
 export enum SequencerState {
-  /**
-   * Sequencer is stopped and not processing any txs from the pool.
-   */
+  /** Sequencer is stopped and not processing any txs from the pool. */
   STOPPED = 'STOPPED',
-  /**
-   * Sequencer is awaiting the next call to work().
-   */
+  /** Sequencer is being stopped. Will move to STOPPED shortly. */
+  STOPPING = 'STOPPING',
+  /** Sequencer is awaiting the next call to work(). */
   IDLE = 'IDLE',
-  /**
-   * Synchronizing with the L2 chain.
-   */
+  /** Synchronizing with the L2 chain. */
   SYNCHRONIZING = 'SYNCHRONIZING',
-  /**
-   * Checking if we are the proposer for the current slot.
-   */
+  /** Checking if we are the proposer for the current slot. */
   PROPOSER_CHECK = 'PROPOSER_CHECK',
-  /**
-   * Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise.
-   */
+  /** Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise. */
   INITIALIZING_PROPOSAL = 'INITIALIZING_PROPOSAL',
-  /**
-   * Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA.
-   */
+  /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */
   CREATING_BLOCK = 'CREATING_BLOCK',
-  /**
-   * Collecting attestations from its peers. Will move to PUBLISHING_BLOCK.
-   */
+  /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */
   COLLECTING_ATTESTATIONS = 'COLLECTING_ATTESTATIONS',
-  /**
-   * Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING.
-   */
+  /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */
   PUBLISHING_BLOCK = 'PUBLISHING_BLOCK',
 }
 

package/src/test/index.ts

@@ -1,5 +1,5 @@
-import type { PublisherManager } from '@aztec/ethereum';
 import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
 import type { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { ValidatorClient } from '@aztec/validator-client';
 

package/src/tx_validator/tx_validator_factory.ts

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import {
   AggregateTxValidator,
@@ -9,10 +10,11 @@ import {
   GasTxValidator,
   MetadataTxValidator,
   PhasesTxValidator,
+  TimestampTxValidator,
   TxPermittedValidator,
   TxProofValidator,
 } from '@aztec/p2p';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { ProtocolContractAddress, protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
 import type {
@@ -47,7 +49,7 @@ export function createValidatorForAcceptingTxs(
     gasFees: GasFees;
     skipFeeEnforcement?: boolean;
     timestamp: UInt64;
-    blockNumber: number;
+    blockNumber: BlockNumber;
     txsPermitted: boolean;
   },
 ): TxValidator<Tx> {
@@ -57,10 +59,12 @@ export function createValidatorForAcceptingTxs(
     new MetadataTxValidator({
       l1ChainId: new Fr(l1ChainId),
       rollupVersion: new Fr(rollupVersion),
+      protocolContractsHash,
+      vkTreeRoot: getVKTreeRoot(),
+    }),
+    new TimestampTxValidator({
       timestamp,
       blockNumber,
-      protocolContractTreeRoot,
-      vkTreeRoot: getVKTreeRoot(),
     }),
     new DoubleSpendTxValidator(new NullifierCache(db)),
     new PhasesTxValidator(contractDataSource, setupAllowList, timestamp),
@@ -114,10 +118,12 @@ function preprocessValidator(
     new MetadataTxValidator({
       l1ChainId: globalVariables.chainId,
       rollupVersion: globalVariables.version,
+      protocolContractsHash,
+      vkTreeRoot: getVKTreeRoot(),
+    }),
+    new TimestampTxValidator({
       timestamp: globalVariables.timestamp,
       blockNumber: globalVariables.blockNumber,
-      protocolContractTreeRoot,
-      vkTreeRoot: getVKTreeRoot(),
     }),
     new DoubleSpendTxValidator(nullifierCache),
     new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.timestamp),