diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a34327c3a..1b4aaa202 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,9 +13,9 @@ jobs: matrix: include: - os: ubuntu-latest - go: '1.19' + go: '1.21' - os: macos-latest - go: '1.19' + go: '1.21' - os: windows-latest go: '1.21' runs-on: ${{ matrix.os }} @@ -27,10 +27,10 @@ jobs: git config --global core.eol lf - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index b1786320c..23cc4c695 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -11,8 +11,8 @@ jobs: name: Test deployment runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 cache: npm diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 3650eccef..83ecf32a7 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -13,17 +13,17 @@ jobs: matrix: include: - os: ubuntu-latest - go: '1.19' + go: '1.21' - os: windows-latest go: '1.21' runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} @@ -39,7 +39,7 @@ jobs: run: make generate && go test ./... - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v4 if: matrix.os == 'ubuntu-latest' with: fail_ci_if_error: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 3433c9be9..c5870bde5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.3.1] - 2024-02-14 + +### Fixed + +- Remove the Lodestar `--eth1.providerUrls` flag +- Replace the Lighthouse `--eth1-endpoints` flag with `--eth1`. + +### Changed + +- Update client images. + ## [v1.3.0] - 2023-12-11 ### Added diff --git a/Makefile b/Makefile index 516e32062..59ce230a7 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ install-mockgen: ## install mockgen go install github.com/golang/mock/mockgen@v1.6.0 install-courtney: ## Install courtney for code coverage - @git clone https://github.com/stdevMac/courtney + @git clone https://github.com/dave/courtney @(cd courtney && go get ./... && go build courtney.go) @go get ./... diff --git a/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml index d331e071c..555d5d9e7 100644 --- a/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml index 67a12c624..e96162844 100644 --- a/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml @@ -33,7 +33,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml index 7ad96dadc..95d44d2d3 100644 --- a/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml index b5449b40e..14d1dd6ab 100644 --- a/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml index 6a7703e20..0154f1d6d 100644 --- a/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml index c3862f9a3..06840f3c2 100644 --- a/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml @@ -47,7 +47,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml index 6a3522fed..ac5aa5a27 100644 --- a/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml @@ -72,7 +72,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml index 8a9fc5c90..b5bdddb13 100644 --- a/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml index 2bab1356c..9f9b382d7 100644 --- a/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml +++ b/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml @@ -86,7 +86,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --suggested-fee-recipient=${FEE_RECIPIENT} - --validator-monitor-auto diff --git a/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml b/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml index 3739673e8..d337595c7 100644 --- a/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml +++ b/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml @@ -65,7 +65,7 @@ services: - --rest-api-host-allowlist=* - --rest-api-enabled=true - --rest-api-port=4000 - - --eth1-endpoints=${EC_NODE} + - --eth1=${EC_NODE} - --eth1-deposit-contract-max-request-size=150 logging: driver: "json-file" diff --git a/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml b/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml index 3739673e8..d337595c7 100644 --- a/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml +++ b/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml @@ -65,7 +65,7 @@ services: - --rest-api-host-allowlist=* - --rest-api-enabled=true - --rest-api-port=4000 - - --eth1-endpoints=${EC_NODE} + - --eth1=${EC_NODE} - --eth1-deposit-contract-max-request-size=150 logging: driver: "json-file" diff --git a/cli/testdata/run_tests/no_env/docker-compose.yml b/cli/testdata/run_tests/no_env/docker-compose.yml index 42f52d075..dd4769978 100644 --- a/cli/testdata/run_tests/no_env/docker-compose.yml +++ b/cli/testdata/run_tests/no_env/docker-compose.yml @@ -88,7 +88,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/cli/testdata/run_tests/no_version/docker-compose.yml b/cli/testdata/run_tests/no_version/docker-compose.yml index a28ee5271..63ea362c1 100644 --- a/cli/testdata/run_tests/no_version/docker-compose.yml +++ b/cli/testdata/run_tests/no_version/docker-compose.yml @@ -87,7 +87,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/cli/testdata/run_tests/valid/docker-compose.yml b/cli/testdata/run_tests/valid/docker-compose.yml index 42f52d075..dd4769978 100644 --- a/cli/testdata/run_tests/valid/docker-compose.yml +++ b/cli/testdata/run_tests/valid/docker-compose.yml @@ -88,7 +88,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/configs/client_images.yaml b/configs/client_images.yaml index e76021133..20c9d681b 100644 --- a/configs/client_images.yaml +++ b/configs/client_images.yaml @@ -1,39 +1,39 @@ execution: geth: name: ethereum/client-go - version: v1.13.5 + version: v1.13.12 besu: name: hyperledger/besu - version: 23.10.2 + version: 24.1.1 nethermind: name: nethermind/nethermind - version: 1.23.0 + version: 1.25.3 erigon: name: thorax/erigon - version: v2.55.1 + version: v2.57.3 consensus: lighthouse: name: sigp/lighthouse - version: v4.5.0 + version: v4.6.0 lodestar: name: chainsafe/lodestar - version: v1.12.0 + version: v1.15.1 teku: name: consensys/teku - version: 23.11.0 + version: 24.1.1 prysm: name: gcr.io/prysmaticlabs/prysm/beacon-chain - version: v4.1.1 + version: v4.2.1 validator: lighthouse: name: sigp/lighthouse - version: v4.5.0 + version: v4.6.0 lodestar: name: chainsafe/lodestar - version: v1.12.0 + version: v1.15.1 teku: name: consensys/teku - version: 23.11.0 + version: 24.1.1 prysm: name: gcr.io/prysmaticlabs/prysm/validator - version: v4.1.1 + version: v4.2.1 \ No newline at end of file diff --git a/docs/docs/commands/cli.mdx b/docs/docs/commands/cli.mdx index cb6778870..17387e485 100644 --- a/docs/docs/commands/cli.mdx +++ b/docs/docs/commands/cli.mdx @@ -42,7 +42,7 @@ This is an example of what you can expect: ``` sedge cli 2023-03-20 21:54:08 -- [INFO] [Logger Init] Log level: info -2023-03-20 21:54:08 -- [INFO] You are running the latest version of sedge. Version: v1.3.0 +2023-03-20 21:54:08 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 ? Select network goerli ? Select node type full-node ? Generation path /root/sedge-data diff --git a/docs/docs/commands/clients.mdx b/docs/docs/commands/clients.mdx index 2e703b792..73018da18 100644 --- a/docs/docs/commands/clients.mdx +++ b/docs/docs/commands/clients.mdx @@ -31,7 +31,7 @@ The execution of `sedge clients` will result in an output like this, that will s ``` $ sedge clients 2023-10-13 14:13:44 -- [INFO] [Logger Init] Log level: info -2023-10-13 14:13:45 -- [INFO] You are running the latest version of sedge. Version: v1.3.0 +2023-10-13 14:13:45 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 2023-10-13 14:13:45 -- [INFO] Listing supported clients for network chiado # Execution Clients Consensus Clients Validator Clients diff --git a/docs/docs/commands/deps.mdx b/docs/docs/commands/deps.mdx index 4615d86ad..d53da079f 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.0 +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] 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 73019f32a..fe5ab0849 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.0 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 [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 bf2f2b3c6..87dc36719 100644 --- a/docs/docs/commands/importKey.mdx +++ b/docs/docs/commands/importKey.mdx @@ -78,7 +78,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.0 +2023-01-26 11:59:34 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # 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 d756fa4a3..8cffd2505 100644 --- a/docs/docs/commands/networks.mdx +++ b/docs/docs/commands/networks.mdx @@ -29,7 +29,7 @@ Global Flags: ``` $ sedge networks 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.0 +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] Listing supported networks # Supported Networks diff --git a/docs/docs/commands/run.mdx b/docs/docs/commands/run.mdx index de33be74f..3e66cc789 100644 --- a/docs/docs/commands/run.mdx +++ b/docs/docs/commands/run.mdx @@ -58,7 +58,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.0 +2022-12-29 19:55:55 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 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 @@ -109,7 +109,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.0 +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] 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 @@ -154,7 +154,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.0 +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] 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 4a3f9f07c..d98ef99f6 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.0 +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] 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 88d9e0833..a4c55223a 100644 --- a/docs/docs/commands/slashingExport.mdx +++ b/docs/docs/commands/slashingExport.mdx @@ -59,7 +59,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.0 +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] Exporting slashing data from client lighthouse # highlight-next-line 2023-01-06 15:47:57 -- [INFO] The slashing protection container is starting... @@ -72,7 +72,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.0 +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] 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. @@ -87,7 +87,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.0 +2023-01-06 15:51:46 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # highlight-next-line 2023-01-06 15:51:46 -- [INFO] Stopping validator client # highlight-next-line @@ -108,7 +108,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.0 +2023-01-06 15:52:07 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # 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 004fe0fb6..87254bb5e 100644 --- a/docs/docs/commands/slashingImport.mdx +++ b/docs/docs/commands/slashingImport.mdx @@ -58,7 +58,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.0 +2023-01-06 14:59:11 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # highlight-next-line 2023-01-06 14:59:11 -- [INFO] Importing slashing data to client prysm from slashing-export.json # highlight-next-line @@ -72,7 +72,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.0 +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] 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. @@ -87,7 +87,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.0 +2023-01-06 15:10:27 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # highlight-next-line 2023-01-06 15:10:27 -- [INFO] Stopping validator client... # highlight-next-line @@ -108,7 +108,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.0 +2023-01-06 15:12:22 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 # 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 827d7c16b..e4c16e6d3 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.0 +2022-00-00 00:00:00 -- [INFO] You are running the latest version of sedge. Version: v1.3.1 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 91c2e8b8c..3927f0c06 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.0/sedge-v1.3.0-linux-amd64 --output sedge + curl -L https://github.com/NethermindEth/sedge/releases/download/v1.3.1/sedge-v1.3.1-linux-amd64 --output sedge ``` ``` - wget https://github.com/NethermindEth/sedge/releases/download/v1.3.0/sedge-v1.3.0-linux-amd64 -O sedge + wget https://github.com/NethermindEth/sedge/releases/download/v1.3.1/sedge-v1.3.1-linux-amd64 -O sedge ``` diff --git a/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml b/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml index 3739673e8..d337595c7 100644 --- a/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml +++ b/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml @@ -65,7 +65,7 @@ services: - --rest-api-host-allowlist=* - --rest-api-enabled=true - --rest-api-port=4000 - - --eth1-endpoints=${EC_NODE} + - --eth1=${EC_NODE} - --eth1-deposit-contract-max-request-size=150 logging: driver: "json-file" diff --git a/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml b/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml index 3739673e8..d337595c7 100644 --- a/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml +++ b/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml @@ -65,7 +65,7 @@ services: - --rest-api-host-allowlist=* - --rest-api-enabled=true - --rest-api-port=4000 - - --eth1-endpoints=${EC_NODE} + - --eth1=${EC_NODE} - --eth1-deposit-contract-max-request-size=150 logging: driver: "json-file" diff --git a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml index 42f52d075..dd4769978 100644 --- a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml @@ -88,7 +88,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml index a28ee5271..63ea362c1 100644 --- a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml @@ -87,7 +87,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml index 42f52d075..dd4769978 100644 --- a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml @@ -88,7 +88,7 @@ services: - --target-peers=${CC_PEER_COUNT} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL} + - --eth1=${EC_API_URL} - --debug-level=${CC_LOG_LEVEL} - --validator-monitor-auto - --subscribe-all-subnets diff --git a/templates/services/merge/consensus/lighthouse.tmpl b/templates/services/merge/consensus/lighthouse.tmpl index bef6e8eda..20b2456fd 100644 --- a/templates/services/merge/consensus/lighthouse.tmpl +++ b/templates/services/merge/consensus/lighthouse.tmpl @@ -38,7 +38,7 @@ - --boot-nodes={{.CCBootnodes}}{{end}} - --execution-endpoints=${EC_AUTH_URL} - --execution-jwt=/tmp/jwt/jwtsecret - - --eth1-endpoints=${EC_API_URL}{{range $url := .FallbackELUrls}},{{$url}}{{end}} + - --eth1=${EC_API_URL}{{range $url := .FallbackELUrls}},{{$url}}{{end}} - --debug-level=${CC_LOG_LEVEL}{{with .FeeRecipient}} - --suggested-fee-recipient=${FEE_RECIPIENT}{{end}} - --validator-monitor-auto diff --git a/templates/services/merge/consensus/lodestar.tmpl b/templates/services/merge/consensus/lodestar.tmpl index bf1750eca..f7ffb511b 100644 --- a/templates/services/merge/consensus/lodestar.tmpl +++ b/templates/services/merge/consensus/lodestar.tmpl @@ -30,7 +30,6 @@ - --eth1.depositContractDeployBlock={{.CustomDeployBlock}}{{end}}{{else}} - --network={{if .SplittedNetwork}}${CL_NETWORK}{{else}}${NETWORK}{{end}}{{end}} - --eth1=true - - --eth1.providerUrls=${EC_API_URL}{{range $url := .FallbackELUrls}},{{$url}}{{end}} - --execution.urls=${EC_AUTH_URL} - --logFile=/var/lib/lodestart/consensus/logs/beacon.log - --logFileLevel=${CC_LOG_LEVEL}{{with .FeeRecipient}}