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

package/dest/tx/simulated_tx.d.ts

@@ -1,66 +1,190 @@
-import type { ZodFor } from '@aztec/foundation/schemas';
+import { type ZodFor } from '@aztec/foundation/schemas';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
+import { type ContractArtifact } from '../abi/abi.js';
+import { type ContractInstanceWithAddress } from '../contract/interfaces/contract_instance.js';
 import type { GasUsed } from '../gas/gas_used.js';
-import { type PrivateKernelProverProfileResult } 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 } from './private_execution_result.js';
+import { type SimulationStats } from './profiling.js';
 import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simulation_output.js';
 import { Tx } from './tx.js';
+export type ContractOverrides = Record<string, {
+    instance: ContractInstanceWithAddress;
+    artifact: ContractArtifact;
+}>;
+export declare class SimulationOverrides {
+    contracts?: ContractOverrides | undefined;
+    constructor(contracts?: ContractOverrides | undefined);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        contracts: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            instance: z.ZodIntersection<z.ZodObject<{
+                version: z.ZodLiteral<1>;
+                salt: ZodFor<import("@aztec/foundation/schemas").Fr>;
+                deployer: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+                currentContractClassId: ZodFor<import("@aztec/foundation/schemas").Fr>;
+                originalContractClassId: ZodFor<import("@aztec/foundation/schemas").Fr>;
+                initializationHash: ZodFor<import("@aztec/foundation/schemas").Fr>;
+                publicKeys: z.ZodEffects<z.ZodObject<{
+                    masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
+                    masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
+                    masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
+                    masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
+                }, "strip", z.ZodTypeAny, {
+                    masterNullifierPublicKey: import("@aztec/foundation/schemas").Point;
+                    masterIncomingViewingPublicKey: import("@aztec/foundation/schemas").Point;
+                    masterOutgoingViewingPublicKey: import("@aztec/foundation/schemas").Point;
+                    masterTaggingPublicKey: import("@aztec/foundation/schemas").Point;
+                }, {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                }>, import("../keys/public_keys.js").PublicKeys, {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                version: 1;
+                salt: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+                deployer: import("../aztec-address/index.js").AztecAddress;
+                currentContractClassId: import("@aztec/foundation/schemas").Fr;
+                originalContractClassId: import("@aztec/foundation/schemas").Fr;
+                initializationHash: import("@aztec/foundation/schemas").Fr;
+            }, {
+                version: 1;
+                publicKeys: {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                };
+                salt?: any;
+                deployer?: any;
+                currentContractClassId?: any;
+                originalContractClassId?: any;
+                initializationHash?: any;
+            }>, z.ZodObject<{
+                address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+            }, "strip", z.ZodTypeAny, {
+                address: import("../aztec-address/index.js").AztecAddress;
+            }, {
+                address?: any;
+            }>>;
+            artifact: ZodFor<ContractArtifact>;
+        }, "strip", z.ZodTypeAny, {
+            instance: {
+                version: 1;
+                salt: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+                deployer: import("../aztec-address/index.js").AztecAddress;
+                currentContractClassId: import("@aztec/foundation/schemas").Fr;
+                originalContractClassId: import("@aztec/foundation/schemas").Fr;
+                initializationHash: import("@aztec/foundation/schemas").Fr;
+            } & {
+                address: import("../aztec-address/index.js").AztecAddress;
+            };
+            artifact: ContractArtifact;
+        }, {
+            instance: {
+                version: 1;
+                publicKeys: {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                };
+                salt?: any;
+                deployer?: any;
+                currentContractClassId?: any;
+                originalContractClassId?: any;
+                initializationHash?: any;
+            } & {
+                address?: any;
+            };
+            artifact?: any;
+        }>>>;
+    }, "strip", z.ZodTypeAny, {
+        contracts?: Record<string, {
+            instance: {
+                version: 1;
+                salt: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+                deployer: import("../aztec-address/index.js").AztecAddress;
+                currentContractClassId: import("@aztec/foundation/schemas").Fr;
+                originalContractClassId: import("@aztec/foundation/schemas").Fr;
+                initializationHash: import("@aztec/foundation/schemas").Fr;
+            } & {
+                address: import("../aztec-address/index.js").AztecAddress;
+            };
+            artifact: ContractArtifact;
+        }> | undefined;
+    }, {
+        contracts?: Record<string, {
+            instance: {
+                version: 1;
+                publicKeys: {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                };
+                salt?: any;
+                deployer?: any;
+                currentContractClassId?: any;
+                originalContractClassId?: any;
+                initializationHash?: any;
+            } & {
+                address?: any;
+            };
+            artifact?: any;
+        }> | undefined;
+    }>, SimulationOverrides, {
+        contracts?: Record<string, {
+            instance: {
+                version: 1;
+                publicKeys: {
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
+                };
+                salt?: any;
+                deployer?: any;
+                currentContractClassId?: any;
+                originalContractClassId?: any;
+                initializationHash?: any;
+            } & {
+                address?: any;
+            };
+            artifact?: any;
+        }> | undefined;
+    }>;
+}
 export declare class PrivateSimulationResult {
     privateExecutionResult: PrivateExecutionResult;
     publicInputs: PrivateKernelTailCircuitPublicInputs;
     constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs);
     getPrivateReturnValues(): NestedProcessReturnValues;
-    toSimulatedTx(): Tx;
+    toSimulatedTx(): Promise<Tx>;
 }
-export declare class TxSimulationResult extends PrivateSimulationResult {
+export declare class TxSimulationResult {
+    privateExecutionResult: PrivateExecutionResult;
+    publicInputs: PrivateKernelTailCircuitPublicInputs;
     publicOutput?: PublicSimulationOutput | undefined;
-    profileResult?: {
-        gateCounts: {
-            circuitName: string;
-            gateCount: number;
-        }[];
-    } | undefined;
-    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, publicOutput?: PublicSimulationOutput | undefined, profileResult?: {
-        gateCounts: {
-            circuitName: string;
-            gateCount: number;
-        }[];
-    } | undefined);
+    stats?: SimulationStats | undefined;
+    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, publicOutput?: PublicSimulationOutput | undefined, stats?: SimulationStats | undefined);
     get gasUsed(): GasUsed;
     static get schema(): ZodFor<TxSimulationResult>;
     static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed'>): TxSimulationResult;
-    getPublicReturnValues(): NestedProcessReturnValues[];
-    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult: PrivateSimulationResult, publicOutput?: PublicSimulationOutput, profileResult?: PrivateKernelProverProfileResult): TxSimulationResult;
+    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult: PrivateSimulationResult, publicOutput?: PublicSimulationOutput, stats?: SimulationStats): TxSimulationResult;
     static random(): Promise<TxSimulationResult>;
-}
-export declare class TxProvingResult {
-    privateExecutionResult: PrivateExecutionResult;
-    publicInputs: PrivateKernelTailCircuitPublicInputs;
-    clientIvcProof: ClientIvcProof;
-    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, clientIvcProof: ClientIvcProof);
-    toTx(): Tx;
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        privateExecutionResult: ZodFor<PrivateExecutionResult>;
-        publicInputs: z.ZodType<PrivateKernelTailCircuitPublicInputs, any, string>;
-        clientIvcProof: z.ZodType<ClientIvcProof, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        publicInputs: PrivateKernelTailCircuitPublicInputs;
-        clientIvcProof: ClientIvcProof;
-        privateExecutionResult: PrivateExecutionResult;
-    }, {
-        publicInputs: string;
-        clientIvcProof: string;
-        privateExecutionResult?: any;
-    }>, TxProvingResult, {
-        publicInputs: string;
-        clientIvcProof: string;
-        privateExecutionResult?: any;
-    }>;
-    static from(fields: FieldsOf<TxProvingResult>): TxProvingResult;
-    static random(): Promise<TxProvingResult>;
+    getPrivateReturnValues(): NestedProcessReturnValues;
+    toSimulatedTx(): Promise<Tx>;
+    getPublicReturnValues(): NestedProcessReturnValues[];
 }
 /**
  * Recursively accummulate the return values of a call result and its nested executions,

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

@@ -1 +1 @@
-{"version":3,"file":"simulated_tx.d.ts","sourceRoot":"","sources":["../../src/tx/simulated_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,KAAK,gCAAgC,EAEtC,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAEL,sBAAsB,EAIvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;gBADlD,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC;IAG3D,sBAAsB;IAItB,aAAa,IAAI,EAAE;CAcpB;AAED,qBAAa,kBAAmB,SAAQ,uBAAuB;IAIpD,YAAY,CAAC;IACb,aAAa,CAAC;;;;;;gBAHrB,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAC3C,YAAY,CAAC,oCAAwB,EACrC,aAAa,CAAC;;;;;iBAAkC;IAKzD,IAAI,OAAO,IAAI,OAAO,CASrB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAS9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IASjE,qBAAqB;IAIrB,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,aAAa,CAAC,EAAE,gCAAgC;WAUrC,MAAM;CAOpB;AAED,qBAAa,eAAe;IAEjB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,cAAc,EAAE,cAAc;gBAF9B,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,cAAc,EAAE,cAAc;IAGvC,IAAI,IAAI,EAAE;IAeV,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;WAIhC,MAAM;CAOpB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}
+{"version":3,"file":"simulated_tx.d.ts","sourceRoot":"","sources":["../../src/tx/simulated_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,eAAe,CAAC;AAC9E,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAE9G,OAAO,EAEL,sBAAsB,EAEvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CACpC,MAAM,EACN;IAAE,QAAQ,EAAE,2BAA2B,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CACtE,CAAC;AAMF,qBAAa,mBAAmB;IACX,SAAS,CAAC,EAAE,iBAAiB;gBAA7B,SAAS,CAAC,EAAE,iBAAiB,YAAA;IAEhD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;CACF;AAED,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;gBADlD,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC;IAG3D,sBAAsB;IAIhB,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC;CAUnC;AAED,qBAAa,kBAAkB;IAEpB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,YAAY,CAAC,EAAE,sBAAsB;IACrC,KAAK,CAAC,EAAE,eAAe;gBAHvB,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,YAAY,CAAC,EAAE,sBAAsB,YAAA,EACrC,KAAK,CAAC,EAAE,eAAe,YAAA;IAGhC,IAAI,OAAO,IAAI,OAAO,CASrB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAS9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IASjE,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,KAAK,CAAC,EAAE,eAAe;WAUZ,MAAM;IAQnB,sBAAsB;IAItB,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC;IAI5B,qBAAqB;CAGtB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}

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 { 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,
+            clientIvcProof: ClientIvcProof.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 {