wip

Author: charlielye

aztec-up/bin/aztec-install

@@ -23,8 +23,7 @@ fi
 AZTEC_HOME="${AZTEC_HOME:-$HOME/.aztec}"
 shared_bin_path="$AZTEC_HOME/bin"
 
-# VERSION can be set externally
-VERSION="${VERSION:-latest}"
+VERSION="${VERSION:-}"
 
 # Install URI (root, not version-specific)
 INSTALL_URI="${INSTALL_URI:-https://install.aztec.network}"
@@ -37,7 +36,7 @@ function print_colored() {
   echo "$1" | sed -E "s/(█+)/${b}\1${y}/g"
 }
 
-function title() {
+function title {
   clear
   echo
   print_colored " █████╗ ███████╗████████╗███████╗ ██████╗"
@@ -66,6 +65,31 @@ function title() {
   fi
 }
 
+function check_for_old_install {
+  if [ -f "$AZTEC_HOME/bin/.aztec-run" ]; then
+    echo_yellow "WARNING: An existing Aztec installation was detected in $AZTEC_HOME."
+    echo_yellow "You should only proceed if you no longer intend to use older versions of Aztec installed via the old docker-based method!"
+    echo
+    echo "Aztec has moved to a native, dockerless installation, using ${bold}${g}aztec-up${r} as a version manager."
+    echo "The container is still available but is only useful for running node infrastructure, not contract development."
+
+    if [ "$NON_INTERACTIVE" -eq 1 ]; then
+      echo "Remove $AZTEC_HOME and try again."
+      exit 1
+    fi
+
+    echo "If you continue, the entire $AZTEC_HOME directory will be removed and replaced with the new installation."
+    echo "You should manually remove old docker images you no longer need."
+    echo
+    read -p "Do you wish to continue? (y/n) " -n 1 -r
+    echo
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+      exit 1
+    fi
+  fi
+}
+
 function echo_green {
   echo -e "${g}$1${r}"
 }
@@ -105,8 +129,13 @@ function install_jq {
 }
 
 function install_aztec_up {
-  # Download aztec-up from root (not version-specific)
-  curl -fsSL "$INSTALL_URI/aztec-up" -o "$shared_bin_path/aztec-up"
+  if [ -n "$VERSION" ]; then
+    # Download aztec-up from version dir (useful for testing).
+    curl -fsSL "$INSTALL_URI/$VERSION/aztec-up" -o "$shared_bin_path/aztec-up"
+  else
+    # Download aztec-up from root (the canonical latest version).
+    curl -fsSL "$INSTALL_URI/aztec-up" -o "$shared_bin_path/aztec-up"
+  fi
   chmod +x "$shared_bin_path/aztec-up"
 }
 
@@ -132,11 +161,11 @@ function update_path_env_var {
     ;;
   esac
 
-  # Check if we already have aztec paths in the profile
+  # Check if we already have aztec paths in the profile.
   if grep -q '\.aztec' "$shell_profile" 2>/dev/null; then
-    # Remove old aztec PATH entries and add new one
+    # Remove old aztec PATH entries.
     local tmp_file=$(mktemp)
-    grep -v '\.aztec' "$shell_profile" > "$tmp_file" || true
+    grep -Ev 'export PATH=.*/\.aztec/' "$shell_profile" > "$tmp_file" || true
     mv "$tmp_file" "$shell_profile"
   fi
 
@@ -148,6 +177,8 @@ function main {
   # Show title if we're in a terminal.
   [ "$NON_INTERACTIVE" -eq 0 ] && title
 
+  check_for_old_install
+
   mkdir -p "$shared_bin_path"
 
   # Install jq

aztec-up/bin/aztec-up

@@ -150,11 +150,10 @@ function cmd_use {
     local aztecrc_file
     if aztecrc_file=$(find_aztecrc); then
       version=$(read_aztecrc "$aztecrc_file")
-      echo_blue "Found .aztecrc: $aztecrc_file"
     else
       echo "Error: No version specified and no .aztecrc file found."
       echo "Usage: aztec-up use <version>"
-      echo "   or: aztec-up use  (with .aztecrc file in current or parent directory)"
+      echo "   or: aztec-up use (with .aztecrc file in current or parent directory)"
       exit 1
     fi
   fi
@@ -174,7 +173,7 @@ function cmd_use {
 
   # Update the current symlink
   ln -sfn "$AZTEC_HOME/versions/$resolved_version" "$AZTEC_HOME/current"
-  echo_green "Now using aztec $resolved_version"
+  echo_green "Using aztec version $resolved_version"
 }
 
 # List installed versions and available aliases

aztec-up/bootstrap.sh

@@ -99,14 +99,28 @@ function test {
 function release {
   echo_header "aztec-up release"
   local version=${REF_NAME#v}
-  local source_dir=./bin
 
-  # Always upload version-specific files to version directory
-  do_or_dryrun aws s3 cp $source_dir/0.0.1/install "s3://install.aztec.network/$version/install"
-  do_or_dryrun aws s3 cp $source_dir/0.0.1/versions "s3://install.aztec.network/$version/versions"
+  # Upload version-specific files to version directory.
+  do_or_dryrun aws s3 cp bin/0.0.1 "s3://install.aztec.network/$version/"
 
+  # Upload root installer files to the version directory, which can be useful for testing.
+  do_or_dryrun aws s3 cp bin/aztec-install "s3://install.aztec.network/$version/aztec-install"
+  do_or_dryrun aws s3 cp bin/aztec-up "s3://install.aztec.network/$version/aztec-up"
+
+  # Update alias to point to new version.
+  # This has real impact outside of the version fence. i.e. if it's nightly dist tag, it affects nightly installs.
   do_or_dryrun aws s3 cp - "s3://install.aztec.network/aliases/$(dist_tag)" <<< "$version"
-  do_or_dryrun aws s3 cp $source_dir/aliases/index "s3://install.aztec.network/aliases/index"
+}
+
+# This is not done by CI.
+# It's a manual process, as updating the root installer and alias index requires careful consideration.
+function release_aztec_up {
+    # Update root scripts.
+    do_or_dryrun aws s3 cp bin/aztec-install "s3://install.aztec.network/aztec-install"
+    do_or_dryrun aws s3 cp bin/aztec-up "s3://install.aztec.network/aztec-up"
+
+    # Update alias list.
+    do_or_dryrun aws s3 cp bin/aliases/index "s3://install.aztec.network/aliases/index"
 }
 
 case "$cmd" in

yarn-project/aztec/scripts/aztec.sh

@@ -12,6 +12,10 @@ cmd=${1:-}
 
 export AZTEC_SHELL_WRAPPER=1
 
+if [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then
+  aztec-up use
+fi
+
 case $cmd in
   test)
     export LOG_LEVEL="${LOG_LEVEL:-error}"