@aztec/stdlib 0.82.2 → 0.82.3-nightly.20250330

package/dest/avm/avm.d.ts

@@ -4,37 +4,11 @@ import { Fr } from '@aztec/foundation/fields';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
-import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import type { MerkleTreeId } from '../trees/merkle_tree_id.js';
+import { NullifierLeaf } from '../trees/nullifier_leaf.js';
+import { PublicDataTreeLeaf } from '../trees/public_data_leaf.js';
 import { AvmCircuitPublicInputs } from './avm_circuit_public_inputs.js';
-export declare class AvmEnqueuedCallHint {
-    readonly msgSender: AztecAddress;
-    readonly contractAddress: AztecAddress;
-    readonly calldata: Fr[];
-    isStaticCall: boolean;
-    constructor(msgSender: AztecAddress, contractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        msgSender: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-        contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-        calldata: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-        isStaticCall: z.ZodBoolean;
-    }, "strip", z.ZodTypeAny, {
-        contractAddress: AztecAddress;
-        msgSender: AztecAddress;
-        isStaticCall: boolean;
-        calldata: Fr[];
-    }, {
-        isStaticCall: boolean;
-        calldata: string[];
-        contractAddress?: any;
-        msgSender?: any;
-    }>, AvmEnqueuedCallHint, {
-        isStaticCall: boolean;
-        calldata: string[];
-        contractAddress?: any;
-        msgSender?: any;
-    }>;
-}
 export declare class AvmContractClassHint {
     readonly classId: Fr;
     readonly artifactHash: Fr;
@@ -172,319 +146,295 @@ export declare class AvmContractInstanceHint {
         deployer?: any;
     }>;
 }
-export declare class AvmAppendTreeHint {
-    readonly leafIndex: Fr;
-    readonly value: Fr;
-    readonly siblingPath: Fr[];
-    constructor(leafIndex: Fr, value: Fr, siblingPath: Fr[]);
+export declare class AvmGetSiblingPathHint {
+    readonly hintKey: AppendOnlyTreeSnapshot;
+    readonly treeId: MerkleTreeId;
+    readonly index: bigint;
+    readonly path: Fr[];
+    constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, index: bigint, path: Fr[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        leafIndex: z.ZodType<Fr, any, string>;
-        value: z.ZodType<Fr, any, string>;
-        siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        hintKey: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            root: Fr;
+            nextAvailableLeafIndex: number;
+        }, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>;
+        treeId: z.ZodNumber;
+        index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        path: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
     }, "strip", z.ZodTypeAny, {
-        value: Fr;
-        leafIndex: Fr;
-        siblingPath: Fr[];
+        path: Fr[];
+        index: bigint;
+        hintKey: AppendOnlyTreeSnapshot;
+        treeId: number;
     }, {
-        value: string;
-        leafIndex: string;
-        siblingPath: string[];
-    }>, AvmAppendTreeHint, {
-        value: string;
-        leafIndex: string;
-        siblingPath: string[];
+        path: string[];
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        treeId: number;
+    }>, AvmGetSiblingPathHint, {
+        path: string[];
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        treeId: number;
     }>;
 }
-export declare class AvmNullifierWriteTreeHint {
-    lowLeafRead: AvmNullifierReadTreeHint;
-    readonly insertionPath: Fr[];
-    constructor(lowLeafRead: AvmNullifierReadTreeHint, insertionPath: Fr[]);
+export declare class AvmGetPreviousValueIndexHint {
+    readonly hintKey: AppendOnlyTreeSnapshot;
+    readonly treeId: MerkleTreeId;
+    readonly value: Fr;
+    readonly index: bigint;
+    readonly alreadyPresent: boolean;
+    constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, value: Fr, index: bigint, alreadyPresent: boolean);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        lowLeafRead: z.ZodEffects<z.ZodObject<{
-            lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodType<Fr, any, string>;
-                nextNullifier: z.ZodType<Fr, any, string>;
-                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            }, "strip", z.ZodTypeAny, {
-                nullifier: Fr;
-                nextNullifier: Fr;
-                nextIndex: bigint;
-            }, {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            }>, NullifierLeafPreimage, {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            }>;
-            lowLeafIndex: z.ZodType<Fr, any, string>;
-            lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        hintKey: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            lowLeafPreimage: NullifierLeafPreimage;
-            lowLeafIndex: Fr;
-            lowLeafSiblingPath: Fr[];
+            root: Fr;
+            nextAvailableLeafIndex: number;
         }, {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
-        }>, AvmNullifierReadTreeHint, {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         }>;
-        insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        treeId: z.ZodNumber;
+        value: z.ZodType<Fr, any, string>;
+        index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        alreadyPresent: z.ZodBoolean;
     }, "strip", z.ZodTypeAny, {
-        lowLeafRead: AvmNullifierReadTreeHint;
-        insertionPath: Fr[];
+        value: Fr;
+        index: bigint;
+        hintKey: AppendOnlyTreeSnapshot;
+        treeId: number;
+        alreadyPresent: boolean;
     }, {
-        lowLeafRead: {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
+        value: string;
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        insertionPath: string[];
-    }>, AvmNullifierWriteTreeHint, {
-        lowLeafRead: {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
+        treeId: number;
+        alreadyPresent: boolean;
+    }>, AvmGetPreviousValueIndexHint, {
+        value: string;
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        insertionPath: string[];
+        treeId: number;
+        alreadyPresent: boolean;
     }>;
 }
-export declare class AvmNullifierReadTreeHint {
-    readonly lowLeafPreimage: NullifierLeafPreimage;
-    readonly lowLeafIndex: Fr;
-    readonly lowLeafSiblingPath: Fr[];
-    constructor(lowLeafPreimage: NullifierLeafPreimage, lowLeafIndex: Fr, lowLeafSiblingPath: Fr[]);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-            nullifier: z.ZodType<Fr, any, string>;
-            nextNullifier: z.ZodType<Fr, any, string>;
-            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+declare const AvmGetLeafPreimageHintPublicDataTree_base: {
+    new (hintKey: AppendOnlyTreeSnapshot, index: bigint, leaf: PublicDataTreeLeaf, nextIndex: bigint, nextValue: Fr): {
+        readonly hintKey: AppendOnlyTreeSnapshot;
+        readonly index: bigint;
+        readonly leaf: PublicDataTreeLeaf;
+        readonly nextIndex: bigint;
+        readonly nextValue: Fr;
+    };
+    readonly schema: z.ZodEffects<z.ZodObject<{
+        hintKey: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            nullifier: Fr;
-            nextNullifier: Fr;
-            nextIndex: bigint;
+            root: Fr;
+            nextAvailableLeafIndex: number;
         }, {
-            nullifier: string;
-            nextNullifier: string;
-            nextIndex: string | number | bigint;
-        }>, NullifierLeafPreimage, {
-            nullifier: string;
-            nextNullifier: string;
-            nextIndex: string | number | bigint;
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         }>;
-        lowLeafIndex: z.ZodType<Fr, any, string>;
-        lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        leaf: z.ZodType<any, z.ZodTypeDef, any>;
+        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        nextValue: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
-        lowLeafPreimage: NullifierLeafPreimage;
-        lowLeafIndex: Fr;
-        lowLeafSiblingPath: Fr[];
+        index: bigint;
+        nextIndex: bigint;
+        hintKey: AppendOnlyTreeSnapshot;
+        nextValue: Fr;
+        leaf?: any;
     }, {
-        lowLeafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
-            nextIndex: string | number | bigint;
+        index: string | number | bigint;
+        nextIndex: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        lowLeafIndex: string;
-        lowLeafSiblingPath: string[];
-    }>, AvmNullifierReadTreeHint, {
-        lowLeafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
-            nextIndex: string | number | bigint;
+        nextValue: string;
+        leaf?: any;
+    }>, {
+        readonly hintKey: AppendOnlyTreeSnapshot;
+        readonly index: bigint;
+        readonly leaf: PublicDataTreeLeaf;
+        readonly nextIndex: bigint;
+        readonly nextValue: Fr;
+    }, {
+        index: string | number | bigint;
+        nextIndex: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        lowLeafIndex: string;
-        lowLeafSiblingPath: string[];
+        nextValue: string;
+        leaf?: any;
     }>;
+};
+export declare class AvmGetLeafPreimageHintPublicDataTree extends AvmGetLeafPreimageHintPublicDataTree_base {
 }
-export declare class AvmPublicDataReadTreeHint {
-    readonly leafPreimage: PublicDataTreeLeafPreimage;
-    readonly leafIndex: Fr;
-    readonly siblingPath: Fr[];
-    constructor(leafPreimage: PublicDataTreeLeafPreimage, leafIndex: Fr, siblingPath: Fr[]);
-    static empty(): AvmPublicDataReadTreeHint;
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        leafPreimage: z.ZodEffects<z.ZodObject<{
-            slot: z.ZodType<Fr, any, string>;
-            value: z.ZodType<Fr, any, string>;
-            nextSlot: z.ZodType<Fr, any, string>;
-            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+declare const AvmGetLeafPreimageHintNullifierTree_base: {
+    new (hintKey: AppendOnlyTreeSnapshot, index: bigint, leaf: NullifierLeaf, nextIndex: bigint, nextValue: Fr): {
+        readonly hintKey: AppendOnlyTreeSnapshot;
+        readonly index: bigint;
+        readonly leaf: NullifierLeaf;
+        readonly nextIndex: bigint;
+        readonly nextValue: Fr;
+    };
+    readonly schema: z.ZodEffects<z.ZodObject<{
+        hintKey: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            value: Fr;
-            slot: Fr;
-            nextIndex: bigint;
-            nextSlot: Fr;
+            root: Fr;
+            nextAvailableLeafIndex: number;
         }, {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        }>, PublicDataTreeLeafPreimage, {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         }>;
-        leafIndex: z.ZodType<Fr, any, string>;
-        siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        leaf: z.ZodType<any, z.ZodTypeDef, any>;
+        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        nextValue: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
-        leafIndex: Fr;
-        siblingPath: Fr[];
-        leafPreimage: PublicDataTreeLeafPreimage;
+        index: bigint;
+        nextIndex: bigint;
+        hintKey: AppendOnlyTreeSnapshot;
+        nextValue: Fr;
+        leaf?: any;
     }, {
-        leafIndex: string;
-        siblingPath: string[];
-        leafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
+        index: string | number | bigint;
+        nextIndex: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-    }>, AvmPublicDataReadTreeHint, {
-        leafIndex: string;
-        siblingPath: string[];
-        leafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
+        nextValue: string;
+        leaf?: any;
+    }>, {
+        readonly hintKey: AppendOnlyTreeSnapshot;
+        readonly index: bigint;
+        readonly leaf: NullifierLeaf;
+        readonly nextIndex: bigint;
+        readonly nextValue: Fr;
+    }, {
+        index: string | number | bigint;
+        nextIndex: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
+        nextValue: string;
+        leaf?: any;
     }>;
+};
+export declare class AvmGetLeafPreimageHintNullifierTree extends AvmGetLeafPreimageHintNullifierTree_base {
 }
-export declare class AvmPublicDataWriteTreeHint {
-    readonly lowLeafRead: AvmPublicDataReadTreeHint;
-    readonly newLeafPreimage: PublicDataTreeLeafPreimage;
-    readonly insertionPath: Fr[];
-    constructor(lowLeafRead: AvmPublicDataReadTreeHint, newLeafPreimage: PublicDataTreeLeafPreimage, insertionPath: Fr[]);
+export declare class AvmGetLeafValueHint {
+    readonly hintKey: AppendOnlyTreeSnapshot;
+    readonly treeId: MerkleTreeId;
+    readonly index: bigint;
+    readonly value: Fr;
+    constructor(hintKey: AppendOnlyTreeSnapshot, treeId: MerkleTreeId, index: bigint, value: Fr);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        lowLeafRead: z.ZodEffects<z.ZodObject<{
-            leafPreimage: z.ZodEffects<z.ZodObject<{
-                slot: z.ZodType<Fr, any, string>;
-                value: z.ZodType<Fr, any, string>;
-                nextSlot: z.ZodType<Fr, any, string>;
-                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            }, "strip", z.ZodTypeAny, {
-                value: Fr;
-                slot: Fr;
-                nextIndex: bigint;
-                nextSlot: Fr;
-            }, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            }>, PublicDataTreeLeafPreimage, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            }>;
-            leafIndex: z.ZodType<Fr, any, string>;
-            siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        hintKey: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            leafIndex: Fr;
-            siblingPath: Fr[];
-            leafPreimage: PublicDataTreeLeafPreimage;
+            root: Fr;
+            nextAvailableLeafIndex: number;
         }, {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
-        }>, AvmPublicDataReadTreeHint, {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         }>;
-        newLeafPreimage: z.ZodEffects<z.ZodObject<{
-            slot: z.ZodType<Fr, any, string>;
-            value: z.ZodType<Fr, any, string>;
-            nextSlot: z.ZodType<Fr, any, string>;
-            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-        }, "strip", z.ZodTypeAny, {
-            value: Fr;
-            slot: Fr;
-            nextIndex: bigint;
-            nextSlot: Fr;
-        }, {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        }>, PublicDataTreeLeafPreimage, {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        }>;
-        insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        treeId: z.ZodNumber;
+        index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        value: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
-        lowLeafRead: AvmPublicDataReadTreeHint;
-        insertionPath: Fr[];
-        newLeafPreimage: PublicDataTreeLeafPreimage;
+        value: Fr;
+        index: bigint;
+        hintKey: AppendOnlyTreeSnapshot;
+        treeId: number;
     }, {
-        lowLeafRead: {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
-        };
-        insertionPath: string[];
-        newLeafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
-        };
-    }>, AvmPublicDataWriteTreeHint, {
-        lowLeafRead: {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
+        value: string;
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        insertionPath: string[];
-        newLeafPreimage: {
-            value: string;
-            slot: string;
-            nextIndex: string | number | bigint;
-            nextSlot: string;
+        treeId: number;
+    }>, AvmGetLeafValueHint, {
+        value: string;
+        index: string | number | bigint;
+        hintKey: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
+        treeId: number;
+    }>;
+}
+export declare class AvmEnqueuedCallHint {
+    readonly msgSender: AztecAddress;
+    readonly contractAddress: AztecAddress;
+    readonly calldata: Fr[];
+    isStaticCall: boolean;
+    constructor(msgSender: AztecAddress, contractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        msgSender: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+        contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
+        calldata: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        isStaticCall: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        contractAddress: AztecAddress;
+        msgSender: AztecAddress;
+        isStaticCall: boolean;
+        calldata: Fr[];
+    }, {
+        isStaticCall: boolean;
+        calldata: string[];
+        contractAddress?: any;
+        msgSender?: any;
+    }>, AvmEnqueuedCallHint, {
+        isStaticCall: boolean;
+        calldata: string[];
+        contractAddress?: any;
+        msgSender?: any;
     }>;
 }
 export declare class AvmExecutionHints {
@@ -492,14 +442,12 @@ export declare class AvmExecutionHints {
     readonly contractInstances: AvmContractInstanceHint[];
     readonly contractClasses: AvmContractClassHint[];
     readonly bytecodeCommitments: AvmBytecodeCommitmentHint[];
-    readonly publicDataReads: AvmPublicDataReadTreeHint[];
-    readonly publicDataWrites: AvmPublicDataWriteTreeHint[];
-    readonly nullifierReads: AvmNullifierReadTreeHint[];
-    readonly nullifierWrites: AvmNullifierWriteTreeHint[];
-    readonly noteHashReads: AvmAppendTreeHint[];
-    readonly noteHashWrites: AvmAppendTreeHint[];
-    readonly l1ToL2MessageReads: AvmAppendTreeHint[];
-    constructor(enqueuedCalls?: AvmEnqueuedCallHint[], contractInstances?: AvmContractInstanceHint[], contractClasses?: AvmContractClassHint[], bytecodeCommitments?: AvmBytecodeCommitmentHint[], publicDataReads?: AvmPublicDataReadTreeHint[], publicDataWrites?: AvmPublicDataWriteTreeHint[], nullifierReads?: AvmNullifierReadTreeHint[], nullifierWrites?: AvmNullifierWriteTreeHint[], noteHashReads?: AvmAppendTreeHint[], noteHashWrites?: AvmAppendTreeHint[], l1ToL2MessageReads?: AvmAppendTreeHint[]);
+    readonly getSiblingPathHints: AvmGetSiblingPathHint[];
+    readonly getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
+    readonly getLeafPreimageHintsPublicDataTree: AvmGetLeafPreimageHintPublicDataTree[];
+    readonly getLeafPreimageHintsNullifierTree: AvmGetLeafPreimageHintNullifierTree[];
+    readonly getLeafValueHints: AvmGetLeafValueHint[];
+    constructor(enqueuedCalls?: AvmEnqueuedCallHint[], contractInstances?: AvmContractInstanceHint[], contractClasses?: AvmContractClassHint[], bytecodeCommitments?: AvmBytecodeCommitmentHint[], getSiblingPathHints?: AvmGetSiblingPathHint[], getPreviousValueIndexHints?: AvmGetPreviousValueIndexHint[], getLeafPreimageHintsPublicDataTree?: AvmGetLeafPreimageHintPublicDataTree[], getLeafPreimageHintsNullifierTree?: AvmGetLeafPreimageHintNullifierTree[], getLeafValueHints?: AvmGetLeafValueHint[]);
     static empty(): AvmExecutionHints;
     static get schema(): z.ZodEffects<z.ZodObject<{
         enqueuedCalls: z.ZodArray<z.ZodEffects<z.ZodObject<{
@@ -638,357 +586,248 @@ export declare class AvmExecutionHints {
             classId: string;
             commitment: string;
         }>, "many">;
-        publicDataReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            leafPreimage: z.ZodEffects<z.ZodObject<{
-                slot: z.ZodType<Fr, any, string>;
-                value: z.ZodType<Fr, any, string>;
-                nextSlot: z.ZodType<Fr, any, string>;
-                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        getSiblingPathHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            hintKey: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
-                value: Fr;
-                slot: Fr;
-                nextIndex: bigint;
-                nextSlot: Fr;
+                root: Fr;
+                nextAvailableLeafIndex: number;
             }, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            }>, PublicDataTreeLeafPreimage, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             }>;
-            leafIndex: z.ZodType<Fr, any, string>;
-            siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+            treeId: z.ZodNumber;
+            index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            path: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
         }, "strip", z.ZodTypeAny, {
-            leafIndex: Fr;
-            siblingPath: Fr[];
-            leafPreimage: PublicDataTreeLeafPreimage;
+            path: Fr[];
+            index: bigint;
+            hintKey: AppendOnlyTreeSnapshot;
+            treeId: number;
         }, {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
-        }>, AvmPublicDataReadTreeHint, {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
+            path: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
+        }>, AvmGetSiblingPathHint, {
+            path: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
         }>, "many">;
-        publicDataWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            lowLeafRead: z.ZodEffects<z.ZodObject<{
-                leafPreimage: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodType<Fr, any, string>;
-                    value: z.ZodType<Fr, any, string>;
-                    nextSlot: z.ZodType<Fr, any, string>;
-                    nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                }, "strip", z.ZodTypeAny, {
-                    value: Fr;
-                    slot: Fr;
-                    nextIndex: bigint;
-                    nextSlot: Fr;
-                }, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                }>, PublicDataTreeLeafPreimage, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                }>;
-                leafIndex: z.ZodType<Fr, any, string>;
-                siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        getPreviousValueIndexHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            hintKey: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
-                leafIndex: Fr;
-                siblingPath: Fr[];
-                leafPreimage: PublicDataTreeLeafPreimage;
+                root: Fr;
+                nextAvailableLeafIndex: number;
             }, {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            }>, AvmPublicDataReadTreeHint, {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             }>;
-            newLeafPreimage: z.ZodEffects<z.ZodObject<{
-                slot: z.ZodType<Fr, any, string>;
-                value: z.ZodType<Fr, any, string>;
-                nextSlot: z.ZodType<Fr, any, string>;
-                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            }, "strip", z.ZodTypeAny, {
-                value: Fr;
-                slot: Fr;
-                nextIndex: bigint;
-                nextSlot: Fr;
-            }, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            }>, PublicDataTreeLeafPreimage, {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            }>;
-            insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+            treeId: z.ZodNumber;
+            value: z.ZodType<Fr, any, string>;
+            index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            alreadyPresent: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
-            lowLeafRead: AvmPublicDataReadTreeHint;
-            insertionPath: Fr[];
-            newLeafPreimage: PublicDataTreeLeafPreimage;
+            value: Fr;
+            index: bigint;
+            hintKey: AppendOnlyTreeSnapshot;
+            treeId: number;
+            alreadyPresent: boolean;
         }, {
-            lowLeafRead: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            };
-            insertionPath: string[];
-            newLeafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
-        }>, AvmPublicDataWriteTreeHint, {
-            lowLeafRead: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            };
-            insertionPath: string[];
-            newLeafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
+            value: string;
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
+            alreadyPresent: boolean;
+        }>, AvmGetPreviousValueIndexHint, {
+            value: string;
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
+            treeId: number;
+            alreadyPresent: boolean;
         }>, "many">;
-        nullifierReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-                nullifier: z.ZodType<Fr, any, string>;
-                nextNullifier: z.ZodType<Fr, any, string>;
-                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        getLeafPreimageHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            hintKey: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
-                nullifier: Fr;
-                nextNullifier: Fr;
-                nextIndex: bigint;
+                root: Fr;
+                nextAvailableLeafIndex: number;
             }, {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            }>, NullifierLeafPreimage, {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             }>;
-            lowLeafIndex: z.ZodType<Fr, any, string>;
-            lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+            index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            leaf: z.ZodType<any, z.ZodTypeDef, any>;
+            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            nextValue: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
-            lowLeafPreimage: NullifierLeafPreimage;
-            lowLeafIndex: Fr;
-            lowLeafSiblingPath: Fr[];
+            index: bigint;
+            nextIndex: bigint;
+            hintKey: AppendOnlyTreeSnapshot;
+            nextValue: Fr;
+            leaf?: any;
         }, {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
-        }>, AvmNullifierReadTreeHint, {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            nextValue: string;
+            leaf?: any;
+        }>, {
+            readonly hintKey: AppendOnlyTreeSnapshot;
+            readonly index: bigint;
+            readonly leaf: PublicDataTreeLeaf;
+            readonly nextIndex: bigint;
+            readonly nextValue: Fr;
+        }, {
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
+            nextValue: string;
+            leaf?: any;
         }>, "many">;
-        nullifierWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            lowLeafRead: z.ZodEffects<z.ZodObject<{
-                lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodType<Fr, any, string>;
-                    nextNullifier: z.ZodType<Fr, any, string>;
-                    nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                }, "strip", z.ZodTypeAny, {
-                    nullifier: Fr;
-                    nextNullifier: Fr;
-                    nextIndex: bigint;
-                }, {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                }>, NullifierLeafPreimage, {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                }>;
-                lowLeafIndex: z.ZodType<Fr, any, string>;
-                lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        getLeafPreimageHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            hintKey: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
-                lowLeafPreimage: NullifierLeafPreimage;
-                lowLeafIndex: Fr;
-                lowLeafSiblingPath: Fr[];
+                root: Fr;
+                nextAvailableLeafIndex: number;
             }, {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }>, AvmNullifierReadTreeHint, {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             }>;
-            insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-        }, "strip", z.ZodTypeAny, {
-            lowLeafRead: AvmNullifierReadTreeHint;
-            insertionPath: Fr[];
-        }, {
-            lowLeafRead: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            };
-            insertionPath: string[];
-        }>, AvmNullifierWriteTreeHint, {
-            lowLeafRead: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            };
-            insertionPath: string[];
-        }>, "many">;
-        noteHashReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            leafIndex: z.ZodType<Fr, any, string>;
-            value: z.ZodType<Fr, any, string>;
-            siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+            index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            leaf: z.ZodType<any, z.ZodTypeDef, any>;
+            nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            nextValue: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
-            value: Fr;
-            leafIndex: Fr;
-            siblingPath: Fr[];
+            index: bigint;
+            nextIndex: bigint;
+            hintKey: AppendOnlyTreeSnapshot;
+            nextValue: Fr;
+            leaf?: any;
         }, {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
-        }>, AvmAppendTreeHint, {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
-        }>, "many">;
-        noteHashWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            leafIndex: z.ZodType<Fr, any, string>;
-            value: z.ZodType<Fr, any, string>;
-            siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-        }, "strip", z.ZodTypeAny, {
-            value: Fr;
-            leafIndex: Fr;
-            siblingPath: Fr[];
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            nextValue: string;
+            leaf?: any;
+        }>, {
+            readonly hintKey: AppendOnlyTreeSnapshot;
+            readonly index: bigint;
+            readonly leaf: NullifierLeaf;
+            readonly nextIndex: bigint;
+            readonly nextValue: Fr;
         }, {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
-        }>, AvmAppendTreeHint, {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            nextValue: string;
+            leaf?: any;
         }>, "many">;
-        l1ToL2MessageReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            leafIndex: z.ZodType<Fr, any, string>;
+        getLeafValueHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            hintKey: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            }, "strip", z.ZodTypeAny, {
+                root: Fr;
+                nextAvailableLeafIndex: number;
+            }, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>;
+            treeId: z.ZodNumber;
+            index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             value: z.ZodType<Fr, any, string>;
-            siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
         }, "strip", z.ZodTypeAny, {
             value: Fr;
-            leafIndex: Fr;
-            siblingPath: Fr[];
+            index: bigint;
+            hintKey: AppendOnlyTreeSnapshot;
+            treeId: number;
         }, {
             value: string;
-            leafIndex: string;
-            siblingPath: string[];
-        }>, AvmAppendTreeHint, {
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
+        }>, AvmGetLeafValueHint, {
             value: string;
-            leafIndex: string;
-            siblingPath: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        publicDataWrites: AvmPublicDataWriteTreeHint[];
         enqueuedCalls: AvmEnqueuedCallHint[];
         contractInstances: AvmContractInstanceHint[];
         contractClasses: AvmContractClassHint[];
         bytecodeCommitments: AvmBytecodeCommitmentHint[];
-        publicDataReads: AvmPublicDataReadTreeHint[];
-        nullifierReads: AvmNullifierReadTreeHint[];
-        nullifierWrites: AvmNullifierWriteTreeHint[];
-        noteHashReads: AvmAppendTreeHint[];
-        noteHashWrites: AvmAppendTreeHint[];
-        l1ToL2MessageReads: AvmAppendTreeHint[];
-    }, {
-        publicDataWrites: {
-            lowLeafRead: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            };
-            insertionPath: string[];
-            newLeafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
+        getSiblingPathHints: AvmGetSiblingPathHint[];
+        getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
+        getLeafPreimageHintsPublicDataTree: {
+            readonly hintKey: AppendOnlyTreeSnapshot;
+            readonly index: bigint;
+            readonly leaf: PublicDataTreeLeaf;
+            readonly nextIndex: bigint;
+            readonly nextValue: Fr;
         }[];
+        getLeafPreimageHintsNullifierTree: {
+            readonly hintKey: AppendOnlyTreeSnapshot;
+            readonly index: bigint;
+            readonly leaf: NullifierLeaf;
+            readonly nextIndex: bigint;
+            readonly nextValue: Fr;
+        }[];
+        getLeafValueHints: AvmGetLeafValueHint[];
+    }, {
         enqueuedCalls: {
             isStaticCall: boolean;
             calldata: string[];
@@ -1022,72 +861,55 @@ export declare class AvmExecutionHints {
             classId: string;
             commitment: string;
         }[];
-        publicDataReads: {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
-        }[];
-        nullifierReads: {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
-            };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
-        }[];
-        nullifierWrites: {
-            lowLeafRead: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            };
-            insertionPath: string[];
-        }[];
-        noteHashReads: {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
+        getSiblingPathHints: {
+            path: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
         }[];
-        noteHashWrites: {
+        getPreviousValueIndexHints: {
             value: string;
-            leafIndex: string;
-            siblingPath: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
+            alreadyPresent: boolean;
         }[];
-        l1ToL2MessageReads: {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
+        getLeafPreimageHintsPublicDataTree: {
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            nextValue: string;
+            leaf?: any;
         }[];
-    }>, AvmExecutionHints, {
-        publicDataWrites: {
-            lowLeafRead: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
+        getLeafPreimageHintsNullifierTree: {
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
-            insertionPath: string[];
-            newLeafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
+            nextValue: string;
+            leaf?: any;
+        }[];
+        getLeafValueHints: {
+            value: string;
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
+            treeId: number;
         }[];
+    }>, AvmExecutionHints, {
         enqueuedCalls: {
             isStaticCall: boolean;
             calldata: string[];
@@ -1121,51 +943,53 @@ export declare class AvmExecutionHints {
             classId: string;
             commitment: string;
         }[];
-        publicDataReads: {
-            leafIndex: string;
-            siblingPath: string[];
-            leafPreimage: {
-                value: string;
-                slot: string;
-                nextIndex: string | number | bigint;
-                nextSlot: string;
-            };
+        getSiblingPathHints: {
+            path: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
         }[];
-        nullifierReads: {
-            lowLeafPreimage: {
-                nullifier: string;
-                nextNullifier: string;
-                nextIndex: string | number | bigint;
+        getPreviousValueIndexHints: {
+            value: string;
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
-            lowLeafIndex: string;
-            lowLeafSiblingPath: string[];
+            treeId: number;
+            alreadyPresent: boolean;
         }[];
-        nullifierWrites: {
-            lowLeafRead: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
+        getLeafPreimageHintsPublicDataTree: {
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
             };
-            insertionPath: string[];
-        }[];
-        noteHashReads: {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
+            nextValue: string;
+            leaf?: any;
         }[];
-        noteHashWrites: {
-            value: string;
-            leafIndex: string;
-            siblingPath: string[];
+        getLeafPreimageHintsNullifierTree: {
+            index: string | number | bigint;
+            nextIndex: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            nextValue: string;
+            leaf?: any;
         }[];
-        l1ToL2MessageReads: {
+        getLeafValueHints: {
             value: string;
-            leafIndex: string;
-            siblingPath: string[];
+            index: string | number | bigint;
+            hintKey: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            treeId: number;
         }[];
     }>;
 }
@@ -1317,357 +1141,248 @@ export declare class AvmCircuitInputs {
                 classId: string;
                 commitment: string;
             }>, "many">;
-            publicDataReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                leafPreimage: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodType<Fr, any, string>;
-                    value: z.ZodType<Fr, any, string>;
-                    nextSlot: z.ZodType<Fr, any, string>;
-                    nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            getSiblingPathHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                hintKey: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
-                    value: Fr;
-                    slot: Fr;
-                    nextIndex: bigint;
-                    nextSlot: Fr;
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
                 }, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                }>, PublicDataTreeLeafPreimage, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 }>;
-                leafIndex: z.ZodType<Fr, any, string>;
-                siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                treeId: z.ZodNumber;
+                index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                path: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
             }, "strip", z.ZodTypeAny, {
-                leafIndex: Fr;
-                siblingPath: Fr[];
-                leafPreimage: PublicDataTreeLeafPreimage;
+                path: Fr[];
+                index: bigint;
+                hintKey: AppendOnlyTreeSnapshot;
+                treeId: number;
             }, {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            }>, AvmPublicDataReadTreeHint, {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
+            }>, AvmGetSiblingPathHint, {
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }>, "many">;
-            publicDataWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                lowLeafRead: z.ZodEffects<z.ZodObject<{
-                    leafPreimage: z.ZodEffects<z.ZodObject<{
-                        slot: z.ZodType<Fr, any, string>;
-                        value: z.ZodType<Fr, any, string>;
-                        nextSlot: z.ZodType<Fr, any, string>;
-                        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                    }, "strip", z.ZodTypeAny, {
-                        value: Fr;
-                        slot: Fr;
-                        nextIndex: bigint;
-                        nextSlot: Fr;
-                    }, {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    }>, PublicDataTreeLeafPreimage, {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    }>;
-                    leafIndex: z.ZodType<Fr, any, string>;
-                    siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-                }, "strip", z.ZodTypeAny, {
-                    leafIndex: Fr;
-                    siblingPath: Fr[];
-                    leafPreimage: PublicDataTreeLeafPreimage;
-                }, {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                }>, AvmPublicDataReadTreeHint, {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                }>;
-                newLeafPreimage: z.ZodEffects<z.ZodObject<{
-                    slot: z.ZodType<Fr, any, string>;
-                    value: z.ZodType<Fr, any, string>;
-                    nextSlot: z.ZodType<Fr, any, string>;
-                    nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            getPreviousValueIndexHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                hintKey: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
-                    value: Fr;
-                    slot: Fr;
-                    nextIndex: bigint;
-                    nextSlot: Fr;
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
                 }, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                }>, PublicDataTreeLeafPreimage, {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 }>;
-                insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                treeId: z.ZodNumber;
+                value: z.ZodType<Fr, any, string>;
+                index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                alreadyPresent: z.ZodBoolean;
             }, "strip", z.ZodTypeAny, {
-                lowLeafRead: AvmPublicDataReadTreeHint;
-                insertionPath: Fr[];
-                newLeafPreimage: PublicDataTreeLeafPreimage;
+                value: Fr;
+                index: bigint;
+                hintKey: AppendOnlyTreeSnapshot;
+                treeId: number;
+                alreadyPresent: boolean;
             }, {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            }>, AvmPublicDataWriteTreeHint, {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+                treeId: number;
+                alreadyPresent: boolean;
+            }>, AvmGetPreviousValueIndexHint, {
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
+                alreadyPresent: boolean;
             }>, "many">;
-            nullifierReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-                    nullifier: z.ZodType<Fr, any, string>;
-                    nextNullifier: z.ZodType<Fr, any, string>;
-                    nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            getLeafPreimageHintsPublicDataTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                hintKey: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
-                    nullifier: Fr;
-                    nextNullifier: Fr;
-                    nextIndex: bigint;
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
                 }, {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                }>, NullifierLeafPreimage, {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 }>;
-                lowLeafIndex: z.ZodType<Fr, any, string>;
-                lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                leaf: z.ZodType<any, z.ZodTypeDef, any>;
+                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                nextValue: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
-                lowLeafPreimage: NullifierLeafPreimage;
-                lowLeafIndex: Fr;
-                lowLeafSiblingPath: Fr[];
+                index: bigint;
+                nextIndex: bigint;
+                hintKey: AppendOnlyTreeSnapshot;
+                nextValue: Fr;
+                leaf?: any;
+            }, {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
+            }>, {
+                readonly hintKey: AppendOnlyTreeSnapshot;
+                readonly index: bigint;
+                readonly leaf: PublicDataTreeLeaf;
+                readonly nextIndex: bigint;
+                readonly nextValue: Fr;
             }, {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }>, AvmNullifierReadTreeHint, {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }>, "many">;
-            nullifierWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                lowLeafRead: z.ZodEffects<z.ZodObject<{
-                    lowLeafPreimage: z.ZodEffects<z.ZodObject<{
-                        nullifier: z.ZodType<Fr, any, string>;
-                        nextNullifier: z.ZodType<Fr, any, string>;
-                        nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                    }, "strip", z.ZodTypeAny, {
-                        nullifier: Fr;
-                        nextNullifier: Fr;
-                        nextIndex: bigint;
-                    }, {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    }>, NullifierLeafPreimage, {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    }>;
-                    lowLeafIndex: z.ZodType<Fr, any, string>;
-                    lowLeafSiblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+            getLeafPreimageHintsNullifierTree: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                hintKey: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
                 }, "strip", z.ZodTypeAny, {
-                    lowLeafPreimage: NullifierLeafPreimage;
-                    lowLeafIndex: Fr;
-                    lowLeafSiblingPath: Fr[];
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
                 }, {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
-                }>, AvmNullifierReadTreeHint, {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 }>;
-                insertionPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+                index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                leaf: z.ZodType<any, z.ZodTypeDef, any>;
+                nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                nextValue: z.ZodType<Fr, any, string>;
             }, "strip", z.ZodTypeAny, {
-                lowLeafRead: AvmNullifierReadTreeHint;
-                insertionPath: Fr[];
+                index: bigint;
+                nextIndex: bigint;
+                hintKey: AppendOnlyTreeSnapshot;
+                nextValue: Fr;
+                leaf?: any;
             }, {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
-                };
-                insertionPath: string[];
-            }>, AvmNullifierWriteTreeHint, {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
-            }>, "many">;
-            noteHashReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                leafIndex: z.ZodType<Fr, any, string>;
-                value: z.ZodType<Fr, any, string>;
-                siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-            }, "strip", z.ZodTypeAny, {
-                value: Fr;
-                leafIndex: Fr;
-                siblingPath: Fr[];
+                nextValue: string;
+                leaf?: any;
+            }>, {
+                readonly hintKey: AppendOnlyTreeSnapshot;
+                readonly index: bigint;
+                readonly leaf: NullifierLeaf;
+                readonly nextIndex: bigint;
+                readonly nextValue: Fr;
             }, {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
-            }>, AvmAppendTreeHint, {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
-            }>, "many">;
-            noteHashWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                leafIndex: z.ZodType<Fr, any, string>;
-                value: z.ZodType<Fr, any, string>;
-                siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-            }, "strip", z.ZodTypeAny, {
-                value: Fr;
-                leafIndex: Fr;
-                siblingPath: Fr[];
-            }, {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
-            }>, AvmAppendTreeHint, {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }>, "many">;
-            l1ToL2MessageReads: z.ZodArray<z.ZodEffects<z.ZodObject<{
-                leafIndex: z.ZodType<Fr, any, string>;
+            getLeafValueHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+                hintKey: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
+                }, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>;
+                treeId: z.ZodNumber;
+                index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
                 value: z.ZodType<Fr, any, string>;
-                siblingPath: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
             }, "strip", z.ZodTypeAny, {
                 value: Fr;
-                leafIndex: Fr;
-                siblingPath: Fr[];
+                index: bigint;
+                hintKey: AppendOnlyTreeSnapshot;
+                treeId: number;
             }, {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
-            }>, AvmAppendTreeHint, {
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
+            }>, AvmGetLeafValueHint, {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            publicDataWrites: AvmPublicDataWriteTreeHint[];
             enqueuedCalls: AvmEnqueuedCallHint[];
             contractInstances: AvmContractInstanceHint[];
             contractClasses: AvmContractClassHint[];
             bytecodeCommitments: AvmBytecodeCommitmentHint[];
-            publicDataReads: AvmPublicDataReadTreeHint[];
-            nullifierReads: AvmNullifierReadTreeHint[];
-            nullifierWrites: AvmNullifierWriteTreeHint[];
-            noteHashReads: AvmAppendTreeHint[];
-            noteHashWrites: AvmAppendTreeHint[];
-            l1ToL2MessageReads: AvmAppendTreeHint[];
-        }, {
-            publicDataWrites: {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
+            getSiblingPathHints: AvmGetSiblingPathHint[];
+            getPreviousValueIndexHints: AvmGetPreviousValueIndexHint[];
+            getLeafPreimageHintsPublicDataTree: {
+                readonly hintKey: AppendOnlyTreeSnapshot;
+                readonly index: bigint;
+                readonly leaf: PublicDataTreeLeaf;
+                readonly nextIndex: bigint;
+                readonly nextValue: Fr;
+            }[];
+            getLeafPreimageHintsNullifierTree: {
+                readonly hintKey: AppendOnlyTreeSnapshot;
+                readonly index: bigint;
+                readonly leaf: NullifierLeaf;
+                readonly nextIndex: bigint;
+                readonly nextValue: Fr;
             }[];
+            getLeafValueHints: AvmGetLeafValueHint[];
+        }, {
             enqueuedCalls: {
                 isStaticCall: boolean;
                 calldata: string[];
@@ -1701,72 +1416,55 @@ export declare class AvmCircuitInputs {
                 classId: string;
                 commitment: string;
             }[];
-            publicDataReads: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+            getSiblingPathHints: {
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }[];
-            nullifierReads: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }[];
-            nullifierWrites: {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+            getPreviousValueIndexHints: {
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
+                treeId: number;
+                alreadyPresent: boolean;
             }[];
-            noteHashReads: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsPublicDataTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            noteHashWrites: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsNullifierTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            l1ToL2MessageReads: {
+            getLeafValueHints: {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
-            }[];
-        }>, AvmExecutionHints, {
-            publicDataWrites: {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }[];
+        }>, AvmExecutionHints, {
             enqueuedCalls: {
                 isStaticCall: boolean;
                 calldata: string[];
@@ -1800,51 +1498,53 @@ export declare class AvmCircuitInputs {
                 classId: string;
                 commitment: string;
             }[];
-            publicDataReads: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+            getSiblingPathHints: {
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }[];
-            nullifierReads: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }[];
-            nullifierWrites: {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+            getPreviousValueIndexHints: {
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
+                treeId: number;
+                alreadyPresent: boolean;
             }[];
-            noteHashReads: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsPublicDataTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            noteHashWrites: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsNullifierTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            l1ToL2MessageReads: {
+            getLeafValueHints: {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
             }[];
         }>;
         publicInputs: z.ZodEffects<z.ZodObject<{
@@ -1913,7 +1613,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -1926,7 +1626,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -1939,7 +1639,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -1952,15 +1652,15 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
             }, "strip", z.ZodTypeAny, {
-                l1ToL2MessageTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                noteHashTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                nullifierTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                publicDataTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+                l1ToL2MessageTree: AppendOnlyTreeSnapshot;
+                noteHashTree: AppendOnlyTreeSnapshot;
+                nullifierTree: AppendOnlyTreeSnapshot;
+                publicDataTree: AppendOnlyTreeSnapshot;
             }, {
                 l1ToL2MessageTree: {
                     root: string;
@@ -2344,7 +2044,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -2357,7 +2057,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -2370,7 +2070,7 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
@@ -2383,15 +2083,15 @@ export declare class AvmCircuitInputs {
                 }, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
-                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                }>, AppendOnlyTreeSnapshot, {
                     root: string;
                     nextAvailableLeafIndex: string | number | bigint;
                 }>;
             }, "strip", z.ZodTypeAny, {
-                l1ToL2MessageTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                noteHashTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                nullifierTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-                publicDataTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+                l1ToL2MessageTree: AppendOnlyTreeSnapshot;
+                noteHashTree: AppendOnlyTreeSnapshot;
+                nullifierTree: AppendOnlyTreeSnapshot;
+                publicDataTree: AppendOnlyTreeSnapshot;
             }, {
                 l1ToL2MessageTree: {
                     root: string;
@@ -2859,25 +2559,6 @@ export declare class AvmCircuitInputs {
         calldata: string[];
         functionName: string;
         hints: {
-            publicDataWrites: {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            }[];
             enqueuedCalls: {
                 isStaticCall: boolean;
                 calldata: string[];
@@ -2911,51 +2592,53 @@ export declare class AvmCircuitInputs {
                 classId: string;
                 commitment: string;
             }[];
-            publicDataReads: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+            getSiblingPathHints: {
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }[];
-            nullifierReads: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }[];
-            nullifierWrites: {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+            getPreviousValueIndexHints: {
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
+                treeId: number;
+                alreadyPresent: boolean;
             }[];
-            noteHashReads: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsPublicDataTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            noteHashWrites: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsNullifierTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            l1ToL2MessageReads: {
+            getLeafValueHints: {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
             }[];
         };
         publicInputs: {
@@ -3111,25 +2794,6 @@ export declare class AvmCircuitInputs {
         calldata: string[];
         functionName: string;
         hints: {
-            publicDataWrites: {
-                lowLeafRead: {
-                    leafIndex: string;
-                    siblingPath: string[];
-                    leafPreimage: {
-                        value: string;
-                        slot: string;
-                        nextIndex: string | number | bigint;
-                        nextSlot: string;
-                    };
-                };
-                insertionPath: string[];
-                newLeafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
-                };
-            }[];
             enqueuedCalls: {
                 isStaticCall: boolean;
                 calldata: string[];
@@ -3163,51 +2827,53 @@ export declare class AvmCircuitInputs {
                 classId: string;
                 commitment: string;
             }[];
-            publicDataReads: {
-                leafIndex: string;
-                siblingPath: string[];
-                leafPreimage: {
-                    value: string;
-                    slot: string;
-                    nextIndex: string | number | bigint;
-                    nextSlot: string;
+            getSiblingPathHints: {
+                path: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
+                treeId: number;
             }[];
-            nullifierReads: {
-                lowLeafPreimage: {
-                    nullifier: string;
-                    nextNullifier: string;
-                    nextIndex: string | number | bigint;
-                };
-                lowLeafIndex: string;
-                lowLeafSiblingPath: string[];
-            }[];
-            nullifierWrites: {
-                lowLeafRead: {
-                    lowLeafPreimage: {
-                        nullifier: string;
-                        nextNullifier: string;
-                        nextIndex: string | number | bigint;
-                    };
-                    lowLeafIndex: string;
-                    lowLeafSiblingPath: string[];
+            getPreviousValueIndexHints: {
+                value: string;
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
                 };
-                insertionPath: string[];
+                treeId: number;
+                alreadyPresent: boolean;
             }[];
-            noteHashReads: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsPublicDataTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            noteHashWrites: {
-                value: string;
-                leafIndex: string;
-                siblingPath: string[];
+            getLeafPreimageHintsNullifierTree: {
+                index: string | number | bigint;
+                nextIndex: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nextValue: string;
+                leaf?: any;
             }[];
-            l1ToL2MessageReads: {
+            getLeafValueHints: {
                 value: string;
-                leafIndex: string;
-                siblingPath: string[];
+                index: string | number | bigint;
+                hintKey: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                treeId: number;
             }[];
         };
         publicInputs: {
@@ -3364,4 +3030,5 @@ export declare class AvmCircuitInputs {
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer): Promise<AvmCircuitInputs>;
 }
+export {};
 //# sourceMappingURL=avm.d.ts.map