@aztec/stdlib 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/rollup/tree_snapshot_diff_hints.js

@@ -0,0 +1,75 @@
+import { MAX_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { NullifierLeafPreimage } from '../trees/index.js';
+/**
+ * Hints used while proving state diff validity for the private base rollup.
+ */ export class TreeSnapshotDiffHints {
+    noteHashSubtreeRootSiblingPath;
+    nullifierPredecessorPreimages;
+    nullifierPredecessorMembershipWitnesses;
+    sortedNullifiers;
+    sortedNullifierIndexes;
+    nullifierSubtreeRootSiblingPath;
+    feePayerBalanceMembershipWitness;
+    constructor(/**
+     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
+     */ noteHashSubtreeRootSiblingPath, /**
+     * The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
+     * See `StandardIndexedTree.batchInsert` function for more details.
+     */ nullifierPredecessorPreimages, /**
+     * Membership witnesses for the nullifiers which need to be updated to perform the batch insertion of the new
+     * nullifiers.
+     */ nullifierPredecessorMembershipWitnesses, /**
+     * The nullifiers to be inserted in the tree, sorted high to low.
+     */ sortedNullifiers, /**
+     * The indexes of the sorted nullifiers to the original ones.
+     */ sortedNullifierIndexes, /**
+     * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
+     */ nullifierSubtreeRootSiblingPath, /**
+     * Membership witness for the fee payer's balance leaf in the public data tree.
+     */ feePayerBalanceMembershipWitness){
+        this.noteHashSubtreeRootSiblingPath = noteHashSubtreeRootSiblingPath;
+        this.nullifierPredecessorPreimages = nullifierPredecessorPreimages;
+        this.nullifierPredecessorMembershipWitnesses = nullifierPredecessorMembershipWitnesses;
+        this.sortedNullifiers = sortedNullifiers;
+        this.sortedNullifierIndexes = sortedNullifierIndexes;
+        this.nullifierSubtreeRootSiblingPath = nullifierSubtreeRootSiblingPath;
+        this.feePayerBalanceMembershipWitness = feePayerBalanceMembershipWitness;
+    }
+    static from(fields) {
+        return new TreeSnapshotDiffHints(...TreeSnapshotDiffHints.getFields(fields));
+    }
+    static getFields(fields) {
+        return [
+            fields.noteHashSubtreeRootSiblingPath,
+            fields.nullifierPredecessorPreimages,
+            fields.nullifierPredecessorMembershipWitnesses,
+            fields.sortedNullifiers,
+            fields.sortedNullifierIndexes,
+            fields.nullifierSubtreeRootSiblingPath,
+            fields.feePayerBalanceMembershipWitness
+        ];
+    }
+    /**
+   * Serializes the state diff hints to a buffer.
+   * @returns A buffer of the serialized state diff hints.
+   */ toBuffer() {
+        return serializeToBuffer(...TreeSnapshotDiffHints.getFields(this));
+    }
+    /**
+   * Deserializes the state diff hints from a buffer.
+   * @param buffer - A buffer to deserialize from.
+   * @returns A new TreeSnapshotDiffHints instance.
+   */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new TreeSnapshotDiffHints(reader.readArray(NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr), reader.readArray(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage), reader.readArray(MAX_NULLIFIERS_PER_TX, {
+            fromBuffer: (buffer)=>MembershipWitness.fromBuffer(buffer, NULLIFIER_TREE_HEIGHT)
+        }), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readNumbers(MAX_NULLIFIERS_PER_TX), reader.readArray(NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr), MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT));
+    }
+    static empty() {
+        return new TreeSnapshotDiffHints(makeTuple(NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage.empty), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>MembershipWitness.empty(NULLIFIER_TREE_HEIGHT)), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>0), makeTuple(NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr.zero), MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT));
+    }
+}

package/dest/rollup/tx_merge_rollup_private_inputs.d.ts

@@ -0,0 +1,44 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
+/**
+ * Represents inputs of the merge rollup circuit.
+ */
+export declare class TxMergeRollupPrivateInputs {
+    /**
+     * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
+     */
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>];
+    constructor(
+    /**
+     * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
+     */
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>]);
+    /**
+     * Serializes the inputs to a buffer.
+     * @returns The inputs serialized to a buffer.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    /**
+     * Serializes the inputs to a hex string.
+     * @returns The instance serialized to a hex string.
+     */
+    toString(): `0x${string}`;
+    /**
+     * Deserializes the inputs from a buffer.
+     * @param buffer - The buffer to deserialize from.
+     * @returns A new TxMergeRollupPrivateInputs instance.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): TxMergeRollupPrivateInputs;
+    /**
+     * Deserializes the inputs from a hex string.
+     * @param str - A hex string to deserialize from.
+     * @returns A new TxMergeRollupPrivateInputs instance.
+     */
+    static fromString(str: string): TxMergeRollupPrivateInputs;
+    /** Returns a buffer representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a string. */
+    static get schema(): import("zod").ZodType<TxMergeRollupPrivateInputs, any, string>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWVyZ2Vfcm9sbHVwX3ByaXZhdGVfaW5wdXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm9sbHVwL3R4X21lcmdlX3JvbGx1cF9wcml2YXRlX2lucHV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzlFLE9BQU8sRUFBYSxLQUFLLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFcEU7O0dBRUc7QUFDSCxxQkFBYSwwQkFBMEI7SUFFbkM7O09BRUc7SUFDSSxlQUFlLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFKaEg7SUFDRTs7T0FFRztJQUNJLGVBQWUsRUFBRSxDQUFDLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLEVBQUUsbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxFQUM1RztJQUVKOzs7T0FHRztJQUNILFFBQVEsNEJBRVA7SUFFRDs7O09BR0c7SUFDSCxRQUFRLGtCQUVQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDhCQU05QztJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLDhCQUU1QjtJQUVELDhEQUE4RDtJQUM5RCxNQUFNLDRCQUVMO0lBRUQseUNBQXlDO0lBQ3pDLE1BQU0sS0FBSyxNQUFNLG1FQUVoQjtDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_merge_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/tx_merge_rollup_private_inputs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAa,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;GAEG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAJhH;IACE;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,EAC5G;IAEJ;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,8BAM9C;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,8BAE5B;IAED,8DAA8D;IAC9D,MAAM,4BAEL;IAED,yCAAyC;IACzC,MAAM,KAAK,MAAM,mEAEhB;CACF"}

package/dest/rollup/{merge_rollup.js → tx_merge_rollup_private_inputs.js}

@@ -1,21 +1,22 @@
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { PreviousRollupData } from './previous_rollup_data.js';
+import { ProofData } from '../proofs/proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 /**
  * Represents inputs of the merge rollup circuit.
- */ export class MergeRollupInputs {
-    previousRollupData;
+ */ export class TxMergeRollupPrivateInputs {
+    previousRollups;
     constructor(/**
      * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
-     */ previousRollupData){
-        this.previousRollupData = previousRollupData;
+     */ previousRollups){
+        this.previousRollups = previousRollups;
     }
     /**
    * Serializes the inputs to a buffer.
    * @returns The inputs serialized to a buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.previousRollupData);
+        return serializeToBuffer(this.previousRollups);
     }
     /**
    * Serializes the inputs to a hex string.
@@ -26,25 +27,25 @@ import { PreviousRollupData } from './previous_rollup_data.js';
     /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new MergeRollupInputs instance.
+   * @returns A new TxMergeRollupPrivateInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new MergeRollupInputs([
-            reader.readObject(PreviousRollupData),
-            reader.readObject(PreviousRollupData)
+        return new TxMergeRollupPrivateInputs([
+            ProofData.fromBuffer(reader, TxRollupPublicInputs),
+            ProofData.fromBuffer(reader, TxRollupPublicInputs)
         ]);
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new MergeRollupInputs instance.
+   * @returns A new TxMergeRollupPrivateInputs instance.
    */ static fromString(str) {
-        return MergeRollupInputs.fromBuffer(hexToBuffer(str));
+        return TxMergeRollupPrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a string. */ static get schema() {
-        return bufferSchemaFor(MergeRollupInputs);
+        return bufferSchemaFor(TxMergeRollupPrivateInputs);
     }
 }

package/dest/rollup/{base_or_merge_rollup_public_inputs.d.ts → tx_rollup_public_inputs.d.ts}

@@ -1,12 +1,12 @@
-import { SpongeBlob } from '@aztec/blob-lib';
-import { Fr } from '@aztec/foundation/fields';
+import { SpongeBlob } from '@aztec/blob-lib/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
 /**
  * Output of the base and merge rollup circuits.
  */
-export declare class BaseOrMergeRollupPublicInputs {
+export declare class TxRollupPublicInputs {
     /**
      * Number of txs in this rollup.
      */
@@ -18,11 +18,11 @@ export declare class BaseOrMergeRollupPublicInputs {
     /**
      * Partial state reference at the start of the rollup circuit.
      */
-    start: PartialStateReference;
+    startTreeSnapshots: PartialStateReference;
     /**
      * Partial state reference at the end of the rollup circuit.
      */
-    end: PartialStateReference;
+    endTreeSnapshots: PartialStateReference;
     /**
      * Sponge state to absorb blob inputs at the start of the rollup circuit.
      */
@@ -32,7 +32,7 @@ export declare class BaseOrMergeRollupPublicInputs {
      */
     endSpongeBlob: SpongeBlob;
     /**
-     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened on-chain).
+     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened onchain).
      * Note: Truncated to 31 bytes to fit in Fr.
      */
     outHash: Fr;
@@ -56,11 +56,11 @@ export declare class BaseOrMergeRollupPublicInputs {
     /**
      * Partial state reference at the start of the rollup circuit.
      */
-    start: PartialStateReference, 
+    startTreeSnapshots: PartialStateReference, 
     /**
      * Partial state reference at the end of the rollup circuit.
      */
-    end: PartialStateReference, 
+    endTreeSnapshots: PartialStateReference, 
     /**
      * Sponge state to absorb blob inputs at the start of the rollup circuit.
      */
@@ -70,7 +70,7 @@ export declare class BaseOrMergeRollupPublicInputs {
      */
     endSpongeBlob: SpongeBlob, 
     /**
-     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened on-chain).
+     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened onchain).
      * Note: Truncated to 31 bytes to fit in Fr.
      */
     outHash: Fr, 
@@ -83,14 +83,14 @@ export declare class BaseOrMergeRollupPublicInputs {
      */
     accumulatedManaUsed: Fr);
     /** Returns an empty instance. */
-    static empty(): BaseOrMergeRollupPublicInputs;
+    static empty(): TxRollupPublicInputs;
     /**
      * Deserializes from a buffer or reader.
      * Note: Corresponds to a write in cpp.
      * @param buffer - Buffer or reader to read from.
      * @returns The deserialized public inputs.
      */
-    static fromBuffer(buffer: Buffer | BufferReader): BaseOrMergeRollupPublicInputs;
+    static fromBuffer(buffer: Buffer | BufferReader): TxRollupPublicInputs;
     /**
      * Serialize this as a buffer.
      * @returns The buffer.
@@ -104,12 +104,12 @@ export declare class BaseOrMergeRollupPublicInputs {
     /**
      * Deserializes from a hex string.
      * @param str - A hex string to deserialize from.
-     * @returns A new BaseOrMergeRollupPublicInputs instance.
+     * @returns A new TxRollupPublicInputs instance.
      */
-    static fromString(str: string): BaseOrMergeRollupPublicInputs;
+    static fromString(str: string): TxRollupPublicInputs;
     /** Returns a buffer representation for JSON serialization. */
     toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string. */
-    static get schema(): import("zod").ZodType<BaseOrMergeRollupPublicInputs, any, string>;
+    static get schema(): import("zod").ZodType<TxRollupPublicInputs, any, string>;
 }
-//# sourceMappingURL=base_or_merge_rollup_public_inputs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcm9sbHVwX3B1YmxpY19pbnB1dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvdHhfcm9sbHVwX3B1YmxpY19pbnB1dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzlFLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTdEOztHQUVHO0FBQ0gscUJBQWEsb0JBQW9CO0lBRTdCOztPQUVHO0lBQ0ksTUFBTSxFQUFFLE1BQU07SUFDckI7O09BRUc7SUFDSSxTQUFTLEVBQUUsaUJBQWlCO0lBQ25DOztPQUVHO0lBQ0ksa0JBQWtCLEVBQUUscUJBQXFCO0lBQ2hEOztPQUVHO0lBQ0ksZ0JBQWdCLEVBQUUscUJBQXFCO0lBQzlDOztPQUVHO0lBQ0ksZUFBZSxFQUFFLFVBQVU7SUFDbEM7O09BRUc7SUFDSSxhQUFhLEVBQUUsVUFBVTtJQUNoQzs7O09BR0c7SUFDSSxPQUFPLEVBQUUsRUFBRTtJQUNsQjs7T0FFRztJQUNJLGVBQWUsRUFBRSxFQUFFO0lBQzFCOztPQUVHO0lBQ0ksbUJBQW1CLEVBQUUsRUFBRTtJQXJDaEM7SUFDRTs7T0FFRztJQUNJLE1BQU0sRUFBRSxNQUFNO0lBQ3JCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLGlCQUFpQjtJQUNuQzs7T0FFRztJQUNJLGtCQUFrQixFQUFFLHFCQUFxQjtJQUNoRDs7T0FFRztJQUNJLGdCQUFnQixFQUFFLHFCQUFxQjtJQUM5Qzs7T0FFRztJQUNJLGVBQWUsRUFBRSxVQUFVO0lBQ2xDOztPQUVHO0lBQ0ksYUFBYSxFQUFFLFVBQVU7SUFDaEM7OztPQUdHO0lBQ0ksT0FBTyxFQUFFLEVBQUU7SUFDbEI7O09BRUc7SUFDSSxlQUFlLEVBQUUsRUFBRTtJQUMxQjs7T0FFRztJQUNJLG1CQUFtQixFQUFFLEVBQUUsRUFDNUI7SUFFSixpQ0FBaUM7SUFDakMsTUFBTSxDQUFDLEtBQUsseUJBWVg7SUFFRDs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsb0JBQW9CLENBYXJFO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFnQlA7SUFFRDs7O09BR0c7SUFDSCxRQUFRLGtCQUVQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sd0JBRTVCO0lBRUQsOERBQThEO0lBQzlELE1BQU0sNEJBRUw7SUFFRCw2Q0FBNkM7SUFDN0MsTUFBTSxLQUFLLE1BQU0sNkRBRWhCO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/tx_rollup_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,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,oBAAoB;IAE7B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,kBAAkB,EAAE,qBAAqB;IAChD;;OAEG;IACI,gBAAgB,EAAE,qBAAqB;IAC9C;;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;IArChC;IACE;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,kBAAkB,EAAE,qBAAqB;IAChD;;OAEG;IACI,gBAAgB,EAAE,qBAAqB;IAC9C;;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,EAC5B;IAEJ,iCAAiC;IACjC,MAAM,CAAC,KAAK,yBAYX;IAED;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB,CAarE;IAED;;;OAGG;IACH,QAAQ,4BAgBP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,wBAE5B;IAED,8DAA8D;IAC9D,MAAM,4BAEL;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,6DAEhB;CACF"}

package/dest/rollup/{base_or_merge_rollup_public_inputs.js → tx_rollup_public_inputs.js}

@@ -1,5 +1,5 @@
-import { SpongeBlob } from '@aztec/blob-lib';
-import { Fr } from '@aztec/foundation/fields';
+import { SpongeBlob } from '@aztec/blob-lib/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
@@ -7,11 +7,11 @@ import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
 /**
  * Output of the base and merge rollup circuits.
- */ export class BaseOrMergeRollupPublicInputs {
+ */ export class TxRollupPublicInputs {
     numTxs;
     constants;
-    start;
-    end;
+    startTreeSnapshots;
+    endTreeSnapshots;
     startSpongeBlob;
     endSpongeBlob;
     outHash;
@@ -23,14 +23,14 @@ import { BlockConstantData } from './block_constant_data.js';
      * Data which is forwarded through the rollup circuits unchanged.
      */ constants, /**
      * Partial state reference at the start of the rollup circuit.
-     */ start, /**
+     */ startTreeSnapshots, /**
      * Partial state reference at the end of the rollup circuit.
-     */ end, /**
+     */ endTreeSnapshots, /**
      * Sponge state to absorb blob inputs at the start of the rollup circuit.
      */ startSpongeBlob, /**
      * Sponge state to absorb blob inputs at the end of the rollup circuit.
      */ endSpongeBlob, /**
-     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened on-chain).
+     * SHA256 hash of L2 to L1 messages. Used to make public inputs constant-sized (to then be opened onchain).
      * Note: Truncated to 31 bytes to fit in Fr.
      */ outHash, /**
      * The summed `transaction_fee` of the constituent transactions.
@@ -39,8 +39,8 @@ import { BlockConstantData } from './block_constant_data.js';
      */ accumulatedManaUsed){
         this.numTxs = numTxs;
         this.constants = constants;
-        this.start = start;
-        this.end = end;
+        this.startTreeSnapshots = startTreeSnapshots;
+        this.endTreeSnapshots = endTreeSnapshots;
         this.startSpongeBlob = startSpongeBlob;
         this.endSpongeBlob = endSpongeBlob;
         this.outHash = outHash;
@@ -48,7 +48,7 @@ import { BlockConstantData } from './block_constant_data.js';
         this.accumulatedManaUsed = accumulatedManaUsed;
     }
     /** Returns an empty instance. */ static empty() {
-        return new BaseOrMergeRollupPublicInputs(0, BlockConstantData.empty(), PartialStateReference.empty(), PartialStateReference.empty(), SpongeBlob.empty(), SpongeBlob.empty(), Fr.zero(), Fr.zero(), Fr.zero());
+        return new TxRollupPublicInputs(0, BlockConstantData.empty(), PartialStateReference.empty(), PartialStateReference.empty(), SpongeBlob.empty(), SpongeBlob.empty(), Fr.zero(), Fr.zero(), Fr.zero());
     }
     /**
    * Deserializes from a buffer or reader.
@@ -57,13 +57,13 @@ import { BlockConstantData } from './block_constant_data.js';
    * @returns The deserialized public inputs.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        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));
+        return new TxRollupPublicInputs(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.numTxs, this.constants, this.start, this.end, this.startSpongeBlob, this.endSpongeBlob, this.outHash, this.accumulatedFees, this.accumulatedManaUsed);
+        return serializeToBuffer(this.numTxs, this.constants, this.startTreeSnapshots, this.endTreeSnapshots, this.startSpongeBlob, this.endSpongeBlob, this.outHash, this.accumulatedFees, this.accumulatedManaUsed);
     }
     /**
    * Serialize this as a hex string.
@@ -74,14 +74,14 @@ import { BlockConstantData } from './block_constant_data.js';
     /**
    * Deserializes from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new BaseOrMergeRollupPublicInputs instance.
+   * @returns A new TxRollupPublicInputs instance.
    */ static fromString(str) {
-        return BaseOrMergeRollupPublicInputs.fromBuffer(hexToBuffer(str));
+        return TxRollupPublicInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(BaseOrMergeRollupPublicInputs);
+        return bufferSchemaFor(TxRollupPublicInputs);
     }
 }

package/dest/schemas/index.d.ts

@@ -1,2 +1,2 @@
 export * from './schemas.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY2hlbWFzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsY0FBYyxDQUFDIn0=

package/dest/schemas/schemas.d.ts

@@ -1,6 +1,8 @@
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { Buffer32 } from '@aztec/foundation/buffer';
+import type { Fq, Fr } from '@aztec/foundation/curves/bn254';
+import type { Point } from '@aztec/foundation/curves/grumpkin';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fq, Fr, Point } from '@aztec/foundation/fields';
 import { type ZodFor } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 import type { AbiDecoded } from '../abi/decoder.js';
@@ -8,6 +10,7 @@ import { EventSelector } from '../abi/event_selector.js';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { Gas } from '../gas/gas.js';
 /**
  * Validation schemas for common types. Every schema must match its toJSON.
  * Foundation schemas are repeated here to aid type inference
@@ -27,22 +30,12 @@ export declare const schemas: {
     Integer: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     /** Coerces input to UInt32. */
     UInt32: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+    /** Coerces input to UInt64. */
+    UInt64: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
     /** Accepts a hex string as a Buffer32 type. */
     Buffer32: ZodFor<Buffer32>;
     /** Accepts a base64 string or an object `{ type: 'Buffer', data: [byte, byte...] }` as a buffer. */
-    Buffer: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
-        type: z.ZodLiteral<"Buffer">;
-        data: z.ZodArray<z.ZodNumber, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "Buffer";
-        data: number[];
-    }, {
-        type: "Buffer";
-        data: number[];
-    }>, Buffer<ArrayBuffer>, {
-        type: "Buffer";
-        data: number[];
-    }>]>;
+    Buffer: ZodFor<Buffer<ArrayBufferLike>>;
     /** Accepts a hex string as a buffer. */
     BufferHex: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>;
     /** Hex string with an optional 0x prefix which gets removed as part of the parsing. */
@@ -57,7 +50,88 @@ export declare const schemas: {
     FunctionSelector: ZodFor<FunctionSelector>;
     /** Accepts a hex string. */
     EventSelector: z.ZodType<EventSelector, any, string>;
+    /** Accepts a number, bigint, or string and coerces to SlotNumber. */
+    SlotNumber: ZodFor<SlotNumber>;
+    /** Accepts a number, bigint, or string and coerces to EpochNumber. */
+    EpochNumber: ZodFor<EpochNumber>;
+    GasUsed: z.ZodObject<{
+        totalGas: z.ZodEffects<z.ZodObject<{
+            daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            daGas: number;
+            l2Gas: number;
+        }, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>, Gas, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>;
+        teardownGas: z.ZodEffects<z.ZodObject<{
+            daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            daGas: number;
+            l2Gas: number;
+        }, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>, Gas, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>;
+        publicGas: z.ZodEffects<z.ZodObject<{
+            daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            daGas: number;
+            l2Gas: number;
+        }, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>, Gas, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>;
+        billedGas: z.ZodEffects<z.ZodObject<{
+            daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            daGas: number;
+            l2Gas: number;
+        }, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>, Gas, {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        totalGas: Gas;
+        teardownGas: Gas;
+        publicGas: Gas;
+        billedGas: Gas;
+    }, {
+        totalGas: {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        };
+        teardownGas: {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        };
+        publicGas: {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        };
+        billedGas: {
+            daGas: string | number | bigint;
+            l2Gas: string | number | bigint;
+        };
+    }>;
 };
 export declare const AbiDecodedSchema: ZodFor<AbiDecoded>;
-export { type ZodFor, bufferSchema, hexSchema, hexSchemaFor, bufferSchemaFor, type ApiSchemaFor, optional, mapSchema, pickFromSchema, } from '@aztec/foundation/schemas';
-//# sourceMappingURL=schemas.d.ts.map
+export declare const NullishToUndefined: (schema: ZodFor<any>) => z.ZodEffects<z.ZodOptional<z.ZodNullable<ZodFor<any>>>, any, any>;
+export { type ZodFor, zodFor, bufferSchema, hexSchema, hexSchemaFor, bufferSchemaFor, type ApiSchemaFor, optional, mapSchema, pickFromSchema, } from '@aztec/foundation/schemas';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NjaGVtYXMvc2NoZW1hcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0MsTUFBTSwyQkFBMkIsQ0FBQztBQUV0RixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFcEM7OztLQUdLO0FBQ0wsZUFBTyxNQUFNLE9BQU87SUFDbEIsNEJBQTRCOztJQUc1Qiw0QkFBNEI7O0lBRzVCLDRCQUE0Qjs7SUFHNUIseUNBQXlDOztJQUd6QyxtQ0FBbUM7O0lBR25DLDJDQUEyQzs7SUFHM0MsK0JBQStCOztJQUcvQiwrQkFBK0I7O0lBRy9CLCtDQUErQzs7SUFHL0Msb0dBQW9HOztJQUdwRyx3Q0FBd0M7O0lBR3hDLHVGQUF1Rjs7SUFHdkYscUNBQXFDOztJQUdyQyw0QkFBNEI7O0lBRzVCLDRCQUE0Qjs7SUFHNUIsNEJBQTRCOztJQUc1Qiw0QkFBNEI7O0lBRzVCLHFFQUFxRTs7SUFHckUsc0VBQXNFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FTdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsVUFBVSxDQU05QyxDQUFDO0FBR0gsZUFBTyxNQUFNLGtCQUFrQiw0RkFBMkUsQ0FBQztBQUUzRyxPQUFPLEVBQ0wsS0FBSyxNQUFNLEVBQ1gsTUFBTSxFQUNOLFlBQVksRUFDWixTQUFTLEVBQ1QsWUFBWSxFQUNaLGVBQWUsRUFDZixLQUFLLFlBQVksRUFDakIsUUFBUSxFQUNSLFNBQVMsRUFDVCxjQUFjLEdBQ2YsTUFBTSwyQkFBMkIsQ0FBQyJ9

package/dest/schemas/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAgC,MAAM,2BAA2B,CAAC;AAEtF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;KAGK;AACL,eAAO,MAAM,OAAO;IAClB,4BAA4B;gBACgB,MAAM,CAAC,UAAU,CAAC;IAE9D,4BAA4B;QACA,MAAM,CAAC,EAAE,CAAC;IAEtC,4BAA4B;QACA,MAAM,CAAC,EAAE,CAAC;IAEtC,yCAAyC;WACP,MAAM,CAAC,KAAK,CAAC;IAE/C,mCAAmC;;IAGnC,2CAA2C;;IAG3C,+BAA+B;;IAG/B,+CAA+C;cACP,MAAM,CAAC,QAAQ,CAAC;IAExD,oGAAoG;;;;;;;;;;;;;;IAGpG,wCAAwC;;IAGxC,uFAAuF;;IAGvF,qCAAqC;;IAGrC,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;CAE7B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAM9C,CAAC;AAEH,OAAO,EACL,KAAK,MAAM,EACX,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,eAAe,EACf,KAAK,YAAY,EACjB,QAAQ,EACR,SAAS,EACT,cAAc,GACf,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,KAAK,MAAM,EAAgC,MAAM,2BAA2B,CAAC;AAEtF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC;;;KAGK;AACL,eAAO,MAAM,OAAO;IAClB,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,yCAAyC;;IAGzC,mCAAmC;;IAGnC,2CAA2C;;IAG3C,+BAA+B;;IAG/B,+BAA+B;;IAG/B,+CAA+C;;IAG/C,oGAAoG;;IAGpG,wCAAwC;;IAGxC,uFAAuF;;IAGvF,qCAAqC;;IAGrC,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,qEAAqE;;IAGrE,sEAAsE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASvE,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAM9C,CAAC;AAGH,eAAO,MAAM,kBAAkB,4FAA2E,CAAC;AAE3G,OAAO,EACL,KAAK,MAAM,EACX,MAAM,EACN,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,eAAe,EACf,KAAK,YAAY,EACjB,QAAQ,EACR,SAAS,EACT,cAAc,GACf,MAAM,2BAA2B,CAAC"}

package/dest/schemas/schemas.js

@@ -4,6 +4,7 @@ import { EventSelector } from '../abi/event_selector.js';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { Gas } from '../gas/gas.js';
 /**
  * Validation schemas for common types. Every schema must match its toJSON.
  * Foundation schemas are repeated here to aid type inference
@@ -15,6 +16,7 @@ import { AztecAddress } from '../aztec-address/index.js';
     /** Coerces any input to bigint. */ BigInt: foundationSchemas.BigInt,
     /** Coerces any input to integer number. */ Integer: foundationSchemas.Integer,
     /** Coerces input to UInt32. */ UInt32: foundationSchemas.UInt32,
+    /** Coerces input to UInt64. */ UInt64: foundationSchemas.UInt64,
     /** Accepts a hex string as a Buffer32 type. */ Buffer32: foundationSchemas.Buffer32,
     /** Accepts a base64 string or an object `{ type: 'Buffer', data: [byte, byte...] }` as a buffer. */ Buffer: foundationSchemas.Buffer,
     /** Accepts a hex string as a buffer. */ BufferHex: foundationSchemas.BufferHex,
@@ -23,7 +25,15 @@ import { AztecAddress } from '../aztec-address/index.js';
     /** Accepts a hex string. */ AztecAddress: AztecAddress.schema,
     /** Accepts a hex string. */ NoteSelector: NoteSelector.schema,
     /** Accepts a hex string. */ FunctionSelector: FunctionSelector.schema,
-    /** Accepts a hex string. */ EventSelector: EventSelector.schema
+    /** Accepts a hex string. */ EventSelector: EventSelector.schema,
+    /** Accepts a number, bigint, or string and coerces to SlotNumber. */ SlotNumber: foundationSchemas.SlotNumber,
+    /** Accepts a number, bigint, or string and coerces to EpochNumber. */ EpochNumber: foundationSchemas.EpochNumber,
+    GasUsed: z.object({
+        totalGas: Gas.schema,
+        teardownGas: Gas.schema,
+        publicGas: Gas.schema,
+        billedGas: Gas.schema
+    })
 };
 export const AbiDecodedSchema = z.union([
     schemas.BigInt,
@@ -32,4 +42,6 @@ export const AbiDecodedSchema = z.union([
     z.array(z.lazy(()=>AbiDecodedSchema)),
     z.record(z.lazy(()=>AbiDecodedSchema))
 ]);
-export { bufferSchema, hexSchema, hexSchemaFor, bufferSchemaFor, optional, mapSchema, pickFromSchema } from '@aztec/foundation/schemas';
+// C++ only supports null values, which we want to convert to undefined.
+export const NullishToUndefined = (schema)=>schema.nullish().transform((x)=>x ?? undefined);
+export { zodFor, bufferSchema, hexSchema, hexSchemaFor, bufferSchemaFor, optional, mapSchema, pickFromSchema } from '@aztec/foundation/schemas';

package/dest/slashing/empire.d.ts

@@ -28,4 +28,4 @@ export declare function getFirstEligibleRoundForOffense(offense: OffenseIdentifi
     epochDuration: number;
     proofSubmissionEpochs: number;
 }): bigint;
-//# sourceMappingURL=empire.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1waXJlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2xhc2hpbmcvZW1waXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzlHLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFekM7Ozs7R0FJRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxPQUFPLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FNdEU7QUFFRCxzR0FBc0c7QUFDdEcsd0JBQWdCLGdDQUFnQyxDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsaUJBQWlCLEdBQUcsaUJBQWlCLEVBQUUsQ0FRL0c7QUFFRCxrR0FBa0c7QUFDbEcsd0JBQWdCLHdCQUF3QixDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsR0FBRyxjQUFjLEVBQUUsQ0FNOUU7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHFCQUFxQixDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE9BQU8sR0FBRyxNQUFNLENBUXBFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLCtCQUErQixDQUM3QyxPQUFPLEVBQUUsaUJBQWlCLEVBQzFCLFNBQVMsRUFBRTtJQUFFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxxQkFBcUIsRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUM3RixNQUFNLENBdUNSIn0=

package/dest/slashing/empire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empire.d.ts","sourceRoot":"","sources":["../../src/slashing/empire.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAMtE;AAED,sGAAsG;AACtG,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,YAAY,GAAG,iBAAiB,GAAG,iBAAiB,EAAE,CAQ/G;AAED,kGAAkG;AAClG,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,CAM9E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAQpE;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,CAAA;CAAE,GAC7F,MAAM,CAqCR"}
+{"version":3,"file":"empire.d.ts","sourceRoot":"","sources":["../../src/slashing/empire.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAMtE;AAED,sGAAsG;AACtG,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,YAAY,GAAG,iBAAiB,GAAG,iBAAiB,EAAE,CAQ/G;AAED,kGAAkG;AAClG,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,CAM9E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAQpE;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,CAAA;CAAE,GAC7F,MAAM,CAuCR"}

package/dest/slashing/empire.js

@@ -1,3 +1,4 @@
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { getRoundForSlot, getRoundsForEpoch } from './helpers.js';
 import { OffenseType } from './types.js';
 /**
@@ -46,7 +47,7 @@ import { OffenseType } from './types.js';
         case OffenseType.INACTIVITY:
             {
                 const epoch = offense.epochOrSlot;
-                const detectedEpoch = epoch + 1n;
+                const detectedEpoch = EpochNumber.fromBigInt(epoch + 1n);
                 return getRoundsForEpoch(detectedEpoch, constants)[0] + 1n;
             }
         // These offenses are detected once an epoch is pruned, which happens after the proof submission window
@@ -55,7 +56,7 @@ import { OffenseType } from './types.js';
             {
                 // TODO(palla/slash): Check for off-by-ones especially here
                 const epoch = offense.epochOrSlot;
-                const detectedEpoch = epoch + BigInt(constants.proofSubmissionEpochs);
+                const detectedEpoch = EpochNumber.fromBigInt(epoch + BigInt(constants.proofSubmissionEpochs));
                 return getRoundsForEpoch(detectedEpoch, constants)[0] + 1n;
             }
         // These offenses are detected immediately in the slot they occur, so we assume they are detected in the first round for the following slot
@@ -63,16 +64,18 @@ import { OffenseType } from './types.js';
         case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
         case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
         case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
+        case OffenseType.DUPLICATE_PROPOSAL:
+        case OffenseType.DUPLICATE_ATTESTATION:
             {
                 const slot = offense.epochOrSlot;
-                const detectedSlot = slot + 1n;
+                const detectedSlot = SlotNumber.fromBigInt(slot + 1n);
                 return getRoundForSlot(detectedSlot, constants).round + 1n;
             }
         // Assume these are epoch-based offenses, even though we should never have to process these
         case OffenseType.UNKNOWN:
             {
                 const epoch = offense.epochOrSlot;
-                const detectedEpoch = epoch + 1n;
+                const detectedEpoch = EpochNumber.fromBigInt(epoch + 1n);
                 return getRoundsForEpoch(detectedEpoch, constants)[0] + 1n;
             }
         default: