Merge branch 'NethermindEth:develop' into develop

ObolNetwork · Jul 30, 2024 · c84beeb · c84beeb
2 parents 52f25a6 + aef5ceb
commit c84beeb
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 30 deletions.
diff --git 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
@@ -7,6 +7,11 @@ 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
 - Remove arguments for Lighthouse `--eth1` flag.
 
@@ -20,13 +25,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ```
diff --git a/docs/docs/quickstart/complete-guide.mdx b/docs/docs/quickstart/complete-guide.mdx
@@ -41,14 +41,14 @@ want to use another installation method:
   <TabItem value="curl" label="curl">
 
   ```
-  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
   ```
 
   </TabItem>
   <TabItem value="wget" label="wget">
 
   ```
-  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
   ```
 
   </TabItem>

diff --git 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
@@ -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"]
diff --git 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
@@ -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