From 696471730d3ad269e5cb8ca4ee1601fcd391a991 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 26 Sep 2023 16:08:55 +0000 Subject: [PATCH 1/4] 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 | 6 -- .../src/fixtures/cross_chain_test_harness.ts | 2 +- yarn-project/end-to-end/src/fixtures/utils.ts | 8 ++- 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 | 71 +++++++++---------- 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 072f9d8e592..ede0e6e01f3 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 0dd23af2824..c6ce2670977 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 51e0233b0d5..ded6297b25e 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 b6159100400..9de009f1e1f 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 407295dca70..fd759beee27 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 758677a92ab..84c3a3c4de1 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 ea9e1cda5f5..d9e5c67a4f1 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 54f750d2e39..6306b3ac8b5 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 d1c4aaab1d4..e06ae5f2aa9 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 deadcccb50b..71f56f29406 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 eb5706e3620..f837e427abf 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 98c5a6191d0..8ee43ae24ee 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 134de4da8b9..11070a0946c 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 c3ce6e177f4..701752499ed 100644 --- a/yarn-project/aztec-sandbox/src/sandbox.ts +++ b/yarn-project/aztec-sandbox/src/sandbox.ts @@ -1,6 +1,6 @@ #!/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 { createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { DeployL1Contracts, L1ContractArtifactsForDeployment, diff --git a/yarn-project/aztec-sandbox/src/server.ts b/yarn-project/aztec-sandbox/src/server.ts index 0e37b1c91a0..d2e4805dd75 100644 --- a/yarn-project/aztec-sandbox/src/server.ts +++ b/yarn-project/aztec-sandbox/src/server.ts @@ -1,4 +1,4 @@ -import { getHttpRpcServer } from '@aztec/aztec-rpc'; +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 897517cdef6..b2d07377c20 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 1c92ea26ede..b678fb81216 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 ad64d948c5c..8b9a54c610c 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 460eefe91f5..05ba10a38ca 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 15444248db2..c6becb31dc5 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 65982b1ce0e..88be20741da 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 891a41d9feb..75cf2245ee9 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 19d4d44a9d1..36795577426 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 dc650816ade..6efa7be80b4 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,10 +1,4 @@ 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'; 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 ac0e4938aa3..de813f13c5f 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 9caea63c96a..83a145765ed 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -1,5 +1,5 @@ import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { AztecRPCServer, createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/aztec-rpc'; +import { AztecRPCServer, createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { AccountWallet, AztecAddress, @@ -42,6 +42,12 @@ import { 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 fc28ba0b96e..2f7e82c45d1 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 727d2724efd..25d284f1f3a 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 411d94921a9..305d5e707e3 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 f12aecaaf9e..2b8e9cc62a0 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 d2f53e0f4c7..13813f40674 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 5974c470c00..c50f6e96f5d 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 807c60eb658..408f630dc80 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 30f0e303e5e..2cff15c3926 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -146,48 +146,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/ethereum": "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 - koa: ^2.14.2 - koa-router: ^12.0.0 - 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 - bin: - aztec-rpc: ./dest/bin/index.js - 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:^" @@ -195,6 +158,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 @@ -391,7 +355,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:^" @@ -401,6 +364,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:^" @@ -697,6 +661,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" From 0aa0f5f4eb6909a6a2468746a853b8083e07dda6 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 26 Sep 2023 17:05:14 +0000 Subject: [PATCH 2/4] fixes --- yarn-project/aztec-node/README.md | 2 +- yarn-project/aztec-sandbox/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-node/README.md b/yarn-project/aztec-node/README.md index f837e427abf..d3a66d3513f 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 `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. +The Node also exposes methods that are consumed by the client (see `pxe`), 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. ## Development diff --git a/yarn-project/aztec-sandbox/Dockerfile b/yarn-project/aztec-sandbox/Dockerfile index 8ee43ae24ee..ad08368869d 100644 --- a/yarn-project/aztec-sandbox/Dockerfile +++ b/yarn-project/aztec-sandbox/Dockerfile @@ -6,7 +6,7 @@ ARG COMMIT_TAG="" RUN rm -rf /usr/src/barretenberg/cpp/srs_db/ignition/monomial COPY . . -# Update pxeon if COMMIT_TAG has been used +# Update pxe version 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; \ From 42f6f0aba20a7b02422ade786c06f57f6ec5da59 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 26 Sep 2023 17:39:29 +0000 Subject: [PATCH 3/4] fixes after rebase --- yarn-project/aztec-node/src/bin/index.ts | 2 +- yarn-project/aztec-sandbox/src/bin/index.ts | 2 +- yarn-project/aztec-sandbox/src/sandbox.ts | 2 +- yarn-project/end-to-end/package.json | 2 +- yarn-project/end-to-end/src/e2e_p2p_network.test.ts | 1 + yarn-project/end-to-end/src/fixtures/utils.ts | 8 +------- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/yarn-project/aztec-node/src/bin/index.ts b/yarn-project/aztec-node/src/bin/index.ts index 6ee1ed4cd78..7aac8514b81 100644 --- a/yarn-project/aztec-node/src/bin/index.ts +++ b/yarn-project/aztec-node/src/bin/index.ts @@ -5,7 +5,7 @@ import http from 'http'; import Koa from 'koa'; import Router from 'koa-router'; -import { AztecNodeConfig, AztecNodeService, getConfigEnvVars, createAztecNodeRpcServer } from '../index.js'; +import { AztecNodeConfig, AztecNodeService, createAztecNodeRpcServer, getConfigEnvVars } from '../index.js'; const { SERVER_PORT = 8081, API_PREFIX = '' } = process.env; diff --git a/yarn-project/aztec-sandbox/src/bin/index.ts b/yarn-project/aztec-sandbox/src/bin/index.ts index 4537603afe8..2ab3b192b59 100644 --- a/yarn-project/aztec-sandbox/src/bin/index.ts +++ b/yarn-project/aztec-sandbox/src/bin/index.ts @@ -1,9 +1,9 @@ #!/usr/bin/env -S node --no-warnings -import { startHttpRpcServer } from '@aztec/aztec-rpc'; import { deployInitialSandboxAccounts } from '@aztec/aztec.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { fileURLToPath } from '@aztec/foundation/url'; import NoirVersion from '@aztec/noir-compiler/noir-version'; +import { startHttpRpcServer } from '@aztec/pxe'; import { readFileSync } from 'fs'; import { dirname, resolve } from 'path'; diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts index 701752499ed..463bf51e85f 100644 --- a/yarn-project/aztec-sandbox/src/sandbox.ts +++ b/yarn-project/aztec-sandbox/src/sandbox.ts @@ -1,6 +1,5 @@ #!/usr/bin/env -S node --no-warnings import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { DeployL1Contracts, L1ContractArtifactsForDeployment, @@ -21,6 +20,7 @@ import { RollupAbi, RollupBytecode, } from '@aztec/l1-artifacts'; +import { createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { createPublicClient, http as httpViemTransport } from 'viem'; import { mnemonicToAccount } from 'viem/accounts'; diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 05ba10a38ca..59b2b94cb18 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -75,4 +75,4 @@ "!*.test.*" ], "types": "./dest/index.d.ts" -} \ No newline at end of file +} 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 6efa7be80b4..53a285646b7 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 @@ -5,6 +5,7 @@ import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { DebugLogger } from '@aztec/foundation/log'; import { TestContractAbi } from '@aztec/noir-contracts/artifacts'; import { BootstrapNode, P2PConfig, createLibP2PPeerId } 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/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index 83a145765ed..34725dfc973 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -1,5 +1,4 @@ import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { AztecRPCServer, createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { AccountWallet, AztecAddress, @@ -42,12 +41,7 @@ import { 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 { AztecRPCServer, createAztecRPCServer, getConfigEnvVars as getRpcConfigEnvVars } from '@aztec/pxe'; import { AztecRPC, L2BlockL2Logs, LogType, TxStatus } from '@aztec/types'; import { From d9a86b8a0da0bd9d531da70095e0923466a46860 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 26 Sep 2023 17:41:51 +0000 Subject: [PATCH 4/4] lockfile update --- yarn-project/yarn.lock | 177 +++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 77 deletions(-) diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 2cff15c3926..697a0fda6c4 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -390,7 +390,7 @@ __metadata: lodash.times: ^4.3.2 lodash.zip: ^4.2.0 lodash.zipwith: ^4.2.0 - puppeteer: ^20.9.0 + puppeteer: ^21.3.4 string-argv: ^0.3.2 ts-jest: ^29.1.0 ts-node: ^10.9.1 @@ -667,6 +667,7 @@ __metadata: dependencies: "@aztec/acir-simulator": "workspace:^" "@aztec/circuits.js": "workspace:^" + "@aztec/ethereum": "workspace:^" "@aztec/foundation": "workspace:^" "@aztec/key-store": "workspace:^" "@aztec/noir-compiler": "workspace:^" @@ -680,6 +681,8 @@ __metadata: "@types/node": ^18.7.23 jest: ^29.5.0 jest-mock-extended: ^3.0.3 + koa: ^2.14.2 + koa-router: ^12.0.0 lodash.omit: ^4.5.0 lodash.partition: ^4.6.0 lodash.times: ^4.3.2 @@ -689,6 +692,8 @@ __metadata: tslib: ^2.4.0 typescript: ^5.0.4 viem: ^1.2.5 + bin: + pxe: ./dest/bin/index.js languageName: unknown linkType: soft @@ -3570,25 +3575,20 @@ __metadata: languageName: node linkType: hard -"@puppeteer/browsers@npm:1.4.6": - version: 1.4.6 - resolution: "@puppeteer/browsers@npm:1.4.6" +"@puppeteer/browsers@npm:1.7.1": + version: 1.7.1 + resolution: "@puppeteer/browsers@npm:1.7.1" dependencies: debug: 4.3.4 extract-zip: 2.0.1 progress: 2.0.3 - proxy-agent: 6.3.0 + proxy-agent: 6.3.1 tar-fs: 3.0.4 unbzip2-stream: 1.4.3 yargs: 17.7.1 - peerDependencies: - typescript: ">= 4.7.4" - peerDependenciesMeta: - typescript: - optional: true bin: browsers: lib/cjs/main-cli.js - checksum: 29569dd8a8a41737bb0dd40cce6279cfc8764afc6242d2f9d8ae610bed7e466fc77eeb27b9b3ac53dd04927a1a0e26389f282f6ba057210979b36ab455009d64 + checksum: fb7cf7773a1aed4e34ce0952dbf9609a164e624d4f8e1f342b816fe3e983888d7a7b2fbafc963559e96cb5bca0d75fb9c81f2097f9b1f5478a0f1cc7cbc12dff languageName: node linkType: hard @@ -6154,7 +6154,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:^7.0.1, agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": version: 7.1.0 resolution: "agent-base@npm:7.1.0" dependencies: @@ -7552,14 +7552,15 @@ __metadata: languageName: node linkType: hard -"chromium-bidi@npm:0.4.16": - version: 0.4.16 - resolution: "chromium-bidi@npm:0.4.16" +"chromium-bidi@npm:0.4.28": + version: 0.4.28 + resolution: "chromium-bidi@npm:0.4.28" dependencies: - mitt: 3.0.0 + mitt: 3.0.1 + urlpattern-polyfill: 9.0.0 peerDependencies: devtools-protocol: "*" - checksum: 9cbb362fdf589dbdfd1618499c5bbdac45a3aa1291c1d2faa2f1ea3768738677985175d1bb1511dfe3e188bc78e6ea2acb453564ece7e09f535bbcd2253ce06a + checksum: d8ac0aefcf11ebd744e0b97ecded9dac5c03ab55f46267570cdf1b780ad1e05e8cf6987b65178bda99a1ef1ea1bc59721bda85008283ca5f145912b9e1bf578d languageName: node linkType: hard @@ -8061,15 +8062,20 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:8.2.0": - version: 8.2.0 - resolution: "cosmiconfig@npm:8.2.0" +"cosmiconfig@npm:8.3.6": + version: 8.3.6 + resolution: "cosmiconfig@npm:8.3.6" dependencies: - import-fresh: ^3.2.1 + import-fresh: ^3.3.0 js-yaml: ^4.1.0 - parse-json: ^5.0.0 + parse-json: ^5.2.0 path-type: ^4.0.0 - checksum: 836d5d8efa750f3fb17b03d6ca74cd3154ed025dffd045304b3ef59637f662bde1e5dc88f8830080d180ec60841719cf4ea2ce73fb21ec694b16865c478ff297 + peerDependencies: + typescript: ">=4.9.5" + peerDependenciesMeta: + typescript: + optional: true + checksum: dc339ebea427898c9e03bf01b56ba7afbac07fc7d2a2d5a15d6e9c14de98275a9565da949375aee1809591c152c0a3877bb86dbeaf74d5bd5aaa79955ad9e7a0 languageName: node linkType: hard @@ -8587,10 +8593,10 @@ __metadata: languageName: node linkType: hard -"devtools-protocol@npm:0.0.1147663": - version: 0.0.1147663 - resolution: "devtools-protocol@npm:0.0.1147663" - checksum: 0631f2b6c6cd7f56e7d62a85bfc291f7e167f0f2de90969ef61fb24e2bd546b2e9530043d2bc3fe6c4d7a9e00473004272d2c2832a10a05e4b75c03a22f549fc +"devtools-protocol@npm:0.0.1179426": + version: 0.0.1179426 + resolution: "devtools-protocol@npm:0.0.1179426" + checksum: 38a091bde42d7d0f8e5e6c7a445db6a56d7b80f21f51de47ed1316123f70b2256aa6fe0d87fbe37bcc4928c0b9245e28a17fb7fbf8d8622156ae36870b26c1ed languageName: node linkType: hard @@ -10869,13 +10875,13 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.0": - version: 7.0.1 - resolution: "https-proxy-agent@npm:7.0.1" +"https-proxy-agent@npm:^7.0.2": + version: 7.0.2 + resolution: "https-proxy-agent@npm:7.0.2" dependencies: agent-base: ^7.0.2 debug: 4 - checksum: 2d765c31865071373771f53abdd72912567b76015a4eff61094f586194192950cd89257d50f0e621807a16c083bc8cad5852e3885c6ba154d2ce721a18fac248 + checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292 languageName: node linkType: hard @@ -14190,10 +14196,10 @@ __metadata: languageName: node linkType: hard -"mitt@npm:3.0.0": - version: 3.0.0 - resolution: "mitt@npm:3.0.0" - checksum: f7be5049d27d18b1dbe9408452d66376fa60ae4a79fe9319869d1b90ae8cbaedadc7e9dab30b32d781411256d468be5538996bb7368941c09009ef6bbfa6bfc7 +"mitt@npm:3.0.1": + version: 3.0.1 + resolution: "mitt@npm:3.0.1" + checksum: b55a489ac9c2949ab166b7f060601d3b6d893a852515ae9eca4e11df01c013876df777ea109317622b5c1c60e8aae252558e33c8c94e14124db38f64a39614b1 languageName: node linkType: hard @@ -14994,19 +15000,19 @@ __metadata: languageName: node linkType: hard -"pac-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "pac-proxy-agent@npm:7.0.0" +"pac-proxy-agent@npm:^7.0.1": + version: 7.0.1 + resolution: "pac-proxy-agent@npm:7.0.1" dependencies: "@tootallnate/quickjs-emscripten": ^0.23.0 agent-base: ^7.0.2 debug: ^4.3.4 get-uri: ^6.0.1 http-proxy-agent: ^7.0.0 - https-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.2 pac-resolver: ^7.0.0 - socks-proxy-agent: ^8.0.1 - checksum: 45fe10ae58b1700d5419a9e5b525fb261b866ed6a65c1382fe45c3d5af9f81d9a58250d407941a363b1955e0315f3d97e02a2f20e4c7e2ba793bd46585db7ec8 + socks-proxy-agent: ^8.0.2 + checksum: 3d4aa48ec1c19db10158ecc1c4c9a9f77792294412d225ceb3dfa45d5a06950dca9755e2db0d9b69f12769119bea0adf2b24390d9c73c8d81df75e28245ae451 languageName: node linkType: hard @@ -15633,19 +15639,19 @@ __metadata: languageName: node linkType: hard -"proxy-agent@npm:6.3.0": - version: 6.3.0 - resolution: "proxy-agent@npm:6.3.0" +"proxy-agent@npm:6.3.1": + version: 6.3.1 + resolution: "proxy-agent@npm:6.3.1" dependencies: agent-base: ^7.0.2 debug: ^4.3.4 http-proxy-agent: ^7.0.0 - https-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.2 lru-cache: ^7.14.1 - pac-proxy-agent: ^7.0.0 + pac-proxy-agent: ^7.0.1 proxy-from-env: ^1.1.0 - socks-proxy-agent: ^8.0.1 - checksum: e3fb0633d665e352ed4efe23ae5616b8301423dfa4ff1c5975d093da8a636181a97391f7a91c6a7ffae17c1a305df855e95507f73bcdafda8876198c64b88f5b + socks-proxy-agent: ^8.0.2 + checksum: 31030da419da31809340ac2521090c9a5bf4fe47a944843f829b3502883208c8586a468955e64b694140a41d70af6f45cf4793f5efd4a6f3ed94e5ac8023e36d languageName: node linkType: hard @@ -15712,33 +15718,28 @@ __metadata: languageName: node linkType: hard -"puppeteer-core@npm:20.9.0": - version: 20.9.0 - resolution: "puppeteer-core@npm:20.9.0" +"puppeteer-core@npm:21.3.5": + version: 21.3.5 + resolution: "puppeteer-core@npm:21.3.5" dependencies: - "@puppeteer/browsers": 1.4.6 - chromium-bidi: 0.4.16 + "@puppeteer/browsers": 1.7.1 + chromium-bidi: 0.4.28 cross-fetch: 4.0.0 debug: 4.3.4 - devtools-protocol: 0.0.1147663 - ws: 8.13.0 - peerDependencies: - typescript: ">= 4.7.4" - peerDependenciesMeta: - typescript: - optional: true - checksum: d298598445b0f2032c02d0ed7d1d18a8d2d2fcaf6fc31fc96e93e2669a7fc6fbee0338bd9b8c8f8822887f18a8fb680b77bb56e96fe1928baadb52292bbd93b4 + devtools-protocol: 0.0.1179426 + ws: 8.14.2 + checksum: c2e904e59c9d58ada08016ff893c6b574ab36848db8e0f214b6c02fef446cfa142d346384cb2bb49c39df45622caf6ef813e7cc10f613024e595aa4406fb77bc languageName: node linkType: hard -"puppeteer@npm:^20.9.0": - version: 20.9.0 - resolution: "puppeteer@npm:20.9.0" +"puppeteer@npm:^21.3.4": + version: 21.3.5 + resolution: "puppeteer@npm:21.3.5" dependencies: - "@puppeteer/browsers": 1.4.6 - cosmiconfig: 8.2.0 - puppeteer-core: 20.9.0 - checksum: c328eca0a649d5e5d68ee2874c25254b8498ab8bbfa1731b444c2dd69380c2f6df1741b3ad427d448fb8e5bcdd259cc9c1ed749dddfc634a64a6a607403fe53c + "@puppeteer/browsers": 1.7.1 + cosmiconfig: 8.3.6 + puppeteer-core: 21.3.5 + checksum: 0bb3f0f2dead30f4a18b94066d73e27a0ec418ba3e1b73fc882ba4b747405c91ee2592eef0137b984f26bca5e52007543ecd01d1ac843dd68b8d78489a296f69 languageName: node linkType: hard @@ -17008,14 +17009,14 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^8.0.1": - version: 8.0.1 - resolution: "socks-proxy-agent@npm:8.0.1" +"socks-proxy-agent@npm:^8.0.2": + version: 8.0.2 + resolution: "socks-proxy-agent@npm:8.0.2" dependencies: - agent-base: ^7.0.1 + agent-base: ^7.0.2 debug: ^4.3.4 socks: ^2.7.1 - checksum: f6538fd16cb545094d20b9a1ae97bb2c4ddd150622ad7cc6b64c89c889d8847b7bac179757838ce5487cbac49a499537e3991c975fe13b152b76b10027470dfb + checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d languageName: node linkType: hard @@ -18426,6 +18427,13 @@ __metadata: languageName: node linkType: hard +"urlpattern-polyfill@npm:9.0.0": + version: 9.0.0 + resolution: "urlpattern-polyfill@npm:9.0.0" + checksum: d3658b78a10eaee514c464f5a4336c408c70cf01e9b915cb1df5892b3c49003d1ed4042dc72d1b18493b8b847883e84fbf2bf358abb5dff84b2725d5e8463bcb + languageName: node + linkType: hard + "use-callback-ref@npm:^1.3.0": version: 1.3.0 resolution: "use-callback-ref@npm:1.3.0" @@ -19160,9 +19168,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:8.13.0, ws@npm:^8.13.0": - version: 8.13.0 - resolution: "ws@npm:8.13.0" +"ws@npm:8.14.2": + version: 8.14.2 + resolution: "ws@npm:8.14.2" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -19171,7 +19179,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c + checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b languageName: node linkType: hard @@ -19190,6 +19198,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:^8.13.0": + version: 8.13.0 + resolution: "ws@npm:8.13.0" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c + languageName: node + linkType: hard + "ws@npm:^8.5.0": version: 8.14.1 resolution: "ws@npm:8.14.1"