refactor: delete MerkleTrees implementation in JS (#11697)

Conclusion of #11420 and #11226 After swapping txe world state trees, this is a recreation of #11420 without txe changes.
AztecProtocol · Feb 3, 2025 · 1db7b78 · 1db7b78
1 parent a68369f
commit 1db7b78
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 1,439 deletions.
diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts
@@ -1,8 +1,7 @@
 import { type MerkleTreeWriteOperations } from '@aztec/circuit-types';
 import { type AvmCircuitInputs, AztecAddress, VerificationKeyData } from '@aztec/circuits.js';
-import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { PublicTxSimulationTester, type TestEnqueuedCall } from '@aztec/simulator/public/fixtures';
-import { MerkleTrees } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
@@ -37,7 +36,7 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
 
     const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
+    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     return new AvmProvingTester(
       bbWorkingDirectory,
       checkCircuitOnly,
@@ -122,7 +121,7 @@ export class AvmProvingTesterV2 extends PublicTxSimulationTester {
     const bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
 
     const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
+    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     return new AvmProvingTesterV2(bbWorkingDirectory, contractDataSource, merkleTrees, skipContractDeployments);
   }
 

diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts
@@ -21,9 +21,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { keccak256, keccakf1600, pedersenCommit, pedersenHash, poseidon2Hash, sha256 } from '@aztec/foundation/crypto';
 import { Fq, Fr, Point } from '@aztec/foundation/fields';
 import { type Fieldable } from '@aztec/foundation/serialize';
-import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { MerkleTrees } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import { randomInt } from 'crypto';
 import { mock } from 'jest-mock-extended';
@@ -1101,9 +1099,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       trace = mock<PublicSideEffectTraceInterface>();
 
       worldStateDB = mock<WorldStateDB>();
-      const tmp = openTmpStore();
-      const telemetryClient = getTelemetryClient();
-      merkleTrees = await (await MerkleTrees.new(tmp, telemetryClient)).fork();
+      merkleTrees = await (await NativeWorldStateService.tmp()).fork();
       (worldStateDB as jest.Mocked<WorldStateDB>).getMerkleInterface.mockReturnValue(merkleTrees);
       ephemeralForest = await AvmEphemeralForest.create(worldStateDB.getMerkleInterface());
 

diff --git a/yarn-project/simulator/src/avm/avm_tree.test.ts b/yarn-project/simulator/src/avm/avm_tree.test.ts
@@ -16,9 +16,7 @@ import {
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
-import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { MerkleTrees, NativeWorldStateService } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import {
   AvmEphemeralForest,
@@ -531,8 +529,7 @@ describe('Checking forking and merging', () => {
  */
 describe('AVM Ephemeral Tree Sanity Test', () => {
   it('Should calculate the frontier correctly', async () => {
-    const store = openTmpStore(true);
-    const worldStateTrees = await MerkleTrees.new(store, getTelemetryClient());
+    const worldStateTrees = await NativeWorldStateService.tmp();
     const leaves = [];
     const numLeaves = 6;
     for (let i = 0; i < numLeaves; i++) {
@@ -557,8 +554,9 @@ describe('AVM Ephemeral Tree Sanity Test', () => {
     const expectedFrontier = [expectedFrontier0, exepctedFrontier1, expectedFrontier2];
     expect(tree.frontier).toEqual(expectedFrontier);
     // Check root
-    await worldStateTrees.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, leaves);
-    const treeInfo = await worldStateTrees.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE, true);
+    const fork = await worldStateTrees.fork();
+    await fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, leaves);
+    const treeInfo = await fork.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE);
     const localRoot = await tree.getRoot();
     expect(localRoot.toBuffer()).toEqual(treeInfo.root);
   });

diff --git a/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts b/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts
@@ -3,8 +3,7 @@ import { GasFees, GlobalVariables } from '@aztec/circuits.js';
 import { encodeArguments } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { MerkleTrees } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import { type AvmContractCallResult } from '../../avm/avm_contract_call_result.js';
 import {
@@ -40,7 +39,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
 
   static async create(skipContractDeployments = false): Promise<AvmSimulationTester> {
     const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
+    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
     const trace = new SideEffectTrace();
     const firstNullifier = new Fr(420000);

diff --git a/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts b/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts
@@ -15,9 +15,8 @@ import { type ContractArtifact, encodeArguments } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
-import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import { MerkleTrees } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import { BaseAvmSimulationTester } from '../../avm/fixtures/base_avm_simulation_tester.js';
 import { getContractFunctionArtifact, getFunctionSelector } from '../../avm/fixtures/index.js';
@@ -46,7 +45,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
 
   public static async create(skipContractDeployments = false): Promise<PublicTxSimulationTester> {
     const contractDataSource = new SimpleContractDataSource();
-    const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
+    const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
     return new PublicTxSimulationTester(contractDataSource, merkleTrees, skipContractDeployments);
   }
 

diff --git a/yarn-project/simulator/src/public/public_tx_simulator.test.ts b/yarn-project/simulator/src/public/public_tx_simulator.test.ts
@@ -36,7 +36,7 @@ import { type AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { type AppendOnlyTree, Poseidon, StandardTree, newTree } from '@aztec/merkle-tree';
 import { ProtocolContractAddress, REGISTERER_CONTRACT_CLASS_REGISTERED_TAG } from '@aztec/protocol-contracts';
-import { MerkleTrees } from '@aztec/world-state';
+import { NativeWorldStateService } from '@aztec/world-state';
 
 import { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
@@ -283,8 +283,7 @@ describe('public_tx_simulator', () => {
   };
 
   beforeEach(async () => {
-    const tmp = openTmpStore();
-    db = await (await MerkleTrees.new(tmp)).fork();
+    db = await (await NativeWorldStateService.tmp()).fork();
     worldStateDB = new WorldStateDB(db, mock<ContractDataSource>());
 
     treeStore = openTmpStore();

diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json
@@ -5,6 +5,7 @@
   "exports": {
     ".": "./dest/index.js",
     "./native": "./dest/native/index.js",
+    "./test": "./dest/test/index.js",
     "./config": "./dest/synchronizer/config.js"
   },
   "typedocOptions": {