refactor: remove multiple public dbs

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -761,7 +761,7 @@ export class AztecNodeService implements AztecNode {
     const txValidators: TxValidator<Tx | ProcessedTx>[] = [
       new DataTxValidator(),
       new MetadataTxValidator(new Fr(this.l1ChainId), new Fr(blockNumber)),
-      new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest())),
+      new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest(), this.contractDataSource)),
     ];
 
     if (!isSimulation) {

yarn-project/bb-prover/src/avm_proving.test.ts

@@ -1,12 +1,11 @@
 import { AvmCircuitInputs, AvmVerificationKeyData, FunctionSelector, Gas, GlobalVariables } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AvmSimulator, type PublicContractsDB, PublicSideEffectTrace, type PublicStateDB } from '@aztec/simulator';
+import { AvmSimulator, type PublicContractsDB, PublicSideEffectTrace, type WorldStateDB } from '@aztec/simulator';
 import {
   getAvmTestContractBytecode,
   initContext,
   initExecutionEnvironment,
-  initHostStorage,
   initPersistableStateManager,
   resolveAvmTestContractAssertionMessage,
 } from '@aztec/simulator/avm/fixtures';
@@ -70,16 +69,15 @@ const proveAndVerifyAvmTestContract = async (
   }).withAddress(environment.address);
   contractsDb.getContractInstance.mockResolvedValue(Promise.resolve(contractInstance));
 
-  const storageDb = mock<PublicStateDB>();
+  const worldStateDB = mock<WorldStateDB>();
   const storageValue = new Fr(5);
-  storageDb.storageRead.mockResolvedValue(Promise.resolve(storageValue));
+  worldStateDB.storageRead.mockResolvedValue(Promise.resolve(storageValue));
 
-  const hostStorage = initHostStorage({ contractsDb });
   const trace = new PublicSideEffectTrace(startSideEffectCounter);
-  const persistableState = initPersistableStateManager({ hostStorage, trace });
+  const persistableState = initPersistableStateManager({ worldStateDB, trace });
   const context = initContext({ env: environment, persistableState });
   const nestedCallBytecode = getAvmTestContractBytecode('add_args_return');
-  jest.spyOn(hostStorage.contractsDb, 'getBytecode').mockResolvedValue(nestedCallBytecode);
+  jest.spyOn(worldStateDB, 'getBytecode').mockResolvedValue(nestedCallBytecode);
 
   const startGas = new Gas(context.machineState.gasLeft.daGas, context.machineState.gasLeft.l2Gas);
 

yarn-project/ivc-integration/src/avm_integration.test.ts

@@ -16,12 +16,11 @@ import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { type FixedLengthArray } from '@aztec/noir-protocol-circuits-types/types';
-import { AvmSimulator, type PublicContractsDB, PublicSideEffectTrace, type PublicStateDB } from '@aztec/simulator';
+import { AvmSimulator, type PublicContractsDB, PublicSideEffectTrace, type WorldStateDB } from '@aztec/simulator';
 import {
   getAvmTestContractBytecode,
   initContext,
   initExecutionEnvironment,
-  initHostStorage,
   initPersistableStateManager,
   resolveAvmTestContractAssertionMessage,
 } from '@aztec/simulator/avm/fixtures';
@@ -146,16 +145,15 @@ const proveAvmTestContract = async (
   }).withAddress(environment.address);
   contractsDb.getContractInstance.mockResolvedValue(await Promise.resolve(contractInstance));
 
-  const storageDb = mock<PublicStateDB>();
+  const worldStateDB = mock<WorldStateDB>();
   const storageValue = new Fr(5);
-  storageDb.storageRead.mockResolvedValue(await Promise.resolve(storageValue));
+  worldStateDB.storageRead.mockResolvedValue(await Promise.resolve(storageValue));
 
-  const hostStorage = initHostStorage({ contractsDb });
   const trace = new PublicSideEffectTrace(startSideEffectCounter);
-  const persistableState = initPersistableStateManager({ hostStorage, trace });
+  const persistableState = initPersistableStateManager({ worldStateDB, trace });
   const context = initContext({ env: environment, persistableState });
   const nestedCallBytecode = getAvmTestContractBytecode('add_args_return');
-  jest.spyOn(hostStorage.contractsDb, 'getBytecode').mockResolvedValue(nestedCallBytecode);
+  jest.spyOn(worldStateDB, 'getBytecode').mockResolvedValue(nestedCallBytecode);
 
   const startGas = new Gas(context.machineState.gasLeft.daGas, context.machineState.gasLeft.l2Gas);
 

yarn-project/prover-client/src/mocks/test_context.ts

@@ -13,15 +13,14 @@ import { type Fr } from '@aztec/foundation/fields';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import {
-  type ContractsDataSourcePublicDB,
   type PublicExecutionResult,
   PublicExecutionResultBuilder,
   type PublicExecutor,
   PublicProcessor,
   RealPublicKernelCircuitSimulator,
   type SimulationProvider,
   WASMSimulator,
-  type WorldStatePublicDB,
+  type WorldStateDB,
 } from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { MerkleTrees } from '@aztec/world-state';
@@ -41,8 +40,7 @@ import { getEnvironmentConfig, getSimulationProvider, makeGlobals } from './fixt
 export class TestContext {
   constructor(
     public publicExecutor: MockProxy<PublicExecutor>,
-    public publicContractsDB: MockProxy<ContractsDataSourcePublicDB>,
-    public publicWorldStateDB: MockProxy<WorldStatePublicDB>,
+    public worldStateDB: MockProxy<WorldStateDB>,
     public publicProcessor: PublicProcessor,
     public simulationProvider: SimulationProvider,
     public globalVariables: GlobalVariables,
@@ -71,8 +69,7 @@ export class TestContext {
     const globalVariables = makeGlobals(blockNumber);
 
     const publicExecutor = mock<PublicExecutor>();
-    const publicContractsDB = mock<ContractsDataSourcePublicDB>();
-    const publicWorldStateDB = mock<WorldStatePublicDB>();
+    const worldStateDB = mock<WorldStateDB>();
     const publicKernel = new RealPublicKernelCircuitSimulator(new WASMSimulator());
     const telemetry = new NoopTelemetryClient();
 
@@ -94,8 +91,7 @@ export class TestContext {
       publicKernel,
       GlobalVariables.empty(),
       Header.empty(),
-      publicContractsDB,
-      publicWorldStateDB,
+      worldStateDB,
       telemetry,
     );
 
@@ -130,8 +126,7 @@ export class TestContext {
 
     return new this(
       publicExecutor,
-      publicContractsDB,
-      publicWorldStateDB,
+      worldStateDB,
       processor,
       simulationProvider,
       globalVariables,

yarn-project/sequencer-client/src/tx_validator/tx_validator_factory.ts

@@ -2,7 +2,7 @@ import { type AllowedElement, type ProcessedTx, type Tx, type TxValidator } from
 import { type GlobalVariables } from '@aztec/circuits.js';
 import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator } from '@aztec/p2p';
 import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
-import { WorldStateDB, WorldStatePublicDB } from '@aztec/simulator';
+import { WorldStateDB } from '@aztec/simulator';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 
@@ -17,16 +17,17 @@ export class TxValidatorFactory {
   ) {}
 
   validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): TxValidator<Tx> {
+    const worldStateDB = new WorldStateDB(this.merkleTreeDb, this.contractDataSource);
     return new AggregateTxValidator(
       new DataTxValidator(),
       new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber),
-      new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb)),
+      new DoubleSpendTxValidator(worldStateDB),
       new PhasesTxValidator(this.contractDataSource, setupAllowList),
-      new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), FeeJuiceAddress, this.enforceFees),
+      new GasTxValidator(worldStateDB, FeeJuiceAddress, this.enforceFees),
     );
   }
 
   validatorForProcessedTxs(): TxValidator<ProcessedTx> {
-    return new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb));
+    return new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb, this.contractDataSource));
   }
 }

yarn-project/simulator/src/avm/avm_simulator.test.ts

@@ -10,6 +10,7 @@ import { type Fieldable } from '@aztec/foundation/serialize';
 import { randomInt } from 'crypto';
 import { mock } from 'jest-mock-extended';
 
+import { type WorldStateDB } from '../public/public_db_sources.js';
 import { type PublicSideEffectTraceInterface } from '../public/side_effect_trace_interface.js';
 import { type AvmContext } from './avm_context.js';
 import { type AvmExecutionEnvironment } from './avm_execution_environment.js';
@@ -22,15 +23,13 @@ import {
   initContext,
   initExecutionEnvironment,
   initGlobalVariables,
-  initHostStorage,
   initMachineState,
   initPersistableStateManager,
   randomMemoryBytes,
   randomMemoryFields,
   randomMemoryUint64s,
   resolveAvmTestContractAssertionMessage,
 } from './fixtures/index.js';
-import { type HostStorage } from './journal/host_storage.js';
 import { type AvmPersistableStateManager } from './journal/journal.js';
 import { Add, CalldataCopy, Return, Set } from './opcodes/index.js';
 import { encodeToBytecode } from './serialization/bytecode_serialization.js';
@@ -395,14 +394,14 @@ describe('AVM simulator: transpiled Noir contracts', () => {
     const value0 = new Fr(420);
     const value1 = new Fr(69);
 
-    let hostStorage: HostStorage;
+    let worldStateDB: WorldStateDB;
     let trace: PublicSideEffectTraceInterface;
     let persistableState: AvmPersistableStateManager;
 
     beforeEach(() => {
-      hostStorage = initHostStorage();
+      worldStateDB = mock<WorldStateDB>();
       trace = mock<PublicSideEffectTraceInterface>();
-      persistableState = initPersistableStateManager({ hostStorage, trace });
+      persistableState = initPersistableStateManager({ worldStateDB, trace });
     });
 
     const createContext = (calldata: Fr[] = []) => {
@@ -429,7 +428,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext(calldata);
         const bytecode = getAvmTestContractBytecode('note_hash_exists');
         if (mockAtLeafIndex !== undefined) {
-          mockNoteHashExists(hostStorage, mockAtLeafIndex, value0);
+          mockNoteHashExists(worldStateDB, mockAtLeafIndex, value0);
         }
 
         const results = await new AvmSimulator(context).executeBytecode(bytecode);
@@ -454,7 +453,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const bytecode = getAvmTestContractBytecode('nullifier_exists');
 
         if (exists) {
-          mockNullifierExists(hostStorage, leafIndex, value0);
+          mockNullifierExists(worldStateDB, leafIndex, value0);
         }
 
         const results = await new AvmSimulator(context).executeBytecode(bytecode);
@@ -493,7 +492,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext(calldata);
         const bytecode = getAvmTestContractBytecode('l1_to_l2_msg_exists');
         if (mockAtLeafIndex !== undefined) {
-          mockL1ToL2MessageExists(hostStorage, mockAtLeafIndex, value0, /*valueAtOtherIndices=*/ value1);
+          mockL1ToL2MessageExists(worldStateDB, mockAtLeafIndex, value0, /*valueAtOtherIndices=*/ value1);
         }
 
         const results = await new AvmSimulator(context).executeBytecode(bytecode);
@@ -631,7 +630,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
 
       it('Should read value in storage (single)', async () => {
         const context = createContext();
-        mockStorageRead(hostStorage, value0);
+        mockStorageRead(worldStateDB, value0);
 
         const bytecode = getAvmTestContractBytecode('read_storage_single');
 
@@ -694,7 +693,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
           [listSlot0.toBigInt(), value0],
           [listSlot1.toBigInt(), value1],
         ]);
-        mockStorageReadWithMap(hostStorage, mockedStorage);
+        mockStorageReadWithMap(worldStateDB, mockedStorage);
 
         const bytecode = getAvmTestContractBytecode('read_storage_list');
 
@@ -768,7 +767,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const calldata = [storageAddress];
 
         const context = createContext(calldata);
-        mockStorageRead(hostStorage, value0);
+        mockStorageRead(worldStateDB, value0);
         const bytecode = getAvmTestContractBytecode('read_storage_map');
 
         const results = await new AvmSimulator(context).executeBytecode(bytecode);
@@ -800,7 +799,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
           initializationHash: new Fr(0x101112),
           publicKeysHash: new Fr(0x161718),
         };
-        mockGetContractInstance(hostStorage, contractInstance);
+        mockGetContractInstance(worldStateDB, contractInstance);
 
         const bytecode = getAvmTestContractBytecode('test_get_contract_instance_raw');
 
@@ -844,7 +843,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext(calldata);
         const callBytecode = getAvmTestContractBytecode('nested_call_to_add');
         const addBytecode = getAvmTestContractBytecode('add_args_return');
-        mockGetBytecode(hostStorage, addBytecode);
+        mockGetBytecode(worldStateDB, addBytecode);
         const nestedTrace = mock<PublicSideEffectTraceInterface>();
         mockTraceFork(trace, nestedTrace);
 
@@ -860,7 +859,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext(calldata);
         const callBytecode = getAvmTestContractBytecode('nested_static_call_to_add');
         const addBytecode = getAvmTestContractBytecode('add_args_return');
-        mockGetBytecode(hostStorage, addBytecode);
+        mockGetBytecode(worldStateDB, addBytecode);
         const nestedTrace = mock<PublicSideEffectTraceInterface>();
         mockTraceFork(trace, nestedTrace);
 
@@ -877,7 +876,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext(calldata);
         const callBytecode = getAvmTestContractBytecode('nested_call_to_add_with_gas');
         const addBytecode = getAvmTestContractBytecode('add_args_return');
-        mockGetBytecode(hostStorage, addBytecode);
+        mockGetBytecode(worldStateDB, addBytecode);
         mockTraceFork(trace);
 
         const results = await new AvmSimulator(context).executeBytecode(callBytecode);
@@ -896,7 +895,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const context = createContext();
         const callBytecode = getAvmTestContractBytecode('nested_static_call_to_set_storage');
         const nestedBytecode = getAvmTestContractBytecode('set_storage_single');
-        mockGetBytecode(hostStorage, nestedBytecode);
+        mockGetBytecode(worldStateDB, nestedBytecode);
         mockTraceFork(trace);
 
         const results = await new AvmSimulator(context).executeBytecode(callBytecode);
@@ -920,7 +919,7 @@ describe('AVM simulator: transpiled Noir contracts', () => {
         const callBytecode = getAvmTestContractBytecode('nested_call_to_add');
         // We actually don't pass the function ADD, but it's ok because the signature is the same.
         const nestedBytecode = getAvmTestContractBytecode('assert_same');
-        mockGetBytecode(hostStorage, nestedBytecode);
+        mockGetBytecode(worldStateDB, nestedBytecode);
 
         const results = await new AvmSimulator(context).executeBytecode(callBytecode);
         expect(results.reverted).toBe(true); // The outer call should revert.

yarn-project/simulator/src/avm/fixtures/index.ts

@@ -10,20 +10,13 @@ import { strict as assert } from 'assert';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
-import {
-  type CommitmentsDB,
-  type PublicContractsDB,
-  type PublicStateDB,
-  resolveAssertionMessage,
-  traverseCauseChain,
-} from '../../index.js';
+import { type WorldStateDB, resolveAssertionMessage, traverseCauseChain } from '../../index.js';
 import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmContextInputs, AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { Field, Uint8, Uint64 } from '../avm_memory_types.js';
 import { type AvmRevertReason } from '../errors.js';
-import { HostStorage } from '../journal/host_storage.js';
 import { AvmPersistableStateManager } from '../journal/journal.js';
 import { NullifierManager } from '../journal/nullifiers.js';
 import { PublicStorage } from '../journal/public_storage.js';
@@ -43,32 +36,19 @@ export function initContext(overrides?: {
   );
 }
 
-/** Creates an empty host storage with mocked dbs. */
-export function initHostStorage(overrides?: {
-  publicDb?: PublicStateDB;
-  contractsDb?: PublicContractsDB;
-  commitmentsDb?: CommitmentsDB;
-}): HostStorage {
-  return new HostStorage(
-    overrides?.publicDb || mock<PublicStateDB>(),
-    overrides?.contractsDb || mock<PublicContractsDB>(),
-    overrides?.commitmentsDb || mock<CommitmentsDB>(),
-  );
-}
-
 /** Creates an empty state manager with mocked host storage. */
 export function initPersistableStateManager(overrides?: {
-  hostStorage?: HostStorage;
+  worldStateDB?: WorldStateDB;
   trace?: PublicSideEffectTraceInterface;
   publicStorage?: PublicStorage;
   nullifiers?: NullifierManager;
 }): AvmPersistableStateManager {
-  const hostStorage = overrides?.hostStorage || initHostStorage();
+  const worldStateDB = overrides?.worldStateDB || mock<WorldStateDB>();
   return new AvmPersistableStateManager(
-    hostStorage,
+    worldStateDB,
     overrides?.trace || mock<PublicSideEffectTraceInterface>(),
-    overrides?.publicStorage || new PublicStorage(hostStorage.publicStateDb),
-    overrides?.nullifiers || new NullifierManager(hostStorage.commitmentsDb),
+    overrides?.publicStorage || new PublicStorage(worldStateDB),
+    overrides?.nullifiers || new NullifierManager(worldStateDB),
   );
 }
 

yarn-project/simulator/src/avm/journal/index.ts

@@ -1,2 +1 @@
-export * from './host_storage.js';
 export * from './journal.js';