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

package/src/tx/tx_receipt.ts

@@ -1,4 +1,12 @@
-import { BlockNumber, BlockNumberSchema, EpochNumber, EpochNumberSchema } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  BlockNumberSchema,
+  EpochNumber,
+  EpochNumberSchema,
+  SlotNumber,
+  SlotNumberSchema,
+} from '@aztec/foundation/branded-types';
+import type { DefineIfFlag, FieldsOf, PickDefined } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
@@ -6,6 +14,8 @@ import { RevertCode } from '../avm/revert_code.js';
 import { BlockHash } from '../block/block_hash.js';
 import { DebugLog } from '../logs/debug_log.js';
 import { type ZodFor, schemas } from '../schemas/schemas.js';
+import { Tx } from './tx.js';
+import { TxEffect } from './tx_effect.js';
 import { TxHash } from './tx_hash.js';
 
 /** Block inclusion/finalization status. */
@@ -28,131 +38,301 @@ export const SortedTxStatuses: TxStatus[] = [
   TxStatus.FINALIZED,
 ];
 
+/** The four statuses a mined transaction can hold, ordered by finalization progress. */
+export const MinedTxStatuses = [TxStatus.PROPOSED, TxStatus.CHECKPOINTED, TxStatus.PROVEN, TxStatus.FINALIZED] as const;
+
+/** Block finalization status of a mined transaction. */
+export type MinedTxStatus = (typeof MinedTxStatuses)[number];
+
 /** Execution result - only set when tx is in a block. */
 export enum TxExecutionResult {
   SUCCESS = 'success',
-  APP_LOGIC_REVERTED = 'app_logic_reverted',
-  TEARDOWN_REVERTED = 'teardown_reverted',
-  BOTH_REVERTED = 'both_reverted',
+  REVERTED = 'reverted',
+}
+
+/** Returned from a `getTxReceipt` call to the node RPC API. */
+export interface TxReceiptInterface {
+  /** The transaction's block finalization status. */
+  status: TxStatus;
+  /** The execution result of the transaction, only set when the tx is in a block. */
+  executionResult?: TxExecutionResult;
+  /** Description of the transaction error, if any. */
+  error?: string;
+  /** The transaction fee paid for the transaction. */
+  transactionFee?: bigint;
+  /** The hash of the block containing the transaction. */
+  blockHash?: BlockHash;
+  /** The block number in which the transaction was included. */
+  blockNumber?: BlockNumber;
+  /** The slot number in which the transaction's block was built. */
+  slotNumber?: SlotNumber;
+  /** The epoch number in which the transaction was included. */
+  epochNumber?: EpochNumber;
+  /** The index of the transaction within its block. */
+  txIndexInBlock?: number;
+  /** The full transaction effect, attached when requested via `includeTxEffect`. */
+  txEffect?: TxEffect;
+  /** The pending transaction, attached when requested via `includePendingTx`. */
+  tx?: Tx;
+  /**
+   * Debug logs collected during public function execution. Served only when the node is in test mode and placed on
+   * the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
+   * tx receipt is obtained).
+   */
+  debugLogs?: DebugLog[];
+
+  /** Returns true (and narrows) if the transaction has been included in a block. */
+  isMined(): this is MinedTxReceipt;
+
+  /** Returns true (and narrows) if the transaction is pending. */
+  isPending(): this is PendingTxReceipt;
+
+  /** Returns true (and narrows) if the transaction was dropped. */
+  isDropped(): this is DroppedTxReceipt;
+
+  /** Returns true if the transaction was executed successfully. */
+  hasExecutionSucceeded(): boolean;
+
+  /** Returns true if the transaction execution reverted. */
+  hasExecutionReverted(): boolean;
 }
 
 /**
- * Represents a transaction receipt in the Aztec network.
- * Contains essential information about the transaction including its status, origin, and associated addresses.
- * REFACTOR: TxReceipt should be returned only once the tx is mined, and all its fields should be required.
- * We should not be using a TxReceipt to answer a query for a pending or dropped tx.
+ * Common surface shared by every transaction receipt variant ({@link PendingTxReceipt}, {@link DroppedTxReceipt},
+ * {@link MinedTxReceipt}).
+ *
+ * Every cross-variant field is declared once here, optional except for `txHash` (always present) and `status`
+ * (abstract, narrowed by each subclass). Declaring the fields optional on the base lets callers read a bare
+ * {@link TxReceipt} union (without first narrowing) and keep compiling. Use the `is*` guards to narrow to the strong
+ * variant type and gain access to its required fields.
  */
-export class TxReceipt {
+abstract class TxReceiptBase {
+  /** The transaction's block finalization status. */
+  public abstract readonly status: TxStatus;
+  /** Description of the transaction error, if any. */
+  public readonly error?: string;
+
   constructor(
     /** A unique identifier for a transaction. */
-    public txHash: TxHash,
-    /** The transaction's block finalization status. */
-    public status: TxStatus,
-    /** The execution result of the transaction, only set when tx is in a block. */
-    public executionResult: TxExecutionResult | undefined,
-    /** Description of transaction error, if any. */
-    public error: string | undefined,
-    /** The transaction fee paid for the transaction. */
-    public transactionFee?: bigint,
-    /** The hash of the block containing the transaction. */
-    public blockHash?: BlockHash,
-    /** The block number in which the transaction was included. */
-    public blockNumber?: BlockNumber,
-    /** The epoch number in which the transaction was included. */
-    public epochNumber?: EpochNumber,
-    /**
-     * Debug logs collected during public function execution. Served only when the node is in test mode and placed on
-     * the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
-     * tx receipt is obtained).
-     */
-    public debugLogs?: DebugLog[],
+    public readonly txHash: TxHash,
   ) {}
 
+  /** Returns true (and narrows) if the transaction has been included in a block. */
+  public isMined(): this is MinedTxReceipt {
+    return this instanceof MinedTxReceipt;
+  }
+
+  /** Returns true (and narrows) if the transaction is pending. */
+  public isPending(): this is PendingTxReceipt {
+    return this instanceof PendingTxReceipt;
+  }
+
+  /** Returns true (and narrows) if the transaction was dropped. */
+  public isDropped(): this is DroppedTxReceipt {
+    return this instanceof DroppedTxReceipt;
+  }
+
   /** Returns true if the transaction was executed successfully. */
-  hasExecutionSucceeded(): boolean {
-    return this.executionResult === TxExecutionResult.SUCCESS;
+  public hasExecutionSucceeded(): boolean {
+    return false;
   }
 
   /** Returns true if the transaction execution reverted. */
-  hasExecutionReverted(): boolean {
-    return this.executionResult !== undefined && this.executionResult !== TxExecutionResult.SUCCESS;
+  public hasExecutionReverted(): boolean {
+    return false;
   }
+}
 
-  /** Returns true if the transaction has been included in a block (proposed, checkpointed, proven, or finalized). */
-  isMined(): boolean {
-    return (
-      this.status === TxStatus.PROPOSED ||
-      this.status === TxStatus.CHECKPOINTED ||
-      this.status === TxStatus.PROVEN ||
-      this.status === TxStatus.FINALIZED
-    );
+abstract class UnminedTxReceipt extends TxReceiptBase {
+  public readonly executionResult: undefined = undefined;
+  public readonly transactionFee: undefined = undefined;
+  public readonly blockHash: undefined = undefined;
+  public readonly blockNumber: undefined = undefined;
+  public readonly slotNumber: undefined = undefined;
+  public readonly txIndexInBlock: undefined = undefined;
+  public readonly epochNumber: undefined = undefined;
+  public readonly txEffect: undefined = undefined;
+}
+
+/**
+ * Receipt for a transaction that is in the mempool but not yet included in a block.
+ */
+export class PendingTxReceipt<Opts extends GetTxReceiptOptions = GetTxReceiptOptions>
+  extends UnminedTxReceipt
+  implements TxReceiptInterface
+{
+  public override readonly status = TxStatus.PENDING;
+
+  constructor(
+    txHash: TxHash,
+    /** The pending transaction, attached when requested via `includePendingTx`. */
+    public readonly tx: DefineIfFlag<Opts, 'includePendingTx', Tx>,
+  ) {
+    super(txHash);
+  }
+
+  static empty(): PendingTxReceipt {
+    return new PendingTxReceipt(TxHash.zero(), undefined);
+  }
+
+  static from(fields: PickDefined<FieldsOf<PendingTxReceipt>>): PendingTxReceipt {
+    return new PendingTxReceipt(fields.txHash, fields.tx);
+  }
+
+  static get schema(): ZodFor<PendingTxReceipt> {
+    return z
+      .object({
+        txHash: TxHash.schema,
+        status: z.literal(TxStatus.PENDING),
+        tx: Tx.schema.optional(),
+      })
+      .transform(fields => PendingTxReceipt.from({ tx: undefined, ...fields }));
   }
+}
+
+/**
+ * Receipt for a transaction that was dropped from the mempool without being mined.
+ */
+export class DroppedTxReceipt extends UnminedTxReceipt implements TxReceiptInterface {
+  public override readonly status = TxStatus.DROPPED;
+
+  public tx: undefined = undefined;
 
-  /** Returns true if the transaction is pending. */
-  isPending(): boolean {
-    return this.status === TxStatus.PENDING;
+  constructor(
+    txHash: TxHash,
+    public override readonly error?: string,
+  ) {
+    super(txHash);
   }
 
-  /** Returns true if the transaction was dropped. */
-  isDropped(): boolean {
-    return this.status === TxStatus.DROPPED;
+  static empty(): DroppedTxReceipt {
+    return new DroppedTxReceipt(TxHash.zero());
   }
 
-  static empty() {
-    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, undefined, undefined);
+  static from(fields: PickDefined<FieldsOf<DroppedTxReceipt>>): DroppedTxReceipt {
+    return new DroppedTxReceipt(fields.txHash, fields.error);
   }
 
-  static get schema(): ZodFor<TxReceipt> {
+  static get schema(): ZodFor<DroppedTxReceipt> {
     return z
       .object({
         txHash: TxHash.schema,
-        status: z.nativeEnum(TxStatus),
-        executionResult: z.nativeEnum(TxExecutionResult).optional(),
+        status: z.literal(TxStatus.DROPPED),
         error: z.string().optional(),
-        blockHash: BlockHash.schema.optional(),
-        blockNumber: BlockNumberSchema.optional(),
-        epochNumber: EpochNumberSchema.optional(),
-        transactionFee: schemas.BigInt.optional(),
-        debugLogs: z.array(DebugLog.schema).optional(),
       })
-      .transform(fields => TxReceipt.from(fields));
-  }
-
-  static from(fields: {
-    txHash: TxHash;
-    status: TxStatus;
-    executionResult?: TxExecutionResult;
-    error?: string;
-    transactionFee?: bigint;
-    blockHash?: BlockHash;
-    blockNumber?: BlockNumber;
-    epochNumber?: EpochNumber;
-    debugLogs?: DebugLog[];
-  }) {
-    return new TxReceipt(
+      .transform(DroppedTxReceipt.from);
+  }
+}
+
+/**
+ * Receipt for a transaction that has been included in a block (proposed, checkpointed, proven, or finalized).
+ * All block-related fields are required for this variant.
+ */
+export class MinedTxReceipt<Opts extends GetTxReceiptOptions = GetTxReceiptOptions>
+  extends TxReceiptBase
+  implements TxReceiptInterface
+{
+  public override readonly status: MinedTxStatus;
+
+  public readonly tx = undefined;
+
+  constructor(
+    txHash: TxHash,
+    status: MinedTxStatus,
+    public readonly executionResult: TxExecutionResult,
+    public readonly transactionFee: bigint,
+    public readonly blockHash: BlockHash,
+    public readonly blockNumber: BlockNumber,
+    public readonly slotNumber: SlotNumber,
+    public readonly txIndexInBlock: number,
+    public readonly epochNumber: EpochNumber,
+    public readonly txEffect: DefineIfFlag<Opts, 'includeTxEffect', TxEffect>,
+    public debugLogs?: DebugLog[],
+  ) {
+    super(txHash);
+    this.status = status;
+  }
+
+  public override hasExecutionSucceeded(): boolean {
+    return this.executionResult === TxExecutionResult.SUCCESS;
+  }
+
+  public override hasExecutionReverted(): boolean {
+    return this.executionResult !== TxExecutionResult.SUCCESS;
+  }
+
+  static from(fields: PickDefined<FieldsOf<MinedTxReceipt>>): MinedTxReceipt {
+    return new MinedTxReceipt(
       fields.txHash,
       fields.status,
       fields.executionResult,
-      fields.error,
       fields.transactionFee,
       fields.blockHash,
       fields.blockNumber,
+      fields.slotNumber,
+      fields.txIndexInBlock,
       fields.epochNumber,
+      fields.txEffect,
       fields.debugLogs,
     );
   }
 
+  static get schema(): ZodFor<MinedTxReceipt> {
+    return z
+      .object({
+        txHash: TxHash.schema,
+        status: z.enum([TxStatus.PROPOSED, TxStatus.CHECKPOINTED, TxStatus.PROVEN, TxStatus.FINALIZED]),
+        executionResult: z.nativeEnum(TxExecutionResult),
+        transactionFee: schemas.BigInt,
+        blockHash: BlockHash.schema,
+        blockNumber: BlockNumberSchema,
+        slotNumber: SlotNumberSchema,
+        txIndexInBlock: schemas.Integer,
+        epochNumber: EpochNumberSchema,
+        txEffect: TxEffect.schema.optional(),
+        debugLogs: z.array(DebugLog.schema).optional(),
+      })
+      .transform(fields => MinedTxReceipt.from({ txEffect: undefined, ...fields }));
+  }
+
   public static executionResultFromRevertCode(revertCode: RevertCode): TxExecutionResult {
-    if (revertCode.equals(RevertCode.OK)) {
-      return TxExecutionResult.SUCCESS;
-    } else if (revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
-      return TxExecutionResult.APP_LOGIC_REVERTED;
-    } else if (revertCode.equals(RevertCode.TEARDOWN_REVERTED)) {
-      return TxExecutionResult.TEARDOWN_REVERTED;
-    } else if (revertCode.equals(RevertCode.BOTH_REVERTED)) {
-      return TxExecutionResult.BOTH_REVERTED;
-    } else {
-      throw new Error(`Unknown revert code: ${revertCode.getCode()}`);
-    }
+    return revertCode.isOK() ? TxExecutionResult.SUCCESS : TxExecutionResult.REVERTED;
   }
 }
+
+/**
+ * A transaction receipt summarizing the lifecycle of a transaction in the Aztec network. Discriminated over the
+ * transaction's status: {@link PendingTxReceipt} while in the mempool, {@link DroppedTxReceipt} once dropped, and
+ * {@link MinedTxReceipt} once included in a block.
+ */
+export type TxReceipt<Opts extends GetTxReceiptOptions = GetTxReceiptOptions> =
+  | PendingTxReceipt<Opts>
+  | DroppedTxReceipt
+  | MinedTxReceipt<Opts>;
+
+/**
+ * Zod schema for {@link TxReceipt}. Each member constrains its `status` field so the union routes
+ * unambiguously, giving a deterministic serialization round-trip.
+ */
+export const TxReceiptSchema: ZodFor<TxReceipt> = z.union([
+  PendingTxReceipt.schema,
+  DroppedTxReceipt.schema,
+  MinedTxReceipt.schema,
+]) as ZodFor<TxReceipt>;
+
+/** Options controlling which optional data is attached to a {@link TxReceipt}. */
+export type GetTxReceiptOptions = {
+  /** Attach the full {@link TxEffect} (mined txs only). */
+  includeTxEffect?: boolean;
+  /** Attach the pending {@link Tx} (pending txs only). */
+  includePendingTx?: boolean;
+  /** Keep the proof on the attached pending {@link Tx}; only meaningful alongside `includePendingTx`. */
+  includeProof?: boolean;
+};
+
+/** Zod schema for {@link GetTxReceiptOptions}. */
+export const GetTxReceiptOptionsSchema: ZodFor<GetTxReceiptOptions> = z.object({
+  includeTxEffect: z.boolean().optional(),
+  includePendingTx: z.boolean().optional(),
+  includeProof: z.boolean().optional(),
+});

package/src/tx/validator/error_texts.ts

@@ -41,5 +41,13 @@ export const TX_ERROR_SIZE_ABOVE_LIMIT = 'Transaction size above size limit';
 // Block header
 export const TX_ERROR_BLOCK_HEADER = 'Block header not found';
 
+// Contract instance
+export const TX_ERROR_INCORRECT_CONTRACT_ADDRESS = 'Incorrect contract instance deployment address';
+export const TX_ERROR_MALFORMED_CONTRACT_INSTANCE_LOG = 'Failed to parse contract instance deployment log';
+
+// Contract class
+export const TX_ERROR_INCORRECT_CONTRACT_CLASS_ID = 'Incorrect contract class id';
+export const TX_ERROR_MALFORMED_CONTRACT_CLASS_LOG = 'Failed to parse contract class registration log';
+
 // General
 export const TX_ERROR_DURING_VALIDATION = 'Unexpected error during validation';

package/src/tx/validator/tx_validator.ts

@@ -15,10 +15,7 @@ export function hasPublicCalls(tx: AnyTx): boolean {
   return tx.data.numberOfPublicCallRequests() > 0;
 }
 
-export type TxValidationResult =
-  | { result: 'valid' }
-  | { result: 'invalid'; reason: string[] }
-  | { result: 'skipped'; reason: string[] };
+export type TxValidationResult = { result: 'valid' } | { result: 'invalid'; reason: string[] };
 
 export interface TxValidator<T = AnyTx> {
   validateTx(tx: T): Promise<TxValidationResult>;
@@ -28,6 +25,5 @@ export const TxValidationResultSchema = zodFor<TxValidationResult>()(
   z.discriminatedUnion('result', [
     z.object({ result: z.literal('valid') }),
     z.object({ result: z.literal('invalid'), reason: z.array(z.string()) }),
-    z.object({ result: z.literal('skipped'), reason: z.array(z.string()) }),
   ]),
 );

package/src/types/shared.ts

@@ -1,4 +1,4 @@
-import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferSink, type Bufferable, type Sinkable, serializeToSink } from '@aztec/foundation/serialize';
 
 /**
  * Implementation of a vector. Matches how we are serializing and deserializing vectors in cpp (length in the first position, followed by the items).
@@ -11,8 +11,13 @@ export class Vector<T extends Bufferable> {
     public items: T[],
   ) {}
 
-  toBuffer() {
-    return serializeToBuffer(this.items.length, this.items);
+  toBuffer(): Buffer;
+  toBuffer(sink: BufferSink): void;
+  toBuffer(sink?: BufferSink): Buffer | void {
+    if (!sink) {
+      return BufferSink.serialize(this);
+    }
+    serializeToSink(sink, this.items.length, this.items as Sinkable[]);
   }
 
   toFriendlyJSON() {
@@ -34,13 +39,3 @@ export type UInt64 = bigint;
  * A type alias for a 128-bit unsigned integer.
  */
 export type UInt128 = bigint;
-
-/**
- * CircuitType replaces ComposerType for now. When using Plonk, CircuitType is equivalent to the information of the proving system that will be used
- * to construct a proof. In the future Aztec zk stack, more information must be specified (e.g., the curve over which circuits are  constructed;
- * Plonk vs Honk; zk-SNARK or just SNARK; etc).
- */
-export enum CircuitType {
-  STANDARD = 0,
-  ULTRA = 1,
-}

package/src/update-checker/dev_version.ts

@@ -0,0 +1,2 @@
+/** Placeholder version returned when running from a local monorepo checkout rather than an npm-installed package. */
+export const DEV_VERSION = 'dev';

package/src/update-checker/index.ts

@@ -1,2 +1,3 @@
+export * from './dev_version.js';
 export * from './package_version.js';
 export * from './version_checker.js';

package/src/update-checker/package_version.ts

@@ -3,28 +3,15 @@ import { fileURLToPath } from '@aztec/foundation/url';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 
-/** Returns the package version from the release-please manifest or the package.json, or undefined if not found. */
-export function getPackageVersion(): string | undefined {
-  const dir = dirname(fileURLToPath(import.meta.url));
-
-  // Try the release-please manifest first (works in dev/repo checkout).
-  try {
-    const releasePleaseManifestPath = resolve(dir, '../../../../.release-please-manifest.json');
-    return JSON.parse(readFileSync(releasePleaseManifestPath).toString())['.'];
-  } catch {
-    // Not in a repo checkout, fall through.
-  }
+import { DEV_VERSION } from './dev_version.js';
 
-  // Fall back to the stdlib package.json version (works in npm-installed packages).
-  try {
-    const packageJsonPath = resolve(dir, '../../package.json');
-    const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
-    if (version && version !== '0.1.0') {
-      return version;
-    }
-  } catch {
-    // No package.json found either.
-  }
-
-  return undefined;
+/**
+ * Returns the package version from the stdlib `package.json`, or `DEV_VERSION` when the version is the `0.1.0`
+ * placeholder (which indicates a local monorepo checkout rather than an npm-installed package).
+ */
+export function getPackageVersion(): string {
+  const dir = dirname(fileURLToPath(import.meta.url));
+  const packageJsonPath = resolve(dir, '../../package.json');
+  const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+  return version === '0.1.0' ? DEV_VERSION : version;
 }

package/src/validators/schemas.ts

@@ -14,7 +14,9 @@ import type {
 export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
   z.enum([
     'checkpoint-mined',
-    'checkpoint-proposed',
+    'checkpoint-valid',
+    'checkpoint-invalid',
+    'checkpoint-unvalidated',
     'checkpoint-missed',
     'blocks-missed',
     'attestation-sent',
@@ -33,7 +35,7 @@ export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(
 
 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,
@@ -64,7 +66,7 @@ export const ValidatorStatsSchema = zodFor<ValidatorStats>()(
 
 export const ValidatorsStatsSchema = zodFor<ValidatorsStats>()(
   z.object({
-    stats: z.record(ValidatorStatsSchema),
+    stats: z.record(z.string(), ValidatorStatsSchema),
     lastProcessedSlot: schemas.SlotNumber.optional(),
     initialSlot: schemas.SlotNumber.optional(),
     slotWindow: schemas.Integer,
@@ -74,7 +76,7 @@ export const ValidatorsStatsSchema = zodFor<ValidatorsStats>()(
 export const SingleValidatorStatsSchema = zodFor<SingleValidatorStats>()(
   z.object({
     validator: ValidatorStatsSchema,
-    allTimeProvenPerformance: z.array(
+    allTimeEpochPerformance: z.array(
       z.object({
         missed: schemas.Integer,
         total: schemas.Integer,

package/src/validators/types.ts

@@ -3,9 +3,28 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 
 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 =
   | 'checkpoint-mined'
-  | 'checkpoint-proposed'
+  | 'checkpoint-valid'
+  | 'checkpoint-invalid'
+  | 'checkpoint-unvalidated'
   | 'checkpoint-missed'
   | 'blocks-missed'
   | 'attestation-sent'
@@ -41,7 +60,7 @@ export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number;
 
 export type SingleValidatorStats = {
   validator: ValidatorStats;
-  allTimeProvenPerformance: { missed: number; total: number; epoch: EpochNumber }[];
+  allTimeEpochPerformance: { missed: number; total: number; epoch: EpochNumber }[];
   lastProcessedSlot?: SlotNumber;
   initialSlot?: SlotNumber;
   slotWindow: number;

package/src/versioning/versioning.ts

@@ -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(),