@aztec/stdlib 3.0.0-nightly.20251111 → 3.0.0-nightly.20251113

package/dest/avm/avm.d.ts

@@ -6,15 +6,15 @@ import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { GasSettings } from '../gas/gas_settings.js';
-import type { GasUsed } from '../gas/gas_used.js';
+import { GasUsed } from '../gas/gas_used.js';
 import { PublicKeys } from '../keys/public_keys.js';
 import { DebugLog } from '../logs/debug_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { type ZodFor } from '../schemas/schemas.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { MerkleTreeId } from '../trees/merkle_tree_id.js';
-import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
-import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
+import { NullifierLeaf, NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
+import { PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { GlobalVariables, NestedProcessReturnValues, ProtocolContracts, PublicCallRequestWithCalldata, TreeSnapshots, type Tx, TxExecutionPhase } from '../tx/index.js';
 import { WorldStateRevision } from '../world-state/world_state_revision.js';
 import { AvmCircuitPublicInputs } from './avm_circuit_public_inputs.js';
@@ -51,6 +51,14 @@ export declare class AvmContractClassHint {
         privateFunctionsRoot?: any;
         classId?: any;
     }>;
+    /**
+     * Creates an AvmContractClassHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmContractClassHint fields
+     * @returns An AvmContractClassHint instance
+     */
+    static fromPlainObject(obj: any): AvmContractClassHint;
 }
 export declare class AvmBytecodeCommitmentHint {
     readonly hintKey: number;
@@ -74,6 +82,14 @@ export declare class AvmBytecodeCommitmentHint {
         classId?: any;
         commitment?: any;
     }>;
+    /**
+     * Creates an AvmBytecodeCommitmentHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmBytecodeCommitmentHint fields
+     * @returns An AvmBytecodeCommitmentHint instance
+     */
+    static fromPlainObject(obj: any): AvmBytecodeCommitmentHint;
 }
 export declare class AvmContractInstanceHint {
     readonly hintKey: number;
@@ -94,97 +110,25 @@ export declare class AvmContractInstanceHint {
         originalContractClassId: ZodFor<Fr>;
         initializationHash: ZodFor<Fr>;
         publicKeys: z.ZodEffects<z.ZodObject<{
-            masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
+            masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
         }, "strip", z.ZodTypeAny, {
             masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
             masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
         }, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>, PublicKeys, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>;
     }, "strip", z.ZodTypeAny, {
         salt: Fr;
@@ -197,22 +141,10 @@ export declare class AvmContractInstanceHint {
         hintKey: number;
     }, {
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         hintKey: number;
         salt?: any;
@@ -223,22 +155,10 @@ export declare class AvmContractInstanceHint {
         address?: any;
     }>, AvmContractInstanceHint, {
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         hintKey: number;
         salt?: any;
@@ -248,6 +168,14 @@ export declare class AvmContractInstanceHint {
         initializationHash?: any;
         address?: any;
     }>;
+    /**
+     * Creates an AvmContractInstanceHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmContractInstanceHint fields
+     * @returns An AvmContractInstanceHint instance
+     */
+    static fromPlainObject(obj: any): AvmContractInstanceHint;
 }
 export declare class AvmDebugFunctionNameHint {
     readonly address: AztecAddress;
@@ -271,6 +199,14 @@ export declare class AvmDebugFunctionNameHint {
         selector?: any;
         address?: any;
     }>;
+    /**
+     * Creates an AvmDebugFunctionNameHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmDebugFunctionNameHint fields
+     * @returns An AvmDebugFunctionNameHint instance
+     */
+    static fromPlainObject(obj: any): AvmDebugFunctionNameHint;
 }
 export declare class AvmGetSiblingPathHint {
     readonly hintKey: AppendOnlyTreeSnapshot;
@@ -280,7 +216,7 @@ export declare class AvmGetSiblingPathHint {
     constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, index: bigint, path: Fr[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -317,6 +253,14 @@ export declare class AvmGetSiblingPathHint {
         };
         treeId: number;
     }>;
+    /**
+     * Creates an AvmGetSiblingPathHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmGetSiblingPathHint fields
+     * @returns An AvmGetSiblingPathHint instance
+     */
+    static fromPlainObject(obj: any): AvmGetSiblingPathHint;
 }
 export declare class AvmGetPreviousValueIndexHint {
     readonly hintKey: AppendOnlyTreeSnapshot;
@@ -327,7 +271,7 @@ export declare class AvmGetPreviousValueIndexHint {
     constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, value: Fr, index: bigint, alreadyPresent: boolean);
     static get schema(): z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -368,6 +312,14 @@ export declare class AvmGetPreviousValueIndexHint {
         treeId: number;
         value?: any;
     }>;
+    /**
+     * Creates an AvmGetPreviousValueIndexHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmGetPreviousValueIndexHint fields
+     * @returns An AvmGetPreviousValueIndexHint instance
+     */
+    static fromPlainObject(obj: any): AvmGetPreviousValueIndexHint;
 }
 type IndexedTreeLeafPreimages = NullifierLeafPreimage | PublicDataTreeLeafPreimage;
 type IndexedTreeLeafPreimagesClasses = typeof NullifierLeafPreimage | typeof PublicDataTreeLeafPreimage;
@@ -379,7 +331,7 @@ declare const AvmGetLeafPreimageHintPublicDataTree_base: {
     };
     readonly schema: z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -394,18 +346,18 @@ declare const AvmGetLeafPreimageHintPublicDataTree_base: {
         index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         leafPreimage: z.ZodEffects<z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nullifier: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 nullifier: Fr;
             }, {
                 nullifier: string;
-            }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+            }>, NullifierLeaf, {
                 nullifier: string;
             }>;
-            nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nextKey: z.ZodType<Fr, any, string>;
             nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+            leaf: NullifierLeaf;
             nextKey: Fr;
             nextIndex: bigint;
         }, {
@@ -422,22 +374,22 @@ declare const AvmGetLeafPreimageHintPublicDataTree_base: {
             nextIndex: string | number | bigint;
         }> | z.ZodEffects<z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
-                slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                slot: z.ZodType<Fr, any, string>;
+                value: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 value: Fr;
                 slot: Fr;
             }, {
                 value: string;
                 slot: string;
-            }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+            }>, PublicDataTreeLeaf, {
                 value: string;
                 slot: string;
             }>;
-            nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nextKey: z.ZodType<Fr, any, string>;
             nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+            leaf: PublicDataTreeLeaf;
             nextKey: Fr;
             nextIndex: bigint;
         }, {
@@ -504,6 +456,14 @@ declare const AvmGetLeafPreimageHintPublicDataTree_base: {
             nextAvailableLeafIndex: string | number | bigint;
         };
     }>;
+    /**
+     * Creates an instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing hint fields
+     * @returns An instance
+     */
+    fromPlainObject(obj: any): any;
 };
 export declare class AvmGetLeafPreimageHintPublicDataTree extends AvmGetLeafPreimageHintPublicDataTree_base {
 }
@@ -515,7 +475,7 @@ declare const AvmGetLeafPreimageHintNullifierTree_base: {
     };
     readonly schema: z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -530,18 +490,18 @@ declare const AvmGetLeafPreimageHintNullifierTree_base: {
         index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         leafPreimage: z.ZodEffects<z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nullifier: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 nullifier: Fr;
             }, {
                 nullifier: string;
-            }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+            }>, NullifierLeaf, {
                 nullifier: string;
             }>;
-            nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nextKey: z.ZodType<Fr, any, string>;
             nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+            leaf: NullifierLeaf;
             nextKey: Fr;
             nextIndex: bigint;
         }, {
@@ -558,22 +518,22 @@ declare const AvmGetLeafPreimageHintNullifierTree_base: {
             nextIndex: string | number | bigint;
         }> | z.ZodEffects<z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
-                slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                slot: z.ZodType<Fr, any, string>;
+                value: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 value: Fr;
                 slot: Fr;
             }, {
                 value: string;
                 slot: string;
-            }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+            }>, PublicDataTreeLeaf, {
                 value: string;
                 slot: string;
             }>;
-            nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nextKey: z.ZodType<Fr, any, string>;
             nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+            leaf: PublicDataTreeLeaf;
             nextKey: Fr;
             nextIndex: bigint;
         }, {
@@ -640,6 +600,14 @@ declare const AvmGetLeafPreimageHintNullifierTree_base: {
             nextAvailableLeafIndex: string | number | bigint;
         };
     }>;
+    /**
+     * Creates an instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing hint fields
+     * @returns An instance
+     */
+    fromPlainObject(obj: any): any;
 };
 export declare class AvmGetLeafPreimageHintNullifierTree extends AvmGetLeafPreimageHintNullifierTree_base {
 }
@@ -651,7 +619,7 @@ export declare class AvmGetLeafValueHint {
     constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, index: bigint, value: Fr);
     static get schema(): z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -688,6 +656,14 @@ export declare class AvmGetLeafValueHint {
         treeId: number;
         value?: any;
     }>;
+    /**
+     * Creates an AvmGetLeafValueHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmGetLeafValueHint fields
+     * @returns An AvmGetLeafValueHint instance
+     */
+    static fromPlainObject(obj: any): AvmGetLeafValueHint;
 }
 declare const AvmSequentialInsertHintPublicDataTree_base: {
     new (hintKey: AppendOnlyTreeSnapshot, stateAfter: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, leaf: InstanceType<IndexedTreeLeafPreimagesClasses>["leaf"], lowLeavesWitnessData: {
@@ -716,7 +692,7 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
     };
     readonly schema: z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -729,7 +705,7 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
             nextAvailableLeafIndex: string | number | bigint;
         }>;
         stateAfter: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -743,41 +719,41 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
         }>;
         treeId: z.ZodNumber;
         leaf: z.ZodEffects<z.ZodObject<{
-            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nullifier: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
             nullifier: Fr;
         }, {
             nullifier: string;
-        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+        }>, NullifierLeaf, {
             nullifier: string;
         }> | z.ZodEffects<z.ZodObject<{
-            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            slot: z.ZodType<Fr, any, string>;
+            value: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
             value: Fr;
             slot: Fr;
         }, {
             value: string;
             slot: string;
-        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+        }>, PublicDataTreeLeaf, {
             value: string;
             slot: string;
         }>;
         lowLeavesWitnessData: z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -794,22 +770,22 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -854,18 +830,18 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
         insertionWitnessData: z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -882,22 +858,22 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -940,7 +916,7 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+        leaf: NullifierLeaf | PublicDataTreeLeaf;
         hintKey: AppendOnlyTreeSnapshot;
         treeId: number;
         stateAfter: AppendOnlyTreeSnapshot;
@@ -1074,6 +1050,14 @@ declare const AvmSequentialInsertHintPublicDataTree_base: {
             };
         };
     }>;
+    /**
+     * Creates an instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing hint fields
+     * @returns An instance
+     */
+    fromPlainObject(obj: any): any;
 };
 export declare class AvmSequentialInsertHintPublicDataTree extends AvmSequentialInsertHintPublicDataTree_base {
 }
@@ -1104,7 +1088,7 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
     };
     readonly schema: z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -1117,7 +1101,7 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
             nextAvailableLeafIndex: string | number | bigint;
         }>;
         stateAfter: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -1131,41 +1115,41 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
         }>;
         treeId: z.ZodNumber;
         leaf: z.ZodEffects<z.ZodObject<{
-            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            nullifier: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
             nullifier: Fr;
         }, {
             nullifier: string;
-        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+        }>, NullifierLeaf, {
             nullifier: string;
         }> | z.ZodEffects<z.ZodObject<{
-            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            slot: z.ZodType<Fr, any, string>;
+            value: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
             value: Fr;
             slot: Fr;
         }, {
             value: string;
             slot: string;
-        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+        }>, PublicDataTreeLeaf, {
             value: string;
             slot: string;
         }>;
         lowLeavesWitnessData: z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -1182,22 +1166,22 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -1242,18 +1226,18 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
         insertionWitnessData: z.ZodObject<{
             leaf: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -1270,22 +1254,22 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -1328,7 +1312,7 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+        leaf: NullifierLeaf | PublicDataTreeLeaf;
         hintKey: AppendOnlyTreeSnapshot;
         treeId: number;
         stateAfter: AppendOnlyTreeSnapshot;
@@ -1462,6 +1446,14 @@ declare const AvmSequentialInsertHintNullifierTree_base: {
             };
         };
     }>;
+    /**
+     * Creates an instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing hint fields
+     * @returns An instance
+     */
+    fromPlainObject(obj: any): any;
 };
 export declare class AvmSequentialInsertHintNullifierTree extends AvmSequentialInsertHintNullifierTree_base {
 }
@@ -1473,7 +1465,7 @@ export declare class AvmAppendLeavesHint {
     constructor(hintKey: AppendOnlyTreeSnapshot, stateAfter: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, leaves: Fr[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
         hintKey: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -1486,7 +1478,7 @@ export declare class AvmAppendLeavesHint {
             nextAvailableLeafIndex: string | number | bigint;
         }>;
         stateAfter: z.ZodEffects<z.ZodObject<{
-            root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            root: z.ZodType<Fr, any, string>;
             nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             root: Fr;
@@ -1528,6 +1520,14 @@ export declare class AvmAppendLeavesHint {
         };
         leaves: any[];
     }>;
+    /**
+     * Creates an AvmAppendLeavesHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmAppendLeavesHint fields
+     * @returns An AvmAppendLeavesHint instance
+     */
+    static fromPlainObject(obj: any): AvmAppendLeavesHint;
 }
 declare class AvmCheckpointActionNoStateChangeHint {
     readonly actionCounter: number;
@@ -1551,6 +1551,14 @@ declare class AvmCheckpointActionNoStateChangeHint {
         oldCheckpointId: number;
         newCheckpointId: number;
     }>;
+    /**
+     * Creates an instance from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing hint fields
+     * @returns An instance
+     */
+    static fromPlainObject(obj: any): any;
 }
 export declare class AvmCreateCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
 }
@@ -1570,7 +1578,7 @@ export declare class AvmRevertCheckpointHint {
         newCheckpointId: z.ZodNumber;
         stateBefore: z.ZodEffects<z.ZodObject<{
             l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1583,7 +1591,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             noteHashTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1596,7 +1604,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             nullifierTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1609,7 +1617,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             publicDataTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1663,7 +1671,7 @@ export declare class AvmRevertCheckpointHint {
         }>;
         stateAfter: z.ZodEffects<z.ZodObject<{
             l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1676,7 +1684,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             noteHashTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1689,7 +1697,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             nullifierTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1702,7 +1710,7 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             publicDataTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -1755,12 +1763,15 @@ export declare class AvmRevertCheckpointHint {
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        stateAfter: TreeSnapshots;
         actionCounter: number;
         oldCheckpointId: number;
         newCheckpointId: number;
+        stateAfter: TreeSnapshots;
         stateBefore: TreeSnapshots;
     }, {
+        actionCounter: number;
+        oldCheckpointId: number;
+        newCheckpointId: number;
         stateAfter: {
             noteHashTree: {
                 root: string;
@@ -1779,9 +1790,6 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             };
         };
-        actionCounter: number;
-        oldCheckpointId: number;
-        newCheckpointId: number;
         stateBefore: {
             noteHashTree: {
                 root: string;
@@ -1801,6 +1809,9 @@ export declare class AvmRevertCheckpointHint {
             };
         };
     }>, AvmRevertCheckpointHint, {
+        actionCounter: number;
+        oldCheckpointId: number;
+        newCheckpointId: number;
         stateAfter: {
             noteHashTree: {
                 root: string;
@@ -1819,9 +1830,6 @@ export declare class AvmRevertCheckpointHint {
                 nextAvailableLeafIndex: string | number | bigint;
             };
         };
-        actionCounter: number;
-        oldCheckpointId: number;
-        newCheckpointId: number;
         stateBefore: {
             noteHashTree: {
                 root: string;
@@ -1841,6 +1849,14 @@ export declare class AvmRevertCheckpointHint {
             };
         };
     }>;
+    /**
+     * Creates an AvmRevertCheckpointHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmRevertCheckpointHint fields
+     * @returns An AvmRevertCheckpointHint instance
+     */
+    static fromPlainObject(obj: any): AvmRevertCheckpointHint;
 }
 export declare class AvmContractDBCreateCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
 }
@@ -1880,6 +1896,14 @@ export declare class AvmTxHint {
     }, setupEnqueuedCalls: PublicCallRequestWithCalldata[], appLogicEnqueuedCalls: PublicCallRequestWithCalldata[], teardownEnqueuedCall: PublicCallRequestWithCalldata | null, gasUsedByPrivate: Gas, feePayer: AztecAddress);
     static fromTx(tx: Tx, gasFees: GasFees): AvmTxHint;
     static empty(): AvmTxHint;
+    /**
+     * Creates an AvmTxHint from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmTxHint fields
+     * @returns An AvmTxHint instance
+     */
+    static fromPlainObject(obj: any): AvmTxHint;
     static get schema(): z.ZodEffects<z.ZodObject<{
         hash: z.ZodString;
         gasSettings: z.ZodEffects<z.ZodObject<{
@@ -1992,7 +2016,7 @@ export declare class AvmTxHint {
             contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 contractAddress: ZodFor<AztecAddress>;
                 fields: z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                    fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                 }, "strip", z.ZodTypeAny, {
                     fields: Fr[];
                 }, {
@@ -2019,7 +2043,7 @@ export declare class AvmTxHint {
                 contractAddress?: any;
             }>, "many">;
             privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                 emittedLength: z.ZodNumber;
             }, "strict", z.ZodTypeAny, {
                 fields: Fr[];
@@ -2063,7 +2087,7 @@ export declare class AvmTxHint {
             contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 contractAddress: ZodFor<AztecAddress>;
                 fields: z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                    fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                 }, "strip", z.ZodTypeAny, {
                     fields: Fr[];
                 }, {
@@ -2090,7 +2114,7 @@ export declare class AvmTxHint {
                 contractAddress?: any;
             }>, "many">;
             privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                 emittedLength: z.ZodNumber;
             }, "strict", z.ZodTypeAny, {
                 fields: Fr[];
@@ -2135,8 +2159,8 @@ export declare class AvmTxHint {
             nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
             l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 message: z.ZodEffects<z.ZodObject<{
-                    recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                    content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                    content: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     content: Fr;
                     recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -2184,8 +2208,8 @@ export declare class AvmTxHint {
             nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
             l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 message: z.ZodEffects<z.ZodObject<{
-                    recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                    content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                    content: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     content: Fr;
                     recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -2436,6 +2460,9 @@ export declare class AvmExecutionHints {
     readonly contractClasses: AvmContractClassHint[];
     readonly bytecodeCommitments: AvmBytecodeCommitmentHint[];
     readonly debugFunctionNames: AvmDebugFunctionNameHint[];
+    readonly contractDBCreateCheckpointHints: AvmContractDBCreateCheckpointHint[];
+    readonly contractDBCommitCheckpointHints: AvmContractDBCommitCheckpointHint[];
+    readonly contractDBRevertCheckpointHints: AvmContractDBRevertCheckpointHint[];
     startingTreeRoots: TreeSnapshots;
     readonly getSiblingPathHints: AvmGetSiblingPathHint[];
     readonly getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
@@ -2448,10 +2475,15 @@ export declare class AvmExecutionHints {
     readonly createCheckpointHints: AvmCreateCheckpointHint[];
     readonly commitCheckpointHints: AvmCommitCheckpointHint[];
     readonly revertCheckpointHints: AvmRevertCheckpointHint[];
-    readonly contractDBCreateCheckpointHints: AvmContractDBCreateCheckpointHint[];
-    readonly contractDBCommitCheckpointHints: AvmContractDBCommitCheckpointHint[];
-    readonly contractDBRevertCheckpointHints: AvmContractDBRevertCheckpointHint[];
-    constructor(globalVariables: GlobalVariables, tx: AvmTxHint, protocolContracts: ProtocolContracts, contractInstances?: AvmContractInstanceHint[], contractClasses?: AvmContractClassHint[], bytecodeCommitments?: AvmBytecodeCommitmentHint[], debugFunctionNames?: AvmDebugFunctionNameHint[], startingTreeRoots?: TreeSnapshots, getSiblingPathHints?: AvmGetSiblingPathHint[], getPreviousValueIndexHints?: AvmGetPreviousValueIndexHint[], getLeafPreimageHintsPublicDataTree?: AvmGetLeafPreimageHintPublicDataTree[], getLeafPreimageHintsNullifierTree?: AvmGetLeafPreimageHintNullifierTree[], getLeafValueHints?: AvmGetLeafValueHint[], sequentialInsertHintsPublicDataTree?: AvmSequentialInsertHintPublicDataTree[], sequentialInsertHintsNullifierTree?: AvmSequentialInsertHintNullifierTree[], appendLeavesHints?: AvmAppendLeavesHint[], createCheckpointHints?: AvmCreateCheckpointHint[], commitCheckpointHints?: AvmCommitCheckpointHint[], revertCheckpointHints?: AvmRevertCheckpointHint[], contractDBCreateCheckpointHints?: AvmContractDBCreateCheckpointHint[], contractDBCommitCheckpointHints?: AvmContractDBCommitCheckpointHint[], contractDBRevertCheckpointHints?: AvmContractDBRevertCheckpointHint[]);
+    constructor(globalVariables: GlobalVariables, tx: AvmTxHint, protocolContracts: ProtocolContracts, contractInstances?: AvmContractInstanceHint[], contractClasses?: AvmContractClassHint[], bytecodeCommitments?: AvmBytecodeCommitmentHint[], debugFunctionNames?: AvmDebugFunctionNameHint[], contractDBCreateCheckpointHints?: AvmContractDBCreateCheckpointHint[], contractDBCommitCheckpointHints?: AvmContractDBCommitCheckpointHint[], contractDBRevertCheckpointHints?: AvmContractDBRevertCheckpointHint[], startingTreeRoots?: TreeSnapshots, getSiblingPathHints?: AvmGetSiblingPathHint[], getPreviousValueIndexHints?: AvmGetPreviousValueIndexHint[], getLeafPreimageHintsPublicDataTree?: AvmGetLeafPreimageHintPublicDataTree[], getLeafPreimageHintsNullifierTree?: AvmGetLeafPreimageHintNullifierTree[], getLeafValueHints?: AvmGetLeafValueHint[], sequentialInsertHintsPublicDataTree?: AvmSequentialInsertHintPublicDataTree[], sequentialInsertHintsNullifierTree?: AvmSequentialInsertHintNullifierTree[], appendLeavesHints?: AvmAppendLeavesHint[], createCheckpointHints?: AvmCreateCheckpointHint[], commitCheckpointHints?: AvmCommitCheckpointHint[], revertCheckpointHints?: AvmRevertCheckpointHint[]);
+    /**
+     * Creates an AvmExecutionHints from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing AvmExecutionHints fields
+     * @returns An AvmExecutionHints instance
+     */
+    static fromPlainObject(obj: any): AvmExecutionHints;
     static empty(): AvmExecutionHints;
     static get schema(): z.ZodEffects<z.ZodObject<{
         globalVariables: z.ZodEffects<z.ZodObject<{
@@ -2621,7 +2653,7 @@ export declare class AvmExecutionHints {
                 contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     contractAddress: ZodFor<AztecAddress>;
                     fields: z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                        fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                     }, "strip", z.ZodTypeAny, {
                         fields: Fr[];
                     }, {
@@ -2648,7 +2680,7 @@ export declare class AvmExecutionHints {
                     contractAddress?: any;
                 }>, "many">;
                 privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                    fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                     emittedLength: z.ZodNumber;
                 }, "strict", z.ZodTypeAny, {
                     fields: Fr[];
@@ -2692,7 +2724,7 @@ export declare class AvmExecutionHints {
                 contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     contractAddress: ZodFor<AztecAddress>;
                     fields: z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                        fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                     }, "strip", z.ZodTypeAny, {
                         fields: Fr[];
                     }, {
@@ -2719,7 +2751,7 @@ export declare class AvmExecutionHints {
                     contractAddress?: any;
                 }>, "many">;
                 privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                    fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                     emittedLength: z.ZodNumber;
                 }, "strict", z.ZodTypeAny, {
                     fields: Fr[];
@@ -2764,8 +2796,8 @@ export declare class AvmExecutionHints {
                 nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                 l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -2813,8 +2845,8 @@ export declare class AvmExecutionHints {
                 nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                 l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -3074,97 +3106,25 @@ export declare class AvmExecutionHints {
             originalContractClassId: ZodFor<Fr>;
             initializationHash: ZodFor<Fr>;
             publicKeys: z.ZodEffects<z.ZodObject<{
-                masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
+                masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
             }, "strip", z.ZodTypeAny, {
                 masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
                 masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
                 masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
                 masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
             }, {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             }>, PublicKeys, {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             }>;
         }, "strip", z.ZodTypeAny, {
             salt: Fr;
@@ -3177,22 +3137,10 @@ export declare class AvmExecutionHints {
             hintKey: number;
         }, {
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             hintKey: number;
             salt?: any;
@@ -3203,22 +3151,10 @@ export declare class AvmExecutionHints {
             address?: any;
         }>, AvmContractInstanceHint, {
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             hintKey: number;
             salt?: any;
@@ -3287,9 +3223,60 @@ export declare class AvmExecutionHints {
             selector?: any;
             address?: any;
         }>, "many">;
+        contractDBCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            actionCounter: z.ZodNumber;
+            oldCheckpointId: z.ZodNumber;
+            newCheckpointId: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, AvmCheckpointActionNoStateChangeHint, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, "many">;
+        contractDBCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            actionCounter: z.ZodNumber;
+            oldCheckpointId: z.ZodNumber;
+            newCheckpointId: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, AvmCheckpointActionNoStateChangeHint, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, "many">;
+        contractDBRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            actionCounter: z.ZodNumber;
+            oldCheckpointId: z.ZodNumber;
+            newCheckpointId: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, AvmCheckpointActionNoStateChangeHint, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }>, "many">;
         startingTreeRoots: z.ZodEffects<z.ZodObject<{
             l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3302,7 +3289,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             noteHashTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3315,7 +3302,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             nullifierTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3328,7 +3315,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             publicDataTree: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3382,7 +3369,7 @@ export declare class AvmExecutionHints {
         }>;
         getSiblingPathHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3421,7 +3408,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         getPreviousValueIndexHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3464,7 +3451,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         getLeafPreimageHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3479,18 +3466,18 @@ export declare class AvmExecutionHints {
             index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             leafPreimage: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -3507,22 +3494,22 @@ export declare class AvmExecutionHints {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -3591,7 +3578,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         getLeafPreimageHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3606,18 +3593,18 @@ export declare class AvmExecutionHints {
             index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             leafPreimage: z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                leaf: NullifierLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -3634,22 +3621,22 @@ export declare class AvmExecutionHints {
                 nextIndex: string | number | bigint;
             }> | z.ZodEffects<z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
-                nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nextKey: z.ZodType<Fr, any, string>;
                 nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: PublicDataTreeLeaf;
                 nextKey: Fr;
                 nextIndex: bigint;
             }, {
@@ -3718,7 +3705,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         getLeafValueHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3757,7 +3744,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         sequentialInsertHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3770,7 +3757,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             stateAfter: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -3784,41 +3771,41 @@ export declare class AvmExecutionHints {
             }>;
             treeId: z.ZodNumber;
             leaf: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nullifier: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 nullifier: Fr;
             }, {
                 nullifier: string;
-            }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+            }>, NullifierLeaf, {
                 nullifier: string;
             }> | z.ZodEffects<z.ZodObject<{
-                slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                slot: z.ZodType<Fr, any, string>;
+                value: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 value: Fr;
                 slot: Fr;
             }, {
                 value: string;
                 slot: string;
-            }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+            }>, PublicDataTreeLeaf, {
                 value: string;
                 slot: string;
             }>;
             lowLeavesWitnessData: z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -3835,22 +3822,22 @@ export declare class AvmExecutionHints {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -3895,18 +3882,18 @@ export declare class AvmExecutionHints {
             insertionWitnessData: z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -3923,22 +3910,22 @@ export declare class AvmExecutionHints {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -3981,7 +3968,7 @@ export declare class AvmExecutionHints {
                 };
             }>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+            leaf: NullifierLeaf | PublicDataTreeLeaf;
             hintKey: AppendOnlyTreeSnapshot;
             treeId: number;
             stateAfter: AppendOnlyTreeSnapshot;
@@ -4117,7 +4104,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         sequentialInsertHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -4130,7 +4117,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             stateAfter: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -4144,41 +4131,41 @@ export declare class AvmExecutionHints {
             }>;
             treeId: z.ZodNumber;
             leaf: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                nullifier: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 nullifier: Fr;
             }, {
                 nullifier: string;
-            }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+            }>, NullifierLeaf, {
                 nullifier: string;
             }> | z.ZodEffects<z.ZodObject<{
-                slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                slot: z.ZodType<Fr, any, string>;
+                value: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 value: Fr;
                 slot: Fr;
             }, {
                 value: string;
                 slot: string;
-            }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+            }>, PublicDataTreeLeaf, {
                 value: string;
                 slot: string;
             }>;
             lowLeavesWitnessData: z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -4195,22 +4182,22 @@ export declare class AvmExecutionHints {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -4255,18 +4242,18 @@ export declare class AvmExecutionHints {
             insertionWitnessData: z.ZodObject<{
                 leaf: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -4283,22 +4270,22 @@ export declare class AvmExecutionHints {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -4341,7 +4328,7 @@ export declare class AvmExecutionHints {
                 };
             }>;
         }, "strip", z.ZodTypeAny, {
-            leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+            leaf: NullifierLeaf | PublicDataTreeLeaf;
             hintKey: AppendOnlyTreeSnapshot;
             treeId: number;
             stateAfter: AppendOnlyTreeSnapshot;
@@ -4477,7 +4464,7 @@ export declare class AvmExecutionHints {
         }>, "many">;
         appendLeavesHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
             hintKey: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -4490,7 +4477,7 @@ export declare class AvmExecutionHints {
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
             stateAfter: z.ZodEffects<z.ZodObject<{
-                root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                root: z.ZodType<Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
                 root: Fr;
@@ -4572,7 +4559,7 @@ export declare class AvmExecutionHints {
             newCheckpointId: z.ZodNumber;
             stateBefore: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4585,7 +4572,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 noteHashTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4598,7 +4585,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 nullifierTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4611,7 +4598,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 publicDataTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4665,7 +4652,7 @@ export declare class AvmExecutionHints {
             }>;
             stateAfter: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4678,7 +4665,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 noteHashTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4691,7 +4678,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 nullifierTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4704,7 +4691,7 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 publicDataTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -4757,12 +4744,15 @@ export declare class AvmExecutionHints {
                 };
             }>;
         }, "strip", z.ZodTypeAny, {
-            stateAfter: TreeSnapshots;
             actionCounter: number;
             oldCheckpointId: number;
             newCheckpointId: number;
+            stateAfter: TreeSnapshots;
             stateBefore: TreeSnapshots;
         }, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
             stateAfter: {
                 noteHashTree: {
                     root: string;
@@ -4781,9 +4771,6 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 };
             };
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
             stateBefore: {
                 noteHashTree: {
                     root: string;
@@ -4803,6 +4790,9 @@ export declare class AvmExecutionHints {
                 };
             };
         }>, AvmRevertCheckpointHint, {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
             stateAfter: {
                 noteHashTree: {
                     root: string;
@@ -4821,9 +4811,6 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 };
             };
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
             stateBefore: {
                 noteHashTree: {
                     root: string;
@@ -4843,57 +4830,6 @@ export declare class AvmExecutionHints {
                 };
             };
         }>, "many">;
-        contractDBCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            actionCounter: z.ZodNumber;
-            oldCheckpointId: z.ZodNumber;
-            newCheckpointId: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, AvmCheckpointActionNoStateChangeHint, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, "many">;
-        contractDBCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            actionCounter: z.ZodNumber;
-            oldCheckpointId: z.ZodNumber;
-            newCheckpointId: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, AvmCheckpointActionNoStateChangeHint, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, "many">;
-        contractDBRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            actionCounter: z.ZodNumber;
-            oldCheckpointId: z.ZodNumber;
-            newCheckpointId: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, AvmCheckpointActionNoStateChangeHint, {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }>, "many">;
     }, "strip", z.ZodTypeAny, {
         globalVariables: GlobalVariables;
         protocolContracts: ProtocolContracts;
@@ -4902,6 +4838,9 @@ export declare class AvmExecutionHints {
         contractClasses: AvmContractClassHint[];
         bytecodeCommitments: AvmBytecodeCommitmentHint[];
         debugFunctionNames: AvmDebugFunctionNameHint[];
+        contractDBCreateCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
+        contractDBCommitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
+        contractDBRevertCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
         startingTreeRoots: TreeSnapshots;
         getSiblingPathHints: AvmGetSiblingPathHint[];
         getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
@@ -4952,9 +4891,6 @@ export declare class AvmExecutionHints {
         createCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
         commitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
         revertCheckpointHints: AvmRevertCheckpointHint[];
-        contractDBCreateCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
-        contractDBCommitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
-        contractDBRevertCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
     }, {
         globalVariables: {
             blockNumber: string | number | bigint;
@@ -5055,22 +4991,10 @@ export declare class AvmExecutionHints {
         };
         contractInstances: {
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             hintKey: number;
             salt?: any;
@@ -5097,6 +5021,21 @@ export declare class AvmExecutionHints {
             selector?: any;
             address?: any;
         }[];
+        contractDBCreateCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
+        contractDBCommitCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
+        contractDBRevertCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
         startingTreeRoots: {
             noteHashTree: {
                 root: string;
@@ -5314,6 +5253,9 @@ export declare class AvmExecutionHints {
             newCheckpointId: number;
         }[];
         revertCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
             stateAfter: {
                 noteHashTree: {
                     root: string;
@@ -5332,9 +5274,6 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 };
             };
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
             stateBefore: {
                 noteHashTree: {
                     root: string;
@@ -5354,21 +5293,6 @@ export declare class AvmExecutionHints {
                 };
             };
         }[];
-        contractDBCreateCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
-        contractDBCommitCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
-        contractDBRevertCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
     }>, AvmExecutionHints, {
         globalVariables: {
             blockNumber: string | number | bigint;
@@ -5469,22 +5393,10 @@ export declare class AvmExecutionHints {
         };
         contractInstances: {
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             hintKey: number;
             salt?: any;
@@ -5511,6 +5423,21 @@ export declare class AvmExecutionHints {
             selector?: any;
             address?: any;
         }[];
+        contractDBCreateCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
+        contractDBCommitCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
+        contractDBRevertCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
+        }[];
         startingTreeRoots: {
             noteHashTree: {
                 root: string;
@@ -5728,6 +5655,9 @@ export declare class AvmExecutionHints {
             newCheckpointId: number;
         }[];
         revertCheckpointHints: {
+            actionCounter: number;
+            oldCheckpointId: number;
+            newCheckpointId: number;
             stateAfter: {
                 noteHashTree: {
                     root: string;
@@ -5746,9 +5676,6 @@ export declare class AvmExecutionHints {
                     nextAvailableLeafIndex: string | number | bigint;
                 };
             };
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
             stateBefore: {
                 noteHashTree: {
                     root: string;
@@ -5768,21 +5695,6 @@ export declare class AvmExecutionHints {
                 };
             };
         }[];
-        contractDBCreateCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
-        contractDBCommitCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
-        contractDBRevertCheckpointHints: {
-            actionCounter: number;
-            oldCheckpointId: number;
-            newCheckpointId: number;
-        }[];
     }>;
 }
 export declare class AvmCircuitInputs {
@@ -5790,6 +5702,7 @@ export declare class AvmCircuitInputs {
     publicInputs: AvmCircuitPublicInputs;
     constructor(hints: AvmExecutionHints, publicInputs: AvmCircuitPublicInputs);
     static empty(): AvmCircuitInputs;
+    static fromPlainObject(obj: any): AvmCircuitInputs;
     static get schema(): z.ZodEffects<z.ZodObject<{
         hints: z.ZodEffects<z.ZodObject<{
             globalVariables: z.ZodEffects<z.ZodObject<{
@@ -5959,7 +5872,7 @@ export declare class AvmCircuitInputs {
                     contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                         contractAddress: ZodFor<AztecAddress>;
                         fields: z.ZodEffects<z.ZodObject<{
-                            fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                            fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                         }, "strip", z.ZodTypeAny, {
                             fields: Fr[];
                         }, {
@@ -5986,7 +5899,7 @@ export declare class AvmCircuitInputs {
                         contractAddress?: any;
                     }>, "many">;
                     privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                        fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                         emittedLength: z.ZodNumber;
                     }, "strict", z.ZodTypeAny, {
                         fields: Fr[];
@@ -6030,7 +5943,7 @@ export declare class AvmCircuitInputs {
                     contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                         contractAddress: ZodFor<AztecAddress>;
                         fields: z.ZodEffects<z.ZodObject<{
-                            fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                            fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                         }, "strip", z.ZodTypeAny, {
                             fields: Fr[];
                         }, {
@@ -6057,7 +5970,7 @@ export declare class AvmCircuitInputs {
                         contractAddress?: any;
                     }>, "many">;
                     privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                        fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                         emittedLength: z.ZodNumber;
                     }, "strict", z.ZodTypeAny, {
                         fields: Fr[];
@@ -6102,8 +6015,8 @@ export declare class AvmCircuitInputs {
                     nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                     l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                         message: z.ZodEffects<z.ZodObject<{
-                            recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                            content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                            content: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             content: Fr;
                             recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -6151,8 +6064,8 @@ export declare class AvmCircuitInputs {
                     nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                     l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                         message: z.ZodEffects<z.ZodObject<{
-                            recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                            content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                            content: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             content: Fr;
                             recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -6412,97 +6325,25 @@ export declare class AvmCircuitInputs {
                 originalContractClassId: ZodFor<Fr>;
                 initializationHash: ZodFor<Fr>;
                 publicKeys: z.ZodEffects<z.ZodObject<{
-                    masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                        x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    }, "strip", z.ZodTypeAny, {
-                        x: Fr;
-                        y: Fr;
-                    }, {
-                        x: string;
-                        y: string;
-                    }>, import("@aztec/foundation/fields").Point, {
-                        x: string;
-                        y: string;
-                    }>]>;
-                    masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                        x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    }, "strip", z.ZodTypeAny, {
-                        x: Fr;
-                        y: Fr;
-                    }, {
-                        x: string;
-                        y: string;
-                    }>, import("@aztec/foundation/fields").Point, {
-                        x: string;
-                        y: string;
-                    }>]>;
-                    masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                        x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    }, "strip", z.ZodTypeAny, {
-                        x: Fr;
-                        y: Fr;
-                    }, {
-                        x: string;
-                        y: string;
-                    }>, import("@aztec/foundation/fields").Point, {
-                        x: string;
-                        y: string;
-                    }>]>;
-                    masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                        x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    }, "strip", z.ZodTypeAny, {
-                        x: Fr;
-                        y: Fr;
-                    }, {
-                        x: string;
-                        y: string;
-                    }>, import("@aztec/foundation/fields").Point, {
-                        x: string;
-                        y: string;
-                    }>]>;
+                    masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                    masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                    masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                    masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
                     masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
                     masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
                     masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
                 }, {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 }>, PublicKeys, {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 }>;
             }, "strip", z.ZodTypeAny, {
                 salt: Fr;
@@ -6515,22 +6356,10 @@ export declare class AvmCircuitInputs {
                 hintKey: number;
             }, {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -6541,22 +6370,10 @@ export declare class AvmCircuitInputs {
                 address?: any;
             }>, AvmContractInstanceHint, {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -6625,9 +6442,60 @@ export declare class AvmCircuitInputs {
                 selector?: any;
                 address?: any;
             }>, "many">;
+            contractDBCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                actionCounter: z.ZodNumber;
+                oldCheckpointId: z.ZodNumber;
+                newCheckpointId: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, AvmCheckpointActionNoStateChangeHint, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, "many">;
+            contractDBCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                actionCounter: z.ZodNumber;
+                oldCheckpointId: z.ZodNumber;
+                newCheckpointId: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, AvmCheckpointActionNoStateChangeHint, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, "many">;
+            contractDBRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                actionCounter: z.ZodNumber;
+                oldCheckpointId: z.ZodNumber;
+                newCheckpointId: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, AvmCheckpointActionNoStateChangeHint, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }>, "many">;
             startingTreeRoots: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6640,7 +6508,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 noteHashTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6653,7 +6521,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 nullifierTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6666,7 +6534,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 publicDataTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6720,7 +6588,7 @@ export declare class AvmCircuitInputs {
             }>;
             getSiblingPathHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6759,7 +6627,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             getPreviousValueIndexHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6802,7 +6670,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             getLeafPreimageHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6817,18 +6685,18 @@ export declare class AvmCircuitInputs {
                 index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 leafPreimage: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -6845,22 +6713,22 @@ export declare class AvmCircuitInputs {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -6929,7 +6797,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             getLeafPreimageHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -6944,18 +6812,18 @@ export declare class AvmCircuitInputs {
                 index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 leafPreimage: z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nullifier: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         nullifier: Fr;
                     }, {
                         nullifier: string;
-                    }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                    }>, NullifierLeaf, {
                         nullifier: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                    leaf: NullifierLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -6972,22 +6840,22 @@ export declare class AvmCircuitInputs {
                     nextIndex: string | number | bigint;
                 }> | z.ZodEffects<z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                        value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        slot: z.ZodType<Fr, any, string>;
+                        value: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         value: Fr;
                         slot: Fr;
                     }, {
                         value: string;
                         slot: string;
-                    }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                    }>, PublicDataTreeLeaf, {
                         value: string;
                         slot: string;
                     }>;
-                    nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nextKey: z.ZodType<Fr, any, string>;
                     nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 }, "strip", z.ZodTypeAny, {
-                    leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                    leaf: PublicDataTreeLeaf;
                     nextKey: Fr;
                     nextIndex: bigint;
                 }, {
@@ -7056,7 +6924,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             getLeafValueHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7095,7 +6963,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             sequentialInsertHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7108,7 +6976,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 stateAfter: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7122,41 +6990,41 @@ export declare class AvmCircuitInputs {
                 }>;
                 treeId: z.ZodNumber;
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }> | z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
                 lowLeavesWitnessData: z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            nullifier: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             nullifier: Fr;
                         }, {
                             nullifier: string;
-                        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                        }>, NullifierLeaf, {
                             nullifier: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                        leaf: NullifierLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7173,22 +7041,22 @@ export declare class AvmCircuitInputs {
                         nextIndex: string | number | bigint;
                     }> | z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            slot: z.ZodType<Fr, any, string>;
+                            value: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             value: Fr;
                             slot: Fr;
                         }, {
                             value: string;
                             slot: string;
-                        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                        }>, PublicDataTreeLeaf, {
                             value: string;
                             slot: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                        leaf: PublicDataTreeLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7233,18 +7101,18 @@ export declare class AvmCircuitInputs {
                 insertionWitnessData: z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            nullifier: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             nullifier: Fr;
                         }, {
                             nullifier: string;
-                        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                        }>, NullifierLeaf, {
                             nullifier: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                        leaf: NullifierLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7261,22 +7129,22 @@ export declare class AvmCircuitInputs {
                         nextIndex: string | number | bigint;
                     }> | z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            slot: z.ZodType<Fr, any, string>;
+                            value: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             value: Fr;
                             slot: Fr;
                         }, {
                             value: string;
                             slot: string;
-                        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                        }>, PublicDataTreeLeaf, {
                             value: string;
                             slot: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                        leaf: PublicDataTreeLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7319,7 +7187,7 @@ export declare class AvmCircuitInputs {
                     };
                 }>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: NullifierLeaf | PublicDataTreeLeaf;
                 hintKey: AppendOnlyTreeSnapshot;
                 treeId: number;
                 stateAfter: AppendOnlyTreeSnapshot;
@@ -7455,7 +7323,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             sequentialInsertHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7468,7 +7336,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 stateAfter: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7482,41 +7350,41 @@ export declare class AvmCircuitInputs {
                 }>;
                 treeId: z.ZodNumber;
                 leaf: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    nullifier: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     nullifier: Fr;
                 }, {
                     nullifier: string;
-                }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                }>, NullifierLeaf, {
                     nullifier: string;
                 }> | z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    slot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     slot: Fr;
                 }, {
                     value: string;
                     slot: string;
-                }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                }>, PublicDataTreeLeaf, {
                     value: string;
                     slot: string;
                 }>;
                 lowLeavesWitnessData: z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            nullifier: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             nullifier: Fr;
                         }, {
                             nullifier: string;
-                        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                        }>, NullifierLeaf, {
                             nullifier: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                        leaf: NullifierLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7533,22 +7401,22 @@ export declare class AvmCircuitInputs {
                         nextIndex: string | number | bigint;
                     }> | z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            slot: z.ZodType<Fr, any, string>;
+                            value: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             value: Fr;
                             slot: Fr;
                         }, {
                             value: string;
                             slot: string;
-                        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                        }>, PublicDataTreeLeaf, {
                             value: string;
                             slot: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                        leaf: PublicDataTreeLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7593,18 +7461,18 @@ export declare class AvmCircuitInputs {
                 insertionWitnessData: z.ZodObject<{
                     leaf: z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            nullifier: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            nullifier: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             nullifier: Fr;
                         }, {
                             nullifier: string;
-                        }>, import("../trees/nullifier_leaf.js").NullifierLeaf, {
+                        }>, NullifierLeaf, {
                             nullifier: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/nullifier_leaf.js").NullifierLeaf;
+                        leaf: NullifierLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7621,22 +7489,22 @@ export declare class AvmCircuitInputs {
                         nextIndex: string | number | bigint;
                     }> | z.ZodEffects<z.ZodObject<{
                         leaf: z.ZodEffects<z.ZodObject<{
-                            slot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                            value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                            slot: z.ZodType<Fr, any, string>;
+                            value: z.ZodType<Fr, any, string>;
                         }, "strip", z.ZodTypeAny, {
                             value: Fr;
                             slot: Fr;
                         }, {
                             value: string;
                             slot: string;
-                        }>, import("../trees/public_data_leaf.js").PublicDataTreeLeaf, {
+                        }>, PublicDataTreeLeaf, {
                             value: string;
                             slot: string;
                         }>;
-                        nextKey: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        nextKey: z.ZodType<Fr, any, string>;
                         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                     }, "strip", z.ZodTypeAny, {
-                        leaf: import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                        leaf: PublicDataTreeLeaf;
                         nextKey: Fr;
                         nextIndex: bigint;
                     }, {
@@ -7679,7 +7547,7 @@ export declare class AvmCircuitInputs {
                     };
                 }>;
             }, "strip", z.ZodTypeAny, {
-                leaf: import("../trees/nullifier_leaf.js").NullifierLeaf | import("../trees/public_data_leaf.js").PublicDataTreeLeaf;
+                leaf: NullifierLeaf | PublicDataTreeLeaf;
                 hintKey: AppendOnlyTreeSnapshot;
                 treeId: number;
                 stateAfter: AppendOnlyTreeSnapshot;
@@ -7815,7 +7683,7 @@ export declare class AvmCircuitInputs {
             }>, "many">;
             appendLeavesHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 hintKey: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7828,7 +7696,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 stateAfter: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -7910,7 +7778,7 @@ export declare class AvmCircuitInputs {
                 newCheckpointId: z.ZodNumber;
                 stateBefore: z.ZodEffects<z.ZodObject<{
                     l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -7923,7 +7791,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     noteHashTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -7936,7 +7804,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     nullifierTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -7949,7 +7817,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     publicDataTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -8003,7 +7871,7 @@ export declare class AvmCircuitInputs {
                 }>;
                 stateAfter: z.ZodEffects<z.ZodObject<{
                     l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -8016,7 +7884,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     noteHashTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -8029,7 +7897,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     nullifierTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -8042,7 +7910,7 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     }>;
                     publicDataTree: z.ZodEffects<z.ZodObject<{
-                        root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        root: z.ZodType<Fr, any, string>;
                         nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                     }, "strip", z.ZodTypeAny, {
                         root: Fr;
@@ -8095,12 +7963,15 @@ export declare class AvmCircuitInputs {
                     };
                 }>;
             }, "strip", z.ZodTypeAny, {
-                stateAfter: TreeSnapshots;
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
+                stateAfter: TreeSnapshots;
                 stateBefore: TreeSnapshots;
             }, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -8119,9 +7990,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -8141,6 +8009,9 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }>, AvmRevertCheckpointHint, {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -8159,9 +8030,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -8181,57 +8049,6 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }>, "many">;
-            contractDBCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                actionCounter: z.ZodNumber;
-                oldCheckpointId: z.ZodNumber;
-                newCheckpointId: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, AvmCheckpointActionNoStateChangeHint, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, "many">;
-            contractDBCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                actionCounter: z.ZodNumber;
-                oldCheckpointId: z.ZodNumber;
-                newCheckpointId: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, AvmCheckpointActionNoStateChangeHint, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, "many">;
-            contractDBRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                actionCounter: z.ZodNumber;
-                oldCheckpointId: z.ZodNumber;
-                newCheckpointId: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, AvmCheckpointActionNoStateChangeHint, {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }>, "many">;
         }, "strip", z.ZodTypeAny, {
             globalVariables: GlobalVariables;
             protocolContracts: ProtocolContracts;
@@ -8240,6 +8057,9 @@ export declare class AvmCircuitInputs {
             contractClasses: AvmContractClassHint[];
             bytecodeCommitments: AvmBytecodeCommitmentHint[];
             debugFunctionNames: AvmDebugFunctionNameHint[];
+            contractDBCreateCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
+            contractDBCommitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
+            contractDBRevertCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
             startingTreeRoots: TreeSnapshots;
             getSiblingPathHints: AvmGetSiblingPathHint[];
             getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
@@ -8290,9 +8110,6 @@ export declare class AvmCircuitInputs {
             createCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
             commitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
             revertCheckpointHints: AvmRevertCheckpointHint[];
-            contractDBCreateCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
-            contractDBCommitCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
-            contractDBRevertCheckpointHints: AvmCheckpointActionNoStateChangeHint[];
         }, {
             globalVariables: {
                 blockNumber: string | number | bigint;
@@ -8393,22 +8210,10 @@ export declare class AvmCircuitInputs {
             };
             contractInstances: {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -8435,6 +8240,21 @@ export declare class AvmCircuitInputs {
                 selector?: any;
                 address?: any;
             }[];
+            contractDBCreateCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBCommitCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBRevertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
             startingTreeRoots: {
                 noteHashTree: {
                     root: string;
@@ -8652,6 +8472,9 @@ export declare class AvmCircuitInputs {
                 newCheckpointId: number;
             }[];
             revertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -8670,9 +8493,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -8692,21 +8512,6 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }[];
-            contractDBCreateCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBCommitCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBRevertCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
         }>, AvmExecutionHints, {
             globalVariables: {
                 blockNumber: string | number | bigint;
@@ -8807,22 +8612,10 @@ export declare class AvmCircuitInputs {
             };
             contractInstances: {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -8849,6 +8642,21 @@ export declare class AvmCircuitInputs {
                 selector?: any;
                 address?: any;
             }[];
+            contractDBCreateCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBCommitCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBRevertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
             startingTreeRoots: {
                 noteHashTree: {
                     root: string;
@@ -9066,6 +8874,9 @@ export declare class AvmCircuitInputs {
                 newCheckpointId: number;
             }[];
             revertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -9084,9 +8895,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -9106,21 +8914,6 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }[];
-            contractDBCreateCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBCommitCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBRevertCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
         }>;
         publicInputs: z.ZodEffects<z.ZodObject<{
             globalVariables: z.ZodEffects<z.ZodObject<{
@@ -9189,7 +8982,7 @@ export declare class AvmCircuitInputs {
             }>;
             startTreeSnapshots: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9202,7 +8995,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 noteHashTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9215,7 +9008,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 nullifierTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9228,7 +9021,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 publicDataTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9400,7 +9193,7 @@ export declare class AvmCircuitInputs {
                 feePerL2Gas: string | number | bigint;
             }>;
             feePayer: ZodFor<AztecAddress>;
-            proverId: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            proverId: z.ZodType<Fr, any, string>;
             publicCallRequestArrayLengths: z.ZodEffects<z.ZodObject<{
                 setupCalls: z.ZodNumber;
                 appLogicCalls: z.ZodNumber;
@@ -9422,7 +9215,7 @@ export declare class AvmCircuitInputs {
                 msgSender: ZodFor<AztecAddress>;
                 contractAddress: ZodFor<AztecAddress>;
                 isStaticCall: z.ZodBoolean;
-                calldataHash: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                calldataHash: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 contractAddress: AztecAddress;
                 msgSender: AztecAddress;
@@ -9443,7 +9236,7 @@ export declare class AvmCircuitInputs {
                 msgSender: ZodFor<AztecAddress>;
                 contractAddress: ZodFor<AztecAddress>;
                 isStaticCall: z.ZodBoolean;
-                calldataHash: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                calldataHash: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 contractAddress: AztecAddress;
                 msgSender: AztecAddress;
@@ -9464,7 +9257,7 @@ export declare class AvmCircuitInputs {
                 msgSender: ZodFor<AztecAddress>;
                 contractAddress: ZodFor<AztecAddress>;
                 isStaticCall: z.ZodBoolean;
-                calldataHash: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                calldataHash: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
                 contractAddress: AztecAddress;
                 msgSender: AztecAddress;
@@ -9516,12 +9309,12 @@ export declare class AvmCircuitInputs {
                 l2ToL1Msgs: string | number | bigint;
             }>;
             previousNonRevertibleAccumulatedData: z.ZodEffects<z.ZodObject<{
-                noteHashes: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
-                nullifiers: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                noteHashes: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                nullifiers: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                 l2ToL1Msgs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -9575,12 +9368,12 @@ export declare class AvmCircuitInputs {
                 }[];
             }>;
             previousRevertibleAccumulatedData: z.ZodEffects<z.ZodObject<{
-                noteHashes: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
-                nullifiers: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                noteHashes: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                nullifiers: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                 l2ToL1Msgs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -9635,7 +9428,7 @@ export declare class AvmCircuitInputs {
             }>;
             endTreeSnapshots: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9648,7 +9441,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 noteHashTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9661,7 +9454,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 nullifierTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9674,7 +9467,7 @@ export declare class AvmCircuitInputs {
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
                 publicDataTree: z.ZodEffects<z.ZodObject<{
-                    root: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    root: z.ZodType<Fr, any, string>;
                     nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
                     root: Fr;
@@ -9761,12 +9554,12 @@ export declare class AvmCircuitInputs {
                 publicDataWrites: number;
             }>;
             accumulatedData: z.ZodEffects<z.ZodObject<{
-                noteHashes: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
-                nullifiers: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                noteHashes: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                nullifiers: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                 l2ToL1Msgs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -9796,8 +9589,8 @@ export declare class AvmCircuitInputs {
                 }>, "many">;
                 publicLogs: ZodFor<import("../logs/public_log.js").FlatPublicLogs>;
                 publicDataWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                    leafSlot: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    value: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                    leafSlot: z.ZodType<Fr, any, string>;
+                    value: z.ZodType<Fr, any, string>;
                 }, "strip", z.ZodTypeAny, {
                     value: Fr;
                     leafSlot: Fr;
@@ -9845,7 +9638,7 @@ export declare class AvmCircuitInputs {
                 }[];
                 publicLogs?: any;
             }>;
-            transactionFee: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            transactionFee: z.ZodType<Fr, any, string>;
             reverted: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
             globalVariables: GlobalVariables;
@@ -10468,22 +10261,10 @@ export declare class AvmCircuitInputs {
             };
             contractInstances: {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -10510,6 +10291,21 @@ export declare class AvmCircuitInputs {
                 selector?: any;
                 address?: any;
             }[];
+            contractDBCreateCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBCommitCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBRevertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
             startingTreeRoots: {
                 noteHashTree: {
                     root: string;
@@ -10727,6 +10523,9 @@ export declare class AvmCircuitInputs {
                 newCheckpointId: number;
             }[];
             revertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -10745,9 +10544,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -10767,21 +10563,6 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }[];
-            contractDBCreateCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBCommitCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBRevertCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
         };
     }>, AvmCircuitInputs, {
         publicInputs: {
@@ -11049,22 +10830,10 @@ export declare class AvmCircuitInputs {
             };
             contractInstances: {
                 publicKeys: {
-                    masterNullifierPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterIncomingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterOutgoingViewingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
-                    masterTaggingPublicKey: string | {
-                        x: string;
-                        y: string;
-                    };
+                    masterNullifierPublicKey: string;
+                    masterIncomingViewingPublicKey: string;
+                    masterOutgoingViewingPublicKey: string;
+                    masterTaggingPublicKey: string;
                 };
                 hintKey: number;
                 salt?: any;
@@ -11091,6 +10860,21 @@ export declare class AvmCircuitInputs {
                 selector?: any;
                 address?: any;
             }[];
+            contractDBCreateCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBCommitCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
+            contractDBRevertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
+            }[];
             startingTreeRoots: {
                 noteHashTree: {
                     root: string;
@@ -11308,6 +11092,9 @@ export declare class AvmCircuitInputs {
                 newCheckpointId: number;
             }[];
             revertCheckpointHints: {
+                actionCounter: number;
+                oldCheckpointId: number;
+                newCheckpointId: number;
                 stateAfter: {
                     noteHashTree: {
                         root: string;
@@ -11326,9 +11113,6 @@ export declare class AvmCircuitInputs {
                         nextAvailableLeafIndex: string | number | bigint;
                     };
                 };
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
                 stateBefore: {
                     noteHashTree: {
                         root: string;
@@ -11348,21 +11132,6 @@ export declare class AvmCircuitInputs {
                     };
                 };
             }[];
-            contractDBCreateCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBCommitCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
-            contractDBRevertCheckpointHints: {
-                actionCounter: number;
-                oldCheckpointId: number;
-                newCheckpointId: number;
-            }[];
         };
     }>;
     serializeWithMessagePack(): Buffer;
@@ -11388,6 +11157,7 @@ export declare class PublicTxResult {
     processedPhases: ProcessedPhase[] | undefined, logs: DebugLog[] | undefined, hints: AvmExecutionHints | undefined, publicInputs: AvmCircuitPublicInputs);
     static empty(): PublicTxResult;
     static get schema(): ZodFor<PublicTxResult>;
+    static fromPlainObject(obj: any): PublicTxResult;
 }
 export type PublicTxSimulatorConfig = {
     proverId: Fr;
@@ -11533,7 +11303,7 @@ export declare class AvmFastSimulationInputs {
                 contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     contractAddress: ZodFor<AztecAddress>;
                     fields: z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                        fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                     }, "strip", z.ZodTypeAny, {
                         fields: Fr[];
                     }, {
@@ -11560,7 +11330,7 @@ export declare class AvmFastSimulationInputs {
                     contractAddress?: any;
                 }>, "many">;
                 privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                    fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                     emittedLength: z.ZodNumber;
                 }, "strict", z.ZodTypeAny, {
                     fields: Fr[];
@@ -11604,7 +11374,7 @@ export declare class AvmFastSimulationInputs {
                 contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     contractAddress: ZodFor<AztecAddress>;
                     fields: z.ZodEffects<z.ZodObject<{
-                        fields: z.ZodEffects<z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">, Fr[], string[]>;
+                        fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
                     }, "strip", z.ZodTypeAny, {
                         fields: Fr[];
                     }, {
@@ -11631,7 +11401,7 @@ export declare class AvmFastSimulationInputs {
                     contractAddress?: any;
                 }>, "many">;
                 privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                    fields: z.ZodArray<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, "many">;
+                    fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
                     emittedLength: z.ZodNumber;
                 }, "strict", z.ZodTypeAny, {
                     fields: Fr[];
@@ -11676,8 +11446,8 @@ export declare class AvmFastSimulationInputs {
                 nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                 l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;
@@ -11725,8 +11495,8 @@ export declare class AvmFastSimulationInputs {
                 nullifiers: z.ZodArray<ZodFor<Fr>, "many">;
                 l2ToL1Messages: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     message: z.ZodEffects<z.ZodObject<{
-                        recipient: z.ZodUnion<[z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>, z.ZodEffects<z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>, import("@aztec/foundation/schemas").EthAddress, string>]>;
-                        content: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+                        recipient: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
+                        content: z.ZodType<Fr, any, string>;
                     }, "strip", z.ZodTypeAny, {
                         content: Fr;
                         recipient: import("@aztec/foundation/schemas").EthAddress;