Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

aztec-up/bin/aztec-nargo

@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export AZTEC_PATH="${AZTEC_PATH:-$HOME/.aztec}"
-if [[ -z "${VERSION:-}" ]]; then
-  VERSION=$(cat "$AZTEC_PATH/default_version" 2>/dev/null || echo "latest")
-fi
-export VERSION
-export DOCKER_REPO="${DOCKER_REPO:-"aztecprotocol/aztec"}"
-
 if [[ $PWD != ${HOME}* ]]; then
   >&2 echo "Due to how we containerize our applications, we require your working directory to be somewhere within $HOME."
   exit 1
@@ -23,7 +16,7 @@ if [ "${1:-}" == "lsp" ]; then
     -v $HOME:$HOME \
     -e HOME=$HOME \
     --entrypoint=/usr/src/noir/noir-repo/target/release/nargo \
-    $DOCKER_REPO:$VERSION lsp
+    aztecprotocol/aztec lsp
   exit
 fi
 
@@ -43,4 +36,4 @@ docker run ${args:-} \
   -e HOME=$HOME \
   --workdir="$PWD" \
   --entrypoint=/usr/src/noir/noir-repo/target/release/nargo \
-  $DOCKER_REPO:$VERSION "$@"
+  aztecprotocol/aztec "$@"

aztec-up/bin/aztec-postprocess-contract

@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export AZTEC_PATH="${AZTEC_PATH:-$HOME/.aztec}"
-if [[ -z "${VERSION:-}" ]]; then
-  VERSION=$(cat "$AZTEC_PATH/default_version" 2>/dev/null || echo "latest")
-fi
-export VERSION
-export DOCKER_REPO="${DOCKER_REPO:-"aztecprotocol/aztec"}"
-
 if [[ $PWD != ${HOME}* ]]; then
   >&2 echo "Due to how we containerize our applications, we require your working directory to be somewhere within $HOME."
   exit 1
@@ -29,4 +22,4 @@ docker run ${args:-} \
   -e HOME=$HOME \
   --workdir="$PWD" \
   --entrypoint=/usr/src/aztec-postprocess-contract/transpile_contract_and_gen_vks.sh \
-  $DOCKER_REPO:$VERSION "$@"
+  aztecprotocol/aztec "$@"