Merge branch 'master' into fix/bls-builds

Signed-off-by: Sam Calder-Mason <sam.calder-mason@ethereum.org>

.github/workflows/sentry-smoke-test.yaml

@@ -27,19 +27,19 @@ jobs:
  run: |
  cat <<EOF > network_params.yaml
  participants:
- - el_client_type: geth
- cl_client_type: teku
- cl_client_image: ethpandaops/teku:master-16c4354
- - el_client_type: nethermind
- cl_client_type: prysm
- - el_client_type: erigon
- cl_client_type: lighthouse
- - el_client_type: besu
- cl_client_type: lighthouse
- - el_client_type: reth
- cl_client_type: lodestar
- - el_client_type: ethereumjs
- cl_client_type: nimbus
+ - el_type: geth
+ cl_type: teku
+ cl_image: ethpandaops/teku:master-16c4354
+ - el_type: nethermind
+ cl_type: prysm
+ - el_type: erigon
+ cl_type: lighthouse
+ - el_type: besu
+ cl_type: lighthouse
+ - el_type: reth
+ cl_type: lodestar
+ - el_type: ethereumjs
+ cl_type: nimbus
  additional_services: []
  network_parans:
  genesis_delay: 180