Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Develop with Main #361

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ jobs:
VERSION: ${{ github.event.inputs.tag }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: "1.18.3"
go-version: "1.19.0"

- run: chmod +x ./scripts/build-go-darwin-binaries.sh && ./scripts/build-go-darwin-binaries.sh

- uses: actions/upload-artifact@master
- uses: actions/upload-artifact@v4
name: Uploading sedge darwin amd64 package
with:
name: sedge-${{env.VERSION}}-darwin-amd64
path: build/sedge-${{env.VERSION}}-darwin-amd64

- uses: actions/upload-artifact@master
- uses: actions/upload-artifact@v4
name: Uploading sedge darwin arm64 package
with:
name: sedge-${{env.VERSION}}-darwin-arm64
Expand All @@ -48,15 +48,15 @@ jobs:
needs: sedge-darwin
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: "1.18.3"
go-version: "1.21.0"

- run: scripts\build-go-windows-binaries.ps1

- uses: actions/upload-artifact@master
- uses: actions/upload-artifact@v4
name: Uploading sedge windows amd64 package
with:
name: sedge-${{env.VERSION}}-windows-amd64.exe
Expand All @@ -70,28 +70,28 @@ jobs:
needs: sedge-windows
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: "1.18.3"
go-version: "1.19.0"

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- run: chmod +x ./scripts/build-go-linux-binaries.sh && ./scripts/build-go-linux-binaries.sh

- uses: actions/upload-artifact@master
- uses: actions/upload-artifact@v4
name: Uploading sedge linux amd64 package
with:
name: sedge-${{env.VERSION}}-linux-amd64
path: build/sedge-${{env.VERSION}}-linux-amd64

- uses: actions/upload-artifact@master
- uses: actions/upload-artifact@v4
name: Uploading sedge linux arm64 package
with:
name: sedge-${{env.VERSION}}-linux-arm64
Expand All @@ -105,12 +105,12 @@ jobs:
needs: sedge-linux
steps:
- name: Download packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: /tmp/binaries

- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
with:
repository: NethermindEth/homebrew-sedge
path: homebrew-sedge
Expand All @@ -126,7 +126,7 @@ jobs:
token: ${{ secrets.REPOSITORY_DISPATCH_TOKEN }}
commit-message: Update Homebrew to latest release
title: "[Release] Update Homebrew"
reviewers: falcoxyz, AntiD2ta, cbermudez97, stdevMac
reviewers: AntiD2ta, cbermudez97, stdevMac, adriantpaez
draft: false
path: homebrew-sedge
add-paths: |
Expand All @@ -140,10 +140,10 @@ jobs:
needs: update-homebrew
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: /tmp/binaries
- name: Generate Changelog
Expand Down Expand Up @@ -184,12 +184,12 @@ jobs:
run: |
sudo apt update && sudo apt install golang-go debhelper libdebhelper-perl build-essential devscripts rsync -y
- name: Checking out Sedge repository
uses: actions/checkout@master
uses: actions/checkout@v4
with:
path: sedge
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: "1.18.3"
go-version: "1.19.0"
- name: Run publish PPA script
env:
GOPATH: /home/runner/go
Expand All @@ -200,7 +200,7 @@ jobs:
- name: Sleep for 1 hour
run: sleep 3600s
shell: bash
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
- run: pip install launchpadlib --upgrade
- name: Run copy binaries PPA script
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ 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

Expand All @@ -21,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Remove default bootnodes for networks managed by clients.
- Remove custom configurations for Chiado and instead use the clients configuration.
- Update client images.

## [v1.2.3] - 2023-08-16

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ install-mockgen: ## install mockgen
go install github.com/golang/mock/[email protected]

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 ./...

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cli/testdata/run_tests/no_env/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/testdata/run_tests/no_version/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/testdata/run_tests/valid/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading