fixup! refactor: rename addContracts -> addContractsFromLogs on PublicContractsDB

- Rename addContractOverrides -> addContracts for symmetry with addContractsFromLogs
- Add createContractsDB() to factory; accept contractsDB as param in create()
  so callers can populate it before construction without exposing it from processor
- Revert contractsDB to protected on PublicProcessor

Author: dbanks12

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

@@ -1382,10 +1382,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
           maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads,
         }),
       });
-      const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
+      const contractsDB = publicProcessorFactory.createContractsDB();
       if (contractOverrides) {
-        processor.contractsDB.addContractOverrides(contractOverrides);
+        contractsDB.addContracts(contractOverrides);
       }
+      const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config, contractsDB);
 
       // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
       const [processedTxs, failedTxs, _usedTxs, returns, debugLogs] = await processor.process([tx]);

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

@@ -77,8 +77,8 @@ export class PublicContractsDB implements PublicContractsDBInterface {
     this.addContractsFromLogs(contractDeploymentData.getRevertibleContractDeploymentData());
   }
 
-  /** Injects contract class and instance overrides directly into the current checkpoint. */
-  public addContractOverrides(overrides: PublicContractOverrides): void {
+  /** Inserts typed contract classes and instances directly into the current checkpoint. */
+  public addContracts(overrides: PublicContractOverrides): void {
     const currentState = this.getCurrentState();
     for (const contractClass of overrides.contractClasses ?? []) {
       currentState.addClass(contractClass.id, contractClass);

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

@@ -73,20 +73,23 @@ export class PublicProcessorFactory {
     this.log = createLogger('simulator:public-processor-factory', bindings);
   }
 
+  /** Creates a fresh PublicContractsDB backed by this factory's data source. */
+  public createContractsDB(): PublicContractsDB {
+    return new PublicContractsDB(this.contractDataSource, this.log.getBindings());
+  }
+
   /**
    * Creates a new instance of a PublicProcessor.
    * @param globalVariables - The global variables for the block being processed.
-   * @param skipFeeEnforcement - Allows disabling balance checks for fee estimations.
+   * @param contractsDB - Optional pre-populated contracts DB; a fresh one is created if omitted.
    * @returns A new instance of a PublicProcessor.
    */
   public create(
     merkleTree: MerkleTreeWriteOperations,
     globalVariables: GlobalVariables,
     config: PublicSimulatorConfig,
+    contractsDB: PublicContractsDB = this.createContractsDB(),
   ): PublicProcessor {
-    const bindings = this.log.getBindings();
-    const contractsDB = new PublicContractsDB(this.contractDataSource, bindings);
-
     const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
     const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables, config);
 
@@ -97,7 +100,7 @@ export class PublicProcessorFactory {
       publicTxSimulator,
       this.dateProvider,
       this.telemetryClient,
-      createLogger('simulator:public-processor', bindings),
+      createLogger('simulator:public-processor', this.log.getBindings()),
     );
   }
 
@@ -134,7 +137,7 @@ export class PublicProcessor implements Traceable {
   constructor(
     protected globalVariables: GlobalVariables,
     private guardedMerkleTree: GuardedMerkleTreeOperations,
-    public readonly contractsDB: PublicContractsDB,
+    protected contractsDB: PublicContractsDB,
     protected publicTxSimulator: PublicTxSimulatorInterface,
     private dateProvider: DateProvider,
     telemetryClient: TelemetryClient = getTelemetryClient(),