@aztec/stdlib 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/trees/append_only_tree_snapshot.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <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, FieldReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
@@ -12,19 +9,7 @@ import type { UInt32 } from '../types/shared.js';
  * Used in circuits to verify that tree insertions are performed correctly.
  */
 export declare class AppendOnlyTreeSnapshot {
-    /**
-     * Root of the append only tree when taking the snapshot.
-     */
     root: Fr;
-    /**
-     * Index of the next available leaf in the append only tree.
-     *
-     * Note: We include the next available leaf index in the snapshot so that the snapshot can be used to verify that
-     *       the insertion was performed at the correct place. If we only verified tree root then it could happen that
-     *       some leaves would get overwritten and the tree root check would still pass.
-     *       TLDR: We need to store the next available leaf index to ensure that the "append only" property was
-     *             preserved when verifying state transitions.
-     */
     nextAvailableLeafIndex: UInt32;
     constructor(
     /**
@@ -55,16 +40,25 @@ export declare class AppendOnlyTreeSnapshot {
         nextAvailableLeafIndex: string | number | bigint;
     }>;
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     toString(): string;
     static fromBuffer(buffer: Buffer | BufferReader): AppendOnlyTreeSnapshot;
     static fromString(str: string): AppendOnlyTreeSnapshot;
     static fromFields(fields: Fr[] | FieldReader): AppendOnlyTreeSnapshot;
-    static zero(): AppendOnlyTreeSnapshot;
-    isZero(): boolean;
+    toAbi(): [`0x${string}`, number];
+    static empty(): AppendOnlyTreeSnapshot;
+    /**
+     * Creates an AppendOnlyTreeSnapshot instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AppendOnlyTreeSnapshot fields
+     * @returns An AppendOnlyTreeSnapshot instance
+     */
+    static fromPlainObject(obj: any): AppendOnlyTreeSnapshot;
+    isEmpty(): boolean;
     [inspect.custom](): string;
     equals(other: this): boolean;
     static random(): AppendOnlyTreeSnapshot;
 }
-//# sourceMappingURL=append_only_tree_snapshot.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwZW5kX29ubHlfdHJlZV9zbmFwc2hvdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL2FwcGVuZF9vbmx5X3RyZWVfc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzNGLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDL0IsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRDs7OztHQUlHO0FBQ0gscUJBQWEsc0JBQXNCO0lBS3hCLElBQUksRUFBRSxFQUFFO0lBVVIsc0JBQXNCLEVBQUUsTUFBTTtJQWR2QztJQUNFOztPQUVHO0lBQ0ksSUFBSSxFQUFFLEVBQUU7SUFDZjs7Ozs7Ozs7T0FRRztJQUNJLHNCQUFzQixFQUFFLE1BQU0sRUFDbkM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsT0FBTyxXQUVOO0lBRUQsUUFBUSw0QkFFUDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxzQkFBc0IsQ0FHdkU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsc0JBQXNCLENBRXJEO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLHNCQUFzQixDQUlwRTtJQUVELEtBQUssSUFBSSxDQUFDLEtBQUssTUFBTSxFQUFFLEVBQUUsTUFBTSxDQUFDLENBRS9CO0lBRUQsTUFBTSxDQUFDLEtBQUssMkJBRVg7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsc0JBQXNCLENBRXZEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FJZjtJQUVNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxXQUV4QjtJQUVELE1BQU0sQ0FBQyxNQUFNLDJCQUVaO0NBQ0YifQ==

package/dest/trees/append_only_tree_snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"append_only_tree_snapshot.d.ts","sourceRoot":"","sources":["../../src/trees/append_only_tree_snapshot.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;;IAbrC;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;IAGvC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAKxE,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB;IAItD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB;IAMrE,MAAM,CAAC,IAAI;IAIX,MAAM,IAAI,OAAO;IAIjB,CAAC,OAAO,CAAC,MAAM,CAAC;IAMT,MAAM,CAAC,KAAK,EAAE,IAAI;IAIzB,MAAM,CAAC,MAAM;CAGd"}
+{"version":3,"file":"append_only_tree_snapshot.d.ts","sourceRoot":"","sources":["../../src/trees/append_only_tree_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,sBAAsB;IAKxB,IAAI,EAAE,EAAE;IAUR,sBAAsB,EAAE,MAAM;IAdvC;IACE;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM,EACnC;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,OAAO,WAEN;IAED,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB,CAGvE;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAErD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB,CAIpE;IAED,KAAK,IAAI,CAAC,KAAK,MAAM,EAAE,EAAE,MAAM,CAAC,CAE/B;IAED,MAAM,CAAC,KAAK,2BAEX;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAEvD;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAIf;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,WAExB;IAED,MAAM,CAAC,MAAM,2BAEZ;CACF"}

package/dest/trees/append_only_tree_snapshot.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
@@ -57,10 +57,25 @@ import { z } from 'zod';
         const reader = FieldReader.asReader(fields);
         return new AppendOnlyTreeSnapshot(reader.readField(), Number(reader.readField().toBigInt()));
     }
-    static zero() {
+    toAbi() {
+        return [
+            this.root.toString(),
+            this.nextAvailableLeafIndex
+        ];
+    }
+    static empty() {
         return new AppendOnlyTreeSnapshot(Fr.ZERO, 0);
     }
-    isZero() {
+    /**
+   * Creates an AppendOnlyTreeSnapshot instance from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing AppendOnlyTreeSnapshot fields
+   * @returns An AppendOnlyTreeSnapshot instance
+   */ static fromPlainObject(obj) {
+        return new AppendOnlyTreeSnapshot(Fr.fromPlainObject(obj.root), obj.nextAvailableLeafIndex);
+    }
+    isEmpty() {
         return this.root.isZero() && this.nextAvailableLeafIndex === 0;
     }
     [inspect.custom]() {

package/dest/trees/database_public_state_source.d.ts

@@ -0,0 +1,11 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '../aztec-address/index.js';
+import type { MerkleTreeReadOperations } from '../interfaces/merkle_tree_operations.js';
+import type { PublicStateSource } from '../interfaces/public_state_source.js';
+export type { PublicStateSource };
+export declare class DatabasePublicStateSource implements PublicStateSource {
+    private db;
+    constructor(db: MerkleTreeReadOperations);
+    storageRead(contractAddress: AztecAddress, slot: Fr): Promise<Fr>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2VfcHVibGljX3N0YXRlX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL2RhdGFiYXNlX3B1YmxpY19zdGF0ZV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDeEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUk5RSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztBQUVsQyxxQkFBYSx5QkFBMEIsWUFBVyxpQkFBaUI7SUFDckQsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLHdCQUF3QixFQUFJO0lBRTlDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQWN0RTtDQUNGIn0=

package/dest/trees/database_public_state_source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"database_public_state_source.d.ts","sourceRoot":"","sources":["../../src/trees/database_public_state_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,qBAAa,yBAA0B,YAAW,iBAAiB;IACrD,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,wBAAwB,EAAI;IAE9C,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CActE;CACF"}

package/dest/trees/database_public_state_source.js

@@ -0,0 +1,18 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { computePublicDataTreeLeafSlot } from '../hash/hash.js';
+import { MerkleTreeId } from './merkle_tree_id.js';
+export class DatabasePublicStateSource {
+    db;
+    constructor(db){
+        this.db = db;
+    }
+    async storageRead(contractAddress, slot) {
+        const leafSlot = (await computePublicDataTreeLeafSlot(contractAddress, slot)).toBigInt();
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
+            return Fr.ZERO;
+        }
+        const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        return preimage.leaf.value;
+    }
+}

package/dest/trees/index.d.ts

@@ -1,9 +1,9 @@
 export * from './nullifier_leaf.js';
-export * from './protocol_contract_leaf.js';
 export * from './public_data_leaf.js';
 export * from './append_only_tree_snapshot.js';
 export * from './merkle_tree_id.js';
 export * from './nullifier_membership_witness.js';
 export * from './public_data_witness.js';
 export * from '../interfaces/merkle_tree_operations.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './database_public_state_source.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmVlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsbUNBQW1DLENBQUMifQ==

package/dest/trees/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/trees/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/trees/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mCAAmC,CAAC"}

package/dest/trees/index.js

@@ -1,8 +1,8 @@
 export * from './nullifier_leaf.js';
-export * from './protocol_contract_leaf.js';
 export * from './public_data_leaf.js';
 export * from './append_only_tree_snapshot.js';
 export * from './merkle_tree_id.js';
 export * from './nullifier_membership_witness.js';
 export * from './public_data_witness.js';
 export * from '../interfaces/merkle_tree_operations.js';
+export * from './database_public_state_source.js';

package/dest/trees/merkle_tree_id.d.ts

@@ -3,21 +3,29 @@
  * @remarks The MerkleTrees class expects these to start from zero and be in incremental order.
  */
 export declare enum MerkleTreeId {
-    NULLIFIER_TREE = 0,// 0
-    NOTE_HASH_TREE = 1,// 1
-    PUBLIC_DATA_TREE = 2,// 2
-    L1_TO_L2_MESSAGE_TREE = 3,// 3
+    NULLIFIER_TREE = 0,
+    NOTE_HASH_TREE = 1,
+    PUBLIC_DATA_TREE = 2,
+    L1_TO_L2_MESSAGE_TREE = 3,
     ARCHIVE = 4
 }
 export declare const merkleTreeIds: () => MerkleTreeId[];
 declare const TREE_HEIGHTS: {
-    readonly 1: 40;
-    readonly 4: 29;
-    readonly 3: 39;
-    readonly 0: 40;
+    readonly 1: 42;
+    readonly 4: 30;
+    readonly 3: 36;
+    readonly 0: 42;
     readonly 2: 40;
 };
 export type TreeHeights = typeof TREE_HEIGHTS;
 export declare function getTreeHeight<TID extends MerkleTreeId>(treeId: TID): TreeHeights[TID];
+declare const TREE_NAMES: {
+    readonly 0: "NULLIFIER_TREE";
+    readonly 1: "NOTE_HASH_TREE";
+    readonly 2: "PUBLIC_DATA_TREE";
+    readonly 3: "L1_TO_L2_MESSAGE_TREE";
+    readonly 4: "ARCHIVE";
+};
+export declare function getTreeName<TID extends MerkleTreeId>(treeId: TID): (typeof TREE_NAMES)[TID];
 export {};
-//# sourceMappingURL=merkle_tree_id.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfaWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmVlcy9tZXJrbGVfdHJlZV9pZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFhQTs7O0dBR0c7QUFDSCxvQkFBWSxZQUFZO0lBQ3RCLGNBQWMsSUFBb0I7SUFDbEMsY0FBYyxJQUFvQjtJQUNsQyxnQkFBZ0IsSUFBc0I7SUFDdEMscUJBQXFCLElBQTJCO0lBQ2hELE9BQU8sSUFBa0I7Q0FDMUI7QUFFRCxlQUFPLE1BQU0sYUFBYSxzQkFFekIsQ0FBQztBQUVGLFFBQUEsTUFBTSxZQUFZOzs7Ozs7Q0FNUixDQUFDO0FBRVgsTUFBTSxNQUFNLFdBQVcsR0FBRyxPQUFPLFlBQVksQ0FBQztBQUU5Qyx3QkFBZ0IsYUFBYSxDQUFDLEdBQUcsU0FBUyxZQUFZLEVBQUUsTUFBTSxFQUFFLEdBQUcsR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBRXJGO0FBRUQsUUFBQSxNQUFNLFVBQVU7Ozs7OztDQU1OLENBQUM7QUFFWCx3QkFBZ0IsV0FBVyxDQUFDLEdBQUcsU0FBUyxZQUFZLEVBQUUsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE9BQU8sVUFBVSxDQUFDLENBQUMsR0FBRyxDQUFDLENBRTNGIn0=

package/dest/trees/merkle_tree_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merkle_tree_id.d.ts","sourceRoot":"","sources":["../../src/trees/merkle_tree_id.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,oBAAY,YAAY;IACtB,cAAc,IAAoB,CAAE,IAAI;IACxC,cAAc,IAAoB,CAAE,IAAI;IACxC,gBAAgB,IAAsB,CAAE,IAAI;IAC5C,qBAAqB,IAA2B,CAAE,IAAI;IACtD,OAAO,IAAkB;CAC1B;AAED,eAAO,MAAM,aAAa,sBAEzB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;CAMR,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC;AAE9C,wBAAgB,aAAa,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAErF"}
+{"version":3,"file":"merkle_tree_id.d.ts","sourceRoot":"","sources":["../../src/trees/merkle_tree_id.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,oBAAY,YAAY;IACtB,cAAc,IAAoB;IAClC,cAAc,IAAoB;IAClC,gBAAgB,IAAsB;IACtC,qBAAqB,IAA2B;IAChD,OAAO,IAAkB;CAC1B;AAED,eAAO,MAAM,aAAa,sBAEzB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;CAMR,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC;AAE9C,wBAAgB,aAAa,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAErF;AAED,QAAA,MAAM,UAAU;;;;;;CAMN,CAAC;AAEX,wBAAgB,WAAW,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,GAAG,CAAC,CAE3F"}

package/dest/trees/merkle_tree_id.js

@@ -23,3 +23,13 @@ const TREE_HEIGHTS = {
 export function getTreeHeight(treeId) {
     return TREE_HEIGHTS[treeId];
 }
+const TREE_NAMES = {
+    [MerkleTreeId.NULLIFIER_TREE]: 'NULLIFIER_TREE',
+    [MerkleTreeId.NOTE_HASH_TREE]: 'NOTE_HASH_TREE',
+    [MerkleTreeId.PUBLIC_DATA_TREE]: 'PUBLIC_DATA_TREE',
+    [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: 'L1_TO_L2_MESSAGE_TREE',
+    [MerkleTreeId.ARCHIVE]: 'ARCHIVE'
+};
+export function getTreeName(treeId) {
+    return TREE_NAMES[treeId];
+}

package/dest/trees/nullifier_leaf.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 type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 import { z } from 'zod';
@@ -9,48 +7,68 @@ import { z } from 'zod';
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
  */
 export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
-    /**
-     * Leaf value inside the indexed tree's linked list.
-     */
-    nullifier: Fr;
-    /**
-     * Next value inside the indexed tree's linked list.
-     */
-    nextNullifier: Fr;
-    /**
-     * Index of the next leaf in the indexed tree's linked list.
-     */
+    leaf: NullifierLeaf;
+    nextKey: Fr;
     nextIndex: bigint;
     constructor(
     /**
      * Leaf value inside the indexed tree's linked list.
      */
-    nullifier: Fr, 
+    leaf: NullifierLeaf, 
     /**
-     * Next value inside the indexed tree's linked list.
+     * Next nullifier inside the indexed tree's linked list.
      */
-    nextNullifier: Fr, 
+    nextKey: Fr, 
     /**
      * Index of the next leaf in the indexed tree's linked list.
      */
     nextIndex: bigint);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        nullifier: z.ZodType<Fr, any, string>;
-        nextNullifier: z.ZodType<Fr, any, string>;
+        leaf: z.ZodEffects<z.ZodObject<{
+            nullifier: z.ZodType<Fr, any, string>;
+        }, "strip", z.ZodTypeAny, {
+            nullifier: Fr;
+        }, {
+            nullifier: string;
+        }>, NullifierLeaf, {
+            nullifier: string;
+        }>;
+        nextKey: z.ZodType<Fr, any, string>;
         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
     }, "strip", z.ZodTypeAny, {
-        nullifier: Fr;
-        nextNullifier: Fr;
+        leaf: NullifierLeaf;
+        nextKey: Fr;
         nextIndex: bigint;
     }, {
-        nullifier: string;
-        nextNullifier: string;
+        leaf: {
+            nullifier: string;
+        };
+        nextKey: string;
         nextIndex: string | number | bigint;
     }>, NullifierLeafPreimage, {
-        nullifier: string;
-        nextNullifier: string;
+        leaf: {
+            nullifier: string;
+        };
+        nextKey: string;
         nextIndex: string | number | bigint;
     }>;
+    /**
+     * Creates a NullifierLeafPreimage from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing NullifierLeafPreimage fields
+     * @returns A NullifierLeafPreimage instance
+     */
+    static fromPlainObject(obj: any): NullifierLeafPreimage;
+    static get leafSchema(): z.ZodEffects<z.ZodObject<{
+        nullifier: z.ZodType<Fr, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        nullifier: Fr;
+    }, {
+        nullifier: string;
+    }>, NullifierLeaf, {
+        nullifier: string;
+    }>;
     getKey(): bigint;
     getNextKey(): bigint;
     getNextIndex(): bigint;
@@ -69,9 +87,6 @@ export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
  * A nullifier to be inserted in the nullifier tree.
  */
 export declare class NullifierLeaf implements IndexedTreeLeaf {
-    /**
-     * Nullifier value.
-     */
     nullifier: Fr;
     constructor(
     /**
@@ -80,9 +95,30 @@ export declare class NullifierLeaf implements IndexedTreeLeaf {
     nullifier: Fr);
     getKey(): bigint;
     toBuffer(): Buffer;
+    clone(): NullifierLeaf;
+    toHashInputs(): Buffer[];
+    static empty(): NullifierLeaf;
+    static random(): NullifierLeaf;
     isEmpty(): boolean;
     updateTo(_another: NullifierLeaf): NullifierLeaf;
     static buildDummy(key: bigint): NullifierLeaf;
-    static fromBuffer(buf: Buffer): NullifierLeaf;
+    static fromBuffer(buf: Buffer | BufferReader): NullifierLeaf;
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        nullifier: z.ZodType<Fr, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        nullifier: Fr;
+    }, {
+        nullifier: string;
+    }>, NullifierLeaf, {
+        nullifier: string;
+    }>;
+    /**
+     * Creates a NullifierLeaf from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing NullifierLeaf fields
+     * @returns A NullifierLeaf instance
+     */
+    static fromPlainObject(obj: any): NullifierLeaf;
 }
-//# sourceMappingURL=nullifier_leaf.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX2xlYWYuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmVlcy9udWxsaWZpZXJfbGVhZi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7OztHQUdHO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsdUJBQXVCO0lBSzFELElBQUksRUFBRSxhQUFhO0lBSW5CLE9BQU8sRUFBRSxFQUFFO0lBSVgsU0FBUyxFQUFFLE1BQU07SUFaMUI7SUFDRTs7T0FFRztJQUNJLElBQUksRUFBRSxhQUFhO0lBQzFCOztPQUVHO0lBQ0ksT0FBTyxFQUFFLEVBQUU7SUFDbEI7O09BRUc7SUFDSSxTQUFTLEVBQUUsTUFBTSxFQUN0QjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLHFCQUFxQixDQVN0RDtJQUVELE1BQU0sS0FBSyxVQUFVOzs7Ozs7OztPQUVwQjtJQUVELE1BQU0sSUFBSSxNQUFNLENBRWY7SUFFRCxVQUFVLElBQUksTUFBTSxDQUVuQjtJQUVELFlBQVksSUFBSSxNQUFNLENBRXJCO0lBRUQsTUFBTSxJQUFJLGFBQWEsQ0FFdEI7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELFlBQVksSUFBSSxNQUFNLEVBQUUsQ0FNdkI7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0lBRUQsTUFBTSxDQUFDLE1BQU0sMEJBRVo7SUFFRCxNQUFNLENBQUMsS0FBSyxJQUFJLHFCQUFxQixDQUVwQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcscUJBQXFCLENBT3RFO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsYUFBYSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxxQkFBcUIsQ0FFOUY7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxxQkFBcUIsR0FBRyxxQkFBcUIsQ0FFbkU7Q0FDRjtBQUVEOztHQUVHO0FBQ0gscUJBQWEsYUFBYyxZQUFXLGVBQWU7SUFLMUMsU0FBUyxFQUFFLEVBQUU7SUFKdEI7SUFDRTs7T0FFRztJQUNJLFNBQVMsRUFBRSxFQUFFLEVBQ2xCO0lBRUosTUFBTSxJQUFJLE1BQU0sQ0FFZjtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsS0FBSyxJQUFJLGFBQWEsQ0FFckI7SUFFRCxZQUFZLElBQUksTUFBTSxFQUFFLENBRXZCO0lBRUQsTUFBTSxDQUFDLEtBQUssSUFBSSxhQUFhLENBRTVCO0lBRUQsTUFBTSxDQUFDLE1BQU0sSUFBSSxhQUFhLENBRTdCO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxRQUFRLENBQUMsUUFBUSxFQUFFLGFBQWEsR0FBRyxhQUFhLENBRS9DO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FFNUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGFBQWEsQ0FHM0Q7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7T0FFaEI7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsYUFBYSxDQUs5QztDQUNGIn0=

package/dest/trees/nullifier_leaf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_leaf.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,uBAAuB;IAEjE;;OAEG;IACI,SAAS,EAAE,EAAE;IACpB;;OAEG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,SAAS,EAAE,EAAE;IACpB;;OAEG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,aAAa;IAIvB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAQxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,KAAK,IAAI,qBAAqB;IAI9B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAIrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IAKvE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB;IAI/F,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,GAAG,qBAAqB;CAGrE;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,eAAe;IAEjD;;OAEG;IACI,SAAS,EAAE,EAAE;;IAHpB;;OAEG;IACI,SAAS,EAAE,EAAE;IAGtB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;IAIhD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAI7C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;CAG9C"}
+{"version":3,"file":"nullifier_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_leaf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,uBAAuB;IAK1D,IAAI,EAAE,aAAa;IAInB,OAAO,EAAE,EAAE;IAIX,SAAS,EAAE,MAAM;IAZ1B;IACE;;OAEG;IACI,IAAI,EAAE,aAAa;IAC1B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM,EACtB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,qBAAqB,CAStD;IAED,MAAM,KAAK,UAAU;;;;;;;;OAEpB;IAED,MAAM,IAAI,MAAM,CAEf;IAED,UAAU,IAAI,MAAM,CAEnB;IAED,YAAY,IAAI,MAAM,CAErB;IAED,MAAM,IAAI,aAAa,CAEtB;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,YAAY,IAAI,MAAM,EAAE,CAMvB;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,KAAK,IAAI,qBAAqB,CAE7B;IAED,MAAM,CAAC,MAAM,0BAEZ;IAED,MAAM,CAAC,KAAK,IAAI,qBAAqB,CAEpC;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAOtE;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB,CAE9F;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,GAAG,qBAAqB,CAEnE;CACF;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,eAAe;IAK1C,SAAS,EAAE,EAAE;IAJtB;IACE;;OAEG;IACI,SAAS,EAAE,EAAE,EAClB;IAEJ,MAAM,IAAI,MAAM,CAEf;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,KAAK,IAAI,aAAa,CAErB;IAED,YAAY,IAAI,MAAM,EAAE,CAEvB;IAED,MAAM,CAAC,KAAK,IAAI,aAAa,CAE5B;IAED,MAAM,CAAC,MAAM,IAAI,aAAa,CAE7B;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAE/C;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAE5C;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAG3D;IAED,MAAM,KAAK,MAAM;;;;;;;;OAEhB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,aAAa,CAK9C;CACF"}

package/dest/trees/nullifier_leaf.js

@@ -1,5 +1,5 @@
 import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
@@ -7,46 +7,61 @@ import { z } from 'zod';
  * Class containing the data of a preimage of a single leaf in the nullifier tree.
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
  */ export class NullifierLeafPreimage {
-    nullifier;
-    nextNullifier;
+    leaf;
+    nextKey;
     nextIndex;
     constructor(/**
      * Leaf value inside the indexed tree's linked list.
-     */ nullifier, /**
-     * Next value inside the indexed tree's linked list.
-     */ nextNullifier, /**
+     */ leaf, /**
+     * Next nullifier inside the indexed tree's linked list.
+     */ nextKey, /**
      * Index of the next leaf in the indexed tree's linked list.
      */ nextIndex){
-        this.nullifier = nullifier;
-        this.nextNullifier = nextNullifier;
+        this.leaf = leaf;
+        this.nextKey = nextKey;
         this.nextIndex = nextIndex;
     }
     static get schema() {
         return z.object({
-            nullifier: schemas.Fr,
-            nextNullifier: schemas.Fr,
+            leaf: NullifierLeaf.schema,
+            nextKey: schemas.Fr,
             nextIndex: schemas.BigInt
-        }).transform(({ nullifier, nextNullifier, nextIndex })=>new NullifierLeafPreimage(nullifier, nextNullifier, nextIndex));
+        }).transform(({ leaf, nextKey, nextIndex })=>new NullifierLeafPreimage(leaf, nextKey, nextIndex));
+    }
+    /**
+   * Creates a NullifierLeafPreimage from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing NullifierLeafPreimage fields
+   * @returns A NullifierLeafPreimage instance
+   */ static fromPlainObject(obj) {
+        if (obj instanceof NullifierLeafPreimage) {
+            return obj;
+        }
+        return new NullifierLeafPreimage(NullifierLeaf.fromPlainObject(obj.leaf), Fr.fromPlainObject(obj.nextKey), typeof obj.nextIndex === 'bigint' ? obj.nextIndex : BigInt(obj.nextIndex));
+    }
+    static get leafSchema() {
+        return NullifierLeaf.schema;
     }
     getKey() {
-        return this.nullifier.toBigInt();
+        return this.leaf.getKey();
     }
     getNextKey() {
-        return this.nextNullifier.toBigInt();
+        return this.nextKey.toBigInt();
     }
     getNextIndex() {
         return this.nextIndex;
     }
     asLeaf() {
-        return new NullifierLeaf(this.nullifier);
+        return this.leaf;
     }
     toBuffer() {
         return Buffer.concat(this.toHashInputs());
     }
     toHashInputs() {
         return [
-            Buffer.from(this.nullifier.toBuffer()),
-            Buffer.from(this.nextNullifier.toBuffer()),
+            ...this.leaf.toHashInputs(),
+            Buffer.from(this.nextKey.toBuffer()),
             Buffer.from(toBufferBE(this.nextIndex, 32))
         ];
     }
@@ -54,23 +69,23 @@ import { z } from 'zod';
         return this.toHashInputs().map((buf)=>Fr.fromBuffer(buf));
     }
     clone() {
-        return new NullifierLeafPreimage(this.nullifier, this.nextNullifier, this.nextIndex);
+        return new NullifierLeafPreimage(this.leaf.clone(), this.nextKey, this.nextIndex);
     }
     static random() {
-        return new NullifierLeafPreimage(Fr.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
+        return new NullifierLeafPreimage(NullifierLeaf.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
     }
     static empty() {
-        return new NullifierLeafPreimage(Fr.ZERO, Fr.ZERO, 0n);
+        return new NullifierLeafPreimage(NullifierLeaf.empty(), Fr.zero(), 0n);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new NullifierLeafPreimage(reader.readObject(Fr), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
+        return new NullifierLeafPreimage(NullifierLeaf.fromBuffer(reader), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
     }
     static fromLeaf(leaf, nextKey, nextIndex) {
-        return new NullifierLeafPreimage(leaf.nullifier, new Fr(nextKey), nextIndex);
+        return new NullifierLeafPreimage(leaf, new Fr(nextKey), nextIndex);
     }
     static clone(preimage) {
-        return new NullifierLeafPreimage(preimage.nullifier, preimage.nextNullifier, preimage.nextIndex);
+        return preimage.clone();
     }
 }
 /**
@@ -88,6 +103,20 @@ import { z } from 'zod';
     toBuffer() {
         return this.nullifier.toBuffer();
     }
+    clone() {
+        return new NullifierLeaf(new Fr(this.nullifier));
+    }
+    toHashInputs() {
+        return [
+            Buffer.from(this.nullifier.toBuffer())
+        ];
+    }
+    static empty() {
+        return new NullifierLeaf(Fr.ZERO);
+    }
+    static random() {
+        return new NullifierLeaf(Fr.random());
+    }
     isEmpty() {
         return this.nullifier.isZero();
     }
@@ -98,6 +127,24 @@ import { z } from 'zod';
         return new NullifierLeaf(new Fr(key));
     }
     static fromBuffer(buf) {
-        return new NullifierLeaf(Fr.fromBuffer(buf));
+        const reader = BufferReader.asReader(buf);
+        return new NullifierLeaf(reader.readObject(Fr));
+    }
+    static get schema() {
+        return z.object({
+            nullifier: schemas.Fr
+        }).transform(({ nullifier })=>new NullifierLeaf(nullifier));
+    }
+    /**
+   * Creates a NullifierLeaf from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing NullifierLeaf fields
+   * @returns A NullifierLeaf instance
+   */ static fromPlainObject(obj) {
+        if (obj instanceof NullifierLeaf) {
+            return obj;
+        }
+        return new NullifierLeaf(Fr.fromPlainObject(obj.nullifier));
     }
 }