From 0aac00c4437cd3d32c7bbf2fe04065465d4df943 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:04:47 +0000 Subject: [PATCH 1/5] chore: acir-simulator -> simulator --- .../syntax/functions/inner_workings.md | 2 +- .../src/core/libraries/ConstantsGen.sol | 3 +- yarn-project/bootstrap.sh | 2 +- yarn-project/deploy_npm.sh | 2 +- .../end-to-end/src/e2e_block_building.test.ts | 2 +- .../import_test_contract/src/main.nr | 2 +- .../contracts/test_contract/src/main.nr | 2 +- yarn-project/package.json | 2 +- yarn-project/pxe/README.md | 2 +- yarn-project/pxe/package.json | 2 +- .../pxe/src/contract_data_oracle/index.ts | 2 +- yarn-project/pxe/src/database/note_dao.ts | 2 +- .../src/kernel_prover/kernel_prover.test.ts | 2 +- .../pxe/src/kernel_prover/kernel_prover.ts | 2 +- .../src/note_processor/note_processor.test.ts | 2 +- .../pxe/src/note_processor/note_processor.ts | 2 +- .../src/note_processor/produce_note_dao.ts | 2 +- .../pxe/src/pxe_service/pxe_service.ts | 2 +- yarn-project/pxe/src/simulator/index.ts | 2 +- .../pxe/src/simulator_oracle/index.ts | 2 +- yarn-project/pxe/tsconfig.json | 2 +- yarn-project/sequencer-client/package.json | 2 +- .../src/sequencer/abstract_phase_manager.ts | 2 +- .../application_logic_phase_manager.ts | 2 +- .../fee_distribution_phase_manager.ts | 2 +- .../fee_preparation_phase_manager.ts | 2 +- .../src/sequencer/public_processor.test.ts | 2 +- .../src/sequencer/public_processor.ts | 2 +- .../src/simulator/public_executor.ts | 2 +- yarn-project/sequencer-client/tsconfig.json | 2 +- .../.eslintrc.cjs | 0 .../{acir-simulator => simulator}/README.md | 0 .../package.json | 2 +- .../src/acvm/acvm.ts | 0 .../src/acvm/acvm_types.ts | 0 .../src/acvm/deserialize.ts | 0 .../src/acvm/index.ts | 0 .../src/acvm/oracle/debug.ts | 0 .../src/acvm/oracle/index.ts | 0 .../src/acvm/oracle/oracle.ts | 0 .../src/acvm/oracle/typed_oracle.ts | 0 .../src/acvm/serialize.ts | 0 .../src/avm/avm_context.test.ts | 0 .../src/avm/avm_context.ts | 0 .../src/avm/avm_execution_environment.test.ts | 0 .../src/avm/avm_execution_environment.ts | 0 .../src/avm/avm_machine_state.ts | 0 .../src/avm/avm_memory_types.test.ts | 0 .../src/avm/avm_memory_types.ts | 0 .../src/avm/avm_message_call_result.ts | 0 .../src/avm/avm_simulator.test.ts | 0 .../src/avm/avm_simulator.ts | 0 .../src/avm/errors.ts | 0 .../src/avm/fixtures/index.ts | 0 .../src/avm/journal/host_storage.ts | 0 .../src/avm/journal/index.ts | 0 .../src/avm/journal/journal.test.ts | 0 .../src/avm/journal/journal.ts | 0 .../src/avm/opcodes/.eslintrc.cjs | 0 .../src/avm/opcodes/accrued_substate.test.ts | 0 .../src/avm/opcodes/accrued_substate.ts | 0 .../src/avm/opcodes/arithmetic.test.ts | 0 .../src/avm/opcodes/arithmetic.ts | 0 .../src/avm/opcodes/bitwise.test.ts | 0 .../src/avm/opcodes/bitwise.ts | 0 .../src/avm/opcodes/comparators.test.ts | 0 .../src/avm/opcodes/comparators.ts | 0 .../src/avm/opcodes/control_flow.test.ts | 0 .../src/avm/opcodes/control_flow.ts | 0 .../avm/opcodes/environment_getters.test.ts | 0 .../src/avm/opcodes/environment_getters.ts | 0 .../src/avm/opcodes/external_calls.test.ts | 0 .../src/avm/opcodes/external_calls.ts | 0 .../src/avm/opcodes/index.ts | 0 .../src/avm/opcodes/instruction.ts | 0 .../src/avm/opcodes/instruction_impl.ts | 0 .../src/avm/opcodes/memory.test.ts | 0 .../src/avm/opcodes/memory.ts | 0 .../src/avm/opcodes/storage.test.ts | 0 .../src/avm/opcodes/storage.ts | 0 .../src/avm/serialization/buffer_cursor.ts | 0 .../bytecode_serialization.test.ts | 0 .../serialization/bytecode_serialization.ts | 0 .../instruction_serialization.test.ts | 0 .../instruction_serialization.ts | 0 .../src/client/client_execution_context.ts | 0 .../src/client/db_oracle.ts | 0 .../src/client/execution_note_cache.ts | 0 .../src/client/execution_result.test.ts | 0 .../src/client/execution_result.ts | 0 .../src/client/index.ts | 0 .../src/client/pick_notes.test.ts | 0 .../src/client/pick_notes.ts | 0 .../src/client/private_execution.test.ts | 0 .../src/client/private_execution.ts | 0 .../src/client/simulator.test.ts | 0 .../src/client/simulator.ts | 0 .../client/unconstrained_execution.test.ts | 0 .../src/client/unconstrained_execution.ts | 0 .../src/client/view_data_oracle.ts | 0 .../src/common/errors.ts | 0 .../src/common/index.ts | 0 .../src/common/packed_args_cache.ts | 0 .../src/common/side_effect_counter.ts | 0 .../src/index.ts | 0 .../src/public/db.ts | 0 .../src/public/execution.ts | 0 .../src/public/executor.ts | 0 .../src/public/index.test.ts | 0 .../src/public/index.ts | 0 .../src/public/public_execution_context.ts | 0 .../src/public/state_actions.ts | 0 .../src/test/utils.ts | 0 .../src/utils.ts | 0 .../tsconfig.json | 0 yarn-project/tsconfig.json | 2 +- yarn-project/typedoc.json | 2 +- yarn-project/yarn.lock | 60 +++++++++---------- 118 files changed, 63 insertions(+), 64 deletions(-) rename yarn-project/{acir-simulator => simulator}/.eslintrc.cjs (100%) rename yarn-project/{acir-simulator => simulator}/README.md (100%) rename yarn-project/{acir-simulator => simulator}/package.json (98%) rename yarn-project/{acir-simulator => simulator}/src/acvm/acvm.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/acvm_types.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/deserialize.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/oracle/debug.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/oracle/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/oracle/oracle.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/oracle/typed_oracle.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/acvm/serialize.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_context.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_context.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_execution_environment.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_execution_environment.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_machine_state.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_memory_types.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_memory_types.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_message_call_result.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_simulator.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/avm_simulator.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/errors.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/fixtures/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/journal/host_storage.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/journal/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/journal/journal.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/journal/journal.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/.eslintrc.cjs (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/accrued_substate.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/accrued_substate.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/arithmetic.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/arithmetic.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/bitwise.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/bitwise.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/comparators.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/comparators.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/control_flow.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/control_flow.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/environment_getters.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/environment_getters.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/external_calls.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/external_calls.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/instruction.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/instruction_impl.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/memory.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/memory.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/storage.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/opcodes/storage.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/serialization/buffer_cursor.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/serialization/bytecode_serialization.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/serialization/bytecode_serialization.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/serialization/instruction_serialization.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/avm/serialization/instruction_serialization.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/client_execution_context.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/db_oracle.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/execution_note_cache.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/execution_result.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/execution_result.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/pick_notes.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/pick_notes.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/private_execution.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/private_execution.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/simulator.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/simulator.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/unconstrained_execution.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/unconstrained_execution.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/client/view_data_oracle.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/common/errors.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/common/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/common/packed_args_cache.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/common/side_effect_counter.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/db.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/execution.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/executor.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/index.test.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/index.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/public_execution_context.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/public/state_actions.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/test/utils.ts (100%) rename yarn-project/{acir-simulator => simulator}/src/utils.ts (100%) rename yarn-project/{acir-simulator => simulator}/tsconfig.json (100%) diff --git a/docs/docs/developers/contracts/syntax/functions/inner_workings.md b/docs/docs/developers/contracts/syntax/functions/inner_workings.md index 3b1a093e00af..3a6174d920c1 100644 --- a/docs/docs/developers/contracts/syntax/functions/inner_workings.md +++ b/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: diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol index 4c31fc92340f..a76f193a9537 100644 --- a/l1-contracts/src/core/libraries/ConstantsGen.sol +++ b/l1-contracts/src/core/libraries/ConstantsGen.sol @@ -67,8 +67,7 @@ library Constants { uint256 internal constant ARGS_HASH_CHUNK_LENGTH = 32; uint256 internal constant ARGS_HASH_CHUNK_COUNT = 32; uint256 internal constant MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 1000; - uint256 internal constant CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = - 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8; + uint256 internal constant CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8; uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 8; uint256 internal constant L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 25; uint256 internal constant MAX_NOTE_FIELDS_LENGTH = 20; diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh index 3d2affb33002..9fe3fd369a89 100755 --- a/yarn-project/bootstrap.sh +++ b/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" diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index 9132db974d08..da60b0a70e88 100755 --- a/yarn-project/deploy_npm.sh +++ b/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 diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts index 645d2b4f3255..9b5760759bd6 100644 --- a/yarn-project/end-to-end/src/e2e_block_building.test.ts +++ b/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 = [ diff --git a/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr index 82ac8a1bd2e1..613d3549b4c4 100644 --- a/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr +++ b/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 { diff --git a/yarn-project/noir-contracts/contracts/test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/test_contract/src/main.nr index 6741ecb8ebe3..86bf71c1eb62 100644 --- a/yarn-project/noir-contracts/contracts/test_contract/src/main.nr +++ b/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, diff --git a/yarn-project/package.json b/yarn-project/package.json index 489e0f42ecc8..cf7ad7b8c91d 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -17,7 +17,7 @@ }, "workspaces": [ "accounts", - "acir-simulator", + "simulator", "archiver", "aztec-faucet", "aztec-node", diff --git a/yarn-project/pxe/README.md b/yarn-project/pxe/README.md index bccdb05f11e6..728445473dc5 100644 --- a/yarn-project/pxe/README.md +++ b/yarn-project/pxe/README.md @@ -6,7 +6,7 @@ ### Main Components in an PXE Service -- [Acir Simulator](../acir-simulator/) +- [Acir 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. diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json index 3ade258964c5..665b47b2c1a7 100644 --- a/yarn-project/pxe/package.json +++ b/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", diff --git a/yarn-project/pxe/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts index a96176719595..5e5135ad1282 100644 --- a/yarn-project/pxe/src/contract_data_oracle/index.ts +++ b/yarn-project/pxe/src/contract_data_oracle/index.ts @@ -1,4 +1,4 @@ -import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/acir-simulator'; +import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator'; import { ContractDatabase } from '@aztec/circuit-types'; import { AztecAddress, diff --git a/yarn-project/pxe/src/database/note_dao.ts b/yarn-project/pxe/src/database/note_dao.ts index 1a7e3442dcd0..ce67c8d3eb5e 100644 --- a/yarn-project/pxe/src/database/note_dao.ts +++ b/yarn-project/pxe/src/database/note_dao.ts @@ -1,4 +1,4 @@ -import { NoteData } from '@aztec/acir-simulator'; +import { NoteData } from '@aztec/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'; diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts index fddbc987affe..c65ca65228c7 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts @@ -1,4 +1,4 @@ -import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator'; +import { ExecutionResult, NoteAndSlot } from '@aztec/simulator'; import { FunctionL2Logs, Note } from '@aztec/circuit-types'; import { FunctionData, diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts index 9cf90394791a..58f18cb18b98 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -1,4 +1,4 @@ -import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator'; +import { ExecutionResult, NoteAndSlot } from '@aztec/simulator'; import { AztecAddress, CallRequest, diff --git a/yarn-project/pxe/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts index 0b97ebf03263..8f7e157a0a78 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.test.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.test.ts @@ -1,4 +1,4 @@ -import { AcirSimulator } from '@aztec/acir-simulator'; +import { AcirSimulator } from '@aztec/simulator'; import { AztecNode, FunctionL2Logs, diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts index 0992685eaf1b..869cd227ef2c 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.ts @@ -1,4 +1,4 @@ -import { ContractNotFoundError } from '@aztec/acir-simulator'; +import { ContractNotFoundError } from '@aztec/simulator'; import { AztecNode, INITIAL_L2_BLOCK_NUM, diff --git a/yarn-project/pxe/src/note_processor/produce_note_dao.ts b/yarn-project/pxe/src/note_processor/produce_note_dao.ts index 14384dd6685a..66e031d5d90e 100644 --- a/yarn-project/pxe/src/note_processor/produce_note_dao.ts +++ b/yarn-project/pxe/src/note_processor/produce_note_dao.ts @@ -1,4 +1,4 @@ -import { AcirSimulator } from '@aztec/acir-simulator'; +import { AcirSimulator } from '@aztec/simulator'; import { L1NotePayload, TxHash } from '@aztec/circuit-types'; import { Fr, PublicKey } from '@aztec/circuits.js'; import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis'; diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index a90970194bf2..fba5babb397a 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -5,7 +5,7 @@ import { collectEnqueuedPublicFunctionCalls, collectUnencryptedLogs, resolveOpcodeLocations, -} from '@aztec/acir-simulator'; +} from '@aztec/simulator'; import { AuthWitness, AztecNode, diff --git a/yarn-project/pxe/src/simulator/index.ts b/yarn-project/pxe/src/simulator/index.ts index cb6d4c0dd812..d4232fc67848 100644 --- a/yarn-project/pxe/src/simulator/index.ts +++ b/yarn-project/pxe/src/simulator/index.ts @@ -1,4 +1,4 @@ -import { AcirSimulator } from '@aztec/acir-simulator'; +import { AcirSimulator } from '@aztec/simulator'; import { AztecNode, KeyStore } from '@aztec/circuit-types'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts index d631a405cdfd..526deafa8fe9 100644 --- a/yarn-project/pxe/src/simulator_oracle/index.ts +++ b/yarn-project/pxe/src/simulator_oracle/index.ts @@ -1,4 +1,4 @@ -import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/acir-simulator'; +import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator'; import { AztecNode, KeyStore, diff --git a/yarn-project/pxe/tsconfig.json b/yarn-project/pxe/tsconfig.json index 4af0483e9f27..06d0a5e93995 100644 --- a/yarn-project/pxe/tsconfig.json +++ b/yarn-project/pxe/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../acir-simulator" + "path": "../simulator" }, { "path": "../circuit-types" diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 40bf5fd98ee1..22a1bb28a401 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -32,7 +32,6 @@ "rootDir": "./src" }, "dependencies": { - "@aztec/acir-simulator": "workspace:^", "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", @@ -41,6 +40,7 @@ "@aztec/merkle-tree": "workspace:^", "@aztec/noir-protocol-circuits": "workspace:^", "@aztec/p2p": "workspace:^", + "@aztec/simulator": "workspace:^", "@aztec/types": "workspace:^", "@aztec/world-state": "workspace:^", "lodash.chunk": "^4.2.0", diff --git a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts index ccfaa3a1341f..f0ff3b9f878c 100644 --- a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts @@ -5,7 +5,7 @@ import { collectPublicDataReads, collectPublicDataUpdateRequests, isPublicExecutionResult, -} from '@aztec/acir-simulator'; +} from '@aztec/simulator'; import { FunctionL2Logs, MerkleTreeId, Tx } from '@aztec/circuit-types'; import { AztecAddress, diff --git a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts index 18a0ec368d3b..64ed265dc6a1 100644 --- a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts @@ -1,4 +1,4 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/acir-simulator'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { isArrayEmpty } from '@aztec/foundation/collection'; diff --git a/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts index 50cea90b51ee..e69f7d8c5a0b 100644 --- a/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts @@ -1,4 +1,4 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/acir-simulator'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; diff --git a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts index 48e225be8a86..e01281b55f72 100644 --- a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts @@ -1,4 +1,4 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/acir-simulator'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts index 56c9baff1fe6..1156814d8d5f 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts @@ -1,4 +1,4 @@ -import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/acir-simulator'; +import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/simulator'; import { ExtendedContractData, FunctionCall, diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.ts index de452d51c982..58dbc6d044ea 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.ts @@ -1,4 +1,4 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/acir-simulator'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { ContractDataSource, L1ToL2MessageSource, Tx } from '@aztec/circuit-types'; import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats'; import { GlobalVariables, Header, Proof, PublicKernelPublicInputs } from '@aztec/circuits.js'; diff --git a/yarn-project/sequencer-client/src/simulator/public_executor.ts b/yarn-project/sequencer-client/src/simulator/public_executor.ts index 7ee16c8e0bd1..44ca10c7e079 100644 --- a/yarn-project/sequencer-client/src/simulator/public_executor.ts +++ b/yarn-project/sequencer-client/src/simulator/public_executor.ts @@ -1,4 +1,4 @@ -import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/acir-simulator'; +import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator'; import { ContractDataSource, ExtendedContractData, L1ToL2MessageSource, MerkleTreeId, Tx } from '@aztec/circuit-types'; import { AztecAddress, diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index 7a1f29b14883..d17fa6334ab6 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../acir-simulator" + "path": "../simulator" }, { "path": "../circuit-types" diff --git a/yarn-project/acir-simulator/.eslintrc.cjs b/yarn-project/simulator/.eslintrc.cjs similarity index 100% rename from yarn-project/acir-simulator/.eslintrc.cjs rename to yarn-project/simulator/.eslintrc.cjs diff --git a/yarn-project/acir-simulator/README.md b/yarn-project/simulator/README.md similarity index 100% rename from yarn-project/acir-simulator/README.md rename to yarn-project/simulator/README.md diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/simulator/package.json similarity index 98% rename from yarn-project/acir-simulator/package.json rename to yarn-project/simulator/package.json index ccd51b8ba54f..935b03c60cca 100644 --- a/yarn-project/acir-simulator/package.json +++ b/yarn-project/simulator/package.json @@ -1,5 +1,5 @@ { - "name": "@aztec/acir-simulator", + "name": "@aztec/simulator", "version": "0.1.0", "type": "module", "exports": "./dest/index.js", diff --git a/yarn-project/acir-simulator/src/acvm/acvm.ts b/yarn-project/simulator/src/acvm/acvm.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/acvm.ts rename to yarn-project/simulator/src/acvm/acvm.ts diff --git a/yarn-project/acir-simulator/src/acvm/acvm_types.ts b/yarn-project/simulator/src/acvm/acvm_types.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/acvm_types.ts rename to yarn-project/simulator/src/acvm/acvm_types.ts diff --git a/yarn-project/acir-simulator/src/acvm/deserialize.ts b/yarn-project/simulator/src/acvm/deserialize.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/deserialize.ts rename to yarn-project/simulator/src/acvm/deserialize.ts diff --git a/yarn-project/acir-simulator/src/acvm/index.ts b/yarn-project/simulator/src/acvm/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/index.ts rename to yarn-project/simulator/src/acvm/index.ts diff --git a/yarn-project/acir-simulator/src/acvm/oracle/debug.ts b/yarn-project/simulator/src/acvm/oracle/debug.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/oracle/debug.ts rename to yarn-project/simulator/src/acvm/oracle/debug.ts diff --git a/yarn-project/acir-simulator/src/acvm/oracle/index.ts b/yarn-project/simulator/src/acvm/oracle/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/oracle/index.ts rename to yarn-project/simulator/src/acvm/oracle/index.ts diff --git a/yarn-project/acir-simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/oracle/oracle.ts rename to yarn-project/simulator/src/acvm/oracle/oracle.ts diff --git a/yarn-project/acir-simulator/src/acvm/oracle/typed_oracle.ts b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/oracle/typed_oracle.ts rename to yarn-project/simulator/src/acvm/oracle/typed_oracle.ts diff --git a/yarn-project/acir-simulator/src/acvm/serialize.ts b/yarn-project/simulator/src/acvm/serialize.ts similarity index 100% rename from yarn-project/acir-simulator/src/acvm/serialize.ts rename to yarn-project/simulator/src/acvm/serialize.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_context.test.ts b/yarn-project/simulator/src/avm/avm_context.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_context.test.ts rename to yarn-project/simulator/src/avm/avm_context.test.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_context.ts b/yarn-project/simulator/src/avm/avm_context.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_context.ts rename to yarn-project/simulator/src/avm/avm_context.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_execution_environment.test.ts b/yarn-project/simulator/src/avm/avm_execution_environment.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_execution_environment.test.ts rename to yarn-project/simulator/src/avm/avm_execution_environment.test.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_execution_environment.ts b/yarn-project/simulator/src/avm/avm_execution_environment.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_execution_environment.ts rename to yarn-project/simulator/src/avm/avm_execution_environment.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_machine_state.ts b/yarn-project/simulator/src/avm/avm_machine_state.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_machine_state.ts rename to yarn-project/simulator/src/avm/avm_machine_state.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_memory_types.test.ts b/yarn-project/simulator/src/avm/avm_memory_types.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_memory_types.test.ts rename to yarn-project/simulator/src/avm/avm_memory_types.test.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_memory_types.ts b/yarn-project/simulator/src/avm/avm_memory_types.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_memory_types.ts rename to yarn-project/simulator/src/avm/avm_memory_types.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_message_call_result.ts b/yarn-project/simulator/src/avm/avm_message_call_result.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_message_call_result.ts rename to yarn-project/simulator/src/avm/avm_message_call_result.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_simulator.test.ts rename to yarn-project/simulator/src/avm/avm_simulator.test.ts diff --git a/yarn-project/acir-simulator/src/avm/avm_simulator.ts b/yarn-project/simulator/src/avm/avm_simulator.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/avm_simulator.ts rename to yarn-project/simulator/src/avm/avm_simulator.ts diff --git a/yarn-project/acir-simulator/src/avm/errors.ts b/yarn-project/simulator/src/avm/errors.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/errors.ts rename to yarn-project/simulator/src/avm/errors.ts diff --git a/yarn-project/acir-simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/fixtures/index.ts rename to yarn-project/simulator/src/avm/fixtures/index.ts diff --git a/yarn-project/acir-simulator/src/avm/journal/host_storage.ts b/yarn-project/simulator/src/avm/journal/host_storage.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/journal/host_storage.ts rename to yarn-project/simulator/src/avm/journal/host_storage.ts diff --git a/yarn-project/acir-simulator/src/avm/journal/index.ts b/yarn-project/simulator/src/avm/journal/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/journal/index.ts rename to yarn-project/simulator/src/avm/journal/index.ts diff --git a/yarn-project/acir-simulator/src/avm/journal/journal.test.ts b/yarn-project/simulator/src/avm/journal/journal.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/journal/journal.test.ts rename to yarn-project/simulator/src/avm/journal/journal.test.ts diff --git a/yarn-project/acir-simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/journal/journal.ts rename to yarn-project/simulator/src/avm/journal/journal.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/.eslintrc.cjs b/yarn-project/simulator/src/avm/opcodes/.eslintrc.cjs similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/.eslintrc.cjs rename to yarn-project/simulator/src/avm/opcodes/.eslintrc.cjs diff --git a/yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.test.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.test.ts rename to yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.ts rename to yarn-project/simulator/src/avm/opcodes/accrued_substate.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.test.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/arithmetic.test.ts rename to yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts rename to yarn-project/simulator/src/avm/opcodes/arithmetic.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/bitwise.test.ts b/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/bitwise.test.ts rename to yarn-project/simulator/src/avm/opcodes/bitwise.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts b/yarn-project/simulator/src/avm/opcodes/bitwise.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts rename to yarn-project/simulator/src/avm/opcodes/bitwise.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/comparators.test.ts b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/comparators.test.ts rename to yarn-project/simulator/src/avm/opcodes/comparators.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/comparators.ts b/yarn-project/simulator/src/avm/opcodes/comparators.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/comparators.ts rename to yarn-project/simulator/src/avm/opcodes/comparators.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/control_flow.test.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/control_flow.test.ts rename to yarn-project/simulator/src/avm/opcodes/control_flow.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts rename to yarn-project/simulator/src/avm/opcodes/control_flow.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/environment_getters.test.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/environment_getters.test.ts rename to yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/environment_getters.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/environment_getters.ts rename to yarn-project/simulator/src/avm/opcodes/environment_getters.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/external_calls.test.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/external_calls.test.ts rename to yarn-project/simulator/src/avm/opcodes/external_calls.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/external_calls.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/external_calls.ts rename to yarn-project/simulator/src/avm/opcodes/external_calls.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/index.ts b/yarn-project/simulator/src/avm/opcodes/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/index.ts rename to yarn-project/simulator/src/avm/opcodes/index.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/instruction.ts b/yarn-project/simulator/src/avm/opcodes/instruction.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/instruction.ts rename to yarn-project/simulator/src/avm/opcodes/instruction.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/instruction_impl.ts b/yarn-project/simulator/src/avm/opcodes/instruction_impl.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/instruction_impl.ts rename to yarn-project/simulator/src/avm/opcodes/instruction_impl.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/memory.test.ts b/yarn-project/simulator/src/avm/opcodes/memory.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/memory.test.ts rename to yarn-project/simulator/src/avm/opcodes/memory.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/memory.ts b/yarn-project/simulator/src/avm/opcodes/memory.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/memory.ts rename to yarn-project/simulator/src/avm/opcodes/memory.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/storage.test.ts b/yarn-project/simulator/src/avm/opcodes/storage.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/storage.test.ts rename to yarn-project/simulator/src/avm/opcodes/storage.test.ts diff --git a/yarn-project/acir-simulator/src/avm/opcodes/storage.ts b/yarn-project/simulator/src/avm/opcodes/storage.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/opcodes/storage.ts rename to yarn-project/simulator/src/avm/opcodes/storage.ts diff --git a/yarn-project/acir-simulator/src/avm/serialization/buffer_cursor.ts b/yarn-project/simulator/src/avm/serialization/buffer_cursor.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/serialization/buffer_cursor.ts rename to yarn-project/simulator/src/avm/serialization/buffer_cursor.ts diff --git a/yarn-project/acir-simulator/src/avm/serialization/bytecode_serialization.test.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/serialization/bytecode_serialization.test.ts rename to yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts diff --git a/yarn-project/acir-simulator/src/avm/serialization/bytecode_serialization.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/serialization/bytecode_serialization.ts rename to yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts diff --git a/yarn-project/acir-simulator/src/avm/serialization/instruction_serialization.test.ts b/yarn-project/simulator/src/avm/serialization/instruction_serialization.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/serialization/instruction_serialization.test.ts rename to yarn-project/simulator/src/avm/serialization/instruction_serialization.test.ts diff --git a/yarn-project/acir-simulator/src/avm/serialization/instruction_serialization.ts b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts similarity index 100% rename from yarn-project/acir-simulator/src/avm/serialization/instruction_serialization.ts rename to yarn-project/simulator/src/avm/serialization/instruction_serialization.ts diff --git a/yarn-project/acir-simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/client_execution_context.ts rename to yarn-project/simulator/src/client/client_execution_context.ts diff --git a/yarn-project/acir-simulator/src/client/db_oracle.ts b/yarn-project/simulator/src/client/db_oracle.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/db_oracle.ts rename to yarn-project/simulator/src/client/db_oracle.ts diff --git a/yarn-project/acir-simulator/src/client/execution_note_cache.ts b/yarn-project/simulator/src/client/execution_note_cache.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/execution_note_cache.ts rename to yarn-project/simulator/src/client/execution_note_cache.ts diff --git a/yarn-project/acir-simulator/src/client/execution_result.test.ts b/yarn-project/simulator/src/client/execution_result.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/execution_result.test.ts rename to yarn-project/simulator/src/client/execution_result.test.ts diff --git a/yarn-project/acir-simulator/src/client/execution_result.ts b/yarn-project/simulator/src/client/execution_result.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/execution_result.ts rename to yarn-project/simulator/src/client/execution_result.ts diff --git a/yarn-project/acir-simulator/src/client/index.ts b/yarn-project/simulator/src/client/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/index.ts rename to yarn-project/simulator/src/client/index.ts diff --git a/yarn-project/acir-simulator/src/client/pick_notes.test.ts b/yarn-project/simulator/src/client/pick_notes.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/pick_notes.test.ts rename to yarn-project/simulator/src/client/pick_notes.test.ts diff --git a/yarn-project/acir-simulator/src/client/pick_notes.ts b/yarn-project/simulator/src/client/pick_notes.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/pick_notes.ts rename to yarn-project/simulator/src/client/pick_notes.ts diff --git a/yarn-project/acir-simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/private_execution.test.ts rename to yarn-project/simulator/src/client/private_execution.test.ts diff --git a/yarn-project/acir-simulator/src/client/private_execution.ts b/yarn-project/simulator/src/client/private_execution.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/private_execution.ts rename to yarn-project/simulator/src/client/private_execution.ts diff --git a/yarn-project/acir-simulator/src/client/simulator.test.ts b/yarn-project/simulator/src/client/simulator.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/simulator.test.ts rename to yarn-project/simulator/src/client/simulator.test.ts diff --git a/yarn-project/acir-simulator/src/client/simulator.ts b/yarn-project/simulator/src/client/simulator.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/simulator.ts rename to yarn-project/simulator/src/client/simulator.ts diff --git a/yarn-project/acir-simulator/src/client/unconstrained_execution.test.ts b/yarn-project/simulator/src/client/unconstrained_execution.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/unconstrained_execution.test.ts rename to yarn-project/simulator/src/client/unconstrained_execution.test.ts diff --git a/yarn-project/acir-simulator/src/client/unconstrained_execution.ts b/yarn-project/simulator/src/client/unconstrained_execution.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/unconstrained_execution.ts rename to yarn-project/simulator/src/client/unconstrained_execution.ts diff --git a/yarn-project/acir-simulator/src/client/view_data_oracle.ts b/yarn-project/simulator/src/client/view_data_oracle.ts similarity index 100% rename from yarn-project/acir-simulator/src/client/view_data_oracle.ts rename to yarn-project/simulator/src/client/view_data_oracle.ts diff --git a/yarn-project/acir-simulator/src/common/errors.ts b/yarn-project/simulator/src/common/errors.ts similarity index 100% rename from yarn-project/acir-simulator/src/common/errors.ts rename to yarn-project/simulator/src/common/errors.ts diff --git a/yarn-project/acir-simulator/src/common/index.ts b/yarn-project/simulator/src/common/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/common/index.ts rename to yarn-project/simulator/src/common/index.ts diff --git a/yarn-project/acir-simulator/src/common/packed_args_cache.ts b/yarn-project/simulator/src/common/packed_args_cache.ts similarity index 100% rename from yarn-project/acir-simulator/src/common/packed_args_cache.ts rename to yarn-project/simulator/src/common/packed_args_cache.ts diff --git a/yarn-project/acir-simulator/src/common/side_effect_counter.ts b/yarn-project/simulator/src/common/side_effect_counter.ts similarity index 100% rename from yarn-project/acir-simulator/src/common/side_effect_counter.ts rename to yarn-project/simulator/src/common/side_effect_counter.ts diff --git a/yarn-project/acir-simulator/src/index.ts b/yarn-project/simulator/src/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/index.ts rename to yarn-project/simulator/src/index.ts diff --git a/yarn-project/acir-simulator/src/public/db.ts b/yarn-project/simulator/src/public/db.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/db.ts rename to yarn-project/simulator/src/public/db.ts diff --git a/yarn-project/acir-simulator/src/public/execution.ts b/yarn-project/simulator/src/public/execution.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/execution.ts rename to yarn-project/simulator/src/public/execution.ts diff --git a/yarn-project/acir-simulator/src/public/executor.ts b/yarn-project/simulator/src/public/executor.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/executor.ts rename to yarn-project/simulator/src/public/executor.ts diff --git a/yarn-project/acir-simulator/src/public/index.test.ts b/yarn-project/simulator/src/public/index.test.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/index.test.ts rename to yarn-project/simulator/src/public/index.test.ts diff --git a/yarn-project/acir-simulator/src/public/index.ts b/yarn-project/simulator/src/public/index.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/index.ts rename to yarn-project/simulator/src/public/index.ts diff --git a/yarn-project/acir-simulator/src/public/public_execution_context.ts b/yarn-project/simulator/src/public/public_execution_context.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/public_execution_context.ts rename to yarn-project/simulator/src/public/public_execution_context.ts diff --git a/yarn-project/acir-simulator/src/public/state_actions.ts b/yarn-project/simulator/src/public/state_actions.ts similarity index 100% rename from yarn-project/acir-simulator/src/public/state_actions.ts rename to yarn-project/simulator/src/public/state_actions.ts diff --git a/yarn-project/acir-simulator/src/test/utils.ts b/yarn-project/simulator/src/test/utils.ts similarity index 100% rename from yarn-project/acir-simulator/src/test/utils.ts rename to yarn-project/simulator/src/test/utils.ts diff --git a/yarn-project/acir-simulator/src/utils.ts b/yarn-project/simulator/src/utils.ts similarity index 100% rename from yarn-project/acir-simulator/src/utils.ts rename to yarn-project/simulator/src/utils.ts diff --git a/yarn-project/acir-simulator/tsconfig.json b/yarn-project/simulator/tsconfig.json similarity index 100% rename from yarn-project/acir-simulator/tsconfig.json rename to yarn-project/simulator/tsconfig.json diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json index 7100672a7f2b..35b0d6c76b6c 100644 --- a/yarn-project/tsconfig.json +++ b/yarn-project/tsconfig.json @@ -19,7 +19,7 @@ }, "references": [ { "path": "accounts/tsconfig.json" }, - { "path": "acir-simulator/tsconfig.json" }, + { "path": "simulator/tsconfig.json" }, { "path": "archiver/tsconfig.json" }, { "path": "aztec-faucet/tsconfig.json" }, { "path": "aztec.js/tsconfig.json" }, diff --git a/yarn-project/typedoc.json b/yarn-project/typedoc.json index f2e4de84a01f..a5dee75ec5fe 100644 --- a/yarn-project/typedoc.json +++ b/yarn-project/typedoc.json @@ -3,7 +3,7 @@ "entryPointStrategy": "packages", "entryPoints": [ "accounts", - "acir-simulator", + "simulator", "archiver", "aztec-cli", "pxe", diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 472b7df6b997..b3d58b9e7800 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -87,34 +87,6 @@ __metadata: languageName: unknown linkType: soft -"@aztec/acir-simulator@workspace:^, @aztec/acir-simulator@workspace:acir-simulator": - version: 0.0.0-use.local - resolution: "@aztec/acir-simulator@workspace:acir-simulator" - dependencies: - "@aztec/circuit-types": "workspace:^" - "@aztec/circuits.js": "workspace:^" - "@aztec/foundation": "workspace:^" - "@aztec/kv-store": "workspace:^" - "@aztec/merkle-tree": "workspace:^" - "@aztec/noir-contracts": "workspace:^" - "@jest/globals": ^29.5.0 - "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js" - "@types/jest": ^29.5.0 - "@types/levelup": ^5.1.3 - "@types/memdown": ^3.0.2 - "@types/node": ^18.7.23 - jest: ^29.5.0 - jest-mock-extended: ^3.0.4 - levelup: ^5.1.1 - memdown: ^6.1.1 - ts-jest: ^29.1.0 - ts-node: ^10.9.1 - tslib: ^2.4.0 - typescript: ^5.0.4 - viem: ^1.2.5 - languageName: unknown - linkType: soft - "@aztec/archiver@workspace:^, @aztec/archiver@workspace:archiver": version: 0.0.0-use.local resolution: "@aztec/archiver@workspace:archiver" @@ -753,7 +725,6 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/pxe@workspace:pxe" dependencies: - "@aztec/acir-simulator": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" @@ -763,6 +734,7 @@ __metadata: "@aztec/noir-compiler": "workspace:^" "@aztec/noir-contracts": "workspace:^" "@aztec/noir-protocol-circuits": "workspace:^" + "@aztec/simulator": "workspace:^" "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 @@ -812,7 +784,6 @@ __metadata: version: 0.0.0-use.local resolution: "@aztec/sequencer-client@workspace:sequencer-client" dependencies: - "@aztec/acir-simulator": "workspace:^" "@aztec/circuit-types": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" @@ -822,6 +793,7 @@ __metadata: "@aztec/merkle-tree": "workspace:^" "@aztec/noir-protocol-circuits": "workspace:^" "@aztec/p2p": "workspace:^" + "@aztec/simulator": "workspace:^" "@aztec/types": "workspace:^" "@aztec/world-state": "workspace:^" "@jest/globals": ^29.5.0 @@ -848,6 +820,34 @@ __metadata: languageName: unknown linkType: soft +"@aztec/simulator@workspace:^, @aztec/simulator@workspace:simulator": + version: 0.0.0-use.local + resolution: "@aztec/simulator@workspace:simulator" + dependencies: + "@aztec/circuit-types": "workspace:^" + "@aztec/circuits.js": "workspace:^" + "@aztec/foundation": "workspace:^" + "@aztec/kv-store": "workspace:^" + "@aztec/merkle-tree": "workspace:^" + "@aztec/noir-contracts": "workspace:^" + "@jest/globals": ^29.5.0 + "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js" + "@types/jest": ^29.5.0 + "@types/levelup": ^5.1.3 + "@types/memdown": ^3.0.2 + "@types/node": ^18.7.23 + jest: ^29.5.0 + jest-mock-extended: ^3.0.4 + levelup: ^5.1.1 + memdown: ^6.1.1 + ts-jest: ^29.1.0 + ts-node: ^10.9.1 + tslib: ^2.4.0 + typescript: ^5.0.4 + viem: ^1.2.5 + languageName: unknown + linkType: soft + "@aztec/types@workspace:^, @aztec/types@workspace:types": version: 0.0.0-use.local resolution: "@aztec/types@workspace:types" From 5471217497365f62222f9e3df0813789fe81ff52 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:09:29 +0000 Subject: [PATCH 2/5] fix: forge fmt --- l1-contracts/src/core/libraries/ConstantsGen.sol | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol index a76f193a9537..4c31fc92340f 100644 --- a/l1-contracts/src/core/libraries/ConstantsGen.sol +++ b/l1-contracts/src/core/libraries/ConstantsGen.sol @@ -67,7 +67,8 @@ library Constants { uint256 internal constant ARGS_HASH_CHUNK_LENGTH = 32; uint256 internal constant ARGS_HASH_CHUNK_COUNT = 32; uint256 internal constant MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 1000; - uint256 internal constant CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8; + uint256 internal constant CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = + 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8; uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 8; uint256 internal constant L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 25; uint256 internal constant MAX_NOTE_FIELDS_LENGTH = 20; From 9a9689ef4fa541e41db94cdc4c84530acc4333af Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:08:12 +0000 Subject: [PATCH 3/5] fix: formatting --- .../pxe/src/contract_data_oracle/index.ts | 2 +- yarn-project/pxe/src/database/note_dao.ts | 2 +- .../pxe/src/kernel_prover/kernel_prover.test.ts | 2 +- .../pxe/src/kernel_prover/kernel_prover.ts | 2 +- .../src/note_processor/note_processor.test.ts | 2 +- .../pxe/src/note_processor/note_processor.ts | 2 +- .../pxe/src/note_processor/produce_note_dao.ts | 2 +- yarn-project/pxe/src/pxe_service/pxe_service.ts | 16 ++++++++-------- yarn-project/pxe/src/simulator/index.ts | 2 +- yarn-project/pxe/src/simulator_oracle/index.ts | 2 +- .../src/sequencer/abstract_phase_manager.ts | 16 ++++++++-------- .../sequencer/application_logic_phase_manager.ts | 2 +- .../sequencer/fee_distribution_phase_manager.ts | 2 +- .../sequencer/fee_preparation_phase_manager.ts | 2 +- .../src/sequencer/public_processor.test.ts | 2 +- .../src/sequencer/public_processor.ts | 2 +- .../src/simulator/public_executor.ts | 2 +- yarn-project/simulator/package.json | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/yarn-project/pxe/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts index 5e5135ad1282..0a2f65195240 100644 --- a/yarn-project/pxe/src/contract_data_oracle/index.ts +++ b/yarn-project/pxe/src/contract_data_oracle/index.ts @@ -1,4 +1,3 @@ -import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/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'; diff --git a/yarn-project/pxe/src/database/note_dao.ts b/yarn-project/pxe/src/database/note_dao.ts index ce67c8d3eb5e..a8ae6e2e9f53 100644 --- a/yarn-project/pxe/src/database/note_dao.ts +++ b/yarn-project/pxe/src/database/note_dao.ts @@ -1,8 +1,8 @@ -import { NoteData } from '@aztec/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. diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts index c65ca65228c7..a27752123a4f 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts @@ -1,4 +1,3 @@ -import { ExecutionResult, NoteAndSlot } from '@aztec/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'; diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts index 58f18cb18b98..3977d4bf0147 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -1,4 +1,3 @@ -import { ExecutionResult, NoteAndSlot } from '@aztec/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'; diff --git a/yarn-project/pxe/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts index 8f7e157a0a78..9b5b4d67bf82 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.test.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.test.ts @@ -1,4 +1,3 @@ -import { AcirSimulator } from '@aztec/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'; diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts index 869cd227ef2c..4ed256273170 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.ts @@ -1,4 +1,3 @@ -import { ContractNotFoundError } from '@aztec/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'; diff --git a/yarn-project/pxe/src/note_processor/produce_note_dao.ts b/yarn-project/pxe/src/note_processor/produce_note_dao.ts index 66e031d5d90e..80a2bdbe1df4 100644 --- a/yarn-project/pxe/src/note_processor/produce_note_dao.ts +++ b/yarn-project/pxe/src/note_processor/produce_note_dao.ts @@ -1,7 +1,7 @@ -import { AcirSimulator } from '@aztec/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'; diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index fba5babb397a..6e5faac09053 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -1,11 +1,3 @@ -import { - AcirSimulator, - ExecutionResult, - collectEncryptedLogs, - collectEnqueuedPublicFunctionCalls, - collectUnencryptedLogs, - resolveOpcodeLocations, -} from '@aztec/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'; diff --git a/yarn-project/pxe/src/simulator/index.ts b/yarn-project/pxe/src/simulator/index.ts index d4232fc67848..40d30a9198db 100644 --- a/yarn-project/pxe/src/simulator/index.ts +++ b/yarn-project/pxe/src/simulator/index.ts @@ -1,5 +1,5 @@ -import { AcirSimulator } from '@aztec/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'; diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts index 526deafa8fe9..8856cbeb2058 100644 --- a/yarn-project/pxe/src/simulator_oracle/index.ts +++ b/yarn-project/pxe/src/simulator_oracle/index.ts @@ -1,4 +1,3 @@ -import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator'; import { AztecNode, KeyStore, @@ -19,6 +18,7 @@ import { } from '@aztec/circuits.js'; import { FunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi'; import { createDebugLogger } from '@aztec/foundation/log'; +import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; import { PxeDatabase } from '../database/index.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts index f0ff3b9f878c..abedccab59f6 100644 --- a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts @@ -1,11 +1,3 @@ -import { - PublicExecution, - PublicExecutionResult, - PublicExecutor, - collectPublicDataReads, - collectPublicDataUpdateRequests, - isPublicExecutionResult, -} from '@aztec/simulator'; import { FunctionL2Logs, MerkleTreeId, Tx } from '@aztec/circuit-types'; import { AztecAddress, @@ -45,6 +37,14 @@ import { computeVarArgsHash } from '@aztec/circuits.js/abis'; import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection'; import { createDebugLogger } from '@aztec/foundation/log'; import { to2Fields } from '@aztec/foundation/serialize'; +import { + PublicExecution, + PublicExecutionResult, + PublicExecutor, + collectPublicDataReads, + collectPublicDataUpdateRequests, + isPublicExecutionResult, +} from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; import { getVerificationKeys } from '../mocks/verification_keys.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts index 64ed265dc6a1..12d147ab9c10 100644 --- a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts @@ -1,8 +1,8 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { isArrayEmpty } from '@aztec/foundation/collection'; import { createDebugLogger } from '@aztec/foundation/log'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; import { PublicProver } from '../prover/index.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts index e69f7d8c5a0b..b90bc544b6b9 100644 --- a/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/fee_distribution_phase_manager.ts @@ -1,7 +1,7 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; import { PublicProver } from '../prover/index.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts index e01281b55f72..7923ea8cbfc5 100644 --- a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts @@ -1,7 +1,7 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { Tx } from '@aztec/circuit-types'; import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; import { PublicProver } from '../prover/index.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts index 1156814d8d5f..dfa2fa4821bc 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts @@ -1,4 +1,3 @@ -import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/simulator'; import { ExtendedContractData, FunctionCall, @@ -36,6 +35,7 @@ import { } from '@aztec/circuits.js/factories'; import { makeTuple } from '@aztec/foundation/array'; import { padArrayEnd, times } from '@aztec/foundation/collection'; +import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/simulator'; import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state'; import { MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.ts index 58dbc6d044ea..aa85da97d641 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.ts @@ -1,9 +1,9 @@ -import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { ContractDataSource, L1ToL2MessageSource, Tx } from '@aztec/circuit-types'; import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats'; import { GlobalVariables, Header, Proof, PublicKernelPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; import { EmptyPublicProver } from '../prover/empty.js'; diff --git a/yarn-project/sequencer-client/src/simulator/public_executor.ts b/yarn-project/sequencer-client/src/simulator/public_executor.ts index 44ca10c7e079..5d9ac0cd0002 100644 --- a/yarn-project/sequencer-client/src/simulator/public_executor.ts +++ b/yarn-project/sequencer-client/src/simulator/public_executor.ts @@ -1,4 +1,3 @@ -import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator'; import { ContractDataSource, ExtendedContractData, L1ToL2MessageSource, MerkleTreeId, Tx } from '@aztec/circuit-types'; import { AztecAddress, @@ -9,6 +8,7 @@ import { PublicDataTreeLeafPreimage, } from '@aztec/circuits.js'; import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/abis'; +import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator'; import { MerkleTreeOperations } from '@aztec/world-state'; /** diff --git a/yarn-project/simulator/package.json b/yarn-project/simulator/package.json index 935b03c60cca..0f55f685910a 100644 --- a/yarn-project/simulator/package.json +++ b/yarn-project/simulator/package.json @@ -7,7 +7,7 @@ "entryPoints": [ "./src/index.ts" ], - "name": "Acir Simulator", + "name": "Simulator", "tsconfig": "./tsconfig.json" }, "scripts": { From 0a50dbdd109dca0ee8ba1b8eba54c6da9850eeef Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:09:20 +0000 Subject: [PATCH 4/5] clean --- barretenberg/cpp/pil/avm/avm.pil | 191 ------------------------------- 1 file changed, 191 deletions(-) delete mode 100644 barretenberg/cpp/pil/avm/avm.pil diff --git a/barretenberg/cpp/pil/avm/avm.pil b/barretenberg/cpp/pil/avm/avm.pil deleted file mode 100644 index 26268fe25cd9..000000000000 --- a/barretenberg/cpp/pil/avm/avm.pil +++ /dev/null @@ -1,191 +0,0 @@ - -include "mem_trace.pil"; -include "alu_chip.pil"; - -namespace avmMini(256); - - //===== CONSTANT POLYNOMIALS ================================================== - pol constant clk(i) { i }; - pol constant first = [1] + [0]*; // Used mostly to toggle off the first row consisting - // only in first element of shifted polynomials. - - //===== CONTROL FLOW ========================================================== - // Program counter - pol commit pc; - // Return Pointer - pol commit internal_return_ptr; - - pol commit sel_internal_call; - pol commit sel_internal_return; - pol commit sel_jump; - - // Halt program execution - pol commit sel_halt; - - //===== TABLE SUBOP-TR ======================================================== - // Boolean selectors for (sub-)operations. Only one operation is activated at - // a time. - - // ADD - pol commit sel_op_add; - // SUB - pol commit sel_op_sub; - // MUL - pol commit sel_op_mul; - // DIV - pol commit sel_op_div; - - // Instruction memory tag (0: uninitialized, 1: u8, 2: u16, 3: u32, 4: u64, 5: u128, 6:field) - pol commit in_tag; - - // Errors - pol commit op_err; // Boolean flag pertaining to an operation error - pol commit tag_err; // Boolean flag (foreign key to memTrace.m_tag_err) - - // A helper witness being the inverse of some value - // to show a non-zero equality - pol commit inv; - - // Intermediate register values - pol commit ia; - pol commit ib; - pol commit ic; - - // Memory operation per intermediate register - pol commit mem_op_a; - pol commit mem_op_b; - pol commit mem_op_c; - - // Read-write flag per intermediate register: Read = 0, Write = 1 - pol commit rwa; - pol commit rwb; - pol commit rwc; - - // Memory index involved into a memory operation per pertaining intermediate register - // We should range constrain it to 32 bits ultimately. For first mini-AVM, - // we will assume that these columns are of the right type. - pol commit mem_idx_a; - pol commit mem_idx_b; - pol commit mem_idx_c; - - - // Track the last line of the execution trace. It does NOT correspond to the last row of the whole table - // of size N. As this depends on the supplied bytecode, this polynomial cannot be constant. - pol commit last; - - // Relations on type constraints - - sel_op_add * (1 - sel_op_add) = 0; - sel_op_sub * (1 - sel_op_sub) = 0; - sel_op_mul * (1 - sel_op_mul) = 0; - sel_op_div * (1 - sel_op_div) = 0; - - sel_internal_call * (1 - sel_internal_call) = 0; - sel_internal_return * (1 - sel_internal_return) = 0; - sel_jump * (1 - sel_jump) = 0; - sel_halt * (1 - sel_halt) = 0; - - op_err * (1 - op_err) = 0; - tag_err * (1 - tag_err) = 0; // Potential optimization (boolean constraint derivation from equivalence check to memTrace)? - - mem_op_a * (1 - mem_op_a) = 0; - mem_op_b * (1 - mem_op_b) = 0; - mem_op_c * (1 - mem_op_c) = 0; - - rwa * (1 - rwa) = 0; - rwb * (1 - rwb) = 0; - rwc * (1 - rwc) = 0; - - // TODO: Constrain rwa, rwb, rwc to u32 type and 0 <= in_tag <= 6 - - // Set intermediate registers to 0 whenever tag_err occurs - tag_err * ia = 0; - tag_err * ib = 0; - tag_err * ic = 0; - - // Relation for division over the finite field - // If tag_err == 1 in a division, then ib == 0 and op_err == 1. - #[SUBOP_DIVISION_FF] - sel_op_div * (1 - op_err) * (ic * ib - ia) = 0; - - // When sel_op_div == 1, we want ib == 0 <==> op_err == 1 - // This can be achieved with the 2 following relations. - // inv is an extra witness to show that we can invert ib, i.e., inv = ib^(-1) - // If ib == 0, we have to set inv = 1 to satisfy the second relation, - // because op_err == 1 from the first relation. - #[SUBOP_DIVISION_ZERO_ERR1] - sel_op_div * (ib * inv - 1 + op_err) = 0; - #[SUBOP_DIVISION_ZERO_ERR2] - sel_op_div * op_err * (1 - inv) = 0; - - // op_err cannot be maliciously activated for a non-relevant - // operation selector, i.e., op_err == 1 ==> sel_op_div || sel_op_XXX || ... - // op_err * (sel_op_div + sel_op_XXX + ... - 1) == 0 - // Note that the above is even a stronger constraint, as it shows - // that exactly one sel_op_XXX must be true. - // At this time, we have only division producing an error. - #[SUBOP_ERROR_RELEVANT_OP] - op_err * (sel_op_div - 1) = 0; - - // TODO: constraint that we stop execution at the first error (tag_err or op_err) - // An error can only happen at the last sub-operation row. - - // OPEN/POTENTIAL OPTIMIZATION: Dedicated error per relevant operation? - // For the division, we could lower the degree from 4 to 3 - // (sel_op_div - op_div_err) * (ic * ib - ia) = 0; - // Same for the relations related to the error activation: - // (ib * inv - 1 + op_div_err) = 0 && op_err * (1 - inv) = 0 - // This works in combination with op_div_err * (sel_op_div - 1) = 0; - // Drawback is the need to paralllelize the latter. - - //===== CONTROL FLOW ======================================================= - //===== JUMP =============================================================== - sel_jump * (pc' - ia) = 0; - - //===== INTERNAL_CALL ====================================================== - // - The program counter in the next row should be equal to the value loaded from the ia register - // - We then write the return location (pc + 1) into the call stack (in memory) - - #[RETURN_POINTER_INCREMENT] - sel_internal_call * (internal_return_ptr' - (internal_return_ptr + 1)) = 0; - sel_internal_call * (internal_return_ptr - mem_idx_b) = 0; - sel_internal_call * (pc' - ia) = 0; - sel_internal_call * ((pc + 1) - ib) = 0; - - // TODO(md): Below relations may be removed through sub-op table lookup - sel_internal_call * (rwb - 1) = 0; - sel_internal_call * (mem_op_b - 1) = 0; - - //===== INTERNAL_RETURN =================================================== - // - We load the memory pointer to be the internal_return_ptr - // - Constrain then next program counter to be the loaded value - // - decrement the internal_return_ptr - - #[RETURN_POINTER_DECREMENT] - sel_internal_return * (internal_return_ptr' - (internal_return_ptr - 1)) = 0; - sel_internal_return * ((internal_return_ptr - 1) - mem_idx_a) = 0; - sel_internal_return * (pc' - ia) = 0; - - // TODO(md): Below relations may be removed through sub-op table lookup - sel_internal_return * rwa = 0; - sel_internal_return * (mem_op_a - 1) = 0; - - //===== CONTROL_FLOW_CONSISTENCY ============================================ - pol INTERNAL_CALL_STACK_SELECTORS = (first + sel_internal_call + sel_internal_return + sel_halt); - pol OPCODE_SELECTORS = (sel_op_add + sel_op_sub + sel_op_div + sel_op_mul); - - // Program counter must increment if not jumping or returning - #[PC_INCREMENT] - (1 - first) * (1 - sel_halt) * OPCODE_SELECTORS * (pc' - (pc + 1)) = 0; - - // first == 0 && sel_internal_call == 0 && sel_internal_return == 0 && sel_halt == 0 ==> internal_return_ptr == internal_return_ptr' - #[INTERNAL_RETURN_POINTER_CONSISTENCY] - (1 - INTERNAL_CALL_STACK_SELECTORS) * (internal_return_ptr' - internal_return_ptr) = 0; - - // TODO: we want to set an initial number for the reserved memory of the jump pointer - - // Inter-table Constraints - - // TODO: tag_err {clk} IS memTrace.m_tag_err {memTrace.m_clk} - // TODO: Map memory trace with intermediate register values whenever there is no tag error, sthg like: - // mem_op_a * (1 - tag_err) {mem_idx_a, clk, ia, rwa} IS m_sub_clk == 0 && 1 - m_tag_err {m_addr, m_clk, m_val, m_rw} From 33f189b746e3ac45b0317335bb0420b8ee67be5c Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:50:54 +0000 Subject: [PATCH 5/5] fix --- yarn-project/pxe/README.md | 2 +- yarn-project/simulator/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn-project/pxe/README.md b/yarn-project/pxe/README.md index 728445473dc5..3cc76c417752 100644 --- a/yarn-project/pxe/README.md +++ b/yarn-project/pxe/README.md @@ -6,7 +6,7 @@ ### Main Components in an PXE Service -- [Acir Simulator](../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. diff --git a/yarn-project/simulator/README.md b/yarn-project/simulator/README.md index bc61142d327f..41b8fe31baf6 100644 --- a/yarn-project/simulator/README.md +++ b/yarn-project/simulator/README.md @@ -1,8 +1,8 @@ -# ACIR Simulator +# Simulator ## Responsibilities -This library package is responsible for simulating function circuits compiled to ACIR. +This library package is responsible for simulating function circuits compiled to ACIR / AVM. Simulating a function implies generating the partial witness and the public inputs of the function, as well as collecting all the data (such as created notes or nullifiers, or state changes) that are necessary for components upstream.