@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97

package/src/update-checker/version_checker.ts

@@ -0,0 +1,65 @@
+import { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/promise';
+
+import { EventEmitter } from 'node:events';
+
+export type EventMap = {
+  newVersion: [{ name: string; currentVersion: string; latestVersion: string }];
+};
+
+export type VersionCheck = {
+  name: string;
+  currentVersion: string;
+  getLatestVersion: () => Promise<string | undefined>;
+};
+
+export class VersionChecker extends EventEmitter<EventMap> {
+  private runningPromise: RunningPromise;
+  constructor(
+    private checks: Array<VersionCheck>,
+    intervalCheckMs = 60_000,
+    private logger = createLogger('version_checker'),
+  ) {
+    super();
+    this.runningPromise = new RunningPromise(this.run, logger, intervalCheckMs);
+  }
+
+  public start(): void {
+    if (this.runningPromise.isRunning()) {
+      this.logger.warn('VersionChecker is already running');
+      return;
+    }
+
+    this.runningPromise.start();
+    this.logger.info('Version check started');
+  }
+
+  public trigger(): Promise<void> {
+    return this.runningPromise.trigger();
+  }
+
+  public async stop(): Promise<void> {
+    if (!this.runningPromise.isRunning()) {
+      this.logger.warn('VersionChecker is not running');
+      return;
+    }
+
+    await this.runningPromise.stop();
+    this.logger.info('Version checker stopped');
+  }
+
+  private run = async () => {
+    await Promise.allSettled(this.checks.map(check => this.checkVersion(check)));
+  };
+
+  private async checkVersion({ name, currentVersion, getLatestVersion }: VersionCheck): Promise<void> {
+    try {
+      const latestVersion = await getLatestVersion();
+      if (latestVersion && latestVersion !== currentVersion) {
+        this.emit('newVersion', { name, latestVersion, currentVersion });
+      }
+    } catch (err) {
+      this.logger.warn(`Error checking for new ${name} versions: ${err}`, { err });
+    }
+  }
+}

package/src/validators/errors.ts

@@ -1,5 +1,6 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { StateReference, TxHash } from '@aztec/stdlib/tx';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { TxHash } from '@aztec/stdlib/tx';
 
 export class ValidatorError extends Error {
   constructor(message: string) {
@@ -17,7 +18,7 @@ export class AttestationTimeoutError extends ValidatorError {
   constructor(
     public readonly collectedCount: number,
     public readonly requiredCount: number,
-    public readonly slot: bigint,
+    public readonly slot: SlotNumber,
   ) {
     super(`Timeout collecting attestations for slot ${slot}: ${collectedCount}/${requiredCount}`);
   }
@@ -35,12 +36,19 @@ export class FailedToReExecuteTransactionsError extends ValidatorError {
   }
 }
 
+export class ReExInitialStateMismatchError extends ValidatorError {
+  constructor(
+    public readonly expectedArchiveRoot: Fr,
+    public readonly actualArchiveRoot: Fr,
+  ) {
+    super('Re-execution initial state mismatch');
+  }
+}
+
 export class ReExStateMismatchError extends ValidatorError {
   constructor(
     public readonly expectedArchiveRoot: Fr,
     public readonly actualArchiveRoot: Fr,
-    public readonly expectedStateReference?: StateReference,
-    public readonly actualStateReference?: StateReference,
   ) {
     super('Re-execution state mismatch');
   }

package/src/validators/schemas.ts

@@ -1,4 +1,4 @@
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
+import { schemas, zodFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
@@ -11,65 +11,80 @@ import type {
   ValidatorsStats,
 } from './types.js';
 
-export const ValidatorStatusInSlotSchema = z.enum([
-  'block-mined',
-  'block-proposed',
-  'block-missed',
-  'attestation-sent',
-  'attestation-missed',
-]) satisfies ZodFor<ValidatorStatusInSlot>;
+export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
+  z.enum([
+    'checkpoint-mined',
+    'checkpoint-valid',
+    'checkpoint-invalid',
+    'checkpoint-unvalidated',
+    'checkpoint-missed',
+    'blocks-missed',
+    'attestation-sent',
+    'attestation-missed',
+  ]),
+);
 
-export const ValidatorStatusHistorySchema = z.array(
-  z.object({
-    slot: schemas.BigInt,
-    status: ValidatorStatusInSlotSchema,
-  }),
-) satisfies ZodFor<ValidatorStatusHistory>;
+export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(
+  z.array(
+    z.object({
+      slot: schemas.SlotNumber,
+      status: ValidatorStatusInSlotSchema,
+    }),
+  ),
+);
 
 export const ValidatorStatusHistorySchemaArray = z.array(ValidatorStatusHistorySchema);
 
-export const ValidatorStatusHistorySchemaMap = z.record(ValidatorStatusHistorySchemaArray);
+export const ValidatorStatusHistorySchemaMap = z.record(z.string(), ValidatorStatusHistorySchemaArray);
 
 const ValidatorTimeStatSchema = z.object({
   timestamp: schemas.BigInt,
-  slot: schemas.BigInt,
+  slot: schemas.SlotNumber,
   date: z.string(),
 });
 
-const ValidatorMissedStatsSchema = z.object({
-  currentStreak: schemas.Integer,
-  rate: z.number().optional(),
-  count: schemas.Integer,
-  total: schemas.Integer,
-}) satisfies ZodFor<ValidatorMissedStats>;
+const ValidatorMissedStatsSchema = zodFor<ValidatorMissedStats>()(
+  z.object({
+    currentStreak: schemas.Integer,
+    rate: z.number().optional(),
+    count: schemas.Integer,
+    total: schemas.Integer,
+  }),
+);
 
-export const ValidatorStatsSchema = z.object({
-  address: schemas.EthAddress,
-  lastProposal: ValidatorTimeStatSchema.optional(),
-  lastAttestation: ValidatorTimeStatSchema.optional(),
-  totalSlots: schemas.Integer,
-  missedProposals: ValidatorMissedStatsSchema,
-  missedAttestations: ValidatorMissedStatsSchema,
-  history: ValidatorStatusHistorySchema,
-}) satisfies ZodFor<ValidatorStats>;
+export const ValidatorStatsSchema = zodFor<ValidatorStats>()(
+  z.object({
+    address: schemas.EthAddress,
+    lastProposal: ValidatorTimeStatSchema.optional(),
+    lastAttestation: ValidatorTimeStatSchema.optional(),
+    totalSlots: schemas.Integer,
+    missedProposals: ValidatorMissedStatsSchema,
+    missedAttestations: ValidatorMissedStatsSchema,
+    history: ValidatorStatusHistorySchema,
+  }),
+);
 
-export const ValidatorsStatsSchema = z.object({
-  stats: z.record(ValidatorStatsSchema),
-  lastProcessedSlot: schemas.BigInt.optional(),
-  initialSlot: schemas.BigInt.optional(),
-  slotWindow: schemas.Integer,
-}) satisfies ZodFor<ValidatorsStats>;
+export const ValidatorsStatsSchema = zodFor<ValidatorsStats>()(
+  z.object({
+    stats: z.record(z.string(), ValidatorStatsSchema),
+    lastProcessedSlot: schemas.SlotNumber.optional(),
+    initialSlot: schemas.SlotNumber.optional(),
+    slotWindow: schemas.Integer,
+  }),
+);
 
-export const SingleValidatorStatsSchema = z.object({
-  validator: ValidatorStatsSchema,
-  allTimeProvenPerformance: z.array(
-    z.object({
-      missed: schemas.Integer,
-      total: schemas.Integer,
-      epoch: schemas.BigInt,
-    }),
-  ),
-  lastProcessedSlot: schemas.BigInt.optional(),
-  initialSlot: schemas.BigInt.optional(),
-  slotWindow: schemas.Integer,
-}) satisfies ZodFor<SingleValidatorStats>;
+export const SingleValidatorStatsSchema = zodFor<SingleValidatorStats>()(
+  z.object({
+    validator: ValidatorStatsSchema,
+    allTimeEpochPerformance: z.array(
+      z.object({
+        missed: schemas.Integer,
+        total: schemas.Integer,
+        epoch: schemas.EpochNumber,
+      }),
+    ),
+    lastProcessedSlot: schemas.SlotNumber.optional(),
+    initialSlot: schemas.SlotNumber.optional(),
+    slotWindow: schemas.Integer,
+  }),
+);

package/src/validators/types.ts

@@ -1,15 +1,36 @@
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
-export type ValidatorStatusType = 'block' | 'attestation';
+export type ValidatorStatusType = 'proposer' | 'attestation';
 
+/**
+ * Per-slot status for a validator.
+ *
+ * Proposer statuses (six-case taxonomy):
+ * - `blocks-missed`           — no block proposals seen for the slot (case 1).
+ * - `checkpoint-missed`       — block proposals seen but no checkpoint proposal (case 2).
+ * - `checkpoint-unvalidated`  — checkpoint proposal seen but local re-execution couldn't
+ *                               validate (missing txs, timeouts, etc.) (case 3).
+ * - `checkpoint-invalid`      — checkpoint proposal re-executed and rejected as invalid (case 4).
+ * - `checkpoint-valid`        — checkpoint proposal re-executed locally as valid (case 5).
+ * - `checkpoint-mined`        — checkpoint published on L1 (case 6).
+ *
+ * Attestor statuses:
+ * - `attestation-sent`        — attestation observed on P2P or in the published checkpoint.
+ * - `attestation-missed`      — committee member did not attest to a checkpoint proposal that
+ *                               was observed locally or published on L1.
+ */
 export type ValidatorStatusInSlot =
-  | 'block-mined'
-  | 'block-proposed'
-  | 'block-missed'
+  | 'checkpoint-mined'
+  | 'checkpoint-valid'
+  | 'checkpoint-invalid'
+  | 'checkpoint-unvalidated'
+  | 'checkpoint-missed'
+  | 'blocks-missed'
   | 'attestation-sent'
   | 'attestation-missed';
 
-export type ValidatorStatusHistory = { slot: bigint; status: ValidatorStatusInSlot }[];
+export type ValidatorStatusHistory = { slot: SlotNumber; status: ValidatorStatusInSlot }[];
 
 export type ValidatorMissedStats = {
   currentStreak: number;
@@ -20,8 +41,8 @@ export type ValidatorMissedStats = {
 
 export type ValidatorStats = {
   address: EthAddress;
-  lastProposal?: { timestamp: bigint; slot: bigint; date: string };
-  lastAttestation?: { timestamp: bigint; slot: bigint; date: string };
+  lastProposal?: { timestamp: bigint; slot: SlotNumber; date: string };
+  lastAttestation?: { timestamp: bigint; slot: SlotNumber; date: string };
   totalSlots: number;
   missedProposals: ValidatorMissedStats;
   missedAttestations: ValidatorMissedStats;
@@ -30,8 +51,8 @@ export type ValidatorStats = {
 
 export type ValidatorsStats = {
   stats: Record<string, ValidatorStats>;
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };
 
@@ -39,8 +60,8 @@ export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number;
 
 export type SingleValidatorStats = {
   validator: ValidatorStats;
-  allTimeProvenPerformance: { missed: number; total: number; epoch: bigint }[];
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  allTimeEpochPerformance: { missed: number; total: number; epoch: EpochNumber }[];
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };

package/src/versioning/versioning.ts

@@ -1,5 +1,5 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 
 import type Koa from 'koa';
@@ -26,7 +26,7 @@ export function getComponentsVersionsFromConfig(
 ): ComponentsVersions {
   return {
     l1ChainId: config.l1ChainId,
-    l1RollupAddress: config.l1Contracts?.rollupAddress, // This should not be undefined, but sometimes the config lies to us and it is...
+    l1RollupAddress: config.rollupAddress,
     rollupVersion: config.rollupVersion,
     l2ProtocolContractsHash: l2ProtocolContractsHash.toString(),
     l2CircuitsVkTreeRoot: l2CircuitsVkTreeRoot.toString(),
@@ -115,7 +115,7 @@ export function validatePartialComponentVersionsMatch(
 }
 
 /** Returns a Koa middleware that injects the versioning info as headers. */
-export function getVersioningMiddleware(versions: Partial<ComponentsVersions>) {
+export function getVersioningMiddleware(versions: Partial<ComponentsVersions>, opts?: { packageVersion?: string }) {
   return async (ctx: Koa.Context, next: () => Promise<void>) => {
     try {
       await next();
@@ -128,6 +128,9 @@ export function getVersioningMiddleware(versions: Partial<ComponentsVersions>) {
           ctx.set(`x-aztec-${key}`, value.toString());
         }
       }
+      if (opts?.packageVersion) {
+        ctx.set('x-aztec-packageVersion', opts.packageVersion);
+      }
     }
   };
 }

package/src/vks/verification_key.ts

@@ -1,81 +1,11 @@
 import { ULTRA_VK_LENGTH_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { times } from '@aztec/foundation/collection';
-import { Fq, Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { hashVK } from '../hash/index.js';
-import { CircuitType } from '../types/shared.js';
-
-/**
- * Curve data.
- */
-export class G1AffineElement {
-  /**
-   * Element's x coordinate.
-   */
-  public x: Fq;
-  /**
-   * Element's y coordinate.
-   */
-  public y: Fq;
-
-  constructor(x: Fq | bigint, y: Fq | bigint) {
-    this.x = typeof x === 'bigint' ? new Fq(x) : x;
-    this.y = typeof y === 'bigint' ? new Fq(y) : y;
-  }
-  /**
-   * Serialize as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(this.x, this.y);
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer  or BufferReader to read from.
-   * @returns The G1AffineElement.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): G1AffineElement {
-    const reader = BufferReader.asReader(buffer);
-    return new G1AffineElement(Fq.fromBuffer(reader), Fq.fromBuffer(reader));
-  }
-}
-
-/**
- * Used store and serialize a key-value map of commitments where key is the name of the commitment and value is
- * the commitment itself. The name can be e.g. Q_1, Q_2, SIGMA_1 etc.
- */
-export class CommitmentMap {
-  constructor(
-    /**
-     * An object used to store the commitments.
-     */
-    public record: { [name: string]: G1AffineElement },
-  ) {}
-
-  /**
-   * Serialize as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    const values = Object.entries(this.record);
-    return serializeToBuffer(values.length, ...values.flat());
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or BufferReader to read from.
-   * @returns The CommitmentMap.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): CommitmentMap {
-    const reader = BufferReader.asReader(buffer);
-    return new CommitmentMap(reader.readMap(G1AffineElement));
-  }
-}
 
 // TODO: find better home for these constants
 export const CIRCUIT_SIZE_INDEX = 0;
@@ -134,6 +64,13 @@ export class VerificationKeyAsFields {
     return new VerificationKeyAsFields(reader.readVector(Fr), reader.readObject(Fr));
   }
 
+  static fromFrBuffer(vkBytes: Buffer): Promise<VerificationKeyAsFields> {
+    const numFields = vkBytes.length / Fr.SIZE_IN_BYTES;
+    const reader = BufferReader.asReader(vkBytes);
+    const fields = reader.readArray(numFields, Fr);
+    return VerificationKeyAsFields.fromKey(fields);
+  }
+
   /**
    * Builds a fake verification key that should be accepted by circuits.
    * @returns A fake verification key.
@@ -162,96 +99,6 @@ export class VerificationKeyAsFields {
   }
 }
 
-export class VerificationKey {
-  constructor(
-    /**
-     * For Plonk, this is equivalent to the proving system used to prove and verify.
-     */
-    public circuitType: CircuitType,
-    /**
-     * The number of gates in this circuit.
-     */
-    public circuitSize: number,
-    /**
-     * The number of public inputs in this circuit.
-     */
-    public numPublicInputs: number,
-    /**
-     * The commitments for this circuit.
-     */
-    public commitments: Record<string, G1AffineElement>,
-    /**
-     * Contains a recursive proof?
-     */
-    public containsRecursiveProof: boolean,
-    /**
-     * Recursion stack.
-     */
-    public recursiveProofPublicInputIndices: number[],
-  ) {}
-
-  /**
-   * Serialize as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(
-      this.circuitType,
-      this.circuitSize,
-      this.numPublicInputs,
-      new CommitmentMap(this.commitments),
-      this.containsRecursiveProof,
-      serializeToBuffer(this.recursiveProofPublicInputIndices.length, this.recursiveProofPublicInputIndices),
-    );
-  }
-
-  /**
-   * Deserializes class from a buffer.
-   * @returns A VerificationKey instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): VerificationKey {
-    const reader = BufferReader.asReader(buffer);
-    return new VerificationKey(
-      reader.readNumber(),
-      reader.readNumber(),
-      reader.readNumber(),
-      reader.readObject(CommitmentMap).record,
-      reader.readBoolean(),
-      reader.readNumberVector(),
-    );
-  }
-
-  /**
-   * Builds a fake Rollup Honk verification key that should be accepted by circuits.
-   * @returns A fake verification key.
-   */
-  static makeRollupFake(): VerificationKey {
-    return new VerificationKey(
-      CircuitType.ULTRA, // This is entirely arbitrary
-      2048,
-      116,
-      {}, // Empty set of commitments
-      false,
-      times(16, i => i),
-    );
-  }
-
-  /**
-   * Builds a fake verification key that should be accepted by circuits.
-   * @returns A fake verification key.
-   */
-  static makeFake(): VerificationKey {
-    return new VerificationKey(
-      CircuitType.ULTRA, // This is entirely arbitrary
-      2048,
-      116,
-      {}, // Empty set of commitments
-      false,
-      times(16, i => i),
-    );
-  }
-}
-
 export class VerificationKeyData {
   constructor(
     public readonly keyAsFields: VerificationKeyAsFields,
@@ -271,18 +118,13 @@ export class VerificationKeyData {
   }
 
   static makeFakeHonk(): VerificationKeyData {
-    return new VerificationKeyData(VerificationKeyAsFields.makeFakeHonk(), VerificationKey.makeFake().toBuffer());
+    const keyAsFields = VerificationKeyAsFields.makeFakeHonk();
+    return new VerificationKeyData(keyAsFields, keyAsFields.toBuffer());
   }
 
   static makeFakeRollupHonk(): VerificationKeyData {
-    return new VerificationKeyData(
-      VerificationKeyAsFields.makeFakeRollupHonk(),
-      VerificationKey.makeRollupFake().toBuffer(),
-    );
-  }
-
-  static makeFake(len = ULTRA_VK_LENGTH_IN_FIELDS): VerificationKeyData {
-    return new VerificationKeyData(VerificationKeyAsFields.makeFake(len), VerificationKey.makeFake().toBuffer());
+    const keyAsFields = VerificationKeyAsFields.makeFakeRollupHonk();
+    return new VerificationKeyData(keyAsFields, keyAsFields.toBuffer());
   }
 
   /**
@@ -305,6 +147,10 @@ export class VerificationKeyData {
     return new VerificationKeyData(verificationKeyAsFields, bytes);
   }
 
+  static async fromFrBuffer(vkBytes: Buffer): Promise<VerificationKeyData> {
+    return new VerificationKeyData(await VerificationKeyAsFields.fromFrBuffer(vkBytes), vkBytes);
+  }
+
   static fromString(str: string): VerificationKeyData {
     return VerificationKeyData.fromBuffer(hexToBuffer(str));
   }

package/src/vks/vk_data.ts

@@ -1,6 +1,6 @@
 import { VK_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex } from '@aztec/foundation/string';
 

package/src/world-state/genesis_data.ts

@@ -0,0 +1,27 @@
+import type { PublicDataTreeLeaf } from '../trees/index.js';
+
+/** Data used to initialize the genesis block, including prefilled public state and an optional timestamp. */
+export type GenesisData = {
+  /** Public data tree leaves to pre-populate in the genesis state (e.g. fee juice balances). */
+  prefilledPublicData: PublicDataTreeLeaf[];
+  /** Timestamp for the genesis block header. Defaults to 0 (canonical empty genesis) in production. */
+  genesisTimestamp: bigint;
+};
+
+/** An empty genesis data with no prefilled state and a zero timestamp. */
+export const EMPTY_GENESIS_DATA: GenesisData = {
+  prefilledPublicData: [],
+  genesisTimestamp: 0n,
+};
+
+/** Returns if an object looks like genesis data */
+export function isGenesisData(obj: any): obj is GenesisData {
+  return (
+    obj &&
+    typeof obj === 'object' &&
+    'prefilledPublicData' in obj &&
+    Array.isArray(obj.prefilledPublicData) &&
+    'genesisTimestamp' in obj &&
+    typeof obj.genesisTimestamp === 'bigint'
+  );
+}

package/src/world-state/index.ts

@@ -1 +1,2 @@
+export * from './genesis_data.js';
 export * from './world_state_revision.js';

package/src/world-state/world_state_revision.ts

@@ -1,21 +1,38 @@
 import { z } from 'zod';
 
 export class WorldStateRevision {
+  /**
+   * Sentinel `blockNumber` meaning "not pinned to any historical block; use the latest committed
+   * state of the underlying tree". Mirrors the `WorldStateRevision::LATEST` constant on the C++
+   * side (defined as `std::numeric_limits<uint32_t>::max()`). Distinct from `blockNumber === 0`,
+   * which pins to the initial / genesis state.
+   */
+  public static readonly LATEST = 0xffffffff;
+
   constructor(
     public readonly forkId: number,
     public readonly blockNumber: number,
     public readonly includeUncommitted: boolean,
   ) {}
 
+  public toString() {
+    return `WorldStateRevision(forkId: ${this.forkId}, blockNumber: ${this.blockNumber}, includeUncommitted: ${this.includeUncommitted})`;
+  }
+
   static empty() {
-    return new WorldStateRevision(0, 0, false);
+    return new WorldStateRevision(0, WorldStateRevision.LATEST, false);
   }
 
   static get schema() {
-    return z.object({
-      forkId: z.number(),
-      blockNumber: z.number(),
-      includeUncommitted: z.boolean(),
-    });
+    return z
+      .object({
+        forkId: z.number(),
+        blockNumber: z.number(),
+        includeUncommitted: z.boolean(),
+      })
+      .transform(
+        ({ forkId, blockNumber, includeUncommitted }) =>
+          new WorldStateRevision(forkId, blockNumber, includeUncommitted),
+      );
   }
 }