Merge branch 'develop' into prysmctl-scripts

prysm.bat

@@ -5,7 +5,7 @@ SetLocal EnableDelayedExpansion & REM All variables are set local to this run &
 set PRYLABS_SIGNING_KEY=0AE0051D647BA3C1A917AF4072E33E4DF1A5036E
 
 REM Complain if invalid arguments were provided.
-for %%a in (beacon-chain validator client-stats) do (
+for %%a in (beacon-chain validator prysmctl client-stats) do (
     if %1 equ %%a (
         goto validprocess
     )
@@ -13,7 +13,7 @@ for %%a in (beacon-chain validator client-stats) do (
 echo ERROR: PROCESS missing or invalid
 echo Usage: ./prysm.bat PROCESS FLAGS.
 echo.
-echo PROCESS can be beacon-chain, validator, or client-stats.
+echo PROCESS can be beacon-chain, validator, prysmctl or client-stats.
 echo FLAGS are the flags or arguments passed to the PROCESS.
 echo. 
 echo Use this script to download the latest Prysm release binaries.
@@ -70,6 +70,7 @@ IF defined USE_PRYSM_MODERN (
 )
 set VALIDATOR_REAL=%wrapper_dir%\validator-%prysm_version%-%system%-%arch%
 set CLIENT_STATS_REAL=%wrapper_dir%\client-stats-%prysm_version%-%system%-%arch%
+set PRYSMCTL_REAL=%wrapper_dir%\prysmctl-%prysm_version%-%system%-%arch%
 
 if "%~1"=="beacon-chain" (
     if exist "%BEACON_CHAIN_REAL%" (
@@ -130,6 +131,22 @@ if "%~1"=="client-stats" (
     )
 )
 
+if "%~1"=="prysmctl" (
+    if exist %PRYSMCTL_REAL% (
+        echo prysmctl is up to date.
+    ) else (
+        echo Downloading prysmctl %prysm_version% to %PRYSMCTL_REAL% %reason%
+		for /f "delims=" %%i in ('curl --silent -o nul -w "%%{http_code}" https://prysmaticlabs.com/releases/prysmctl-%prysm_version%-%system%-%arch% ') do set "http=%%i" && echo %%i
+		if "!http!"=="404" (
+			echo No prysmctl found for %prysm_version%
+			exit /b 1
+		)
+		curl -L https://prysmaticlabs.com/releases/prysmctl-%prysm_version%-%system%-%arch% -o %PRYSMCTL_REAL%
+        curl --silent -L https://prysmaticlabs.com/releases/prysmctl-%prysm_version%-%system%-%arch%.sha256 -o %wrapper_dir%\prysmctl-%prysm_version%-%system%-%arch%.sha256
+        curl --silent -L https://prysmaticlabs.com/releases/prysmctl-%prysm_version%-%system%-%arch%.sig -o %wrapper_dir%\prysmctl-%prysm_version%-%system%-%arch%.sig
+    )
+)
+
 if "%~1"=="slasher" (
     echo The slasher binary is no longer available. Please use the --slasher flag with your beacon node. See: https://docs.prylabs.network/docs/prysm-usage/slasher/
     exit /b 1
@@ -138,6 +155,7 @@ if "%~1"=="slasher" (
 if "%~1"=="beacon-chain" ( set process=%BEACON_CHAIN_REAL%)
 if "%~1"=="validator" ( set process=%VALIDATOR_REAL%) 
 if "%~1"=="client-stats" ( set process=%CLIENT_STATS_REAL%)
+if "%~1"=="prysmctl" ( set process=%PRYSMCTL_REAL%)
 
 REM GPG not natively available on Windows, external module required
 echo WARN GPG verification is not natively available on Windows.

prysm.ps1

@@ -2,11 +2,11 @@ $folderDist = "dist";
 $ProgressPreference = 'SilentlyContinue' # Disable Invoke-WebRequest progress bar, makes it silent and faster.
 
 # Complain if invalid arguments were provided.
-if ("beacon-chain", "validator", "client-stats" -notcontains $args[0]) {
+if ("beacon-chain", "validator","prysmctl", "client-stats" -notcontains $args[0]) {
     Write-Host @"
 Usage: ./prysm.sh1 PROCESS FLAGS.
 
-PROCESS can be beacon-chain, validator, or client-stats.
+PROCESS can be beacon-chain, validator, prysmctl, or client-stats.
 FLAGS are the flags or arguments passed to the PROCESS.
  
 Use this script to download the latest Prysm release binaries.

prysm.sh

@@ -69,7 +69,7 @@ function get_realpath() {
 if [ "$#" -lt 1 ]; then
     color "31" "Usage: ./prysm.sh PROCESS FLAGS."
     color "31" "       ./prysm.sh PROCESS --download-only."
-    color "31" "PROCESS can be beacon-chain, validator, or client-stats."
+    color "31" "PROCESS can be beacon-chain, validator, prysmctl, or client-stats."
     exit 1
 fi
 
@@ -178,6 +178,7 @@ else
 fi
 VALIDATOR_REAL="${wrapper_dir}/validator-${prysm_version}-${system}-${arch}"
 CLIENT_STATS_REAL="${wrapper_dir}/client-stats-${prysm_version}-${system}-${arch}"
+PRYSMCTL_REAL="${wrapper_dir}/prysmctl-${prysm_version}-${system}-${arch}"
 
 if [[ $1 == beacon-chain ]]; then
     if [[ ! -x $BEACON_CHAIN_REAL ]]; then
@@ -236,6 +237,24 @@ if [[ $1 == client-stats ]]; then
     fi
 fi
 
+if [[ $1 == prysmctl ]]; then
+    if [[ ! -x $PRYSMCTL_REAL ]]; then
+        color "34" "Downloading prysmctl@${prysm_version} to ${CLIENT_STATS_REAL} (${reason})"
+
+        file=prysmctl-${prysm_version}-${system}-${arch}
+        res=$(curl -w '%{http_code}\n' -f -L "https://prysmaticlabs.com/releases/${file}" -o "$PRYSMCTL_REAL" | ( grep 404 || true ) )
+        if [[ $res == 404 ]];then
+            echo "No prysmctl found for ${prysm_version},(${file}) exit"
+            exit 1
+        fi
+        curl --silent -L "https://prysmaticlabs.com/releases/${file}.sha256" -o "${wrapper_dir}/${file}.sha256"
+        curl --silent -L "https://prysmaticlabs.com/releases/${file}.sig" -o "${wrapper_dir}/${file}.sig"
+        chmod +x "$PRYSMCTL_REAL"
+    else
+        color "37" "prysmctl is up to date."
+    fi
+fi
+
 if [[ $1 == slasher ]]; then
     color "41" "The slasher binary is no longer available. Please use the --slasher flag with your beacon node. See: https://docs.prylabs.network/docs/prysm-usage/slasher/"
     exit 1
@@ -254,11 +273,15 @@ client-stats)
     readonly process=$CLIENT_STATS_REAL
     ;;
 
+prysmctl)
+    readonly process=$PRYSMCTL_REAL
+    ;;
+
 *)
     color "31" "Process '$1' is not found!"
     color "31" "Usage: ./prysm.sh PROCESS FLAGS."
     color "31" "       ./prysm.sh PROCESS --download-only."
-    color "31" "PROCESS can be beacon-chain, validator, or client-stats."
+    color "31" "PROCESS can be beacon-chain, validator, prysmctl, or client-stats."
     exit 1
     ;;
 esac