@aztec/stdlib 1.0.0-nightly.20250607 → 1.0.0-nightly.20250610

package/src/tx/public_simulation_output.ts

@@ -7,8 +7,8 @@ import { z } from 'zod';
 import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
-import { CombinedConstantData } from '../kernel/combined_constant_data.js';
 import { TxEffect } from '../tx/tx_effect.js';
+import { GlobalVariables } from './global_variables.js';
 
 /** Return values of simulating a circuit. */
 export type ProcessReturnValues = Fr[] | undefined;
@@ -50,7 +50,7 @@ export class NestedProcessReturnValues {
 export class PublicSimulationOutput {
   constructor(
     public revertReason: SimulationError | undefined,
-    public constants: CombinedConstantData,
+    public globalVariables: GlobalVariables,
     public txEffect: TxEffect,
     public publicReturnValues: NestedProcessReturnValues[],
     public gasUsed: GasUsed,
@@ -60,7 +60,7 @@ export class PublicSimulationOutput {
     return z
       .object({
         revertReason: SimulationError.schema.optional(),
-        constants: CombinedConstantData.schema,
+        globalVariables: GlobalVariables.schema,
         txEffect: TxEffect.schema,
         publicReturnValues: z.array(NestedProcessReturnValues.schema),
         gasUsed: z.object({
@@ -74,7 +74,7 @@ export class PublicSimulationOutput {
         fields =>
           new PublicSimulationOutput(
             fields.revertReason,
-            fields.constants,
+            fields.globalVariables,
             fields.txEffect,
             fields.publicReturnValues,
             fields.gasUsed,
@@ -85,7 +85,7 @@ export class PublicSimulationOutput {
   static async random() {
     return new PublicSimulationOutput(
       await SimulationError.random(),
-      CombinedConstantData.empty(),
+      GlobalVariables.empty(),
       TxEffect.empty(),
       times(2, NestedProcessReturnValues.random),
       { teardownGas: Gas.random(), totalGas: Gas.random(), publicGas: Gas.random(), billedGas: Gas.random() },

package/src/tx/state_reference.ts

@@ -1,4 +1,5 @@
 import { 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';
 
@@ -33,7 +34,7 @@ export class StateReference {
   }
 
   toBuffer() {
-    // Note: The order here must match the order in the HeaderLib solidity library.
+    // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return serializeToBuffer(this.l1ToL2MessageTree, this.partial);
   }
 
@@ -61,12 +62,30 @@ 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.zero(), PartialStateReference.empty());
+    return new StateReference(AppendOnlyTreeSnapshot.empty(), PartialStateReference.empty());
+  }
+
+  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()]];
   }
 
   isEmpty(): boolean {
-    return this.l1ToL2MessageTree.isZero() && this.partial.isEmpty();
+    return this.l1ToL2MessageTree.isEmpty() && this.partial.isEmpty();
   }
 
   toInspect() {

package/src/tx/tree_snapshots.ts

@@ -52,7 +52,7 @@ export class TreeSnapshots {
   }
 
   toBuffer() {
-    // Note: The order here must match the order in the HeaderLib solidity library.
+    // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return serializeToBuffer(this.l1ToL2MessageTree, this.noteHashTree, this.nullifierTree, this.publicDataTree);
   }
 
@@ -84,19 +84,19 @@ export class TreeSnapshots {
 
   static empty(): TreeSnapshots {
     return new TreeSnapshots(
-      AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
     );
   }
 
   isEmpty(): boolean {
     return (
-      this.l1ToL2MessageTree.isZero() &&
-      this.noteHashTree.isZero() &&
-      this.nullifierTree.isZero() &&
-      this.publicDataTree.isZero()
+      this.l1ToL2MessageTree.isEmpty() &&
+      this.noteHashTree.isEmpty() &&
+      this.nullifierTree.isEmpty() &&
+      this.publicDataTree.isEmpty()
     );
   }
 

package/src/tx/tx.ts

@@ -163,7 +163,7 @@ export class Tx extends Gossipable {
 
   /**
    * Gets either revertible or non revertible contract class logs emitted by this tx.
-   * @param revertible - true for revertible only logs, false for non reverible only logs.
+   * @param revertible - true for revertible only logs, false for non revertible only logs.
    * @returns The requested logs.
    */
   getSplitContractClassLogs(revertible: boolean): ContractClassLog[] {

package/src/tx/tx_hash.ts

@@ -5,6 +5,7 @@ import { schemas } from '../schemas/index.js';
 
 /**
  * A class representing hash of Aztec transaction.
+ * @dev Computed by hashing the public inputs of the private kernel tail circuit (see Tx::getTxHash function).
  */
 export class TxHash {
   constructor(

package/dest/kernel/combined_constant_data.d.ts

@@ -1,71 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { type ZodFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { BlockHeader } from '../tx/block_header.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-import type { TxConstantData } from '../tx/tx_constant_data.js';
-import { TxContext } from '../tx/tx_context.js';
-/**
- * Data that is constant/not modified by neither of the kernels.
- */
-export declare class CombinedConstantData {
-    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
-    historicalHeader: BlockHeader;
-    /**
-     * Context of the transaction.
-     *
-     * Note: `chainId` and `version` in txContext are not redundant to the values in
-     * self.historical_header.global_variables because they can be different in case of a protocol upgrade. In such
-     * a situation we could be using header from a block before the upgrade took place but be using the updated
-     * protocol to execute and prove the transaction.
-     */
-    txContext: TxContext;
-    /**
-     * Root of the vk tree for the protocol circuits.
-     */
-    vkTreeRoot: Fr;
-    /**
-     * Root of the tree for the protocol contracts.
-     */
-    protocolContractTreeRoot: Fr;
-    /** Present when output by a public kernel, empty otherwise. */
-    globalVariables: GlobalVariables;
-    constructor(
-    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
-    historicalHeader: BlockHeader, 
-    /**
-     * Context of the transaction.
-     *
-     * Note: `chainId` and `version` in txContext are not redundant to the values in
-     * self.historical_header.global_variables because they can be different in case of a protocol upgrade. In such
-     * a situation we could be using header from a block before the upgrade took place but be using the updated
-     * protocol to execute and prove the transaction.
-     */
-    txContext: TxContext, 
-    /**
-     * Root of the vk tree for the protocol circuits.
-     */
-    vkTreeRoot: Fr, 
-    /**
-     * Root of the tree for the protocol contracts.
-     */
-    protocolContractTreeRoot: Fr, 
-    /** Present when output by a public kernel, empty otherwise. */
-    globalVariables: GlobalVariables);
-    static combine(TxConstantData: TxConstantData, globalVariables: GlobalVariables): CombinedConstantData;
-    static get schema(): ZodFor<CombinedConstantData>;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    clone(): CombinedConstantData;
-    getSize(): number;
-    static from({ historicalHeader, txContext, vkTreeRoot, protocolContractTreeRoot, globalVariables, }: FieldsOf<CombinedConstantData>): CombinedConstantData;
-    /**
-     * Deserializes from a buffer or reader, corresponding to a write in cpp.
-     * @param buffer - Buffer or buffer reader to read from.
-     * @returns A new instance of CombinedConstantData.
-     */
-    static fromBuffer(buffer: Buffer | BufferReader): CombinedConstantData;
-    static fromFields(fields: Fr[] | FieldReader): CombinedConstantData;
-    static empty(): CombinedConstantData;
-}
-//# sourceMappingURL=combined_constant_data.d.ts.map

package/dest/kernel/combined_constant_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"combined_constant_data.d.ts","sourceRoot":"","sources":["../../src/kernel/combined_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAyB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;GAEG;AACH,qBAAa,oBAAoB;IAE7B,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC,+DAA+D;IACxD,eAAe,EAAE,eAAe;;IApBvC,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC,+DAA+D;IACxD,eAAe,EAAE,eAAe;IAGzC,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe;IAU/E,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAWhD;IAED,QAAQ;IAUR,KAAK,IAAI,oBAAoB;IAI7B,OAAO;IAUP,MAAM,CAAC,IAAI,CAAC,EACV,gBAAgB,EAChB,SAAS,EACT,UAAU,EACV,wBAAwB,EACxB,eAAe,GAChB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,oBAAoB;IAIxD;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB;IAWtE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,oBAAoB;IAWnE,MAAM,CAAC,KAAK;CAGb"}

package/dest/kernel/combined_constant_data.js

@@ -1,73 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { hexSchemaFor, schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { z } from 'zod';
-import { BlockHeader } from '../tx/block_header.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-import { TxContext } from '../tx/tx_context.js';
-/**
- * Data that is constant/not modified by neither of the kernels.
- */ export class CombinedConstantData {
-    historicalHeader;
-    txContext;
-    vkTreeRoot;
-    protocolContractTreeRoot;
-    globalVariables;
-    constructor(/** Header of a block whose state is used during execution (not the block the transaction is included in). */ historicalHeader, /**
-     * Context of the transaction.
-     *
-     * Note: `chainId` and `version` in txContext are not redundant to the values in
-     * self.historical_header.global_variables because they can be different in case of a protocol upgrade. In such
-     * a situation we could be using header from a block before the upgrade took place but be using the updated
-     * protocol to execute and prove the transaction.
-     */ txContext, /**
-     * Root of the vk tree for the protocol circuits.
-     */ vkTreeRoot, /**
-     * Root of the tree for the protocol contracts.
-     */ protocolContractTreeRoot, /** Present when output by a public kernel, empty otherwise. */ globalVariables){
-        this.historicalHeader = historicalHeader;
-        this.txContext = txContext;
-        this.vkTreeRoot = vkTreeRoot;
-        this.protocolContractTreeRoot = protocolContractTreeRoot;
-        this.globalVariables = globalVariables;
-    }
-    static combine(TxConstantData, globalVariables) {
-        return new CombinedConstantData(TxConstantData.historicalHeader, TxConstantData.txContext, TxConstantData.vkTreeRoot, TxConstantData.protocolContractTreeRoot, globalVariables);
-    }
-    static get schema() {
-        return z.object({
-            historicalHeader: BlockHeader.schema,
-            txContext: TxContext.schema,
-            vkTreeRoot: schemas.Fr,
-            protocolContractTreeRoot: schemas.Fr,
-            globalVariables: GlobalVariables.schema
-        }).transform(CombinedConstantData.from).or(hexSchemaFor(CombinedConstantData));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.historicalHeader, this.txContext, this.vkTreeRoot, this.protocolContractTreeRoot, this.globalVariables);
-    }
-    clone() {
-        return CombinedConstantData.fromBuffer(this.toBuffer());
-    }
-    getSize() {
-        return this.historicalHeader.getSize() + this.txContext.getSize() + this.vkTreeRoot.size + this.protocolContractTreeRoot.size + this.globalVariables.getSize();
-    }
-    static from({ historicalHeader, txContext, vkTreeRoot, protocolContractTreeRoot, globalVariables }) {
-        return new CombinedConstantData(historicalHeader, txContext, vkTreeRoot, protocolContractTreeRoot, globalVariables);
-    }
-    /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or buffer reader to read from.
-   * @returns A new instance of CombinedConstantData.
-   */ static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new CombinedConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(GlobalVariables));
-    }
-    static fromFields(fields) {
-        const reader = FieldReader.asReader(fields);
-        return new CombinedConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), reader.readField(), reader.readField(), reader.readObject(GlobalVariables));
-    }
-    static empty() {
-        return new CombinedConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
-    }
-}

package/dest/rollup/constant_rollup_data.d.ts

@@ -1,45 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-/**
- * Data which is forwarded through the base rollup circuits unchanged.
- */
-export declare class ConstantRollupData {
-    /** Archive tree snapshot at the very beginning of the entire rollup. */
-    lastArchive: AppendOnlyTreeSnapshot;
-    /**
-     * Root of the verification key tree.
-     */
-    vkTreeRoot: Fr;
-    /**
-     * Root of the protocol contract tree.
-     */
-    protocolContractTreeRoot: Fr;
-    /**
-     * Global variables for the block
-     */
-    globalVariables: GlobalVariables;
-    constructor(
-    /** Archive tree snapshot at the very beginning of the entire rollup. */
-    lastArchive: AppendOnlyTreeSnapshot, 
-    /**
-     * Root of the verification key tree.
-     */
-    vkTreeRoot: Fr, 
-    /**
-     * Root of the protocol contract tree.
-     */
-    protocolContractTreeRoot: Fr, 
-    /**
-     * Global variables for the block
-     */
-    globalVariables: GlobalVariables);
-    static from(fields: FieldsOf<ConstantRollupData>): ConstantRollupData;
-    static fromBuffer(buffer: Buffer | BufferReader): ConstantRollupData;
-    static getFields(fields: FieldsOf<ConstantRollupData>): readonly [AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables];
-    static empty(): ConstantRollupData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-}
-//# sourceMappingURL=constant_rollup_data.d.ts.map

package/dest/rollup/constant_rollup_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constant_rollup_data.d.ts","sourceRoot":"","sources":["../../src/rollup/constant_rollup_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,eAAe,EAAE,eAAe;;IAbvC,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,eAAe,EAAE,eAAe;IAGzC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB;IAIrE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;IAUpE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAIrD,MAAM,CAAC,KAAK;IAIZ,QAAQ;CAGT"}

package/src/kernel/combined_constant_data.ts

@@ -1,128 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { type ZodFor, hexSchemaFor, schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
-
-import { BlockHeader } from '../tx/block_header.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-import type { TxConstantData } from '../tx/tx_constant_data.js';
-import { TxContext } from '../tx/tx_context.js';
-
-/**
- * Data that is constant/not modified by neither of the kernels.
- */
-export class CombinedConstantData {
-  constructor(
-    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
-    public historicalHeader: BlockHeader,
-    /**
-     * Context of the transaction.
-     *
-     * Note: `chainId` and `version` in txContext are not redundant to the values in
-     * self.historical_header.global_variables because they can be different in case of a protocol upgrade. In such
-     * a situation we could be using header from a block before the upgrade took place but be using the updated
-     * protocol to execute and prove the transaction.
-     */
-    public txContext: TxContext,
-    /**
-     * Root of the vk tree for the protocol circuits.
-     */
-    public vkTreeRoot: Fr,
-    /**
-     * Root of the tree for the protocol contracts.
-     */
-    public protocolContractTreeRoot: Fr,
-    /** Present when output by a public kernel, empty otherwise. */
-    public globalVariables: GlobalVariables,
-  ) {}
-
-  static combine(TxConstantData: TxConstantData, globalVariables: GlobalVariables) {
-    return new CombinedConstantData(
-      TxConstantData.historicalHeader,
-      TxConstantData.txContext,
-      TxConstantData.vkTreeRoot,
-      TxConstantData.protocolContractTreeRoot,
-      globalVariables,
-    );
-  }
-
-  static get schema(): ZodFor<CombinedConstantData> {
-    return z
-      .object({
-        historicalHeader: BlockHeader.schema,
-        txContext: TxContext.schema,
-        vkTreeRoot: schemas.Fr,
-        protocolContractTreeRoot: schemas.Fr,
-        globalVariables: GlobalVariables.schema,
-      })
-      .transform(CombinedConstantData.from)
-      .or(hexSchemaFor(CombinedConstantData));
-  }
-
-  toBuffer() {
-    return serializeToBuffer(
-      this.historicalHeader,
-      this.txContext,
-      this.vkTreeRoot,
-      this.protocolContractTreeRoot,
-      this.globalVariables,
-    );
-  }
-
-  clone(): CombinedConstantData {
-    return CombinedConstantData.fromBuffer(this.toBuffer());
-  }
-
-  getSize() {
-    return (
-      this.historicalHeader.getSize() +
-      this.txContext.getSize() +
-      this.vkTreeRoot.size +
-      this.protocolContractTreeRoot.size +
-      this.globalVariables.getSize()
-    );
-  }
-
-  static from({
-    historicalHeader,
-    txContext,
-    vkTreeRoot,
-    protocolContractTreeRoot,
-    globalVariables,
-  }: FieldsOf<CombinedConstantData>): CombinedConstantData {
-    return new CombinedConstantData(historicalHeader, txContext, vkTreeRoot, protocolContractTreeRoot, globalVariables);
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or buffer reader to read from.
-   * @returns A new instance of CombinedConstantData.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): CombinedConstantData {
-    const reader = BufferReader.asReader(buffer);
-    return new CombinedConstantData(
-      reader.readObject(BlockHeader),
-      reader.readObject(TxContext),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      reader.readObject(GlobalVariables),
-    );
-  }
-
-  static fromFields(fields: Fr[] | FieldReader): CombinedConstantData {
-    const reader = FieldReader.asReader(fields);
-    return new CombinedConstantData(
-      reader.readObject(BlockHeader),
-      reader.readObject(TxContext),
-      reader.readField(),
-      reader.readField(),
-      reader.readObject(GlobalVariables),
-    );
-  }
-
-  static empty() {
-    return new CombinedConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
-  }
-}

package/src/rollup/constant_rollup_data.ts

@@ -1,54 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-
-/**
- * Data which is forwarded through the base rollup circuits unchanged.
- */
-export class ConstantRollupData {
-  constructor(
-    /** Archive tree snapshot at the very beginning of the entire rollup. */
-    public lastArchive: AppendOnlyTreeSnapshot,
-    /**
-     * Root of the verification key tree.
-     */
-    public vkTreeRoot: Fr,
-    /**
-     * Root of the protocol contract tree.
-     */
-    public protocolContractTreeRoot: Fr,
-    /**
-     * Global variables for the block
-     */
-    public globalVariables: GlobalVariables,
-  ) {}
-
-  static from(fields: FieldsOf<ConstantRollupData>): ConstantRollupData {
-    return new ConstantRollupData(...ConstantRollupData.getFields(fields));
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader): ConstantRollupData {
-    const reader = BufferReader.asReader(buffer);
-    return new ConstantRollupData(
-      reader.readObject(AppendOnlyTreeSnapshot),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      reader.readObject(GlobalVariables),
-    );
-  }
-
-  static getFields(fields: FieldsOf<ConstantRollupData>) {
-    return [fields.lastArchive, fields.vkTreeRoot, fields.protocolContractTreeRoot, fields.globalVariables] as const;
-  }
-
-  static empty() {
-    return new ConstantRollupData(AppendOnlyTreeSnapshot.zero(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
-  }
-
-  toBuffer() {
-    return serializeToBuffer(...ConstantRollupData.getFields(this));
-  }
-}