@aztec/sequencer-client 0.15.0 → 0.16.0

package/src/simulator/public_executor.ts

@@ -1,35 +1,9 @@
-import {
-  CommitmentsDB,
-  MessageLoadOracleInputs,
-  PublicContractsDB,
-  PublicExecutor,
-  PublicStateDB,
-} from '@aztec/acir-simulator';
-import { AztecAddress, EthAddress, Fr, FunctionSelector, HistoricBlockData } from '@aztec/circuits.js';
+import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/acir-simulator';
+import { AztecAddress, EthAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
 import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
 import { ContractDataSource, ExtendedContractData, L1ToL2MessageSource, MerkleTreeId, Tx } from '@aztec/types';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-/**
- * Returns a new PublicExecutor simulator backed by the supplied merkle tree db and contract data source.
- * @param merkleTree - A merkle tree database.
- * @param contractDataSource - A contract data source.
- * @returns A new instance of a PublicExecutor.
- */
-export function getPublicExecutor(
-  merkleTree: MerkleTreeOperations,
-  publicContractsDB: PublicContractsDB,
-  l1toL2MessageSource: L1ToL2MessageSource,
-  blockData: HistoricBlockData,
-) {
-  return new PublicExecutor(
-    new WorldStatePublicDB(merkleTree),
-    publicContractsDB,
-    new WorldStateDB(merkleTree, l1toL2MessageSource),
-    blockData,
-  );
-}
-
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
@@ -95,8 +69,9 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
 /**
  * Implements the PublicStateDB using a world-state database.
  */
-class WorldStatePublicDB implements PublicStateDB {
-  private writeCache: Map<bigint, Fr> = new Map();
+export class WorldStatePublicDB implements PublicStateDB {
+  private commitedWriteCache: Map<bigint, Fr> = new Map();
+  private uncommitedWriteCache: Map<bigint, Fr> = new Map();
 
   constructor(private db: MerkleTreeOperations) {}
 
@@ -108,8 +83,14 @@ class WorldStatePublicDB implements PublicStateDB {
    */
   public async storageRead(contract: AztecAddress, slot: Fr): Promise<Fr> {
     const index = computePublicDataTreeIndex(contract, slot).value;
-    const cached = this.writeCache.get(index);
-    if (cached !== undefined) return cached;
+    const uncommited = this.uncommitedWriteCache.get(index);
+    if (uncommited !== undefined) {
+      return uncommited;
+    }
+    const commited = this.commitedWriteCache.get(index);
+    if (commited !== undefined) {
+      return commited;
+    }
     const value = await this.db.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, index);
     return value ? Fr.fromBuffer(value) : Fr.ZERO;
   }
@@ -122,7 +103,27 @@ class WorldStatePublicDB implements PublicStateDB {
    */
   public storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void> {
     const index = computePublicDataTreeIndex(contract, slot).value;
-    this.writeCache.set(index, newValue);
+    this.uncommitedWriteCache.set(index, newValue);
+    return Promise.resolve();
+  }
+
+  /**
+   * Commit the pending changes to the DB.
+   * @returns Nothing.
+   */
+  commit(): Promise<void> {
+    for (const [k, v] of this.uncommitedWriteCache) {
+      this.commitedWriteCache.set(k, v);
+    }
+    return this.rollback();
+  }
+
+  /**
+   * Rollback the pending changes.
+   * @returns Nothing.
+   */
+  rollback(): Promise<void> {
+    this.uncommitedWriteCache = new Map<bigint, Fr>();
     return Promise.resolve();
   }
 }

package/src/simulator/public_kernel.ts

@@ -7,9 +7,9 @@ import { CircuitSimulationStats } from '@aztec/types/stats';
 import { PublicKernelCircuitSimulator } from './index.js';
 
 /**
- * Implements the PublicKernelCircuitSimulator by calling the wasm implementations of the circuits.
+ * Implements the PublicKernelCircuitSimulator.
  */
-export class WasmPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
+export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
   private log = createDebugLogger('aztec:public-kernel-simulator');
 
   /**
@@ -18,7 +18,9 @@ export class WasmPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
    * @returns The public inputs as outputs of the simulation.
    */
   public async publicKernelCircuitPrivateInput(input: PublicKernelInputs): Promise<PublicKernelPublicInputs> {
-    if (!input.previousKernel.publicInputs.isPrivate) throw new Error(`Expected private kernel previous inputs`);
+    if (!input.previousKernel.publicInputs.isPrivate) {
+      throw new Error(`Expected private kernel previous inputs`);
+    }
     const [duration, result] = await elapsed(() => executePublicKernelPrivatePrevious(input));
     this.log(`Simulated public kernel circuit with private input`, {
       eventName: 'circuit-simulation',
@@ -36,7 +38,9 @@ export class WasmPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
    * @returns The public inputs as outputs of the simulation.
    */
   public async publicKernelCircuitNonFirstIteration(input: PublicKernelInputs): Promise<PublicKernelPublicInputs> {
-    if (input.previousKernel.publicInputs.isPrivate) throw new Error(`Expected public kernel previous inputs`);
+    if (input.previousKernel.publicInputs.isPrivate) {
+      throw new Error(`Expected public kernel previous inputs`);
+    }
     const [duration, result] = await elapsed(() => executePublicKernelPublicPrevious(input));
     this.log(`Simulated public kernel circuit non-first iteration`, {
       eventName: 'circuit-simulation',

package/src/simulator/rollup.ts

@@ -1,24 +1,21 @@
 import {
   BaseOrMergeRollupPublicInputs,
   BaseRollupInputs,
-  CircuitError,
-  CircuitsWasm,
   MergeRollupInputs,
   RootRollupInputs,
   RootRollupPublicInputs,
-  baseRollupSim,
 } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
-import { executeMergeRollup, executeRootRollup } from '@aztec/noir-protocol-circuits';
+import { executeBaseRollup, executeMergeRollup, executeRootRollup } from '@aztec/noir-protocol-circuits';
 import { CircuitSimulationStats } from '@aztec/types/stats';
 
 import { RollupSimulator } from './index.js';
 
 /**
- * Implements the rollup circuit simulator using the wasm circuits implementation.
+ * Implements the rollup circuit simulator.
  */
-export class WasmRollupCircuitSimulator implements RollupSimulator {
+export class RealRollupCircuitSimulator implements RollupSimulator {
   private log = createDebugLogger('aztec:rollup-simulator');
 
   /**
@@ -27,11 +24,7 @@ export class WasmRollupCircuitSimulator implements RollupSimulator {
    * @returns The public inputs as outputs of the simulation.
    */
   public async baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
-    const wasm = await CircuitsWasm.get();
-    const [duration, result] = await elapsed(() => baseRollupSim(wasm, input));
-    if (result instanceof CircuitError) {
-      throw new CircuitError(result.code, result.message);
-    }
+    const [duration, result] = await elapsed(() => executeBaseRollup(input));
 
     this.log(`Simulated base rollup circuit`, {
       eventName: 'circuit-simulation',