@aztec/stdlib 0.87.2 → 0.87.3-nightly.20250529

package/dest/rollup/base_rollup_hints.d.ts

@@ -33,7 +33,7 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -62,7 +62,7 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -95,7 +95,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -112,7 +112,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Data which is not modified by the base rollup circuit.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"base_rollup_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/base_rollup_hints.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base_rollup_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/base_rollup_hints.ts"],"names":[],"mappings":"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"}

package/dest/rollup/base_rollup_hints.js

@@ -15,7 +15,7 @@ export class PrivateBaseRollupHints {
     stateDiffHints;
     feePayerFeeJuiceBalanceReadHint;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Partial state reference at the start of the rollup.
@@ -29,7 +29,7 @@ export class PrivateBaseRollupHints {
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
+     */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.start = start;
@@ -37,7 +37,7 @@ export class PrivateBaseRollupHints {
         this.stateDiffHints = stateDiffHints;
         this.feePayerFeeJuiceBalanceReadHint = feePayerFeeJuiceBalanceReadHint;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
+        this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
     static from(fields) {
@@ -50,7 +50,7 @@ export class PrivateBaseRollupHints {
             fields.stateDiffHints,
             fields.feePayerFeeJuiceBalanceReadHint,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.contractClassLogsFields,
             fields.constants
         ];
     }
@@ -80,7 +80,7 @@ export class PrivateBaseRollupHints {
 export class PublicBaseRollupHints {
     startSpongeBlob;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Sponge state to absorb blob inputs at the start of the rollup.
@@ -88,12 +88,12 @@ export class PublicBaseRollupHints {
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
+     */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.startSpongeBlob = startSpongeBlob;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
+        this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
     static from(fields) {
@@ -103,7 +103,7 @@ export class PublicBaseRollupHints {
         return [
             fields.startSpongeBlob,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.contractClassLogsFields,
             fields.constants
         ];
     }

package/dest/rollup/previous_rollup_block_data.d.ts

@@ -1,8 +1,7 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_public_inputs.js';
 /**
  * Represents the data of a previous block merge or block root rollup circuit.
@@ -17,13 +16,9 @@ export declare class PreviousRollupBlockData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
     /**
-     * The verification key of the block merge or block root rollup circuit.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vk: VerificationKeyAsFields;
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>;
+    vkData: VkData;
     constructor(
     /**
      * Public inputs to the block merge or block root rollup circuit.
@@ -34,13 +29,9 @@ export declare class PreviousRollupBlockData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, 
     /**
-     * The verification key of the block merge or block root rollup circuit.
-     */
-    vk: VerificationKeyAsFields, 
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>);
+    vkData: VkData);
     /**
      * Serializes previous rollup data to a buffer.
      * @returns The buffer of the serialized previous rollup data.

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

@@ -1 +1 @@
-{"version":3,"file":"previous_rollup_block_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_block_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AAEjG;;GAEG;AACH,qBAAa,uBAAuB;IAEhC;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;;IAf1D;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;IAG5D;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uBAAuB;CASjF"}
+{"version":3,"file":"previous_rollup_block_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_block_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AAEjG;;GAEG;AACH,qBAAa,uBAAuB;IAEhC;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;;IAXrB;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;IAGvB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uBAAuB;CAQjF"}

package/dest/rollup/previous_rollup_block_data.js

@@ -1,35 +1,30 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_public_inputs.js';
 /**
  * Represents the data of a previous block merge or block root rollup circuit.
  */ export class PreviousRollupBlockData {
     blockRootOrBlockMergePublicInputs;
     proof;
-    vk;
-    vkWitness;
+    vkData;
     constructor(/**
      * Public inputs to the block merge or block root rollup circuit.
      */ blockRootOrBlockMergePublicInputs, /**
      * The proof of the block merge or block root rollup circuit.
      */ proof, /**
-     * The verification key of the block merge or block root rollup circuit.
-     */ vk, /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */ vkWitness){
+     * The verification key and the witness of the vk in the vk tree.
+     */ vkData){
         this.blockRootOrBlockMergePublicInputs = blockRootOrBlockMergePublicInputs;
         this.proof = proof;
-        this.vk = vk;
-        this.vkWitness = vkWitness;
+        this.vkData = vkData;
     }
     /**
    * Serializes previous rollup data to a buffer.
    * @returns The buffer of the serialized previous rollup data.
    */ toBuffer() {
-        return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vk, this.vkWitness);
+        return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vkData);
     }
     /**
    * Deserializes previous rollup data from a buffer.
@@ -37,6 +32,6 @@ import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_p
    * @returns A new PreviousRollupData instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PreviousRollupBlockData(reader.readObject(BlockRootOrBlockMergePublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VerificationKeyAsFields), MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT));
+        return new PreviousRollupBlockData(reader.readObject(BlockRootOrBlockMergePublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
 }

package/dest/rollup/previous_rollup_data.d.ts

@@ -1,8 +1,7 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 /**
  * Represents the data of a previous merge or base rollup circuit.
@@ -17,13 +16,9 @@ export declare class PreviousRollupData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
     /**
-     * The verification key of the base or merge rollup circuit.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vk: VerificationKeyAsFields;
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>;
+    vkData: VkData;
     constructor(
     /**
      * Public inputs to the base or merge rollup circuit.
@@ -34,13 +29,9 @@ export declare class PreviousRollupData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, 
     /**
-     * The verification key of the base or merge rollup circuit.
-     */
-    vk: VerificationKeyAsFields, 
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>);
+    vkData: VkData);
     /**
      * Serializes previous rollup data to a buffer.
      * @returns The buffer of the serialized previous rollup data.

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

@@ -1 +1 @@
-{"version":3,"file":"previous_rollup_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;;IAf1D;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;IAG5D;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;CAS5E"}
+{"version":3,"file":"previous_rollup_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;;IAXrB;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;IAGvB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;CAQ5E"}

package/dest/rollup/previous_rollup_data.js

@@ -1,35 +1,30 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 /**
  * Represents the data of a previous merge or base rollup circuit.
  */ export class PreviousRollupData {
     baseOrMergeRollupPublicInputs;
     proof;
-    vk;
-    vkWitness;
+    vkData;
     constructor(/**
      * Public inputs to the base or merge rollup circuit.
      */ baseOrMergeRollupPublicInputs, /**
      * The proof of the base or merge rollup circuit.
      */ proof, /**
-     * The verification key of the base or merge rollup circuit.
-     */ vk, /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */ vkWitness){
+     * The verification key and the witness of the vk in the vk tree.
+     */ vkData){
         this.baseOrMergeRollupPublicInputs = baseOrMergeRollupPublicInputs;
         this.proof = proof;
-        this.vk = vk;
-        this.vkWitness = vkWitness;
+        this.vkData = vkData;
     }
     /**
    * Serializes previous rollup data to a buffer.
    * @returns The buffer of the serialized previous rollup data.
    */ toBuffer() {
-        return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vk, this.vkWitness);
+        return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vkData);
     }
     /**
    * Deserializes previous rollup data from a buffer.
@@ -37,6 +32,6 @@ import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inp
    * @returns A new PreviousRollupData instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PreviousRollupData(reader.readObject(BaseOrMergeRollupPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VerificationKeyAsFields), MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT));
+        return new PreviousRollupData(reader.readObject(BaseOrMergeRollupPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
 }

package/dest/rollup/private_tube_data.d.ts

@@ -2,12 +2,12 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export declare class PrivateTubeData {
     publicInputs: PrivateToRollupKernelCircuitPublicInputs;
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: PrivateToRollupKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkWitnessData);
+    vkData: VkData;
+    constructor(publicInputs: PrivateToRollupKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkData);
     static empty(): PrivateTubeData;
     static fromBuffer(buffer: Buffer | BufferReader): PrivateTubeData;
     toBuffer(): Buffer<ArrayBufferLike>;

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

@@ -1 +1 @@
-{"version":3,"file":"private_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/private_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,eAAe;IAEjB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}
+{"version":3,"file":"private_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/private_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,eAAe;IAEjB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}

package/dest/rollup/private_tube_data.js

@@ -2,7 +2,7 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export class PrivateTubeData {
     publicInputs;
     proof;
@@ -13,11 +13,11 @@ export class PrivateTubeData {
         this.vkData = vkData;
     }
     static empty() {
-        return new PrivateTubeData(PrivateToRollupKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkWitnessData.empty());
+        return new PrivateTubeData(PrivateToRollupKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkData.empty());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateTubeData(reader.readObject(PrivateToRollupKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkWitnessData));
+        return new PrivateTubeData(reader.readObject(PrivateToRollupKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);

package/dest/rollup/public_tube_data.d.ts

@@ -2,12 +2,12 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PrivateToPublicKernelCircuitPublicInputs } from '../kernel/private_to_public_kernel_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export declare class PublicTubeData {
     publicInputs: PrivateToPublicKernelCircuitPublicInputs;
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: PrivateToPublicKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkWitnessData);
+    vkData: VkData;
+    constructor(publicInputs: PrivateToPublicKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkData);
     static empty(): PublicTubeData;
     static fromBuffer(buffer: Buffer | BufferReader): PublicTubeData;
     toBuffer(): Buffer<ArrayBufferLike>;

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

@@ -1 +1 @@
-{"version":3,"file":"public_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/public_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,cAAc;IAEhB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}
+{"version":3,"file":"public_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/public_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,cAAc;IAEhB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}

package/dest/rollup/public_tube_data.js

@@ -2,7 +2,7 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { PrivateToPublicKernelCircuitPublicInputs } from '../kernel/private_to_public_kernel_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export class PublicTubeData {
     publicInputs;
     proof;
@@ -13,11 +13,11 @@ export class PublicTubeData {
         this.vkData = vkData;
     }
     static empty() {
-        return new PublicTubeData(PrivateToPublicKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkWitnessData.empty());
+        return new PublicTubeData(PrivateToPublicKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkData.empty());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicTubeData(reader.readObject(PrivateToPublicKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkWitnessData));
+        return new PublicTubeData(reader.readObject(PrivateToPublicKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);

package/dest/rollup/root_rollup.d.ts

@@ -3,7 +3,6 @@ import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { FeeRecipient } from './block_root_or_block_merge_public_inputs.js';
 import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
 /**
@@ -72,12 +71,10 @@ export declare class RootRollupInputs {
  * NOTE: in practice, we'll hash all of this up into a single public input, for cheap on-chain verification.
  */
 export declare class RootRollupPublicInputs {
-    /** Snapshot of archive tree before/after this rollup been processed */
-    previousArchive: AppendOnlyTreeSnapshot;
-    endArchive: AppendOnlyTreeSnapshot;
-    endTimestamp: Fr;
-    endBlockNumber: Fr;
-    outHash: Fr;
+    /** Root of the archive tree before this rollup is processed */
+    previousArchiveRoot: Fr;
+    /** Root of the archive tree after this rollup is processed */
+    endArchiveRoot: Fr;
     proposedBlockHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>;
     fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>;
     chainId: Fr;
@@ -87,9 +84,11 @@ export declare class RootRollupPublicInputs {
     proverId: Fr;
     blobPublicInputs: Tuple<BlockBlobPublicInputs, typeof AZTEC_MAX_EPOCH_DURATION>;
     constructor(
-    /** Snapshot of archive tree before/after this rollup been processed */
-    previousArchive: AppendOnlyTreeSnapshot, endArchive: AppendOnlyTreeSnapshot, endTimestamp: Fr, endBlockNumber: Fr, outHash: Fr, proposedBlockHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>, fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>, chainId: Fr, version: Fr, vkTreeRoot: Fr, protocolContractTreeRoot: Fr, proverId: Fr, blobPublicInputs: Tuple<BlockBlobPublicInputs, typeof AZTEC_MAX_EPOCH_DURATION>);
-    static getFields(fields: FieldsOf<RootRollupPublicInputs>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, Fr, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient], Fr, Fr, Fr, Fr, Fr, [BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs]];
+    /** Root of the archive tree before this rollup is processed */
+    previousArchiveRoot: Fr, 
+    /** Root of the archive tree after this rollup is processed */
+    endArchiveRoot: Fr, proposedBlockHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>, fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>, chainId: Fr, version: Fr, vkTreeRoot: Fr, protocolContractTreeRoot: Fr, proverId: Fr, blobPublicInputs: Tuple<BlockBlobPublicInputs, typeof AZTEC_MAX_EPOCH_DURATION>);
+    static getFields(fields: FieldsOf<RootRollupPublicInputs>): readonly [Fr, Fr, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient], Fr, Fr, Fr, Fr, Fr, [BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs, BlockBlobPublicInputs]];
     toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     static from(fields: FieldsOf<RootRollupPublicInputs>): RootRollupPublicInputs;

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

@@ -1 +1 @@
-{"version":3,"file":"root_rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/root_rollup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"root_rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/root_rollup.ts"],"names":[],"mappings":"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"}

package/dest/rollup/root_rollup.js

@@ -5,7 +5,6 @@ import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { FeeRecipient } from './block_root_or_block_merge_public_inputs.js';
 import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
 /**
@@ -80,11 +79,8 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
  *
  * NOTE: in practice, we'll hash all of this up into a single public input, for cheap on-chain verification.
  */ export class RootRollupPublicInputs {
-    previousArchive;
-    endArchive;
-    endTimestamp;
-    endBlockNumber;
-    outHash;
+    previousArchiveRoot;
+    endArchiveRoot;
     proposedBlockHeaderHashes;
     fees;
     chainId;
@@ -93,13 +89,9 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
     protocolContractTreeRoot;
     proverId;
     blobPublicInputs;
-    constructor(/** Snapshot of archive tree before/after this rollup been processed */ previousArchive, endArchive, // This is a u64 in nr, but GlobalVariables contains this as a u64 and is mapped to ts as a field, so I'm doing the same here
-    endTimestamp, endBlockNumber, outHash, proposedBlockHeaderHashes, fees, chainId, version, vkTreeRoot, protocolContractTreeRoot, proverId, blobPublicInputs){
-        this.previousArchive = previousArchive;
-        this.endArchive = endArchive;
-        this.endTimestamp = endTimestamp;
-        this.endBlockNumber = endBlockNumber;
-        this.outHash = outHash;
+    constructor(/** Root of the archive tree before this rollup is processed */ previousArchiveRoot, /** Root of the archive tree after this rollup is processed */ endArchiveRoot, proposedBlockHeaderHashes, fees, chainId, version, vkTreeRoot, protocolContractTreeRoot, proverId, blobPublicInputs){
+        this.previousArchiveRoot = previousArchiveRoot;
+        this.endArchiveRoot = endArchiveRoot;
         this.proposedBlockHeaderHashes = proposedBlockHeaderHashes;
         this.fees = fees;
         this.chainId = chainId;
@@ -111,11 +103,8 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
     }
     static getFields(fields) {
         return [
-            fields.previousArchive,
-            fields.endArchive,
-            fields.endTimestamp,
-            fields.endBlockNumber,
-            fields.outHash,
+            fields.previousArchiveRoot,
+            fields.endArchiveRoot,
             fields.proposedBlockHeaderHashes,
             fields.fees,
             fields.chainId,
@@ -141,7 +130,7 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
    * @returns The deserialized `RootRollupPublicInputs` object.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new RootRollupPublicInputs(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readArray(AZTEC_MAX_EPOCH_DURATION, Fr), reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readArray(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs));
+        return new RootRollupPublicInputs(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readArray(AZTEC_MAX_EPOCH_DURATION, Fr), reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readArray(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs));
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -156,6 +145,6 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
         return bufferSchemaFor(RootRollupPublicInputs);
     }
     /** Creates a random instance. */ static random() {
-        return new RootRollupPublicInputs(AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random(), Fr.random(), Fr.random(), Fr.random(), makeTuple(AZTEC_MAX_EPOCH_DURATION, Fr.random), makeTuple(AZTEC_MAX_EPOCH_DURATION, FeeRecipient.random), Fr.random(), Fr.random(), Fr.random(), Fr.random(), Fr.random(), makeTuple(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs.empty));
+        return new RootRollupPublicInputs(Fr.random(), Fr.random(), makeTuple(AZTEC_MAX_EPOCH_DURATION, Fr.random), makeTuple(AZTEC_MAX_EPOCH_DURATION, FeeRecipient.random), Fr.random(), Fr.random(), Fr.random(), Fr.random(), Fr.random(), makeTuple(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs.empty));
     }
 }

package/dest/tests/factories.d.ts

@@ -18,7 +18,7 @@ import { RollupValidationRequests } from '../kernel/hints/rollup_validation_requ
 import { CombinedConstantData, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PrivateToRollupAccumulatedData } from '../kernel/index.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
+import { PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
 import { PublicKeys } from '../keys/index.js';
 import { L2ToL1Message, ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { BaseParityInputs } from '../parity/base_parity_inputs.js';
@@ -155,6 +155,7 @@ export declare function makeGrumpkinScalar(seed?: number): GrumpkinScalar;
  */
 export declare function makeProof(seed?: number): Proof;
 export declare function makePublicCallRequest(seed?: number): PublicCallRequest;
+export declare function makePublicCallRequestArrayLengths(seed?: number): PublicCallRequestArrayLengths;
 /**
  * Makes arbitrary tx request.
  * @param seed - The seed to use for generating the tx request.