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

package/dest/trees/public_data_witness.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { SiblingPath } from '@aztec/foundation/trees';
+import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
 /**
@@ -40,92 +38,45 @@ export declare class PublicDataWitness {
      * Sibling path to prove membership of the leaf.
      */
     siblingPath: SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>);
-    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>;
-            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-        }, "strip", z.ZodTypeAny, {
-            value: Fr;
-            slot: Fr;
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        index: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+        leafPreimage: z.ZodPipe<z.ZodObject<{
+            leaf: z.ZodPipe<z.ZodObject<{
+                slot: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                value: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            }, z.core.$strip>, z.ZodTransform<import("./public_data_leaf.js").PublicDataTreeLeaf, {
+                slot: Fr;
+                value: Fr;
+            }>>;
+            nextKey: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            nextIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+        }, z.core.$strip>, z.ZodTransform<PublicDataTreeLeafPreimage, {
+            leaf: import("./public_data_leaf.js").PublicDataTreeLeaf;
+            nextKey: Fr;
             nextIndex: bigint;
-            nextSlot: Fr;
-        }, {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        }>, PublicDataTreeLeafPreimage, {
-            value: string;
-            slot: 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">;
-            data: z.ZodArray<z.ZodNumber, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[]; /**
-             * Deserializes an PublicDataWitness object from a buffer.
-             * @param buf - Buffer or BufferReader to deserialize.
-             * @returns An instance of PublicDataWitness.
-             */
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>, SiblingPath<40>, string | {
-            type: "Buffer";
-            data: number[];
-        }>, SiblingPath<40>, string | {
-            type: "Buffer";
-            data: number[];
-        }>;
-    }, "strip", z.ZodTypeAny, {
+        }>>;
+        siblingPath: z.ZodPipe<import("../schemas/schemas.js").ZodFor<Buffer<ArrayBufferLike>>, z.ZodTransform<SiblingPath<40>, Buffer<ArrayBufferLike>>>;
+    }, z.core.$strip>, z.ZodTransform<PublicDataWitness, {
         index: bigint;
         leafPreimage: PublicDataTreeLeafPreimage;
         siblingPath: SiblingPath<40>;
-    }, {
-        index: string | number | bigint;
-        leafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        };
-        siblingPath: string | {
-            type: "Buffer";
-            data: number[];
-        };
-    }>, PublicDataWitness, {
-        index: string | number | bigint;
-        leafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        };
-        siblingPath: string | {
-            type: "Buffer";
-            data: number[];
-        };
-    }>;
+    }>>;
     /**
      * Returns a field array representation of a public data witness.
      * @returns A field array representation of a public data witness.
      */
     toFields(): Fr[];
+    /**
+     * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+     */
+    toNoirRepresentation(): (string | string[])[];
     toBuffer(): Buffer;
     /**
      * Returns a string representation of the TxEffect object.
      */
     toString(): string;
     static random(): PublicDataWitness;
+    withoutPreimage(): MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
     /**
      * Deserializes an PublicDataWitness object from a buffer.
      * @param buf - Buffer or BufferReader to deserialize.
@@ -139,4 +90,4 @@ export declare class PublicDataWitness {
      */
     static fromString(str: string): PublicDataWitness;
 }
-//# sourceMappingURL=public_data_witness.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2RhdGFfd2l0bmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL3B1YmxpY19kYXRhX3dpdG5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFHeEIsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxpQkFBaUI7SUFFMUI7O09BRUc7YUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7O09BR0c7YUFDYSxZQUFZLEVBQUUsMEJBQTBCO0lBQ3hEOztPQUVHO2FBQ2EsV0FBVyxFQUFFLFdBQVcsQ0FBQyxPQUFPLHVCQUF1QixDQUFDO0lBYjFFO0lBQ0U7O09BRUc7SUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7O09BR0c7SUFDYSxZQUFZLEVBQUUsMEJBQTBCO0lBQ3hEOztPQUVHO0lBQ2EsV0FBVyxFQUFFLFdBQVcsQ0FBQyxPQUFPLHVCQUF1QixDQUFDLEVBQ3RFO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFRaEI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksRUFBRSxFQUFFLENBU3RCO0lBRUQ7O09BRUc7SUFDSSxvQkFBb0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBVW5EO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7T0FFRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLE1BQU0sc0JBTVo7SUFFTSxlQUFlLElBQUksaUJBQWlCLENBQUMsT0FBTyx1QkFBdUIsQ0FBQyxDQUUxRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGlCQUFpQixDQVFsRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLHFCQUU1QjtDQUNGIn0=

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BA4CjB;;;;eAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAxCF;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAWvB,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,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,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;IAb1E;IACE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC,EACtE;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;QAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE,CAStB;IAED;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAUnD;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,MAAM,sBAMZ;IAEM,eAAe,IAAI,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,CAE1E;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAQlE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,qBAE5B;CACF"}

package/dest/trees/public_data_witness.js

@@ -1,9 +1,9 @@
 import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { SiblingPath } from '@aztec/foundation/trees';
+import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { schemas } from '../schemas/schemas.js';
 import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
@@ -41,13 +41,26 @@ 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()
         ];
     }
+    /**
+   * Returns a representation of the public data 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(),
+            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())
+        ];
+    }
     toBuffer() {
         return serializeToBuffer([
             this.index,
@@ -63,6 +76,9 @@ import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
     static random() {
         return new PublicDataWitness(BigInt(Math.floor(Math.random() * 1000)), PublicDataTreeLeafPreimage.random(), SiblingPath.random(PUBLIC_DATA_TREE_HEIGHT));
     }
+    withoutPreimage() {
+        return new MembershipWitness(PUBLIC_DATA_TREE_HEIGHT, this.index, this.siblingPath.toTuple());
+    }
     /**
    * Deserializes an PublicDataWitness object from a buffer.
    * @param buf - Buffer or BufferReader to deserialize.

package/dest/tx/block_header.d.ts

@@ -1,36 +1,41 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ZodFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
+import { BlockHash } from '../block/block_hash.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { ContentCommitment } from './content_commitment.js';
 import { GlobalVariables } from './global_variables.js';
 import { StateReference } from './state_reference.js';
 /** A header of an L2 block. */
 export declare class BlockHeader {
     /** Snapshot of archive before the block is applied. */
-    lastArchive: AppendOnlyTreeSnapshot;
-    /** Hash of the body of an L2 block. */
-    contentCommitment: ContentCommitment;
+    readonly lastArchive: AppendOnlyTreeSnapshot;
     /** State reference. */
-    state: StateReference;
+    readonly state: StateReference;
+    /**
+     * Hash of the sponge blob after the tx effects of this block has been applied.
+     * May contain tx effects from the previous blocks in the same checkpoint.
+     */
+    readonly spongeBlobHash: Fr;
     /** Global variables of an L2 block. */
-    globalVariables: GlobalVariables;
+    readonly globalVariables: GlobalVariables;
     /** Total fees in the block, computed by the root rollup circuit */
-    totalFees: Fr;
+    readonly totalFees: Fr;
     /** Total mana used in the block, computed by the root rollup circuit */
-    totalManaUsed: Fr;
+    readonly totalManaUsed: Fr;
+    private _cachedHash?;
     constructor(
     /** Snapshot of archive before the block is applied. */
     lastArchive: AppendOnlyTreeSnapshot, 
-    /** Hash of the body of an L2 block. */
-    contentCommitment: ContentCommitment, 
     /** State reference. */
     state: StateReference, 
+    /**
+     * Hash of the sponge blob after the tx effects of this block has been applied.
+     * May contain tx effects from the previous blocks in the same checkpoint.
+     */
+    spongeBlobHash: Fr, 
     /** Global variables of an L2 block. */
     globalVariables: GlobalVariables, 
     /** Total fees in the block, computed by the root rollup circuit */
@@ -38,11 +43,13 @@ export declare class BlockHeader {
     /** Total mana used in the block, computed by the root rollup circuit */
     totalManaUsed: Fr);
     static get schema(): ZodFor<BlockHeader>;
-    static getFields(fields: FieldsOf<BlockHeader>): readonly [AppendOnlyTreeSnapshot, ContentCommitment, StateReference, GlobalVariables, Fr, Fr];
+    static getFields(fields: FieldsOf<BlockHeader>): readonly [AppendOnlyTreeSnapshot, StateReference, Fr, GlobalVariables, Fr, Fr];
     static from(fields: FieldsOf<BlockHeader>): BlockHeader;
-    getSlot(): bigint;
+    getSlot(): SlotNumber;
+    getBlockNumber(): BlockNumber;
     getSize(): number;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     toFields(): Fr[];
     clone(): BlockHeader;
     static fromBuffer(buffer: Buffer | BufferReader): BlockHeader;
@@ -55,27 +62,27 @@ export declare class BlockHeader {
      */
     toString(): `0x${string}`;
     static fromString(str: string): BlockHeader;
-    hash(): Promise<Fr>;
+    hash(): Promise<BlockHash>;
+    /** Manually set the hash for this block header if already computed */
+    setHash(hashed: BlockHash): void;
+    /** Recomputes the cached hash. Used for testing when header fields are mutated via unfreeze. */
+    recomputeHash(): Promise<BlockHash>;
+    static random(overrides?: Partial<FieldsOf<BlockHeader>> & Partial<FieldsOf<GlobalVariables>>): BlockHeader;
     toInspect(): {
         lastArchive: `0x${string}`;
-        contentCommitment: {
-            numTxs: number;
-            blobsHash: `0x${string}`;
-            inHash: `0x${string}`;
-            outHash: `0x${string}`;
-        };
         state: {
             l1ToL2MessageTree: `0x${string}`;
             noteHashTree: `0x${string}`;
             nullifierTree: `0x${string}`;
             publicDataTree: `0x${string}`;
         };
+        spongeBlobHash: bigint;
         globalVariables: {
             chainId: number;
             version: number;
-            blockNumber: number;
-            slotNumber: number;
-            timestamp: number;
+            blockNumber: BlockNumber;
+            slotNumber: SlotNumber;
+            timestamp: bigint;
             coinbase: `0x${string}`;
             feeRecipient: `0x${string}`;
             feePerDaGas: number;
@@ -87,4 +94,4 @@ export declare class BlockHeader {
     [inspect.custom](): string;
     equals(other: this): boolean;
 }
-//# sourceMappingURL=block_header.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvYmxvY2tfaGVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHMUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBc0MsTUFBTSw2QkFBNkIsQ0FBQztBQUV4SCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXRELCtCQUErQjtBQUMvQixxQkFBYSxXQUFXO0lBSXBCLHVEQUF1RDthQUN2QyxXQUFXLEVBQUUsc0JBQXNCO0lBQ25ELHVCQUF1QjthQUNQLEtBQUssRUFBRSxjQUFjO0lBQ3JDOzs7T0FHRzthQUNhLGNBQWMsRUFBRSxFQUFFO0lBQ2xDLHVDQUF1QzthQUN2QixlQUFlLEVBQUUsZUFBZTtJQUNoRCxtRUFBbUU7YUFDbkQsU0FBUyxFQUFFLEVBQUU7SUFDN0Isd0VBQXdFO2FBQ3hELGFBQWEsRUFBRSxFQUFFO0lBakJuQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQXFCO0lBRXpDO0lBQ0UsdURBQXVEO0lBQ3ZDLFdBQVcsRUFBRSxzQkFBc0I7SUFDbkQsdUJBQXVCO0lBQ1AsS0FBSyxFQUFFLGNBQWM7SUFDckM7OztPQUdHO0lBQ2EsY0FBYyxFQUFFLEVBQUU7SUFDbEMsdUNBQXVDO0lBQ3ZCLGVBQWUsRUFBRSxlQUFlO0lBQ2hELG1FQUFtRTtJQUNuRCxTQUFTLEVBQUUsRUFBRTtJQUM3Qix3RUFBd0U7SUFDeEQsYUFBYSxFQUFFLEVBQUUsRUFDL0I7SUFFSixNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FXdkM7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsV0FBVyxDQUFDLGtGQVM3QztJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsZUFFeEM7SUFFRCxPQUFPLElBQUksVUFBVSxDQUVwQjtJQUVELGNBQWMsSUFBSSxXQUFXLENBRTVCO0lBRUQsT0FBTyxXQVNOO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQU1mO0lBRUQsS0FBSyxJQUFJLFdBQVcsQ0FFbkI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLFdBQVcsQ0FXNUQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsV0FBVyxDQVd6RDtJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQU0sR0FBRyxXQUFXLENBVXJFO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FTakI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLGtCQUVkO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFdBQVcsQ0FFMUM7SUFFRCxJQUFJLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQU96QjtJQUVELHNFQUFzRTtJQUN0RSxPQUFPLENBQUMsTUFBTSxFQUFFLFNBQVMsUUFFeEI7SUFFRCxnR0FBZ0c7SUFDaEcsYUFBYSxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FHbEM7SUFFRCxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBTSxHQUFHLFdBQVcsQ0FVOUc7SUFFRCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BU1I7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FZZjtJQUVNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FTbEM7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"block_header.d.ts","sourceRoot":"","sources":["../../src/tx/block_header.ts"],"names":[],"mappings":";;;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,+BAA+B;AAC/B,qBAAa,WAAW;IAEpB,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;;IAXxB,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IAG1B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,WAAW,CAAC,CAWvC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;IAY9C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;IAIzC,OAAO;IAIP,OAAO;IAWP,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAQhB,KAAK,IAAI,WAAW;IAIpB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAa7D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,WAAW;IAa1D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAM,GAAG,WAAW;IAYtE,OAAO,IAAI,OAAO;IAWlB;;;OAGG;IACI,QAAQ;IAIf,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW;IAI3C,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAInB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAWT,CAAC,OAAO,CAAC,MAAM,CAAC;IAiBT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAUpC"}
+{"version":3,"file":"block_header.d.ts","sourceRoot":"","sources":["../../src/tx/block_header.ts"],"names":[],"mappings":"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"}

package/dest/tx/block_header.js

@@ -1,26 +1,33 @@
-import { BLOCK_HEADER_LENGTH, GeneratorIndex } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+var _computedKey;
+import { BLOCK_HEADER_LENGTH, DomainSeparator } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
 import { z } from 'zod';
+import { BlockHash } from '../block/block_hash.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { ContentCommitment } from './content_commitment.js';
 import { GlobalVariables } from './global_variables.js';
 import { StateReference } from './state_reference.js';
+_computedKey = inspect.custom;
 /** A header of an L2 block. */ export class BlockHeader {
     lastArchive;
-    contentCommitment;
     state;
+    spongeBlobHash;
     globalVariables;
     totalFees;
     totalManaUsed;
-    constructor(/** Snapshot of archive before the block is applied. */ lastArchive, /** Hash of the body of an L2 block. */ contentCommitment, /** State reference. */ state, /** Global variables of an L2 block. */ globalVariables, /** Total fees in the block, computed by the root rollup circuit */ totalFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed){
+    _cachedHash;
+    constructor(/** Snapshot of archive before the block is applied. */ lastArchive, /** State reference. */ state, /**
+     * Hash of the sponge blob after the tx effects of this block has been applied.
+     * May contain tx effects from the previous blocks in the same checkpoint.
+     */ spongeBlobHash, /** Global variables of an L2 block. */ globalVariables, /** Total fees in the block, computed by the root rollup circuit */ totalFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed){
         this.lastArchive = lastArchive;
-        this.contentCommitment = contentCommitment;
         this.state = state;
+        this.spongeBlobHash = spongeBlobHash;
         this.globalVariables = globalVariables;
         this.totalFees = totalFees;
         this.totalManaUsed = totalManaUsed;
@@ -28,19 +35,18 @@ import { StateReference } from './state_reference.js';
     static get schema() {
         return z.object({
             lastArchive: AppendOnlyTreeSnapshot.schema,
-            contentCommitment: ContentCommitment.schema,
             state: StateReference.schema,
+            spongeBlobHash: schemas.Fr,
             globalVariables: GlobalVariables.schema,
             totalFees: schemas.Fr,
             totalManaUsed: schemas.Fr
         }).transform(BlockHeader.from);
     }
     static getFields(fields) {
-        // Note: The order here must match the order in the HeaderLib solidity library.
         return [
             fields.lastArchive,
-            fields.contentCommitment,
             fields.state,
+            fields.spongeBlobHash,
             fields.globalVariables,
             fields.totalFees,
             fields.totalManaUsed
@@ -50,13 +56,19 @@ import { StateReference } from './state_reference.js';
         return new BlockHeader(...BlockHeader.getFields(fields));
     }
     getSlot() {
-        return this.globalVariables.slotNumber.toBigInt();
+        return this.globalVariables.slotNumber;
+    }
+    getBlockNumber() {
+        return this.globalVariables.blockNumber;
     }
     getSize() {
-        return this.lastArchive.getSize() + this.contentCommitment.getSize() + this.state.getSize() + this.globalVariables.getSize() + this.totalFees.size + this.totalManaUsed.size;
+        return this.lastArchive.getSize() + this.state.getSize() + this.spongeBlobHash.size + this.globalVariables.getSize() + this.totalFees.size + this.totalManaUsed.size;
     }
-    toBuffer() {
-        return serializeToBuffer(...BlockHeader.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...BlockHeader.getFields(this));
     }
     toFields() {
         const fields = serializeToFields(...BlockHeader.getFields(this));
@@ -70,17 +82,17 @@ import { StateReference } from './state_reference.js';
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BlockHeader(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(ContentCommitment), reader.readObject(StateReference), reader.readObject(GlobalVariables), reader.readObject(Fr), reader.readObject(Fr));
+        return new BlockHeader(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(StateReference), reader.readObject(Fr), reader.readObject(GlobalVariables), reader.readObject(Fr), reader.readObject(Fr));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new BlockHeader(AppendOnlyTreeSnapshot.fromFields(reader), ContentCommitment.fromFields(reader), StateReference.fromFields(reader), GlobalVariables.fromFields(reader), reader.readField(), reader.readField());
+        return new BlockHeader(AppendOnlyTreeSnapshot.fromFields(reader), StateReference.fromFields(reader), reader.readField(), GlobalVariables.fromFields(reader), reader.readField(), reader.readField());
     }
     static empty(fields = {}) {
         return BlockHeader.from({
-            lastArchive: AppendOnlyTreeSnapshot.zero(),
-            contentCommitment: ContentCommitment.empty(),
+            lastArchive: AppendOnlyTreeSnapshot.empty(),
             state: StateReference.empty(),
+            spongeBlobHash: Fr.ZERO,
             globalVariables: GlobalVariables.empty(),
             totalFees: Fr.ZERO,
             totalManaUsed: Fr.ZERO,
@@ -88,7 +100,7 @@ import { StateReference } from './state_reference.js';
         });
     }
     isEmpty() {
-        return this.lastArchive.isZero() && this.contentCommitment.isEmpty() && this.state.isEmpty() && this.globalVariables.isEmpty() && this.totalFees.isZero() && this.totalManaUsed.isZero();
+        return this.lastArchive.isEmpty() && this.state.isEmpty() && this.spongeBlobHash.isZero() && this.globalVariables.isEmpty() && this.totalFees.isZero() && this.totalManaUsed.isZero();
     }
     /**
    * Serializes this instance into a string.
@@ -100,35 +112,53 @@ import { StateReference } from './state_reference.js';
         return BlockHeader.fromBuffer(hexToBuffer(str));
     }
     hash() {
-        return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH);
+        if (!this._cachedHash) {
+            this._cachedHash = poseidon2HashWithSeparator(this.toFields(), DomainSeparator.BLOCK_HEADER_HASH).then((fr)=>new BlockHash(fr));
+        }
+        return this._cachedHash;
+    }
+    /** Manually set the hash for this block header if already computed */ setHash(hashed) {
+        this._cachedHash = Promise.resolve(hashed);
+    }
+    /** Recomputes the cached hash. Used for testing when header fields are mutated via unfreeze. */ recomputeHash() {
+        this._cachedHash = undefined;
+        return this.hash();
+    }
+    static random(overrides = {}) {
+        return BlockHeader.from({
+            lastArchive: AppendOnlyTreeSnapshot.random(),
+            state: StateReference.random(),
+            spongeBlobHash: Fr.random(),
+            globalVariables: GlobalVariables.random(overrides),
+            totalFees: new Fr(randomInt(100_000)),
+            totalManaUsed: new Fr(randomInt(100_000_000)),
+            ...overrides
+        });
     }
     toInspect() {
         return {
             lastArchive: this.lastArchive.root.toString(),
-            contentCommitment: this.contentCommitment.toInspect(),
             state: this.state.toInspect(),
+            spongeBlobHash: this.spongeBlobHash.toBigInt(),
             globalVariables: this.globalVariables.toInspect(),
             totalFees: this.totalFees.toBigInt(),
             totalManaUsed: this.totalManaUsed.toBigInt()
         };
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `Header {
   lastArchive: ${inspect(this.lastArchive)},
-  contentCommitment.numTxs: ${this.contentCommitment.numTxs.toNumber()},
-  contentCommitment.blobsHash: ${this.contentCommitment.blobsHash.toString('hex')},
-  contentCommitment.inHash: ${this.contentCommitment.inHash.toString('hex')},
-  contentCommitment.outHash: ${this.contentCommitment.outHash.toString('hex')},
   state.l1ToL2MessageTree: ${inspect(this.state.l1ToL2MessageTree)},
   state.noteHashTree: ${inspect(this.state.partial.noteHashTree)},
   state.nullifierTree: ${inspect(this.state.partial.nullifierTree)},
   state.publicDataTree: ${inspect(this.state.partial.publicDataTree)},
+  spongeBlobHash: ${this.spongeBlobHash},
   globalVariables: ${inspect(this.globalVariables)},
   totalFees: ${this.totalFees},
   totalManaUsed: ${this.totalManaUsed},
 }`;
     }
     equals(other) {
-        return this.contentCommitment.equals(other.contentCommitment) && this.state.equals(other.state) && this.globalVariables.equals(other.globalVariables) && this.totalFees.equals(other.totalFees) && this.totalManaUsed.equals(other.totalManaUsed) && this.lastArchive.equals(other.lastArchive);
+        return this.lastArchive.equals(other.lastArchive) && this.state.equals(other.state) && this.spongeBlobHash.equals(other.spongeBlobHash) && this.globalVariables.equals(other.globalVariables) && this.totalFees.equals(other.totalFees) && this.totalManaUsed.equals(other.totalManaUsed);
     }
 }

package/dest/tx/call_context.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
@@ -51,27 +48,17 @@ export declare class CallContext {
      */
     static empty(): CallContext;
     static random(): Promise<CallContext>;
-    static get schema(): z.ZodEffects<z.ZodObject<{
+    static get schema(): z.ZodPipe<z.ZodObject<{
         msgSender: import("../schemas/index.js").ZodFor<AztecAddress>;
         contractAddress: import("../schemas/index.js").ZodFor<AztecAddress>;
         functionSelector: import("../schemas/index.js").ZodFor<FunctionSelector>;
         isStaticCall: z.ZodBoolean;
-    }, "strip", z.ZodTypeAny, {
-        contractAddress: AztecAddress;
+    }, z.core.$strip>, z.ZodTransform<CallContext, {
         msgSender: AztecAddress;
+        contractAddress: AztecAddress;
         functionSelector: FunctionSelector;
         isStaticCall: boolean;
-    }, {
-        isStaticCall: boolean;
-        contractAddress?: any;
-        msgSender?: any;
-        functionSelector?: any;
-    }>, CallContext, {
-        isStaticCall: boolean;
-        contractAddress?: any;
-        msgSender?: any;
-        functionSelector?: any;
-    }>;
+    }>>;
     isEmpty(): boolean;
     static from(fields: FieldsOf<CallContext>): CallContext;
     static getFields(fields: FieldsOf<CallContext>): readonly [AztecAddress, AztecAddress, FunctionSelector, boolean];
@@ -79,7 +66,7 @@ export declare class CallContext {
      * Serialize this as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     /**
      * Deserialize this from a buffer.
@@ -91,4 +78,4 @@ export declare class CallContext {
     equals(callContext: CallContext): boolean;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=call_context.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbF9jb250ZXh0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvY2FsbF9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUF3QyxNQUFNLDZCQUE2QixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDL0IsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHekQ7O0dBRUc7QUFDSCxxQkFBYSxXQUFXO0lBRXBCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFlBQVk7SUFDOUI7O09BRUc7SUFDSSxlQUFlLEVBQUUsWUFBWTtJQUNwQzs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7T0FFRztJQUNJLFlBQVksRUFBRSxPQUFPO0lBaEI5QjtJQUNFOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFlBQVk7SUFDOUI7O09BRUc7SUFDSSxlQUFlLEVBQUUsWUFBWTtJQUNwQzs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7T0FFRztJQUNJLFlBQVksRUFBRSxPQUFPLEVBQzFCO0lBRUo7OztPQUdHO0lBQ0gsT0FBYyxLQUFLLElBQUksV0FBVyxDQUVqQztJQUVELE9BQWEsTUFBTSx5QkFPbEI7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7OztRQVNoQjtJQUVELE9BQU8sWUFJTjtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsR0FBRyxXQUFXLENBRXREO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFdBQVcsQ0FBQyxvRUFFN0M7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLGVBUTlDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLFdBQVcsQ0FRekQ7SUFFRCxNQUFNLENBQUMsV0FBVyxFQUFFLFdBQVcsV0FPOUI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FPZjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"call_context.d.ts","sourceRoot":"","sources":["../../src/tx/call_context.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,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,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;GAEG;AACH,qBAAa,WAAW;IAEpB;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO;;IAf5B;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO;IAG9B;;;OAGG;WACW,KAAK,IAAI,WAAW;WAIrB,MAAM;IASnB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAShB;IAED,OAAO;IAMP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,WAAW;IAIvD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;IAI9C;;;OAGG;IACH,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAUhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAU/C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,WAAW;IAU1D,MAAM,CAAC,WAAW,EAAE,WAAW;IAS/B,CAAC,OAAO,CAAC,MAAM,CAAC;CAQjB"}
+{"version":3,"file":"call_context.d.ts","sourceRoot":"","sources":["../../src/tx/call_context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,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,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;GAEG;AACH,qBAAa,WAAW;IAEpB;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO;IAhB9B;IACE;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO,EAC1B;IAEJ;;;OAGG;IACH,OAAc,KAAK,IAAI,WAAW,CAEjC;IAED,OAAa,MAAM,yBAOlB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;QAShB;IAED,OAAO,YAIN;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,WAAW,CAEtD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,oEAE7C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,eAQ9C;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,WAAW,CAQzD;IAED,MAAM,CAAC,WAAW,EAAE,WAAW,WAO9B;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAOf;CACF"}

package/dest/tx/call_context.js

@@ -1,3 +1,4 @@
+var _computedKey;
 import { CALL_CONTEXT_LENGTH } from '@aztec/constants';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
@@ -5,6 +6,7 @@ import { z } from 'zod';
 import { FunctionSelector } from '../abi/index.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { schemas } from '../schemas/index.js';
+_computedKey = inspect.custom;
 /**
  * Call context.
  */ export class CallContext {
@@ -85,7 +87,7 @@ import { schemas } from '../schemas/index.js';
     equals(callContext) {
         return callContext.msgSender.equals(this.msgSender) && callContext.contractAddress.equals(this.contractAddress) && callContext.functionSelector.equals(this.functionSelector) && callContext.isStaticCall === this.isStaticCall;
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `CallContext {
       msgSender: ${this.msgSender}
       contractAddress: ${this.contractAddress}