@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/proofs/recursive_proof.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { Proof } from './proof.js';
@@ -54,7 +52,7 @@ export declare class RecursiveProof<N extends number> {
      *
      * @returns A Buffer containing the serialized proof data in custom format.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serialize the Proof instance to a hex string.
      * @returns The hex string representation of the proof data.
@@ -67,9 +65,9 @@ export declare class RecursiveProof<N extends number> {
      */
     static fromString<N extends number>(str: string, expectedSize?: N): RecursiveProof<N>;
     /** Returns a buffer representation for JSON serialization. */
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string with expected size. */
-    static schemaFor<N extends number>(expectedSize?: N): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer, string>, import("zod").ZodEffects<import("zod").ZodObject<{
+    static schemaFor<N extends number>(expectedSize?: N): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer<ArrayBuffer>, string>, import("zod").ZodEffects<import("zod").ZodObject<{
         type: import("zod").ZodLiteral<"Buffer">;
         data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
     }, "strip", import("zod").ZodTypeAny, {
@@ -78,7 +76,7 @@ export declare class RecursiveProof<N extends number> {
     }, {
         type: "Buffer";
         data: number[];
-    }>, Buffer, {
+    }>, Buffer<ArrayBuffer>, {
         type: "Buffer";
         data: number[];
     }>]>, RecursiveProof<N>, string | {

package/dest/proofs/recursive_proof.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recursive_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/recursive_proof.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,KAAK,EAAkB,MAAM,YAAY,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,MAAM;IAExC;;OAEG;IACI,KAAK,EAAE,EAAE,EAAE;IAElB;;OAEG;IACI,WAAW,EAAE,KAAK;IACzB;;OAEG;IACI,WAAW,EAAE,OAAO;IACpB,WAAW,EAAE,CAAC;;IAbrB;;OAEG;IACI,KAAK,EAAE,EAAE,EAAE;IAElB;;OAEG;IACI,WAAW,EAAE,KAAK;IACzB;;OAEG;IACI,WAAW,EAAE,OAAO,EACpB,WAAW,EAAE,CAAC;IAOvB;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAcvG;;;;;OAKG;IACI,QAAQ;IAIf;;;OAGG;IACI,QAAQ;IAIf;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAIrF,8DAA8D;IAC9D,MAAM;IAIN,gEAAgE;IAChE,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;CAGpD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,qBAEhE;AAED,wBAAgB,kBAAkB,CAAC,YAAY,SAAS,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,SAAI,gCAO3F;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,SAAS,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,gCAEzG"}
+{"version":3,"file":"recursive_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/recursive_proof.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,KAAK,EAAkB,MAAM,YAAY,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,MAAM;IAExC;;OAEG;IACI,KAAK,EAAE,EAAE,EAAE;IAElB;;OAEG;IACI,WAAW,EAAE,KAAK;IACzB;;OAEG;IACI,WAAW,EAAE,OAAO;IACpB,WAAW,EAAE,CAAC;;IAbrB;;OAEG;IACI,KAAK,EAAE,EAAE,EAAE;IAElB;;OAEG;IACI,WAAW,EAAE,KAAK;IACzB;;OAEG;IACI,WAAW,EAAE,OAAO,EACpB,WAAW,EAAE,CAAC;IAOvB;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAcvG;;;;;OAKG;IACI,QAAQ;IAIf;;;OAGG;IACI,QAAQ;IAIf;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;IAIrF,8DAA8D;IAC9D,MAAM;IAIN,gEAAgE;IAChE,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;CAGpD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,qBAEhE;AAED,wBAAgB,kBAAkB,CAAC,YAAY,SAAS,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,SAAI,gCAO3F;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,SAAS,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,gCAEzG"}

package/dest/rollup/avm_proof_data.d.ts

@@ -1,17 +1,17 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/vk_data.js';
 export declare class AvmProofData {
     publicInputs: AvmCircuitPublicInputs;
-    proof: RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>, vkData: VkWitnessData);
+    proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
+    vkData: VkData;
+    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>, vkData: VkData);
     static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): AvmProofData;
 }
+export declare function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[];
 //# sourceMappingURL=avm_proof_data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,0BAA0B,CAAC;IACxD,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,0BAA0B,CAAC,EACxD,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb"}
+{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC;IAClE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC,EAClE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb;AAGD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}

package/dest/rollup/avm_proof_data.js

@@ -1,8 +1,9 @@
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/vk_data.js';
 export class AvmProofData {
     publicInputs;
     proof;
@@ -14,12 +15,19 @@ export class AvmProofData {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkWitnessData));
+        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
     }
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
     }
     static empty() {
-        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS), VkWitnessData.empty());
+        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED), VkData.empty());
     }
 }
+// TODO(#14234)[Unconditional PIs validation]: remove this function.
+export function enhanceProofWithPiValidationFlag(proof, skipPublicInputsValidation) {
+    const skipPublicInputsField = skipPublicInputsValidation ? new Fr(1) : new Fr(0);
+    return [
+        skipPublicInputsField
+    ].concat(proof).slice(0, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
+}

package/dest/rollup/base_or_merge_rollup_public_inputs.d.ts

@@ -1,19 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { SpongeBlob } from '@aztec/blob-lib';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { RollupTypes } from '../types/shared.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 /**
  * Output of the base and merge rollup circuits.
  */
 export declare class BaseOrMergeRollupPublicInputs {
-    /**
-     * Specifies from which type of rollup circuit these inputs are from.
-     */
-    rollupType: RollupTypes;
     /**
      * Number of txs in this rollup.
      */
@@ -21,7 +14,7 @@ export declare class BaseOrMergeRollupPublicInputs {
     /**
      * Data which is forwarded through the rollup circuits unchanged.
      */
-    constants: ConstantRollupData;
+    constants: BlockConstantData;
     /**
      * Partial state reference at the start of the rollup circuit.
      */
@@ -52,10 +45,6 @@ export declare class BaseOrMergeRollupPublicInputs {
      */
     accumulatedManaUsed: Fr;
     constructor(
-    /**
-     * Specifies from which type of rollup circuit these inputs are from.
-     */
-    rollupType: RollupTypes, 
     /**
      * Number of txs in this rollup.
      */
@@ -63,7 +52,7 @@ export declare class BaseOrMergeRollupPublicInputs {
     /**
      * Data which is forwarded through the rollup circuits unchanged.
      */
-    constants: ConstantRollupData, 
+    constants: BlockConstantData, 
     /**
      * Partial state reference at the start of the rollup circuit.
      */
@@ -106,7 +95,7 @@ export declare class BaseOrMergeRollupPublicInputs {
      * Serialize this as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serialize this as a hex string.
      * @returns - The hex string.
@@ -119,7 +108,7 @@ export declare class BaseOrMergeRollupPublicInputs {
      */
     static fromString(str: string): BaseOrMergeRollupPublicInputs;
     /** Returns a buffer representation for JSON serialization. */
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string. */
     static get schema(): import("zod").ZodType<BaseOrMergeRollupPublicInputs, any, string>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"base_or_merge_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/base_or_merge_rollup_public_inputs.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D;;GAEG;AACH,qBAAa,6BAA6B;IAEtC;;OAEG;IACI,UAAU,EAAE,WAAW;IAC9B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,kBAAkB;IACpC;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,GAAG,EAAE,qBAAqB;IACjC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,aAAa,EAAE,UAAU;IAChC;;;OAGG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,eAAe,EAAE,EAAE;IAC1B;;OAEG;IACI,mBAAmB,EAAE,EAAE;;IAxC9B;;OAEG;IACI,UAAU,EAAE,WAAW;IAC9B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,kBAAkB;IACpC;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,GAAG,EAAE,qBAAqB;IACjC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,aAAa,EAAE,UAAU;IAChC;;;OAGG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,eAAe,EAAE,EAAE;IAC1B;;OAEG;IACI,mBAAmB,EAAE,EAAE;IAGhC,iCAAiC;IACjC,MAAM,CAAC,KAAK;IAeZ;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,6BAA6B;IAgB/E;;;OAGG;IACH,QAAQ;IAmBR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,sEAEhB;CACF"}
+{"version":3,"file":"base_or_merge_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/base_or_merge_rollup_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,6BAA6B;IAEtC;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,GAAG,EAAE,qBAAqB;IACjC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,aAAa,EAAE,UAAU;IAChC;;;OAGG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,eAAe,EAAE,EAAE;IAC1B;;OAEG;IACI,mBAAmB,EAAE,EAAE;;IApC9B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,GAAG,EAAE,qBAAqB;IACjC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,aAAa,EAAE,UAAU;IAChC;;;OAGG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,eAAe,EAAE,EAAE;IAC1B;;OAEG;IACI,mBAAmB,EAAE,EAAE;IAGhC,iCAAiC;IACjC,MAAM,CAAC,KAAK;IAcZ;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,6BAA6B;IAe/E;;;OAGG;IACH,QAAQ;IAkBR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,sEAEhB;CACF"}

package/dest/rollup/base_or_merge_rollup_public_inputs.js

@@ -4,12 +4,10 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { RollupTypes } from '../types/shared.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 /**
  * Output of the base and merge rollup circuits.
  */ export class BaseOrMergeRollupPublicInputs {
-    rollupType;
     numTxs;
     constants;
     start;
@@ -20,8 +18,6 @@ import { ConstantRollupData } from './constant_rollup_data.js';
     accumulatedFees;
     accumulatedManaUsed;
     constructor(/**
-     * Specifies from which type of rollup circuit these inputs are from.
-     */ rollupType, /**
      * Number of txs in this rollup.
      */ numTxs, /**
      * Data which is forwarded through the rollup circuits unchanged.
@@ -41,7 +37,6 @@ import { ConstantRollupData } from './constant_rollup_data.js';
      */ accumulatedFees, /**
      * The summed `mana_used` of the constituent transactions.
      */ accumulatedManaUsed){
-        this.rollupType = rollupType;
         this.numTxs = numTxs;
         this.constants = constants;
         this.start = start;
@@ -53,7 +48,7 @@ import { ConstantRollupData } from './constant_rollup_data.js';
         this.accumulatedManaUsed = accumulatedManaUsed;
     }
     /** Returns an empty instance. */ static empty() {
-        return new BaseOrMergeRollupPublicInputs(RollupTypes.Base, 0, ConstantRollupData.empty(), PartialStateReference.empty(), PartialStateReference.empty(), SpongeBlob.empty(), SpongeBlob.empty(), Fr.zero(), Fr.zero(), Fr.zero());
+        return new BaseOrMergeRollupPublicInputs(0, BlockConstantData.empty(), PartialStateReference.empty(), PartialStateReference.empty(), SpongeBlob.empty(), SpongeBlob.empty(), Fr.zero(), Fr.zero(), Fr.zero());
     }
     /**
    * Deserializes from a buffer or reader.
@@ -62,13 +57,13 @@ import { ConstantRollupData } from './constant_rollup_data.js';
    * @returns The deserialized public inputs.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BaseOrMergeRollupPublicInputs(reader.readNumber(), reader.readNumber(), reader.readObject(ConstantRollupData), reader.readObject(PartialStateReference), reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(SpongeBlob), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader));
+        return new BaseOrMergeRollupPublicInputs(reader.readNumber(), reader.readObject(BlockConstantData), reader.readObject(PartialStateReference), reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(SpongeBlob), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader));
     }
     /**
    * Serialize this as a buffer.
    * @returns The buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.rollupType, this.numTxs, this.constants, this.start, this.end, this.startSpongeBlob, this.endSpongeBlob, this.outHash, this.accumulatedFees, this.accumulatedManaUsed);
+        return serializeToBuffer(this.numTxs, this.constants, this.start, this.end, this.startSpongeBlob, this.endSpongeBlob, this.outHash, this.accumulatedFees, this.accumulatedManaUsed);
     }
     /**
    * Serialize this as a hex string.

package/dest/rollup/base_rollup_hints.d.ts

@@ -1,14 +1,13 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { SpongeBlob } from '@aztec/blob-lib';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { PublicDataHint } from '../avm/public_data_hint.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLogFields } from '../logs/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/index.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
 export declare class PrivateBaseRollupHints {
@@ -35,11 +34,11 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, 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.
      */
-    constants: ConstantRollupData;
+    constants: BlockConstantData;
     constructor(
     /**
      * Partial state reference at the start of the rollup.
@@ -64,18 +63,18 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, 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.
      */
-    constants: ConstantRollupData);
+    constants: BlockConstantData);
     static from(fields: FieldsOf<PrivateBaseRollupHints>): PrivateBaseRollupHints;
-    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, PrivateBaseStateDiffHints, PublicDataHint, MembershipWitness<29>, [ContractClassLog], ConstantRollupData];
+    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, PrivateBaseStateDiffHints, PublicDataHint, MembershipWitness<29>, [ContractClassLogFields], BlockConstantData];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serializes the inputs to a hex string.
      * @returns The instance serialized to a hex string.
@@ -90,6 +89,10 @@ export declare class PublicBaseRollupHints {
      * Sponge state to absorb blob inputs at the start of the rollup.
      */
     startSpongeBlob: SpongeBlob;
+    /**
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
+     */
+    lastArchive: AppendOnlyTreeSnapshot;
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
@@ -97,16 +100,16 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
-    /**
-     * Data which is not modified by the base rollup circuit.
-     */
-    constants: ConstantRollupData;
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     constructor(
     /**
      * Sponge state to absorb blob inputs at the start of the rollup.
      */
     startSpongeBlob: SpongeBlob, 
+    /**
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
+     */
+    lastArchive: AppendOnlyTreeSnapshot, 
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
@@ -114,18 +117,14 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
-    /**
-     * Data which is not modified by the base rollup circuit.
-     */
-    constants: ConstantRollupData);
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>);
     static from(fields: FieldsOf<PublicBaseRollupHints>): PublicBaseRollupHints;
-    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, MembershipWitness<29>, [ContractClassLog], ConstantRollupData];
+    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, AppendOnlyTreeSnapshot, MembershipWitness<29>, [ContractClassLogFields]];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serializes the inputs to a hex string.
      * @returns The instance serialized to a hex string.

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

@@ -5,9 +5,10 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import { PublicDataHint } from '../avm/public_data_hint.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLogFields } from '../logs/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/index.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
 export class PrivateBaseRollupHints {
     start;
@@ -15,7 +16,7 @@ export class PrivateBaseRollupHints {
     stateDiffHints;
     feePayerFeeJuiceBalanceReadHint;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Partial state reference at the start of the rollup.
@@ -29,7 +30,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 +38,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 +51,7 @@ export class PrivateBaseRollupHints {
             fields.stateDiffHints,
             fields.feePayerFeeJuiceBalanceReadHint,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.contractClassLogsFields,
             fields.constants
         ];
     }
@@ -68,33 +69,33 @@ export class PrivateBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(PrivateBaseStateDiffHints), reader.readObject(PublicDataHint), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog), reader.readObject(ConstantRollupData));
+        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(PrivateBaseStateDiffHints), reader.readObject(PublicDataHint), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(BlockConstantData));
     }
     static fromString(str) {
         return PrivateBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), PrivateBaseStateDiffHints.empty(), PublicDataHint.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.empty), ConstantRollupData.empty());
+        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), PrivateBaseStateDiffHints.empty(), PublicDataHint.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
     }
 }
 export class PublicBaseRollupHints {
     startSpongeBlob;
+    lastArchive;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
-    constants;
+    contractClassLogsFields;
     constructor(/**
      * Sponge state to absorb blob inputs at the start of the rollup.
      */ startSpongeBlob, /**
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
+     */ lastArchive, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
-     * Data which is not modified by the base rollup circuit.
-     */ constants){
+     */ contractClassLogsFields){
         this.startSpongeBlob = startSpongeBlob;
+        this.lastArchive = lastArchive;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
-        this.constants = constants;
+        this.contractClassLogsFields = contractClassLogsFields;
     }
     static from(fields) {
         return new PublicBaseRollupHints(...PublicBaseRollupHints.getFields(fields));
@@ -102,9 +103,9 @@ export class PublicBaseRollupHints {
     static getFields(fields) {
         return [
             fields.startSpongeBlob,
+            fields.lastArchive,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
-            fields.constants
+            fields.contractClassLogsFields
         ];
     }
     /**
@@ -121,12 +122,12 @@ export class PublicBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog), reader.readObject(ConstantRollupData));
+        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), reader.readObject(AppendOnlyTreeSnapshot), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)));
     }
     static fromString(str) {
         return PublicBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PublicBaseRollupHints(SpongeBlob.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.empty), ConstantRollupData.empty());
+        return new PublicBaseRollupHints(SpongeBlob.empty(), AppendOnlyTreeSnapshot.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty));
     }
 }

package/dest/rollup/block_constant_data.d.ts

@@ -0,0 +1,37 @@
+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';
+/**
+ * Constants that are the same for the entire block.
+ */
+export declare class BlockConstantData {
+    /** Archive tree snapshot at the very beginning of the entire rollup. */
+    lastArchive: AppendOnlyTreeSnapshot;
+    /** L1 to L2 message tree snapshot after this block lands. */
+    newL1ToL2: 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, 
+    /** L1 to L2 message tree snapshot after this block lands. */
+    newL1ToL2: 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<BlockConstantData>): BlockConstantData;
+    static fromBuffer(buffer: Buffer | BufferReader): BlockConstantData;
+    static getFields(fields: FieldsOf<BlockConstantData>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables];
+    static empty(): BlockConstantData;
+    toBuffer(): Buffer<ArrayBufferLike>;
+}
+//# sourceMappingURL=block_constant_data.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"block_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/block_constant_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,iBAAiB;IAE1B,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,6DAA6D;IACtD,SAAS,EAAE,sBAAsB;IACxC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;;IATvC,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,6DAA6D;IACtD,SAAS,EAAE,sBAAsB;IACxC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IAGzC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAWnE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAUpD,MAAM,CAAC,KAAK;IAUZ,QAAQ;CAGT"}

package/dest/rollup/{constant_rollup_data.js → block_constant_data.js}

@@ -3,43 +3,40 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 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 {
+ * Constants that are the same for the entire block.
+ */ export class BlockConstantData {
     lastArchive;
+    newL1ToL2;
     vkTreeRoot;
     protocolContractTreeRoot;
     globalVariables;
-    constructor(/** Archive tree snapshot at the very beginning of the entire rollup. */ lastArchive, /**
-     * Root of the verification key tree.
-     */ vkTreeRoot, /**
-     * Root of the protocol contract tree.
-     */ protocolContractTreeRoot, /**
-     * Global variables for the block
-     */ globalVariables){
+    constructor(/** Archive tree snapshot at the very beginning of the entire rollup. */ lastArchive, /** L1 to L2 message tree snapshot after this block lands. */ newL1ToL2, /** Root of the verification key tree. */ vkTreeRoot, /** Root of the protocol contract tree. */ protocolContractTreeRoot, /** Global variables for the block. */ globalVariables){
         this.lastArchive = lastArchive;
+        this.newL1ToL2 = newL1ToL2;
         this.vkTreeRoot = vkTreeRoot;
         this.protocolContractTreeRoot = protocolContractTreeRoot;
         this.globalVariables = globalVariables;
     }
     static from(fields) {
-        return new ConstantRollupData(...ConstantRollupData.getFields(fields));
+        return new BlockConstantData(...BlockConstantData.getFields(fields));
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new ConstantRollupData(reader.readObject(AppendOnlyTreeSnapshot), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(GlobalVariables));
+        return new BlockConstantData(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(GlobalVariables));
     }
     static getFields(fields) {
         return [
             fields.lastArchive,
+            fields.newL1ToL2,
             fields.vkTreeRoot,
             fields.protocolContractTreeRoot,
             fields.globalVariables
         ];
     }
     static empty() {
-        return new ConstantRollupData(AppendOnlyTreeSnapshot.zero(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
+        return new BlockConstantData(AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
     }
     toBuffer() {
-        return serializeToBuffer(...ConstantRollupData.getFields(this));
+        return serializeToBuffer(...BlockConstantData.getFields(this));
     }
 }

package/dest/rollup/block_merge_rollup.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
 /**
@@ -19,7 +17,7 @@ export declare class BlockMergeRollupInputs {
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serializes the inputs to a hex string.
      * @returns The instance serialized to a hex string.
@@ -38,7 +36,7 @@ export declare class BlockMergeRollupInputs {
      */
     static fromString(str: string): BlockMergeRollupInputs;
     /** Returns a hex representation for JSON serialization. */
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string. */
     static get schema(): import("zod").ZodType<BlockMergeRollupInputs, any, string>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"block_merge_rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/block_merge_rollup.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;GAEG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,kBAAkB,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;;IAH7E;;OAEG;IACI,kBAAkB,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAG/E;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,2DAA2D;IAC3D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,+DAEhB;CACF"}
+{"version":3,"file":"block_merge_rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/block_merge_rollup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;GAEG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,kBAAkB,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;;IAH7E;;OAEG;IACI,kBAAkB,EAAE,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAG/E;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,2DAA2D;IAC3D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,+DAEhB;CACF"}