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

package/dest/tx/public_simulation_output.js

@@ -1,11 +1,13 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import times from 'lodash.times';
 import { z } from 'zod';
 import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
-import { CombinedConstantData } from '../kernel/combined_constant_data.js';
+import { DebugLog } from '../logs/debug_log.js';
+import { NullishToUndefined } from '../schemas/schemas.js';
 import { TxEffect } from '../tx/tx_effect.js';
+import { GlobalVariables } from './global_variables.js';
 /** Return values of simulating complete callstack. */ export class NestedProcessReturnValues {
     values;
     nested;
@@ -13,12 +15,18 @@ import { TxEffect } from '../tx/tx_effect.js';
         this.values = values;
         this.nested = nested ?? [];
     }
+    equals(other) {
+        return this.values?.length === other.values?.length && this.nested.length === other.nested.length && (this.values === undefined || this.values.every((v, i)=>v.equals(other.values[i]))) && this.nested.every((n, i)=>n.equals(other.nested[i]));
+    }
     static get schema() {
         return z.object({
-            values: z.array(schemas.Fr).optional(),
+            values: NullishToUndefined(z.array(schemas.Fr)),
             nested: z.array(z.lazy(()=>NestedProcessReturnValues.schema))
         }).transform(({ values, nested })=>new NestedProcessReturnValues(values, nested));
     }
+    static fromPlainObject(obj) {
+        return new NestedProcessReturnValues(obj.values?.map(Fr.fromPlainObject), obj.nested?.map(NestedProcessReturnValues.fromPlainObject));
+    }
     static empty() {
         return new NestedProcessReturnValues([]);
     }
@@ -32,21 +40,23 @@ import { TxEffect } from '../tx/tx_effect.js';
  * Outputs of processing the public component of a transaction.
  */ export class PublicSimulationOutput {
     revertReason;
-    constants;
+    globalVariables;
     txEffect;
     publicReturnValues;
     gasUsed;
-    constructor(revertReason, constants, txEffect, publicReturnValues, gasUsed){
+    debugLogs;
+    constructor(revertReason, globalVariables, txEffect, publicReturnValues, gasUsed, debugLogs = []){
         this.revertReason = revertReason;
-        this.constants = constants;
+        this.globalVariables = globalVariables;
         this.txEffect = txEffect;
         this.publicReturnValues = publicReturnValues;
         this.gasUsed = gasUsed;
+        this.debugLogs = debugLogs;
     }
     static get schema() {
         return z.object({
             revertReason: SimulationError.schema.optional(),
-            constants: CombinedConstantData.schema,
+            globalVariables: GlobalVariables.schema,
             txEffect: TxEffect.schema,
             publicReturnValues: z.array(NestedProcessReturnValues.schema),
             gasUsed: z.object({
@@ -54,11 +64,12 @@ import { TxEffect } from '../tx/tx_effect.js';
                 teardownGas: Gas.schema,
                 publicGas: Gas.schema,
                 billedGas: Gas.schema
-            })
-        }).transform((fields)=>new PublicSimulationOutput(fields.revertReason, fields.constants, fields.txEffect, fields.publicReturnValues, fields.gasUsed));
+            }),
+            debugLogs: z.array(DebugLog.schema).default([])
+        }).transform((fields)=>new PublicSimulationOutput(fields.revertReason, fields.globalVariables, fields.txEffect, fields.publicReturnValues, fields.gasUsed, fields.debugLogs));
     }
     static async random() {
-        return new PublicSimulationOutput(await SimulationError.random(), CombinedConstantData.empty(), TxEffect.empty(), times(2, NestedProcessReturnValues.random), {
+        return new PublicSimulationOutput(await SimulationError.random(), GlobalVariables.empty(), TxEffect.empty(), times(2, NestedProcessReturnValues.random), {
             teardownGas: Gas.random(),
             totalGas: Gas.random(),
             publicGas: Gas.random(),

package/dest/tx/simulated_tx.d.ts

@@ -1,72 +1,144 @@
-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 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 { type PublicStorageOverride } from '../interfaces/public_storage_override.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
+import type { OffchainEffect } from './offchain_effect.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;
+}>;
+export declare class SimulationOverrides {
+    publicStorage?: PublicStorageOverride[];
+    contracts?: ContractOverrides;
+    constructor(args?: {
+        publicStorage?: PublicStorageOverride[];
+        contracts?: ContractOverrides;
+    });
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        publicStorage: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
+            contract: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+            slot: ZodFor<import("@aztec/foundation/schemas").Fr>;
+            value: ZodFor<import("@aztec/foundation/schemas").Fr>;
+        }, z.core.$strip>>>>, z.ZodTransform<{
+            contract: import("../aztec-address/index.js").AztecAddress;
+            slot: import("@aztec/foundation/schemas").Fr;
+            value: import("@aztec/foundation/schemas").Fr;
+        }[] | undefined, {
+            contract: import("../aztec-address/index.js").AztecAddress;
+            slot: import("@aztec/foundation/schemas").Fr;
+            value: import("@aztec/foundation/schemas").Fr;
+        }[] | null | undefined>>;
+        contracts: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodObject<{
+            instance: z.ZodIntersection<z.ZodObject<{
+                version: z.ZodLiteral<2>;
+                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>;
+                immutablesHash: ZodFor<import("@aztec/foundation/schemas").Fr>;
+                publicKeys: z.ZodPipe<z.ZodObject<{
+                    npkMHash: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                    ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+                    ovpkMHash: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                    tpkMHash: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                    mspkMHash: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                    fbpkMHash: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                }, z.core.$strip>, z.ZodTransform<import("../keys/public_keys.js").PublicKeys, {
+                    npkMHash: import("@aztec/foundation/schemas").Fr;
+                    ivpkM: import("@aztec/foundation/schemas").Point;
+                    ovpkMHash: import("@aztec/foundation/schemas").Fr;
+                    tpkMHash: import("@aztec/foundation/schemas").Fr;
+                    mspkMHash: import("@aztec/foundation/schemas").Fr;
+                    fbpkMHash: import("@aztec/foundation/schemas").Fr;
+                }>>;
+            }, z.core.$strip>, z.ZodObject<{
+                address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+            }, z.core.$strip>>;
+        }, z.core.$strip>>>>, z.ZodTransform<Record<string, {
+            instance: {
+                version: 2;
+                salt: import("@aztec/foundation/schemas").Fr;
+                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;
+                immutablesHash: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+            } & {
+                address: import("../aztec-address/index.js").AztecAddress;
+            };
+        }> | undefined, Record<string, {
+            instance: {
+                version: 2;
+                salt: import("@aztec/foundation/schemas").Fr;
+                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;
+                immutablesHash: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+            } & {
+                address: import("../aztec-address/index.js").AztecAddress;
+            };
+        }> | null | undefined>>;
+    }, z.core.$strip>, z.ZodTransform<SimulationOverrides, {
+        publicStorage: {
+            contract: import("../aztec-address/index.js").AztecAddress;
+            slot: import("@aztec/foundation/schemas").Fr;
+            value: import("@aztec/foundation/schemas").Fr;
+        }[] | undefined;
+        contracts: Record<string, {
+            instance: {
+                version: 2;
+                salt: import("@aztec/foundation/schemas").Fr;
+                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;
+                immutablesHash: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+            } & {
+                address: import("../aztec-address/index.js").AztecAddress;
+            };
+        }> | 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);
+    /** Returns offchain effects collected from private execution. */
+    get offchainEffects(): OffchainEffect[];
     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 from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed' | 'offchainEffects'>): 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,
+ * Recursively accumulate the return values of a call result and its nested executions,
  * so they can be retrieved in order.
  * @param executionResult
  * @returns
  */
 export declare function accumulatePrivateReturnValues(executionResult: PrivateExecutionResult): NestedProcessReturnValues;
-//# sourceMappingURL=simulated_tx.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltdWxhdGVkX3R4LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvc2ltdWxhdGVkX3R4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBWSxNQUFNLDJCQUEyQixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUNMLEtBQUssMkJBQTJCLEVBRWpDLE1BQU0sNkNBQTZDLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQStCLE1BQU0sMENBQTBDLENBQUM7QUFDbkgsT0FBTyxFQUFFLG9DQUFvQyxFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFFOUcsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDM0QsT0FBTyxFQUVMLHNCQUFzQixFQUd2QixNQUFNLCtCQUErQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUIsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3RSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNsRyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBUzdCLE1BQU0sTUFBTSxpQkFBaUIsR0FBRyxNQUFNLENBQUMsTUFBTSxFQUErQjtJQUFFLFFBQVEsRUFBRSwyQkFBMkIsQ0FBQTtDQUFFLENBQUMsQ0FBQztBQVF2SCxxQkFBYSxtQkFBbUI7SUFDdkIsYUFBYSxDQUFDLEVBQUUscUJBQXFCLEVBQUUsQ0FBQztJQUN4QyxTQUFTLENBQUMsRUFBRSxpQkFBaUIsQ0FBQztJQUVyQyxZQUFZLElBQUksR0FBRTtRQUFFLGFBQWEsQ0FBQyxFQUFFLHFCQUFxQixFQUFFLENBQUM7UUFBQyxTQUFTLENBQUMsRUFBRSxpQkFBaUIsQ0FBQTtLQUFPLEVBR2hHO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFPaEI7Q0FDRjtBQUVELHFCQUFhLHVCQUF1QjtJQUV6QixzQkFBc0IsRUFBRSxzQkFBc0I7SUFDOUMsWUFBWSxFQUFFLG9DQUFvQztJQUYzRCxZQUNTLHNCQUFzQixFQUFFLHNCQUFzQixFQUM5QyxZQUFZLEVBQUUsb0NBQW9DLEVBQ3ZEO0lBRUosc0JBQXNCLDhCQUVyQjtJQUVLLGFBQWEsSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBU2pDO0NBQ0Y7QUFFRCxxQkFBYSxrQkFBa0I7SUFFcEIsc0JBQXNCLEVBQUUsc0JBQXNCO0lBQzlDLFlBQVksRUFBRSxvQ0FBb0M7SUFDbEQsWUFBWSxDQUFDO0lBQ2IsS0FBSyxDQUFDO0lBSmYsWUFDUyxzQkFBc0IsRUFBRSxzQkFBc0IsRUFDOUMsWUFBWSxFQUFFLG9DQUFvQyxFQUNsRCxZQUFZLENBQUMsb0NBQXdCLEVBQ3JDLEtBQUssQ0FBQyw2QkFBaUIsRUFDNUI7SUFFSixpRUFBaUU7SUFDakUsSUFBSSxlQUFlLElBQUksY0FBYyxFQUFFLENBRXRDO0lBRUQsSUFBSSxPQUFPLElBQUksT0FBTyxDQVNyQjtJQUVELE1BQU0sS0FBSyxNQUFNLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBUzlDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLFNBQVMsR0FBRyxpQkFBaUIsQ0FBQyxzQkFPcEY7SUFFRCxNQUFNLENBQUMsMENBQTBDLENBQy9DLHVCQUF1QixFQUFFLHVCQUF1QixFQUNoRCxZQUFZLENBQUMsRUFBRSxzQkFBc0IsRUFDckMsS0FBSyxDQUFDLEVBQUUsZUFBZSxzQkFReEI7SUFFRCxPQUFhLE1BQU0sZ0NBTWxCO0lBRUQsc0JBQXNCLDhCQUVyQjtJQUVELGFBQWEsSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBRTNCO0lBRUQscUJBQXFCLGdDQUVwQjtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsNkJBQTZCLENBQUMsZUFBZSxFQUFFLHNCQUFzQixHQUFHLHlCQUF5QixDQVdoSCJ9

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,EACL,KAAK,2BAA2B,EAEjC,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,qBAAqB,EAA+B,MAAM,0CAA0C,CAAC;AACnH,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAEL,sBAAsB,EAGvB,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;AAS7B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAA+B;IAAE,QAAQ,EAAE,2BAA2B,CAAA;CAAE,CAAC,CAAC;AAQvH,qBAAa,mBAAmB;IACvB,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACxC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAErC,YAAY,IAAI,GAAE;QAAE,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,iBAAiB,CAAA;KAAO,EAGhG;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAOhB;CACF;AAED,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAF3D,YACS,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EACvD;IAEJ,sBAAsB,8BAErB;IAEK,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC,CASjC;CACF;AAED,qBAAa,kBAAkB;IAEpB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,YAAY,CAAC;IACb,KAAK,CAAC;IAJf,YACS,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,YAAY,CAAC,oCAAwB,EACrC,KAAK,CAAC,6BAAiB,EAC5B;IAEJ,iEAAiE;IACjE,IAAI,eAAe,IAAI,cAAc,EAAE,CAEtC;IAED,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,GAAG,iBAAiB,CAAC,sBAOpF;IAED,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,KAAK,CAAC,EAAE,eAAe,sBAQxB;IAED,OAAa,MAAM,gCAMlB;IAED,sBAAsB,8BAErB;IAED,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC,CAE3B;IAED,qBAAqB,gCAEpB;CACF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}

package/dest/tx/simulated_tx.js

@@ -1,11 +1,35 @@
+import { optional } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+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 { PublicStorageOverrideSchema } from '../interfaces/public_storage_override.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, collectOffchainEffects, 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. `publicStorage` writes to the public-data
+ * tree fork. `contracts` overrides contract instances in the contract DB.
+ * In order to simulate a transaction with these set, it *must* be run without the kernel circuits,
+ * or validations will fail.
+ */ export class SimulationOverrides {
+    publicStorage;
+    contracts;
+    constructor(args = {}){
+        this.publicStorage = args.publicStorage?.length ? args.publicStorage : undefined;
+        this.contracts = args.contracts && Object.keys(args.contracts).length > 0 ? args.contracts : undefined;
+    }
+    static get schema() {
+        return z.object({
+            publicStorage: optional(z.array(PublicStorageOverrideSchema)),
+            contracts: optional(z.record(z.string(), z.object({
+                instance: ContractInstanceWithAddressSchema
+            })))
+        }).transform((args)=>new SimulationOverrides(args));
+    }
+}
 export class PrivateSimulationResult {
     privateExecutionResult;
     publicInputs;
@@ -16,19 +40,29 @@ 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;
+    }
+    /** Returns offchain effects collected from private execution. */ get offchainEffects() {
+        return collectOffchainEffects(this.privateExecutionResult);
     }
     get gasUsed() {
         return this.publicOutput?.gasUsed ?? {
@@ -43,61 +77,37 @@ 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 : [];
     }
 }
 /**
- * Recursively accummulate the return values of a call result and its nested executions,
+ * Recursively accumulate the return values of a call result and its nested executions,
  * so they can be retrieved in order.
  * @param executionResult
  * @returns
  */ 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,8 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -20,139 +18,56 @@ export declare class StateReference {
     l1ToL2MessageTree: AppendOnlyTreeSnapshot, 
     /** Reference to the rest of the state. */
     partial: PartialStateReference);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-            root: z.ZodType<Fr, any, string>;
-            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-        }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        l1ToL2MessageTree: z.ZodPipe<z.ZodObject<{
+            root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+        }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
             root: Fr;
             nextAvailableLeafIndex: number;
-        }, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>, AppendOnlyTreeSnapshot, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>;
-        partial: z.ZodEffects<z.ZodObject<{
-            noteHashTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
+        }>>;
+        partial: z.ZodPipe<z.ZodObject<{
+            noteHashTree: z.ZodPipe<z.ZodObject<{
+                root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+            }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
                 root: Fr;
                 nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-            nullifierTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
+            }>>;
+            nullifierTree: z.ZodPipe<z.ZodObject<{
+                root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+            }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
                 root: Fr;
                 nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-            publicDataTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
+            }>>;
+            publicDataTree: z.ZodPipe<z.ZodObject<{
+                root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+            }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
                 root: Fr;
                 nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-        }, "strip", z.ZodTypeAny, {
+            }>>;
+        }, z.core.$strip>, z.ZodTransform<PartialStateReference, {
             noteHashTree: AppendOnlyTreeSnapshot;
             nullifierTree: AppendOnlyTreeSnapshot;
             publicDataTree: AppendOnlyTreeSnapshot;
-        }, {
-            noteHashTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            nullifierTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            publicDataTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-        }>, PartialStateReference, {
-            noteHashTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            nullifierTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            publicDataTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        partial: PartialStateReference;
+        }>>;
+    }, z.core.$strip>, z.ZodTransform<StateReference, {
         l1ToL2MessageTree: AppendOnlyTreeSnapshot;
-    }, {
-        partial: {
-            noteHashTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            nullifierTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            publicDataTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-        };
-        l1ToL2MessageTree: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-    }>, StateReference, {
-        partial: {
-            noteHashTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            nullifierTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            publicDataTree: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-        };
-        l1ToL2MessageTree: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-    }>;
+        partial: PartialStateReference;
+    }>>;
     getSize(): number;
+    static getFields(fields: FieldsOf<StateReference>): readonly [AppendOnlyTreeSnapshot, PartialStateReference];
+    static from(fields: FieldsOf<StateReference>): StateReference;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): StateReference;
     static fromFields(fields: Fr[] | FieldReader): StateReference;
     static empty(): StateReference;
+    static random(): StateReference;
+    toAbi(): [ReturnType<AppendOnlyTreeSnapshot['toAbi']>, ReturnType<PartialStateReference['toAbi']>];
     isEmpty(): boolean;
     toInspect(): {
         l1ToL2MessageTree: `0x${string}`;
@@ -160,7 +75,11 @@ 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;
 }
-//# sourceMappingURL=state_reference.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGVfcmVmZXJlbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvc3RhdGVfcmVmZXJlbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBbUIsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFckU7O0dBRUc7QUFDSCxxQkFBYSxjQUFjO0lBRXZCLDZDQUE2QztJQUN0QyxpQkFBaUIsRUFBRSxzQkFBc0I7SUFDaEQsMENBQTBDO0lBQ25DLE9BQU8sRUFBRSxxQkFBcUI7SUFKdkM7SUFDRSw2Q0FBNkM7SUFDdEMsaUJBQWlCLEVBQUUsc0JBQXNCO0lBQ2hELDBDQUEwQztJQUNuQyxPQUFPLEVBQUUscUJBQXFCLEVBQ25DO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O1FBT2hCO0lBRUQsT0FBTyxXQUVOO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQyw0REFFaEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLGtCQUUzQztJQUdELFFBQVEsSUFBSSxNQUFNLENBQUM7SUFDbkIsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBUWpDLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsY0FBYyxDQUcvRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxjQUFjLENBTzVEO0lBRUQsTUFBTSxDQUFDLEtBQUssSUFBSSxjQUFjLENBRTdCO0lBRUQsTUFBTSxDQUFDLE1BQU0sSUFBSSxjQUFjLENBRTlCO0lBRUQsS0FBSyxJQUFJLENBQUMsVUFBVSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsVUFBVSxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FFakc7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELFNBQVM7Ozs7O01BT1I7SUFFRDs7T0FFRztJQUNJLFFBQVEsU0FnQmQ7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FPZjtJQUVNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FFbEM7Q0FDRiJ9