@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.023c3e5

package/dest/proofs/proving_request_type.d.ts

@@ -1,16 +1,21 @@
 export declare enum ProvingRequestType {
     PUBLIC_VM = 0,
-    PRIVATE_BASE_ROLLUP = 1,
-    PUBLIC_BASE_ROLLUP = 2,
-    MERGE_ROLLUP = 3,
-    EMPTY_BLOCK_ROOT_ROLLUP = 4,
-    BLOCK_ROOT_ROLLUP = 5,
-    SINGLE_TX_BLOCK_ROOT_ROLLUP = 6,
-    BLOCK_MERGE_ROLLUP = 7,
-    ROOT_ROLLUP = 8,
-    BASE_PARITY = 9,
-    ROOT_PARITY = 10,
-    /** Recursive Client IVC verification to connect private to public or rollup */
-    TUBE_PROOF = 11
+    PUBLIC_CHONK_VERIFIER = 1,
+    PRIVATE_TX_BASE_ROLLUP = 2,
+    PUBLIC_TX_BASE_ROLLUP = 3,
+    TX_MERGE_ROLLUP = 4,
+    BLOCK_ROOT_FIRST_ROLLUP = 5,
+    BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP = 6,
+    BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP = 7,
+    BLOCK_ROOT_ROLLUP = 8,
+    BLOCK_ROOT_SINGLE_TX_ROLLUP = 9,
+    BLOCK_MERGE_ROLLUP = 10,
+    CHECKPOINT_ROOT_ROLLUP = 11,
+    CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP = 12,
+    CHECKPOINT_PADDING_ROLLUP = 13,
+    CHECKPOINT_MERGE_ROLLUP = 14,
+    ROOT_ROLLUP = 15,
+    PARITY_BASE = 16,
+    PARITY_ROOT = 17
 }
-//# sourceMappingURL=proving_request_type.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19yZXF1ZXN0X3R5cGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm9vZnMvcHJvdmluZ19yZXF1ZXN0X3R5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQVksa0JBQWtCO0lBQzVCLFNBQVMsSUFBQTtJQUNULHFCQUFxQixJQUFBO0lBRXJCLHNCQUFzQixJQUFBO0lBQ3RCLHFCQUFxQixJQUFBO0lBQ3JCLGVBQWUsSUFBQTtJQUNmLHVCQUF1QixJQUFBO0lBQ3ZCLGlDQUFpQyxJQUFBO0lBQ2pDLGdDQUFnQyxJQUFBO0lBQ2hDLGlCQUFpQixJQUFBO0lBQ2pCLDJCQUEyQixJQUFBO0lBQzNCLGtCQUFrQixLQUFBO0lBQ2xCLHNCQUFzQixLQUFBO0lBQ3RCLG1DQUFtQyxLQUFBO0lBQ25DLHlCQUF5QixLQUFBO0lBQ3pCLHVCQUF1QixLQUFBO0lBQ3ZCLFdBQVcsS0FBQTtJQUVYLFdBQVcsS0FBQTtJQUNYLFdBQVcsS0FBQTtDQUNaIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IAET,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,YAAY,IAAA;IACZ,uBAAuB,IAAA;IACvB,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,WAAW,IAAA;IAEX,WAAW,IAAA;IACX,WAAW,KAAA;IACX,+EAA+E;IAC/E,UAAU,KAAA;CACX"}
+{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IACT,qBAAqB,IAAA;IAErB,sBAAsB,IAAA;IACtB,qBAAqB,IAAA;IACrB,eAAe,IAAA;IACf,uBAAuB,IAAA;IACvB,iCAAiC,IAAA;IACjC,gCAAgC,IAAA;IAChC,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,KAAA;IAClB,sBAAsB,KAAA;IACtB,mCAAmC,KAAA;IACnC,yBAAyB,KAAA;IACzB,uBAAuB,KAAA;IACvB,WAAW,KAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;CACZ"}

package/dest/proofs/proving_request_type.js

@@ -1,15 +1,21 @@
 export var ProvingRequestType = /*#__PURE__*/ function(ProvingRequestType) {
     ProvingRequestType[ProvingRequestType["PUBLIC_VM"] = 0] = "PUBLIC_VM";
-    ProvingRequestType[ProvingRequestType["PRIVATE_BASE_ROLLUP"] = 1] = "PRIVATE_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PUBLIC_BASE_ROLLUP"] = 2] = "PUBLIC_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["MERGE_ROLLUP"] = 3] = "MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["EMPTY_BLOCK_ROOT_ROLLUP"] = 4] = "EMPTY_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 5] = "BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["SINGLE_TX_BLOCK_ROOT_ROLLUP"] = 6] = "SINGLE_TX_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 7] = "BLOCK_MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 8] = "ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BASE_PARITY"] = 9] = "BASE_PARITY";
-    ProvingRequestType[ProvingRequestType["ROOT_PARITY"] = 10] = "ROOT_PARITY";
-    /** Recursive Client IVC verification to connect private to public or rollup */ ProvingRequestType[ProvingRequestType["TUBE_PROOF"] = 11] = "TUBE_PROOF";
+    ProvingRequestType[ProvingRequestType["PUBLIC_CHONK_VERIFIER"] = 1] = "PUBLIC_CHONK_VERIFIER";
+    ProvingRequestType[ProvingRequestType["PRIVATE_TX_BASE_ROLLUP"] = 2] = "PRIVATE_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PUBLIC_TX_BASE_ROLLUP"] = 3] = "PUBLIC_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["TX_MERGE_ROLLUP"] = 4] = "TX_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_FIRST_ROLLUP"] = 5] = "BLOCK_ROOT_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP"] = 6] = "BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP"] = 7] = "BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 8] = "BLOCK_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_ROLLUP"] = 9] = "BLOCK_ROOT_SINGLE_TX_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 10] = "BLOCK_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_ROLLUP"] = 11] = "CHECKPOINT_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP"] = 12] = "CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_PADDING_ROLLUP"] = 13] = "CHECKPOINT_PADDING_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_MERGE_ROLLUP"] = 14] = "CHECKPOINT_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 15] = "ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PARITY_BASE"] = 16] = "PARITY_BASE";
+    ProvingRequestType[ProvingRequestType["PARITY_ROOT"] = 17] = "PARITY_ROOT";
     return ProvingRequestType;
 }({});

package/dest/proofs/recursive_proof.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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,24 +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<{
-        type: import("zod").ZodLiteral<"Buffer">;
-        data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
-    }, "strip", import("zod").ZodTypeAny, {
-        type: "Buffer";
-        data: number[];
-    }, {
-        type: "Buffer";
-        data: number[];
-    }>, Buffer, {
-        type: "Buffer";
-        data: number[];
-    }>]>, RecursiveProof<N>, string | {
-        type: "Buffer";
-        data: number[];
-    }>;
+    static schemaFor<N extends number>(expectedSize?: N): import("zod").ZodEffects<import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>, RecursiveProof<N>, any>;
 }
 /**
  * Makes an empty proof.
@@ -98,4 +81,4 @@ export declare function makeRecursiveProof<PROOF_LENGTH extends number>(size: PR
  * @returns The proof object
  */
 export declare function makeRecursiveProofFromBinary<PROOF_LENGTH extends number>(proof: Proof, size: PROOF_LENGTH): RecursiveProof<PROOF_LENGTH>;
-//# sourceMappingURL=recursive_proof.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjdXJzaXZlX3Byb29mLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvb2ZzL3JlY3Vyc2l2ZV9wcm9vZi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RSxPQUFPLEVBQUUsS0FBSyxFQUFrQixNQUFNLFlBQVksQ0FBQztBQUVuRDs7Ozs7Ozs7O0dBU0c7QUFDSCxxQkFBYSxjQUFjLENBQUMsQ0FBQyxTQUFTLE1BQU07SUFFeEM7O09BRUc7SUFDSSxLQUFLLEVBQUUsRUFBRSxFQUFFO0lBRWxCOztPQUVHO0lBQ0ksV0FBVyxFQUFFLEtBQUs7SUFDekI7O09BRUc7SUFDSSxXQUFXLEVBQUUsT0FBTztJQUNwQixXQUFXLEVBQUUsQ0FBQztJQWR2QjtJQUNFOztPQUVHO0lBQ0ksS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUVsQjs7T0FFRztJQUNJLFdBQVcsRUFBRSxLQUFLO0lBQ3pCOztPQUVHO0lBQ0ksV0FBVyxFQUFFLE9BQU8sRUFDcEIsV0FBVyxFQUFFLENBQUMsRUFLdEI7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsU0FBUyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FZdEc7SUFFRDs7Ozs7T0FLRztJQUNJLFFBQVEsNEJBRWQ7SUFFRDs7O09BR0c7SUFDSSxRQUFRLGtCQUVkO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxTQUFTLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLFlBQVksQ0FBQyxFQUFFLENBQUMsR0FBRyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBRXBGO0lBRUQsOERBQThEO0lBQzlELE1BQU0sNEJBRUw7SUFFRCxnRUFBZ0U7SUFDaEUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFNBQVMsTUFBTSxFQUFFLFlBQVksQ0FBQyxFQUFFLENBQUMseUhBRWxEO0NBQ0Y7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLHVCQUF1QixDQUFDLENBQUMsU0FBUyxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMscUJBRWhFO0FBRUQsd0JBQWdCLGtCQUFrQixDQUFDLFlBQVksU0FBUyxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxJQUFJLFNBQUksZ0NBTzNGO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLDRCQUE0QixDQUFDLFlBQVksU0FBUyxNQUFNLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsWUFBWSxnQ0FFekcifQ==

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,gCAAgC,CAAC;AAEpD,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;IAdvB;IACE;;OAEG;IACI,KAAK,EAAE,EAAE,EAAE;IAElB;;OAEG;IACI,WAAW,EAAE,KAAK;IACzB;;OAEG;IACI,WAAW,EAAE,OAAO,EACpB,WAAW,EAAE,CAAC,EAKtB;IAED;;;;;;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,CAYtG;IAED;;;;;OAKG;IACI,QAAQ,4BAEd;IAED;;;OAGG;IACI,QAAQ,kBAEd;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAEpF;IAED,8DAA8D;IAC9D,MAAM,4BAEL;IAED,gEAAgE;IAChE,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,yHAElD;CACF;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/proofs/recursive_proof.js

@@ -1,5 +1,5 @@
 import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';

package/dest/rollup/avm_proof_data.d.ts

@@ -1,17 +1,5 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
-import { BufferReader } from '@aztec/foundation/serialize';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_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);
-    static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
-    toBuffer(): Buffer;
-    static empty(): AvmProofData;
-}
-//# sourceMappingURL=avm_proof_data.d.ts.map
+import type { ProofDataForFixedVk } from '../proofs/proof_data.js';
+export type AvmProofData = ProofDataForFixedVk<AvmCircuitPublicInputs, typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3Byb29mX2RhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvYXZtX3Byb29mX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9DQUFvQyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRSxNQUFNLE1BQU0sWUFBWSxHQUFHLG1CQUFtQixDQUFDLHNCQUFzQixFQUFFLE9BQU8sb0NBQW9DLENBQUMsQ0FBQyJ9

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;AAExE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,MAAM,MAAM,YAAY,GAAG,mBAAmB,CAAC,sBAAsB,EAAE,OAAO,oCAAoC,CAAC,CAAC"}

package/dest/rollup/avm_proof_data.js

@@ -1,25 +1 @@
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
-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';
-export class AvmProofData {
-    publicInputs;
-    proof;
-    vkData;
-    constructor(publicInputs, proof, vkData){
-        this.publicInputs = publicInputs;
-        this.proof = proof;
-        this.vkData = vkData;
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkWitnessData));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
-    }
-    static empty() {
-        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS), VkWitnessData.empty());
-    }
-}
+export { };

package/dest/rollup/base_rollup_hints.d.ts

@@ -1,15 +1,14 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { BlockConstantData } from './block_constant_data.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
 export declare class PrivateBaseRollupHints {
     /**
@@ -23,23 +22,23 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints;
+    treeSnapshotDiffHints: TreeSnapshotDiffHints;
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint;
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage;
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
      * 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.
@@ -52,30 +51,30 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints, 
+    treeSnapshotDiffHints: TreeSnapshotDiffHints, 
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint, 
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage, 
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
      * 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, TreeSnapshotDiffHints, PublicDataTreeLeafPreimage, [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], [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.
@@ -91,41 +90,41 @@ export declare class PublicBaseRollupHints {
      */
     startSpongeBlob: SpongeBlob;
     /**
-     * Membership witnesses of blocks referred by each of the 2 kernels.
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    lastArchive: AppendOnlyTreeSnapshot;
     /**
-     * Preimages to the kernel's contractClassLogsHashes.
+     * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
-     * Data which is not modified by the base rollup circuit.
+     * Preimages to the kernel's contractClassLogsHashes.
      */
-    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, 
     /**
-     * Membership witnesses of blocks referred by each of the 2 kernels.
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    lastArchive: AppendOnlyTreeSnapshot, 
     /**
-     * Preimages to the kernel's contractClassLogsHashes.
+     * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLog, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
-     * Data which is not modified by the base rollup circuit.
+     * Preimages to the kernel's contractClassLogsHashes.
      */
-    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, [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], [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.
@@ -135,4 +134,4 @@ export declare class PublicBaseRollupHints {
     static fromString(str: string): PublicBaseRollupHints;
     static empty(): PublicBaseRollupHints;
 }
-//# sourceMappingURL=base_rollup_hints.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9yb2xsdXBfaGludHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvYmFzZV9yb2xsdXBfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxjQUFjLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVsRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxLQUFLLEtBQUssRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUxRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMxRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN6RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RSxNQUFNLE1BQU0sZUFBZSxHQUFHLHNCQUFzQixHQUFHLHFCQUFxQixDQUFDO0FBRTdFLHFCQUFhLHNCQUFzQjtJQUUvQjs7T0FFRztJQUNJLEtBQUssRUFBRSxxQkFBcUI7SUFDbkM7O09BRUc7SUFDSSxlQUFlLEVBQUUsVUFBVTtJQUNsQzs7T0FFRztJQUNJLHFCQUFxQixFQUFFLHFCQUFxQjtJQUNuRDs7T0FFRztJQUNJLDJCQUEyQixFQUFFLDBCQUEwQjtJQUM5RDs7T0FFRztJQUNJLDZCQUE2QixFQUFFLEtBQUssQ0FBQyxF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

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

@@ -1,21 +1,22 @@
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { BlockConstantData } from './block_constant_data.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export class PrivateBaseRollupHints {
     start;
     startSpongeBlob;
-    stateDiffHints;
-    feePayerFeeJuiceBalanceReadHint;
-    archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    treeSnapshotDiffHints;
+    feePayerBalanceLeafPreimage;
+    anchorBlockArchiveSiblingPath;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Partial state reference at the start of the rollup.
@@ -23,21 +24,21 @@ export class PrivateBaseRollupHints {
      * Sponge state to absorb blob inputs at the start of the rollup.
      */ startSpongeBlob, /**
      * Hints used while proving state diff validity.
-     */ stateDiffHints, /**
-     * Public data read hint for accessing the balance of the fee payer.
-     */ feePayerFeeJuiceBalanceReadHint, /**
+     */ treeSnapshotDiffHints, /**
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
+     */ feePayerBalanceLeafPreimage, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
-     */ archiveRootMembershipWitness, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
+     */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.start = start;
         this.startSpongeBlob = startSpongeBlob;
-        this.stateDiffHints = stateDiffHints;
-        this.feePayerFeeJuiceBalanceReadHint = feePayerFeeJuiceBalanceReadHint;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
+        this.treeSnapshotDiffHints = treeSnapshotDiffHints;
+        this.feePayerBalanceLeafPreimage = feePayerBalanceLeafPreimage;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
+        this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
     static from(fields) {
@@ -47,10 +48,10 @@ export class PrivateBaseRollupHints {
         return [
             fields.start,
             fields.startSpongeBlob,
-            fields.stateDiffHints,
-            fields.feePayerFeeJuiceBalanceReadHint,
-            fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.treeSnapshotDiffHints,
+            fields.feePayerBalanceLeafPreimage,
+            fields.anchorBlockArchiveSiblingPath,
+            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(TreeSnapshotDiffHints), reader.readObject(PublicDataTreeLeafPreimage), reader.readArray(ARCHIVE_HEIGHT, Fr), 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(), TreeSnapshotDiffHints.empty(), PublicDataTreeLeafPreimage.empty(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
     }
 }
 export class PublicBaseRollupHints {
     startSpongeBlob;
-    archiveRootMembershipWitness;
-    contractClassLogsPreimages;
-    constants;
+    lastArchive;
+    anchorBlockArchiveSiblingPath;
+    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, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
-     * Data which is not modified by the base rollup circuit.
-     */ constants){
+     */ contractClassLogsFields){
         this.startSpongeBlob = startSpongeBlob;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
-        this.constants = constants;
+        this.lastArchive = lastArchive;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
+        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.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
-            fields.constants
+            fields.lastArchive,
+            fields.anchorBlockArchiveSiblingPath,
+            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), reader.readArray(ARCHIVE_HEIGHT, Fr), 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(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty));
     }
 }

package/dest/rollup/block_constant_data.d.ts

@@ -0,0 +1,51 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+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.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */
+    l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot;
+    /** Root of the verification key tree. */
+    vkTreeRoot: Fr;
+    /** Hash of the protocol contracts list. */
+    protocolContractsHash: Fr;
+    /** Global variables for the block. */
+    globalVariables: GlobalVariables;
+    /** Identifier of the prover. */
+    proverId: Fr;
+    constructor(
+    /** Archive tree snapshot at the very beginning of the entire rollup. */
+    lastArchive: AppendOnlyTreeSnapshot, 
+    /**
+     * L1-to-L2 message tree snapshot after this block lands.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */
+    l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot, 
+    /** Root of the verification key tree. */
+    vkTreeRoot: Fr, 
+    /** Hash of the protocol contracts list. */
+    protocolContractsHash: Fr, 
+    /** Global variables for the block. */
+    globalVariables: GlobalVariables, 
+    /** Identifier of the prover. */
+    proverId: Fr);
+    static from(fields: FieldsOf<BlockConstantData>): BlockConstantData;
+    static fromBuffer(buffer: Buffer | BufferReader): BlockConstantData;
+    static getFields(fields: FieldsOf<BlockConstantData>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables, Fr];
+    static empty(): BlockConstantData;
+    toBuffer(): Buffer<ArrayBufferLike>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfY29uc3RhbnRfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JvbGx1cC9ibG9ja19jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RDs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjtJQUUxQix3RUFBd0U7SUFDakUsV0FBVyxFQUFFLHNCQUFzQjtJQUMxQzs7Ozs7T0FLRztJQUNJLGtCQUFrQixFQUFFLHNCQUFzQjtJQUNqRCx5Q0FBeUM7SUFDbEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsMkNBQTJDO0lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7SUFDaEMsc0NBQXNDO0lBQy9CLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLGdDQUFnQztJQUN6QixRQUFRLEVBQUUsRUFBRTtJQWpCckI7SUFDRSx3RUFBd0U7SUFDakUsV0FBVyxFQUFFLHNCQUFzQjtJQUMxQzs7Ozs7T0FLRztJQUNJLGtCQUFrQixFQUFFLHNCQUFzQjtJQUNqRCx5Q0FBeUM7SUFDbEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsMkNBQTJDO0lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7SUFDaEMsc0NBQXNDO0lBQy9CLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLGdDQUFnQztJQUN6QixRQUFRLEVBQUUsRUFBRSxFQUNqQjtJQUVKLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLGlCQUFpQixDQUVsRTtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsaUJBQWlCLENBVWxFO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGlCQUFpQixDQUFDLDBGQVNuRDtJQUVELE1BQU0sQ0FBQyxLQUFLLHNCQVNYO0lBRUQsUUFBUSw0QkFFUDtDQUNGIn0=

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,gCAAgC,CAAC;AACpD,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;;;;;OAKG;IACI,kBAAkB,EAAE,sBAAsB;IACjD,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IACvC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IAjBrB;IACE,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C;;;;;OAKG;IACI,kBAAkB,EAAE,sBAAsB;IACjD,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IACvC,gCAAgC;IACzB,QAAQ,EAAE,EAAE,EACjB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAElE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAUlE;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,0FASnD;IAED,MAAM,CAAC,KAAK,sBASX;IAED,QAAQ,4BAEP;CACF"}