From e92f92ec49af82d8cf6ed42ddf490d414c57f252 Mon Sep 17 00:00:00 2001 From: Haneen Hany <124837763+khalifaa55@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:33:29 +0300 Subject: [PATCH 1/2] Sync branch with main branch changes (#399) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [docs] update changelog * [docs] update docs for version v1.3.0 * docs: update main docs page to holds holesky Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: add new info section on latest comment at quickstart page Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: update CHANGELOG Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * fix: golang version for release * Release v1.3.1 (#359) * [docs] update changelog * [docs] update docs for version v1.3.0 * docs: update main docs page to holds holesky Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: add new info section on latest comment at quickstart page Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: update CHANGELOG Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * fix: golang version for release * chore: Update client images to be ready for deneb forks * feat: update courtney dependency * fix: update unit_tests action * fix: update build workflow * fix: update codecov/codecov-action to v4 * fix: update doc-test dependencies versions * fix: update templates commands in tests * feat: update versions of clients * fix: update lodestar command * docs: update changelog * docs: update documentation to version v1.3.1 * docs: update CHANGELOG.md Co-authored-by: Adrian Tubal Páez Ruiz * docs: update CHANGELOG.md Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian * Fix homebrew (#360) * feat: upgrade release action * fix: downgrade docker/setup-buildx-action to v3 * fix: update reviewers on release PR * fix:comment failing packages on Windows * Release v1.3.2 (#365) Dencun-ready release Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian * Release v1.4.0 (#394) * [docs] update changelog * [docs] update docs for version v1.3.0 * docs: update main docs page to holds holesky Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: add new info section on latest comment at quickstart page Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: update CHANGELOG Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * fix: golang version for release * chore: Update client images to be ready for deneb forks * feat: update courtney dependency * fix: update unit_tests action * fix: update build workflow * fix: update codecov/codecov-action to v4 * fix: update doc-test dependencies versions * fix: update templates commands in tests * feat: update versions of clients * fix: update lodestar command * Update develop branch with main (#362) * [docs] update changelog * [docs] update docs for version v1.3.0 * docs: update main docs page to holds holesky Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: add new info section on latest comment at quickstart page Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: update CHANGELOG Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * fix: golang version for release * Release v1.3.1 (#359) * [docs] update changelog * [docs] update docs for version v1.3.0 * docs: update main docs page to holds holesky Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: add new info section on latest comment at quickstart page Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * docs: update CHANGELOG Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> * fix: golang version for release * chore: Update client images to be ready for deneb forks * feat: update courtney dependency * fix: update unit_tests action * fix: update build workflow * fix: update codecov/codecov-action to v4 * fix: update doc-test dependencies versions * fix: update templates commands in tests * feat: update versions of clients * fix: update lodestar command * docs: update changelog * docs: update documentation to version v1.3.1 * docs: update CHANGELOG.md Co-authored-by: Adrian Tubal Páez Ruiz * docs: update CHANGELOG.md Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian * Fix homebrew (#360) * feat: upgrade release action * fix: downgrade docker/setup-buildx-action to v3 * fix: update reviewers on release PR * fix:comment failing packages on Windows --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian * Update images dencun-ready (#364) * feat: update client images to be dencun compatible * docs: update changelog * Remove obsolete version field (#373) * fix: remove obsolete version field * fix: update github actions (#366) * fix: check-version PR reviewers (#382) * Remove support for Goerli (#372) * Removed Goerli from NetworkSupported and adjusted networks test * Removed Goerli from templates/envs * Removed Goerli from templates/envs * Mentioned Goerli support removal in the changelog, goerli.mdx, and README * Fixed TestSupportMEVBoost * Removed Georli from TestGenerativeEnvFile * Adjusted Test case 6 in TestCheckVariable * Removed Georli from networks list for TestSupportedNetworks * Removed Goerli from cli.go * Adjusted test cli_test.go "consensus node" network into NetworkMainnet * Replaced Goerli network from test cases in generate_test.go with valid networks * Removed Goerli from GenerateCmd() * Replaced Goerli in test cases with Mainnet * Removed Goerli from KeysCmd() * Removed Goerli from FullNodeSubCmd() * Removed NetworkGoerli * Fixed index_out_of_range error in Holesky related test cases in "Select network" * Adjusted error in TestCli regarding "consensus node" test case * Update cli/sub_gen.go * docs: Update cli.mdx * docs: Update clients.mdx * docs: Update generate.mdx * docs: Update keys.mdx * docs: Update networks.mdx * docs: Replace Goerli with Sepolia in run-validator-mev[network].md * docs: Remove Goerli from documentations * feat: remove Goerli from ImportKeys and associated tests * docs: remove Goerli from docs * test: Add E2E test suite (#384) * test: init e2e tests * feat: add e2e test workflow * chore: add codecov config * feat: Add Smart Contracts logic for Lido (#386) * feat: add MevBoostRelayAllowedList contract and code * feat: add StakingRouter contract and code * feat: add contracts go files to package "lido" * feat: apply changes to go.sum and go.mod * feat: adjust packages for contracts * fix: adjust formatting in MEVBoostRelayAllowedList.go * fix: update go.mod and go.sum * test: create MEVBoostrelayAllowedList_test.go * feat: update go.mod, go.sum * style: adjust formatting * feat: move lido package to internal package * feat: add feeRecipient addresses for each network * feat: adjust MEVBoostRelayAllowedList_test.go for method GetRelays * style: add comments to GetRelays method * feat: separate test and logic methods * feat: put expectedRelays in .yaml file * style: rename files, adjust formatting and add comments * feat: import configs package * feat: add public rpcs to configs and create method GetPublicRPCs * style: adjust formatting * feat: Allow keystores creation with eth1 withdrawal credentials (#235) * feat: allow keystores creation with eth1 withdrawal credentials * fix: error when passing empty withdrawal eth1 address * chore: Add devcontainer config * fix: Withdrawal credentials prefix zeros in deposit data. * feat: Add json schema and logic to validate deposit_data.json * test: Add e2e test for keys gen with eth1 withdrawal cred * feat: Support installing deps on debian 12 * fix: fix e2e tests error in Windows * fix: e2e sedge keys test for Windows --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: AntiD2ta Co-authored-by: Haneen Khalifa * feat: Add support for mev-boost on Holesky (#380) * feat: add mev RelayUrls for Holesky * feat: update holesky/envs_base.tmpl * test: add test case in TestSupportMEVBoost * docs: update docs, README.md, and CHANGELOG.md * feat: update TestCli/consensus_node_holesky * feat: update TestCli/consensus_node_holesky --------- Co-authored-by: Marcos Antonio Maceo <35319980+stdevMac@users.noreply.github.com> * feat: Update images to latest versions (#391) * feat: update clients to latest images * Fix misused eth1 flag for lighthouse CL * docs: update changelog --------- Co-authored-by: Yaroslav Kukharuk * feat: Add Lido Flow (#389) * feat: add method GetRelaysURI and adjust mevboostrelaylist package * feat: add lido flow for cli.go * refactor: adjust prompts for lido flow * feat: add non-interactive lido flow * style: adjust formatting * fix: adjust formatting * test: add e2e test for non-interactive setup * fix: adjust e2e test * style: adjust formatting * test: Add mocks test for non-interactive setup in cli/generate_test.go * doc: documentation for lido csm on sedge * test: adjust e2e tests for lido flow * fix: update go.mod * fix: Adjust generate_test.go * feat: Add --lido to sedge keys * feat: Overwrite WithdrawalAddress in prompts setup * refactor: error messages * refactor: adjust tests and naming * test: adjust keys for holesky * doc: Update Sedge with Lido guide (#390) * feat: MEV prompt with lido * refactor: Validate lido supported networks * refactor: NodeOptionsFactory interface for cli * refactor: NodeOptionsFactory interface for sedge generate * fix: Holesky fork version * refac: New pkg options for Sedge setup type logic * feat(keys): Log keystore path after generation * doc: Add --network holesky to sedge keys --lido example * chore: Update go.mod * fix documentation for update on commands * doc: Update CHANGELOG --------- Co-authored-by: Marcos Maceo Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: AntiD2ta * feat: Support ubuntu 24.04 deps install (#392) * feat: Support installing deps on Ubuntu 24.04 * feat: Add gcc and g++ to suggested deps for build from source * fix(cli): Mev-boost not being generated for holesky (#393) * docs: update documentation for release v.1.4.0 --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian Co-authored-by: Kamil Chodoła <43241881+kamilchodola@users.noreply.github.com> Co-authored-by: Haneen Khalifa <124837763+khalifaa55@users.noreply.github.com> Co-authored-by: Carlos Bermudez Porto <43155355+cbermudez97@users.noreply.github.com> Co-authored-by: AntiD2ta Co-authored-by: Haneen Khalifa Co-authored-by: Yaroslav Kukharuk * fix: set golang to 1.21 on actions (#395) * fix: update go version on dockerfile for buildx (#396) * fix: update go version on actions for ppa (#397) * refactor: lido.go --------- Co-authored-by: Marcos Antonio Maceo Reyes Co-authored-by: Marcos Antonio Maceo <35319980+stdevMac@users.noreply.github.com> Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> Co-authored-by: Adrian Co-authored-by: Kamil Chodoła <43241881+kamilchodola@users.noreply.github.com> Co-authored-by: Carlos Bermudez Porto <43155355+cbermudez97@users.noreply.github.com> Co-authored-by: AntiD2ta Co-authored-by: Yaroslav Kukharuk --- .github/workflows/release.yml | 6 +++--- CHANGELOG.md | 13 +++++++++++-- README.md | 10 ++++++++++ docs/docs/commands/deps.mdx | 2 +- docs/docs/commands/down.mdx | 2 +- docs/docs/commands/importKey.mdx | 2 +- docs/docs/commands/networks.mdx | 2 +- docs/docs/commands/run.mdx | 6 +++--- docs/docs/commands/show.mdx | 2 +- docs/docs/commands/slashingExport.mdx | 8 ++++---- docs/docs/commands/slashingImport.mdx | 8 ++++---- docs/docs/commands/version.mdx | 2 +- docs/docs/quickstart/complete-guide.mdx | 4 ++-- internal/pkg/options/lido.go | 5 +---- scripts/Dockerfile | 2 +- 15 files changed, 45 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09f0859a1..53e439e22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.19.0" + go-version: "1.21.0" - run: chmod +x ./scripts/build-go-darwin-binaries.sh && ./scripts/build-go-darwin-binaries.sh @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.19.0" + go-version: "1.21.0" - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -189,7 +189,7 @@ jobs: path: sedge - uses: actions/setup-go@v5 with: - go-version: "1.19.0" + go-version: "1.21.0" - name: Run publish PPA script env: GOPATH: /home/runner/go diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b92cf31f..45e563195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.4.0] - 2024-07-10 + ### Fixed - Remove arguments for Lighthouse `--eth1` flag. @@ -20,13 +22,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update client images to Dencun-ready versions. +- Update client images to Dencun-ready versions. - Renamed `--eth1-withdrawal-address` flag from `sedge keys` to `--eth-withdrawal-address`. - Update client images to latest versions. ### Removed -- Removed support for Goerli. +- Removed support for Goerli. + + +## [v1.3.2] - 2024-03-08 + +### Changed + +- Update client images to Dencun-ready versions. ## [v1.3.1] - 2024-02-14 diff --git a/README.md b/README.md index d5f2a320e..6585dd5a3 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,15 @@ While Sedge assists in installing the validator, it is not designed to register Users acknowledge that no warranty is being made of a successful installation. Sedge is a tool and it ultimately depends on you to use it correctly and follow all the best practice guidance, as found in this README and documentation. +## Lido integration + +Sedge is integrated with [Lido CSM](https://operatorportal.lido.fi/modules/community-staking-module), with +permissionless entry, allowing any node operator — and especially community stakers, from solo stakers, to groups of +friends, to amateur operators — to operate validators by providing an ETH-based bond (security collateral). + +Sedge supports the Lido CSM, allowing users to generate validator keys and set up their full nodes with ease. You can +read more about it in [our documentation](https://docs.sedge.nethermind.io/docs/quickstart/staking-with-lido)! + ## Supported networks and clients ### Mainnet @@ -246,6 +255,7 @@ The following roadmap covers the main features and ideas we want to implement bu ### Version 1.X (Current) - [x] Support Erigon on Gnosis +- [x] Support for Lido CSM - [ ] Include monitoring tool for alerting, tracking validator balance, and tracking sync progress and status of nodes - [ ] More tests!!! - [ ] Support for Nimbus client diff --git a/docs/docs/commands/deps.mdx b/docs/docs/commands/deps.mdx index d53da079f..fe31f1b17 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.3.1 +2023-03-21 02:56:05 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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 fe5ab0849..88b0c5640 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.3.1 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 [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 c6fb4adfc..90fa62f77 100644 --- a/docs/docs/commands/importKey.mdx +++ b/docs/docs/commands/importKey.mdx @@ -79,7 +79,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.3.1 +2023-01-26 11:59:34 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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 1b119e7a0..94959ebe4 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.3.2 +2024-07-09 12:23:03 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 2024-07-09 12:23:03 -- [INFO] Listing supported networks # Supported Networks diff --git a/docs/docs/commands/run.mdx b/docs/docs/commands/run.mdx index d9a2749a2..a5de00673 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.3.1 +2022-12-29 19:55:55 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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.3.1 +2022-12-29 21:03:29 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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.3.1 +2022-12-29 21:24:12 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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 a1302feec..a14c4d645 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.3.1 +2023-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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 f47d2c9dd..ec7d7eecd 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.3.1 +2023-01-06 15:47:57 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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.3.1 +2023-01-06 15:51:11 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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.3.1 +2023-01-06 15:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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.3.1 +2023-01-06 15:52:07 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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 2e373487d..3d5f67674 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.3.1 +2023-01-06 14:59:11 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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.3.1 +2023-01-06 15:08:06 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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.3.1 +2023-01-06 15:10:27 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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.3.1 +2023-01-06 15:12:22 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 # 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 78ed24145..cd71477fd 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.3.1 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.4.0 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 3927f0c06..1a0c6ce5e 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.3.1/sedge-v1.3.1-linux-amd64 --output sedge + curl -L https://github.com/NethermindEth/sedge/releases/download/v1.4.0/sedge-v1.4.0-linux-amd64 --output sedge ``` ``` - wget https://github.com/NethermindEth/sedge/releases/download/v1.3.1/sedge-v1.3.1-linux-amd64 -O sedge + wget https://github.com/NethermindEth/sedge/releases/download/v1.4.0/sedge-v1.4.0-linux-amd64 -O sedge ``` diff --git a/internal/pkg/options/lido.go b/internal/pkg/options/lido.go index 1780d13ba..08949b9a7 100644 --- a/internal/pkg/options/lido.go +++ b/internal/pkg/options/lido.go @@ -68,10 +68,7 @@ func (l *lidoOptions) RelayURLs(network string) ([]string, error) { func (l *lidoOptions) MEVBoostEnabled(network string) bool { _, supported := mevboostrelaylist.NetworkSupportedByLidoMevBoost(network) - if supported { - return true - } - return false + return supported } func (l *lidoOptions) ValidateSettings(settings OptionSettings) error { diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 2b91244f7..93c4565c9 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.18.3 AS build +FROM --platform=$BUILDPLATFORM golang:1.21.0 AS build WORKDIR /src ARG TARGETOS ARG TARGETARCH From aef5cebe418202a1d74765db207ddca89ff07a74 Mon Sep 17 00:00:00 2001 From: Haneen Hany <124837763+khalifaa55@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:08:08 +0300 Subject: [PATCH 2/2] fix: Teku and Lighthouse import keys container error on Windows (#398) * fix: error for Lighthouse and Teku in Windows * doc: update CHANGELOG.md * doc: Update CHANGELOG.md Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> --------- Co-authored-by: Miguel Tenorio <46824157+AntiD2ta@users.noreply.github.com> --- CHANGELOG.md | 3 +++ .../images/validator-import/lighthouse/context/Dockerfile | 4 +++- internal/images/validator-import/teku/context/Dockerfile | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e563195..2864f2a72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +- Teku and Lighthouse import keys container error on Windows. + ## [v1.4.0] - 2024-07-10 ### Fixed diff --git a/internal/images/validator-import/lighthouse/context/Dockerfile b/internal/images/validator-import/lighthouse/context/Dockerfile index 525884c26..078043c13 100644 --- a/internal/images/validator-import/lighthouse/context/Dockerfile +++ b/internal/images/validator-import/lighthouse/context/Dockerfile @@ -5,7 +5,7 @@ WORKDIR / ARG LH_VERSION ARG NETWORK -RUN apt-get update && apt-get install -y curl +RUN apt-get update && apt-get install -y curl dos2unix bash RUN version=$(echo $LH_VERSION | cut -d':' -f 2) \ && curl -L https://github.com/sigp/lighthouse/releases/download/$version/lighthouse-$version-x86_64-unknown-linux-gnu.tar.gz --output lh.gz @@ -14,6 +14,8 @@ RUN tar -xvf lh.gz COPY validator-init.sh . +RUN dos2unix validator-init.sh + RUN chmod +x validator-init.sh ENV VAL_NETWORK=$NETWORK diff --git a/internal/images/validator-import/teku/context/Dockerfile b/internal/images/validator-import/teku/context/Dockerfile index 7af598077..96c9f6571 100644 --- a/internal/images/validator-import/teku/context/Dockerfile +++ b/internal/images/validator-import/teku/context/Dockerfile @@ -6,6 +6,8 @@ COPY validator-init.sh /scripts WORKDIR /scripts +RUN dos2unix validator-init.sh + RUN chmod +x validator-init.sh CMD ["/bin/sh", "validator-init.sh"]