chore(txe): no custom public merkle db

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

@@ -35,7 +35,6 @@ import {
 } from '@aztec/simulator/server';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TX_ERROR_EXISTING_NULLIFIER, type Tx } from '@aztec/stdlib/tx';
-import type { TelemetryClient } from '@aztec/telemetry-client';
 
 import { jest } from '@jest/globals';
 import 'jest-extended';
@@ -644,15 +643,7 @@ class TestPublicProcessorFactory extends PublicProcessorFactory {
     globalVariables: GlobalVariables,
     doMerkleOperations: boolean,
     skipFeeEnforcement: boolean,
-    telemetryClient?: TelemetryClient,
   ) {
-    return new TestPublicTxSimulator(
-      treesDB,
-      contractsDB,
-      globalVariables,
-      doMerkleOperations,
-      skipFeeEnforcement,
-      telemetryClient,
-    );
+    return new TestPublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement);
   }
 }

yarn-project/simulator/src/public/public_db_sources.ts

@@ -393,7 +393,7 @@ class ForwardMerkleTree implements MerkleTreeWriteOperations {
 export class PublicTreesDB extends ForwardMerkleTree implements PublicStateDBInterface {
   private logger = createLogger('simulator:public-trees-db');
 
-  constructor(private readonly db: MerkleTreeWriteOperations) {
+  constructor(db: MerkleTreeWriteOperations) {
     super(db);
   }
 

yarn-project/simulator/src/public/public_processor/public_processor.ts

@@ -67,7 +67,6 @@ export class PublicProcessorFactory {
       globalVariables,
       /*doMerkleOperations=*/ true,
       skipFeeEnforcement,
-      this.telemetryClient,
     );
 
     return new PublicProcessor(
@@ -86,15 +85,14 @@ export class PublicProcessorFactory {
     globalVariables: GlobalVariables,
     doMerkleOperations: boolean,
     skipFeeEnforcement: boolean,
-    telemetryClient: TelemetryClient,
   ): PublicTxSimulator {
     return new TelemetryPublicTxSimulator(
       treesDB,
       contractsDB,
       globalVariables,
       doMerkleOperations,
       skipFeeEnforcement,
-      telemetryClient,
+      this.telemetryClient,
     );
   }
 }

yarn-project/txe/src/oracle/txe_oracle.ts

@@ -46,6 +46,7 @@ import { createTxForPublicCalls } from '@aztec/simulator/public/fixtures';
 import {
   ExecutionError,
   PublicContractsDB,
+  PublicTreesDB,
   type PublicTxResult,
   PublicTxSimulator,
   createSimulationError,
@@ -112,7 +113,6 @@ import { ForkCheckpoint, NativeWorldStateService } from '@aztec/world-state/nati
 import { TXENode } from '../node/txe_node.js';
 import { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
-import { TXEPublicTreesDB } from '../util/txe_public_dbs.js';
 
 export class TXE implements TypedOracle {
   private blockNumber = 1;
@@ -945,7 +945,7 @@ export class TXE implements TypedOracle {
     // See note at revert below.
     const checkpoint = await ForkCheckpoint.new(db);
     try {
-      const treesDB = new TXEPublicTreesDB(db, this);
+      const treesDB = new PublicTreesDB(db);
       const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(this));
       const simulator = new PublicTxSimulator(treesDB, contractsDB, globalVariables, /*doMerkleOperations=*/ true);