diff --git a/CHANGELOG.md b/CHANGELOG.md index 79cd81ea..c2a8e3a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - New cli flag --distributed for running cluster with Charon distributed validator +## [v1.7.2] - 2024-11-12 + +### Fixed +- Fix Erigon image source +- Fix installation script path + ## [v1.7.1] - 2024-11-1 ### Added diff --git a/configs/client_images.yaml b/configs/client_images.yaml index 084019bf..d1f377a8 100644 --- a/configs/client_images.yaml +++ b/configs/client_images.yaml @@ -9,8 +9,8 @@ execution: name: nethermind/nethermind version: 1.29.1 erigon: - name: thorax/erigon - version: v2.60.9 + name: erigontech/erigon + version: v2.60.10 consensus: lighthouse: name: sigp/lighthouse diff --git a/docs/docs/commands/cli.mdx b/docs/docs/commands/cli.mdx index 8670d019..692902b0 100644 --- a/docs/docs/commands/cli.mdx +++ b/docs/docs/commands/cli.mdx @@ -43,7 +43,7 @@ This is an example of what you can expect: ``` $ sedge cli 2024-10-16 17:51:44 -- [INFO] [Logger Init] Log level: info -2024-10-16 17:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2024-10-16 17:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 ? Select node setup ethereum-node ? Select network mainnet ? Select node type full-node diff --git a/docs/docs/commands/deps.mdx b/docs/docs/commands/deps.mdx index 006a3fae..351e1aac 100644 --- a/docs/docs/commands/deps.mdx +++ b/docs/docs/commands/deps.mdx @@ -75,7 +75,7 @@ The execution of `sedge deps check` will result in an output like this if everyt ``` $ sedge deps check 2023-03-21 02:56:04 -- [INFO] [Logger Init] Log level: info -2023-03-21 02:56:05 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-03-21 02:56:05 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2023-03-21 02:56:05 -- [INFO] docker is installed 2023-03-21 02:56:06 -- [INFO] All dependencies are installed and running ``` diff --git a/docs/docs/commands/down.mdx b/docs/docs/commands/down.mdx index 616c0c4e..e85e14cb 100644 --- a/docs/docs/commands/down.mdx +++ b/docs/docs/commands/down.mdx @@ -38,7 +38,7 @@ The execution of `sedge down` will close and remove all the opened containers an ``` $ sedge down 2022-00-00 00:00:00 -- [INFO] [Logger Init] Log level: info -2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 [sudo] password for maceo: [+] Running 7/7 ⠿ Container execution-client Removed 93.8s diff --git a/docs/docs/commands/importKey.mdx b/docs/docs/commands/importKey.mdx index 9f6ec66e..51de1571 100644 --- a/docs/docs/commands/importKey.mdx +++ b/docs/docs/commands/importKey.mdx @@ -80,7 +80,7 @@ To import the validator keys, and start the validator client after the import, r ```shell $ sedge import-key --from keystore -n sepolia --start-validator prysm 2023-01-26 11:59:34 -- [INFO] [Logger Init] Log level: info -2023-01-26 11:59:34 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-26 11:59:34 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-26 11:59:34 -- [WARN] The keys path is not the default one, copying the keys to the default path /root/sedge/example/sedge-data/keystore 2023-01-26 11:59:34 -- [INFO] Importing validator keys diff --git a/docs/docs/commands/networks.mdx b/docs/docs/commands/networks.mdx index ca820aa1..9f553518 100644 --- a/docs/docs/commands/networks.mdx +++ b/docs/docs/commands/networks.mdx @@ -28,7 +28,7 @@ Global Flags: ``` $ sedge networks 2024-07-09 12:23:02 -- [INFO] [Logger Init] Log level: info -2024-07-09 12:23:03 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2024-07-09 12:23:03 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2024-07-09 12:23:03 -- [INFO] Listing supported networks diff --git a/docs/docs/commands/run.mdx b/docs/docs/commands/run.mdx index 7c7c180a..99031268 100644 --- a/docs/docs/commands/run.mdx +++ b/docs/docs/commands/run.mdx @@ -59,7 +59,7 @@ the following command to start all services in the default generation path $ sedge run Using config file: /root/.sedge.yaml 2022-12-29 19:55:55 -- [INFO] [Logger Init] Logging configuration: {Level:debug} -2022-12-29 19:55:55 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2022-12-29 19:55:55 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2022-12-29 20:40:24 -- [INFO] Checking dependencies: docker 2022-12-29 20:40:24 -- [INFO] All dependencies are installed on host machine 2022-12-29 19:55:55 -- [INFO] Setting up containers @@ -110,7 +110,7 @@ start the validator. $ sedge run --services execution,consensus Using config file: /root/.sedge.yaml 2022-12-29 21:03:29 -- [INFO] [Logger Init] Logging configuration: {Level:debug} -2022-12-29 21:03:29 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2022-12-29 21:03:29 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2022-12-29 21:03:29 -- [INFO] Checking dependencies: docker 2022-12-29 21:03:29 -- [INFO] All dependencies are installed on host machine 2022-12-29 21:03:29 -- [INFO] Setting up containers @@ -155,7 +155,7 @@ Now you can start the validator client like follow: $ sedge run --services validator Using config file: /root/.sedge.yaml 2022-12-29 21:24:12 -- [INFO] [Logger Init] Logging configuration: {Level:debug} -2022-12-29 21:24:12 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2022-12-29 21:24:12 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2022-12-29 21:24:12 -- [INFO] Checking dependencies: docker 2022-12-29 21:24:12 -- [INFO] All dependencies are installed on host machine 2022-12-29 21:24:12 -- [INFO] Setting up containers diff --git a/docs/docs/commands/show.mdx b/docs/docs/commands/show.mdx index 54a549a5..ec288578 100644 --- a/docs/docs/commands/show.mdx +++ b/docs/docs/commands/show.mdx @@ -29,7 +29,7 @@ Global Flags: ``` $ sedge show 2023-00-00 00:00:00 -- [INFO] [Logger Init] Log level: info -2023-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2023-00-00 00:00:00 -- [INFO] Showing existing containers information 2023-00-00 00:00:00 -- [INFO] containers: - name: sedge-execution-client diff --git a/docs/docs/commands/slashingExport.mdx b/docs/docs/commands/slashingExport.mdx index 4f1ed3ad..4857668f 100644 --- a/docs/docs/commands/slashingExport.mdx +++ b/docs/docs/commands/slashingExport.mdx @@ -58,7 +58,7 @@ This is an example of exporting slashing protection data from a setup using sepo ```shell $ sedge slashing-export lighthouse -n sepolia --out slashing-protection.json 2023-01-06 15:47:56 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:47:57 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:47:57 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2023-01-06 15:47:57 -- [INFO] Exporting slashing data from client lighthouse # highlight-next-line 2023-01-06 15:47:57 -- [INFO] The slashing protection container is starting... @@ -71,7 +71,7 @@ Notice in this case the validator client remains stopped because it has been sto ```shell $ sedge slashing-export lighthouse -n sepolia --out slashing-protection.json --start-validator 2023-01-06 15:51:11 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:51:11 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:51:11 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2023-01-06 15:51:11 -- [INFO] Exporting slashing data from client lighthouse 2023-01-06 15:51:11 -- [INFO] The slashing protection container is starting... 2023-01-06 15:51:12 -- [INFO] The slashing container ends successfully. @@ -86,7 +86,7 @@ Another case may be exporting the slashing data protection when the validator is ```shell $ sedge slashing-export lighthouse -n sepolia --out slashing-protection.json 2023-01-06 15:51:46 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-06 15:51:46 -- [INFO] Stopping validator client # highlight-next-line @@ -107,7 +107,7 @@ In this case, the validator client is stopped before the export and started agai ```shell $ sedge slashing-export lighthouse -n sepolia --out slashing-protection.json --stop-validator 2023-01-06 15:52:07 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:52:07 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:52:07 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-06 15:52:07 -- [INFO] Stopping validator client # highlight-next-line diff --git a/docs/docs/commands/slashingImport.mdx b/docs/docs/commands/slashingImport.mdx index 47a73b58..08fc7c23 100644 --- a/docs/docs/commands/slashingImport.mdx +++ b/docs/docs/commands/slashingImport.mdx @@ -56,7 +56,7 @@ This is an example of importing slashing protection data to a setup using sepoli ```shell $ sedge slashing-import prysm -f slashing-export.json -n sepolia 2023-01-06 14:59:11 -- [INFO] [Logger Init] Log level: info -2023-01-06 14:59:11 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 14:59:11 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-06 14:59:11 -- [INFO] Importing slashing data to client prysm from slashing-export.json # highlight-next-line @@ -70,7 +70,7 @@ Notice in this case the validator client remains stopped because it has been sto ```shell $ sedge slashing-import prysm -f slashing-export.json -n sepolia --start-validator 2023-01-06 15:08:05 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:08:06 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:08:06 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 2023-01-06 15:08:06 -- [INFO] Importing slashing data to client prysm from slashing-export.json 2023-01-06 15:08:06 -- [INFO] The slashing protection container is starting... 2023-01-06 15:08:06 -- [INFO] The slashing container ends successfully. @@ -85,7 +85,7 @@ Another case may be importing the slashing data protection when the validator is ```shell $ sedge slashing-import prysm -f slashing-export.json -n sepolia 2023-01-06 15:10:27 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:10:27 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:10:27 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-06 15:10:27 -- [INFO] Stopping validator client... # highlight-next-line @@ -106,7 +106,7 @@ In this case, the validator client is stopped before the import and started agai ```shell $ sedge slashing-import prysm -f slashing-export.json -n sepolia --stop-validator 2023-01-06 15:12:22 -- [INFO] [Logger Init] Log level: info -2023-01-06 15:12:22 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2023-01-06 15:12:22 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 # highlight-next-line 2023-01-06 15:12:22 -- [INFO] Stopping validator client... # highlight-next-line diff --git a/docs/docs/commands/version.mdx b/docs/docs/commands/version.mdx index ce69eae3..4f287437 100644 --- a/docs/docs/commands/version.mdx +++ b/docs/docs/commands/version.mdx @@ -29,6 +29,6 @@ Global Flags: ``` $ sedge version 2022-00-00 00:00:00 -- [INFO] [Logger Init] Log level: info -2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.1 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.7.2 sedge v0.5.1 ``` \ No newline at end of file diff --git a/docs/docs/quickstart/complete-guide.mdx b/docs/docs/quickstart/complete-guide.mdx index b8e87930..18f84176 100644 --- a/docs/docs/quickstart/complete-guide.mdx +++ b/docs/docs/quickstart/complete-guide.mdx @@ -41,14 +41,14 @@ want to use another installation method: ``` - curl -L https://github.com/NethermindEth/sedge/releases/download/v1.7.1/sedge-v1.7.1-linux-amd64 --output sedge + curl -L https://github.com/NethermindEth/sedge/releases/download/v1.7.2/sedge-v1.7.2-linux-amd64 --output sedge ``` ``` - wget https://github.com/NethermindEth/sedge/releases/download/v1.7.1/sedge-v1.7.1-linux-amd64 -O sedge + wget https://github.com/NethermindEth/sedge/releases/download/v1.7.2/sedge-v1.7.2-linux-amd64 -O sedge ``` diff --git a/internal/pkg/clients/types_test.go b/internal/pkg/clients/types_test.go index 1b784d0e..9206e57f 100644 --- a/internal/pkg/clients/types_test.go +++ b/internal/pkg/clients/types_test.go @@ -53,7 +53,7 @@ func TestSetImageOrDefault_Execution(t *testing.T) { Name: "erigon", Type: "execution", }, - expectedImage: *regexp.MustCompile(`^thorax/erigon:v\d+\.\d+\.\d+$`), + expectedImage: *regexp.MustCompile(`^erigontech/erigon:v\d+\.\d+\.\d+$`), }, } for _, test := range tests { diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100644 index 00000000..13ea787f --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +set -e + +# Function to get the latest release tag from GitHub +get_latest_release() { + curl --silent "https://api.github.com/repos/NethermindEth/sedge/releases/latest" | # Get latest release from GitHub API + grep '"tag_name":' | # Get tag line + sed -E 's/.*"([^"]+)".*/\1/' # Extract version number +} + +# Detect OS and architecture +OS="$(uname -s)" +ARCH="$(uname -m)" + +# Normalize OS and ARCH +if [[ "$OS" == "Linux" ]]; then + PLATFORM="linux" +elif [[ "$OS" == "Darwin" ]]; then + PLATFORM="darwin" +else + echo "Unsupported OS: $OS" + exit 1 +fi + +if [[ "$ARCH" == "x86_64" ]]; then + ARCH="amd64" +elif [[ "$ARCH" == "arm64" || "$ARCH" == "aarch64" ]]; then + ARCH="arm64" +else + echo "Unsupported architecture: $ARCH" + exit 1 +fi + +# Get the latest version +VERSION=$(get_latest_release) +echo "Latest version is $VERSION" + +# Construct the download URL +BINARY_NAME="sedge-${VERSION}-${PLATFORM}-${ARCH}" +DOWNLOAD_URL="https://github.com/NethermindEth/sedge/releases/download/${VERSION}/${BINARY_NAME}" + +# Download the binary +echo "Downloading ${BINARY_NAME} from ${DOWNLOAD_URL}..." +curl -L -o sedge "${DOWNLOAD_URL}" + +# Make it executable +chmod +x sedge + +# Move to /usr/local/bin or another directory in PATH +echo "Installing sedge to /usr/local/bin..." +sudo mv sedge /usr/local/bin/ + +echo "Installation complete. You can now run 'sedge version' from the command line."