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

package/dest/tx/simulated_tx.js

@@ -1,11 +1,33 @@
+import { optional } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+import { ContractArtifactSchema } from '../abi/abi.js';
+import { ContractInstanceWithAddressSchema } from '../contract/interfaces/contract_instance.js';
 import { Gas } from '../gas/gas.js';
-import { PrivateKernelProverProfileResultSchema } from '../kernel/private_kernel_prover_profile_result.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { PrivateExecutionResult, collectEnqueuedPublicFunctionCalls, collectPublicTeardownFunctionCall, collectSortedContractClassLogs } from './private_execution_result.js';
+import { ChonkProof } from '../proofs/chonk_proof.js';
+import { PrivateExecutionResult, collectSortedContractClassLogs } from './private_execution_result.js';
+import { SimulationStatsSchema } from './profiling.js';
 import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simulation_output.js';
 import { Tx } from './tx.js';
+/*
+ * Optional values that can be overridden during simulation. In order to simulate a transaction with these
+ * set, it *must* be run without the kernel circuits, or validations will fail
+ */ export class SimulationOverrides {
+    contracts;
+    constructor(contracts){
+        this.contracts = contracts;
+    }
+    static get schema() {
+        return z.object({
+            contracts: optional(z.record(z.string(), z.object({
+                instance: ContractInstanceWithAddressSchema,
+                artifact: ContractArtifactSchema
+            })))
+        }).transform(({ contracts })=>{
+            return new SimulationOverrides(contracts);
+        });
+    }
+}
 export class PrivateSimulationResult {
     privateExecutionResult;
     publicInputs;
@@ -16,19 +38,26 @@ export class PrivateSimulationResult {
     getPrivateReturnValues() {
         return accumulatePrivateReturnValues(this.privateExecutionResult);
     }
-    toSimulatedTx() {
+    async toSimulatedTx() {
         const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-        const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
-        const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
-        const tx = new Tx(this.publicInputs, ClientIvcProof.empty(), contractClassLogs, enqueuedPublicFunctions, teardownPublicFunction);
-        return tx;
+        return await Tx.create({
+            data: this.publicInputs,
+            chonkProof: ChonkProof.empty(),
+            contractClassLogFields: contractClassLogs,
+            publicFunctionCalldata: this.privateExecutionResult.publicFunctionCalldata
+        });
     }
 }
-export class TxSimulationResult extends PrivateSimulationResult {
+export class TxSimulationResult {
+    privateExecutionResult;
+    publicInputs;
     publicOutput;
-    profileResult;
-    constructor(privateExecutionResult, publicInputs, publicOutput, profileResult){
-        super(privateExecutionResult, publicInputs), this.publicOutput = publicOutput, this.profileResult = profileResult;
+    stats;
+    constructor(privateExecutionResult, publicInputs, publicOutput, stats){
+        this.privateExecutionResult = privateExecutionResult;
+        this.publicInputs = publicInputs;
+        this.publicOutput = publicOutput;
+        this.stats = stats;
     }
     get gasUsed() {
         return this.publicOutput?.gasUsed ?? {
@@ -43,50 +72,26 @@ export class TxSimulationResult extends PrivateSimulationResult {
             privateExecutionResult: PrivateExecutionResult.schema,
             publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
             publicOutput: PublicSimulationOutput.schema.optional(),
-            profileResult: PrivateKernelProverProfileResultSchema.optional()
+            stats: optional(SimulationStatsSchema)
         }).transform(TxSimulationResult.from);
     }
     static from(fields) {
-        return new TxSimulationResult(fields.privateExecutionResult, fields.publicInputs, fields.publicOutput, fields.profileResult);
-    }
-    getPublicReturnValues() {
-        return this.publicOutput ? this.publicOutput.publicReturnValues : [];
+        return new TxSimulationResult(fields.privateExecutionResult, fields.publicInputs, fields.publicOutput, fields.stats);
     }
-    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, profileResult) {
-        return new TxSimulationResult(privateSimulationResult.privateExecutionResult, privateSimulationResult.publicInputs, publicOutput, profileResult);
+    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, stats) {
+        return new TxSimulationResult(privateSimulationResult.privateExecutionResult, privateSimulationResult.publicInputs, publicOutput, stats);
     }
     static async random() {
         return new TxSimulationResult(await PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty(), await PublicSimulationOutput.random());
     }
-}
-export class TxProvingResult {
-    privateExecutionResult;
-    publicInputs;
-    clientIvcProof;
-    constructor(privateExecutionResult, publicInputs, clientIvcProof){
-        this.privateExecutionResult = privateExecutionResult;
-        this.publicInputs = publicInputs;
-        this.clientIvcProof = clientIvcProof;
-    }
-    toTx() {
-        const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-        const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
-        const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
-        const tx = new Tx(this.publicInputs, this.clientIvcProof, contractClassLogs, enqueuedPublicFunctions, teardownPublicFunction);
-        return tx;
-    }
-    static get schema() {
-        return z.object({
-            privateExecutionResult: PrivateExecutionResult.schema,
-            publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-            clientIvcProof: ClientIvcProof.schema
-        }).transform(TxProvingResult.from);
+    getPrivateReturnValues() {
+        return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).getPrivateReturnValues();
     }
-    static from(fields) {
-        return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
+    toSimulatedTx() {
+        return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).toSimulatedTx();
     }
-    static async random() {
-        return new TxProvingResult(await PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty(), ClientIvcProof.empty());
+    getPublicReturnValues() {
+        return this.publicOutput ? this.publicOutput.publicReturnValues : [];
     }
 }
 /**
@@ -97,7 +102,7 @@ export class TxProvingResult {
  */ export function accumulatePrivateReturnValues(executionResult) {
     const collectPrivateReturnValuesRecursive = (executionResult)=>{
         const acc = new NestedProcessReturnValues(executionResult.returnValues);
-        acc.nested = executionResult.nestedExecutions.map((nestedExecution)=>collectPrivateReturnValuesRecursive(nestedExecution));
+        acc.nested = executionResult.nestedExecutionResults.map((nestedExecutionResult)=>collectPrivateReturnValuesRecursive(nestedExecutionResult));
         return acc;
     };
     return collectPrivateReturnValuesRecursive(executionResult.entrypoint);

package/dest/tx/state_reference.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import type { ViemStateReference } from '@aztec/ethereum';
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
@@ -148,11 +146,15 @@ export declare class StateReference {
         };
     }>;
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): StateReference;
     static fromFields(fields: Fr[] | FieldReader): StateReference;
+    static fromViem(stateReference: ViemStateReference): StateReference;
     static empty(): StateReference;
+    static random(): StateReference;
+    toViem(): ViemStateReference;
+    toAbi(): [ReturnType<AppendOnlyTreeSnapshot['toAbi']>, ReturnType<PartialStateReference['toAbi']>];
     isEmpty(): boolean;
     toInspect(): {
         l1ToL2MessageTree: `0x${string}`;
@@ -160,6 +162,10 @@ export declare class StateReference {
         nullifierTree: `0x${string}`;
         publicDataTree: `0x${string}`;
     };
+    /**
+     * Validates the trees in world state have the expected number of leaves (multiple of number of insertions per tx)
+     */
+    validate(): void;
     [inspect.custom](): string;
     equals(other: this): boolean;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/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,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;GAEG;AACH,qBAAa,cAAc;IAEvB,6CAA6C;IACtC,iBAAiB,EAAE,sBAAsB;IAChD,0CAA0C;IACnC,OAAO,EAAE,qBAAqB;;IAHrC,6CAA6C;IACtC,iBAAiB,EAAE,sBAAsB;IAChD,0CAA0C;IACnC,OAAO,EAAE,qBAAqB;IAGvC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,QAAQ;IAKR,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAKhE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc;IAS7D,MAAM,CAAC,KAAK,IAAI,cAAc;IAI9B,OAAO,IAAI,OAAO;IAIlB,SAAS;;;;;;IAST,CAAC,OAAO,CAAC,MAAM,CAAC;IAST,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAGpC"}
+{"version":3,"file":"state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/state_reference.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;GAEG;AACH,qBAAa,cAAc;IAEvB,6CAA6C;IACtC,iBAAiB,EAAE,sBAAsB;IAChD,0CAA0C;IACnC,OAAO,EAAE,qBAAqB;;IAHrC,6CAA6C;IACtC,iBAAiB,EAAE,sBAAsB;IAChD,0CAA0C;IACnC,OAAO,EAAE,qBAAqB;IAGvC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,QAAQ;IAKR,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAKhE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc;IAS7D,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB;IAOlD,MAAM,CAAC,KAAK,IAAI,cAAc;IAI9B,MAAM,CAAC,MAAM,IAAI,cAAc;IAI/B,MAAM,IAAI,kBAAkB;IAO5B,KAAK,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;IAIlG,OAAO,IAAI,OAAO;IAIlB,SAAS;;;;;;IAST;;OAEG;IACI,QAAQ;IAkBf,CAAC,OAAO,CAAC,MAAM,CAAC;IAST,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAGpC"}

package/dest/tx/state_reference.js

@@ -1,4 +1,4 @@
-import { STATE_REFERENCE_LENGTH } from '@aztec/constants';
+import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, STATE_REFERENCE_LENGTH } from '@aztec/constants';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
@@ -23,7 +23,7 @@ import { PartialStateReference } from './partial_state_reference.js';
         return this.l1ToL2MessageTree.getSize() + this.partial.getSize();
     }
     toBuffer() {
-        // 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 serializeToBuffer(this.l1ToL2MessageTree, this.partial);
     }
     toFields() {
@@ -46,11 +46,31 @@ import { PartialStateReference } from './partial_state_reference.js';
         const partial = PartialStateReference.fromFields(reader);
         return new StateReference(l1ToL2MessageTree, partial);
     }
+    static fromViem(stateReference) {
+        return new StateReference(AppendOnlyTreeSnapshot.fromViem(stateReference.l1ToL2MessageTree), PartialStateReference.fromViem(stateReference.partialStateReference));
+    }
     static empty() {
-        return new StateReference(AppendOnlyTreeSnapshot.zero(), PartialStateReference.empty());
+        return new StateReference(AppendOnlyTreeSnapshot.empty(), PartialStateReference.empty());
+    }
+    static random() {
+        return new StateReference(AppendOnlyTreeSnapshot.random(), PartialStateReference.random());
+    }
+    toViem() {
+        return {
+            l1ToL2MessageTree: this.l1ToL2MessageTree.toViem(),
+            partialStateReference: this.partial.toViem()
+        };
+    }
+    toAbi() {
+        return [
+            this.l1ToL2MessageTree.toAbi(),
+            [
+                ...this.partial.toAbi()
+            ]
+        ];
     }
     isEmpty() {
-        return this.l1ToL2MessageTree.isZero() && this.partial.isEmpty();
+        return this.l1ToL2MessageTree.isEmpty() && this.partial.isEmpty();
     }
     toInspect() {
         return {
@@ -60,6 +80,19 @@ import { PartialStateReference } from './partial_state_reference.js';
             publicDataTree: this.partial.publicDataTree.root.toString()
         };
     }
+    /**
+   * Validates the trees in world state have the expected number of leaves (multiple of number of insertions per tx)
+   */ validate() {
+        if (this.l1ToL2MessageTree.nextAvailableLeafIndex % NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP !== 0) {
+            throw new Error(`Invalid L1 to L2 message tree next available leaf index ${this.l1ToL2MessageTree.nextAvailableLeafIndex} (must be a multiple of ${NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP})`);
+        }
+        if (this.partial.noteHashTree.nextAvailableLeafIndex % MAX_NOTE_HASHES_PER_TX !== 0) {
+            throw new Error(`Invalid note hash tree next available leaf index ${this.partial.noteHashTree.nextAvailableLeafIndex} (must be a multiple of ${MAX_NOTE_HASHES_PER_TX})`);
+        }
+        if (this.partial.nullifierTree.nextAvailableLeafIndex % MAX_NULLIFIERS_PER_TX !== 0) {
+            throw new Error(`Invalid nullifier tree next available leaf index ${this.partial.nullifierTree.nextAvailableLeafIndex} (must be a multiple of ${MAX_NULLIFIERS_PER_TX})`);
+        }
+    }
     [inspect.custom]() {
         return `StateReference {
   l1ToL2MessageTree: ${inspect(this.l1ToL2MessageTree)},
@@ -69,6 +102,6 @@ import { PartialStateReference } from './partial_state_reference.js';
 }`;
     }
     equals(other) {
-        return this.l1ToL2MessageTree.root.equals(other.l1ToL2MessageTree.root) && this.partial.equals(other.partial);
+        return this.l1ToL2MessageTree.equals(other.l1ToL2MessageTree) && this.partial.equals(other.partial);
     }
 }

package/dest/tx/tree_snapshots.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 { inspect } from 'util';
@@ -10,10 +7,10 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
  * Stores snapshots of all the trees but archive.
  */
 export declare class TreeSnapshots {
-    readonly l1ToL2MessageTree: AppendOnlyTreeSnapshot;
-    readonly noteHashTree: AppendOnlyTreeSnapshot;
-    readonly nullifierTree: AppendOnlyTreeSnapshot;
-    readonly publicDataTree: AppendOnlyTreeSnapshot;
+    l1ToL2MessageTree: AppendOnlyTreeSnapshot;
+    noteHashTree: AppendOnlyTreeSnapshot;
+    nullifierTree: AppendOnlyTreeSnapshot;
+    publicDataTree: AppendOnlyTreeSnapshot;
     constructor(l1ToL2MessageTree: AppendOnlyTreeSnapshot, noteHashTree: AppendOnlyTreeSnapshot, nullifierTree: AppendOnlyTreeSnapshot, publicDataTree: AppendOnlyTreeSnapshot);
     static get schema(): z.ZodEffects<z.ZodObject<{
         l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
@@ -69,15 +66,11 @@ export declare class TreeSnapshots {
             nextAvailableLeafIndex: string | number | bigint;
         }>;
     }, "strip", z.ZodTypeAny, {
-        l1ToL2MessageTree: AppendOnlyTreeSnapshot;
         noteHashTree: AppendOnlyTreeSnapshot;
         nullifierTree: AppendOnlyTreeSnapshot;
         publicDataTree: AppendOnlyTreeSnapshot;
+        l1ToL2MessageTree: AppendOnlyTreeSnapshot;
     }, {
-        l1ToL2MessageTree: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
         noteHashTree: {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
@@ -90,11 +83,11 @@ export declare class TreeSnapshots {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
         };
-    }>, TreeSnapshots, {
         l1ToL2MessageTree: {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
         };
+    }>, TreeSnapshots, {
         noteHashTree: {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
@@ -107,10 +100,14 @@ export declare class TreeSnapshots {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
         };
+        l1ToL2MessageTree: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
     }>;
     getSize(): number;
     static fromBuffer(buffer: Buffer | BufferReader): TreeSnapshots;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromFields(fields: Fr[] | FieldReader): TreeSnapshots;
     toFields(): Fr[];
     static empty(): TreeSnapshots;

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

@@ -1 +1 @@
-{"version":3,"file":"tree_snapshots.d.ts","sourceRoot":"","sources":["../../src/tx/tree_snapshots.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,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,aAAa;aAEN,iBAAiB,EAAE,sBAAsB;aACzC,YAAY,EAAE,sBAAsB;aACpC,aAAa,EAAE,sBAAsB;aACrC,cAAc,EAAE,sBAAsB;gBAHtC,iBAAiB,EAAE,sBAAsB,EACzC,YAAY,EAAE,sBAAsB,EACpC,aAAa,EAAE,sBAAsB,EACrC,cAAc,EAAE,sBAAsB;IAGxD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAYhB;IAED,OAAO;IASP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAU/D,QAAQ;IAKR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAW5C,QAAQ,IAAI,EAAE,EAAE;IAehB,MAAM,CAAC,KAAK,IAAI,aAAa;IAS7B,OAAO,IAAI,OAAO;IASlB,CAAC,OAAO,CAAC,MAAM,CAAC;CAQjB"}
+{"version":3,"file":"tree_snapshots.d.ts","sourceRoot":"","sources":["../../src/tx/tree_snapshots.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,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,aAAa;IAEf,iBAAiB,EAAE,sBAAsB;IACzC,YAAY,EAAE,sBAAsB;IACpC,aAAa,EAAE,sBAAsB;IACrC,cAAc,EAAE,sBAAsB;gBAHtC,iBAAiB,EAAE,sBAAsB,EACzC,YAAY,EAAE,sBAAsB,EACpC,aAAa,EAAE,sBAAsB,EACrC,cAAc,EAAE,sBAAsB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAYhB;IAED,OAAO;IASP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAU/D,QAAQ;IAKR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAW5C,QAAQ,IAAI,EAAE,EAAE;IAehB,MAAM,CAAC,KAAK,IAAI,aAAa;IAS7B,OAAO,IAAI,OAAO;IASlB,CAAC,OAAO,CAAC,MAAM,CAAC;CAQjB"}

package/dest/tx/tree_snapshots.js

@@ -32,7 +32,7 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
         return new TreeSnapshots(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot));
     }
     toBuffer() {
-        // 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 serializeToBuffer(this.l1ToL2MessageTree, this.noteHashTree, this.nullifierTree, this.publicDataTree);
     }
     static fromFields(fields) {
@@ -56,10 +56,10 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
         return fields;
     }
     static empty() {
-        return new TreeSnapshots(AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero());
+        return new TreeSnapshots(AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty());
     }
     isEmpty() {
-        return this.l1ToL2MessageTree.isZero() && this.noteHashTree.isZero() && this.nullifierTree.isZero() && this.publicDataTree.isZero();
+        return this.l1ToL2MessageTree.isEmpty() && this.noteHashTree.isEmpty() && this.nullifierTree.isEmpty() && this.publicDataTree.isEmpty();
     }
     [inspect.custom]() {
         return `TreeSnapshots {

package/dest/tx/tx.d.ts

@@ -1,77 +1,76 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer32 } from '@aztec/foundation/buffer';
+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 type { GasSettings } from '../gas/gas_settings.js';
 import type { GetPublicLogsResponse } from '../interfaces/get_logs_response.js';
 import type { L2LogsSource } from '../interfaces/l2_logs_source.js';
-import type { ScopedLogHash } from '../kernel/log_hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
-import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
+import { TopicType } from '../p2p/topic_type.js';
+import { ChonkProof } from '../proofs/chonk_proof.js';
 import type { TxStats } from '../stats/stats.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
+import { PublicCallRequestWithCalldata } from './public_call_request_with_calldata.js';
 import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
  */
 export declare class Tx extends Gossipable {
+    #private;
+    /** Identifier of the tx */
+    readonly txHash: TxHash;
     /**
      * Output of the private kernel circuit for this tx.
      */
     readonly data: PrivateKernelTailCircuitPublicInputs;
     /**
      * Proof from the private kernel circuit.
-     * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */
-    readonly clientIvcProof: ClientIvcProof;
+    readonly chonkProof: ChonkProof;
     /**
-     * Contract class logs generated by the tx.
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
      */
-    contractClassLogs: ContractClassLog[];
+    readonly contractClassLogFields: ContractClassLogFields[];
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    readonly enqueuedPublicFunctionCalls: PublicExecutionRequest[];
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */
-    readonly publicTeardownFunctionCall: PublicExecutionRequest;
-    static p2pTopic: string;
-    private txHash;
+    readonly publicFunctionCalldata: HashedValues[];
+    static p2pTopic: TopicType;
+    private calldataMap;
     constructor(
+    /** Identifier of the tx */
+    txHash: TxHash, 
     /**
      * Output of the private kernel circuit for this tx.
      */
     data: PrivateKernelTailCircuitPublicInputs, 
     /**
      * Proof from the private kernel circuit.
-     * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */
-    clientIvcProof: ClientIvcProof, 
+    chonkProof: ChonkProof, 
     /**
-     * Contract class logs generated by the tx.
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
      */
-    contractClassLogs: ContractClassLog[], 
+    contractClassLogFields: ContractClassLogFields[], 
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    enqueuedPublicFunctionCalls: PublicExecutionRequest[], 
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */
-    publicTeardownFunctionCall: PublicExecutionRequest);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    publicFunctionCalldata: HashedValues[]);
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     hasPublicCalls(): boolean;
-    getNonRevertiblePublicExecutionRequests(): PublicExecutionRequest[];
-    getRevertiblePublicExecutionRequests(): PublicExecutionRequest[];
-    getPublicTeardownExecutionRequest(): PublicExecutionRequest | undefined;
-    getTotalPublicArgsCount(): number;
+    numberOfPublicCalls(): number;
+    getNonRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getTeardownPublicCallRequestWithCalldata(): PublicCallRequestWithCalldata | undefined;
+    getPublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getTotalPublicCalldataCount(): number;
     getGasSettings(): GasSettings;
     /**
      * Deserializes the Tx object from a Buffer.
@@ -79,65 +78,48 @@ export declare class Tx extends Gossipable {
      * @returns An instance of Tx.
      */
     static fromBuffer(buffer: Buffer | BufferReader): Tx;
-    static newWithTxData(data: PrivateKernelTailCircuitPublicInputs, publicTeardownExecutionRequest?: PublicExecutionRequest): Tx;
     /**
      * Serializes the Tx object into a Buffer.
      * @returns Buffer representation of the Tx object.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static get schema(): ZodFor<Tx>;
+    static computeTxHash(fields: Pick<FieldsOf<Tx>, 'data'>): Promise<TxHash>;
+    static create(fields: Omit<FieldsOf<Tx>, 'txHash'>): Promise<Tx>;
     static from(fields: FieldsOf<Tx>): Tx;
+    /**
+     * Validates that the tx hash matches the computed hash from the tx data.
+     * This should be called when deserializing a tx from an untrusted source.
+     * @returns true if the hash is valid, false otherwise
+     */
+    validateTxHash(): Promise<boolean>;
     /**
      * Gets public logs emitted by this tx.
      * @param logsSource - An instance of `L2LogsSource` which can be used to obtain the logs.
      * @returns The requested logs.
      */
     getPublicLogs(logsSource: L2LogsSource): Promise<GetPublicLogsResponse>;
+    getContractClassLogs(): ContractClassLog[];
     /**
      * Gets either revertible or non revertible contract class logs emitted by this tx.
-     * @param revertible - true for revertible only logs, false for non reverible only logs.
-     * @returns The requested logs.
-     */
-    getSplitContractClassLogs(revertible: boolean, silo?: boolean): Promise<ContractClassLog[]>;
-    /**
-     * Filters contract class logs emitted by this tx.
-     * @param logHashes - logs to keep represented by their hashes.
-     * @param silo - whether to silo the logs before returning them.
+     * @param revertible - true for revertible only logs, false for non revertible only logs.
      * @returns The requested logs.
      */
-    filterContractClassLogs(logHashes: ScopedLogHash[], silo?: boolean): Promise<ContractClassLog[]>;
+    getSplitContractClassLogs(revertible: boolean): ContractClassLog[];
     /**
-     * Computes (if necessary) & return transaction hash.
+     * Return transaction hash.
      * @returns The hash of the public inputs of the private kernel tail circuit.
      */
-    getTxHash(forceRecompute?: boolean): Promise<TxHash>;
-    /**
-     * Allows setting the hash of the Tx.
-     * Use this when you want to skip computing it from the original data.
-     * Don't set a Tx hash received from an untrusted source.
-     * @param hash - The hash to set.
-     */
-    setTxHash(hash: TxHash): void;
+    getTxHash(): TxHash;
+    getCalldataMap(): Map<string, Fr[]>;
     /** Returns stats about this tx. */
-    getStats(): Promise<TxStats>;
+    getStats(): TxStats;
     getSize(): number;
     /**
      * Estimates the tx size based on its private effects. Note that the actual size of the tx
      * after processing will probably be larger, as public execution would generate more data.
      */
     getEstimatedPrivateTxEffectsSize(): number;
-    /**
-     * Convenience function to get a hash out of a tx or a tx-like.
-     * @param tx - Tx-like object.
-     * @returns - The hash.
-     */
-    static getHash(tx: Tx | HasHash): Promise<TxHash>;
-    /**
-     * Convenience function to get array of hashes for an array of txs.
-     * @param txs - The txs to get the hashes from.
-     * @returns The corresponding array of hashes.
-     */
-    static getHashes(txs: (Tx | HasHash)[]): Promise<TxHash[]>;
     /**
      * Clones a tx, making a deep copy of all fields.
      * @param tx - The transaction to be cloned.
@@ -149,26 +131,18 @@ export declare class Tx extends Gossipable {
      * @param randomProof - Whether to create a random proof - this will be random bytes of the full size.
      * @returns A random tx.
      */
-    static random(randomProof?: boolean): Promise<Tx>;
-    /**
-     * Filters out logs from functions that are not present in the provided kernel output.
-     *
-     * The purpose of this is to remove logs that got dropped due to a revert,
-     * in which case, we only have the kernel's hashes to go on, as opposed to
-     * this grouping by function maintained in this class.
-     *
-     * The logic therefore is to drop all FunctionLogs if any constituent hash
-     * does not appear in the provided hashes: it is impossible for part of a
-     * function to revert.
-     *
-     * @param logHashes the individual log hashes we want to keep
-     * @param out the output to put passing logs in, to keep this function abstract
-     */
-    filterRevertedLogs(): Promise<void>;
+    static random(args?: {
+        randomProof?: boolean;
+        txHash?: string | TxHash;
+    }): Tx;
+    /** Recomputes the tx hash. Used for testing purposes only when a property of the tx was mutated. */
+    recomputeHash(): Promise<void>;
+}
+/**
+ * Helper class to handle Serialization and Deserialization of Txs array.
+ */
+export declare class TxArray extends Array<Tx> {
+    static fromBuffer(buffer: Buffer | BufferReader): TxArray;
+    toBuffer(): Buffer;
 }
-/** Utility type for an entity that has a hash property for a txhash */
-type HasHash = {
-    hash: TxHash;
-};
-export {};
 //# sourceMappingURL=tx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAyD,MAAM,6BAA6B,CAAC;AAClH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,EAAG,SAAQ,UAAU;;IAM9B,2BAA2B;aACX,MAAM,EAAE,MAAM;IAC9B;;OAEG;aACa,IAAI,EAAE,oCAAoC;IAC1D;;OAEG;aACa,UAAU,EAAE,UAAU;IACtC;;;;OAIG;aACa,sBAAsB,EAAE,sBAAsB,EAAE;IAChE;;OAEG;aACa,sBAAsB,EAAE,YAAY,EAAE;IAxBxD,OAAgB,QAAQ,YAAgB;IAExC,OAAO,CAAC,WAAW,CAAgC;;IAGjD,2BAA2B;IACX,MAAM,EAAE,MAAM;IAC9B;;OAEG;IACa,IAAI,EAAE,oCAAoC;IAC1D;;OAEG;IACa,UAAU,EAAE,UAAU;IACtC;;;;OAIG;IACa,sBAAsB,EAAE,sBAAsB,EAAE;IAChE;;OAEG;IACa,sBAAsB,EAAE,YAAY,EAAE;IAM/C,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI1D,cAAc;IAId,mBAAmB;IAInB,8CAA8C,IAAI,6BAA6B,EAAE;IAIjF,2CAA2C,IAAI,6BAA6B,EAAE;IAI9E,wCAAwC,IAAI,6BAA6B,GAAG,SAAS;IAKrF,iCAAiC,IAAI,6BAA6B,EAAE;IAUpE,2BAA2B,IAAI,MAAM;IAIrC,cAAc,IAAI,WAAW;IAI7B;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,EAAE;IAWpD;;;OAGG;IACH,QAAQ;IAUR,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,CAS9B;WAEY,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;WAOhD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;IAKtE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;IAUhC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAKxC;;;;OAIG;IACI,aAAa,CAAC,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAI9E,oBAAoB,IAAI,gBAAgB,EAAE;IAW1C;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,OAAO,GAAG,gBAAgB,EAAE;IAYlE;;;OAGG;IACH,SAAS,IAAI,MAAM;IAInB,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;IAUnC,mCAAmC;IACnC,QAAQ,IAAI,OAAO;IAmBnB,OAAO;IASP;;;OAGG;IACH,gCAAgC;IAShC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE;IAUxB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,GAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAAG,EAAE;IAUjF,oGAAoG;IACvF,aAAa;CAW3B;AAED;;GAEG;AACH,qBAAa,OAAQ,SAAQ,KAAK,CAAC,EAAE,CAAC;IACpC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAWlD,QAAQ,IAAI,MAAM;CAG1B"}