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

package/dest/tx/content_commitment.d.ts

@@ -1,101 +1,44 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import type { ViemContentCommitment } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-export declare const NUM_BYTES_PER_SHA256 = 32;
 export declare class ContentCommitment {
-    numTxs: Fr;
-    blobsHash: Buffer;
-    inHash: Buffer;
-    outHash: Buffer;
-    constructor(numTxs: Fr, blobsHash: Buffer, inHash: Buffer, outHash: Buffer);
+    blobsHash: Fr;
+    inHash: Fr;
+    outHash: Fr;
+    constructor(blobsHash: Fr, inHash: Fr, outHash: Fr);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        numTxs: z.ZodType<Fr, any, string>;
-        blobsHash: 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">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>;
-        inHash: 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">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>;
-        outHash: 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">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>;
+        blobsHash: z.ZodType<Fr, any, string>;
+        inHash: z.ZodType<Fr, any, string>;
+        outHash: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
-        numTxs: Fr;
-        blobsHash: Buffer;
-        inHash: Buffer;
-        outHash: Buffer;
+        blobsHash: Fr;
+        inHash: Fr;
+        outHash: Fr;
     }, {
-        numTxs: string;
-        blobsHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        inHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        outHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        blobsHash: string;
+        inHash: string;
+        outHash: string;
     }>, ContentCommitment, {
-        numTxs: string;
-        blobsHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        inHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        outHash: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        blobsHash: string;
+        inHash: string;
+        outHash: string;
     }>;
+    static getFields(fields: FieldsOf<ContentCommitment>): readonly [Fr, Fr, Fr];
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): ContentCommitment;
     toInspect(): {
-        numTxs: number;
         blobsHash: `0x${string}`;
         inHash: `0x${string}`;
         outHash: `0x${string}`;
     };
+    toViem(): ViemContentCommitment;
+    static fromViem(contentCommitment: ViemContentCommitment): ContentCommitment;
     toFields(): Fr[];
-    static fromBuffer(buffer: Buffer | BufferReader): ContentCommitment;
     static fromFields(fields: Fr[] | FieldReader): ContentCommitment;
+    static random(): ContentCommitment;
     static empty(): ContentCommitment;
     isEmpty(): boolean;
     toString(): string;

package/dest/tx/content_commitment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content_commitment.d.ts","sourceRoot":"","sources":["../../src/tx/content_commitment.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,qBAAa,iBAAiB;IACT,MAAM,EAAE,EAAE;IAAS,SAAS,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM;IAAS,OAAO,EAAE,MAAM;gBAAnF,MAAM,EAAE,EAAE,EAAS,SAAS,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,EAAS,OAAO,EAAE,MAAM;IAsBtG,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,OAAO;IAIP,QAAQ;IAIR,SAAS;;;;;;IAST,QAAQ,IAAI,EAAE,EAAE;IAehB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAWnE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,iBAAiB;IAUhE,MAAM,CAAC,KAAK,IAAI,iBAAiB;IASjC,OAAO,IAAI,OAAO;IASX,QAAQ,IAAI,MAAM;IAIzB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IAK1C,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAQpC"}
+{"version":3,"file":"content_commitment.d.ts","sourceRoot":"","sources":["../../src/tx/content_commitment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,iBAAiB;IAEnB,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;gBAFX,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE;IAGpB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAIpD,OAAO;IAIP,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAMnE,SAAS;;;;;IAQT,MAAM,IAAI,qBAAqB;IAQ/B,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB;IAQxD,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,iBAAiB;IAKhE,MAAM,CAAC,MAAM,IAAI,iBAAiB;IAIlC,MAAM,CAAC,KAAK,IAAI,iBAAiB;IAIjC,OAAO,IAAI,OAAO;IAIX,QAAQ,IAAI,MAAM;IAIzB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IAK1C,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAKpC"}

package/dest/tx/content_commitment.js

@@ -1,87 +1,73 @@
-import { CONTENT_COMMITMENT_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { bufferToHex } from '@aztec/foundation/string';
 import { z } from 'zod';
-export const NUM_BYTES_PER_SHA256 = 32;
 export class ContentCommitment {
-    numTxs;
     blobsHash;
     inHash;
     outHash;
-    constructor(numTxs, blobsHash, inHash, outHash){
-        this.numTxs = numTxs;
+    constructor(blobsHash, inHash, outHash){
         this.blobsHash = blobsHash;
         this.inHash = inHash;
         this.outHash = outHash;
-        // NB: we do not calculate blobHash in the circuit, but we still truncate it so it fits in a field
-        if (blobsHash.length !== NUM_BYTES_PER_SHA256) {
-            throw new Error(`blobsHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
-        }
-        if (blobsHash[0] !== 0) {
-            throw new Error(`blobsHash buffer should be truncated and left padded`);
-        }
-        if (inHash.length !== NUM_BYTES_PER_SHA256) {
-            throw new Error(`inHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
-        }
-        if (inHash[0] !== 0) {
-            throw new Error(`inHash buffer should be truncated and left padded`);
-        }
-        if (outHash.length !== NUM_BYTES_PER_SHA256) {
-            throw new Error(`outHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
-        }
-        if (outHash[0] !== 0) {
-            throw new Error(`outHash buffer should be truncated and left padded`);
-        }
     }
     static get schema() {
         return z.object({
-            numTxs: schemas.Fr,
-            blobsHash: schemas.Buffer,
-            inHash: schemas.Buffer,
-            outHash: schemas.Buffer
-        }).transform(({ numTxs, blobsHash, inHash, outHash })=>new ContentCommitment(numTxs, blobsHash, inHash, outHash));
+            blobsHash: schemas.Fr,
+            inHash: schemas.Fr,
+            outHash: schemas.Fr
+        }).transform(({ blobsHash, inHash, outHash })=>new ContentCommitment(blobsHash, inHash, outHash));
+    }
+    static getFields(fields) {
+        return [
+            fields.blobsHash,
+            fields.inHash,
+            fields.outHash
+        ];
     }
     getSize() {
         return this.toBuffer().length;
     }
     toBuffer() {
-        return serializeToBuffer(this.numTxs, this.blobsHash, this.inHash, this.outHash);
+        return serializeToBuffer(...ContentCommitment.getFields(this));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new ContentCommitment(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr));
     }
     toInspect() {
         return {
-            numTxs: this.numTxs.toNumber(),
-            blobsHash: bufferToHex(this.blobsHash),
-            inHash: bufferToHex(this.inHash),
-            outHash: bufferToHex(this.outHash)
+            blobsHash: this.blobsHash.toString(),
+            inHash: this.inHash.toString(),
+            outHash: this.outHash.toString()
         };
     }
-    toFields() {
-        const serialized = [
-            this.numTxs,
-            Fr.fromBuffer(this.blobsHash),
-            Fr.fromBuffer(this.inHash),
-            Fr.fromBuffer(this.outHash)
-        ];
-        if (serialized.length !== CONTENT_COMMITMENT_LENGTH) {
-            throw new Error(`Expected content commitment to have ${CONTENT_COMMITMENT_LENGTH} fields, but it has ${serialized.length} fields`);
-        }
-        return serialized;
+    toViem() {
+        return {
+            blobsHash: this.blobsHash.toString(),
+            inHash: this.inHash.toString(),
+            outHash: this.outHash.toString()
+        };
     }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new ContentCommitment(reader.readObject(Fr), reader.readBytes(NUM_BYTES_PER_SHA256), reader.readBytes(NUM_BYTES_PER_SHA256), reader.readBytes(NUM_BYTES_PER_SHA256));
+    static fromViem(contentCommitment) {
+        return new ContentCommitment(Fr.fromString(contentCommitment.blobsHash), Fr.fromString(contentCommitment.inHash), Fr.fromString(contentCommitment.outHash));
+    }
+    toFields() {
+        return serializeToFields(...ContentCommitment.getFields(this));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new ContentCommitment(reader.readField(), reader.readField().toBuffer(), reader.readField().toBuffer(), reader.readField().toBuffer());
+        return new ContentCommitment(reader.readField(), reader.readField(), reader.readField());
+    }
+    static random() {
+        return new ContentCommitment(Fr.random(), Fr.random(), Fr.random());
     }
     static empty() {
-        return new ContentCommitment(Fr.zero(), Buffer.alloc(NUM_BYTES_PER_SHA256), Buffer.alloc(NUM_BYTES_PER_SHA256), Buffer.alloc(NUM_BYTES_PER_SHA256));
+        return new ContentCommitment(Fr.zero(), Fr.zero(), Fr.zero());
     }
     isEmpty() {
-        return this.numTxs.isZero() && this.blobsHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256)) && this.inHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256)) && this.outHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256));
+        return this.blobsHash.isZero() && this.inHash.isZero() && this.outHash.isZero();
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -91,6 +77,6 @@ export class ContentCommitment {
         return ContentCommitment.fromBuffer(buffer);
     }
     equals(other) {
-        return this.inHash.equals(other.inHash) && this.outHash.equals(other.outHash) && this.numTxs.equals(other.numTxs) && this.blobsHash.equals(other.blobsHash);
+        return this.blobsHash.equals(other.blobsHash) && this.inHash.equals(other.inHash) && this.outHash.equals(other.outHash);
     }
 }

package/dest/tx/function_data.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, FieldReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';

package/dest/tx/function_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_data.d.ts","sourceRoot":"","sources":["../../src/tx/function_data.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,wCAAwC;AACxC,qBAAa,YAAY;IAErB,sDAAsD;IAC/C,QAAQ,EAAE,gBAAgB;IACjC,2DAA2D;IACpD,SAAS,EAAE,OAAO;;IAHzB,sDAAsD;IAC/C,QAAQ,EAAE,gBAAgB;IACjC,2DAA2D;IACpD,SAAS,EAAE,OAAO;WAGd,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IAOnF,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,EAAE,EAAE;IAUhB;;;OAGG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAIpC;;;;OAIG;WACW,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,6DAA6D;QAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,YAAY;IAIhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;IAK9D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,YAAY;CAQ5D"}
+{"version":3,"file":"function_data.d.ts","sourceRoot":"","sources":["../../src/tx/function_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,wCAAwC;AACxC,qBAAa,YAAY;IAErB,sDAAsD;IAC/C,QAAQ,EAAE,gBAAgB;IACjC,2DAA2D;IACpD,SAAS,EAAE,OAAO;;IAHzB,sDAAsD;IAC/C,QAAQ,EAAE,gBAAgB;IACjC,2DAA2D;IACpD,SAAS,EAAE,OAAO;WAGd,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IAOnF,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,EAAE,EAAE;IAUhB;;;OAGG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAIpC;;;;OAIG;WACW,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,6DAA6D;QAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,YAAY;IAIhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;IAK9D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,YAAY;CAQ5D"}

package/dest/tx/global_variable_builder.d.ts

@@ -1,7 +1,7 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '../aztec-address/index.js';
 import type { GasFees } from '../gas/gas_fees.js';
+import type { UInt32 } from '../types/index.js';
 import type { GlobalVariables } from './global_variables.js';
 /**
  * Interface for building global variables for Aztec blocks.
@@ -16,6 +16,6 @@ export interface GlobalVariableBuilder {
      * @param slotNumber - Optional. The slot number to use for the global variables. If undefined, it will be calculated.
      * @returns A promise that resolves to the GlobalVariables for the given block number.
      */
-    buildGlobalVariables(blockNumber: Fr, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: bigint): Promise<GlobalVariables>;
+    buildGlobalVariables(blockNumber: UInt32, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: bigint): Promise<GlobalVariables>;
 }
 //# sourceMappingURL=global_variable_builder.d.ts.map

package/dest/tx/global_variable_builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global_variable_builder.d.ts","sourceRoot":"","sources":["../../src/tx/global_variable_builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC;;;;;;;OAOG;IACH,oBAAoB,CAClB,WAAW,EAAE,EAAE,EACf,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7B"}
+{"version":3,"file":"global_variable_builder.d.ts","sourceRoot":"","sources":["../../src/tx/global_variable_builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvC;;;;;;;OAOG;IACH,oBAAoB,CAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7B"}

package/dest/tx/global_variables.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
@@ -9,6 +6,7 @@ import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
+import type { UInt32, UInt64 } from '../types/index.js';
 /**
  * Global variables of the L2 block.
  */
@@ -18,11 +16,11 @@ export declare class GlobalVariables {
     /** Version for the L2 block. */
     version: Fr;
     /** Block number of the L2 block. */
-    blockNumber: Fr;
+    blockNumber: UInt32;
     /** Slot number of the L2 block */
     slotNumber: Fr;
     /** Timestamp of the L2 block. */
-    timestamp: Fr;
+    timestamp: UInt64;
     /** Recipient of block reward. */
     coinbase: EthAddress;
     /** Address to receive fees. */
@@ -35,11 +33,11 @@ export declare class GlobalVariables {
     /** Version for the L2 block. */
     version: Fr, 
     /** Block number of the L2 block. */
-    blockNumber: Fr, 
+    blockNumber: UInt32, 
     /** Slot number of the L2 block */
     slotNumber: Fr, 
     /** Timestamp of the L2 block. */
-    timestamp: Fr, 
+    timestamp: UInt64, 
     /** Recipient of block reward. */
     coinbase: EthAddress, 
     /** Address to receive fees. */
@@ -49,55 +47,55 @@ export declare class GlobalVariables {
     static get schema(): z.ZodEffects<z.ZodObject<{
         chainId: import("../schemas/index.js").ZodFor<Fr>;
         version: import("../schemas/index.js").ZodFor<Fr>;
-        blockNumber: import("../schemas/index.js").ZodFor<Fr>;
+        blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         slotNumber: import("../schemas/index.js").ZodFor<Fr>;
-        timestamp: import("../schemas/index.js").ZodFor<Fr>;
+        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         coinbase: import("../schemas/index.js").ZodFor<EthAddress>;
         feeRecipient: import("../schemas/index.js").ZodFor<AztecAddress>;
         gasFees: z.ZodEffects<z.ZodObject<{
-            feePerDaGas: z.ZodType<Fr, any, string>;
-            feePerL2Gas: z.ZodType<Fr, any, string>;
+            feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            feePerDaGas: Fr;
-            feePerL2Gas: Fr;
+            feePerDaGas: bigint;
+            feePerL2Gas: bigint;
         }, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>, GasFees, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>;
     }, "strip", z.ZodTypeAny, {
         chainId: Fr;
         version: Fr;
-        blockNumber: Fr;
+        blockNumber: number;
         slotNumber: Fr;
-        timestamp: Fr;
+        timestamp: bigint;
         coinbase: EthAddress;
         feeRecipient: AztecAddress;
         gasFees: GasFees;
     }, {
+        blockNumber: string | number | bigint;
+        timestamp: string | number | bigint;
         gasFees: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
         chainId?: any;
         version?: any;
-        blockNumber?: any;
         slotNumber?: any;
-        timestamp?: any;
         coinbase?: any;
         feeRecipient?: any;
     }>, GlobalVariables, {
+        blockNumber: string | number | bigint;
+        timestamp: string | number | bigint;
         gasFees: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
         chainId?: any;
         version?: any;
-        blockNumber?: any;
         slotNumber?: any;
-        timestamp?: any;
         coinbase?: any;
         feeRecipient?: any;
     }>;
@@ -106,8 +104,8 @@ export declare class GlobalVariables {
     static empty(fields?: Partial<FieldsOf<GlobalVariables>>): GlobalVariables;
     static fromBuffer(buffer: Buffer | BufferReader): GlobalVariables;
     static fromFields(fields: Fr[] | FieldReader): GlobalVariables;
-    static getFields(fields: FieldsOf<GlobalVariables>): readonly [Fr, Fr, Fr, Fr, Fr, EthAddress, AztecAddress, GasFees];
-    toBuffer(): Buffer;
+    static getFields(fields: FieldsOf<GlobalVariables>): readonly [Fr, Fr, number, Fr, bigint, EthAddress, AztecAddress, GasFees];
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     /**
      * A trimmed version of the JSON representation of the global variables,
@@ -116,7 +114,7 @@ export declare class GlobalVariables {
     toFriendlyJSON(): {
         blockNumber: number;
         slotNumber: number;
-        timestamp: `0x${string}`;
+        timestamp: string;
         coinbase: `0x${string}`;
         gasFees: string;
     };
@@ -127,7 +125,7 @@ export declare class GlobalVariables {
         version: number;
         blockNumber: number;
         slotNumber: number;
-        timestamp: number;
+        timestamp: bigint;
         coinbase: `0x${string}`;
         feeRecipient: `0x${string}`;
         feePerDaGas: number;

package/dest/tx/global_variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global_variables.d.ts","sourceRoot":"","sources":["../../src/tx/global_variables.ts"],"names":[],"mappings":";;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C;;GAEG;AACH,qBAAa,eAAe;IAExB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,EAAE;IACtB,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,EAAE;IACpB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;;IAfvB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,EAAE;IACtB,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,EAAE;IACpB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IAGzB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,OAAO,IAAI,MAAM;IAIjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,eAAe;IAI/D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAM,GAAG,eAAe;IAc9E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAcjE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAe9D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAclD,QAAQ;IAIR,QAAQ;IAUR;;;OAGG;IACH,cAAc;;;;;;;IAUd,KAAK,IAAI,eAAe;IAIxB,OAAO,IAAI,OAAO;IAalB,SAAS;;;;;;;;;;;IAcT,CAAC,OAAO,CAAC,MAAM,CAAC;IAIT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAYpC"}
+{"version":3,"file":"global_variables.d.ts","sourceRoot":"","sources":["../../src/tx/global_variables.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,qBAAa,eAAe;IAExB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,MAAM;IAC1B,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;;IAfvB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,MAAM;IAC1B,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IAGzB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,OAAO,IAAI,MAAM;IAIjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,eAAe;IAI/D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAM,GAAG,eAAe;IAc9E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAcjE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAe9D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAalD,QAAQ;IAaR,QAAQ;IAUR;;;OAGG;IACH,cAAc;;;;;;;IAUd,KAAK,IAAI,eAAe;IAIxB,OAAO,IAAI,OAAO;IAalB,SAAS;;;;;;;;;;;IAcT,CAAC,OAAO,CAAC,MAAM,CAAC;IAIT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAYpC"}

package/dest/tx/global_variables.js

@@ -2,7 +2,7 @@ import { GLOBAL_VARIABLES_LENGTH } from '@aztec/constants';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -33,9 +33,9 @@ import { schemas } from '../schemas/index.js';
         return z.object({
             chainId: schemas.Fr,
             version: schemas.Fr,
-            blockNumber: schemas.Fr,
+            blockNumber: schemas.UInt32,
             slotNumber: schemas.Fr,
-            timestamp: schemas.Fr,
+            timestamp: schemas.BigInt,
             coinbase: schemas.EthAddress,
             feeRecipient: schemas.AztecAddress,
             gasFees: GasFees.schema
@@ -49,9 +49,9 @@ import { schemas } from '../schemas/index.js';
     }
     static empty(fields = {}) {
         return GlobalVariables.from({
-            blockNumber: Fr.ZERO,
+            blockNumber: 0,
             slotNumber: Fr.ZERO,
-            timestamp: Fr.ZERO,
+            timestamp: 0n,
             chainId: Fr.ZERO,
             version: Fr.ZERO,
             coinbase: EthAddress.ZERO,
@@ -62,14 +62,13 @@ import { schemas } from '../schemas/index.js';
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new GlobalVariables(Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
+        return new GlobalVariables(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readNumber(), Fr.fromBuffer(reader), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new GlobalVariables(reader.readField(), reader.readField(), reader.readField(), reader.readField(), reader.readField(), EthAddress.fromField(reader.readField()), AztecAddress.fromField(reader.readField()), GasFees.fromFields(reader));
+        return new GlobalVariables(reader.readField(), reader.readField(), reader.readU32(), reader.readField(), reader.readField().toBigInt(), EthAddress.fromField(reader.readField()), AztecAddress.fromField(reader.readField()), GasFees.fromFields(reader));
     }
     static getFields(fields) {
-        // Note: The order here must match the order in the HeaderLib solidity library.
         return [
             fields.chainId,
             fields.version,
@@ -82,7 +81,16 @@ import { schemas } from '../schemas/index.js';
         ];
     }
     toBuffer() {
-        return serializeToBuffer(...GlobalVariables.getFields(this));
+        return serializeToBuffer([
+            this.chainId,
+            this.version,
+            this.blockNumber,
+            this.slotNumber,
+            bigintToUInt64BE(this.timestamp),
+            this.coinbase,
+            this.feeRecipient,
+            this.gasFees
+        ]);
     }
     toFields() {
         const fields = serializeToFields(...GlobalVariables.getFields(this));
@@ -96,7 +104,7 @@ import { schemas } from '../schemas/index.js';
    * tailored for human consumption.
    */ toFriendlyJSON() {
         return {
-            blockNumber: this.blockNumber.toNumber(),
+            blockNumber: this.blockNumber,
             slotNumber: this.slotNumber.toNumber(),
             timestamp: this.timestamp.toString(),
             coinbase: this.coinbase.toString(),
@@ -107,25 +115,25 @@ import { schemas } from '../schemas/index.js';
         return GlobalVariables.fromBuffer(this.toBuffer());
     }
     isEmpty() {
-        return this.chainId.isZero() && this.version.isZero() && this.blockNumber.isZero() && this.slotNumber.isZero() && this.timestamp.isZero() && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty();
+        return this.chainId.isZero() && this.version.isZero() && this.blockNumber === 0 && this.slotNumber.isZero() && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty();
     }
     toInspect() {
         return {
             chainId: this.chainId.toNumber(),
             version: this.version.toNumber(),
-            blockNumber: this.blockNumber.toNumber(),
+            blockNumber: this.blockNumber,
             slotNumber: this.slotNumber.toNumber(),
-            timestamp: this.timestamp.toNumber(),
+            timestamp: this.timestamp,
             coinbase: this.coinbase.toString(),
             feeRecipient: this.feeRecipient.toString(),
-            feePerDaGas: this.gasFees.feePerDaGas.toNumber(),
-            feePerL2Gas: this.gasFees.feePerL2Gas.toNumber()
+            feePerDaGas: Number(this.gasFees.feePerDaGas),
+            feePerL2Gas: Number(this.gasFees.feePerL2Gas)
         };
     }
     [inspect.custom]() {
         return `GlobalVariables ${inspect(this.toInspect())}`;
     }
     equals(other) {
-        return this.chainId.equals(other.chainId) && this.version.equals(other.version) && this.blockNumber.equals(other.blockNumber) && this.slotNumber.equals(other.slotNumber) && this.timestamp.equals(other.timestamp) && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees);
+        return this.chainId.equals(other.chainId) && this.version.equals(other.version) && this.blockNumber === other.blockNumber && this.slotNumber.equals(other.slotNumber) && this.timestamp === other.timestamp && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees);
     }
 }

package/dest/tx/hashed_values.d.ts

@@ -1,7 +1,6 @@
-/// <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 { FieldsOf } from '@aztec/foundation/types';
 import { type ZodFor } from '../schemas/schemas.js';
 /**
  * A container for storing a list of values and their hash.
@@ -15,12 +14,23 @@ export declare class HashedValues {
      * The hash of the raw values
      */
     readonly hash: Fr;
-    private constructor();
+    constructor(
+    /**
+     *  Raw values.
+     */
+    values: Fr[], 
+    /**
+     * The hash of the raw values
+     */
+    hash: Fr);
+    getSize(): number;
     static get schema(): ZodFor<HashedValues>;
-    toJSON(): Fr[];
-    static random(): Promise<HashedValues>;
-    static fromValues(values: Fr[]): Promise<HashedValues>;
-    toBuffer(): Buffer;
+    static from(fields: FieldsOf<HashedValues>): HashedValues;
+    static getFields(fields: FieldsOf<HashedValues>): readonly [Fr[], Fr];
+    static random(): HashedValues;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): HashedValues;
+    static fromArgs(args: Fr[]): Promise<HashedValues>;
+    static fromCalldata(calldata: Fr[]): Promise<HashedValues>;
 }
 //# sourceMappingURL=hashed_values.d.ts.map

package/dest/tx/hashed_values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;IAR1B,OAAO;IAWP,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAExC;IAED,MAAM;IAIN,MAAM,CAAC,MAAM;WAIA,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE;IAIpC,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;CAI/D"}
+{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;;IAPxB;;OAEG;IACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;IACa,IAAI,EAAE,EAAE;IAG1B,OAAO;IAIP,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAOxC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY;IAIzD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC;IAI/C,MAAM,CAAC,MAAM;IAIb,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;WAMjD,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE;WAKnB,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE;CAGzC"}