frefactor: renaming as

AztecProtocol · Apr 23, 2024 · 3212adc · 3212adc
1 parent 8a5ece7
commit 3212adc
Show file tree

Hide file tree

Showing 44 changed files with 82 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -27,14 +27,6 @@ Alternatively, to just hack on Noir contracts and Typescript, run `./bootstrap.s
 
 To build Typescript code, make sure to have [`nvm`](https://github.com/nvm-sh/nvm) (node version manager) installed.
 
-To build noir code, make sure that you are using the version from `yarn-project/noir-compiler/src/noir-version.json`.
-
-Install nargo by running
-
-```
-noirup -v TAG_FROM_THE_FILE
-```
-
 ## Continuous Integration
 
 This repository uses CircleCI for continuous integration. Build steps are managed using [`build-system`](https://github.com/AztecProtocol/build-system). Small packages are built and tested as part of a docker build operation, while larger ones and end-to-end tests spin up a large AWS spot instance. Each successful build step creates a new docker image that gets tagged with the package name and commit.

diff --git a/boxes/Dockerfile b/boxes/Dockerfile
@@ -13,7 +13,7 @@ COPY --from=noir-projects /usr/src/noir-projects/noir-protocol-circuits/crates/t
 WORKDIR /usr/src/boxes
 COPY . .
 ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
-ENV AZTEC_COMPILE=/usr/src/yarn-project/noir-compiler/aztec-compile-dest
+ENV AZTEC_COMPILE=/usr/src/yarn-project/builder/aztec-compile-dest
 RUN yarn
 RUN npx -y playwright@1.42 install --with-deps
 ENTRYPOINT ["/bin/sh", "-c"]
diff --git a/boxes/Earthfile b/boxes/Earthfile
@@ -12,7 +12,7 @@ build:
     WORKDIR /usr/src/boxes
     COPY . .
     ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
-    ENV AZTEC_COMPILE=/usr/src/yarn-project/noir-compiler/aztec-compile-dest
+    ENV AZTEC_COMPILE=/usr/src/yarn-project/builder/aztec-compile-dest
     RUN yarn && yarn build
     RUN npx -y playwright@1.42 install --with-deps
     ENTRYPOINT ["/bin/sh", "-c"]
diff --git a/yarn-project/.earthlyignore b/yarn-project/.earthlyignore
@@ -53,17 +53,17 @@ end-to-end/src/web/main.js
 end-to-end/src/web/main.js.LICENSE.txt
 entry-points/src/artifacts
 l1-contracts/generated
-noir-compiler/target/
-noir-compiler/proofs/
-noir-compiler/Prover.toml
-noir-compiler/Verifier.toml
-noir-compiler/noir-protocol-circuits-types/.gitignore wow
-noir-compiler/proofs/
-noir-compiler/Prover.toml
-noir-compiler/Verifier.toml
-noir-compiler/src/target
-noir-compiler/src/crs
-noir-compiler/src/types
+builder/target/
+builder/proofs/
+builder/Prover.toml
+builder/Verifier.toml
+builder/noir-protocol-circuits-types/.gitignore wow
+builder/proofs/
+builder/Prover.toml
+builder/Verifier.toml
+builder/src/target
+builder/src/crs
+builder/src/types
 protocol-contracts/src/artifacts
 scripts/tmp
 noir-contracts.js/src

diff --git a/yarn-project/.gitignore b/yarn-project/.gitignore
@@ -27,17 +27,17 @@ end-to-end/src/web/main.js.LICENSE.txt
 entry-points/src/artifacts
 l1-artifacts/generated
 l1-contracts/generated
-noir-compiler/target/
-noir-compiler/proofs/
-noir-compiler/Prover.toml
-noir-compiler/Verifier.toml
-noir-compiler/noir-protocol-circuits-types/.gitignore wow
-noir-compiler/proofs/
-noir-compiler/Prover.toml
-noir-compiler/Verifier.toml
-noir-compiler/src/target
-noir-compiler/src/crs
-noir-compiler/src/types
+builder/target/
+builder/proofs/
+builder/Prover.toml
+builder/Verifier.toml
+builder/noir-protocol-circuits-types/.gitignore wow
+builder/proofs/
+builder/Prover.toml
+builder/Verifier.toml
+builder/src/target
+builder/src/crs
+builder/src/types
 noir-protocol-circuits-types/src/types/
 protocol-contracts/src/artifacts
 scripts/tmp

diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
@@ -31,14 +31,14 @@
     "@aztec/archiver": "workspace:^",
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
+    "@aztec/builder": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
-    "@aztec/noir-compiler": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",

diff --git a/yarn-project/aztec/tsconfig.json b/yarn-project/aztec/tsconfig.json
@@ -40,7 +40,7 @@
       "path": "../l1-artifacts"
     },
     {
-      "path": "../noir-compiler"
+      "path": "../builder"
     },
     {
       "path": "../noir-contracts.js"

diff --git a/yarn-project/noir-compiler/.eslintrc.cjs → yarn-project/builder/.eslintrc.cjs b/yarn-project/noir-compiler/.eslintrc.cjs → yarn-project/builder/.eslintrc.cjs
diff --git a/yarn-project/noir-compiler/.prettierignore → yarn-project/builder/.prettierignore b/yarn-project/noir-compiler/.prettierignore → yarn-project/builder/.prettierignore
diff --git a/yarn-project/noir-compiler/README.md → yarn-project/builder/README.md b/yarn-project/noir-compiler/README.md → yarn-project/builder/README.md
@@ -1,13 +1,15 @@
 # Aztec.nr compiler
 
-The Aztec.nr compiler compiles Aztec.nr contracts using nargo and outputs Aztec formatted contract ABIs. The compiler can also generate typescript classes for each contract, as well as Aztec.nr interfaces for calling external functions.
+The Aztec.nr compiler compiles Aztec.nr contracts using nargo and outputs Aztec formatted contract ABIs.
+The compiler can also generate typescript classes for each contract, as well as Aztec.nr interfaces for calling external functions.
+it can also be used to update aztec project dependencies.
 
 ## Installation
 
 To install the package, run: 
 
 ```bash
-yarn add @aztec/noir-compiler
+yarn add @aztec/builder
 ```
 
 ## Usage

diff --git a/...-project/noir-compiler/aztec-compile-dest → yarn-project/builder/aztec-compile-dest b/...-project/noir-compiler/aztec-compile-dest → yarn-project/builder/aztec-compile-dest
diff --git a/yarn-project/noir-compiler/package.json → yarn-project/builder/package.json b/yarn-project/noir-compiler/package.json → yarn-project/builder/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@aztec/noir-compiler",
+  "name": "@aztec/builder",
   "version": "0.1.0",
   "type": "module",
   "exports": {

diff --git a/yarn-project/noir-compiler/src/cli.ts → yarn-project/builder/src/cli.ts b/yarn-project/noir-compiler/src/cli.ts → yarn-project/builder/src/cli.ts
diff --git a/...-project/noir-compiler/src/cli/codegen.ts → yarn-project/builder/src/cli/codegen.ts b/...-project/noir-compiler/src/cli/codegen.ts → yarn-project/builder/src/cli/codegen.ts
diff --git a/...ct/noir-compiler/src/cli/update/common.ts → ...-project/builder/src/cli/update/common.ts b/...ct/noir-compiler/src/cli/update/common.ts → ...-project/builder/src/cli/update/common.ts
diff --git a/...ct/noir-compiler/src/cli/update/github.ts → ...-project/builder/src/cli/update/github.ts b/...ct/noir-compiler/src/cli/update/github.ts → ...-project/builder/src/cli/update/github.ts
diff --git a/...ject/noir-compiler/src/cli/update/noir.ts → yarn-project/builder/src/cli/update/noir.ts b/...ject/noir-compiler/src/cli/update/noir.ts → yarn-project/builder/src/cli/update/noir.ts
diff --git a/...oject/noir-compiler/src/cli/update/npm.ts → yarn-project/builder/src/cli/update/npm.ts b/...oject/noir-compiler/src/cli/update/npm.ts → yarn-project/builder/src/cli/update/npm.ts
diff --git a/...ct/noir-compiler/src/cli/update/update.ts → ...-project/builder/src/cli/update/update.ts b/...ct/noir-compiler/src/cli/update/update.ts → ...-project/builder/src/cli/update/update.ts
diff --git a/...ect/noir-compiler/src/cli/update/utils.ts → yarn-project/builder/src/cli/update/utils.ts b/...ect/noir-compiler/src/cli/update/utils.ts → yarn-project/builder/src/cli/update/utils.ts
diff --git a/.../src/contract-interface-gen/typescript.ts → .../src/contract-interface-gen/typescript.ts b/.../src/contract-interface-gen/typescript.ts → .../src/contract-interface-gen/typescript.ts
diff --git a/...ler/src/fixtures/test_contract/Nargo.toml → ...der/src/fixtures/test_contract/Nargo.toml b/...ler/src/fixtures/test_contract/Nargo.toml → ...der/src/fixtures/test_contract/Nargo.toml
diff --git a/...er/src/fixtures/test_contract/src/main.nr → ...er/src/fixtures/test_contract/src/main.nr b/...er/src/fixtures/test_contract/src/main.nr → ...er/src/fixtures/test_contract/src/main.nr
diff --git a/...t/noir-compiler/src/fixtures/test_lib.zip → ...project/builder/src/fixtures/test_lib.zip b/...t/noir-compiler/src/fixtures/test_lib.zip → ...project/builder/src/fixtures/test_lib.zip
diff --git a/...compiler/src/fixtures/test_lib/Nargo.toml → .../builder/src/fixtures/test_lib/Nargo.toml b/...compiler/src/fixtures/test_lib/Nargo.toml → .../builder/src/fixtures/test_lib/Nargo.toml
diff --git a/...compiler/src/fixtures/test_lib/src/lib.nr → .../builder/src/fixtures/test_lib/src/lib.nr b/...compiler/src/fixtures/test_lib/src/lib.nr → .../builder/src/fixtures/test_lib/src/lib.nr
diff --git a/...piler/src/fixtures/test_lib/src/module.nr → ...ilder/src/fixtures/test_lib/src/module.nr b/...piler/src/fixtures/test_lib/src/module.nr → ...ilder/src/fixtures/test_lib/src/module.nr
diff --git a/...r/src/fixtures/test_lib/src/module/foo.nr → ...r/src/fixtures/test_lib/src/module/foo.nr b/...r/src/fixtures/test_lib/src/module/foo.nr → ...r/src/fixtures/test_lib/src/module/foo.nr
diff --git a/yarn-project/noir-compiler/src/index.ts → yarn-project/builder/src/index.ts b/yarn-project/noir-compiler/src/index.ts → yarn-project/builder/src/index.ts
diff --git a/...-project/noir-compiler/src/mocked_keys.ts → yarn-project/builder/src/mocked_keys.ts b/...-project/noir-compiler/src/mocked_keys.ts → yarn-project/builder/src/mocked_keys.ts
diff --git a/yarn-project/noir-compiler/src/utils.ts → yarn-project/builder/src/utils.ts b/yarn-project/noir-compiler/src/utils.ts → yarn-project/builder/src/utils.ts
diff --git a/yarn-project/noir-compiler/tsconfig.json → yarn-project/builder/tsconfig.json b/yarn-project/noir-compiler/tsconfig.json → yarn-project/builder/tsconfig.json
diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh
@@ -90,7 +90,7 @@ deploy_package entrypoints
 deploy_package accounts
 deploy_package l1-artifacts
 deploy_package ethereum
-deploy_package noir-compiler
+deploy_package builder
 deploy_package noir-contracts.js
 deploy_package kv-store
 deploy_package merkle-tree

diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json
@@ -41,7 +41,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/noir-compiler": "workspace:^",
+    "@aztec/builder": "workspace:^",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",

diff --git a/yarn-project/noir-contracts.js/scripts/generate-types.sh b/yarn-project/noir-contracts.js/scripts/generate-types.sh
@@ -28,7 +28,7 @@ for ABI in $(find ../../noir-projects/noir-contracts/target -maxdepth 1 -type f
 done
 
 # Generate types for the contracts
-node --no-warnings ../noir-compiler/dest/cli.js codegen -o $OUT_DIR artifacts
+node --no-warnings ../builder/dest/cli.js codegen -o $OUT_DIR artifacts
 
 # Append exports for each generated TypeScript file to index.ts
 find "$OUT_DIR" -maxdepth 1 -type f -name '*.ts' ! -name 'index.ts' | while read -r TS_FILE; do

diff --git a/yarn-project/noir-contracts.js/tsconfig.json b/yarn-project/noir-contracts.js/tsconfig.json
@@ -10,7 +10,7 @@
       "path": "../aztec.js"
     },
     {
-      "path": "../noir-compiler"
+      "path": "../builder"
     }
   ],
   "include": [

diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
@@ -37,9 +37,9 @@
     }
   },
   "dependencies": {
+    "@aztec/builder": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/noir-compiler": "workspace:^",
     "@aztec/types": "workspace:^",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",

diff --git a/yarn-project/noir-protocol-circuits-types/tsconfig.json b/yarn-project/noir-protocol-circuits-types/tsconfig.json
@@ -13,7 +13,7 @@
       "path": "../foundation"
     },
     {
-      "path": "../noir-compiler"
+      "path": "../builder"
     },
     {
       "path": "../types"

diff --git a/yarn-project/package.json b/yarn-project/package.json
@@ -39,7 +39,7 @@
     "kv-store",
     "l1-artifacts",
     "merkle-tree",
-    "noir-compiler",
+    "builder",
     "noir-contracts.js",
     "noir-protocol-circuits-types",
     "p2p",

diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
@@ -40,13 +40,13 @@
     ]
   },
   "dependencies": {
+    "@aztec/builder": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/key-store": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/noir-compiler": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/simulator": "workspace:^",

diff --git a/yarn-project/pxe/tsconfig.json b/yarn-project/pxe/tsconfig.json
@@ -25,7 +25,7 @@
       "path": "../kv-store"
     },
     {
-      "path": "../noir-compiler"
+      "path": "../builder"
     },
     {
       "path": "../noir-protocol-circuits-types"

diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json
@@ -35,7 +35,7 @@
     { "path": "l1-artifacts/tsconfig.json" },
     { "path": "merkle-tree/tsconfig.json" },
     { "path": "noir-contracts.js/tsconfig.json" },
-    { "path": "noir-compiler/tsconfig.json" },
+    { "path": "builder/tsconfig.json" },
     { "path": "noir-protocol-circuits-types/tsconfig.json" },
     { "path": "p2p/tsconfig.json" },
     { "path": "p2p-bootstrap/tsconfig.json" },

diff --git a/yarn-project/typedoc.json b/yarn-project/typedoc.json
@@ -11,7 +11,7 @@
     "aztec.js",
     "key-store",
     "noir-contracts.js",
-    "noir-compiler",
+    "builder",
     "p2p",
     "prover-client",
     "aztec-node",

diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
@@ -196,14 +196,14 @@ __metadata:
     "@aztec/archiver": "workspace:^"
     "@aztec/aztec-node": "workspace:^"
     "@aztec/aztec.js": "workspace:^"
+    "@aztec/builder": "workspace:^"
     "@aztec/circuit-types": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
     "@aztec/entrypoints": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
-    "@aztec/noir-compiler": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/p2p": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"
@@ -239,6 +239,42 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/builder@workspace:^, @aztec/builder@workspace:builder":
+  version: 0.0.0-use.local
+  resolution: "@aztec/builder@workspace:builder"
+  dependencies:
+    "@aztec/circuits.js": "workspace:^"
+    "@aztec/foundation": "workspace:^"
+    "@aztec/types": "workspace:^"
+    "@iarna/toml": ^2.2.5
+    "@jest/globals": ^29.5.0
+    "@types/fs-extra": ^11.0.1
+    "@types/jest": ^29.5.0
+    "@types/lodash.camelcase": ^4.3.7
+    "@types/lodash.capitalize": ^4.2.7
+    "@types/lodash.uniqby": ^4.7.9
+    "@types/node": ^18.7.23
+    "@types/pako": ^2.0.0
+    "@types/semver": ^7.5.4
+    base64-js: ^1.5.1
+    commander: ^9.0.0
+    fs-extra: ^11.1.1
+    jest: ^29.5.0
+    lodash.camelcase: ^4.3.0
+    lodash.capitalize: ^4.2.1
+    lodash.uniqby: ^4.7.0
+    memfs: ^4.6.0
+    pako: ^2.1.0
+    semver: ^7.5.4
+    ts-node: ^10.9.1
+    tslib: ^2.4.0
+    typescript: ^5.0.4
+    unzipit: ^1.4.3
+  bin:
+    aztec-compile: dest/cli.js
+  languageName: unknown
+  linkType: soft
+
 "@aztec/circuit-types@workspace:^, @aztec/circuit-types@workspace:circuit-types":
   version: 0.0.0-use.local
   resolution: "@aztec/circuit-types@workspace:circuit-types"
@@ -525,48 +561,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aztec/noir-compiler@workspace:^, @aztec/noir-compiler@workspace:noir-compiler":
-  version: 0.0.0-use.local
-  resolution: "@aztec/noir-compiler@workspace:noir-compiler"
-  dependencies:
-    "@aztec/circuits.js": "workspace:^"
-    "@aztec/foundation": "workspace:^"
-    "@aztec/types": "workspace:^"
-    "@iarna/toml": ^2.2.5
-    "@jest/globals": ^29.5.0
-    "@types/fs-extra": ^11.0.1
-    "@types/jest": ^29.5.0
-    "@types/lodash.camelcase": ^4.3.7
-    "@types/lodash.capitalize": ^4.2.7
-    "@types/lodash.uniqby": ^4.7.9
-    "@types/node": ^18.7.23
-    "@types/pako": ^2.0.0
-    "@types/semver": ^7.5.4
-    base64-js: ^1.5.1
-    commander: ^9.0.0
-    fs-extra: ^11.1.1
-    jest: ^29.5.0
-    lodash.camelcase: ^4.3.0
-    lodash.capitalize: ^4.2.1
-    lodash.uniqby: ^4.7.0
-    memfs: ^4.6.0
-    pako: ^2.1.0
-    semver: ^7.5.4
-    ts-node: ^10.9.1
-    tslib: ^2.4.0
-    typescript: ^5.0.4
-    unzipit: ^1.4.3
-  bin:
-    aztec-compile: dest/cli.js
-  languageName: unknown
-  linkType: soft
-
 "@aztec/noir-contracts.js@workspace:^, @aztec/noir-contracts.js@workspace:noir-contracts.js":
   version: 0.0.0-use.local
   resolution: "@aztec/noir-contracts.js@workspace:noir-contracts.js"
   dependencies:
     "@aztec/aztec.js": "workspace:^"
-    "@aztec/noir-compiler": "workspace:^"
+    "@aztec/builder": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     jest: ^29.5.0
@@ -580,12 +580,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aztec/noir-protocol-circuits-types@workspace:noir-protocol-circuits-types"
   dependencies:
+    "@aztec/builder": "workspace:^"
     "@aztec/circuit-types": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
-    "@aztec/noir-compiler": "workspace:^"
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
@@ -711,13 +711,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aztec/pxe@workspace:pxe"
   dependencies:
+    "@aztec/builder": "workspace:^"
     "@aztec/circuit-types": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/key-store": "workspace:^"
     "@aztec/kv-store": "workspace:^"
-    "@aztec/noir-compiler": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/noir-protocol-circuits-types": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"