chore: CLI's startup time was pushing almost 2s. This gets the basic 'help' down to 0.16.

barretenberg/acir_tests/Dockerfile.bb.js

@@ -2,7 +2,7 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/noir-acir-tests as noir-acir-tests
 
 FROM node:18.19.0
-COPY --from=0 /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=0 /usr/src/barretenberg/ts-build /usr/src/barretenberg/ts
 COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
 RUN apt update && apt install -y lsof jq
 WORKDIR /usr/src/barretenberg/acir_tests

barretenberg/ts/Dockerfile

@@ -5,7 +5,7 @@ COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg
 
 # Create a standalone container that can run bb.js (and tests).
 # We'll perform the build in a new, different directory, so the original directory can become the "published" package.
-WORKDIR /usr/src/barretenberg/ts
+WORKDIR /usr/src/barretenberg/ts-build
 # Leverage layer caching. Only re-install packages if these files change.
 COPY .yarn .yarn
 COPY package.json package.json
@@ -17,4 +17,4 @@ RUN yarn formatting && SKIP_CPP_BUILD=1 yarn build
 CMD ["yarn", "test"]
 
 # We want to create a pure package, as would be published to npm, for consuming projects.
-RUN yarn pack && tar zxf package.tgz && rm package.tgz
+RUN yarn pack && tar zxf package.tgz && rm package.tgz && mv package ../ts

barretenberg/ts/package.json

@@ -20,14 +20,13 @@
     "README.md"
   ],
   "scripts": {
-    "clean": "rm -rf ./dest .tsbuildinfo .tsbuildinfo.cjs package.tgz package",
-    "build": "yarn clean && yarn build:wasm && yarn build:esm && yarn build:cjs && yarn build:browser && yarn build:package",
+    "clean": "rm -rf ./dest .tsbuildinfo .tsbuildinfo.cjs",
+    "build": "yarn clean && yarn build:wasm && yarn build:esm && yarn build:cjs && yarn build:browser",
     "build:wasm": "./scripts/build_wasm.sh",
     "build:esm": "tsc -b && chmod +x ./dest/node/main.js",
     "build:cjs": "tsc -b tsconfig.cjs.json && ./scripts/cjs_postprocess.sh",
     "build:browser": "webpack",
     "build:bindings": "cd .. && ./scripts/bindgen.sh",
-    "build:package": "yarn pack && tar zxf package.tgz && rm -f package.tgz",
     "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src",
     "formatting:fix": "prettier -w ./src",
     "test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests",

barretenberg/ts/src/barretenberg/index.ts

@@ -41,7 +41,8 @@ export class Barretenberg extends BarretenbergApi {
   }
 }
 
-let barretenbergSyncSingleton: Promise<BarretenbergSync>;
+let barretenbergSyncSingleton: BarretenbergSync;
+let barretenbergSyncSingletonPromise: Promise<BarretenbergSync>;
 
 export class BarretenbergSync extends BarretenbergApiSync {
   private constructor(wasm: BarretenbergWasmMain) {
@@ -55,9 +56,16 @@ export class BarretenbergSync extends BarretenbergApiSync {
     return new BarretenbergSync(wasm);
   }
 
+  static initSingleton() {
+    if (!barretenbergSyncSingletonPromise) {
+      barretenbergSyncSingletonPromise = BarretenbergSync.new().then(s => (barretenbergSyncSingleton = s));
+    }
+    return barretenbergSyncSingletonPromise;
+  }
+
   static getSingleton() {
     if (!barretenbergSyncSingleton) {
-      barretenbergSyncSingleton = BarretenbergSync.new();
+      throw new Error('Initialise first via initSingleton().');
     }
     return barretenbergSyncSingleton;
   }
@@ -66,3 +74,11 @@ export class BarretenbergSync extends BarretenbergApiSync {
     return this.wasm;
   }
 }
+
+// If we're loading this module in a test environment, just init the singleton immediately for convienience.
+if (process.env.NODE_ENV === 'test') {
+  // Need to ignore for cjs build.
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  await BarretenbergSync.initSingleton();
+}

build-system/scripts/augment_prompt

@@ -0,0 +1,2 @@
+# Used to augment the prompt when using start_interactive and zsh.
+echo "b "

build-system/scripts/build_local

@@ -114,6 +114,9 @@ for E in "${PROJECTS[@]}"; do
   # Retag for aztecprotocol dockerhub.
   docker tag $DEPLOY_IMAGE_URI aztecprotocol/$REPO:latest
 
+  echo -e "${BOLD}Tagged${RESET}: aztecprotocol/$REPO:latest"
+  echo -e "${BOLD}SHA256${RESET}: $(docker inspect --format='{{.Id}}' $DEPLOY_IMAGE_URI)"
+
   if [ "$PROJECT_DIR_NAME" = "$TARGET_PROJECT" ]; then
     if [ -n "$LAUNCH" ]; then
       docker run -ti --rm aztecprotocol/$REPO:latest

build-system/scripts/query_manifest

@@ -4,7 +4,7 @@ set -eu
 CMD=$1
 REPO=$2
 
-ROOT_PATH=${ROOT_PATH:-$PWD}
+ROOT_PATH=${ROOT_PATH:-$(git rev-parse --show-toplevel)}
 MANIFEST=$ROOT_PATH/build_manifest.yml
 
 if [ $(yq "has(\"$REPO\")" $MANIFEST) == "false" ]; then

build-system/scripts/setup_env

@@ -16,8 +16,9 @@ BRANCH=${5:-}
 PULL_REQUEST=${6:-}
 
 BASH_ENV=${BASH_ENV:-}
+ROOT_PATH=$(git rev-parse --show-toplevel)
 BUILD_SYSTEM_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
-PROJECT=$(cat PROJECT)
+PROJECT=$(cat $ROOT_PATH/PROJECT)
 COMMIT_MESSAGE=$(git log -n 1 --pretty=format:"%s" $COMMIT_HASH)
 PATH=$PATH:$BUILD_SYSTEM_PATH/scripts
 
@@ -64,7 +65,7 @@ if [ -z "$BASH_ENV" ]; then
   BASH_ENV=$(mktemp)
 fi
 
-echo export ROOT_PATH=$PWD >> $BASH_ENV
+echo export ROOT_PATH=$ROOT_PATH >> $BASH_ENV
 echo export BUILD_SYSTEM_PATH=$BUILD_SYSTEM_PATH >> $BASH_ENV
 echo export DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} >> $BASH_ENV
 echo export BUILDKIT_PROGRESS=plain >> $BASH_ENV

build-system/start_interactive

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Starts an interactive shell with the build system initialised.
+# Good for playing around with build system on development machines.
+
+source $(dirname "$0")/scripts/setup_env '' '' mainframe_$USER > /dev/null
+PROMPT_LEAN_LEFT=augment_prompt $SHELL

cspell.json

@@ -42,6 +42,8 @@
     "cimg",
     "clonedeep",
     "clonedeepwith",
+    "cmd",
+    "cmds",
     "codegen",
     "comlink",
     "composability",

yarn-project/.dockerignore

@@ -7,11 +7,10 @@
 
 */data*
 **/dest
-**/*.tsbuildinfo
-**/Dockerfile*
 **/node_modules
-Dockerfile*
+**/Dockerfile*
+**/*.tsbuildinfo
 
 noir-contracts/src/types
 noir-contracts/src/artifacts
-noir-contracts/target
+noir-contracts/target

yarn-project/.yarnrc.yml

@@ -5,3 +5,7 @@ plugins:
     spec: '@yarnpkg/plugin-workspace-tools'
 
 yarnPath: .yarn/releases/yarn-3.6.3.cjs
+
+logFilters:
+  - code: YN0013
+    level: discard

yarn-project/Dockerfile

@@ -11,10 +11,10 @@ RUN apk add bash perl
 # Copy in the entire workspace.
 COPY . .
 
-RUN yarn workspace @aztec/foundation build && \
-  yarn workspace @aztec/noir-compiler build && \
-  yarn workspace @aztec/noir-contracts noir:build:all && \
-  yarn workspace @aztec/noir-protocol-circuits noir:build && \
-  yarn tsc -b
+RUN yarn workspace @aztec/foundation build
+RUN yarn workspace @aztec/noir-compiler build
+RUN yarn workspace @aztec/noir-contracts noir:build:all
+RUN yarn workspace @aztec/noir-protocol-circuits noir:build
+RUN yarn tsc -b
 
 ENTRYPOINT ["yarn"]

yarn-project/aztec-sandbox/Dockerfile

@@ -1,5 +1,4 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-prod AS yarn-project-prod
 
-WORKDIR /usr/src/yarn-project/aztec-sandbox
-ENTRYPOINT ["yarn", "start"]
+ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec-sandbox/dest/bin/index.js"]
 EXPOSE 8079 8080

yarn-project/aztec-sandbox/src/bin/index.ts

@@ -2,9 +2,10 @@
 import { createAztecNodeRpcServer, getConfigEnvVars as getNodeConfigEnvVars } from '@aztec/aztec-node';
 import { AccountManager, createAztecNodeClient, deployInitialSandboxAccounts } from '@aztec/aztec.js';
 import { NULL_KEY } from '@aztec/ethereum';
+import { init } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { NoirWasmVersion } from '@aztec/noir-compiler/versions';
+import { NoirCommit } from '@aztec/noir-compiler/versions';
 import { BootstrapNode, getP2PConfigEnvVars } from '@aztec/p2p';
 import { GrumpkinScalar, PXEService, createPXERpcServer } from '@aztec/pxe';
 
@@ -76,15 +77,24 @@ async function main() {
 
   const mode = MODE as SandboxMode;
 
-  const createShutdown = (cb?: () => Promise<void>) => async () => {
-    logger.info('Shutting down...');
-    if (cb) {
-      await cb();
-    }
-    process.exit(0);
+  const installSignalHandlers = (cb?: () => Promise<void>) => {
+    const shutdown = async () => {
+      logger.info('Shutting down...');
+      if (cb) {
+        await cb();
+      }
+      process.exit(0);
+    };
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
+    process.once('SIGINT', shutdown);
+    process.once('SIGTERM', shutdown);
   };
 
-  let shutdown: () => Promise<void>;
+  installSignalHandlers();
+
+  // Init crypto (bb.js).
+  await init();
 
   const logStrings = [];
 
@@ -97,12 +107,12 @@ async function main() {
 
   // Code path for starting Sandbox
   if (mode === SandboxMode.Sandbox) {
-    logger.info(`Setting up Aztec Sandbox v${version} (noir v${NoirWasmVersion}), please stand by...`);
+    logger.info(`Setting up Aztec Sandbox v${version} (noir ${NoirCommit}), please stand by...`);
 
     const { pxe, node, stop, accounts } = await createAndInitialiseSandbox(deployTestAccounts);
 
     // Create shutdown cleanup function
-    shutdown = createShutdown(stop);
+    installSignalHandlers(stop);
 
     // Start Node and PXE JSON-RPC servers
     startHttpRpcServer(node, createAztecNodeRpcServer, AZTEC_NODE_PORT);
@@ -115,7 +125,7 @@ async function main() {
       const accountLogStrings = await createAccountLogs(accounts, pxe);
       logStrings.push(...accountLogStrings);
     }
-    logStrings.push(`Aztec Sandbox v${version} (noir v${NoirWasmVersion}) is now ready for use!`);
+    logStrings.push(`Aztec Sandbox v${version} (noir ${NoirCommit}) is now ready for use!`);
   } else if (mode === SandboxMode.Node) {
     // Code path for starting Node only
     const nodeConfig = getNodeConfigEnvVars();
@@ -131,21 +141,19 @@ async function main() {
     }
 
     const node = await createAztecNode(nodeConfig);
-    shutdown = createShutdown(node.stop);
+    installSignalHandlers(node.stop);
 
     // Start Node JSON-RPC server
     startHttpRpcServer(node, createAztecNodeRpcServer, 8080); // Use standard 8080 when no PXE is running
-    logStrings.push(
-      `Aztec Node v${version} (noir v${NoirWasmVersion}) is now ready for use in port ${AZTEC_NODE_PORT}!`,
-    );
+    logStrings.push(`Aztec Node v${version} (noir ${NoirCommit}) is now ready for use in port ${AZTEC_NODE_PORT}!`);
   } else if (mode === SandboxMode.PXE) {
     // Code path for starting PXE only
 
     // Create a Node client to connect to the PXE
     const node = createAztecNodeClient(AZTEC_NODE_URL);
 
     const pxe = await createAztecPXE(node);
-    shutdown = createShutdown(pxe.stop);
+    installSignalHandlers(pxe.stop);
 
     // Start PXE JSON-RPC server
     startHttpRpcServer(pxe, createPXERpcServer, PXE_PORT);
@@ -157,24 +165,20 @@ async function main() {
       logStrings.push(...accountLogStrings);
     }
 
-    logStrings.push(`PXE v${version} (noir v${NoirWasmVersion}) is now ready for use in port ${PXE_PORT}!`);
+    logStrings.push(`PXE v${version} (noir ${NoirCommit}) is now ready for use in port ${PXE_PORT}!`);
   } else if (mode === SandboxMode.P2PBootstrap) {
     // Code path for starting a P2P bootstrap node
     const config = getP2PConfigEnvVars();
     const bootstrapNode = new BootstrapNode(logger);
     await bootstrapNode.start(config);
-    shutdown = createShutdown(bootstrapNode.stop);
+    installSignalHandlers(bootstrapNode.stop);
     logStrings.push(
       `Bootstrap P2P node is now ready for use. Listening on: ${config.tcpListenIp}:${config.tcpListenPort}.`,
     );
-  } else {
-    shutdown = createShutdown();
   }
 
   // Log startup details
   logger.info(`${splash}\n${github}\n\n`.concat(...logStrings));
-  process.once('SIGINT', shutdown);
-  process.once('SIGTERM', shutdown);
 }
 
 /**

yarn-project/aztec.js/package.json

@@ -4,9 +4,20 @@
   "version": "0.1.0",
   "type": "module",
   "exports": {
-    "node": "./dest/index.js",
-    "import": "./dest/index.js",
-    "default": "./dest/main.js"
+    ".": {
+      "node": "./dest/index.js",
+      "import": "./dest/index.js",
+      "default": "./dest/main.js"
+    },
+    "./interfaces/pxe": "./dest/api/interfaces/pxe.js",
+    "./abi": "./dest/api/abi.js",
+    "./aztec_address": "./dest/api/aztec_address.js",
+    "./eth_address": "./dest/api/eth_address.js",
+    "./ethereum": "./dest/api/ethereum.js",
+    "./fields": "./dest/api/fields.js",
+    "./init": "./dest/api/init.js",
+    "./log_id": "./dest/api/log_id.js",
+    "./tx_hash": "./dest/api/tx_hash.js"
   },
   "typedocOptions": {
     "entryPoints": [

yarn-project/aztec.js/src/api/README.md

@@ -0,0 +1,7 @@
+# API
+
+This provides a more modular api for importing parts of the library as needed.
+The root `index.js` just exposes everything, which can have consequences for startup times and optimizations.
+Here we can gradually build up a much more granular api to allow importing precisely what's needed.
+This should adopt the opposite philosophy to "export all my child exports".
+Every file should (usually) export one thing, and the file/directory structure should be reflected in package.json exports.

yarn-project/aztec.js/src/api/abi.ts

@@ -0,0 +1 @@
+export { ContractArtifact, FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';

yarn-project/aztec.js/src/api/aztec_address.ts

@@ -0,0 +1 @@
+export { AztecAddress } from '@aztec/foundation/aztec-address';

yarn-project/aztec.js/src/api/eth_address.ts

@@ -0,0 +1 @@
+export { EthAddress } from '@aztec/foundation/eth-address';

yarn-project/aztec.js/src/api/ethereum.ts

@@ -0,0 +1,6 @@
+export {
+  deployL1Contract,
+  deployL1Contracts,
+  DeployL1Contracts,
+  L1ContractArtifactsForDeployment,
+} from '@aztec/ethereum';

yarn-project/aztec.js/src/api/fields.ts

@@ -0,0 +1 @@
+export { Point, Fr, Fq, GrumpkinScalar } from '@aztec/foundation/fields';

yarn-project/aztec.js/src/api/init.ts

@@ -0,0 +1 @@
+export { init as initAztecJs } from '@aztec/foundation/crypto';

yarn-project/aztec.js/src/api/interfaces/pxe.ts

@@ -0,0 +1 @@
+export { PXE } from '@aztec/types/interfaces';

yarn-project/aztec.js/src/api/log_id.ts

@@ -0,0 +1 @@
+export { LogId } from '@aztec/types/log_id';

yarn-project/aztec.js/src/api/tx_hash.ts

@@ -0,0 +1 @@
+export { TxHash } from '@aztec/types/tx_hash';

yarn-project/aztec.js/src/contract_deployer/index.ts

@@ -1,2 +1,3 @@
 export * from './contract_deployer.js';
 export * from './deploy_sent_tx.js';
+export * from './deploy_method.js';