@aztec/stdlib 0.86.0 → 0.87.0

package/dest/tx/partial_state_reference.d.ts

@@ -1,5 +1,3 @@
-/// <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 { z } from 'zod';
@@ -96,7 +94,7 @@ export declare class PartialStateReference {
     static fromBuffer(buffer: Buffer | BufferReader): PartialStateReference;
     static fromFields(fields: Fr[] | FieldReader): PartialStateReference;
     static empty(): PartialStateReference;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     isEmpty(): boolean;
     equals(other: this): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"partial_state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/partial_state_reference.ts"],"names":[],"mappings":";;AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,sCAAsC;aACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;aACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;aACxB,cAAc,EAAE,sBAAsB;;IALtD,sCAAsC;IACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;IACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;IACxB,cAAc,EAAE,sBAAsB;IAGxD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAWhB;IAED,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IASvE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB;IAUpE,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAQrC,QAAQ;IAIR,QAAQ;IAcR,OAAO,IAAI,OAAO;IAIX,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAOpC"}
+{"version":3,"file":"partial_state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/partial_state_reference.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,sCAAsC;aACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;aACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;aACxB,cAAc,EAAE,sBAAsB;;IALtD,sCAAsC;IACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;IACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;IACxB,cAAc,EAAE,sBAAsB;IAGxD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAWhB;IAED,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IASvE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB;IAUpE,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAQrC,QAAQ;IAIR,QAAQ;IAcR,OAAO,IAAI,OAAO;IAIX,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAOpC"}

package/dest/tx/private_execution_result.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { NoteSelector } from '../abi/note_selector.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import type { IsEmpty } from '../kernel/utils/interfaces.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Note } from '../note/note.js';
 import { type ZodFor } from '../schemas/index.js';
 import { HashedValues } from './hashed_values.js';
@@ -28,7 +26,7 @@ export declare class NoteAndSlot {
     /** The note type identifier. */
     noteTypeId: NoteSelector);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        note: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
+        note: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
             type: z.ZodLiteral<"Buffer">;
             data: z.ZodArray<z.ZodNumber, "many">;
         }, "strip", z.ZodTypeAny, {
@@ -37,7 +35,7 @@ export declare class NoteAndSlot {
         }, {
             type: "Buffer";
             data: number[];
-        }>, Buffer, {
+        }>, Buffer<ArrayBuffer>, {
             type: "Buffer";
             data: number[];
         }>]>, Note, string | {
@@ -122,9 +120,11 @@ export declare class PrivateCallExecutionResult {
     nestedExecutions: PrivateCallExecutionResult[];
     /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
+     * Note: We only need to collect the ContractClassLogFields as preimages for the tx.
+     * But keep them as ContractClassLog so that we can verify the log hashes before submitting the tx (TODO).
      */
     contractClassLogs: CountedContractClassLog[];
+    profileResult?: PrivateExecutionProfileResult | undefined;
     constructor(
     /** The ACIR bytecode. */
     acir: Buffer, 
@@ -146,9 +146,10 @@ export declare class PrivateCallExecutionResult {
     nestedExecutions: PrivateCallExecutionResult[], 
     /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
+     * Note: We only need to collect the ContractClassLogFields as preimages for the tx.
+     * But keep them as ContractClassLog so that we can verify the log hashes before submitting the tx (TODO).
      */
-    contractClassLogs: CountedContractClassLog[]);
+    contractClassLogs: CountedContractClassLog[], profileResult?: PrivateExecutionProfileResult | undefined);
     static get schema(): ZodFor<PrivateCallExecutionResult>;
     static from(fields: FieldsOf<PrivateCallExecutionResult>): PrivateCallExecutionResult;
     static random(nested?: number): Promise<PrivateCallExecutionResult>;
@@ -160,7 +161,15 @@ export declare function collectNoteHashNullifierCounterMap(execResult: PrivateEx
  * @param execResult - The topmost execution result.
  * @returns All contract class logs.
  */
-export declare function collectSortedContractClassLogs(execResult: PrivateExecutionResult): ContractClassLog[];
+export declare function collectSortedContractClassLogs(execResult: PrivateExecutionResult): ContractClassLogFields[];
 export declare function getFinalMinRevertibleSideEffectCounter(execResult: PrivateExecutionResult): number;
 export declare function collectNested<T>(executionStack: PrivateCallExecutionResult[], extractExecutionItems: (execution: PrivateCallExecutionResult) => T[]): T[];
+export declare class PrivateExecutionProfileResult {
+    timings: {
+        witgen: number;
+    };
+    constructor(timings: {
+        witgen: number;
+    });
+}
 //# sourceMappingURL=private_execution_result.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"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"}

package/dest/tx/private_execution_result.js

@@ -98,12 +98,14 @@ export class PrivateExecutionResult {
     returnValues;
     nestedExecutions;
     contractClassLogs;
+    profileResult;
     constructor(// Needed for prover
     /** The ACIR bytecode. */ acir, /** The verification key. */ vk, /** The partial witness. */ partialWitness, // Needed for the verifier (kernel)
     /** The call stack item. */ publicInputs, /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */ noteHashLeafIndexMap, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The nested executions. */ nestedExecutions, /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
-     */ contractClassLogs){
+     * Note: We only need to collect the ContractClassLogFields as preimages for the tx.
+     * But keep them as ContractClassLog so that we can verify the log hashes before submitting the tx (TODO).
+     */ contractClassLogs, profileResult){
         this.acir = acir;
         this.vk = vk;
         this.partialWitness = partialWitness;
@@ -114,6 +116,7 @@ export class PrivateExecutionResult {
         this.returnValues = returnValues;
         this.nestedExecutions = nestedExecutions;
         this.contractClassLogs = contractClassLogs;
+        this.profileResult = profileResult;
     }
     static get schema() {
         return z.object({
@@ -192,7 +195,7 @@ export function collectNoteHashNullifierCounterMap(execResult) {
  */ export function collectSortedContractClassLogs(execResult) {
     const allLogs = collectContractClassLogs(execResult.entrypoint);
     const sortedLogs = sortByCounter(allLogs);
-    return sortedLogs.map((l)=>l.log);
+    return sortedLogs.map((l)=>l.log.fields);
 }
 export function getFinalMinRevertibleSideEffectCounter(execResult) {
     const collectFinalMinRevertibleSideEffectCounterRecursive = (callResult)=>{
@@ -207,3 +210,9 @@ export function collectNested(executionStack, extractExecutionItems) {
     const thisExecutionReads = executionStack.flatMap(extractExecutionItems);
     return thisExecutionReads.concat(executionStack.flatMap(({ nestedExecutions })=>collectNested(nestedExecutions, extractExecutionItems)));
 }
+export class PrivateExecutionProfileResult {
+    timings;
+    constructor(timings){
+        this.timings = timings;
+    }
+}

package/dest/tx/profiling.d.ts

@@ -0,0 +1,110 @@
+import { type ZodFor } from '@aztec/foundation/schemas';
+import { z } from 'zod';
+import type { AbiDecoded } from '../abi/decoder.js';
+import { type PrivateExecutionStep } from '../kernel/private_kernel_prover_output.js';
+type FunctionTiming = {
+    functionName: string;
+    time: number;
+};
+export type ProvingTimings = {
+    sync?: number;
+    proving?: number;
+    perFunction: FunctionTiming[];
+    unaccounted: number;
+    total: number;
+};
+export declare const ProvingTimingsSchema: z.ZodObject<{
+    sync: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+    proving: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+    perFunction: z.ZodArray<z.ZodObject<{
+        functionName: z.ZodString;
+        time: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        functionName: string;
+        time: number;
+    }, {
+        functionName: string;
+        time: number;
+    }>, "many">;
+    unaccounted: z.ZodNumber;
+    total: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    perFunction: {
+        functionName: string;
+        time: number;
+    }[];
+    unaccounted: number;
+    total: number;
+    sync?: number | undefined;
+    proving?: number | undefined;
+}, {
+    perFunction: {
+        functionName: string;
+        time: number;
+    }[];
+    unaccounted: number;
+    total: number;
+    sync?: number | undefined;
+    proving?: number | undefined;
+}>;
+export interface SimulationTimings {
+    sync: number;
+    publicSimulation?: number;
+    validation?: number;
+    perFunction: FunctionTiming[];
+    unaccounted: number;
+    total: number;
+}
+export declare const SimulationTimingsSchema: z.ZodObject<{
+    sync: z.ZodNumber;
+    publicSimulation: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+    validation: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
+    perFunction: z.ZodArray<z.ZodObject<{
+        functionName: z.ZodString;
+        time: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        functionName: string;
+        time: number;
+    }, {
+        functionName: string;
+        time: number;
+    }>, "many">;
+    unaccounted: z.ZodNumber;
+    total: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    sync: number;
+    perFunction: {
+        functionName: string;
+        time: number;
+    }[];
+    unaccounted: number;
+    total: number;
+    validation?: number | undefined;
+    publicSimulation?: number | undefined;
+}, {
+    sync: number;
+    perFunction: {
+        functionName: string;
+        time: number;
+    }[];
+    unaccounted: number;
+    total: number;
+    validation?: number | undefined;
+    publicSimulation?: number | undefined;
+}>;
+export declare class TxProfileResult {
+    executionSteps: PrivateExecutionStep[];
+    timings: ProvingTimings;
+    constructor(executionSteps: PrivateExecutionStep[], timings: ProvingTimings);
+    static get schema(): ZodFor<TxProfileResult>;
+    static random(): TxProfileResult;
+}
+export declare class UtilitySimulationResult {
+    result: AbiDecoded;
+    timings?: SimulationTimings | undefined;
+    constructor(result: AbiDecoded, timings?: SimulationTimings | undefined);
+    static get schema(): ZodFor<UtilitySimulationResult>;
+    static random(): UtilitySimulationResult;
+}
+export {};
+//# sourceMappingURL=profiling.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/tx/profiling.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,2CAA2C,CAAC;AAGlH,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAIF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM/B,CAAC;AAEH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOlC,CAAC;AAEH,qBAAa,eAAe;IAEjB,cAAc,EAAE,oBAAoB,EAAE;IACtC,OAAO,EAAE,cAAc;gBADvB,cAAc,EAAE,oBAAoB,EAAE,EACtC,OAAO,EAAE,cAAc;IAGhC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAO3C;IAED,MAAM,CAAC,MAAM,IAAI,eAAe;CA4BjC;AAED,qBAAa,uBAAuB;IAEzB,MAAM,EAAE,UAAU;IAClB,OAAO,CAAC,EAAE,iBAAiB;gBAD3B,MAAM,EAAE,UAAU,EAClB,OAAO,CAAC,EAAE,iBAAiB,YAAA;IAGpC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAOnD;IAED,MAAM,CAAC,MAAM,IAAI,uBAAuB;CAezC"}

package/dest/tx/profiling.js

@@ -0,0 +1,97 @@
+import { Fr } from '@aztec/foundation/fields';
+import { optional } from '@aztec/foundation/schemas';
+import { z } from 'zod';
+import { PrivateExecutionStepSchema } from '../kernel/private_kernel_prover_output.js';
+import { AbiDecodedSchema } from '../schemas/schemas.js';
+const FunctionTimingSchema = z.object({
+    functionName: z.string(),
+    time: z.number()
+});
+export const ProvingTimingsSchema = z.object({
+    sync: optional(z.number()),
+    proving: optional(z.number()),
+    perFunction: z.array(FunctionTimingSchema),
+    unaccounted: z.number(),
+    total: z.number()
+});
+export const SimulationTimingsSchema = z.object({
+    sync: z.number(),
+    publicSimulation: optional(z.number()),
+    validation: optional(z.number()),
+    perFunction: z.array(FunctionTimingSchema),
+    unaccounted: z.number(),
+    total: z.number()
+});
+export class TxProfileResult {
+    executionSteps;
+    timings;
+    constructor(executionSteps, timings){
+        this.executionSteps = executionSteps;
+        this.timings = timings;
+    }
+    static get schema() {
+        return z.object({
+            executionSteps: z.array(PrivateExecutionStepSchema),
+            timings: ProvingTimingsSchema
+        }).transform(({ executionSteps, timings })=>new TxProfileResult(executionSteps, timings));
+    }
+    static random() {
+        return new TxProfileResult([
+            {
+                functionName: 'random',
+                bytecode: Buffer.from('random'),
+                witness: new Map([
+                    [
+                        1,
+                        'random'
+                    ]
+                ]),
+                vk: Buffer.from('random'),
+                timings: {
+                    witgen: 1,
+                    gateCount: 1
+                }
+            }
+        ], {
+            sync: 1,
+            proving: 1,
+            perFunction: [
+                {
+                    functionName: 'random',
+                    time: 1
+                }
+            ],
+            unaccounted: 1,
+            total: 4
+        });
+    }
+}
+export class UtilitySimulationResult {
+    result;
+    timings;
+    constructor(result, timings){
+        this.result = result;
+        this.timings = timings;
+    }
+    static get schema() {
+        return z.object({
+            result: AbiDecodedSchema,
+            timings: optional(SimulationTimingsSchema)
+        }).transform(({ result, timings })=>new UtilitySimulationResult(result, timings));
+    }
+    static random() {
+        return new UtilitySimulationResult(Fr.random().toBigInt(), {
+            sync: 1,
+            publicSimulation: 1,
+            validation: 1,
+            perFunction: [
+                {
+                    functionName: 'random',
+                    time: 1
+                }
+            ],
+            unaccounted: 1,
+            total: 5
+        });
+    }
+}

package/dest/tx/proposed_block_header.d.ts

@@ -0,0 +1,80 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import type { ZodFor } from '@aztec/foundation/schemas';
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { inspect } from 'util';
+import { AztecAddress } from '../aztec-address/index.js';
+import { GasFees } from '../gas/index.js';
+import type { UInt64 } from '../types/shared.js';
+import { ContentCommitment } from './content_commitment.js';
+/** The proposed values of an L2 block. */
+export declare class ProposedBlockHeader {
+    /** Root of the archive tree before this block is added. */
+    lastArchiveRoot: Fr;
+    /** Content commitment of the L2 block. */
+    contentCommitment: ContentCommitment;
+    /** Slot number of the L2 block */
+    slotNumber: Fr;
+    /** Timestamp of the L2 block. */
+    timestamp: UInt64;
+    /** Recipient of block reward. */
+    coinbase: EthAddress;
+    /** Address to receive fees. */
+    feeRecipient: AztecAddress;
+    /** Global gas prices for this block. */
+    gasFees: GasFees;
+    /** Total mana used in the block, computed by the root rollup circuit */
+    totalManaUsed: Fr;
+    constructor(
+    /** Root of the archive tree before this block is added. */
+    lastArchiveRoot: Fr, 
+    /** Content commitment of the L2 block. */
+    contentCommitment: ContentCommitment, 
+    /** Slot number of the L2 block */
+    slotNumber: Fr, 
+    /** Timestamp of the L2 block. */
+    timestamp: UInt64, 
+    /** Recipient of block reward. */
+    coinbase: EthAddress, 
+    /** Address to receive fees. */
+    feeRecipient: AztecAddress, 
+    /** Global gas prices for this block. */
+    gasFees: GasFees, 
+    /** Total mana used in the block, computed by the root rollup circuit */
+    totalManaUsed: Fr);
+    static get schema(): ZodFor<ProposedBlockHeader>;
+    static getFields(fields: FieldsOf<ProposedBlockHeader>): readonly [Fr, ContentCommitment, Fr, bigint, EthAddress, AztecAddress, GasFees, Fr];
+    static from(fields: FieldsOf<ProposedBlockHeader>): ProposedBlockHeader;
+    static fromBuffer(buffer: Buffer | BufferReader): ProposedBlockHeader;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    hash(): Fr;
+    static empty(fields?: Partial<FieldsOf<ProposedBlockHeader>>): ProposedBlockHeader;
+    isEmpty(): boolean;
+    /**
+     * Serializes this instance into a string.
+     * @returns Encoded string.
+     */
+    toString(): `0x${string}`;
+    static fromString(str: string): ProposedBlockHeader;
+    toInspect(): {
+        lastArchive: `0x${string}`;
+        contentCommitment: {
+            numTxs: number;
+            blobsHash: `0x${string}`;
+            inHash: `0x${string}`;
+            outHash: `0x${string}`;
+        };
+        slotNumber: bigint;
+        timestamp: bigint;
+        coinbase: `0x${string}`;
+        feeRecipient: `0x${string}`;
+        gasFees: {
+            feePerDaGas: number;
+            feePerL2Gas: number;
+        };
+        totalManaUsed: bigint;
+    };
+    [inspect.custom](): string;
+}
+//# sourceMappingURL=proposed_block_header.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proposed_block_header.d.ts","sourceRoot":"","sources":["../../src/tx/proposed_block_header.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAuC,MAAM,6BAA6B,CAAC;AAEhG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,0CAA0C;AAC1C,qBAAa,mBAAmB;IAE5B,2DAA2D;IACpD,eAAe,EAAE,EAAE;IAC1B,0CAA0C;IACnC,iBAAiB,EAAE,iBAAiB;IAC3C,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IACvB,wEAAwE;IACjE,aAAa,EAAE,EAAE;;IAfxB,2DAA2D;IACpD,eAAe,EAAE,EAAE;IAC1B,0CAA0C;IACnC,iBAAiB,EAAE,iBAAiB;IAC3C,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IACvB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IAG1B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAa/C;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;IAatD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;IAIjD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB;IAerE,QAAQ;IAcR,IAAI,IAAI,EAAE;IAIV,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAM,GAAG,mBAAmB;IActF,OAAO,IAAI,OAAO;IAalB;;;OAGG;IACI,QAAQ;IAIf,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB;IAInD,SAAS;;;;;;;;;;;;;;;;;;IAaT,CAAC,OAAO,CAAC,MAAM,CAAC;CAajB"}

package/dest/tx/proposed_block_header.js

@@ -0,0 +1,130 @@
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { inspect } from 'util';
+import { z } from 'zod';
+import { AztecAddress } from '../aztec-address/index.js';
+import { GasFees } from '../gas/index.js';
+import { schemas } from '../schemas/index.js';
+import { ContentCommitment } from './content_commitment.js';
+/** The proposed values of an L2 block. */ export class ProposedBlockHeader {
+    lastArchiveRoot;
+    contentCommitment;
+    slotNumber;
+    timestamp;
+    coinbase;
+    feeRecipient;
+    gasFees;
+    totalManaUsed;
+    constructor(/** Root of the archive tree before this block is added. */ lastArchiveRoot, /** Content commitment of the L2 block. */ contentCommitment, /** Slot number of the L2 block */ slotNumber, /** Timestamp of the L2 block. */ timestamp, /** Recipient of block reward. */ coinbase, /** Address to receive fees. */ feeRecipient, /** Global gas prices for this block. */ gasFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed){
+        this.lastArchiveRoot = lastArchiveRoot;
+        this.contentCommitment = contentCommitment;
+        this.slotNumber = slotNumber;
+        this.timestamp = timestamp;
+        this.coinbase = coinbase;
+        this.feeRecipient = feeRecipient;
+        this.gasFees = gasFees;
+        this.totalManaUsed = totalManaUsed;
+    }
+    static get schema() {
+        return z.object({
+            lastArchiveRoot: schemas.Fr,
+            contentCommitment: ContentCommitment.schema,
+            slotNumber: schemas.Fr,
+            timestamp: schemas.BigInt,
+            coinbase: schemas.EthAddress,
+            feeRecipient: schemas.AztecAddress,
+            gasFees: GasFees.schema,
+            totalManaUsed: schemas.Fr
+        }).transform(ProposedBlockHeader.from);
+    }
+    static getFields(fields) {
+        return [
+            fields.lastArchiveRoot,
+            fields.contentCommitment,
+            fields.slotNumber,
+            fields.timestamp,
+            fields.coinbase,
+            fields.feeRecipient,
+            fields.gasFees,
+            fields.totalManaUsed
+        ];
+    }
+    static from(fields) {
+        return new ProposedBlockHeader(...ProposedBlockHeader.getFields(fields));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new ProposedBlockHeader(reader.readObject(Fr), reader.readObject(ContentCommitment), Fr.fromBuffer(reader), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees), reader.readObject(Fr));
+    }
+    toBuffer() {
+        // Note: The order here must match the order in the HeaderLib solidity library.
+        return serializeToBuffer([
+            this.lastArchiveRoot,
+            this.contentCommitment,
+            this.slotNumber,
+            bigintToUInt64BE(this.timestamp),
+            this.coinbase,
+            this.feeRecipient,
+            this.gasFees,
+            this.totalManaUsed
+        ]);
+    }
+    hash() {
+        return sha256ToField([
+            this.toBuffer()
+        ]);
+    }
+    static empty(fields = {}) {
+        return ProposedBlockHeader.from({
+            lastArchiveRoot: Fr.ZERO,
+            contentCommitment: ContentCommitment.empty(),
+            slotNumber: Fr.ZERO,
+            timestamp: 0n,
+            coinbase: EthAddress.ZERO,
+            feeRecipient: AztecAddress.ZERO,
+            gasFees: GasFees.empty(),
+            totalManaUsed: Fr.ZERO,
+            ...fields
+        });
+    }
+    isEmpty() {
+        return this.lastArchiveRoot.isZero() && this.contentCommitment.isEmpty() && this.slotNumber.isZero() && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty() && this.totalManaUsed.isZero();
+    }
+    /**
+   * Serializes this instance into a string.
+   * @returns Encoded string.
+   */ toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    static fromString(str) {
+        return ProposedBlockHeader.fromBuffer(hexToBuffer(str));
+    }
+    toInspect() {
+        return {
+            lastArchive: this.lastArchiveRoot.toString(),
+            contentCommitment: this.contentCommitment.toInspect(),
+            slotNumber: this.slotNumber.toBigInt(),
+            timestamp: this.timestamp,
+            coinbase: this.coinbase.toString(),
+            feeRecipient: this.feeRecipient.toString(),
+            gasFees: this.gasFees.toInspect(),
+            totalManaUsed: this.totalManaUsed.toBigInt()
+        };
+    }
+    [inspect.custom]() {
+        const gasfees = `da:${this.gasFees.feePerDaGas.toBigInt()}, l2:${this.gasFees.feePerL2Gas.toBigInt()}`;
+        return `Header {
+  lastArchiveRoot: ${this.lastArchiveRoot.toString()},
+  contentCommitment: ${inspect(this.contentCommitment)},
+  slotNumber: ${this.slotNumber.toBigInt()},
+  timestamp: ${this.timestamp},
+  coinbase: ${this.coinbase.toString()},
+  feeRecipient: ${this.feeRecipient.toString()},
+  gasFees: ${gasfees},
+  totalManaUsed: ${this.totalManaUsed.toBigInt()},
+}`;
+    }
+}