Merge branch 'unstable' into deneb-free-blobs

# Conflicts: # .github/workflows/docker.yml # .github/workflows/local-testnet.yml # .github/workflows/test-suite.yml # Cargo.lock # Cargo.toml # beacon_node/beacon_chain/src/beacon_chain.rs # beacon_node/beacon_chain/src/builder.rs # beacon_node/beacon_chain/src/test_utils.rs # beacon_node/execution_layer/src/engine_api/json_structures.rs # beacon_node/network/src/beacon_processor/mod.rs # beacon_node/network/src/beacon_processor/worker/gossip_methods.rs # beacon_node/network/src/sync/backfill_sync/mod.rs # beacon_node/store/src/config.rs # beacon_node/store/src/hot_cold_store.rs # common/eth2_network_config/Cargo.toml # consensus/ssz/src/decode/impls.rs # consensus/ssz_derive/src/lib.rs # consensus/ssz_derive/tests/tests.rs # consensus/ssz_types/src/serde_utils/mod.rs # consensus/tree_hash/src/impls.rs # consensus/tree_hash/src/lib.rs # consensus/types/Cargo.toml # consensus/types/src/beacon_state.rs # consensus/types/src/chain_spec.rs # consensus/types/src/eth_spec.rs # consensus/types/src/fork_name.rs # lcli/Cargo.toml # lcli/src/main.rs # lcli/src/new_testnet.rs # scripts/local_testnet/el_bootnode.sh # scripts/local_testnet/genesis.json # scripts/local_testnet/geth.sh # scripts/local_testnet/setup.sh # scripts/local_testnet/start_local_testnet.sh # scripts/local_testnet/vars.env # scripts/tests/doppelganger_protection.sh # scripts/tests/genesis.json # scripts/tests/vars.env # testing/ef_tests/Cargo.toml # validator_client/src/block_service.rs
2026-03-19 12:56:12 +00:00 · 2023-05-30 11:26:33 +10:00
parent 9b55d74c1c c547a11b0d
commit 70c4ae35ab
333 changed files with 5930 additions and 13386 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,6 @@ on:
        branches:
            - unstable
            - stable
-            - capella
            - eip4844
        tags:
            - v*
@@ -36,11 +35,6 @@ jobs:
              run: |
                    echo "VERSION=latest" >> $GITHUB_ENV
                    echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
-            - name: Extract version (if capella)
-              if: github.event.ref == 'refs/heads/capella'
-              run: |
-                    echo "VERSION=capella" >> $GITHUB_ENV
-                    echo "VERSION_SUFFIX=" >> $GITHUB_ENV
            - name: Extract version (if eip4844)
              if: github.event.ref == 'refs/heads/eip4844'
              run: |
--- a/.github/workflows/linkcheck.yml
+++ b/.github/workflows/linkcheck.yml
@@ -7,6 +7,7 @@ on:
  pull_request:
    paths:
      - 'book/**'
+  merge_group:

 jobs:
  linkcheck:
--- a/.github/workflows/local-testnet.yml
+++ b/.github/workflows/local-testnet.yml
@@ -6,6 +6,7 @@ on:
    branches:
      - unstable
  pull_request:
+  merge_group:

 jobs:
  run-local-testnet:
@@ -24,25 +25,23 @@ jobs:
        uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
        with:
            repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install ganache
-        run: npm install ganache@latest --global
-      - name: Install geth
+      - name: Install geth (ubuntu)
+        if: matrix.os == 'ubuntu-22.04'
        run: |
          sudo add-apt-repository -y ppa:ethereum/ethereum
          sudo apt-get update
          sudo apt-get install ethereum
-        if: matrix.os == 'ubuntu-22.04'
+      - name: Install geth (mac)
+        if: matrix.os == 'macos-12'
        run: |
          brew tap ethereum/ethereum
          brew install ethereum
-        if: matrix.os == 'macos-12'
      - name: Install GNU sed & GNU grep
+        if: matrix.os == 'macos-12'
        run: |
          brew install gnu-sed grep
          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
          echo "$(brew --prefix)/opt/grep/libexec/gnubin" >> $GITHUB_PATH
-        if: matrix.os == 'macos-12'
-
      # https://github.com/actions/cache/blob/main/examples.md#rust---cargo
      - uses: actions/cache@v3
        id: cache-cargo
@@ -59,7 +58,7 @@ jobs:
        run: make && make install-lcli

      - name: Start local testnet
-        run: ./start_local_testnet.sh && sleep 60
+        run: ./start_local_testnet.sh genesis.json && sleep 60
        working-directory: scripts/local_testnet

      - name: Print logs
@@ -75,7 +74,7 @@ jobs:
        working-directory: scripts/local_testnet

      - name: Start local testnet with blinded block production
-        run: ./start_local_testnet.sh -p && sleep 60
+        run: ./start_local_testnet.sh -p genesis.json && sleep 60
        working-directory: scripts/local_testnet

      - name: Print logs for blinded block testnet
@@ -84,4 +83,4 @@ jobs:

      - name: Stop local testnet with blinded block production
        run: ./stop_local_testnet.sh
-        working-directory: scripts/local_testnet
+        working-directory: scripts/local_testnet
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -8,6 +8,7 @@ on:
      - trying
      - 'pr/*'
  pull_request:
+  merge_group:
 env:
  # Deny warnings in CI
  # Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
@@ -21,7 +22,7 @@ jobs:
  target-branch-check:
    name: target-branch-check
    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
    steps:
        - name: Check that the pull request is not targeting the stable branch
          run: test ${{ github.base_ref }} != "stable"
@@ -58,8 +59,8 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Run tests in release
      run: make test-release
  release-tests-windows:
@@ -78,8 +79,8 @@ jobs:
      run: |
        choco install python protoc visualstudio2019-workload-vctools -y
        npm config set msvs_version 2019
-    - name: Install ganache
-      run: npm install -g ganache --loglevel verbose
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Install make
      run: choco install -y make
    - uses: KyleMayes/install-llvm-action@v1
@@ -140,8 +141,8 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Run tests in debug
      run: make test-debug
  state-transition-vectors-ubuntu:
@@ -196,8 +197,8 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Run the beacon chain sim that starts from an eth1 contract
      run: cargo run --release --bin simulator eth1-sim
  merge-transition-ubuntu:
@@ -212,8 +213,8 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Run the beacon chain sim and go through the merge transition
      run: cargo run --release --bin simulator eth1-sim --post-merge
  no-eth1-simulator-ubuntu:
@@ -228,8 +229,6 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
    - name: Run the beacon chain sim without an eth1 connection
      run: cargo run --release --bin simulator no-eth1-sim
  syncing-simulator-ubuntu:
@@ -244,8 +243,8 @@ jobs:
      uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install ganache
-      run: sudo npm install -g ganache
+    - name: Install anvil
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
    - name: Run the syncing simulator
      run: cargo run --release --bin simulator syncing-sim
  doppelganger-protection-test:
@@ -269,14 +268,14 @@ jobs:
      run: |
          make
          make install-lcli
-    - name: Run the doppelganger protection success test script
-      run: |
-          cd scripts/tests
-          ./doppelganger_protection.sh success genesis.json
    - name: Run the doppelganger protection failure test script
      run: |
          cd scripts/tests
          ./doppelganger_protection.sh failure genesis.json
+    - name: Run the doppelganger protection success test script
+      run: |
+          cd scripts/tests
+          ./doppelganger_protection.sh success genesis.json
  execution-engine-integration-ubuntu:
    name: execution-engine-integration-ubuntu
    runs-on: ubuntu-latest