@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

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,6 +1,3 @@
-/// <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';
@@ -9,6 +6,7 @@ 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 { ProposedBlockHeader } from './proposed_block_header.js';
 import { StateReference } from './state_reference.js';
 /** A header of an L2 block. */
 export declare class BlockHeader {
@@ -41,8 +39,9 @@ export declare class BlockHeader {
     static getFields(fields: FieldsOf<BlockHeader>): readonly [AppendOnlyTreeSnapshot, ContentCommitment, StateReference, 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;
@@ -56,10 +55,10 @@ export declare class BlockHeader {
     toString(): `0x${string}`;
     static fromString(str: string): BlockHeader;
     hash(): Promise<Fr>;
+    toPropose(): ProposedBlockHeader;
     toInspect(): {
         lastArchive: `0x${string}`;
         contentCommitment: {
-            numTxs: number;
             blobsHash: `0x${string}`;
             inHash: `0x${string}`;
             outHash: `0x${string}`;
@@ -75,7 +74,7 @@ export declare class BlockHeader {
             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,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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,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,IAAI,mBAAmB;IAahC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;IAWT,CAAC,OAAO,CAAC,MAAM,CAAC;IAgBT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAUpC"}

package/dest/tx/block_header.js

@@ -9,6 +9,7 @@ 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 { ProposedBlockHeader } from './proposed_block_header.js';
 import { StateReference } from './state_reference.js';
 /** A header of an L2 block. */ export class BlockHeader {
     lastArchive;
@@ -36,7 +37,7 @@ import { StateReference } from './state_reference.js';
         }).transform(BlockHeader.from);
     }
     static getFields(fields) {
-        // Note: The order here must match the order in the HeaderLib solidity library.
+        // Note: The order here must match the order in the ProposedHeaderLib solidity library.
         return [
             fields.lastArchive,
             fields.contentCommitment,
@@ -52,6 +53,9 @@ 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;
     }
@@ -78,7 +82,7 @@ import { StateReference } from './state_reference.js';
     }
     static empty(fields = {}) {
         return BlockHeader.from({
-            lastArchive: AppendOnlyTreeSnapshot.zero(),
+            lastArchive: AppendOnlyTreeSnapshot.empty(),
             contentCommitment: ContentCommitment.empty(),
             state: StateReference.empty(),
             globalVariables: GlobalVariables.empty(),
@@ -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.contentCommitment.isEmpty() && this.state.isEmpty() && this.globalVariables.isEmpty() && this.totalFees.isZero() && this.totalManaUsed.isZero();
     }
     /**
    * Serializes this instance into a string.
@@ -102,6 +106,9 @@ import { StateReference } from './state_reference.js';
     hash() {
         return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH);
     }
+    toPropose() {
+        return new ProposedBlockHeader(this.lastArchive.root, this.contentCommitment, this.globalVariables.slotNumber, this.globalVariables.timestamp, this.globalVariables.coinbase, this.globalVariables.feeRecipient, this.globalVariables.gasFees, this.totalManaUsed);
+    }
     toInspect() {
         return {
             lastArchive: this.lastArchive.root.toString(),
@@ -115,10 +122,9 @@ 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')},
+  contentCommitment.blobsHash: ${inspect(this.contentCommitment.blobsHash)},
+  contentCommitment.inHash: ${inspect(this.contentCommitment.inHash)},
+  contentCommitment.outHash: ${inspect(this.contentCommitment.outHash)},
   state.l1ToL2MessageTree: ${inspect(this.state.l1ToL2MessageTree)},
   state.noteHashTree: ${inspect(this.state.partial.noteHashTree)},
   state.nullifierTree: ${inspect(this.state.partial.nullifierTree)},

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;

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);
     }
 }