Merge branch 'unstable' into validator-manager

paulhauner · Aug 3, 2023 · a803529 · a803529
2 parents c8317f2 + 7399a54
commit a803529
Show file tree

Hide file tree

Showing 76 changed files with 2,730 additions and 2,704 deletions.
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -21,10 +21,6 @@ jobs:
 
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install geth (ubuntu)
  if: matrix.os == 'ubuntu-22.04'
  run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -79,15 +79,6 @@ jobs:
  if: startsWith(matrix.arch, 'x86_64-windows')
  run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
 
- # ==============================
- # Windows & Mac dependencies
- # ==============================
- - name: Install Protoc
- if: contains(matrix.arch, 'darwin') || contains(matrix.arch, 'windows')
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
-
  # ==============================
  # Builds
  # ==============================

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -17,6 +17,10 @@ env:
  PINNED_NIGHTLY: nightly-2023-04-16
  # Prevent Github API rate limiting.
  LIGHTHOUSE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # Enable self-hosted runners for the sigp repo only.
+ SELF_HOSTED_RUNNERS: ${{ github.repository == 'sigp/lighthouse' }}
+ # Self-hosted runners need to reference a different host for `./watch` tests.
+ WATCH_HOST: ${{ github.repository == 'sigp/lighthouse' && 'host.docker.internal' || 'localhost' }}
 jobs:
  target-branch-check:
  name: target-branch-check
@@ -48,41 +52,41 @@ jobs:
  run: make cargo-fmt
  release-tests-ubuntu:
  name: release-tests-ubuntu
- runs-on: ubuntu-latest
+ # Use self-hosted runners only on the sigp repo.
+ runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
  needs: cargo-fmt
  steps:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
+ if: env.SELF_HOSTED_RUNNERS == false
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Run tests in release
  run: make test-release
  release-tests-windows:
  name: release-tests-windows
- runs-on: windows-2019
+ runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows"]') || 'windows-2019' }}
  needs: cargo-fmt
  steps:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
+ if: env.SELF_HOSTED_RUNNERS == false
  run: rustup update stable
  - name: Use Node.js
  uses: actions/setup-node@v2
  with:
  node-version: '14'
  - name: Install windows build tools
  run: |
- choco install python protoc visualstudio2019-workload-vctools -y
+ choco install python visualstudio2019-workload-vctools -y
  npm config set msvs_version 2019
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Install make
  run: choco install -y make
  - uses: KyleMayes/install-llvm-action@v1
+ if: env.SELF_HOSTED_RUNNERS == false
  with:
  version: "15.0"
  directory: ${{ runner.temp }}/llvm
@@ -92,16 +96,14 @@ jobs:
  run: make test-release
  beacon-chain-tests:
  name: beacon-chain-tests
- runs-on: ubuntu-latest
+ # Use self-hosted runners only on the sigp repo.
+ runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
  needs: cargo-fmt
  steps:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
+ if: env.SELF_HOSTED_RUNNERS == false
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run beacon_chain tests for all known forks
  run: make test-beacon-chain
  op-pool-tests:
@@ -112,10 +114,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run operation_pool tests for all known forks
  run: make test-op-pool
  slasher-tests:
@@ -130,16 +128,14 @@ jobs:
  run: make test-slasher
  debug-tests-ubuntu:
  name: debug-tests-ubuntu
- runs-on: ubuntu-22.04
+ # Use self-hosted runners only on the sigp repo.
+ runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
  needs: cargo-fmt
  steps:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
+ if: env.SELF_HOSTED_RUNNERS == false
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Run tests in debug
@@ -152,24 +148,18 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run state_transition_vectors in release.
  run: make run-state-transition-tests
  ef-tests-ubuntu:
  name: ef-tests-ubuntu
- runs-on: ubuntu-latest
+ # Use self-hosted runners only on the sigp repo.
+ runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "small"]') || 'ubuntu-latest' }}
  needs: cargo-fmt
  steps:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
+ if: env.SELF_HOSTED_RUNNERS == false
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run consensus-spec-tests with blst, milagro and fake_crypto
  run: make test-ef
  dockerfile-ubuntu:
@@ -192,10 +182,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Run the beacon chain sim that starts from an eth1 contract
@@ -208,10 +194,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Run the beacon chain sim and go through the merge transition
@@ -224,10 +206,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run the beacon chain sim without an eth1 connection
  run: cargo run --release --bin simulator no-eth1-sim
  syncing-simulator-ubuntu:
@@ -238,10 +216,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install Foundry (anvil)
  uses: foundry-rs/foundry-toolchain@v1
  - name: Run the syncing simulator
@@ -254,10 +228,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install geth
  run: |
  sudo add-apt-repository -y ppa:ethereum/ethereum
@@ -289,10 +259,6 @@ jobs:
  dotnet-version: '6.0.201'
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run exec engine integration tests in release
  run: make test-exec-engine
  check-benchmarks:
@@ -303,10 +269,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Typecheck benchmark code without running it
  run: make check-benches
  clippy:
@@ -317,10 +279,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Get latest version of stable Rust
  run: rustup update stable
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Lint code for quality and style with Clippy
  run: make lint
  - name: Certify Cargo.lock freshness
@@ -333,10 +291,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Install Rust @ MSRV (${{ needs.extract-msrv.outputs.MSRV }})
  run: rustup override set ${{ needs.extract-msrv.outputs.MSRV }}
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Run cargo check
  run: cargo check --workspace
  arbitrary-check:
@@ -375,10 +329,6 @@ jobs:
  - uses: actions/checkout@v3
  - name: Install Rust (${{ env.PINNED_NIGHTLY }})
  run: rustup toolchain install $PINNED_NIGHTLY
- - name: Install Protoc
- uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Install cargo-udeps
  run: cargo install cargo-udeps --locked --force
  - name: Create Cargo config dir
@@ -396,7 +346,7 @@ jobs:
  steps:
  - uses: actions/checkout@v3
  - name: Install dependencies
- run: sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang protobuf-compiler
+ run: sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang
  - name: Use Rust beta
  run: rustup override set beta
  - name: Run make