chore: build protocol circuits on CI and stop committing artifacts

yarn-project/Dockerfile

@@ -16,7 +16,7 @@ RUN yarn workspace @aztec/noir-contracts build:contracts
 # We need to build aztec.js as it needs to copy in account contracts from noir-contracts.
 # TODO: Contracts should not be baked into aztec.js.
 RUN yarn workspace @aztec/aztec.js build
-RUN yarn workspace @aztec/noir-protocol-circuits noir:build
+RUN yarn workspace @aztec/noir-protocol-circuits build
 RUN yarn tsc -b
 
 ENTRYPOINT ["yarn"]

yarn-project/bootstrap.sh

@@ -37,7 +37,7 @@ yarn workspace @aztec/noir-contracts build:contracts
 # TODO: Contracts should not be baked into aztec.js.
 yarn workspace @aztec/aztec.js build:copy-contracts
 # Build protocol circuits. TODO: move pre yarn-project.
-yarn workspace @aztec/noir-protocol-circuits noir:build
+yarn workspace @aztec/noir-protocol-circuits build
 
 yarn build
 

yarn-project/noir-protocol-circuits/.gitignore

@@ -3,3 +3,4 @@ Prover.toml
 Verifier.toml
 src/target
 src/crs
+src/types

yarn-project/noir-protocol-circuits/package.json

@@ -7,13 +7,13 @@
     "./types": "./dest/types/index.js"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
-    "clean": "rm -rf ./dest .tsbuildinfo",
+    "build": "yarn clean && yarn noir:build && yarn noir:types",
+    "clean": "rm -rf ./dest .tsbuildinfo src/types src/target",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
+    "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
     "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*",
-    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix",
+    "noir:types": "node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix:types",
     "noir:test": "cd src && ../../../noir/target/release/nargo test",
     "test": "yarn test:js && yarn noir:test",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"

yarn-project/noir-protocol-circuits/src/scripts/generate_ts_from_abi.ts

@@ -209,11 +209,19 @@ const circuits = [
 ];
 
 const main = async () => {
+  try {
+    await fs.access('./src/types/');
+  } catch (error) {
+    await fs.mkdir('./src/types', { recursive: true });
+  }
+
   for (const circuit of circuits) {
     const rawData = await fs.readFile(`./src/target/${circuit}.json`, 'utf-8');
     const abiObj: NoirCompiledCircuit = JSON.parse(rawData);
     const generatedInterface = generateTsInterface(abiObj.abi);
-    await fs.writeFile(`./src/types/${circuit}_types.ts`, generatedInterface);
+
+    const outputFile = `./src/types/${circuit}_types.ts`;
+    await fs.writeFile(outputFile, generatedInterface);
   }
 };
 

yarn-project/noir-protocol-circuits/src/type_conversion.ts

@@ -87,7 +87,7 @@ import {
   AztecAddress as NoirAztecAddress,
   EthAddress as NoirEthAddress,
   Field as NoirField,
-  Point as NoirPoint,
+  GrumpkinPoint as NoirPoint,
   OptionallyRevealedData as OptionallyRevealedDataNoir,
   PrivateCallData as PrivateCallDataNoir,
   PrivateCallStackItem as PrivateCallStackItemNoir,