Remove anys in getSnapshot

yarn-project/end-to-end/src/integration_l1_publisher.test.ts

@@ -428,8 +428,15 @@ describe('L1Publisher integration', () => {
 
       const treeHeight = Math.ceil(Math.log2(newL2ToL1MsgsArray.length));
 
-      const tree = new StandardTree(openTmpStore(true), new SHA256Trunc(), 'temp_outhash_sibling_path', treeHeight);
-      await tree.appendLeaves(newL2ToL1MsgsArray.map(l2ToL1Msg => l2ToL1Msg.toBuffer()));
+      const tree = new StandardTree(
+        openTmpStore(true),
+        new SHA256Trunc(),
+        'temp_outhash_sibling_path',
+        treeHeight,
+        0n,
+        Fr,
+      );
+      await tree.appendLeaves(newL2ToL1MsgsArray);
 
       const expectedRoot = tree.getRoot(true);
       const [actualRoot] = await outbox.read.roots([block.header.globalVariables.blockNumber.toBigInt()]);

yarn-project/merkle-tree/src/interfaces/indexed_tree.ts

@@ -1,7 +1,9 @@
 import { SiblingPath } from '@aztec/circuit-types';
 import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 
+import { IndexedTreeSnapshot, TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js';
 import { AppendOnlyTree } from './append_only_tree.js';
+import { MerkleTree } from './merkle_tree.js';
 
 /**
  * Factory for creating leaf preimages.
@@ -73,7 +75,10 @@ export interface BatchInsertionResult<TreeHeight extends number, SubtreeSiblingP
 /**
  * Indexed merkle tree.
  */
-export interface IndexedTree extends AppendOnlyTree<Buffer> {
+export interface IndexedTree
+  extends MerkleTree<Buffer>,
+    TreeSnapshotBuilder<IndexedTreeSnapshot>,
+    Omit<AppendOnlyTree<Buffer>, keyof TreeSnapshotBuilder<TreeSnapshot<Buffer>>> {
   /**
    * Finds the index of the largest leaf whose value is less than or equal to the provided value.
    * @param newValue - The new value to be inserted into the tree.

yarn-project/prover-client/src/orchestrator/block-building-helpers.ts

@@ -94,7 +94,7 @@ export async function buildBaseRollupInput(
 
   // Update the note hash trees with the new items being inserted to get the new roots
   // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
-  const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value.toBuffer());
+  const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value);
   await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
 
   // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
@@ -214,10 +214,7 @@ export async function executeRootRollupCircuit(
   const rootInput = await getRootRollupInput(...left, ...right, l1ToL2Roots, newL1ToL2Messages, db);
 
   // Update the local trees to include the new l1 to l2 messages
-  await db.appendLeaves(
-    MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
-    newL1ToL2Messages.map(m => m.toBuffer()),
-  );
+  await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, newL1ToL2Messages);
 
   // Simulate and get proof for the root circuit
   const rootOutput = await simulator.rootRollupCircuit(rootInput);

yarn-project/prover-client/src/orchestrator/orchestrator.test.ts

@@ -136,7 +136,7 @@ describe('prover/tx-prover', () => {
             .sort(sideEffectCmp),
           SideEffect.empty(),
           MAX_NEW_NOTE_HASHES_PER_TX,
-        ).map(l => l.value.toBuffer()),
+        ).map(l => l.value),
       ),
     );
     await expectsDb.batchInsert(

yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts

@@ -114,8 +114,10 @@ describe('server_world_state_synchronizer', () => {
       new SHA256Trunc(),
       'empty_subtree_in_hash',
       L1_TO_L2_MSG_SUBTREE_HEIGHT,
+      0n,
+      Fr,
     );
-    await tree.appendLeaves(l1ToL2Messages.map(msg => msg.toBuffer()));
+    await tree.appendLeaves(l1ToL2Messages);
     inHash = tree.getRoot(true);
   });
 

yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts

@@ -245,8 +245,10 @@ export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
       new SHA256Trunc(),
       'temp_in_hash_check',
       L1_TO_L2_MSG_SUBTREE_HEIGHT,
+      0n,
+      Fr,
     );
-    await tree.appendLeaves(l1ToL2Messages.map(msg => msg.toBuffer()));
+    await tree.appendLeaves(l1ToL2Messages);
 
     if (!tree.getRoot(true).equals(inHash)) {
       throw new Error('Obtained L1 to L2 messages failed to be hashed to the block inHash');

yarn-project/world-state/src/world-state-db/merkle_trees.ts

@@ -503,11 +503,9 @@ export class MerkleTrees implements MerkleTreeDb {
 
   public async getSnapshot(blockNumber: number): Promise<TreeSnapshots> {
     return {
-      [MerkleTreeId.NULLIFIER_TREE]: (await this.trees[MerkleTreeId.NULLIFIER_TREE].getSnapshot(blockNumber)) as any,
+      [MerkleTreeId.NULLIFIER_TREE]: await this.trees[MerkleTreeId.NULLIFIER_TREE].getSnapshot(blockNumber),
       [MerkleTreeId.NOTE_HASH_TREE]: await this.trees[MerkleTreeId.NOTE_HASH_TREE].getSnapshot(blockNumber),
-      [MerkleTreeId.PUBLIC_DATA_TREE]: (await this.trees[MerkleTreeId.PUBLIC_DATA_TREE].getSnapshot(
-        blockNumber,
-      )) as any,
+      [MerkleTreeId.PUBLIC_DATA_TREE]: await this.trees[MerkleTreeId.PUBLIC_DATA_TREE].getSnapshot(blockNumber),
       [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.trees[MerkleTreeId.L1_TO_L2_MESSAGE_TREE].getSnapshot(
         blockNumber,
       ),