@aztec/stdlib 0.82.3 → 0.83.0

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,42 +57,56 @@ 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.value, 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();
     }
 }
 /**
  * A nullifier to be inserted in the nullifier tree.
  */ export class NullifierLeaf {
-    value;
+    nullifier;
     constructor(/**
      * Nullifier value.
-     */ value){
-        this.value = value;
+     */ nullifier){
+        this.nullifier = nullifier;
     }
     getKey() {
-        return this.value.toBigInt();
+        return this.nullifier.toBigInt();
     }
     toBuffer() {
-        return this.value.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.value.isZero();
+        return this.nullifier.isZero();
     }
     updateTo(_another) {
         throw new Error('Nullifiers are create only');
@@ -98,11 +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({
-            value: schemas.Fr
-        }).transform(({ value })=>new NullifierLeaf(value));
+            nullifier: schemas.Fr
+        }).transform(({ nullifier })=>new NullifierLeaf(nullifier));
     }
 }

package/dest/trees/nullifier_membership_witness.d.ts

@@ -40,20 +40,32 @@ 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<{
@@ -82,8 +94,10 @@ export declare class NullifierMembershipWitness {
     }, {
         index: string | number | bigint;
         leafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         };
         siblingPath: string | {
@@ -93,8 +107,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 | {

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;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}
+{"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;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}

package/dest/trees/protocol_contract_leaf.d.ts

@@ -62,7 +62,6 @@ export declare class ProtocolContractLeafPreimage implements IndexedTreeLeafPrei
     static random(): ProtocolContractLeafPreimage;
     static empty(): ProtocolContractLeafPreimage;
     static fromBuffer(buffer: Buffer | BufferReader): ProtocolContractLeafPreimage;
-    static fromLeaf(leaf: ProtocolContractLeaf, nextKey: bigint, nextIndex: bigint): ProtocolContractLeafPreimage;
 }
 /**
  * An address to be inserted or checked in the protocol contract tree.

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

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/protocol_contract_leaf.ts"],"names":[],"mappings":";;AAEA,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;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,uBAAuB;IAExE;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;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,oBAAoB;IAI9B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAKxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,KAAK,IAAI,4BAA4B;IAI5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,4BAA4B;IAS9E,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,4BAA4B;CAG9G;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IAExD;;OAEG;IACI,OAAO,EAAE,EAAE;;IAHlB;;OAEG;IACI,OAAO,EAAE,EAAE;IAGpB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,oBAAoB;IAI9D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;IAIpD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;CAGrD"}
+{"version":3,"file":"protocol_contract_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/protocol_contract_leaf.ts"],"names":[],"mappings":";;AAEA,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;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,uBAAuB;IAExE;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;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,oBAAoB;IAI9B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAKxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,KAAK,IAAI,4BAA4B;IAI5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,4BAA4B;CAQ/E;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IAExD;;OAEG;IACI,OAAO,EAAE,EAAE;;IAHlB;;OAEG;IACI,OAAO,EAAE,EAAE;IAGpB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,oBAAoB;IAI9D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;IAIpD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;CAGrD"}

package/dest/trees/protocol_contract_leaf.js

@@ -69,9 +69,6 @@ import { z } from 'zod';
         const reader = BufferReader.asReader(buffer);
         return new ProtocolContractLeafPreimage(reader.readObject(Fr), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
     }
-    static fromLeaf(leaf, nextKey, nextIndex) {
-        return new ProtocolContractLeafPreimage(leaf.address, new Fr(nextKey), nextIndex);
-    }
 }
 /**
  * An address to be inserted or checked in the protocol contract tree.

package/dest/trees/public_data_leaf.d.ts

@@ -10,58 +10,77 @@ import { z } from 'zod';
  */
 export declare class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
     /**
-     * The slot of the leaf
+     * The leaf (slot, value).
      */
-    slot: Fr;
-    /**
-     * The value of the leaf
-     */
-    value: Fr;
+    leaf: PublicDataTreeLeaf;
     /**
-     * Next value inside the indexed tree's linked list.
+     * Next key (slot) 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;
@@ -99,6 +118,8 @@ export declare class PublicDataTreeLeaf implements IndexedTreeLeaf {
     value: Fr);
     getKey(): bigint;
     toBuffer(): Buffer;
+    clone(): PublicDataTreeLeaf;
+    toHashInputs(): Buffer[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicDataTreeLeaf;
     equals(another: PublicDataTreeLeaf): boolean;
     toString(): string;

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;IAIlC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;CACF"}
+{"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"}

package/dest/trees/public_data_leaf.js

@@ -7,77 +7,73 @@ import { z } from 'zod';
  * Class containing the data of a preimage of a single leaf in the public data tree.
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
  */ export class PublicDataTreeLeafPreimage {
-    slot;
-    value;
-    nextSlot;
+    leaf;
+    nextKey;
     nextIndex;
     constructor(/**
-     * The slot of the leaf
-     */ slot, /**
-     * The value of the leaf
-     */ value, /**
-     * Next value inside the indexed tree's linked list.
-     */ nextSlot, /**
+     * The leaf (slot, value).
+     */ leaf, /**
+     * Next key (slot) inside the indexed tree's linked list.
+     */ nextKey, /**
      * Index of the next leaf in the indexed tree's linked list.
      */ nextIndex){
-        this.slot = slot;
-        this.value = value;
-        this.nextSlot = nextSlot;
+        this.leaf = leaf;
+        this.nextKey = nextKey;
         this.nextIndex = nextIndex;
     }
     static get schema() {
         return z.object({
-            slot: schemas.Fr,
-            value: schemas.Fr,
-            nextSlot: schemas.Fr,
+            leaf: PublicDataTreeLeaf.schema,
+            nextKey: schemas.Fr,
             nextIndex: schemas.BigInt
-        }).transform(({ slot, value, nextSlot, nextIndex })=>new PublicDataTreeLeafPreimage(slot, value, nextSlot, nextIndex));
+        }).transform(({ leaf, nextKey, nextIndex })=>new PublicDataTreeLeafPreimage(leaf, nextKey, nextIndex));
+    }
+    static get leafSchema() {
+        return PublicDataTreeLeaf.schema;
     }
     getKey() {
-        return this.slot.toBigInt();
+        return this.leaf.getKey();
     }
     getNextKey() {
-        return this.nextSlot.toBigInt();
+        return this.nextKey.toBigInt();
     }
     getNextIndex() {
         return this.nextIndex;
     }
     asLeaf() {
-        return new PublicDataTreeLeaf(this.slot, this.value);
+        return this.leaf;
     }
     toBuffer() {
         return Buffer.concat(this.toHashInputs());
     }
     toHashInputs() {
         return [
-            Buffer.from(this.slot.toBuffer()),
-            Buffer.from(this.value.toBuffer()),
+            ...this.leaf.toHashInputs(),
             Buffer.from(toBufferBE(this.nextIndex, 32)),
-            Buffer.from(this.nextSlot.toBuffer())
+            Buffer.from(this.nextKey.toBuffer())
         ];
     }
     clone() {
-        return new PublicDataTreeLeafPreimage(this.slot, this.value, this.nextSlot, this.nextIndex);
+        return new PublicDataTreeLeafPreimage(this.leaf.clone(), this.nextKey, this.nextIndex);
     }
     static random() {
-        return new PublicDataTreeLeafPreimage(Fr.random(), Fr.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
+        return new PublicDataTreeLeafPreimage(PublicDataTreeLeaf.buildDummy(BigInt(Math.floor(Math.random() * 1000))), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
     }
     static empty() {
-        return new PublicDataTreeLeafPreimage(Fr.ZERO, Fr.ZERO, Fr.ZERO, 0n);
+        return new PublicDataTreeLeafPreimage(PublicDataTreeLeaf.empty(), Fr.ZERO, 0n);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        const slot = Fr.fromBuffer(reader);
-        const value = Fr.fromBuffer(reader);
+        const value = PublicDataTreeLeaf.fromBuffer(reader);
         const nextIndex = toBigIntBE(reader.readBytes(32));
         const nextSlot = Fr.fromBuffer(reader);
-        return new PublicDataTreeLeafPreimage(slot, value, nextSlot, nextIndex);
+        return new PublicDataTreeLeafPreimage(value, nextSlot, nextIndex);
     }
     static fromLeaf(leaf, nextKey, nextIndex) {
-        return new PublicDataTreeLeafPreimage(leaf.slot, leaf.value, new Fr(nextKey), nextIndex);
+        return new PublicDataTreeLeafPreimage(leaf, new Fr(nextKey), nextIndex);
     }
     static clone(preimage) {
-        return new PublicDataTreeLeafPreimage(preimage.slot, preimage.value, preimage.nextSlot, preimage.nextIndex);
+        return preimage.clone();
     }
 }
 /**
@@ -102,6 +98,15 @@ import { z } from 'zod';
             this.value
         ]);
     }
+    clone() {
+        return new PublicDataTreeLeaf(this.slot, this.value);
+    }
+    toHashInputs() {
+        return [
+            this.slot.toBuffer(),
+            this.value.toBuffer()
+        ];
+    }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new PublicDataTreeLeaf(Fr.fromBuffer(reader), Fr.fromBuffer(reader));

package/dest/trees/public_data_witness.d.ts

@@ -43,25 +43,39 @@ export declare class PublicDataWitness {
     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<{
-            slot: z.ZodType<Fr, any, string>;
-            value: z.ZodType<Fr, any, string>;
-            nextSlot: z.ZodType<Fr, any, string>;
+            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;
+            }>, import("./public_data_leaf.js").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, {
-            value: Fr;
-            slot: Fr;
+            leaf: import("./public_data_leaf.js").PublicDataTreeLeaf;
+            nextKey: Fr;
             nextIndex: bigint;
-            nextSlot: Fr;
         }, {
-            value: string;
-            slot: string;
+            leaf: {
+                value: string;
+                slot: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
-            nextSlot: string;
         }>, PublicDataTreeLeafPreimage, {
-            value: string;
-            slot: string;
+            leaf: {
+                value: string;
+                slot: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
-            nextSlot: string;
         }>;
         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">;
@@ -89,10 +103,12 @@ export declare class PublicDataWitness {
     }, {
         index: string | number | bigint;
         leafPreimage: {
-            value: string;
-            slot: string;
+            leaf: {
+                value: string;
+                slot: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
-            nextSlot: string;
         };
         siblingPath: string | {
             type: "Buffer";
@@ -101,10 +117,12 @@ export declare class PublicDataWitness {
     }>, PublicDataWitness, {
         index: string | number | bigint;
         leafPreimage: {
-            value: string;
-            slot: string;
+            leaf: {
+                value: string;
+                slot: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
-            nextSlot: string;
         };
         siblingPath: string | {
             type: "Buffer";

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

@@ -1 +1 @@
-{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;;IAZxE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAG1E,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAWvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;IAYpD,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,MAAM;IAQb;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAUnE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}
+{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;;IAZxE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAG1E,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAWvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;IAYpD,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,MAAM;IAQb;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAUnE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}

package/dest/trees/public_data_witness.js

@@ -41,10 +41,10 @@ import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
    */ toFields() {
         return [
             new Fr(this.index),
-            new Fr(this.leafPreimage.slot),
-            new Fr(this.leafPreimage.value),
+            new Fr(this.leafPreimage.leaf.slot),
+            new Fr(this.leafPreimage.leaf.value),
             new Fr(this.leafPreimage.nextIndex),
-            new Fr(this.leafPreimage.nextSlot),
+            new Fr(this.leafPreimage.nextKey),
             ...this.siblingPath.toFields()
         ];
     }
@@ -54,9 +54,9 @@ import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
         // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
         return [
             new Fr(this.index).toString(),
-            new Fr(this.leafPreimage.slot).toString(),
-            new Fr(this.leafPreimage.value).toString(),
-            new Fr(this.leafPreimage.nextSlot).toString(),
+            new Fr(this.leafPreimage.leaf.slot).toString(),
+            new Fr(this.leafPreimage.leaf.value).toString(),
+            new Fr(this.leafPreimage.nextKey).toString(),
             new Fr(this.leafPreimage.nextIndex).toString(),
             this.siblingPath.toFields().map((fr)=>fr.toString())
         ];

package/dest/versioning/versioning.d.ts

@@ -6,7 +6,7 @@ import type { ChainConfig } from '../config/config.js';
 export type ComponentsVersions = {
     l1ChainId: number;
     l1RollupAddress: EthAddress;
-    l2ChainVersion: number;
+    rollupVersion: number;
     l2ProtocolContractsTreeRoot: string;
     l2CircuitsVkTreeRoot: string;
 };

package/dest/versioning/versioning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD,8IAA8I;AAC9I,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,UAAU,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qDAAqD;AACrD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,WAAW,EACnB,2BAA2B,EAAE,MAAM,GAAG,EAAE,EACxC,oBAAoB,EAAE,MAAM,GAAG,EAAE,GAChC,kBAAkB,CAQpB;AAED,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAiB9E;AAED,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIzD;AAED,iGAAiG;AACjG,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QAmC/F;AAED,8EAA8E;AAC9E,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACrC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,QAiBpC;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,SACxD,IAAI,OAAO,QAAQ,MAAM,QAAQ,IAAI,CAAC,mBAS1D;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,iBAC3D;IAAE,OAAO,EAAE;QAAE,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,mBAYzF"}
+{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD,8IAA8I;AAC9I,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,UAAU,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qDAAqD;AACrD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,WAAW,EACnB,2BAA2B,EAAE,MAAM,GAAG,EAAE,EACxC,oBAAoB,EAAE,MAAM,GAAG,EAAE,GAChC,kBAAkB,CAQpB;AAED,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAiB9E;AAED,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIzD;AAED,iGAAiG;AACjG,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QA6B/F;AAED,8EAA8E;AAC9E,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACrC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,QAiBpC;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,SACxD,IAAI,OAAO,QAAQ,MAAM,QAAQ,IAAI,CAAC,mBAS1D;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,iBAC3D;IAAE,OAAO,EAAE;QAAE,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,mBAYzF"}