@aztec/stdlib 3.0.0-nightly.20251128 → 3.0.0-nightly.20251202

package/src/tx/block_header.ts

@@ -1,4 +1,5 @@
 import { BLOCK_HEADER_LENGTH, GeneratorIndex } from '@aztec/constants';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { poseidon2HashWithSeparator, randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor, schemas } from '@aztec/foundation/schemas';
@@ -61,8 +62,8 @@ export class BlockHeader {
     return new BlockHeader(...BlockHeader.getFields(fields));
   }
 
-  getSlot() {
-    return this.globalVariables.slotNumber.toBigInt();
+  getSlot(): SlotNumber {
+    return this.globalVariables.slotNumber;
   }
 
   getBlockNumber() {

package/src/tx/global_variable_builder.ts

@@ -1,4 +1,5 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { SlotNumber } from '@aztec/foundation/schemas';
 
 import type { AztecAddress } from '../aztec-address/index.js';
 import type { GasFees } from '../gas/gas_fees.js';
@@ -23,6 +24,6 @@ export interface GlobalVariableBuilder {
     blockNumber: UInt32,
     coinbase: EthAddress,
     feeRecipient: AztecAddress,
-    slotNumber?: bigint,
+    slotNumber?: SlotNumber,
   ): Promise<GlobalVariables>;
 }

package/src/tx/global_variables.ts

@@ -1,4 +1,5 @@
 import { GLOBAL_VARIABLES_LENGTH } from '@aztec/constants';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { randomInt } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -32,7 +33,7 @@ export class GlobalVariables {
     /** Block number of the L2 block. */
     public blockNumber: UInt32,
     /** Slot number of the L2 block */
-    public slotNumber: Fr,
+    public slotNumber: SlotNumber,
     /** Timestamp of the L2 block. */
     public timestamp: UInt64,
     /** Recipient of block reward. */
@@ -49,7 +50,7 @@ export class GlobalVariables {
         chainId: schemas.Fr,
         version: schemas.Fr,
         blockNumber: schemas.UInt32,
-        slotNumber: schemas.Fr,
+        slotNumber: schemas.SlotNumber,
         timestamp: schemas.BigInt,
         coinbase: schemas.EthAddress,
         feeRecipient: schemas.AztecAddress,
@@ -78,7 +79,7 @@ export class GlobalVariables {
       Fr.fromPlainObject(obj.chainId),
       Fr.fromPlainObject(obj.version),
       obj.blockNumber,
-      Fr.fromPlainObject(obj.slotNumber),
+      SlotNumber(Fr.fromPlainObject(obj.slotNumber).toNumber()),
       typeof obj.timestamp === 'bigint' ? obj.timestamp : BigInt(obj.timestamp),
       EthAddress.fromPlainObject(obj.coinbase),
       AztecAddress.fromPlainObject(obj.feeRecipient),
@@ -89,7 +90,7 @@ export class GlobalVariables {
   static empty(fields: Partial<FieldsOf<GlobalVariables>> = {}): GlobalVariables {
     return GlobalVariables.from({
       blockNumber: 0,
-      slotNumber: Fr.ZERO,
+      slotNumber: SlotNumber.ZERO,
       timestamp: 0n,
       chainId: Fr.ZERO,
       version: Fr.ZERO,
@@ -106,7 +107,7 @@ export class GlobalVariables {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       reader.readNumber(),
-      Fr.fromBuffer(reader),
+      SlotNumber(reader.readNumber()),
       reader.readUInt64(),
       reader.readObject(EthAddress),
       reader.readObject(AztecAddress),
@@ -121,7 +122,7 @@ export class GlobalVariables {
       reader.readField(),
       reader.readField(),
       reader.readU32(),
-      reader.readField(),
+      SlotNumber(reader.readU32()),
       reader.readField().toBigInt(),
       EthAddress.fromField(reader.readField()),
       AztecAddress.fromField(reader.readField()),
@@ -172,13 +173,31 @@ export class GlobalVariables {
   toFriendlyJSON() {
     return {
       blockNumber: this.blockNumber,
-      slotNumber: this.slotNumber.toNumber(),
+      slotNumber: this.slotNumber,
       timestamp: this.timestamp.toString(),
       coinbase: this.coinbase.toString(),
       gasFees: jsonStringify(this.gasFees),
     };
   }
 
+  /**
+   * Converts GlobalVariables to a plain object suitable for MessagePack serialization.
+   * This method ensures that slotNumber is serialized as a Fr (Field element) to match
+   * the C++ struct definition which expects slot_number as FF.
+   */
+  toJSON() {
+    return {
+      chainId: this.chainId,
+      version: this.version,
+      blockNumber: this.blockNumber,
+      slotNumber: new Fr(this.slotNumber), // Convert to Fr for C++ compatibility
+      timestamp: this.timestamp,
+      coinbase: this.coinbase,
+      feeRecipient: this.feeRecipient,
+      gasFees: this.gasFees,
+    };
+  }
+
   clone(): GlobalVariables {
     return GlobalVariables.fromBuffer(this.toBuffer());
   }
@@ -188,7 +207,7 @@ export class GlobalVariables {
       this.chainId.isZero() &&
       this.version.isZero() &&
       this.blockNumber === 0 &&
-      this.slotNumber.isZero() &&
+      this.slotNumber === 0 &&
       this.timestamp === 0n &&
       this.coinbase.isZero() &&
       this.feeRecipient.isZero() &&
@@ -201,7 +220,7 @@ export class GlobalVariables {
       chainId: new Fr(randomInt(100_000)),
       version: new Fr(randomInt(100_000)),
       blockNumber: randomInt(100_000),
-      slotNumber: new Fr(randomInt(100_000)),
+      slotNumber: SlotNumber(randomInt(100_000)),
       coinbase: EthAddress.random(),
       feeRecipient: AztecAddress.fromField(Fr.random()),
       gasFees: GasFees.random(),
@@ -215,7 +234,7 @@ export class GlobalVariables {
       chainId: this.chainId.toNumber(),
       version: this.version.toNumber(),
       blockNumber: this.blockNumber,
-      slotNumber: this.slotNumber.toNumber(),
+      slotNumber: this.slotNumber,
       timestamp: this.timestamp,
       coinbase: this.coinbase.toString(),
       feeRecipient: this.feeRecipient.toString(),
@@ -233,7 +252,7 @@ export class GlobalVariables {
       this.chainId.equals(other.chainId) &&
       this.version.equals(other.version) &&
       this.blockNumber === other.blockNumber &&
-      this.slotNumber.equals(other.slotNumber) &&
+      this.slotNumber === other.slotNumber &&
       this.timestamp === other.timestamp &&
       this.coinbase.equals(other.coinbase) &&
       this.feeRecipient.equals(other.feeRecipient) &&

package/src/tx/indexed_tx_effect.ts

@@ -2,10 +2,10 @@ import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { L2BlockHash } from '../block/block_hash.js';
-import { type InBlock, inBlockSchemaFor, randomInBlock } from '../block/in_block.js';
+import { type DataInBlock, inBlockSchemaFor, randomInBlock } from '../block/in_block.js';
 import { TxEffect } from './tx_effect.js';
 
-export type IndexedTxEffect = InBlock<TxEffect> & { txIndexInBlock: number };
+export type IndexedTxEffect = DataInBlock<TxEffect> & { txIndexInBlock: number };
 
 export function indexedTxSchema() {
   return inBlockSchemaFor(TxEffect.schema).extend({ txIndexInBlock: schemas.Integer });

package/src/tx/partial_state_reference.ts

@@ -1,5 +1,4 @@
 import { PARTIAL_STATE_REFERENCE_LENGTH } from '@aztec/constants';
-import type { ViemPartialStateReference } from '@aztec/ethereum';
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -65,14 +64,6 @@ export class PartialStateReference {
     return new PartialStateReference(noteHashTree, nullifierTree, publicDataTree);
   }
 
-  static fromViem(stateReference: ViemPartialStateReference) {
-    return new PartialStateReference(
-      AppendOnlyTreeSnapshot.fromViem(stateReference.noteHashTree),
-      AppendOnlyTreeSnapshot.fromViem(stateReference.nullifierTree),
-      AppendOnlyTreeSnapshot.fromViem(stateReference.publicDataTree),
-    );
-  }
-
   static random(): PartialStateReference {
     return new PartialStateReference(
       AppendOnlyTreeSnapshot.random(),
@@ -81,14 +72,6 @@ export class PartialStateReference {
     );
   }
 
-  toViem(): ViemPartialStateReference {
-    return {
-      noteHashTree: this.noteHashTree.toViem(),
-      nullifierTree: this.nullifierTree.toViem(),
-      publicDataTree: this.publicDataTree.toViem(),
-    };
-  }
-
   toAbi(): [
     ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
     ReturnType<AppendOnlyTreeSnapshot['toAbi']>,

package/src/tx/state_reference.ts

@@ -4,7 +4,6 @@ import {
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   STATE_REFERENCE_LENGTH,
 } from '@aztec/constants';
-import type { ViemStateReference } from '@aztec/ethereum';
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -76,13 +75,6 @@ export class StateReference {
     return new StateReference(l1ToL2MessageTree, partial);
   }
 
-  static fromViem(stateReference: ViemStateReference) {
-    return new StateReference(
-      AppendOnlyTreeSnapshot.fromViem(stateReference.l1ToL2MessageTree),
-      PartialStateReference.fromViem(stateReference.partialStateReference),
-    );
-  }
-
   static empty(): StateReference {
     return new StateReference(AppendOnlyTreeSnapshot.empty(), PartialStateReference.empty());
   }
@@ -91,13 +83,6 @@ export class StateReference {
     return new StateReference(AppendOnlyTreeSnapshot.random(), PartialStateReference.random());
   }
 
-  toViem(): ViemStateReference {
-    return {
-      l1ToL2MessageTree: this.l1ToL2MessageTree.toViem(),
-      partialStateReference: this.partial.toViem(),
-    };
-  }
-
   toAbi(): [ReturnType<AppendOnlyTreeSnapshot['toAbi']>, ReturnType<PartialStateReference['toAbi']>] {
     return [this.l1ToL2MessageTree.toAbi(), [...this.partial.toAbi()]];
   }

package/src/tx/tx.ts

@@ -300,8 +300,9 @@ export class Tx extends Gossipable {
   }
 
   /** Recomputes the tx hash. Used for testing purposes only when a property of the tx was mutated. */
-  public async recomputeHash() {
+  public async recomputeHash(): Promise<TxHash> {
     (this as any).txHash = await Tx.computeTxHash(this);
+    return this.txHash;
   }
 
   #combinePublicCallRequestWithCallData(request: PublicCallRequest) {

package/src/validators/errors.ts

@@ -1,5 +1,6 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/fields';
-import type { StateReference, TxHash } from '@aztec/stdlib/tx';
+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}`);
   }
@@ -39,8 +40,6 @@ 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

@@ -21,7 +21,7 @@ export const ValidatorStatusInSlotSchema = z.enum([
 
 export const ValidatorStatusHistorySchema = z.array(
   z.object({
-    slot: schemas.BigInt,
+    slot: schemas.SlotNumber,
     status: ValidatorStatusInSlotSchema,
   }),
 ) satisfies ZodFor<ValidatorStatusHistory>;
@@ -32,7 +32,7 @@ export const ValidatorStatusHistorySchemaMap = z.record(ValidatorStatusHistorySc
 
 const ValidatorTimeStatSchema = z.object({
   timestamp: schemas.BigInt,
-  slot: schemas.BigInt,
+  slot: schemas.SlotNumber,
   date: z.string(),
 });
 
@@ -55,8 +55,8 @@ export const ValidatorStatsSchema = z.object({
 
 export const ValidatorsStatsSchema = z.object({
   stats: z.record(ValidatorStatsSchema),
-  lastProcessedSlot: schemas.BigInt.optional(),
-  initialSlot: schemas.BigInt.optional(),
+  lastProcessedSlot: schemas.SlotNumber.optional(),
+  initialSlot: schemas.SlotNumber.optional(),
   slotWindow: schemas.Integer,
 }) satisfies ZodFor<ValidatorsStats>;
 
@@ -69,7 +69,7 @@ export const SingleValidatorStatsSchema = z.object({
       epoch: schemas.EpochNumber,
     }),
   ),
-  lastProcessedSlot: schemas.BigInt.optional(),
-  initialSlot: schemas.BigInt.optional(),
+  lastProcessedSlot: schemas.SlotNumber.optional(),
+  initialSlot: schemas.SlotNumber.optional(),
   slotWindow: schemas.Integer,
 }) satisfies ZodFor<SingleValidatorStats>;

package/src/validators/types.ts

@@ -1,4 +1,4 @@
-import type { EpochNumber } from '@aztec/foundation/branded-types';
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
 export type ValidatorStatusType = 'block' | 'attestation';
@@ -10,7 +10,7 @@ export type ValidatorStatusInSlot =
   | 'attestation-sent'
   | 'attestation-missed';
 
-export type ValidatorStatusHistory = { slot: bigint; status: ValidatorStatusInSlot }[];
+export type ValidatorStatusHistory = { slot: SlotNumber; status: ValidatorStatusInSlot }[];
 
 export type ValidatorMissedStats = {
   currentStreak: number;
@@ -21,8 +21,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;
@@ -31,8 +31,8 @@ export type ValidatorStats = {
 
 export type ValidatorsStats = {
   stats: Record<string, ValidatorStats>;
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };
 
@@ -41,7 +41,7 @@ export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number;
 export type SingleValidatorStats = {
   validator: ValidatorStats;
   allTimeProvenPerformance: { missed: number; total: number; epoch: EpochNumber }[];
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };