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

package/dest/trees/nullifier_leaf.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
@@ -12,11 +10,11 @@ export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     /**
      * 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.
      */
@@ -25,32 +23,53 @@ export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     /**
      * 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;
     }>;
+    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;
@@ -80,9 +99,22 @@ 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;
+    }>;
 }
 //# sourceMappingURL=nullifier_leaf.d.ts.map

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,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,IAAI,EAAE,aAAa;IAC1B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,IAAI,EAAE,aAAa;IAC1B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,KAAK,UAAU;;;;;;;;OAEpB;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;IASvE,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,KAAK,IAAI,aAAa;IAItB,YAAY,IAAI,MAAM,EAAE;IAIxB,MAAM,CAAC,KAAK,IAAI,aAAa;IAI7B,MAAM,CAAC,MAAM,IAAI,aAAa;IAI9B,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,YAAY,GAAG,aAAa;IAK5D,MAAM,KAAK,MAAM;;;;;;;;OAEhB;CACF"}

package/dest/trees/nullifier_leaf.js

@@ -7,46 +7,49 @@ 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));
+    }
+    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 +57,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 +91,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 +115,12 @@ 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));
     }
 }

package/dest/trees/nullifier_membership_witness.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { SiblingPath } from '@aztec/foundation/trees';
+import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { NullifierLeafPreimage } from './nullifier_leaf.js';
 /**
@@ -40,50 +38,64 @@ export declare class NullifierMembershipWitness {
     static get schema(): z.ZodEffects<z.ZodObject<{
         index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         leafPreimage: 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;
+            }>, import("./nullifier_leaf.js").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: import("./nullifier_leaf.js").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;
         }>;
-        siblingPath: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
-            type: z.ZodLiteral<"Buffer">;
-            data: z.ZodArray<z.ZodNumber, "many">;
+        siblingPath: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
+            type: import("zod").ZodLiteral<"Buffer">;
+            data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
         }, "strip", z.ZodTypeAny, {
             type: "Buffer";
             data: number[];
         }, {
             type: "Buffer";
             data: number[];
-        }>, Buffer, {
+        }>, Buffer<ArrayBuffer>, {
             type: "Buffer";
             data: number[];
-        }>]>, SiblingPath<40>, string | {
+        }>]>, SiblingPath<42>, string | {
             type: "Buffer";
             data: number[];
-        }>, SiblingPath<40>, string | {
+        }>, SiblingPath<42>, string | {
             type: "Buffer";
             data: number[];
         }>;
     }, "strip", z.ZodTypeAny, {
         index: bigint;
         leafPreimage: NullifierLeafPreimage;
-        siblingPath: SiblingPath<40>;
+        siblingPath: SiblingPath<42>;
     }, {
         index: string | number | bigint;
         leafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         };
         siblingPath: string | {
@@ -93,8 +105,10 @@ export declare class NullifierMembershipWitness {
     }>, NullifierMembershipWitness, {
         index: string | number | bigint;
         leafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         };
         siblingPath: string | {
@@ -103,10 +117,15 @@ export declare class NullifierMembershipWitness {
         };
     }>;
     static random(): NullifierMembershipWitness;
+    withoutPreimage(): MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
     /**
      * Returns a field array representation of a nullifier witness.
      * @returns A field array representation of a nullifier witness.
      */
     toFields(): Fr[];
+    /**
+     * Returns a representation of the nullifier membership witness as expected by intrinsic Noir deserialization.
+     */
+    toNoirRepresentation(): (string | string[])[];
 }
 //# sourceMappingURL=nullifier_membership_witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQb;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;CAGxB"}
+{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQN,eAAe,IAAI,iBAAiB,CAAC,OAAO,qBAAqB,CAAC;IAIzE;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}

package/dest/trees/nullifier_membership_witness.js

@@ -1,6 +1,6 @@
 import { NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { SiblingPath } from '@aztec/foundation/trees';
+import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { schemas } from '../schemas/index.js';
 import { NullifierLeafPreimage } from './nullifier_leaf.js';
@@ -34,6 +34,9 @@ import { NullifierLeafPreimage } from './nullifier_leaf.js';
     static random() {
         return new NullifierMembershipWitness(BigInt(Math.floor(Math.random() * 1000)), NullifierLeafPreimage.random(), SiblingPath.random(NULLIFIER_TREE_HEIGHT));
     }
+    withoutPreimage() {
+        return new MembershipWitness(NULLIFIER_TREE_HEIGHT, this.index, this.siblingPath.toTuple());
+    }
     /**
    * Returns a field array representation of a nullifier witness.
    * @returns A field array representation of a nullifier witness.
@@ -44,4 +47,14 @@ import { NullifierLeafPreimage } from './nullifier_leaf.js';
             ...this.siblingPath.toFields()
         ];
     }
+    /**
+   * Returns a representation of the nullifier membership witness as expected by intrinsic Noir deserialization.
+   */ toNoirRepresentation() {
+        // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+        return [
+            new Fr(this.index).toString(),
+            ...this.leafPreimage.toFields().map((fr)=>fr.toString()),
+            this.siblingPath.toFields().map((fr)=>fr.toString())
+        ];
+    }
 }

package/dest/trees/public_data_leaf.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
@@ -10,58 +8,77 @@ import { z } from 'zod';
  */
 export declare class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
     /**
-     * The slot of the leaf
+     * The leaf (slot, value).
      */
-    slot: Fr;
+    leaf: PublicDataTreeLeaf;
     /**
-     * The value of the leaf
+     * Next key (slot) inside the indexed tree's linked list.
      */
-    value: Fr;
-    /**
-     * Next value inside the indexed tree's linked list.
-     */
-    nextSlot: Fr;
+    nextKey: Fr;
     /**
      * Index of the next leaf in the indexed tree's linked list.
      */
     nextIndex: bigint;
     constructor(
     /**
-     * The slot of the leaf
+     * The leaf (slot, value).
      */
-    slot: Fr, 
+    leaf: PublicDataTreeLeaf, 
     /**
-     * The value of the leaf
+     * Next key (slot) inside the indexed tree's linked list.
      */
-    value: Fr, 
-    /**
-     * Next value inside the indexed tree's linked list.
-     */
-    nextSlot: Fr, 
+    nextKey: Fr, 
     /**
      * Index of the next leaf in the indexed tree's linked list.
      */
     nextIndex: bigint);
     static get schema(): z.ZodEffects<z.ZodObject<{
+        leaf: z.ZodEffects<z.ZodObject<{
+            slot: z.ZodType<Fr, any, string>;
+            value: z.ZodType<Fr, any, string>;
+        }, "strip", z.ZodTypeAny, {
+            value: Fr;
+            slot: Fr;
+        }, {
+            value: string;
+            slot: string;
+        }>, PublicDataTreeLeaf, {
+            value: string;
+            slot: string;
+        }>;
+        nextKey: z.ZodType<Fr, any, string>;
+        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    }, "strip", z.ZodTypeAny, {
+        leaf: PublicDataTreeLeaf;
+        nextKey: Fr;
+        nextIndex: bigint;
+    }, {
+        leaf: {
+            value: string;
+            slot: string;
+        };
+        nextKey: string;
+        nextIndex: string | number | bigint;
+    }>, PublicDataTreeLeafPreimage, {
+        leaf: {
+            value: string;
+            slot: string;
+        };
+        nextKey: string;
+        nextIndex: string | number | bigint;
+    }>;
+    static get leafSchema(): z.ZodEffects<z.ZodObject<{
         slot: z.ZodType<Fr, any, string>;
         value: z.ZodType<Fr, any, string>;
-        nextSlot: z.ZodType<Fr, any, string>;
-        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
     }, "strip", z.ZodTypeAny, {
         value: Fr;
         slot: Fr;
-        nextIndex: bigint;
-        nextSlot: Fr;
     }, {
         value: string;
         slot: string;
-        nextIndex: string | number | bigint;
-        nextSlot: string;
-    }>, PublicDataTreeLeafPreimage, {
+    }>, PublicDataTreeLeaf, {
         value: string;
         slot: string;
-        nextIndex: string | number | bigint;
-        nextSlot: string;
     }>;
     getKey(): bigint;
     getNextKey(): bigint;
@@ -98,7 +115,9 @@ export declare class PublicDataTreeLeaf implements IndexedTreeLeaf {
      */
     value: Fr);
     getKey(): bigint;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    clone(): PublicDataTreeLeaf;
+    toHashInputs(): Buffer[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicDataTreeLeaf;
     equals(another: PublicDataTreeLeaf): boolean;
     toString(): string;
@@ -106,5 +125,18 @@ export declare class PublicDataTreeLeaf implements IndexedTreeLeaf {
     updateTo(another: PublicDataTreeLeaf): PublicDataTreeLeaf;
     static buildDummy(key: bigint): PublicDataTreeLeaf;
     static empty(): PublicDataTreeLeaf;
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        slot: z.ZodType<Fr, any, string>;
+        value: z.ZodType<Fr, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        value: Fr;
+        slot: Fr;
+    }, {
+        value: string;
+        slot: string;
+    }>, PublicDataTreeLeaf, {
+        value: string;
+        slot: string;
+    }>;
 }
 //# sourceMappingURL=public_data_leaf.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"public_data_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_leaf.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,0BAA2B,YAAW,uBAAuB;IAEtE;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;IAChB;;OAEG;IACI,QAAQ,EAAE,EAAE;IACnB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAfxB;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;IAChB;;OAEG;IACI,QAAQ,EAAE,EAAE;IACnB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAWhB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,kBAAkB;IAI5B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IASxB,KAAK,IAAI,0BAA0B;IAInC,MAAM,CAAC,MAAM;IASb,MAAM,CAAC,KAAK,IAAI,0BAA0B;IAI1C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,0BAA0B;IAS5E,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,0BAA0B;IAIzG,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAA0B,GAAG,0BAA0B;CAG/E;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IAEtD;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;;IAPhB;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;IAGlB,MAAM,IAAI,MAAM;IAIhB,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO;IAI5C,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB;IAOzD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;IAIlD,MAAM,CAAC,KAAK,IAAI,kBAAkB;CAGnC"}
+{"version":3,"file":"public_data_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_leaf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,0BAA2B,YAAW,uBAAuB;IAEtE;;OAEG;IACI,IAAI,EAAE,kBAAkB;IAC/B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,IAAI,EAAE,kBAAkB;IAC/B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,KAAK,UAAU;;;;;;;;;;;;OAEpB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,kBAAkB;IAI5B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAQxB,KAAK,IAAI,0BAA0B;IAInC,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,KAAK,IAAI,0BAA0B;IAI1C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,0BAA0B;IAQ5E,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,0BAA0B;IAIzG,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAA0B,GAAG,0BAA0B;CAG/E;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IAEtD;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;;IAPhB;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;OAEG;IACI,KAAK,EAAE,EAAE;IAGlB,MAAM,IAAI,MAAM;IAIhB,QAAQ;IAIR,KAAK,IAAI,kBAAkB;IAI3B,YAAY,IAAI,MAAM,EAAE;IAIxB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO;IAI5C,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB;IAOzD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;IAIlD,MAAM,CAAC,KAAK,IAAI,kBAAkB;IAIlC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;CACF"}