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

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));
@@ -127,4 +132,10 @@ import { z } from 'zod';
     static empty() {
         return new PublicDataTreeLeaf(Fr.ZERO, Fr.ZERO);
     }
+    static get schema() {
+        return z.object({
+            slot: schemas.Fr,
+            value: schemas.Fr
+        }).transform(({ slot, value })=>new PublicDataTreeLeaf(slot, value));
+    }
 }

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 { 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';
 /**
@@ -43,40 +41,50 @@ 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">;
-            data: z.ZodArray<z.ZodNumber, "many">;
+        siblingPath: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
+            type: import("zod").ZodLiteral<"Buffer">;
+            data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
         }, "strip", z.ZodTypeAny, {
             type: "Buffer";
             data: number[];
         }, {
             type: "Buffer";
-            data: number[]; /**
-             * Deserializes an PublicDataWitness object from a buffer.
-             * @param buf - Buffer or BufferReader to deserialize.
-             * @returns An instance of PublicDataWitness.
-             */
-        }>, Buffer, {
+            data: number[];
+        }>, Buffer<ArrayBuffer>, {
             type: "Buffer";
             data: number[];
         }>]>, SiblingPath<40>, string | {
@@ -93,10 +101,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";
@@ -105,10 +115,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";
@@ -120,12 +132,17 @@ export declare class PublicDataWitness {
      * @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.

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,0BAA0B,CAAC;AAC9C,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;;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;IAQN,eAAe,IAAI,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IAI3E;;;;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

@@ -3,7 +3,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
 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,23 +1,22 @@
-/// <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 { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 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;
     /** 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 */
@@ -27,10 +26,13 @@ export declare class BlockHeader {
     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 +40,12 @@ 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;
+    getBlockNumber(): number;
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     clone(): BlockHeader;
     static fromBuffer(buffer: Buffer | BufferReader): BlockHeader;
@@ -58,24 +61,19 @@ export declare class BlockHeader {
     hash(): Promise<Fr>;
     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;
+            timestamp: bigint;
             coinbase: `0x${string}`;
             feeRecipient: `0x${string}`;
             feePerDaGas: number;

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":"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,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,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B;;;OAGG;IACI,cAAc,EAAE,EAAE;IACzB,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;;IAdxB,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B;;;OAGG;IACI,cAAc,EAAE,EAAE;IACzB,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;IAW9C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;IAIzC,OAAO;IAIP,cAAc;IAId,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;IAcT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAUpC"}

package/dest/tx/block_header.js

@@ -7,20 +7,22 @@ import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
 import { z } from 'zod';
 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 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){
+    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 +30,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
@@ -52,8 +53,11 @@ import { StateReference } from './state_reference.js';
     getSlot() {
         return this.globalVariables.slotNumber.toBigInt();
     }
+    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));
@@ -70,17 +74,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 +92,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.
@@ -105,8 +109,8 @@ import { StateReference } from './state_reference.js';
     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()
@@ -115,20 +119,17 @@ import { StateReference } from './state_reference.js';
     [inspect.custom]() {
         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,6 +1,3 @@
-/// <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 { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -79,7 +76,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.

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,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"}

package/dest/tx/capsule.d.ts

@@ -1,10 +1,10 @@
-/// <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 { AztecAddress } from '../aztec-address/index.js';
 /**
  * Read-only data that is passed to the contract through an oracle during a transaction execution.
+ * TODO(#12425): Check whether this is always used to represent a transient capsule and if so, rename to
+ * TransientCapsule.
  */
 export declare class Capsule {
     /** The address of the contract the capsule is for */
@@ -22,7 +22,7 @@ export declare class Capsule {
     data: Fr[]);
     static get schema(): import("zod").ZodType<Capsule, any, string>;
     toJSON(): `0x${string}`;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): Capsule;
     toString(): `0x${string}`;
     static fromString(str: string): Capsule;

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

@@ -1 +1 @@
-{"version":3,"file":"capsule.d.ts","sourceRoot":"","sources":["../../src/tx/capsule.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;GAEG;AACH,qBAAa,OAAO;IAEhB,qDAAqD;aACrC,eAAe,EAAE,YAAY;IAC7C,sCAAsC;aACtB,WAAW,EAAE,EAAE;IAC/B,mCAAmC;aACnB,IAAI,EAAE,EAAE,EAAE;;IAL1B,qDAAqD;IACrC,eAAe,EAAE,YAAY;IAC7C,sCAAsC;IACtB,WAAW,EAAE,EAAE;IAC/B,mCAAmC;IACnB,IAAI,EAAE,EAAE,EAAE;IAG5B,MAAM,KAAK,MAAM,gDAEhB;IAED,MAAM;IAIN,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAKzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}
+{"version":3,"file":"capsule.d.ts","sourceRoot":"","sources":["../../src/tx/capsule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;GAIG;AACH,qBAAa,OAAO;IAEhB,qDAAqD;aACrC,eAAe,EAAE,YAAY;IAC7C,sCAAsC;aACtB,WAAW,EAAE,EAAE;IAC/B,mCAAmC;aACnB,IAAI,EAAE,EAAE,EAAE;;IAL1B,qDAAqD;IACrC,eAAe,EAAE,YAAY;IAC7C,sCAAsC;IACtB,WAAW,EAAE,EAAE;IAC/B,mCAAmC;IACnB,IAAI,EAAE,EAAE,EAAE;IAG5B,MAAM,KAAK,MAAM,gDAEhB;IAED,MAAM;IAIN,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAKzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}

package/dest/tx/capsule.js

@@ -6,6 +6,8 @@ import { AztecAddress } from '../aztec-address/index.js';
 import { Vector } from '../types/shared.js';
 /**
  * Read-only data that is passed to the contract through an oracle during a transaction execution.
+ * TODO(#12425): Check whether this is always used to represent a transient capsule and if so, rename to
+ * TransientCapsule.
  */ export class Capsule {
     contractAddress;
     storageSlot;