@aztec/sequencer-client 0.15.1 → 0.16.0

package/dest/client/sequencer-client.js

@@ -3,7 +3,7 @@ import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
 import { Sequencer, getL1Publisher, getVerificationKeys } from '../index.js';
 import { EmptyRollupProver } from '../prover/empty.js';
 import { PublicProcessorFactory } from '../sequencer/public_processor.js';
-import { WasmRollupCircuitSimulator } from '../simulator/rollup.js';
+import { RealRollupCircuitSimulator } from '../simulator/rollup.js';
 /**
  * Encapsulates the full sequencer and publisher.
  */
@@ -25,7 +25,7 @@ export class SequencerClient {
         const publisher = getL1Publisher(config);
         const globalsBuilder = getGlobalVariableBuilder(config);
         const merkleTreeDb = worldStateSynchronizer.getLatest();
-        const blockBuilder = new SoloBlockBuilder(merkleTreeDb, getVerificationKeys(), new WasmRollupCircuitSimulator(), new EmptyRollupProver());
+        const blockBuilder = new SoloBlockBuilder(merkleTreeDb, getVerificationKeys(), new RealRollupCircuitSimulator(), new EmptyRollupProver());
         const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, l1ToL2MessageSource);
         const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchronizer, blockBuilder, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, config);
         await sequencer.start();

package/dest/index.d.ts

@@ -5,7 +5,7 @@ export * from './client/index.js';
 export * from './mocks/verification_keys.js';
 export * from './sequencer/public_processor.js';
 export * from './global_variable_builder/index.js';
-export { WasmRollupCircuitSimulator } from './simulator/rollup.js';
+export { RealRollupCircuitSimulator } from './simulator/rollup.js';
 export { EmptyRollupProver } from './prover/empty.js';
 export { SoloBlockBuilder } from './block_builder/solo_block_builder.js';
 export { makeProcessedTx, makeEmptyProcessedTx } from './sequencer/processed_tx.js';

package/dest/index.js

@@ -7,7 +7,7 @@ export * from './mocks/verification_keys.js';
 export * from './sequencer/public_processor.js';
 export * from './global_variable_builder/index.js';
 // Used by publisher test in e2e
-export { WasmRollupCircuitSimulator } from './simulator/rollup.js';
+export { RealRollupCircuitSimulator } from './simulator/rollup.js';
 export { EmptyRollupProver } from './prover/empty.js';
 export { SoloBlockBuilder } from './block_builder/solo_block_builder.js';
 export { makeProcessedTx, makeEmptyProcessedTx } from './sequencer/processed_tx.js';

package/dest/sequencer/config.d.ts

@@ -1,18 +1,2 @@
-/**
- * The sequencer configuration.
- */
-export interface SequencerConfig {
-    /**
-     * The number of ms to wait between polling for pending txs.
-     */
-    transactionPollingIntervalMS?: number;
-    /**
-     * The maximum number of txs to include in a block.
-     */
-    maxTxsPerBlock?: number;
-    /**
-     * The minimum number of txs to include in a block.
-     */
-    minTxsPerBlock?: number;
-}
+export { SequencerConfig } from '@aztec/types';
 //# sourceMappingURL=config.d.ts.map

package/dest/sequencer/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/sequencer/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/sequencer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}

package/dest/sequencer/public_processor.d.ts

@@ -1,6 +1,5 @@
-import { PublicExecutionResult, PublicExecutor } from '@aztec/acir-simulator';
-import { Fr, GlobalVariables, HistoricBlockData, KernelCircuitPublicInputs, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, PreviousKernelData, Proof, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicKernelPublicInputs } from '@aztec/circuits.js';
-import { Tuple } from '@aztec/foundation/serialize';
+import { PublicExecutionResult, PublicExecutor, PublicStateDB } from '@aztec/acir-simulator';
+import { Fr, GlobalVariables, HistoricBlockData, KernelCircuitPublicInputs, PreviousKernelData, Proof, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicKernelPublicInputs } from '@aztec/circuits.js';
 import { ContractDataSource, FunctionL2Logs, L1ToL2MessageSource, Tx } from '@aztec/types';
 import { MerkleTreeOperations } from '@aztec/world-state';
 import { PublicProver } from '../prover/index.js';
@@ -36,8 +35,9 @@ export declare class PublicProcessor {
     protected globalVariables: GlobalVariables;
     protected blockData: HistoricBlockData;
     protected publicContractsDB: ContractsDataSourcePublicDB;
+    protected publicStateDB: PublicStateDB;
     private log;
-    constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, publicProver: PublicProver, globalVariables: GlobalVariables, blockData: HistoricBlockData, publicContractsDB: ContractsDataSourcePublicDB, log?: import("@aztec/foundation/log").DebugLogger);
+    constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, publicProver: PublicProver, globalVariables: GlobalVariables, blockData: HistoricBlockData, publicContractsDB: ContractsDataSourcePublicDB, publicStateDB: PublicStateDB, log?: import("@aztec/foundation/log").DebugLogger);
     /**
      * Run each tx through the public circuit and the public kernel circuit if needed.
      * @param txs - Txs to process.
@@ -56,7 +56,7 @@ export declare class PublicProcessor {
     protected getPreviousKernelData(previousOutput: KernelCircuitPublicInputs, previousProof: Proof): PreviousKernelData;
     protected getPublicCircuitPublicInputs(result: PublicExecutionResult): Promise<PublicCircuitPublicInputs>;
     protected getPublicCallStackItem(result: PublicExecutionResult, isExecutionRequest?: boolean): Promise<PublicCallStackItem>;
-    protected getPublicCallStackPreimages(result: PublicExecutionResult): Promise<[PublicCallStackItem, PublicCallStackItem, PublicCallStackItem, PublicCallStackItem]>;
+    protected getPublicCallStackPreimages(result: PublicExecutionResult): Promise<PublicCallStackItem[]>;
     protected getBytecodeHash(_result: PublicExecutionResult): Promise<Fr>;
     /**
      * Calculates the PublicCircuitOutput for this execution result along with its proof,
@@ -66,7 +66,7 @@ export declare class PublicProcessor {
      * @param isExecutionRequest - Whether the current callstack item should be considered a public fn execution request.
      * @returns A corresponding PublicCallData object.
      */
-    protected getPublicCallData(result: PublicExecutionResult, preimages: Tuple<PublicCallStackItem, typeof MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>, isExecutionRequest?: boolean): Promise<PublicCallData>;
+    protected getPublicCallData(result: PublicExecutionResult, isExecutionRequest?: boolean): Promise<PublicCallData>;
     /**
      * Patch the ordering of storage actions output from the public kernel.
      * @param publicInputs - to be patched here: public inputs to the kernel iteration up to this point

package/dest/sequencer/public_processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/sequencer/public_processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/sequencer/public_processor.ts"],"names":[],"mappings":"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"}

package/dest/sequencer/public_processor.js

@@ -1,14 +1,14 @@
-import { collectPublicDataReads, collectPublicDataUpdateRequests, isPublicExecutionResult, } from '@aztec/acir-simulator';
-import { AztecAddress, CombinedAccumulatedData, ContractStorageRead, ContractStorageUpdateRequest, Fr, KernelCircuitPublicInputs, MAX_NEW_COMMITMENTS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PreviousKernelData, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelInputs, RETURN_VALUES_LENGTH, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
-import { computeCallStackItemHash, computeVarArgsHash } from '@aztec/circuits.js/abis';
+import { PublicExecutor, collectPublicDataReads, collectPublicDataUpdateRequests, isPublicExecutionResult, } from '@aztec/acir-simulator';
+import { AztecAddress, CallRequest, CombinedAccumulatedData, ContractStorageRead, ContractStorageUpdateRequest, Fr, KernelCircuitPublicInputs, MAX_NEW_COMMITMENTS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PreviousKernelData, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelInputs, RETURN_VALUES_LENGTH, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
+import { computeVarArgsHash } from '@aztec/circuits.js/abis';
 import { arrayNonEmptyLength, isArrayEmpty, padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { mapTuple, to2Fields } from '@aztec/foundation/serialize';
+import { to2Fields } from '@aztec/foundation/serialize';
 import { MerkleTreeId, Tx } from '@aztec/types';
 import { getVerificationKeys } from '../index.js';
 import { EmptyPublicProver } from '../prover/empty.js';
-import { ContractsDataSourcePublicDB, getPublicExecutor } from '../simulator/public_executor.js';
-import { WasmPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
+import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
+import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
 import { makeEmptyProcessedTx, makeProcessedTx } from './processed_tx.js';
 import { getHistoricBlockData } from './utils.js';
 /**
@@ -30,7 +30,10 @@ export class PublicProcessorFactory {
     async create(prevGlobalVariables, globalVariables) {
         const blockData = await getHistoricBlockData(this.merkleTree, prevGlobalVariables);
         const publicContractsDB = new ContractsDataSourcePublicDB(this.contractDataSource);
-        return new PublicProcessor(this.merkleTree, getPublicExecutor(this.merkleTree, publicContractsDB, this.l1Tol2MessagesDataSource, blockData), new WasmPublicKernelCircuitSimulator(), new EmptyPublicProver(), globalVariables, blockData, publicContractsDB);
+        const worldStatePublicDB = new WorldStatePublicDB(this.merkleTree);
+        const worldStateDB = new WorldStateDB(this.merkleTree, this.l1Tol2MessagesDataSource);
+        const publicExecutor = new PublicExecutor(worldStatePublicDB, publicContractsDB, worldStateDB, blockData);
+        return new PublicProcessor(this.merkleTree, publicExecutor, new RealPublicKernelCircuitSimulator(), new EmptyPublicProver(), globalVariables, blockData, publicContractsDB, worldStatePublicDB);
     }
 }
 /**
@@ -38,7 +41,7 @@ export class PublicProcessorFactory {
  * any public function calls in them. Txs with private calls only are unaffected.
  */
 export class PublicProcessor {
-    constructor(db, publicExecutor, publicKernel, publicProver, globalVariables, blockData, publicContractsDB, log = createDebugLogger('aztec:sequencer:public-processor')) {
+    constructor(db, publicExecutor, publicKernel, publicProver, globalVariables, blockData, publicContractsDB, publicStateDB, log = createDebugLogger('aztec:sequencer:public-processor')) {
         this.db = db;
         this.publicExecutor = publicExecutor;
         this.publicKernel = publicKernel;
@@ -46,6 +49,7 @@ export class PublicProcessor {
         this.globalVariables = globalVariables;
         this.blockData = blockData;
         this.publicContractsDB = publicContractsDB;
+        this.publicStateDB = publicStateDB;
         this.log = log;
     }
     /**
@@ -64,6 +68,8 @@ export class PublicProcessor {
                 // add new contracts to the contracts db so that their functions may be found and called
                 await this.publicContractsDB.addNewContracts(tx);
                 result.push(await this.processTx(tx));
+                // commit the state updates from this transaction
+                await this.publicStateDB.commit();
             }
             catch (err) {
                 this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
@@ -73,6 +79,8 @@ export class PublicProcessor {
                 });
                 // remove contracts on failure
                 await this.publicContractsDB.removeNewContracts(tx);
+                // rollback any state updates from this failed transaction
+                await this.publicStateDB.rollback();
             }
         }
         return [result, failed];
@@ -86,7 +94,7 @@ export class PublicProcessor {
         return makeEmptyProcessedTx(this.blockData, chainId, version);
     }
     async processTx(tx) {
-        if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isZero())) {
+        if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isEmpty())) {
             const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(tx);
             tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
             return makeProcessedTx(tx, publicKernelOutput, publicKernelProof);
@@ -120,8 +128,7 @@ export class PublicProcessor {
                 const functionSelector = result.execution.functionData.selector.toString();
                 this.log(`Running public kernel circuit for ${functionSelector}@${result.execution.contractAddress.toString()}`);
                 executionStack.push(...result.nestedExecutions);
-                const preimages = await this.getPublicCallStackPreimages(result);
-                const callData = await this.getPublicCallData(result, preimages, isExecutionRequest);
+                const callData = await this.getPublicCallData(result, isExecutionRequest);
                 [kernelOutput, kernelProof] = await this.runKernelCircuit(callData, kernelOutput, kernelProof);
                 if (!enqueuedExecutionResult) {
                     enqueuedExecutionResult = result;
@@ -165,7 +172,7 @@ export class PublicProcessor {
         const publicDataTreeInfo = await this.db.getTreeInfo(MerkleTreeId.PUBLIC_DATA_TREE);
         this.blockData.publicDataTreeRoot = Fr.fromBuffer(publicDataTreeInfo.root);
         const callStackPreimages = await this.getPublicCallStackPreimages(result);
-        const publicCallStack = mapTuple(callStackPreimages, item => item.isEmpty() ? Fr.ZERO : computeCallStackItemHash(item));
+        const publicCallStackHashes = padArrayEnd(callStackPreimages.map(c => c.hash()), Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
         const unencryptedLogsHash = to2Fields(result.unencryptedLogs.hash());
         const unencryptedLogPreimagesLength = new Fr(result.unencryptedLogs.getSerializedLength());
@@ -179,7 +186,7 @@ export class PublicProcessor {
             returnValues: padArrayEnd(result.returnValues, Fr.ZERO, RETURN_VALUES_LENGTH),
             contractStorageReads: padArrayEnd(result.contractStorageReads, ContractStorageRead.empty(), MAX_PUBLIC_DATA_READS_PER_CALL),
             contractStorageUpdateRequests: padArrayEnd(result.contractStorageUpdateRequests, ContractStorageUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL),
-            publicCallStack,
+            publicCallStackHashes,
             unencryptedLogsHash,
             unencryptedLogPreimagesLength,
             historicBlockData: this.blockData,
@@ -190,12 +197,10 @@ export class PublicProcessor {
     }
     async getPublicCallStackPreimages(result) {
         const nested = result.nestedExecutions;
-        const preimages = await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
-        if (preimages.length > MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL) {
-            throw new Error(`Public call stack size exceeded (max ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}, got ${preimages.length})`);
+        if (nested.length > MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL) {
+            throw new Error(`Public call stack size exceeded (max ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}, got ${nested.length})`);
         }
-        // note this was previously padArrayStart in the cpp kernel, logic was updated in noir translation
-        return padArrayEnd(preimages, PublicCallStackItem.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
+        return await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
     }
     getBytecodeHash(_result) {
         // TODO: Determine how to calculate bytecode hash. Circuits just check it isn't zero for now.
@@ -211,12 +216,14 @@ export class PublicProcessor {
      * @param isExecutionRequest - Whether the current callstack item should be considered a public fn execution request.
      * @returns A corresponding PublicCallData object.
      */
-    async getPublicCallData(result, preimages, isExecutionRequest = false) {
+    async getPublicCallData(result, isExecutionRequest = false) {
         const bytecodeHash = await this.getBytecodeHash(result);
         const callStackItem = await this.getPublicCallStackItem(result, isExecutionRequest);
+        const publicCallRequests = (await this.getPublicCallStackPreimages(result)).map(c => c.toCallRequest());
+        const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
         const portalContractAddress = result.execution.callContext.portalContractAddress.toField();
         const proof = await this.publicProver.getPublicCircuitProof(callStackItem.publicInputs);
-        return new PublicCallData(callStackItem, preimages, proof, portalContractAddress, bytecodeHash);
+        return new PublicCallData(callStackItem, publicCallStack, proof, portalContractAddress, bytecodeHash);
     }
     // HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel
     // cannot keep track of side effects that happen after or before a nested call, we override the public
@@ -272,4 +279,4 @@ export class PublicProcessor {
         ], PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/sequencer/public_processor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/sequencer/public_processor.ts"],"names":[],"mappings":"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"}

package/dest/simulator/public_executor.d.ts

@@ -1,15 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
-import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicExecutor } 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 { ContractDataSource, ExtendedContractData, L1ToL2MessageSource, 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 declare function getPublicExecutor(merkleTree: MerkleTreeOperations, publicContractsDB: PublicContractsDB, l1toL2MessageSource: L1ToL2MessageSource, blockData: HistoricBlockData): PublicExecutor;
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
@@ -33,6 +26,39 @@ export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
     getIsInternal(address: AztecAddress, selector: FunctionSelector): Promise<boolean | undefined>;
     getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined>;
 }
+/**
+ * Implements the PublicStateDB using a world-state database.
+ */
+export declare class WorldStatePublicDB implements PublicStateDB {
+    private db;
+    private commitedWriteCache;
+    private uncommitedWriteCache;
+    constructor(db: MerkleTreeOperations);
+    /**
+     * Reads a value from public storage, returning zero if none.
+     * @param contract - Owner of the storage.
+     * @param slot - Slot to read in the contract storage.
+     * @returns The current value in the storage slot.
+     */
+    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
+    /**
+     * Records a write to public storage.
+     * @param contract - Owner of the storage.
+     * @param slot - Slot to read in the contract storage.
+     * @param newValue - The new value to store.
+     */
+    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
+    /**
+     * Commit the pending changes to the DB.
+     * @returns Nothing.
+     */
+    commit(): Promise<void>;
+    /**
+     * Rollback the pending changes.
+     * @returns Nothing.
+     */
+    rollback(): Promise<void>;
+}
 /**
  * Implements WorldState db using a world state database.
  */

package/dest/simulator/public_executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvG,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,mBAAmB,EAAgB,EAAE,EAAE,MAAM,cAAc,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,mBAAmB,EACxC,SAAS,EAAE,iBAAiB,kBAQ7B;AAED;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;;IAGvD,OAAO,CAAC,EAAE;IAFtB,KAAK,oCAA2C;gBAE5B,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAc7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1C,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI3F,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAI9F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAQvF;AAuCD;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,mBAAmB;gBAArD,EAAE,EAAE,oBAAoB,EAAU,mBAAmB,EAAE,mBAAmB;IAEjF,gBAAgB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAalE,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG7E"}
+{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACjH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEpF,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,mBAAmB,EAAgB,EAAE,EAAE,MAAM,cAAc,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;;IAGvD,OAAO,CAAC,EAAE;IAFtB,KAAK,oCAA2C;gBAE5B,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAc7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1C,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI3F,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAI9F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAQvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAI1C,OAAO,CAAC,EAAE;IAHtB,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,oBAAoB,CAA8B;gBAEtC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAcvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvB;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAI1B;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,mBAAmB;gBAArD,EAAE,EAAE,oBAAoB,EAAU,mBAAmB,EAAE,mBAAmB;IAEjF,gBAAgB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAalE,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG7E"}

package/dest/simulator/public_executor.js

@@ -1,18 +1,8 @@
 var _ContractsDataSourcePublicDB_instances, _ContractsDataSourcePublicDB_getContract;
 import { __classPrivateFieldGet } from "tslib";
-import { PublicExecutor, } from '@aztec/acir-simulator';
 import { Fr } from '@aztec/circuits.js';
 import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
 import { MerkleTreeId } from '@aztec/types';
-/**
- * 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, publicContractsDB, l1toL2MessageSource, blockData) {
-    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.
@@ -70,10 +60,11 @@ _ContractsDataSourcePublicDB_instances = new WeakSet(), _ContractsDataSourcePubl
 /**
  * Implements the PublicStateDB using a world-state database.
  */
-class WorldStatePublicDB {
+export class WorldStatePublicDB {
     constructor(db) {
         this.db = db;
-        this.writeCache = new Map();
+        this.commitedWriteCache = new Map();
+        this.uncommitedWriteCache = new Map();
     }
     /**
      * Reads a value from public storage, returning zero if none.
@@ -83,9 +74,13 @@ class WorldStatePublicDB {
      */
     async storageRead(contract, slot) {
         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;
@@ -98,7 +93,25 @@ class WorldStatePublicDB {
      */
     storageWrite(contract, slot, newValue) {
         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() {
+        for (const [k, v] of this.uncommitedWriteCache) {
+            this.commitedWriteCache.set(k, v);
+        }
+        return this.rollback();
+    }
+    /**
+     * Rollback the pending changes.
+     * @returns Nothing.
+     */
+    rollback() {
+        this.uncommitedWriteCache = new Map();
         return Promise.resolve();
     }
 }
@@ -125,4 +138,4 @@ export class WorldStateDB {
         return await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment.toBuffer());
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2V4ZWN1dG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NpbXVsYXRvci9wdWJsaWNfZXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBSUwsY0FBYyxHQUVmLE1BQU0sdUJBQXVCLENBQUM7QUFDL0IsT0FBTyxFQUE0QixFQUFFLEVBQXVDLE1BQU0sb0JBQW9CLENBQUM7QUFDdkcsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckUsT0FBTyxFQUFpRSxZQUFZLEVBQU0sTUFBTSxjQUFjLENBQUM7QUFHL0c7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsaUJBQWlCLENBQy9CLFVBQWdDLEVBQ2hDLGlCQUFvQyxFQUNwQyxtQkFBd0MsRUFDeEMsU0FBNEI7SUFFNUIsT0FBTyxJQUFJLGNBQWMsQ0FDdkIsSUFBSSxrQkFBa0IsQ0FBQyxVQUFVLENBQUMsRUFDbEMsaUJBQWlCLEVBQ2pCLElBQUksWUFBWSxDQUFDLFVBQVUsRUFBRSxtQkFBbUIsQ0FBQyxFQUNqRCxTQUFTLENBQ1YsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sMkJBQTJCO0lBR3RDLFlBQW9CLEVBQXNCOztRQUF0QixPQUFFLEdBQUYsRUFBRSxDQUFvQjtRQUYxQyxVQUFLLEdBQUcsSUFBSSxHQUFHLEVBQWdDLENBQUM7SUFFSCxDQUFDO0lBRTlDOzs7T0FHRztJQUNJLGVBQWUsQ0FBQyxFQUFNO1FBQzNCLEtBQUssTUFBTSxRQUFRLElBQUksRUFBRSxDQUFDLFlBQVksRUFBRTtZQUN0QyxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQztZQUU5RCxJQUFJLGVBQWUsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDNUIsU0FBUzthQUNWO1lBRUQsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2V4ZWN1dG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NpbXVsYXRvci9wdWJsaWNfZXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxPQUFPLEVBQTRCLEVBQUUsRUFBb0IsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRSxPQUFPLEVBQWlFLFlBQVksRUFBTSxNQUFNLGNBQWMsQ0FBQztBQUcvRzs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sMkJBQTJCO0lBR3RDLFlBQW9CLEVBQXNCOztRQUF0QixPQUFFLEdBQUYsRUFBRSxDQUFvQjtRQUYxQyxVQUFLLEdBQUcsSUFBSSxHQUFHLEVBQWdDLENBQUM7SUFFSCxDQUFDO0lBRTlDOzs7T0FHRztJQUNJLGVBQWUsQ0FBQyxFQUFNO1FBQzNCLEtBQUssTUFBTSxRQUFRLElBQUksRUFBRSxDQUFDLFlBQVksRUFBRTtZQUN0QyxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQztZQUU5RCxJQUFJLGVBQWUsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDNUIsU0FBUzthQUNWO1lBRUQsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1NBQ3REO1FBRUQsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVEOzs7T0FHRztJQUNJLGtCQUFrQixDQUFDLEVBQU07UUFDOUIsS0FBSyxNQUFNLFFBQVEsSUFBSSxFQUFFLENBQUMsWUFBWSxFQUFFO1lBQ3RDLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDO1lBRTlELElBQUksZUFBZSxDQUFDLE1BQU0sRUFBRSxFQUFFO2dCQUM1QixTQUFTO2FBQ1Y7WUFFRCxJQUFJLENB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

package/dest/simulator/public_kernel.d.ts

@@ -1,9 +1,9 @@
 import { PublicKernelInputs, PublicKernelPublicInputs } from '@aztec/circuits.js';
 import { PublicKernelCircuitSimulator } from './index.js';
 /**
- * Implements the PublicKernelCircuitSimulator by calling the wasm implementations of the circuits.
+ * Implements the PublicKernelCircuitSimulator.
  */
-export declare class WasmPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
+export declare class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
     private log;
     /**
      * Simulates the public kernel circuit (with a previous private kernel circuit run) from its inputs.

package/dest/simulator/public_kernel.js

@@ -2,9 +2,9 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
 import { executePublicKernelPrivatePrevious, executePublicKernelPublicPrevious } from '@aztec/noir-protocol-circuits';
 /**
- * Implements the PublicKernelCircuitSimulator by calling the wasm implementations of the circuits.
+ * Implements the PublicKernelCircuitSimulator.
  */
-export class WasmPublicKernelCircuitSimulator {
+export class RealPublicKernelCircuitSimulator {
     constructor() {
         this.log = createDebugLogger('aztec:public-kernel-simulator');
     }

package/dest/simulator/rollup.d.ts

@@ -1,9 +1,9 @@
 import { BaseOrMergeRollupPublicInputs, BaseRollupInputs, MergeRollupInputs, RootRollupInputs, RootRollupPublicInputs } from '@aztec/circuits.js';
 import { RollupSimulator } from './index.js';
 /**
- * Implements the rollup circuit simulator using the wasm circuits implementation.
+ * Implements the rollup circuit simulator.
  */
-export declare class WasmRollupCircuitSimulator implements RollupSimulator {
+export declare class RealRollupCircuitSimulator implements RollupSimulator {
     private log;
     /**
      * Simulates the base rollup circuit from its inputs.

package/dest/simulator/rollup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/simulator/rollup.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAGhB,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C;;GAEG;AACH,qBAAa,0BAA2B,YAAW,eAAe;IAChE,OAAO,CAAC,GAAG,CAA+C;IAE1D;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAiB/F;;;;OAIG;IACU,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAcjG;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAazF"}
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/simulator/rollup.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C;;GAEG;AACH,qBAAa,0BAA2B,YAAW,eAAe;IAChE,OAAO,CAAC,GAAG,CAA+C;IAE1D;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAa/F;;;;OAIG;IACU,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAcjG;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAazF"}

package/dest/simulator/rollup.js

@@ -1,11 +1,10 @@
-import { CircuitError, CircuitsWasm, 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';
 /**
- * Implements the rollup circuit simulator using the wasm circuits implementation.
+ * Implements the rollup circuit simulator.
  */
-export class WasmRollupCircuitSimulator {
+export class RealRollupCircuitSimulator {
     constructor() {
         this.log = createDebugLogger('aztec:rollup-simulator');
     }
@@ -15,11 +14,7 @@ export class WasmRollupCircuitSimulator {
      * @returns The public inputs as outputs of the simulation.
      */
     async baseRollupCircuit(input) {
-        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',
             circuitName: 'base-rollup',
@@ -62,4 +57,4 @@ export class WasmRollupCircuitSimulator {
         return result;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NpbXVsYXRvci9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLFlBQVksRUFDWixZQUFZLEVBSVosYUFBYSxHQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBS3RGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLDBCQUEwQjtJQUF2QztRQUNVLFFBQUcsR0FBRyxpQkFBaUIsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0lBNkQ1RCxDQUFDO0lBM0RDOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBdUI7UUFDcEQsTUFBTSxJQUFJLEdBQUcsTUFBTSxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDdEMsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDM0UsSUFBSSxNQUFNLFlBQVksWUFBWSxFQUFFO1lBQ2xDLE1BQU0sSUFBSSxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDckQ7UUFFRCxJQUFJLENBQUMsR0FBRyxDQUFDLCtCQUErQixFQUFFO1lBQ3hDLFNBQVMsRUFBRSxvQkFBb0I7WUFDL0IsV0FBVyxFQUFFLGFBQWE7WUFDMUIsUUFBUTtZQUNSLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUNsQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFFcEMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLGtCQUFrQixDQUFDLEtBQXdCO1FBQ3RELE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUUxRSxJQUFJLENBQUMsR0FBRyxDQUFDLGdDQUFnQyxFQUFFO1lBQ3pDLFNBQVMsRUFBRSxvQkFBb0I7WUFDL0IsV0FBVyxFQUFFLGNBQWM7WUFDM0IsUUFBUTtZQUNSLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUNsQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFFcEMsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBdUI7UUFDcEQsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRXpFLElBQUksQ0FBQyxHQUFHLENBQUMsK0JBQStCLEVBQUU7WUFDeEMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUsYUFBYTtZQUMxQixRQUFRO1lBQ1IsU0FBUyxFQUFFLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1lBQ2xDLFVBQVUsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtTQUNKLENBQUMsQ0FBQztRQUVwQyxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NpbXVsYXRvci9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBS3pHOztHQUVHO0FBQ0gsTUFBTSxPQUFPLDBCQUEwQjtJQUF2QztRQUNVLFFBQUcsR0FBRyxpQkFBaUIsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0lBeUQ1RCxDQUFDO0lBdkRDOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBdUI7UUFDcEQsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRXpFLElBQUksQ0FBQyxHQUFHLENBQUMsK0JBQStCLEVBQUU7WUFDeEMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUsYUFBYTtZQUMxQixRQUFRO1lBQ1IsU0FBUyxFQUFFLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1lBQ2xDLFVBQVUsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtTQUNKLENBQUMsQ0FBQztRQUVwQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUNEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsa0JBQWtCLENBQUMsS0FBd0I7UUFDdEQsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRTFFLElBQUksQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLEVBQUU7WUFDekMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUsY0FBYztZQUMzQixRQUFRO1lBQ1IsU0FBUyxFQUFFLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1lBQ2xDLFVBQVUsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtTQUNKLENBQUMsQ0FBQztRQUVwQyxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUF1QjtRQUNwRCxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFFekUsSUFBSSxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsRUFBRTtZQUN4QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxhQUFhO1lBQzFCLFFBQVE7WUFDUixTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDbEMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBRXBDLE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7Q0FDRiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -32,16 +32,16 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/acir-simulator": "0.15.1",
-    "@aztec/circuits.js": "0.15.1",
-    "@aztec/ethereum": "0.15.1",
-    "@aztec/foundation": "0.15.1",
-    "@aztec/l1-artifacts": "0.15.1",
-    "@aztec/merkle-tree": "0.15.1",
-    "@aztec/noir-protocol-circuits": "0.15.1",
-    "@aztec/p2p": "0.15.1",
-    "@aztec/types": "0.15.1",
-    "@aztec/world-state": "0.15.1",
+    "@aztec/acir-simulator": "0.16.0",
+    "@aztec/circuits.js": "0.16.0",
+    "@aztec/ethereum": "0.16.0",
+    "@aztec/foundation": "0.16.0",
+    "@aztec/l1-artifacts": "0.16.0",
+    "@aztec/merkle-tree": "0.16.0",
+    "@aztec/noir-protocol-circuits": "0.16.0",
+    "@aztec/p2p": "0.16.0",
+    "@aztec/types": "0.16.0",
+    "@aztec/world-state": "0.16.0",
     "lodash.chunk": "^4.2.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.pick": "^4.4.0",

package/src/client/sequencer-client.ts

@@ -8,7 +8,7 @@ import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
 import { Sequencer, SequencerConfig, getL1Publisher, getVerificationKeys } from '../index.js';
 import { EmptyRollupProver } from '../prover/empty.js';
 import { PublicProcessorFactory } from '../sequencer/public_processor.js';
-import { WasmRollupCircuitSimulator } from '../simulator/rollup.js';
+import { RealRollupCircuitSimulator } from '../simulator/rollup.js';
 
 /**
  * Encapsulates the full sequencer and publisher.
@@ -41,7 +41,7 @@ export class SequencerClient {
     const blockBuilder = new SoloBlockBuilder(
       merkleTreeDb,
       getVerificationKeys(),
-      new WasmRollupCircuitSimulator(),
+      new RealRollupCircuitSimulator(),
       new EmptyRollupProver(),
     );
 

package/src/index.ts

@@ -9,7 +9,7 @@ export * from './sequencer/public_processor.js';
 export * from './global_variable_builder/index.js';
 
 // Used by publisher test in e2e
-export { WasmRollupCircuitSimulator } from './simulator/rollup.js';
+export { RealRollupCircuitSimulator } from './simulator/rollup.js';
 export { EmptyRollupProver } from './prover/empty.js';
 export { SoloBlockBuilder } from './block_builder/solo_block_builder.js';
 export { makeProcessedTx, makeEmptyProcessedTx } from './sequencer/processed_tx.js';

package/src/sequencer/config.ts

@@ -1,17 +1 @@
-/**
- * The sequencer configuration.
- */
-export interface SequencerConfig {
-  /**
-   * The number of ms to wait between polling for pending txs.
-   */
-  transactionPollingIntervalMS?: number;
-  /**
-   * The maximum number of txs to include in a block.
-   */
-  maxTxsPerBlock?: number;
-  /**
-   * The minimum number of txs to include in a block.
-   */
-  minTxsPerBlock?: number;
-}
+export { SequencerConfig } from '@aztec/types';

package/src/sequencer/public_processor.ts

@@ -2,12 +2,14 @@ import {
   PublicExecution,
   PublicExecutionResult,
   PublicExecutor,
+  PublicStateDB,
   collectPublicDataReads,
   collectPublicDataUpdateRequests,
   isPublicExecutionResult,
 } from '@aztec/acir-simulator';
 import {
   AztecAddress,
+  CallRequest,
   CombinedAccumulatedData,
   ContractStorageRead,
   ContractStorageUpdateRequest,
@@ -36,10 +38,10 @@ import {
   RETURN_VALUES_LENGTH,
   VK_TREE_HEIGHT,
 } from '@aztec/circuits.js';
-import { computeCallStackItemHash, computeVarArgsHash } from '@aztec/circuits.js/abis';
+import { computeVarArgsHash } from '@aztec/circuits.js/abis';
 import { arrayNonEmptyLength, isArrayEmpty, padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { Tuple, mapTuple, to2Fields } from '@aztec/foundation/serialize';
+import { to2Fields } from '@aztec/foundation/serialize';
 import { ContractDataSource, FunctionL2Logs, L1ToL2MessageSource, MerkleTreeId, Tx } from '@aztec/types';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
@@ -47,8 +49,8 @@ import { getVerificationKeys } from '../index.js';
 import { EmptyPublicProver } from '../prover/empty.js';
 import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB, getPublicExecutor } from '../simulator/public_executor.js';
-import { WasmPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
+import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
+import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
 import { FailedTx, ProcessedTx, makeEmptyProcessedTx, makeProcessedTx } from './processed_tx.js';
 import { getHistoricBlockData } from './utils.js';
 
@@ -75,14 +77,18 @@ export class PublicProcessorFactory {
   ): Promise<PublicProcessor> {
     const blockData = await getHistoricBlockData(this.merkleTree, prevGlobalVariables);
     const publicContractsDB = new ContractsDataSourcePublicDB(this.contractDataSource);
+    const worldStatePublicDB = new WorldStatePublicDB(this.merkleTree);
+    const worldStateDB = new WorldStateDB(this.merkleTree, this.l1Tol2MessagesDataSource);
+    const publicExecutor = new PublicExecutor(worldStatePublicDB, publicContractsDB, worldStateDB, blockData);
     return new PublicProcessor(
       this.merkleTree,
-      getPublicExecutor(this.merkleTree, publicContractsDB, this.l1Tol2MessagesDataSource, blockData),
-      new WasmPublicKernelCircuitSimulator(),
+      publicExecutor,
+      new RealPublicKernelCircuitSimulator(),
       new EmptyPublicProver(),
       globalVariables,
       blockData,
       publicContractsDB,
+      worldStatePublicDB,
     );
   }
 }
@@ -100,6 +106,7 @@ export class PublicProcessor {
     protected globalVariables: GlobalVariables,
     protected blockData: HistoricBlockData,
     protected publicContractsDB: ContractsDataSourcePublicDB,
+    protected publicStateDB: PublicStateDB,
 
     private log = createDebugLogger('aztec:sequencer:public-processor'),
   ) {}
@@ -121,6 +128,8 @@ export class PublicProcessor {
         // add new contracts to the contracts db so that their functions may be found and called
         await this.publicContractsDB.addNewContracts(tx);
         result.push(await this.processTx(tx));
+        // commit the state updates from this transaction
+        await this.publicStateDB.commit();
       } catch (err) {
         this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
         failed.push({
@@ -129,6 +138,8 @@ export class PublicProcessor {
         });
         // remove contracts on failure
         await this.publicContractsDB.removeNewContracts(tx);
+        // rollback any state updates from this failed transaction
+        await this.publicStateDB.rollback();
       }
     }
 
@@ -145,7 +156,7 @@ export class PublicProcessor {
   }
 
   protected async processTx(tx: Tx): Promise<ProcessedTx> {
-    if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isZero())) {
+    if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isEmpty())) {
       const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
         tx,
       );
@@ -193,8 +204,7 @@ export class PublicProcessor {
           `Running public kernel circuit for ${functionSelector}@${result.execution.contractAddress.toString()}`,
         );
         executionStack.push(...result.nestedExecutions);
-        const preimages = await this.getPublicCallStackPreimages(result);
-        const callData = await this.getPublicCallData(result, preimages, isExecutionRequest);
+        const callData = await this.getPublicCallData(result, isExecutionRequest);
 
         [kernelOutput, kernelProof] = await this.runKernelCircuit(callData, kernelOutput, kernelProof);
 
@@ -252,9 +262,10 @@ export class PublicProcessor {
     this.blockData.publicDataTreeRoot = Fr.fromBuffer(publicDataTreeInfo.root);
 
     const callStackPreimages = await this.getPublicCallStackPreimages(result);
-
-    const publicCallStack = mapTuple(callStackPreimages, item =>
-      item.isEmpty() ? Fr.ZERO : computeCallStackItemHash(item),
+    const publicCallStackHashes = padArrayEnd(
+      callStackPreimages.map(c => c.hash()),
+      Fr.ZERO,
+      MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
     );
 
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
@@ -279,7 +290,7 @@ export class PublicProcessor {
         ContractStorageUpdateRequest.empty(),
         MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
       ),
-      publicCallStack,
+      publicCallStackHashes,
       unencryptedLogsHash,
       unencryptedLogPreimagesLength,
       historicBlockData: this.blockData,
@@ -295,17 +306,15 @@ export class PublicProcessor {
     );
   }
 
-  protected async getPublicCallStackPreimages(result: PublicExecutionResult) {
+  protected async getPublicCallStackPreimages(result: PublicExecutionResult): Promise<PublicCallStackItem[]> {
     const nested = result.nestedExecutions;
-    const preimages: PublicCallStackItem[] = await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
-    if (preimages.length > MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL) {
+    if (nested.length > MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL) {
       throw new Error(
-        `Public call stack size exceeded (max ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}, got ${preimages.length})`,
+        `Public call stack size exceeded (max ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}, got ${nested.length})`,
       );
     }
 
-    // note this was previously padArrayStart in the cpp kernel, logic was updated in noir translation
-    return padArrayEnd(preimages, PublicCallStackItem.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
+    return await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
   }
 
   protected getBytecodeHash(_result: PublicExecutionResult) {
@@ -323,16 +332,14 @@ export class PublicProcessor {
    * @param isExecutionRequest - Whether the current callstack item should be considered a public fn execution request.
    * @returns A corresponding PublicCallData object.
    */
-  protected async getPublicCallData(
-    result: PublicExecutionResult,
-    preimages: Tuple<PublicCallStackItem, typeof MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
-    isExecutionRequest = false,
-  ) {
+  protected async getPublicCallData(result: PublicExecutionResult, isExecutionRequest = false) {
     const bytecodeHash = await this.getBytecodeHash(result);
     const callStackItem = await this.getPublicCallStackItem(result, isExecutionRequest);
+    const publicCallRequests = (await this.getPublicCallStackPreimages(result)).map(c => c.toCallRequest());
+    const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
     const portalContractAddress = result.execution.callContext.portalContractAddress.toField();
     const proof = await this.publicProver.getPublicCircuitProof(callStackItem.publicInputs);
-    return new PublicCallData(callStackItem, preimages, proof, portalContractAddress, bytecodeHash);
+    return new PublicCallData(callStackItem, publicCallStack, proof, portalContractAddress, bytecodeHash);
   }
 
   // HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel

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,9 +83,13 @@ 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;
@@ -124,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');
 
   /**

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',