chore: acir-simulator -> simulator (#4439)

docs/docs/developers/contracts/syntax/functions/inner_workings.md

@@ -86,7 +86,7 @@ To generate the environment, the simulator gets the blockheader from the [PXE da
 
 Once the execution environment is created, `execute_unconstrained_function` is invoked:
 
-#include_code execute_unconstrained_function yarn-project/acir-simulator/src/client/unconstrained_execution.ts typescript
+#include_code execute_unconstrained_function yarn-project/simulator/src/client/unconstrained_execution.ts typescript
 
 This:
 

yarn-project/bootstrap.sh

@@ -46,7 +46,7 @@ yarn workspace @aztec/noir-contracts build:contracts
 echo "Copying account contracts..."
 yarn workspace @aztec/accounts build:copy-contracts
 # Build protocol circuits. TODO: move pre yarn-project.
-echo "Building contracts from noir-protocol-circuits..."
+echo "Building circuits from noir-protocol-circuits..."
 yarn workspace @aztec/noir-protocol-circuits build
 
 echo -e "\033[1mBuilding all packages...\033[0m"

yarn-project/deploy_npm.sh

@@ -91,7 +91,7 @@ deploy_package noir-compiler
 deploy_package noir-contracts
 deploy_package merkle-tree
 deploy_package noir-protocol-circuits
-deploy_package acir-simulator
+deploy_package simulator
 deploy_package key-store
 deploy_package pxe
 deploy_package archiver

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

@@ -147,7 +147,7 @@ describe('e2e_block_building', () => {
 
     it('drops tx with private nullifier already emitted from public on the same block', async () => {
       const secret = Fr.random();
-      // See yarn-project/acir-simulator/src/public/index.test.ts 'Should be able to create a nullifier from the public context'
+      // See yarn-project/simulator/src/public/index.test.ts 'Should be able to create a nullifier from the public context'
       const emittedPublicNullifier = pedersenHash([new Fr(140), secret].map(a => a.toBuffer()));
 
       const calls = [

yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr

@@ -19,7 +19,7 @@ contract ImportTest {
 
     // Calls the testCodeGen on the Test contract at the target address
     // Used for testing calling a function with arguments of multiple types
-    // See yarn-project/acir-simulator/src/client/private_execution.ts
+    // See yarn-project/simulator/src/client/private_execution.ts
     // See yarn-project/end-to-end/src/e2e_nested_contract.test.ts
     #[aztec(private)]
     fn main(target: AztecAddress) -> Field {

yarn-project/noir-contracts/contracts/test_contract/src/main.nr

@@ -181,7 +181,7 @@ contract Test {
     }
 
     // Test codegen for Aztec.nr interfaces
-    // See yarn-project/acir-simulator/src/client/private_execution.test.ts 'nested calls through autogenerated interface'
+    // See yarn-project/simulator/src/client/private_execution.test.ts 'nested calls through autogenerated interface'
     // Note; this function is deliberately NOT annotated with #[aztec(private)] due to its use in tests
     fn test_code_gen(
         inputs: PrivateContextInputs,

yarn-project/package.json

@@ -17,7 +17,7 @@
   },
   "workspaces": [
     "accounts",
-    "acir-simulator",
+    "simulator",
     "archiver",
     "aztec-faucet",
     "aztec-node",

yarn-project/pxe/README.md

@@ -6,7 +6,7 @@
 
 ### Main Components in an PXE Service
 
-- [Acir Simulator](../acir-simulator/)
+- [Simulator](../simulator/)
 - [Key Store](../key-store/)
 - [Account State](./src/account_state/account_state.ts): It coordinates other components to synchronize and decrypt data, simulate transactions, and generate kernel proofs, for a specific account.
 

yarn-project/pxe/package.json

@@ -33,7 +33,6 @@
     "workerThreads": true
   },
   "dependencies": {
-    "@aztec/acir-simulator": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
@@ -42,6 +41,7 @@
     "@aztec/kv-store": "workspace:^",
     "@aztec/noir-compiler": "workspace:^",
     "@aztec/noir-protocol-circuits": "workspace:^",
+    "@aztec/simulator": "workspace:^",
     "@aztec/types": "workspace:^",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",

yarn-project/pxe/src/contract_data_oracle/index.ts

@@ -1,4 +1,3 @@
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/acir-simulator';
 import { ContractDatabase } from '@aztec/circuit-types';
 import {
   AztecAddress,
@@ -9,6 +8,7 @@ import {
 } from '@aztec/circuits.js';
 import { FunctionDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
 import { ContractClass, ContractInstance } from '@aztec/types/contracts';
 
 import { ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';

yarn-project/pxe/src/database/note_dao.ts

@@ -1,8 +1,8 @@
-import { NoteData } from '@aztec/acir-simulator';
 import { Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point, PublicKey } from '@aztec/circuits.js';
 import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader } from '@aztec/foundation/serialize';
+import { NoteData } from '@aztec/simulator';
 
 /**
  * A note with contextual data.

yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts

@@ -1,4 +1,3 @@
-import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator';
 import { FunctionL2Logs, Note } from '@aztec/circuit-types';
 import {
   FunctionData,
@@ -22,6 +21,7 @@ import { makeTxRequest } from '@aztec/circuits.js/factories';
 import { makeTuple } from '@aztec/foundation/array';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ExecutionResult, NoteAndSlot } from '@aztec/simulator';
 
 import { mock } from 'jest-mock-extended';
 

yarn-project/pxe/src/kernel_prover/kernel_prover.ts

@@ -1,4 +1,3 @@
-import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator';
 import {
   AztecAddress,
   CallRequest,
@@ -31,6 +30,7 @@ import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Tuple, assertLength, mapTuple } from '@aztec/foundation/serialize';
 import { pushTestData } from '@aztec/foundation/testing';
+import { ExecutionResult, NoteAndSlot } from '@aztec/simulator';
 
 import { KernelProofCreator, ProofCreator, ProofOutput, ProofOutputFinal } from './proof_creator.js';
 import { ProvingDataOracle } from './proving_data_oracle.js';

yarn-project/pxe/src/note_processor/note_processor.test.ts

@@ -1,4 +1,3 @@
-import { AcirSimulator } from '@aztec/acir-simulator';
 import {
   AztecNode,
   FunctionL2Logs,
@@ -18,6 +17,7 @@ import { pedersenHash } from '@aztec/foundation/crypto';
 import { Point } from '@aztec/foundation/fields';
 import { ConstantKeyPair } from '@aztec/key-store';
 import { AztecLmdbStore } from '@aztec/kv-store';
+import { AcirSimulator } from '@aztec/simulator';
 
 import { jest } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';

yarn-project/pxe/src/note_processor/note_processor.ts

@@ -1,4 +1,3 @@
-import { ContractNotFoundError } from '@aztec/acir-simulator';
 import {
   AztecNode,
   INITIAL_L2_BLOCK_NUM,
@@ -13,6 +12,7 @@ import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import { ContractNotFoundError } from '@aztec/simulator';
 
 import { DeferredNoteDao } from '../database/deferred_note_dao.js';
 import { PxeDatabase } from '../database/index.js';

yarn-project/pxe/src/note_processor/produce_note_dao.ts

@@ -1,7 +1,7 @@
-import { AcirSimulator } from '@aztec/acir-simulator';
 import { L1NotePayload, TxHash } from '@aztec/circuit-types';
 import { Fr, PublicKey } from '@aztec/circuits.js';
 import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
+import { AcirSimulator } from '@aztec/simulator';
 
 import { NoteDao } from '../database/note_dao.js';
 

yarn-project/pxe/src/pxe_service/pxe_service.ts

@@ -1,11 +1,3 @@
-import {
-  AcirSimulator,
-  ExecutionResult,
-  collectEncryptedLogs,
-  collectEnqueuedPublicFunctionCalls,
-  collectUnencryptedLogs,
-  resolveOpcodeLocations,
-} from '@aztec/acir-simulator';
 import {
   AuthWitness,
   AztecNode,
@@ -56,6 +48,14 @@ import { Fr } from '@aztec/foundation/fields';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import {
+  AcirSimulator,
+  ExecutionResult,
+  collectEncryptedLogs,
+  collectEnqueuedPublicFunctionCalls,
+  collectUnencryptedLogs,
+  resolveOpcodeLocations,
+} from '@aztec/simulator';
 import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { NodeInfo } from '@aztec/types/interfaces';
 

yarn-project/pxe/src/simulator/index.ts

@@ -1,5 +1,5 @@
-import { AcirSimulator } from '@aztec/acir-simulator';
 import { AztecNode, KeyStore } from '@aztec/circuit-types';
+import { AcirSimulator } from '@aztec/simulator';
 
 import { ContractDataOracle } from '../contract_data_oracle/index.js';
 import { PxeDatabase } from '../database/pxe_database.js';