@aztec/stdlib 3.0.0-nightly.20250925 → 3.0.0-nightly.20250926

package/src/rollup/tx_rollup_public_inputs.ts

@@ -23,11 +23,11 @@ export class TxRollupPublicInputs {
     /**
      * Partial state reference at the start of the rollup circuit.
      */
-    public startPartialState: PartialStateReference,
+    public startTreeSnapshots: PartialStateReference,
     /**
      * Partial state reference at the end of the rollup circuit.
      */
-    public endPartialState: PartialStateReference,
+    public endTreeSnapshots: PartialStateReference,
     /**
      * Sponge state to absorb blob inputs at the start of the rollup circuit.
      */
@@ -96,8 +96,8 @@ export class TxRollupPublicInputs {
       this.numTxs,
       this.constants,
 
-      this.startPartialState,
-      this.endPartialState,
+      this.startTreeSnapshots,
+      this.endTreeSnapshots,
 
       this.startSpongeBlob,
       this.endSpongeBlob,

package/src/tests/factories.ts

@@ -9,7 +9,7 @@ import {
   FIXED_DA_GAS,
   FIXED_L2_GAS,
   GeneratorIndex,
-  L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+  L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   MAX_CONTRACT_CLASS_LOGS_PER_TX,
   MAX_ENQUEUED_CALLS_PER_CALL,
   MAX_ENQUEUED_CALLS_PER_TX,
@@ -29,8 +29,8 @@ import {
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-  NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
-  NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
+  NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
+  NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   NULLIFIER_TREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   NUM_BASE_PARITY_PER_ROOT_PARITY,
@@ -75,7 +75,6 @@ import {
   AvmTxHint,
   RevertCode,
 } from '../avm/index.js';
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { PublicDataRead } from '../avm/public_data_read.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -131,7 +130,6 @@ import { ProofData } from '../proofs/index.js';
 import { Proof } from '../proofs/proof.js';
 import { ProvingRequestType } from '../proofs/proving_request_type.js';
 import { makeRecursiveProof } from '../proofs/recursive_proof.js';
-import { AvmProofData } from '../rollup/avm_proof_data.js';
 import { PrivateBaseRollupHints, PublicBaseRollupHints } from '../rollup/base_rollup_hints.js';
 import { BlockConstantData } from '../rollup/block_constant_data.js';
 import { BlockMergeRollupPrivateInputs } from '../rollup/block_merge_rollup_private_inputs.js';
@@ -147,7 +145,7 @@ import { EpochConstantData } from '../rollup/epoch_constant_data.js';
 import { PrivateTxBaseRollupPrivateInputs } from '../rollup/private_tx_base_rollup_private_inputs.js';
 import { PublicTxBaseRollupPrivateInputs } from '../rollup/public_tx_base_rollup_private_inputs.js';
 import { RootRollupPublicInputs } from '../rollup/root_rollup_public_inputs.js';
-import { PrivateBaseStateDiffHints } from '../rollup/state_diff_hints.js';
+import { TreeSnapshotDiffHints } from '../rollup/tree_snapshot_diff_hints.js';
 import { TxMergeRollupPrivateInputs } from '../rollup/tx_merge_rollup_private_inputs.js';
 import { TxRollupPublicInputs } from '../rollup/tx_rollup_public_inputs.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -919,7 +917,7 @@ export function makeBlockRootFirstRollupPrivateInputs(seed = 0) {
     makeProofData(seed, makeParityPublicInputs),
     [makeProofData(seed + 0x1000, makeTxRollupPublicInputs), makeProofData(seed + 0x2000, makeTxRollupPublicInputs)],
     makeAppendOnlyTreeSnapshot(seed + 0x3000),
-    makeSiblingPath(seed + 0x4000, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH),
+    makeSiblingPath(seed + 0x4000, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH),
     makeSiblingPath(seed + 0x5000, ARCHIVE_HEIGHT),
   );
 }
@@ -980,11 +978,11 @@ export function makePublicDataTreeLeafPreimage(seed = 0): PublicDataTreeLeafPrei
 }
 
 /**
- * Creates an instance of PrivateBaseStateDiffHints with arbitrary values based on the provided seed.
+ * Creates an instance of TreeSnapshotDiffHints with arbitrary values based on the provided seed.
  * @param seed - The seed to use for generating the hints.
- * @returns A PrivateBaseStateDiffHints object.
+ * @returns A TreeSnapshotDiffHints object.
  */
-export function makePrivateBaseStateDiffHints(seed = 1): PrivateBaseStateDiffHints {
+export function makeTreeSnapshotDiffHints(seed = 1): TreeSnapshotDiffHints {
   const nullifierPredecessorPreimages = makeTuple(
     MAX_NULLIFIERS_PER_TX,
     x => makeNullifierLeafPreimage(x),
@@ -1001,24 +999,20 @@ export function makePrivateBaseStateDiffHints(seed = 1): PrivateBaseStateDiffHin
 
   const sortedNullifierIndexes = makeTuple(MAX_NULLIFIERS_PER_TX, i => i, seed + 0x4000);
 
-  const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, fr, seed + 0x5000);
+  const noteHashSubtreeRootSiblingPath = makeTuple(NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, fr, seed + 0x5000);
 
-  const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, fr, seed + 0x6000);
+  const nullifierSubtreeRootSiblingPath = makeTuple(NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, fr, seed + 0x6000);
 
-  const feeWriteLowLeafPreimage = makePublicDataTreeLeafPreimage(seed + 0x7000);
-  const feeWriteLowLeafMembershipWitness = makeMembershipWitness(PUBLIC_DATA_TREE_HEIGHT, seed + 0x8000);
-  const feeWriteSiblingPath = makeTuple(PUBLIC_DATA_TREE_HEIGHT, fr, seed + 0x9000);
+  const feePayerBalanceMembershipWitness = makeMembershipWitness(PUBLIC_DATA_TREE_HEIGHT, seed + 0x8000);
 
-  return new PrivateBaseStateDiffHints(
+  return new TreeSnapshotDiffHints(
+    noteHashSubtreeRootSiblingPath,
     nullifierPredecessorPreimages,
     nullifierPredecessorMembershipWitnesses,
     sortedNullifiers,
     sortedNullifierIndexes,
-    noteHashSubtreeSiblingPath,
-    nullifierSubtreeSiblingPath,
-    feeWriteLowLeafPreimage,
-    feeWriteLowLeafMembershipWitness,
-    feeWriteSiblingPath,
+    nullifierSubtreeRootSiblingPath,
+    feePayerBalanceMembershipWitness,
   );
 }
 
@@ -1047,22 +1041,22 @@ function makePrivateBaseRollupHints(seed = 1) {
 
   const startSpongeBlob = makeSpongeBlob(seed + 0x200);
 
-  const stateDiffHints = makePrivateBaseStateDiffHints(seed + 0x600);
+  const treeSnapshotDiffHints = makeTreeSnapshotDiffHints(seed + 0x600);
 
-  const archiveRootMembershipWitness = makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x9000);
+  const anchorBlockArchiveSiblingPath = makeSiblingPath(seed + 0x9000, ARCHIVE_HEIGHT);
 
   const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
 
   const constants = makeBlockConstantData(0x100);
 
-  const feePayerFeeJuiceBalanceReadHint = PublicDataHint.empty();
+  const feePayerBalanceLeafPreimage = PublicDataTreeLeafPreimage.empty();
 
   return PrivateBaseRollupHints.from({
     start,
     startSpongeBlob,
-    stateDiffHints,
-    feePayerFeeJuiceBalanceReadHint,
-    archiveRootMembershipWitness,
+    treeSnapshotDiffHints,
+    feePayerBalanceLeafPreimage,
+    anchorBlockArchiveSiblingPath,
     contractClassLogsFields,
     constants,
   });
@@ -1072,7 +1066,7 @@ function makePublicBaseRollupHints(seed = 1) {
   return PublicBaseRollupHints.from({
     startSpongeBlob: makeSpongeBlob(seed),
     lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x1000),
-    archiveRootMembershipWitness: makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x2000),
+    anchorBlockArchiveSiblingPath: makeSiblingPath(seed + 0x2000, ARCHIVE_HEIGHT),
     contractClassLogsFields: makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x3000),
     proverId: fr(seed + 0x4000),
   });
@@ -1085,21 +1079,13 @@ export function makePrivateTxBaseRollupPrivateInputs(seed = 0) {
   });
 }
 
-function makeAvmProofData(seed = 1) {
-  return new AvmProofData(
-    makeAvmCircuitPublicInputs(seed),
-    makeRecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, seed + 0x100),
-    makeVkData(seed + 0x200),
-  );
-}
-
 export function makePublicTxBaseRollupPrivateInputs(seed = 0) {
   const publicTubeProofData = makeProofData(
     seed,
     makePrivateToPublicKernelCircuitPublicInputs,
     RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   );
-  const avmProofData = makeAvmProofData(seed + 0x100);
+  const avmProofData = makeProofData(seed + 0x100, makeAvmCircuitPublicInputs, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
   const hints = makePublicBaseRollupHints(seed + 0x200);
 
   return PublicTxBaseRollupPrivateInputs.from({
@@ -1629,6 +1615,7 @@ export async function makeBloatedProcessedTx({
     // Create avm output.
     const avmOutput = AvmCircuitPublicInputs.empty();
     // Assign data from hints.
+    avmOutput.protocolContractTreeRoot = protocolContractTreeRoot;
     avmOutput.startTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
     avmOutput.endTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
     // Assign data from private.
@@ -1671,6 +1658,7 @@ export async function makeBloatedProcessedTx({
       i => new PublicDataWrite(new Fr(i), new Fr(i + 10)),
       seed + 0x2000,
     );
+    avmOutput.accumulatedDataArrayLengths = avmOutput.accumulatedData.getArrayLengths();
     avmOutput.gasSettings = gasSettings;
 
     const avmCircuitInputs = await makeAvmCircuitInputs(seed + 0x3000, { publicInputs: avmOutput });

package/dest/avm/public_data_hint.d.ts

@@ -1,16 +0,0 @@
-import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-export declare class PublicDataHint {
-    leafSlot: Fr;
-    value: Fr;
-    membershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
-    leafPreimage: PublicDataTreeLeafPreimage;
-    constructor(leafSlot: Fr, value: Fr, membershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>, leafPreimage: PublicDataTreeLeafPreimage);
-    static empty(): PublicDataHint;
-    static fromBuffer(buffer: Buffer | BufferReader): PublicDataHint;
-    toBuffer(): Buffer<ArrayBufferLike>;
-}
-//# sourceMappingURL=public_data_hint.d.ts.map

package/dest/avm/public_data_hint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"public_data_hint.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_hint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE/D,qBAAa,cAAc;IAEhB,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE,EAAE;IACT,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IACpE,YAAY,EAAE,0BAA0B;gBAHxC,QAAQ,EAAE,EAAE,EACZ,KAAK,EAAE,EAAE,EACT,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,EACpE,YAAY,EAAE,0BAA0B;IAGjD,MAAM,CAAC,KAAK;IASZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAU/C,QAAQ;CAGT"}

package/dest/avm/public_data_hint.js

@@ -1,27 +0,0 @@
-import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-export class PublicDataHint {
-    leafSlot;
-    value;
-    membershipWitness;
-    leafPreimage;
-    constructor(leafSlot, value, membershipWitness, leafPreimage){
-        this.leafSlot = leafSlot;
-        this.value = value;
-        this.membershipWitness = membershipWitness;
-        this.leafPreimage = leafPreimage;
-    }
-    static empty() {
-        return new PublicDataHint(Fr.ZERO, Fr.ZERO, MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT), PublicDataTreeLeafPreimage.empty());
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new PublicDataHint(reader.readObject(Fr), reader.readObject(Fr), MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT), reader.readObject(PublicDataTreeLeafPreimage));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.leafSlot, this.value, this.membershipWitness, this.leafPreimage);
-    }
-}

package/dest/rollup/state_diff_hints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"state_diff_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/state_diff_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,qCAAqC,EACrC,qCAAqC,EACrC,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAEtF;;GAEG;AACH,qBAAa,yBAAyB;IAElC;;;OAGG;IACI,6BAA6B,EAAE,KAAK,CAAC,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAChG;;;OAGG;IACI,uCAAuC,EAAE,KAAK,CACnD,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAC/C,OAAO,qBAAqB,CAC7B;IACD;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAChE;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,qBAAqB,CAAC;IAC1E;;OAEG;IACI,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qCAAqC,CAAC;IAC1F;;OAEG;IACI,2BAA2B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qCAAqC,CAAC;IAE3F;;OAEG;IACI,uBAAuB,EAAE,0BAA0B;IAC1D;;OAEG;IACI,gCAAgC,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IAC1F;;OAEG;IACI,mBAAmB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,uBAAuB,CAAC;;IAzCrE;;;OAGG;IACI,6BAA6B,EAAE,KAAK,CAAC,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAChG;;;OAGG;IACI,uCAAuC,EAAE,KAAK,CACnD,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAC/C,OAAO,qBAAqB,CAC7B;IACD;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAChE;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,qBAAqB,CAAC;IAC1E;;OAEG;IACI,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qCAAqC,CAAC;IAC1F;;OAEG;IACI,2BAA2B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qCAAqC,CAAC;IAE3F;;OAEG;IACI,uBAAuB,EAAE,0BAA0B;IAC1D;;OAEG;IACI,gCAAgC,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IAC1F;;OAEG;IACI,mBAAmB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,uBAAuB,CAAC;IAGvE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,yBAAyB;IAInF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,yBAAyB,CAAC;IAc5D;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,yBAAyB;IAiB3E,MAAM,CAAC,KAAK;CAab"}

package/dest/rollup/state_diff_hints.js

@@ -1,85 +0,0 @@
-import { MAX_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
-/**
- * Hints used while proving state diff validity for the private base rollup.
- */ export class PrivateBaseStateDiffHints {
-    nullifierPredecessorPreimages;
-    nullifierPredecessorMembershipWitnesses;
-    sortedNullifiers;
-    sortedNullifierIndexes;
-    noteHashSubtreeSiblingPath;
-    nullifierSubtreeSiblingPath;
-    feeWriteLowLeafPreimage;
-    feeWriteLowLeafMembershipWitness;
-    feeWriteSiblingPath;
-    constructor(/**
-     * The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
-     * See `StandardIndexedTree.batchInsert` function for more details.
-     */ nullifierPredecessorPreimages, /**
-     * Membership witnesses for the nullifiers which need to be updated to perform the batch insertion of the new
-     * nullifiers.
-     */ nullifierPredecessorMembershipWitnesses, /**
-     * The nullifiers to be inserted in the tree, sorted high to low.
-     */ sortedNullifiers, /**
-     * The indexes of the sorted nullifiers to the original ones.
-     */ sortedNullifierIndexes, /**
-     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
-     */ noteHashSubtreeSiblingPath, /**
-     * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
-     */ nullifierSubtreeSiblingPath, /**
-     * Low leaf for the fee write in the public data tree.
-     */ feeWriteLowLeafPreimage, /**
-     * Membership witness for the low leaf for the fee write in the public data tree.
-     */ feeWriteLowLeafMembershipWitness, /**
-     * Sibling path "pointing to" where the fee write should be inserted into the public data tree.
-     */ feeWriteSiblingPath){
-        this.nullifierPredecessorPreimages = nullifierPredecessorPreimages;
-        this.nullifierPredecessorMembershipWitnesses = nullifierPredecessorMembershipWitnesses;
-        this.sortedNullifiers = sortedNullifiers;
-        this.sortedNullifierIndexes = sortedNullifierIndexes;
-        this.noteHashSubtreeSiblingPath = noteHashSubtreeSiblingPath;
-        this.nullifierSubtreeSiblingPath = nullifierSubtreeSiblingPath;
-        this.feeWriteLowLeafPreimage = feeWriteLowLeafPreimage;
-        this.feeWriteLowLeafMembershipWitness = feeWriteLowLeafMembershipWitness;
-        this.feeWriteSiblingPath = feeWriteSiblingPath;
-    }
-    static from(fields) {
-        return new PrivateBaseStateDiffHints(...PrivateBaseStateDiffHints.getFields(fields));
-    }
-    static getFields(fields) {
-        return [
-            fields.nullifierPredecessorPreimages,
-            fields.nullifierPredecessorMembershipWitnesses,
-            fields.sortedNullifiers,
-            fields.sortedNullifierIndexes,
-            fields.noteHashSubtreeSiblingPath,
-            fields.nullifierSubtreeSiblingPath,
-            fields.feeWriteLowLeafPreimage,
-            fields.feeWriteLowLeafMembershipWitness,
-            fields.feeWriteSiblingPath
-        ];
-    }
-    /**
-   * Serializes the state diff hints to a buffer.
-   * @returns A buffer of the serialized state diff hints.
-   */ toBuffer() {
-        return serializeToBuffer(...PrivateBaseStateDiffHints.getFields(this));
-    }
-    /**
-   * Deserializes the state diff hints from a buffer.
-   * @param buffer - A buffer to deserialize from.
-   * @returns A new PrivateBaseStateDiffHints instance.
-   */ static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new PrivateBaseStateDiffHints(reader.readArray(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage), reader.readArray(MAX_NULLIFIERS_PER_TX, {
-            fromBuffer: (buffer)=>MembershipWitness.fromBuffer(buffer, NULLIFIER_TREE_HEIGHT)
-        }), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readNumbers(MAX_NULLIFIERS_PER_TX), reader.readArray(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, Fr), reader.readArray(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, Fr), reader.readObject(PublicDataTreeLeafPreimage), MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT), reader.readArray(PUBLIC_DATA_TREE_HEIGHT, Fr));
-    }
-    static empty() {
-        return new PrivateBaseStateDiffHints(makeTuple(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage.empty), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>MembershipWitness.empty(NULLIFIER_TREE_HEIGHT)), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>0), makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, Fr.zero), makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, Fr.zero), PublicDataTreeLeafPreimage.empty(), MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT), makeTuple(PUBLIC_DATA_TREE_HEIGHT, Fr.zero));
-    }
-}

package/src/avm/public_data_hint.ts

@@ -1,38 +0,0 @@
-import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-
-import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-
-export class PublicDataHint {
-  constructor(
-    public leafSlot: Fr,
-    public value: Fr,
-    public membershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>,
-    public leafPreimage: PublicDataTreeLeafPreimage,
-  ) {}
-
-  static empty() {
-    return new PublicDataHint(
-      Fr.ZERO,
-      Fr.ZERO,
-      MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT),
-      PublicDataTreeLeafPreimage.empty(),
-    );
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new PublicDataHint(
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT),
-      reader.readObject(PublicDataTreeLeafPreimage),
-    );
-  }
-
-  toBuffer() {
-    return serializeToBuffer(this.leafSlot, this.value, this.membershipWitness, this.leafPreimage);
-  }
-}