From a158b9a679ee27dd56c531ea507e5c7313b6eed5 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 26 Sep 2023 16:08:55 +0000 Subject: [PATCH] pxe package --- .circleci/config.yml | 6 +- README.md | 2 +- .../dev_docs/getting_started/quickstart.md | 2 +- docs/docs/dev_docs/getting_started/sandbox.md | 10 +-- .../tutorials/writing_dapp/rpc_server.md | 2 +- .../tutorials/writing_token_contract.md | 4 +- .../wallets/creating_schnorr_accounts.md | 2 +- docs/docusaurus.config.js | 4 +- docs/scripts/build.sh | 2 +- docs/sidebars.js | 2 +- yarn-project/aztec-node/README.md | 2 +- yarn-project/aztec-sandbox/Dockerfile | 4 +- yarn-project/aztec-sandbox/package.json | 2 +- yarn-project/aztec-sandbox/src/sandbox.ts | 2 +- yarn-project/aztec-sandbox/src/server.ts | 2 +- yarn-project/aztec-sandbox/tsconfig.json | 6 +- yarn-project/aztec.js/README.md | 2 +- yarn-project/deploy_npm.sh | 2 +- yarn-project/end-to-end/package.json | 2 +- .../end-to-end/src/aztec_rpc_sandbox.test.ts | 2 +- .../end-to-end/src/e2e_2_rpc_servers.test.ts | 2 +- .../end-to-end/src/e2e_cheat_codes.test.ts | 2 +- yarn-project/end-to-end/src/e2e_cli.test.ts | 2 +- .../end-to-end/src/e2e_p2p_network.test.ts | 7 +- .../src/fixtures/cross_chain_test_harness.ts | 2 +- yarn-project/end-to-end/src/fixtures/utils.ts | 12 ++-- yarn-project/end-to-end/tsconfig.json | 6 +- yarn-project/key-store/README.md | 2 +- yarn-project/package.json | 2 +- yarn-project/{aztec-rpc => pxe}/.eslintrc.cjs | 0 yarn-project/{aztec-rpc => pxe}/Dockerfile | 6 +- yarn-project/{aztec-rpc => pxe}/README.md | 0 yarn-project/{aztec-rpc => pxe}/package.json | 2 +- .../aztec_rpc_http/aztec_rpc_http_server.ts | 0 .../src/aztec_rpc_http/index.ts | 0 .../src/aztec_rpc_server/aztec_rpc_server.ts | 0 .../create_aztec_rpc_server.ts | 0 .../src/aztec_rpc_server/index.ts | 0 .../test/aztec_rpc_server.test.ts | 0 .../test/aztec_rpc_test_suite.ts | 0 .../{aztec-rpc => pxe}/src/config/index.ts | 0 .../src/contract_data_oracle/index.ts | 0 .../src/contract_database/index.ts | 0 .../memory_contract_database.ts | 0 .../src/contract_tree/index.ts | 0 .../src/database/database.ts | 0 .../{aztec-rpc => pxe}/src/database/index.ts | 0 .../src/database/memory_db.test.ts | 0 .../src/database/memory_db.ts | 0 .../src/database/note_spending_info_dao.ts | 0 yarn-project/{aztec-rpc => pxe}/src/index.ts | 0 .../src/kernel_oracle/index.ts | 0 .../src/kernel_prover/index.ts | 0 .../src/kernel_prover/kernel_prover.test.ts | 0 .../src/kernel_prover/kernel_prover.ts | 0 .../src/kernel_prover/proof_creator.ts | 0 .../src/kernel_prover/proving_data_oracle.ts | 0 .../src/note_processor/index.ts | 0 .../src/note_processor/note_processor.test.ts | 0 .../src/note_processor/note_processor.ts | 0 .../{aztec-rpc => pxe}/src/simulator/index.ts | 0 .../src/simulator_oracle/index.ts | 0 .../src/synchronizer/index.ts | 0 .../src/synchronizer/synchronizer.test.ts | 0 .../src/synchronizer/synchronizer.ts | 0 yarn-project/{aztec-rpc => pxe}/tsconfig.json | 0 yarn-project/tsconfig.json | 2 +- yarn-project/typedoc.json | 2 +- yarn-project/yarn.lock | 66 +++++++++---------- 69 files changed, 86 insertions(+), 91 deletions(-) rename yarn-project/{aztec-rpc => pxe}/.eslintrc.cjs (100%) rename yarn-project/{aztec-rpc => pxe}/Dockerfile (64%) rename yarn-project/{aztec-rpc => pxe}/README.md (100%) rename yarn-project/{aztec-rpc => pxe}/package.json (98%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_http/aztec_rpc_http_server.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_http/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_server/aztec_rpc_server.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_server/create_aztec_rpc_server.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_server/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_server/test/aztec_rpc_server.test.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/aztec_rpc_server/test/aztec_rpc_test_suite.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/config/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/contract_data_oracle/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/contract_database/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/contract_database/memory_contract_database.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/contract_tree/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/database/database.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/database/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/database/memory_db.test.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/database/memory_db.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/database/note_spending_info_dao.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_oracle/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_prover/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_prover/kernel_prover.test.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_prover/kernel_prover.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_prover/proof_creator.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/kernel_prover/proving_data_oracle.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/note_processor/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/note_processor/note_processor.test.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/note_processor/note_processor.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/simulator/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/simulator_oracle/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/synchronizer/index.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/synchronizer/synchronizer.test.ts (100%) rename yarn-project/{aztec-rpc => pxe}/src/synchronizer/synchronizer.ts (100%) rename yarn-project/{aztec-rpc => pxe}/tsconfig.json (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 072f9d8e5922..ede0e6e01f3e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -817,7 +817,7 @@ jobs: name: "Test" command: cond_run_script end-to-end ./scripts/run_tests_local e2e_card_game.test.ts - aztec-rpc-sandbox: + pxe-sandbox: machine: image: ubuntu-2204:2023.07.2 resource_class: large @@ -1214,7 +1214,7 @@ workflows: - e2e-canary-test: *e2e_test - e2e-browser-sandbox: *e2e_test - e2e-card-game: *e2e_test - - aztec-rpc-sandbox: *e2e_test + - pxe-sandbox: *e2e_test - cli-docs-sandbox: *e2e_test - guides-writing-an-account-contract: *e2e_test - guides-dapp-testing: *e2e_test @@ -1251,7 +1251,7 @@ workflows: - e2e-browser-sandbox - e2e-canary-test - e2e-card-game - - aztec-rpc-sandbox + - pxe-sandbox - cli-docs-sandbox - guides-writing-an-account-contract - guides-dapp-testing diff --git a/README.md b/README.md index 0dd23af28246..c6ce2670977f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ All the packages that make up [Aztec](https://docs.aztec.network). - [Aztec.nr](./yarn-project/aztec-nr/): A [Noir](https://noir-lang.org) framework for smart contracts on Aztec. - [Aztec Sandbox](./yarn-project/aztec-sandbox/): A package for setting up a local dev net, including a local Ethereum network, deployed rollup contracts and Aztec execution environment. -- [Aztec.js](./yarn-project/aztec.js/): A tool for interacting with the Aztec network. It communicates via the [Aztec RPC Server](./yarn-project/aztec-rpc/). +- [Aztec.js](./yarn-project/aztec.js/): A tool for interacting with the Aztec network. It communicates via the [Aztec RPC Server](./yarn-project/pxe/). - [Aztec Boxes](./yarn-project/boxes/): A minimal framework for building full stack applications for Aztec (using React). - [Example contracts](./yarn-project/noir-contracts/): Example contracts for the Aztec network, written in Noir. - [End to end tests](./yarn-project/end-to-end/): Integration tests writted in Typescript--a good reference for how to use the packages for specific tasks. diff --git a/docs/docs/dev_docs/getting_started/quickstart.md b/docs/docs/dev_docs/getting_started/quickstart.md index 51e0233b0d5f..ded6297b25e9 100644 --- a/docs/docs/dev_docs/getting_started/quickstart.md +++ b/docs/docs/dev_docs/getting_started/quickstart.md @@ -15,7 +15,7 @@ This is a 1 page introduction to getting started with running the sandbox, and i Aztec's Layer 2 network is a fully programmable combined private/public ZK rollup. To achieve this, the network contains the following primary components: - Aztec Node - Aggregates all of the 'backend' services necessary for the building and publishing of rollups. This packages is currently in development and much of the functionality is mocked. -- [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec-rpc) - Normally residing with the end client, this decrypts and stores a client's private state, executes simulations and submits transactions to the Aztec Node. +- [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/pxe) - Normally residing with the end client, this decrypts and stores a client's private state, executes simulations and submits transactions to the Aztec Node. - [Aztec.js](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js) - Aztec's client library for interacting with the Aztec RPC Server (think Ethers.js). See the getting started guide [here](./sandbox.md). All of this is included in the Sandbox, with the exception of Aztec.js which you can use to interact with it. diff --git a/docs/docs/dev_docs/getting_started/sandbox.md b/docs/docs/dev_docs/getting_started/sandbox.md index b61591004006..9de009f1e1fb 100644 --- a/docs/docs/dev_docs/getting_started/sandbox.md +++ b/docs/docs/dev_docs/getting_started/sandbox.md @@ -167,7 +167,7 @@ A successful run should show: rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } ``` @@ -201,7 +201,7 @@ Now that we have our accounts loaded, let's move on to deploy our pre-compiled t rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } token Creating accounts using schnorr signers... +3ms @@ -243,7 +243,7 @@ Running now should yield output: rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } token Creating accounts using schnorr signers... +3ms @@ -285,7 +285,7 @@ Our output should now look like this: rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } token Creating accounts using schnorr signers... +3ms @@ -324,7 +324,7 @@ Our complete output should now be: rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } token Creating accounts using schnorr signers... +3ms diff --git a/docs/docs/dev_docs/tutorials/writing_dapp/rpc_server.md b/docs/docs/dev_docs/tutorials/writing_dapp/rpc_server.md index 407295dca707..fd759beee27f 100644 --- a/docs/docs/dev_docs/tutorials/writing_dapp/rpc_server.md +++ b/docs/docs/dev_docs/tutorials/writing_dapp/rpc_server.md @@ -1,6 +1,6 @@ # Connecting to the RPC Server -As an app developer, the [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec-rpc) interface provides you with access to the user's accounts and their private state, as well as a connection to the network for accessing public global state. +As an app developer, the [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/pxe) interface provides you with access to the user's accounts and their private state, as well as a connection to the network for accessing public global state. During the Sandbox phase, this role is fulfilled by the [Aztec Sandbox](../../getting_started/sandbox.md), which runs a local RPC Server and an Aztec Node, both connected to a local Ethereum development node like Anvil. The Sandbox also includes a set of pre-initialized accounts that you can use from your app. diff --git a/docs/docs/dev_docs/tutorials/writing_token_contract.md b/docs/docs/dev_docs/tutorials/writing_token_contract.md index 758677a92ab3..84c3a3c4de1b 100644 --- a/docs/docs/dev_docs/tutorials/writing_token_contract.md +++ b/docs/docs/dev_docs/tutorials/writing_token_contract.md @@ -38,7 +38,7 @@ Node Info: Version: 1 Chain Id: 31337 Rollup Address: 0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9 -Client: aztec-rpc@0.7.5 +Client: pxe@0.7.5 Compatible Nargo Version: 0.11.1-aztec.0 ``` @@ -466,7 +466,7 @@ A getter function for checking the token `total_supply`. #### `balance_of_private` -A getter function for checking the private balance of the provided Aztec account. Note that the [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec-rpc) must have access to the `owner`s decryption keys in order to decrypt their notes. +A getter function for checking the private balance of the provided Aztec account. Note that the [Aztec RPC Server](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/pxe) must have access to the `owner`s decryption keys in order to decrypt their notes. #include_code balance_of_private /yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr rust diff --git a/docs/docs/dev_docs/wallets/creating_schnorr_accounts.md b/docs/docs/dev_docs/wallets/creating_schnorr_accounts.md index ea9e1cda5f5a..d9e5c67a4f15 100644 --- a/docs/docs/dev_docs/wallets/creating_schnorr_accounts.md +++ b/docs/docs/dev_docs/wallets/creating_schnorr_accounts.md @@ -36,7 +36,7 @@ Let's assume you have a file `src/index.ts` from the example used in the Sandbox rollupAddress: EthAddress { buffer: }, - client: 'aztec-rpc@0.1.0', + client: 'pxe@0.1.0', compatibleNargoVersion: '0.11.1-aztec.0' } token Creating accounts using schnorr signers... +3ms diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 54f750d2e396..6306b3ac8b53 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -125,11 +125,11 @@ const config = { [ "@spalladino/docusaurus-plugin-typedoc", { - id: "apis/aztec-rpc", + id: "apis/pxe", entryPoints: ["../yarn-project/types/src/interfaces/aztec_rpc.ts"], tsconfig: "../yarn-project/types/tsconfig.json", entryPointStrategy: "expand", - out: "apis/aztec-rpc", + out: "apis/pxe", disableSources: true, frontmatter: { sidebar_label: "Aztec RPC Server" }, }, diff --git a/docs/scripts/build.sh b/docs/scripts/build.sh index d1c4aaab1d4d..e06ae5f2aa99 100755 --- a/docs/scripts/build.sh +++ b/docs/scripts/build.sh @@ -32,7 +32,7 @@ if [ -n "$NETLIFY" ]; then (cd yarn-project && yarn) # Build the required projects for typedoc - build_package "aztec-rpc" + build_package "pxe" build_package "aztec.js" "yarn build:ts" # Back to docs site diff --git a/docs/sidebars.js b/docs/sidebars.js index deadcccb50bb..71f56f29406d 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -353,7 +353,7 @@ const sidebars = { { label: "Aztec RPC Server", type: "doc", - id: "apis/aztec-rpc/interfaces/AztecRPC", + id: "apis/pxe/interfaces/AztecRPC", }, { label: "Aztec.js", diff --git a/yarn-project/aztec-node/README.md b/yarn-project/aztec-node/README.md index eb5706e36206..f837e427abf5 100644 --- a/yarn-project/aztec-node/README.md +++ b/yarn-project/aztec-node/README.md @@ -2,7 +2,7 @@ The Aztec Node implements a sequencer node in the network, and is currently meant to be used for local development and testing. The Node is the entrypoint for creating and starting a new Sequencer client with default components (a local P2P client, an in-memory merkle tree database, etc). -The Node also exposes methods that are consumed by the client (see `aztec-rpc`), such as querying network info or submitting a transaction. As Aztec evolves beyond local development, these methods will be accessible via a JSON-RPC API or similar. Refer to the `end-to-end` tests for examples on how to initialize an Aztec Node and use it along with an RPC client. +The Node also exposes methods that are consumed by the client (see `pxech as querying network info or submitting a transaction. As Aztec evolves beyond local development, these methods will be accessible via a JSON-RPC API or similar. Refer to the `end-to-end` tests for examples on how to initialize an Aztec Node and use it along with an RPC client. ## Development diff --git a/yarn-project/aztec-sandbox/Dockerfile b/yarn-project/aztec-sandbox/Dockerfile index 4bd5ddbdbaa0..1f33dcfad95e 100644 --- a/yarn-project/aztec-sandbox/Dockerfile +++ b/yarn-project/aztec-sandbox/Dockerfile @@ -6,8 +6,8 @@ ARG COMMIT_TAG="" RUN rm -rf /usr/src/barretenberg/cpp/srs_db/ignition/monomial COPY . . -# Update aztec-rpc version if COMMIT_TAG has been used -WORKDIR /usr/src/yarn-project/aztec-rpc +# Update pxeon if COMMIT_TAG has been used +WORKDIR /usr/src/yarn-project/pxe RUN if [[ -n "${COMMIT_TAG}" ]]; then \ jq --arg v ${COMMIT_TAG} '.version = $v' package.json > _temp && mv _temp package.json; \ fi diff --git a/yarn-project/aztec-sandbox/package.json b/yarn-project/aztec-sandbox/package.json index 134de4da8b90..11070a0946ce 100644 --- a/yarn-project/aztec-sandbox/package.json +++ b/yarn-project/aztec-sandbox/package.json @@ -29,7 +29,6 @@ ], "dependencies": { "@aztec/aztec-node": "workspace:^", - "@aztec/aztec-rpc": "workspace:^", "@aztec/aztec.js": "workspace:^", "@aztec/circuits.js": "workspace:^", "@aztec/ethereum": "workspace:^", @@ -37,6 +36,7 @@ "@aztec/l1-artifacts": "workspace:^", "@aztec/noir-compiler": "workspace:^", "@aztec/noir-contracts": "workspace:^", + "@aztec/pxe": "workspace:^", "@aztec/types": "workspace:^", "abitype": "^0.8.11", "koa": "^2.14.2", diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts index 227cc7f6edbd..31cfb050a30d 100644 --- a/yarn-project/aztec-sandbox/src/sandbox.ts +++ b/yarn-project/aztec-sandbox/src/sandbox.ts @@ -1,9 +1,9 @@ #!/usr/bin/env -S node --no-warnings import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/aztec-rpc'; import { deployL1Contracts } from '@aztec/ethereum'; import { createDebugLogger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; +import { createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { HDAccount, createPublicClient, http as httpViemTransport } from 'viem'; import { mnemonicToAccount } from 'viem/accounts'; diff --git a/yarn-project/aztec-sandbox/src/server.ts b/yarn-project/aztec-sandbox/src/server.ts index e749c4cc79c4..0d3a89a5b9ec 100644 --- a/yarn-project/aztec-sandbox/src/server.ts +++ b/yarn-project/aztec-sandbox/src/server.ts @@ -1,5 +1,5 @@ -import { getHttpRpcServer } from '@aztec/aztec-rpc'; import { DeployL1Contracts } from '@aztec/ethereum'; +import { getHttpRpcServer } from '@aztec/pxe'; import { AztecRPC } from '@aztec/types'; import http from 'http'; diff --git a/yarn-project/aztec-sandbox/tsconfig.json b/yarn-project/aztec-sandbox/tsconfig.json index 897517cdef65..b2d07377c202 100644 --- a/yarn-project/aztec-sandbox/tsconfig.json +++ b/yarn-project/aztec-sandbox/tsconfig.json @@ -9,9 +9,6 @@ { "path": "../aztec-node" }, - { - "path": "../aztec-rpc" - }, { "path": "../aztec.js" }, @@ -33,6 +30,9 @@ { "path": "../noir-contracts" }, + { + "path": "../pxe" + }, { "path": "../types" } diff --git a/yarn-project/aztec.js/README.md b/yarn-project/aztec.js/README.md index 1c92ea26ede1..b678fb81216e 100644 --- a/yarn-project/aztec.js/README.md +++ b/yarn-project/aztec.js/README.md @@ -1,6 +1,6 @@ # Aztec.js -Aztec.js is a library that provides APIs for managing accounts and interacting with contracts on the Aztec network. It communicates with the [Aztec RPC Server](https://docs.aztec.network/apis/aztec-rpc/interfaces/AztecRPC) through an `AztecRPCClient` implementation, allowing developers to easily register new accounts, deploy contracts, view functions, and send transactions. +Aztec.js is a library that provides APIs for managing accounts and interacting with contracts on the Aztec network. It communicates with the [Aztec RPC Server](https://docs.aztec.network/apis/pxe/interfaces/AztecRPC) through an `AztecRPCClient` implementation, allowing developers to easily register new accounts, deploy contracts, view functions, and send transactions. ## Usage diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index ad64d948c5c8..8b9a54c610c4 100755 --- a/yarn-project/deploy_npm.sh +++ b/yarn-project/deploy_npm.sh @@ -64,7 +64,7 @@ deploy_package ethereum deploy_package noir-compiler deploy_package noir-contracts deploy_package cli -deploy_package aztec-rpc +deploy_package pxe deploy_package acir-simulator deploy_package archiver deploy_package merkle-tree diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 460eefe91f51..05ba10a38cae 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -24,7 +24,6 @@ "dependencies": { "@aztec/archiver": "workspace:^", "@aztec/aztec-node": "workspace:^", - "@aztec/aztec-rpc": "workspace:^", "@aztec/aztec-sandbox": "workspace:^", "@aztec/aztec.js": "workspace:^", "@aztec/circuits.js": "workspace:^", @@ -34,6 +33,7 @@ "@aztec/l1-artifacts": "workspace:^", "@aztec/noir-contracts": "workspace:^", "@aztec/p2p": "workspace:^", + "@aztec/pxe": "workspace:^", "@aztec/sequencer-client": "workspace:^", "@aztec/types": "workspace:^", "@aztec/world-state": "workspace:^", diff --git a/yarn-project/end-to-end/src/aztec_rpc_sandbox.test.ts b/yarn-project/end-to-end/src/aztec_rpc_sandbox.test.ts index 15444248db22..c6becb31dc5e 100644 --- a/yarn-project/end-to-end/src/aztec_rpc_sandbox.test.ts +++ b/yarn-project/end-to-end/src/aztec_rpc_sandbox.test.ts @@ -1,5 +1,5 @@ -import { aztecRpcTestSuite } from '@aztec/aztec-rpc'; import { createAztecRpcClient, waitForSandbox } from '@aztec/aztec.js'; +import { aztecRpcTestSuite } from '@aztec/pxe'; const { SANDBOX_URL = 'http://localhost:8080' } = process.env; diff --git a/yarn-project/end-to-end/src/e2e_2_rpc_servers.test.ts b/yarn-project/end-to-end/src/e2e_2_rpc_servers.test.ts index 65982b1ce0e8..88be20741da9 100644 --- a/yarn-project/end-to-end/src/e2e_2_rpc_servers.test.ts +++ b/yarn-project/end-to-end/src/e2e_2_rpc_servers.test.ts @@ -1,10 +1,10 @@ import { AztecNodeService } from '@aztec/aztec-node'; -import { AztecRPCServer, EthAddress, Fr } from '@aztec/aztec-rpc'; import { AztecAddress, Wallet, computeMessageSecretHash } from '@aztec/aztec.js'; import { DebugLogger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; import { toBigInt } from '@aztec/foundation/serialize'; import { ChildContract, TokenContract } from '@aztec/noir-contracts/types'; +import { AztecRPCServer, EthAddress, Fr } from '@aztec/pxe'; import { AztecRPC, CompleteAddress, TxStatus } from '@aztec/types'; import { jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts index a01c24e10eb2..cc5a492e8e9b 100644 --- a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts +++ b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts @@ -1,7 +1,7 @@ -import { EthAddress } from '@aztec/aztec-rpc'; import { CheatCodes, Wallet } from '@aztec/aztec.js'; import { RollupAbi } from '@aztec/l1-artifacts'; import { TestContract } from '@aztec/noir-contracts/types'; +import { EthAddress } from '@aztec/pxe'; import { AztecRPC, TxStatus } from '@aztec/types'; import { Account, Chain, HttpTransport, PublicClient, WalletClient, getAddress, getContract, parseEther } from 'viem'; diff --git a/yarn-project/end-to-end/src/e2e_cli.test.ts b/yarn-project/end-to-end/src/e2e_cli.test.ts index 112748fe75b0..b583e2e8f7d2 100644 --- a/yarn-project/end-to-end/src/e2e_cli.test.ts +++ b/yarn-project/end-to-end/src/e2e_cli.test.ts @@ -1,7 +1,7 @@ import { AztecNodeService } from '@aztec/aztec-node'; -import { AztecRPCServer } from '@aztec/aztec-rpc'; import { startHttpRpcServer } from '@aztec/aztec-sandbox'; import { AztecRPC, createDebugLogger } from '@aztec/aztec.js'; +import { AztecRPCServer } from '@aztec/pxe'; import { cliTestSuite } from './canary/cli.js'; import { setup as e2eSetup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts index d29197e34118..ae56802ac7da 100644 --- a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts @@ -1,16 +1,11 @@ import { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; -import { - AztecRPCServer, - ConstantKeyPair, - createAztecRPCServer, - getConfigEnvVars as getRpcConfig, -} from '@aztec/aztec-rpc'; import { ContractDeployer, SentTx, isContractDeployed } from '@aztec/aztec.js'; import { AztecAddress, CompleteAddress, Fr, PublicKey, getContractDeploymentInfo } from '@aztec/circuits.js'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { DebugLogger } from '@aztec/foundation/log'; import { TestContractAbi } from '@aztec/noir-contracts/artifacts'; import { BootstrapNode, P2PConfig, createLibP2PPeerId, exportLibP2PPeerIdToString } from '@aztec/p2p'; +import { AztecRPCServer, ConstantKeyPair, createAztecRPCServer, getConfigEnvVars as getRpcConfig } from '@aztec/pxe'; import { TxStatus } from '@aztec/types'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts b/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts index e34244ade3f5..56347e94bff1 100644 --- a/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts +++ b/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts @@ -1,5 +1,4 @@ import { AztecNodeService } from '@aztec/aztec-node'; -import { AztecRPCServer } from '@aztec/aztec-rpc'; import { CheatCodes, Wallet, computeMessageSecretHash } from '@aztec/aztec.js'; import { AztecAddress, CompleteAddress, EthAddress, Fr, PublicKey } from '@aztec/circuits.js'; import { DeployL1Contracts } from '@aztec/ethereum'; @@ -8,6 +7,7 @@ import { sha256ToField } from '@aztec/foundation/crypto'; import { DebugLogger } from '@aztec/foundation/log'; import { OutboxAbi } from '@aztec/l1-artifacts'; import { TokenBridgeContract, TokenContract } from '@aztec/noir-contracts/types'; +import { AztecRPCServer } from '@aztec/pxe'; import { AztecRPC, TxStatus } from '@aztec/types'; import { Chain, HttpTransport, PublicClient, getContract } from 'viem'; diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index a4fd4fabdad0..87e65d3a5505 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -1,10 +1,4 @@ import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { - AztecRPCServer, - RpcServerConfig, - createAztecRPCServer, - getConfigEnvVars as getRpcConfigEnvVars, -} from '@aztec/aztec-rpc'; import { AccountWallet, AztecAddress, @@ -26,6 +20,12 @@ import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; import { PortalERC20Abi, PortalERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts'; import { NonNativeTokenContract, TokenBridgeContract, TokenContract } from '@aztec/noir-contracts/types'; +import { + AztecRPCServer, + RpcServerConfig, + createAztecRPCServer, + getConfigEnvVars as getRpcConfigEnvVars, +} from '@aztec/pxe'; import { AztecRPC, L2BlockL2Logs, LogType, TxStatus } from '@aztec/types'; import { diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json index fc28ba0b96e1..2f7e82c45d14 100644 --- a/yarn-project/end-to-end/tsconfig.json +++ b/yarn-project/end-to-end/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../aztec-node" }, - { - "path": "../aztec-rpc" - }, { "path": "../aztec-sandbox" }, @@ -42,6 +39,9 @@ { "path": "../p2p" }, + { + "path": "../pxe" + }, { "path": "../sequencer-client" }, diff --git a/yarn-project/key-store/README.md b/yarn-project/key-store/README.md index 727d2724efd8..25d284f1f3a5 100644 --- a/yarn-project/key-store/README.md +++ b/yarn-project/key-store/README.md @@ -1,3 +1,3 @@ # Key Store -A key store is an input component for the [AztecRPCServer](../aztec-rpc/) to manage keys securely. It provides a secure environment and interfaces for users to manage their keys. When the AztecRPCServer requests keys and signatures from the key store, a well-designed key store should prompt users to authorize the requested action before sending any sensitive information to the AztecRPCServer. This helps to ensure that sensitive data, such as private keys, is not accessible to unauthorized parties. Additionally, the key store should provide robust protection mechanisms such as encryption, multi-factor authentication, and backup/restore functionalities to prevent data loss or theft. +A key store is an input component for the [AztecRPCServer](../pxe/) to manage keys securely. It provides a secure environment and interfaces for users to manage their keys. When the AztecRPCServer requests keys and signatures from the key store, a well-designed key store should prompt users to authorize the requested action before sending any sensitive information to the AztecRPCServer. This helps to ensure that sensitive data, such as private keys, is not accessible to unauthorized parties. Additionally, the key store should provide robust protection mechanisms such as encryption, multi-factor authentication, and backup/restore functionalities to prevent data loss or theft. diff --git a/yarn-project/package.json b/yarn-project/package.json index 411d94921a9a..305d5e707e36 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -19,7 +19,7 @@ "acir-simulator", "archiver", "aztec-node", - "aztec-rpc", + "pxe", "aztec-sandbox", "aztec.js", "boxes/blank", diff --git a/yarn-project/aztec-rpc/.eslintrc.cjs b/yarn-project/pxe/.eslintrc.cjs similarity index 100% rename from yarn-project/aztec-rpc/.eslintrc.cjs rename to yarn-project/pxe/.eslintrc.cjs diff --git a/yarn-project/aztec-rpc/Dockerfile b/yarn-project/pxe/Dockerfile similarity index 64% rename from yarn-project/aztec-rpc/Dockerfile rename to yarn-project/pxe/Dockerfile index f12aecaaf9eb..2b8e9cc62a06 100644 --- a/yarn-project/aztec-rpc/Dockerfile +++ b/yarn-project/pxe/Dockerfile @@ -2,7 +2,7 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder COPY . . -WORKDIR /usr/src/yarn-project/aztec-rpc +WORKDIR /usr/src/yarn-project/pxe RUN yarn build && yarn formatting && yarn test # Prune dev dependencies. See comment in base image. @@ -10,6 +10,6 @@ RUN yarn cache clean RUN yarn workspaces focus --production > /dev/null FROM node:18-alpine -COPY --from=builder /usr/src/yarn-project/aztec-rpc /usr/src/yarn-project/aztec-rpc -WORKDIR /usr/src/yarn-project/aztec-rpc +COPY --from=builder /usr/src/yarn-project/pxe /usr/src/yarn-project/pxe +WORKDIR /usr/src/yarn-project/pxe ENTRYPOINT ["yarn"] \ No newline at end of file diff --git a/yarn-project/aztec-rpc/README.md b/yarn-project/pxe/README.md similarity index 100% rename from yarn-project/aztec-rpc/README.md rename to yarn-project/pxe/README.md diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/pxe/package.json similarity index 98% rename from yarn-project/aztec-rpc/package.json rename to yarn-project/pxe/package.json index 9c477cf34f17..81b15a87aea5 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/pxe/package.json @@ -1,5 +1,5 @@ { - "name": "@aztec/aztec-rpc", + "name": "@aztec/pxe", "version": "0.1.0", "type": "module", "exports": "./dest/index.js", diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts b/yarn-project/pxe/src/aztec_rpc_http/aztec_rpc_http_server.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts rename to yarn-project/pxe/src/aztec_rpc_http/aztec_rpc_http_server.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_http/index.ts b/yarn-project/pxe/src/aztec_rpc_http/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_http/index.ts rename to yarn-project/pxe/src/aztec_rpc_http/index.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts b/yarn-project/pxe/src/aztec_rpc_server/aztec_rpc_server.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts rename to yarn-project/pxe/src/aztec_rpc_server/aztec_rpc_server.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/create_aztec_rpc_server.ts b/yarn-project/pxe/src/aztec_rpc_server/create_aztec_rpc_server.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_server/create_aztec_rpc_server.ts rename to yarn-project/pxe/src/aztec_rpc_server/create_aztec_rpc_server.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/index.ts b/yarn-project/pxe/src/aztec_rpc_server/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_server/index.ts rename to yarn-project/pxe/src/aztec_rpc_server/index.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/test/aztec_rpc_server.test.ts b/yarn-project/pxe/src/aztec_rpc_server/test/aztec_rpc_server.test.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_server/test/aztec_rpc_server.test.ts rename to yarn-project/pxe/src/aztec_rpc_server/test/aztec_rpc_server.test.ts diff --git a/yarn-project/aztec-rpc/src/aztec_rpc_server/test/aztec_rpc_test_suite.ts b/yarn-project/pxe/src/aztec_rpc_server/test/aztec_rpc_test_suite.ts similarity index 100% rename from yarn-project/aztec-rpc/src/aztec_rpc_server/test/aztec_rpc_test_suite.ts rename to yarn-project/pxe/src/aztec_rpc_server/test/aztec_rpc_test_suite.ts diff --git a/yarn-project/aztec-rpc/src/config/index.ts b/yarn-project/pxe/src/config/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/config/index.ts rename to yarn-project/pxe/src/config/index.ts diff --git a/yarn-project/aztec-rpc/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/contract_data_oracle/index.ts rename to yarn-project/pxe/src/contract_data_oracle/index.ts diff --git a/yarn-project/aztec-rpc/src/contract_database/index.ts b/yarn-project/pxe/src/contract_database/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/contract_database/index.ts rename to yarn-project/pxe/src/contract_database/index.ts diff --git a/yarn-project/aztec-rpc/src/contract_database/memory_contract_database.ts b/yarn-project/pxe/src/contract_database/memory_contract_database.ts similarity index 100% rename from yarn-project/aztec-rpc/src/contract_database/memory_contract_database.ts rename to yarn-project/pxe/src/contract_database/memory_contract_database.ts diff --git a/yarn-project/aztec-rpc/src/contract_tree/index.ts b/yarn-project/pxe/src/contract_tree/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/contract_tree/index.ts rename to yarn-project/pxe/src/contract_tree/index.ts diff --git a/yarn-project/aztec-rpc/src/database/database.ts b/yarn-project/pxe/src/database/database.ts similarity index 100% rename from yarn-project/aztec-rpc/src/database/database.ts rename to yarn-project/pxe/src/database/database.ts diff --git a/yarn-project/aztec-rpc/src/database/index.ts b/yarn-project/pxe/src/database/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/database/index.ts rename to yarn-project/pxe/src/database/index.ts diff --git a/yarn-project/aztec-rpc/src/database/memory_db.test.ts b/yarn-project/pxe/src/database/memory_db.test.ts similarity index 100% rename from yarn-project/aztec-rpc/src/database/memory_db.test.ts rename to yarn-project/pxe/src/database/memory_db.test.ts diff --git a/yarn-project/aztec-rpc/src/database/memory_db.ts b/yarn-project/pxe/src/database/memory_db.ts similarity index 100% rename from yarn-project/aztec-rpc/src/database/memory_db.ts rename to yarn-project/pxe/src/database/memory_db.ts diff --git a/yarn-project/aztec-rpc/src/database/note_spending_info_dao.ts b/yarn-project/pxe/src/database/note_spending_info_dao.ts similarity index 100% rename from yarn-project/aztec-rpc/src/database/note_spending_info_dao.ts rename to yarn-project/pxe/src/database/note_spending_info_dao.ts diff --git a/yarn-project/aztec-rpc/src/index.ts b/yarn-project/pxe/src/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/index.ts rename to yarn-project/pxe/src/index.ts diff --git a/yarn-project/aztec-rpc/src/kernel_oracle/index.ts b/yarn-project/pxe/src/kernel_oracle/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_oracle/index.ts rename to yarn-project/pxe/src/kernel_oracle/index.ts diff --git a/yarn-project/aztec-rpc/src/kernel_prover/index.ts b/yarn-project/pxe/src/kernel_prover/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_prover/index.ts rename to yarn-project/pxe/src/kernel_prover/index.ts diff --git a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.test.ts rename to yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts diff --git a/yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_prover/kernel_prover.ts rename to yarn-project/pxe/src/kernel_prover/kernel_prover.ts diff --git a/yarn-project/aztec-rpc/src/kernel_prover/proof_creator.ts b/yarn-project/pxe/src/kernel_prover/proof_creator.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_prover/proof_creator.ts rename to yarn-project/pxe/src/kernel_prover/proof_creator.ts diff --git a/yarn-project/aztec-rpc/src/kernel_prover/proving_data_oracle.ts b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts similarity index 100% rename from yarn-project/aztec-rpc/src/kernel_prover/proving_data_oracle.ts rename to yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts diff --git a/yarn-project/aztec-rpc/src/note_processor/index.ts b/yarn-project/pxe/src/note_processor/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/note_processor/index.ts rename to yarn-project/pxe/src/note_processor/index.ts diff --git a/yarn-project/aztec-rpc/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts similarity index 100% rename from yarn-project/aztec-rpc/src/note_processor/note_processor.test.ts rename to yarn-project/pxe/src/note_processor/note_processor.test.ts diff --git a/yarn-project/aztec-rpc/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts similarity index 100% rename from yarn-project/aztec-rpc/src/note_processor/note_processor.ts rename to yarn-project/pxe/src/note_processor/note_processor.ts diff --git a/yarn-project/aztec-rpc/src/simulator/index.ts b/yarn-project/pxe/src/simulator/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/simulator/index.ts rename to yarn-project/pxe/src/simulator/index.ts diff --git a/yarn-project/aztec-rpc/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/simulator_oracle/index.ts rename to yarn-project/pxe/src/simulator_oracle/index.ts diff --git a/yarn-project/aztec-rpc/src/synchronizer/index.ts b/yarn-project/pxe/src/synchronizer/index.ts similarity index 100% rename from yarn-project/aztec-rpc/src/synchronizer/index.ts rename to yarn-project/pxe/src/synchronizer/index.ts diff --git a/yarn-project/aztec-rpc/src/synchronizer/synchronizer.test.ts b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts similarity index 100% rename from yarn-project/aztec-rpc/src/synchronizer/synchronizer.test.ts rename to yarn-project/pxe/src/synchronizer/synchronizer.test.ts diff --git a/yarn-project/aztec-rpc/src/synchronizer/synchronizer.ts b/yarn-project/pxe/src/synchronizer/synchronizer.ts similarity index 100% rename from yarn-project/aztec-rpc/src/synchronizer/synchronizer.ts rename to yarn-project/pxe/src/synchronizer/synchronizer.ts diff --git a/yarn-project/aztec-rpc/tsconfig.json b/yarn-project/pxe/tsconfig.json similarity index 100% rename from yarn-project/aztec-rpc/tsconfig.json rename to yarn-project/pxe/tsconfig.json diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json index 5974c470c00b..c50f6e96f5dc 100644 --- a/yarn-project/tsconfig.json +++ b/yarn-project/tsconfig.json @@ -22,7 +22,7 @@ { "path": "archiver/tsconfig.json" }, { "path": "aztec.js/tsconfig.json" }, { "path": "aztec-node/tsconfig.json" }, - { "path": "aztec-rpc/tsconfig.json" }, + { "path": "pxe/tsconfig.json" }, { "path": "aztec-sandbox/tsconfig.json" }, { "path": "canary/tsconfig.json" }, { "path": "circuits.js/tsconfig.json" }, diff --git a/yarn-project/typedoc.json b/yarn-project/typedoc.json index 807c60eb658d..408f630dc804 100644 --- a/yarn-project/typedoc.json +++ b/yarn-project/typedoc.json @@ -5,7 +5,7 @@ "acir-simulator", "archiver", "aztec-cli", - "aztec-rpc", + "pxe", "aztec-sandbox", "aztec.js", "key-store", diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 9252fc38ac7b..1a6b6d5a76c3 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -141,43 +141,11 @@ __metadata: languageName: unknown linkType: soft -"@aztec/aztec-rpc@workspace:^, @aztec/aztec-rpc@workspace:aztec-rpc": - version: 0.0.0-use.local - resolution: "@aztec/aztec-rpc@workspace:aztec-rpc" - dependencies: - "@aztec/acir-simulator": "workspace:^" - "@aztec/circuits.js": "workspace:^" - "@aztec/foundation": "workspace:^" - "@aztec/key-store": "workspace:^" - "@aztec/noir-compiler": "workspace:^" - "@aztec/types": "workspace:^" - "@jest/globals": ^29.5.0 - "@rushstack/eslint-patch": ^1.1.4 - "@types/jest": ^29.5.0 - "@types/lodash.omit": ^4.5.7 - "@types/lodash.partition": ^4.6.0 - "@types/lodash.times": ^4.3.7 - "@types/node": ^18.7.23 - jest: ^29.5.0 - jest-mock-extended: ^3.0.3 - lodash.omit: ^4.5.0 - lodash.partition: ^4.6.0 - lodash.times: ^4.3.2 - sha3: ^2.1.4 - 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/aztec-sandbox@workspace:^, @aztec/aztec-sandbox@workspace:aztec-sandbox": version: 0.0.0-use.local resolution: "@aztec/aztec-sandbox@workspace:aztec-sandbox" dependencies: "@aztec/aztec-node": "workspace:^" - "@aztec/aztec-rpc": "workspace:^" "@aztec/aztec.js": "workspace:^" "@aztec/circuits.js": "workspace:^" "@aztec/ethereum": "workspace:^" @@ -185,6 +153,7 @@ __metadata: "@aztec/l1-artifacts": "workspace:^" "@aztec/noir-compiler": "workspace:^" "@aztec/noir-contracts": "workspace:^" + "@aztec/pxe": "workspace:^" "@aztec/types": "workspace:^" "@jest/globals": ^29.5.0 "@types/jest": ^29.5.0 @@ -378,7 +347,6 @@ __metadata: dependencies: "@aztec/archiver": "workspace:^" "@aztec/aztec-node": "workspace:^" - "@aztec/aztec-rpc": "workspace:^" "@aztec/aztec-sandbox": "workspace:^" "@aztec/aztec.js": "workspace:^" "@aztec/circuits.js": "workspace:^" @@ -388,6 +356,7 @@ __metadata: "@aztec/l1-artifacts": "workspace:^" "@aztec/noir-contracts": "workspace:^" "@aztec/p2p": "workspace:^" + "@aztec/pxe": "workspace:^" "@aztec/sequencer-client": "workspace:^" "@aztec/types": "workspace:^" "@aztec/world-state": "workspace:^" @@ -685,6 +654,37 @@ __metadata: languageName: unknown linkType: soft +"@aztec/pxe@workspace:^, @aztec/pxe@workspace:pxe": + version: 0.0.0-use.local + resolution: "@aztec/pxe@workspace:pxe" + dependencies: + "@aztec/acir-simulator": "workspace:^" + "@aztec/circuits.js": "workspace:^" + "@aztec/foundation": "workspace:^" + "@aztec/key-store": "workspace:^" + "@aztec/noir-compiler": "workspace:^" + "@aztec/types": "workspace:^" + "@jest/globals": ^29.5.0 + "@rushstack/eslint-patch": ^1.1.4 + "@types/jest": ^29.5.0 + "@types/lodash.omit": ^4.5.7 + "@types/lodash.partition": ^4.6.0 + "@types/lodash.times": ^4.3.7 + "@types/node": ^18.7.23 + jest: ^29.5.0 + jest-mock-extended: ^3.0.3 + lodash.omit: ^4.5.0 + lodash.partition: ^4.6.0 + lodash.times: ^4.3.2 + sha3: ^2.1.4 + 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/sequencer-client@workspace:^, @aztec/sequencer-client@workspace:sequencer-client": version: 0.0.0-use.local resolution: "@aztec/sequencer-client@workspace:sequencer-client"