fix: end-to-end aztec cli dependency issue

.circleci/config.yml

@@ -422,7 +422,7 @@ jobs:
           name: "Build and test"
           command: build aztec.js
 
-  aztec-cli:
+  cli:
     machine:
       image: ubuntu-2004:202010-01
     resource_class: large
@@ -431,7 +431,7 @@ jobs:
       - *setup_env
       - run:
           name: "Build and test"
-          command: build aztec-cli
+          command: build cli
 
   types:
     machine:
@@ -1082,11 +1082,11 @@ jobs:
             deploy_ecr noir-contracts
             deploy_npm noir-contracts
       - run:
-          name: "aztec-cli"
-          working_directory: aztec-cli
+          name: "cli"
+          working_directory: cli
           command: |
-            deploy_ecr aztec-cli
-            deploy_npm aztec-cli
+            deploy_ecr cli
+            deploy_npm cli
       # Aztec Sandbox and dependencies
       - run:
           name: "aztec-rpc"
@@ -1349,7 +1349,7 @@ workflows:
       - archiver: *yarn_project
       - aztec-rpc: *yarn_project
       - aztec-node: *yarn_project
-      - aztec-cli: *yarn_project
+      - cli: *yarn_project
       - key-store: *yarn_project
       - merkle-tree: *yarn_project
       - p2p: *yarn_project
@@ -1375,7 +1375,7 @@ workflows:
             - archiver
             - aztec-rpc
             - aztec-node
-            - aztec-cli
+            - cli
             - key-store
             - merkle-tree
             - p2p

build_manifest.json

@@ -180,11 +180,11 @@
       "types"
     ]
   },
-  "aztec-cli": {
+  "cli": {
     "buildDir": "yarn-project",
-    "projectDir": "yarn-project/aztec-cli",
-    "dockerfile": "aztec-cli/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/aztec-cli/"],
+    "projectDir": "yarn-project/cli",
+    "dockerfile": "cli/Dockerfile",
+    "rebuildPatterns": ["^yarn-project/cli/"],
     "dependencies": [
       "aztec.js",
       "ethereum",
@@ -272,6 +272,7 @@
       "aztec-sandbox",
       "aztec.js",
       "circuits.js",
+      "cli",
       "ethereum",
       "foundation",
       "l1-artifacts",

yarn-project/canary/tsconfig.json

@@ -23,7 +23,7 @@
       "path": "../aztec.js"
     },
     {
-      "path": "../aztec-cli"
+      "path": "../cli"
     },
     {
       "path": "../foundation"

yarn-project/aztec-cli/Dockerfile → yarn-project/cli/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-cli
+WORKDIR /usr/src/yarn-project/cli
 RUN yarn build && yarn formatting && yarn test
 
 # Prune dev dependencies. See comment in base image.
@@ -11,5 +11,5 @@ RUN yarn workspaces focus --production > /dev/null
 
 FROM node:18-alpine
 COPY --from=builder /usr/src/ /usr/src/
-WORKDIR /usr/src/yarn-project/aztec-cli
+WORKDIR /usr/src/yarn-project/cli
 ENTRYPOINT ["yarn", "start"]

yarn-project/end-to-end/tsconfig.json

@@ -25,7 +25,7 @@
       "path": "../circuits.js"
     },
     {
-      "path": "../aztec-cli"
+      "path": "../cli"
     },
     {
       "path": "../ethereum"

yarn-project/noir-compiler/README.md

@@ -18,7 +18,7 @@ To run the compiler as a CLI tool, first install the package and then run:
 yarn aztec-compile compile --help
 ```
 
-You can also run the compiler from the [main Aztec CLI](../aztec-cli/README.md), which includes several other features for interacting with the Aztec Network:
+You can also run the compiler from the [main Aztec CLI](../cli/README.md), which includes several other features for interacting with the Aztec Network:
 
 ```bash
 yarn add @aztec/cli

yarn-project/package.json

@@ -18,12 +18,12 @@
   "workspaces": [
     "acir-simulator",
     "archiver",
-    "aztec-cli",
     "aztec-rpc",
     "aztec-sandbox",
     "aztec.js",
     "canary",
     "circuits.js",
+    "cli",
     "docs",
     "end-to-end",
     "ethereum",

yarn-project/yarn-project-base/Dockerfile

@@ -17,7 +17,7 @@ WORKDIR /usr/src/yarn-project
 # We only want to copy the package.json's, to ensure we only rebuild this image if project dependencies changed.
 COPY acir-simulator/package.json acir-simulator/package.json
 COPY archiver/package.json archiver/package.json
-COPY aztec-cli/package.json aztec-cli/package.json
+COPY cli/package.json cli/package.json
 COPY aztec-rpc/package.json aztec-rpc/package.json
 COPY aztec-node/package.json aztec-node/package.json
 COPY aztec-sandbox/package.json aztec-sandbox/package.json
@@ -78,12 +78,12 @@ RUN cp build_manifest.json ../
 # Copy tsconfig to check dependencies
 COPY acir-simulator/tsconfig.json acir-simulator/tsconfig.json
 COPY archiver/tsconfig.json archiver/tsconfig.json
-COPY aztec-cli/tsconfig.json aztec-cli/tsconfig.json
 COPY aztec-rpc/tsconfig.json aztec-rpc/tsconfig.json
 COPY aztec-node/tsconfig.json aztec-node/tsconfig.json
 COPY aztec-sandbox/tsconfig.json aztec-sandbox/tsconfig.json
 COPY aztec.js/tsconfig.json aztec.js/tsconfig.json
 COPY canary/tsconfig.json canary/tsconfig.json
+COPY cli/tsconfig.json cli/tsconfig.json
 COPY end-to-end/tsconfig.json end-to-end/tsconfig.json
 COPY ethereum/tsconfig.json ethereum/tsconfig.json
 COPY foundation/tsconfig.json foundation/tsconfig.json

yarn-project/yarn.lock

@@ -313,9 +313,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aztec/cli@workspace:^, @aztec/cli@workspace:aztec-cli":
+"@aztec/cli@workspace:^, @aztec/cli@workspace:cli":
   version: 0.0.0-use.local
-  resolution: "@aztec/cli@workspace:aztec-cli"
+  resolution: "@aztec/cli@workspace:cli"
   dependencies:
     "@aztec/aztec.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"