Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/go_modules/golang.org/x/crypto…
Browse files Browse the repository at this point in the history
…-0.17.0
  • Loading branch information
adriantpaez committed Aug 5, 2024
2 parents 86f7fe2 + aef5ceb commit c585444
Show file tree
Hide file tree
Showing 135 changed files with 9,106 additions and 826 deletions.
45 changes: 45 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/go
{
"name": "Go",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bookworm",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers-contrib/features/curl-apt-get:1": {}
},
"customizations": {
"vscode": {
"extensions": [
"GitHub.copilot",
"streetsidesoftware.code-spell-checker",
"ms-azuretools.vscode-docker",
"dbaeumer.vscode-eslint",
"donjayamanne.githistory",
"GitHub.copilot-chat",
"GitHub.vscode-pull-request-github",
"golang.go",
"yzhang.markdown-all-in-one",
"DavidAnson.vscode-markdownlint",
"unifiedjs.vscode-mdx",
"redhat.vscode-yaml",
"eamodio.gitlens"
]
}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "go version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
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/check-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
PAT: ${{ secrets.REPOSITORY_DISPATCH_TOKEN }}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.REPOSITORY_DISPATCH_TOKEN }}
commit-message: Update image versions to latest version.
title: "[Update] Update image versions"
reviewers: falcoxyz, AntiD2ta, cbermudez97
reviewers: AntiD2ta, adriantpaez, stdevMac, cbermudez97
branch: feature/update-container-images
draft: false
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
34 changes: 34 additions & 0 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: sedge e2e tests
on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]
workflow_dispatch:

jobs:
unit_tests:
name: Run e2e tests
strategy:
matrix:
include:
- os: ubuntu-latest
go: '1.21'
- os: windows-latest
go: '1.21'
runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

- name: Install deps
run: make install-deps

- name: Run e2e tests
run: make e2e-test
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@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

- 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@v5
with:
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@v5
with:
go-version: "1.19.0"
go-version: "1.21.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 @@ -121,12 +121,12 @@ jobs:
bash /home/runner/work/sedge/sedge/homebrew-sedge/scripts/update-homebrew.sh
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
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@v5
with:
go-version: "1.19.0"
go-version: "1.21.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
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,50 @@ 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.

### Added

- Add support for MEV-boost on Holesky.
- New flag `--lido` to `generate` command for Lido CSM setup.
- New Sedge setup flow with `sedge cli` command for Lido CSM setup.
- Support for `sedge keys` to generate 0x01 withdrawal credentials.
- Support for installing Docker in Ubuntu 24.04 LTS.

### Changed

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


## [v1.3.2] - 2024-03-08

### Changed

- Update client images to Dencun-ready versions.

## [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 Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ test: generate ## run tests
@mkdir -p coverage
@go test -coverprofile=coverage/coverage.out -covermode=count ./...

e2e-test: generate ## Run e2e tests
@go test -timeout 20m -count=1 ./e2e/...

codecov-test: generate ## unit tests with coverage using the courtney tool
@mkdir -p coverage
@courtney/courtney -v -o coverage/coverage.out ./...
Expand All @@ -42,7 +45,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
Loading

0 comments on commit c585444

Please sign in to comment.