From a2e7e9340f812e69b313d85655d7158ae06d1fe1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 24 Jan 2025 06:13:09 -0600
Subject: [PATCH] chore: update installation script to make use of latest
 (#865)

* feat: updates installation script to make use of latest

* chore: remove logs

* fix: update verify logic in script
---
 foundryup-zksync/foundryup-zksync | 60 ++++++++++++++++++++++---------
 install-foundry-zksync            | 17 ++++++---
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/foundryup-zksync/foundryup-zksync b/foundryup-zksync/foundryup-zksync
index 3fead66d6..07bb0ba09 100755
--- a/foundryup-zksync/foundryup-zksync
+++ b/foundryup-zksync/foundryup-zksync
@@ -86,19 +86,34 @@ main() {
 
   # Install by downloading binaries
   if [[ "$FOUNDRYUP_REPO" == "matter-labs/foundry-zksync" && -z "$FOUNDRYUP_BRANCH" && -z "$FOUNDRYUP_COMMIT" ]]; then
-    FOUNDRYUP_VERSION=${FOUNDRYUP_VERSION:-nightly}
-    FOUNDRYUP_TAG=$FOUNDRYUP_VERSION
-
-    # Normalize versions (handle channels, versions without v prefix
-    if [[ "$FOUNDRYUP_VERSION" =~ ^nightly ]]; then
-      FOUNDRYUP_VERSION="nightly"
-    elif [[ "$FOUNDRYUP_VERSION" == [[:digit:]]* ]]; then
-      # Add v prefix
-      FOUNDRYUP_VERSION="v${FOUNDRYUP_VERSION}"
-      FOUNDRYUP_TAG="${FOUNDRYUP_VERSION}"
+    # If --version not specified, fetch the latest release tag from GitHub
+   if [ -z "$FOUNDRYUP_VERSION" ]; then
+    # No --version passed -> Use the "latest" semantic-release tag
+    LATEST_TAG=$(curl -s https://api.github.com/repos/${FOUNDRYUP_REPO}/releases/latest | \
+                 sed -n 's/.*"tag_name": "\([^"]*\)".*/\1/p')
+    if [ -z "$LATEST_TAG" ]; then
+      err "could not fetch the latest release tag for $FOUNDRYUP_REPO!"
     fi
+    FOUNDRYUP_TAG="$LATEST_TAG"
 
-    say "installing foundry (version ${FOUNDRYUP_VERSION}, tag ${FOUNDRYUP_TAG})"
+  else
+    # --version was specified; check if it's nightly or a numeric version, etc.
+    if [[ "$FOUNDRYUP_VERSION" == "nightly" ]]; then
+      say "Installing the nightly build"
+      FOUNDRYUP_TAG="nightly"
+    elif [[ "$FOUNDRYUP_VERSION" =~ ^foundry-zksync-v ]]; then
+      # user passed full "foundry-zksync-v0.0.4"
+      FOUNDRYUP_TAG="$FOUNDRYUP_VERSION"
+    elif [[ "$FOUNDRYUP_VERSION" =~ ^v ]]; then
+      # user passed "v0.0.4"
+      FOUNDRYUP_TAG="foundry-zksync-$FOUNDRYUP_VERSION"
+    else
+      # user passed "0.0.4"
+      FOUNDRYUP_TAG="foundry-zksync-v$FOUNDRYUP_VERSION"
+    fi
+
+    say "installing foundry-zksync ($FOUNDRYUP_TAG)"
+  fi
 
     uname_s=$(uname -s)
     PLATFORM=$(tolower "${FOUNDRYUP_PLATFORM:-$uname_s}")
@@ -134,9 +149,8 @@ main() {
 
     # Compute the URL of the release tarball in the Foundry repository.
     RELEASE_URL="https://github.com/${FOUNDRYUP_REPO}/releases/download/${FOUNDRYUP_TAG}/"
-    BIN_ARCHIVE_URL="${RELEASE_URL}foundry_${FOUNDRYUP_VERSION}_${PLATFORM}_${ARCHITECTURE}.$EXT"
-    MAN_TARBALL_URL="${RELEASE_URL}foundry_man_${FOUNDRYUP_VERSION}.tar.gz"
-
+    BIN_ARCHIVE_URL="${RELEASE_URL}foundry_nightly_${PLATFORM}_${ARCHITECTURE}.$EXT"
+    
     # Download and extract the binaries archive
     say "downloading latest forge, and cast"
     if [ "$PLATFORM" = "win32" ]; then
@@ -150,9 +164,23 @@ main() {
 
     # Optionally download the manuals
     if check_cmd tar; then
-      say "downloading manpages"
+      say "attempting to download manpages from release assets"
       mkdir -p "$FOUNDRY_MAN_DIR"
-      download "$MAN_TARBALL_URL" | tar -xzC "$FOUNDRY_MAN_DIR"
+
+      ASSET_DATA=$(curl -s "https://api.github.com/repos/${FOUNDRYUP_REPO}/releases/tags/${FOUNDRYUP_TAG}")
+
+      # Parse out the man asset name:
+      # e.g. "foundry_man_nightly-ae913af65381734ad46c044a9495b67310bc77c4.tar.gz"
+      MAN_ASSET_NAME=$(echo "$ASSET_DATA" | grep -oE '"name":\s*"foundry_man_nightly[^"]+' \
+                                      | sed 's/"name": "//')
+
+      if [ -n "$MAN_ASSET_NAME" ]; then
+        MAN_TARBALL_URL="${RELEASE_URL}${MAN_ASSET_NAME}"
+        say "Found manpage tarball: $MAN_TARBALL_URL"
+        download "$MAN_TARBALL_URL" | tar -xzC "$FOUNDRY_MAN_DIR"
+      else
+        say "No manpage tarball found for this release."
+      fi
     else
       say 'skipping manpage download: missing "tar"'
     fi
diff --git a/install-foundry-zksync b/install-foundry-zksync
index e433ed801..e6a4a8a71 100755
--- a/install-foundry-zksync
+++ b/install-foundry-zksync
@@ -62,9 +62,18 @@ echo "Cleanup completed."
 echo "Installation completed successfully!"
 
 echo "Verifying installation..."
-if "${FOUNDRY_BIN_DIR}/forge" --version | grep -q "0.0.2"; then
-    echo "Forge version 0.0.2 is successfully installed."
-else
-    echo "Installation verification failed. Forge is not properly installed."
+FORGE_VERSION_OUTPUT=$("${FOUNDRY_BIN_DIR}/forge" --version 2>/dev/null || true)
+
+echo $FORGE_VERSION_OUTPUT
+
+if [ -z "$FORGE_VERSION_OUTPUT" ]; then
+    echo "Installation verification failed. 'forge --version' returned empty or an error."
     exit 1
 fi
+
+if echo "$FORGE_VERSION_OUTPUT" | grep -E -q "[0-9]+\.[0-9]+\.[0-9]+"; then
+    echo "Forge is successfully installed with version: $FORGE_VERSION_OUTPUT"
+else
+    echo "Forge is installed, but no semantic version (x.x.x) was detected."
+    echo "Installed version output: $FORGE_VERSION_OUTPUT"
+fi