Fix sammy' comment.

* PeerDAS: Broadcast not seen via gossip but reconstructed data columns.

* Address Nishant's comment.

.bazelrc

@@ -22,6 +22,7 @@ coverage --define=coverage_enabled=1
 build --workspace_status_command=./hack/workspace_status.sh
 
 build --define blst_disabled=false
+build --compilation_mode=opt
 run --define blst_disabled=false
 
 build:blst_disabled --define blst_disabled=true

.bazelversion

@@ -1 +1 @@
-7.4.1
+7.1.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,6 @@
    in review.
 4. Note that PRs updating dependencies and new Go versions are not accepted.
    Please file an issue instead.
-5. A changelog entry is required for user facing issues.
 -->
 
 **What type of PR is this?**
@@ -29,9 +28,3 @@
 Fixes #
 
 **Other notes for review**
-
-**Acknowledgements**
-
-- [ ] I have read [CONTRIBUTING.md](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md).
-- [ ] I have included a uniquely named [changelog fragment file](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md#maintaining-changelogmd).
-- [ ] I have added a description to this PR with sufficient context for reviewers to understand this PR.

.github/actions/gomodtidy/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine
+FROM golang:1.21-alpine
 
 COPY entrypoint.sh /entrypoint.sh
 

.github/workflows/changelog.yml

@@ -1,34 +0,0 @@
-# This workflow will build a golang project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
-
-name: changelog
-
-on:
-  pull_request:
-    branches: [ "develop" ]
-
-jobs:
-  run-changelog-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - name: Download unclog binary
-        uses: dsaltares/fetch-gh-release-asset@aa2ab1243d6e0d5b405b973c89fa4d06a2d0fff7 # 1.1.2
-        with:
-          repo: OffchainLabs/unclog
-          version: "tags/v0.1.3"
-          file: "unclog"
-
-      - name: Get new changelog files
-        id: new-changelog-files
-        uses: OffchainLabs/gh-action-changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # v4.0.8
-        with:
-          files: |
-            changelog/**.md
-
-      - name: Run lint command
-        env:
-          ALL_ADDED_MARKDOWN: ${{ steps.new-changelog-files.outputs.added_files }}
-        run: chmod +x unclog && ./unclog check -fragment-env=ALL_ADDED_MARKDOWN

.github/workflows/clang-format.yml

@@ -1,21 +0,0 @@
-name: Protobuf Format
-
-on: 
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ '*' ]
-  merge_group:
-    types: [checks_requested]
-
-jobs:
-  clang-format-checking:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      # Is this step failing for you? 
-      # Run: clang-format -i proto/**/*.proto
-      # See: https://clang.llvm.org/docs/ClangFormat.html
-      - uses: RafikFarhad/clang-format-github-action@v3
-        with:
-          sources: "proto/**/*.proto"

.github/workflows/fuzz.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.23.5'
+          go-version: '1.21.5'
       - id: list
         uses: shogo82148/actions-go-fuzz/list@v0
         with:
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.23.5'
+          go-version: '1.21.5'
       - uses: shogo82148/actions-go-fuzz/run@v0
         with:
           packages: ${{ matrix.package }}

.github/workflows/go.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Go mod tidy checker
         id: gomodtidy
@@ -27,34 +27,34 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Go 1.24
-        uses: actions/setup-go@v4
+        uses: actions/checkout@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.24.0'
+          go-version: '1.21.5'
       - name: Run Gosec Security Scanner
         run: | # https://github.com/securego/gosec/issues/469
           export PATH=$PATH:$(go env GOPATH)/bin
-          go install github.com/securego/gosec/v2/cmd/gosec@v2.22.1
-          gosec -exclude-generated -exclude=G307,G115 -exclude-dir=crypto/bls/herumi ./...
+          go install github.com/securego/gosec/v2/cmd/gosec@v2.15.0
+          gosec -exclude-generated -exclude=G307 -exclude-dir=crypto/bls/herumi ./...
 
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
-      - name: Set up Go 1.24
-        uses: actions/setup-go@v4
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.24.0'
+          go-version: '1.21.5'
           id: go
 
       - name: Golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.64.5
+          version: v1.55.2
           args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number
 
   build:
@@ -62,13 +62,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v2
         with:
-          go-version: '1.24.0'
+          go-version: '1.21.5'
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Get dependencies
         run: |

.golangci.yml

@@ -1,20 +1,28 @@
 run:
-  timeout: 10m
-  go: '1.23.5'
-
-issues:
-  exclude-files:
+  skip-files:
     - validator/web/site_data.go
     - .*_test.go
-  exclude-dirs:
+  skip-dirs:
     - proto
     - tools/analyzers
+  timeout: 10m
+  go: '1.21.5'
 
 linters:
   enable-all: true
   disable:
     # Deprecated linters:
+    - deadcode
+    - exhaustivestruct
+    - golint
     - govet
+    - ifshort
+    - interfacer
+    - maligned
+    - nosnakecase
+    - scopelint
+    - structcheck
+    - varcheck
 
     # Disabled for now:
     - asasalint
@@ -26,8 +34,7 @@ linters:
     - dogsled
     - dupl
     - durationcheck
-    - errname
-    - err113
+    - errorlint
     - exhaustive
     - exhaustruct
     - forbidigo
@@ -41,17 +48,16 @@ linters:
     - gocyclo
     - godot
     - godox
+    - goerr113
     - gofumpt
+    - gomnd
     - gomoddirectives
-    - gosec
     - inamedparam
     - interfacebloat
-    - intrange
     - ireturn
     - lll
     - maintidx
     - makezero
-    - mnd
     - musttag
     - nakedret
     - nestif
@@ -66,16 +72,13 @@ linters:
     - predeclared
     - promlinter
     - protogetter
-    - recvcheck
     - revive
-    - spancheck
     - staticcheck
     - stylecheck
     - tagalign
     - tagliatelle
     - thelper
     - unparam
-    - usetesting
     - varnamelen
     - wrapcheck
     - wsl

.policy.yml

@@ -26,6 +26,7 @@ approval_rules:
       only_changed_files:
         paths:
           - "*pb.go"
+          - "*pb.gw.go"
           - "*.bazel"
     options:
       ignore_commits_by:
@@ -68,6 +69,7 @@ approval_rules:
       changed_files:
         ignore:
           - "*pb.go"
+          - "*pb.gw.go"
           - "*.bazel"
     options:
       ignore_commits_by:

BUILD.bazel

@@ -55,6 +55,13 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+# Protobuf gRPC gateway compiler
+alias(
+    name = "grpc_gateway_proto_compiler",
+    actual = "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway",
+    visibility = ["//visibility:public"],
+)
+
 gometalinter(
     name = "gometalinter",
     config = "//:.gometalinter.json",
@@ -165,7 +172,7 @@ STATICCHECK_ANALYZERS = [
     "sa6006",
     "sa9001",
     "sa9002",
-    "sa9003",
+    #"sa9003", # Doesn't build. See https://github.com/dominikh/go-tools/pull/1483
     "sa9004",
     "sa9005",
     "sa9006",
@@ -197,7 +204,6 @@ nogo(
         "//tools/analyzers/logruswitherror:go_default_library",
         "//tools/analyzers/maligned:go_default_library",
         "//tools/analyzers/nop:go_default_library",
-        "//tools/analyzers/nopanic:go_default_library",
         "//tools/analyzers/properpermissions:go_default_library",
         "//tools/analyzers/recursivelock:go_default_library",
         "//tools/analyzers/shadowpredecl:go_default_library",
@@ -218,7 +224,6 @@ nogo(
         "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_default_library",
         "@org_golang_x_tools//go/analysis/passes/defers:go_default_library",
         "@org_golang_x_tools//go/analysis/passes/directive:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/errorsas:go_default_library",
         # fieldalignment disabled
         #"@org_golang_x_tools//go/analysis/passes/fieldalignment:go_default_library",
         "@org_golang_x_tools//go/analysis/passes/findcall:go_default_library",

CONTRIBUTING.md

@@ -6,9 +6,6 @@ Excited by our work and want to get involved in building out our sharding releas
 
 You can explore our [Open Issues](https://github.com/prysmaticlabs/prysm/issues) in-the works for our different releases. Feel free to fork our repo and start creating PR’s after assigning yourself to an issue of interest. We are always chatting on [Discord](https://discord.gg/CTYGPUJ) drop us a line there if you want to get more involved or have any questions on our implementation!
 
-> [!IMPORTANT] 
-> Please, **do not send pull requests for trivial changes**, such as typos, these will be rejected. These types of pull requests incur a cost to reviewers and do not provide much value to the project. If you are unsure, please open an issue first to discuss the change.
-
 ## Contribution Steps
 
 **1. Set up Prysm following the instructions in README.md.**
@@ -123,19 +120,15 @@ $ git push myrepo feature-in-progress-branch
 
 Navigate to your fork of the repo on GitHub. On the upper left where the current branch is listed, change the branch to your feature-in-progress-branch. Open the files that you have worked on and check to make sure they include your changes.
 
-**16. Add an entry to CHANGELOG.md.**
+**16. Create a pull request.**
 
-All PRs must must include a changelog fragment file in the `changelog` directory. If your change is not user-facing or should not be mentioned in the changelog for some other reason, you may use the `Ignored` changelog section in your fragment's header to satisfy this requirement without altering the final release changelog. See the [Maintaining CHANGELOG.md](#maintaining-changelogmd) section for more information.
+Navigate your browser to https://github.com/prysmaticlabs/prysm and click on the new pull request button. In the “base” box on the left, leave the default selection “base master”, the branch that you want your changes to be applied to. In the “compare” box on the right, select feature-in-progress-branch, the branch containing the changes you want to apply. You will then be asked to answer a few questions about your pull request. After you complete the questionnaire, the pull request will appear in the list of pull requests at https://github.com/prysmaticlabs/prysm/pulls.
 
-**17. Create a pull request.**
-
-Navigate your browser to https://github.com/prysmaticlabs/prysm and click on the new pull request button. In the “base” box on the left, leave the default selection “base develop”, the branch that you want your changes to be applied to. In the “compare” box on the right, select feature-in-progress-branch, the branch containing the changes you want to apply. You will then be asked to answer a few questions about your pull request. After you complete the questionnaire, the pull request will appear in the list of pull requests at https://github.com/prysmaticlabs/prysm/pulls. Ensure that you have added an entry to CHANGELOG.md if your PR is a user-facing change. See the [Maintaining CHANGELOG.md](#maintaining-changelogmd) section for more information.
-
-**18. Respond to comments by Core Contributors.**
+**17. Respond to comments by Core Contributors.**
 
 Core Contributors may ask questions and request that you make edits. If you set notifications at the top of the page to “not watching,” you will still be notified by email whenever someone comments on the page of a pull request you have created. If you are asked to modify your pull request, repeat steps 8 through 15, then leave a comment to notify the Core Contributors that the pull request is ready for further review.
 
-**19. If the number of commits becomes excessive, you may be asked to squash your commits.**
+**18. If the number of commits becomes excessive, you may be asked to squash your commits.**
 
  You can do this with an interactive rebase. Start by running the following command to determine the commit that is the base of your branch...
 
@@ -143,7 +136,7 @@ Core Contributors may ask questions and request that you make edits. If you set
 $ git merge-base feature-in-progress-branch prysm/master
 ```
 
-**20. The previous command will return a commit-hash that you should use in the following command.**
+**19. The previous command will return a commit-hash that you should use in the following command.**
 
 ```
 $ git rebase -i commit-hash
@@ -167,24 +160,13 @@ squash  hash 	add a feature
 
 Save and close the file, then a commit command will appear in the terminal that squashes the smaller commits into one. Check to be sure the commit message accurately reflects your changes and then hit enter to execute it.
 
-**21. Update your pull request with the following command.**
+**20. Update your pull request with the following command.**
 
 ```
 $ git push myrepo feature-in-progress-branch -f
 ```
 
-**22.  Finally, again leave a comment to the Core Contributors on the pull request to let them know that the pull request has been updated.**
-
-## Maintaining CHANGELOG.md
-
-This project follows the changelog guidelines from [keepachangelog.com](https://keepachangelog.com/en/1.1.0/). In order to minimize conflicts and workflow headaches, we chose to implement a changelog management
-strategy that uses changelog "fragment" files, managed by our changelog management tool called `unclog`. Each PR must include a new changelog fragment file in the `changelog` directory, as specified by unclog's
-[README.md](https://github.com/OffchainLabs/unclog?tab=readme-ov-file#what-is-a-changelog-fragment). As the `unclog` README suggests in the [Best Practices](https://github.com/OffchainLabs/unclog?tab=readme-ov-file#best-practices) section, 
-the standard naming convention for your PR's fragment file, to avoid conflicting with another fragment file, is `changelog/<github user name>_<PR branch name>.md`.
-
-### Releasing
-
-When a new release is made, the "Unreleased" section should be moved to a new section with the release version and the current date. Then a new "Unreleased" section is made at the top of the file with the categories listed above.
+**21.  Finally, again leave a comment to the Core Contributors on the pull request to let them know that the pull request has been updated.**
 
 ## Contributor Responsibilities
 

DEPENDENCIES.md

@@ -55,7 +55,7 @@ bazel build //beacon-chain --config=release
 ## Adding / updating dependencies
 
 1. Add your dependency as you would with go modules. I.e. `go get ...`
-1. Run `bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=deps.bzl%prysm_deps -prune=true` to update the bazel managed dependencies.
+1. Run `bazel run //:gazelle -- update-repos -from_file=go.mod` to update the bazel managed dependencies.
 
 Example:
 

INTEROP.md

@@ -2,21 +2,18 @@
 
 This README details how to setup Prysm for interop testing for usage with other Ethereum consensus clients.
 
-> [!IMPORTANT]  
-> This guide is likely to be outdated. The Prysm team does not have capacity to troubleshoot
-> outdated interop guides or instructions. If you experience issues with this guide, please file an
-> issue for visibility and propose fixes, if possible.
-
 ## Installation & Setup
 
 1. Install [Bazel](https://docs.bazel.build/versions/master/install.html) **(Recommended)**
 2. `git clone https://github.com/prysmaticlabs/prysm && cd prysm`
-3. `bazel build //cmd/...`
+3. `bazel build //...`
 
 ## Starting from Genesis
 
-Prysm can be started from a built-in mainnet genesis state, or started with a provided genesis state by
-using the `--genesis-state` flag and providing a path to the genesis.ssz file.
+Prysm supports a few ways to quickly launch a beacon node from basic configurations:
+
+- `NumValidators + GenesisTime`: Launches a beacon node by deterministically generating a state from a num-validators flag along with a genesis time **(Recommended)**
+- `SSZ Genesis`: Launches a beacon node  from a .ssz file containing a SSZ-encoded, genesis beacon state
 
 ## Generating a Genesis State
 
@@ -24,34 +21,21 @@ To setup the necessary files for these quick starts, Prysm provides a tool to ge
 a deterministically generated set of validator private keys following the official interop YAML format 
 [here](https://github.com/ethereum/eth2.0-pm/blob/master/interop/mocked_start).
 
-You can use `prysmctl` to create a deterministic genesis state for interop.
+You can use `bazel run //tools/genesis-state-gen` to create a deterministic genesis state for interop.
 
-```sh
-# Download (or create) a chain config file.
-curl https://raw.githubusercontent.com/ethereum/consensus-specs/refs/heads/dev/configs/minimal.yaml -o /tmp/minimal.yaml
+### Usage
+
+- **--genesis-time** uint: Unix timestamp used as the genesis time in the generated genesis state (defaults to now)
+- **--num-validators** int: Number of validators to deterministically include in the generated genesis state
+- **--output-ssz** string: Output filename of the SSZ marshaling of the generated genesis state
+- **--config-name=interop** string: name of the beacon chain config to use when generating the state. ex mainnet|minimal|interop
+
+The example below creates 64 validator keys, instantiates a genesis state with those 64 validators and with genesis unix timestamp 1567542540,
+and finally writes a ssz encoded output to ~/Desktop/genesis.ssz. This file can be used to kickstart the beacon chain in the next section. When using the `--interop-*` flags, the beacon node will assume the `interop` config should be used, unless a different config is specified on the command line.
 
-# Run prysmctl to generate genesis with a 2 minute genesis delay and 256 validators. 
-bazel run //cmd/prysmctl --config=minimal -- \
-  testnet generate-genesis \
-  --genesis-time-delay=120 \
-  --num-validators=256 \
-  --output-ssz=/tmp/genesis.ssz \
-  --chain-config-file=/tmp/minimal.yaml
 ```
-
-The flags are explained below:
-- `bazel run //cmd/prysmctl` is the bazel command to compile and run prysmctl.
-- `--config=minimal` is a bazel build time configuration flag to compile Prysm with minimal state constants.
-- `--` is an argument divider to tell bazel that everything after this divider should be passed as arguments to prysmctl. Without this divider, it isn't clear to bazel if the arguments are meant to be build time arguments or runtime arguments so the operation complains and fails to build without this divider.
-- `testnet` is the primary command argument for prysmctl.
-- `generate-genesis` is the subcommand to `testnet` in prysmctl.
-- `--genesis-time-delay` uint: The number of seconds in the future to define genesis. Example: a value of 60 will set the genesis time to 1 minute in the future. This should be sufficiently large enough to allow for you to start the beacon node before the genesis time. 
-- `--num-validators` int: Number of validators to deterministically include in the generated genesis state
-- `--output-ssz` string: Output filename of the SSZ marshaling of the generated genesis state
-- `--chain-config-file` string: Filepath to a chain config yaml file.
-
-Note: This guide saves items to the `/tmp/` directory which will not persist if your machine is
-restarted. Consider tweaking the arguments if persistence is needed.
+bazel run //tools/genesis-state-gen -- --config-name interop --output-ssz ~/Desktop/genesis.ssz --num-validators 64 --genesis-time 1567542540
+```
 
 ## Launching a Beacon Node + Validator Client
 
@@ -60,33 +44,45 @@ restarted. Consider tweaking the arguments if persistence is needed.
 Open up two terminal windows, run:
 
 ```
-bazel run //cmd/beacon-chain --config=minimal -- \
-  --minimal-config \
-  --bootstrap-node= \
-  --deposit-contract 0x8A04d14125D0FDCDc742F4A05C051De07232EDa4 \
-  --datadir=/tmp/beacon-chain-minimal-devnet \
-  --force-clear-db \
-  --min-sync-peers=0 \
-  --genesis-state=/tmp/genesis.ssz \
-  --chain-config-file=/tmp/minimal.yaml
+bazel run //beacon-chain -- \
+--bootstrap-node= \
+--deposit-contract 0x8A04d14125D0FDCDc742F4A05C051De07232EDa4 \
+--datadir=/tmp/beacon-chain-interop \
+--force-clear-db \
+--min-sync-peers=0 \
+--interop-num-validators 64 \
+--interop-eth1data-votes
 ```
 
-This will start the system with 256 validators. The flags used can be explained as such:
-
-- `bazel run //cmd/beacon-chain --config=minimal` builds and runs the beacon node in minimal build configuration.
-- `--` is a flag divider to distinguish between bazel flags and flags that should be passed to the application. All flags and arguments after this divider are passed to the beacon chain.
-- `--minimal-config` tells the beacon node to use minimal network configuration. This is different from the compile time state configuration flag `--config=minimal` and both are required.
-- `--bootstrap-node=` disables the default bootstrap nodes. This prevents the client from attempting to peer with mainnet nodes.
-- `--datadir=/tmp/beacon-chain-minimal-devnet` sets the data directory in a temporary location. Change this to your preferred destination.
-- `--force-clear-db` will delete the beaconchain.db file without confirming with the user. This is helpful for iteratively running local devnets without changing the datadir, but less helpful for one off runs where there was no database in the data directory.
-- `--min-sync-peers=0` allows the beacon node to skip initial sync without peers. This is essential because Prysm expects at least a few peers to start the blockchain.
-- `--genesis-state=/tmp/genesis.ssz` defines the path to the generated genesis ssz file. The beacon node will use this as the initial genesis state.
-- `--chain-config-file=/tmp/minimal.yaml` defines the path to the yaml file with the chain configuration.
-
-As soon as the beacon node has started, start the validator in the other terminal window. 
+This will deterministically generate a beacon genesis state and start
+the system with 64 validators and the genesis time set to the current unix timestamp.
+Wait a bit until your beacon chain starts, and in the other window:
 
 ```
-bazel run //cmd/validator --config=minimal -- --datadir=/tmp/validator --interop-num-validators=256 --minimal-config --suggested-fee-recipient=0x8A04d14125D0FDCDc742F4A05C051De07232EDa4
+bazel run //validator -- --keymanager=interop --keymanageropts='{"keys":64}'
 ```
 
-This will launch and kickstart the system with your 256 validators performing their duties accordingly.
+This will launch and kickstart the system with your 64 validators performing their duties accordingly.
+
+### Launching from `genesis.ssz`
+
+Assuming you generated a `genesis.ssz` file with 64 validators, open up two terminal windows, run:
+
+```
+ bazel run //beacon-chain -- \
+--bootstrap-node= \
+--deposit-contract 0x8A04d14125D0FDCDc742F4A05C051De07232EDa4 \
+--datadir=/tmp/beacon-chain-interop \
+--force-clear-db \
+--min-sync-peers=0 \
+--interop-genesis-state /path/to/genesis.ssz \
+--interop-eth1data-votes
+```
+
+Wait a bit until your beacon chain starts, and in the other window:
+
+```
+bazel run //validator -- --keymanager=interop --keymanageropts='{"keys":64}'
+```
+
+This will launch and kickstart the system with your 64 validators performing their duties accordingly.

README.md

@@ -1,7 +1,5 @@
-<h1 align="left">Prysm: An Ethereum Consensus Implementation Written in Go</h1>
+# Prysm: An Ethereum Consensus Implementation Written in Go
 
-<div align="left">
-  
 [![Build status](https://badge.buildkite.com/b555891daf3614bae4284dcf365b2340cefc0089839526f096.svg?branch=master)](https://buildkite.com/prysmatic-labs/prysm)
 [![Go Report Card](https://goreportcard.com/badge/github.com/prysmaticlabs/prysm)](https://goreportcard.com/report/github.com/prysmaticlabs/prysm)
 [![Consensus_Spec_Version 1.4.0](https://img.shields.io/badge/Consensus%20Spec%20Version-v1.4.0-blue.svg)](https://github.com/ethereum/consensus-specs/tree/v1.4.0)
@@ -9,60 +7,31 @@
 [![Discord](https://user-images.githubusercontent.com/7288322/34471967-1df7808a-efbb-11e7-9088-ed0b04151291.png)](https://discord.gg/prysmaticlabs)
 [![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/prysmaticlabs/prysm/badge)](https://www.gitpoap.io/gh/prysmaticlabs/prysm)
 
-</div>
+This is the core repository for Prysm, a [Golang](https://golang.org/) implementation of the [Ethereum Consensus](https://ethereum.org/en/developers/docs/consensus-mechanisms/#proof-of-stake) [specification](https://github.com/ethereum/consensus-specs), developed by [Offchain Labs](https://www.offchainlabs.com). See the [Changelog](https://github.com/prysmaticlabs/prysm/releases) for details of the latest releases and upcoming breaking changes.
 
----
+### Getting Started
 
-## 📖 Overview
+A detailed set of installation and usage instructions as well as breakdowns of each individual component are available in the [official documentation portal](https://docs.prylabs.network). If you still have questions, feel free to stop by our [Discord](https://discord.gg/prysmaticlabs).
 
-This is the core repository for Prysm, a [Golang](https://golang.org/) implementation of the [Ethereum Consensus](https://ethereum.org/en/developers/docs/consensus-mechanisms/#proof-of-stake) [specification](https://github.com/ethereum/consensus-specs), developed by [Offchain Labs](https://www.offchainlabs.com).
+### Staking on Mainnet
 
-See the [Changelog](https://github.com/prysmaticlabs/prysm/releases) for details of the latest releases and upcoming breaking changes.
+To participate in staking, you can join the [official eth2 launchpad](https://launchpad.ethereum.org). The launchpad is the only recommended way to become a validator on mainnet. You can explore validator rewards/penalties via Bitfly's block explorer: [beaconcha.in](https://beaconcha.in), and follow the latest blocks added to the chain on [beaconscan](https://beaconscan.com).
 
----
-
-## 🚀 Getting Started
-
-A detailed set of installation and usage instructions as well as breakdowns of each individual component are available in the **[official documentation portal](https://docs.prylabs.network)**.
-
-💬 **Need help?** Join our **[Discord Community](https://discord.gg/prysmaticlabs)** for support.
-
----
-
-## 🏆 Staking on Mainnet
-
-To participate in staking, you can join the **[official Ethereum launchpad](https://launchpad.ethereum.org)**. The launchpad is the **only recommended** way to become a validator on mainnet.
-
-🔍 Explore validator rewards/penalties:
-
-- **[beaconcha.in](https://beaconcha.in)**
-- **[beaconscan](https://beaconscan.com)**
-
----
-
-## 🤝 Contributing
-
-### 🔥 Branches
 
+## Contributing
+### Branches
 Prysm maintains two permanent branches:
 
-- **[`master`](https://github.com/prysmaticlabs/prysm/tree/master)** - This points to the latest stable release. It is ideal for most users.
-- **[`develop`](https://github.com/prysmaticlabs/prysm/tree/develop)** - This is used for development and contains the latest PRs. Developers should base their PRs on this branch.
+* [master](https://github.com/prysmaticlabs/prysm/tree/master): This points to the latest stable release. It is ideal for most users.
+* [develop](https://github.com/prysmaticlabs/prysm/tree/develop): This is used for development, it contains the latest PRs. Developers should base their PRs on this branch.
 
-### 🛠 Contribution Guide
+### Guide
+Want to get involved? Check out our [Contribution Guide](https://docs.prylabs.network/docs/contribute/contribution-guidelines/) to learn more!
 
-Want to get involved? Check out our **[Contribution Guide](https://docs.prylabs.network/docs/contribute/contribution-guidelines/)** to learn more!
+## License
 
----
+[GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
-## 📜 License
+## Legal Disclaimer
 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)  
-
-This project is licensed under the **GNU General Public License v3.0**.
-
----
-
-## ⚖️ Legal Disclaimer
-
-📜 [Terms of Use](/TERMS_OF_SERVICE.md)
+[Terms of Use](/TERMS_OF_SERVICE.md)

WORKSPACE

@@ -16,34 +16,6 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "toolchains_protoc",
-    sha256 = "abb1540f8a9e045422730670ebb2f25b41fa56ca5a7cf795175a110a0a68f4ad",
-    strip_prefix = "toolchains_protoc-0.3.6",
-    url = "https://github.com/aspect-build/toolchains_protoc/releases/download/v0.3.6/toolchains_protoc-v0.3.6.tar.gz",
-)
-
-load("@toolchains_protoc//protoc:repositories.bzl", "rules_protoc_dependencies")
-
-rules_protoc_dependencies()
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-
-rules_proto_dependencies()
-
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-
-bazel_features_deps()
-
-load("@toolchains_protoc//protoc:toolchain.bzl", "protoc_toolchains")
-
-protoc_toolchains(
-    name = "protoc_toolchains",
-    version = "v25.3",
-)
-
 HERMETIC_CC_TOOLCHAIN_VERSION = "v3.0.1"
 
 http_archive(
@@ -129,9 +101,9 @@ http_archive(
 
 http_archive(
     name = "aspect_bazel_lib",
-    sha256 = "a272d79bb0ac6b6965aa199b1f84333413452e87f043b53eca7f347a23a478e8",
-    strip_prefix = "bazel-lib-2.9.3",
-    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.3/bazel-lib-v2.9.3.tar.gz",
+    sha256 = "f5ea76682b209cc0bd90d0f5a3b26d2f7a6a2885f0c5f615e72913f4805dbb0d",
+    strip_prefix = "bazel-lib-2.5.0",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.5.0/bazel-lib-v2.5.0.tar.gz",
 )
 
 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")
@@ -160,15 +132,15 @@ oci_register_toolchains(
 
 http_archive(
     name = "io_bazel_rules_go",
-    integrity = "sha256-JD8o94crTb2DFiJJR8nMAGdBAW95zIENB4cbI+JnrI4=",
     patch_args = ["-p1"],
     patches = [
         # Expose internals of go_test for custom build transitions.
         "//third_party:io_bazel_rules_go_test.patch",
     ],
-    strip_prefix = "rules_go-cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9",
+    sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
     urls = [
-        "https://github.com/bazel-contrib/rules_go/archive/cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
     ],
 )
 
@@ -193,7 +165,7 @@ load("@rules_oci//oci:pull.bzl", "oci_pull")
 oci_pull(
     name = "linux_debian11_multiarch_base",  # Debian bullseye
     digest = "sha256:b82f113425c5b5c714151aaacd8039bc141821cdcd3c65202d42bdf9c43ae60b",  # 2023-12-12
-    image = "gcr.io/prysmaticlabs/distroless/cc-debian11",
+    image = "gcr.io/distroless/cc-debian11",
     platforms = [
         "linux/amd64",
         "linux/arm64/v8",
@@ -210,7 +182,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.24.0",
+    go_version = "1.21.8",
     nogo = "@//:nogo",
 )
 
@@ -255,7 +227,7 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.5.0-beta.4"
+consensus_spec_version = "v1.5.0-alpha.2"
 
 bls_test_version = "v0.1.1"
 
@@ -271,7 +243,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-QG0NUqaCvP5lKaKKwF/fmeICZVjONMlb7EE+MtYl0C0=",
+    integrity = "sha256-NNXBa7SZ2sFb68HPNahgu1p0yDBpjuKJuLfRCl7vvoQ=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version,
 )
 
@@ -287,7 +259,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-8NQngTSSqzW/j3tOUi3r5h+94ChRbLNWTt7BOGqr4+E=",
+    integrity = "sha256-7BnlBvGWU92iAB100cMaAXVQhRrqpMQbavgrI+/paCw=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version,
 )
 
@@ -303,7 +275,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-gFqxbaBnJ7dtdoj0zFbVrtlHv/bLNuWjrTHkyCAjFjI=",
+    integrity = "sha256-VCHhcNt+fynf/sHK11qbRBAy608u9T1qAafvAGfxQhA=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version,
 )
 
@@ -318,7 +290,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-9paalF0POULpP2ga+4ouHSETKYrWNCUCZoJHPuFw06E=",
+    integrity = "sha256-a2aCNFyFkYLtf6QSwGOHdx7xXHjA2NNT8x8ZuxB0aes=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )
@@ -360,46 +332,14 @@ http_archive(
 filegroup(
     name = "configs",
     srcs = [
-        "metadata/config.yaml",
+        "custom_config_data/config.yaml",
     ],
     visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-YVFFrCmjoGZ3fXMWpsCpSsYbANy1grnqYwOLKIg2SsA=",
-    strip_prefix = "holesky-32a72e21c6e53c262f27d50dd540cb654517d03a",
-    url = "https://github.com/eth-clients/holesky/archive/32a72e21c6e53c262f27d50dd540cb654517d03a.tar.gz",  # 2025-03-17
-)
-
-http_archive(
-    name = "sepolia_testnet",
-    build_file_content = """
-filegroup(
-    name = "configs",
-    srcs = [
-        "metadata/config.yaml",
-    ],
-    visibility = ["//visibility:public"],
-)
-""",
-    integrity = "sha256-b5F7Wg9LLMqGRIpP2uqb/YsSFVn2ynzlV7g/Nb1EFLk=",
-    strip_prefix = "sepolia-562d9938f08675e9ba490a1dfba21fb05843f39f",
-    url = "https://github.com/eth-clients/sepolia/archive/562d9938f08675e9ba490a1dfba21fb05843f39f.tar.gz",  # 2025-03-17
-)
-
-http_archive(
-    name = "hoodi_testnet",
-    build_file_content = """
-filegroup(
-    name = "configs",
-    srcs = [
-        "metadata/config.yaml",
-    ],
-    visibility = ["//visibility:public"],
-)
-""",
-    integrity = "sha256-dPiEWUd8QvbYGwGtIm0QtCekitVLOLsW5rpQIGzz8PU=",
-    strip_prefix = "hoodi-828c2c940e1141092bd4bb979cef547ea926d272",
-    url = "https://github.com/eth-clients/hoodi/archive/828c2c940e1141092bd4bb979cef547ea926d272.tar.gz",
+    sha256 = "5f4be6fd088683ea9db45c863b9c5a1884422449e5b59fd2d561d3ba0f73ffd9",
+    strip_prefix = "holesky-9d9aabf2d4de51334ee5fed6c79a4d55097d1a43",
+    url = "https://github.com/eth-clients/holesky/archive/9d9aabf2d4de51334ee5fed6c79a4d55097d1a43.tar.gz",  # 2024-01-22
 )
 
 http_archive(
@@ -447,7 +387,7 @@ gometalinter_dependencies()
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 
-gazelle_dependencies(go_sdk = "go_sdk")
+gazelle_dependencies()
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 

api/apiutil/BUILD.bazel

@@ -1,9 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["common.go"],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/apiutil",
-    visibility = ["//visibility:public"],
-    deps = ["//consensus-types/primitives:go_default_library"],
-)

api/apiutil/common.go

@@ -1,30 +0,0 @@
-package apiutil
-
-import (
-	"fmt"
-	neturl "net/url"
-	"regexp"
-	"strconv"
-
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-)
-
-func ValidRoot(root string) bool {
-	matchesRegex, err := regexp.MatchString("^0x[a-fA-F0-9]{64}$", root)
-	if err != nil {
-		return false
-	}
-	return matchesRegex
-}
-
-func Uint64ToString[T uint64 | primitives.Slot | primitives.ValidatorIndex | primitives.CommitteeIndex | primitives.Epoch](val T) string {
-	return strconv.FormatUint(uint64(val), 10)
-}
-
-func BuildURL(path string, queryParams ...neturl.Values) string {
-	if len(queryParams) == 0 {
-		return path
-	}
-
-	return fmt.Sprintf("%s?%s", path, queryParams[0].Encode())
-}

api/client/BUILD.bazel

@@ -5,31 +5,16 @@ go_library(
     srcs = [
         "client.go",
         "errors.go",
-        "json_rest_handler.go",
         "options.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/v5/api/client",
     visibility = ["//visibility:public"],
-    deps = [
-        "//api:go_default_library",
-        "//network/httputil:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-    ],
+    deps = ["@com_github_pkg_errors//:go_default_library"],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "client_test.go",
-        "json_rest_handler_test.go",
-    ],
+    srcs = ["client_test.go"],
     embed = [":go_default_library"],
-    deps = [
-        "//api:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//network/httputil:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-    ],
+    deps = ["//testing/require:go_default_library"],
 )

api/client/beacon/BUILD.bazel

@@ -3,34 +3,61 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "checkpoint.go",
         "client.go",
         "doc.go",
+        "health.go",
         "log.go",
-        "structs.go",
-        "template.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon",
     visibility = ["//visibility:public"],
     deps = [
         "//api/client:go_default_library",
+        "//api/client/beacon/iface:go_default_library",
         "//api/server:go_default_library",
         "//api/server/structs:go_default_library",
+        "//beacon-chain/core/helpers:go_default_library",
+        "//beacon-chain/state:go_default_library",
+        "//consensus-types/interfaces:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//encoding/bytesutil:go_default_library",
+        "//encoding/ssz/detect:go_default_library",
+        "//io/file:go_default_library",
         "//network/forks:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
+        "//runtime/version:go_default_library",
+        "//time/slots:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
+        "@org_golang_x_mod//semver:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = ["client_test.go"],
+    srcs = [
+        "checkpoint_test.go",
+        "client_test.go",
+        "health_test.go",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//api/client:go_default_library",
+        "//api/client/beacon/testing:go_default_library",
+        "//beacon-chain/state:go_default_library",
+        "//config/params:go_default_library",
+        "//consensus-types/blocks:go_default_library",
+        "//consensus-types/blocks/testing:go_default_library",
+        "//consensus-types/primitives:go_default_library",
+        "//encoding/ssz/detect:go_default_library",
+        "//network/forks:go_default_library",
+        "//proto/prysm/v1alpha1:go_default_library",
+        "//runtime/version:go_default_library",
         "//testing/require:go_default_library",
+        "//testing/util:go_default_library",
+        "//time/slots:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@org_uber_go_mock//gomock:go_default_library",
     ],
 )

api/client/beacon/chain/BUILD.bazel

@@ -1,45 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "client.go",
-        "grpc_client.go",
-        "interfaces.go",
-        "rest_client.go",
-    ],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/chain",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//api/client:go_default_library",
-        "//api/client/beacon/shared_providers:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//config/features:go_default_library",
-        "//consensus-types/primitives:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//time/slots:go_default_library",
-        "//validator/helpers:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@com_github_golang_protobuf//ptypes/empty",
-        "@com_github_pkg_errors//:go_default_library",
-        "@org_golang_google_grpc//:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["rest_client_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//api/client/beacon/mock:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//consensus-types/primitives:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-        "//time/slots:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
-        "@org_uber_go_mock//gomock:go_default_library",
-    ],
-)

api/client/beacon/chain/client.go

@@ -1,31 +0,0 @@
-package chain
-
-import (
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	validatorHelpers "github.com/prysmaticlabs/prysm/v5/validator/helpers"
-	"google.golang.org/grpc"
-)
-
-func NewClient(validatorConn validatorHelpers.NodeConnection, jsonRestHandler client.JsonRestHandler) Client {
-	grpcClient := NewGrpcChainClient(validatorConn.GetGrpcClientConn())
-	if features.Get().EnableBeaconRESTApi {
-		return NewBeaconApiChainClientWithFallback(jsonRestHandler, grpcClient)
-	} else {
-		return grpcClient
-	}
-}
-
-func NewGrpcChainClient(cc grpc.ClientConnInterface) Client {
-	return &grpcChainClient{ethpb.NewBeaconChainClient(cc)}
-}
-
-func NewBeaconApiChainClientWithFallback(jsonRestHandler client.JsonRestHandler, fallbackClient Client) Client {
-	return &beaconApiChainClient{
-		jsonRestHandler:         jsonRestHandler,
-		fallbackClient:          fallbackClient,
-		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
-	}
-}

api/client/beacon/chain/grpc_client.go

@@ -1,36 +0,0 @@
-package chain
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type grpcChainClient struct {
-	beaconChainClient ethpb.BeaconChainClient
-}
-
-func (c *grpcChainClient) ChainHead(ctx context.Context, in *empty.Empty) (*ethpb.ChainHead, error) {
-	return c.beaconChainClient.GetChainHead(ctx, in)
-}
-
-func (c *grpcChainClient) ValidatorBalances(ctx context.Context, in *ethpb.ListValidatorBalancesRequest) (*ethpb.ValidatorBalances, error) {
-	return c.beaconChainClient.ListValidatorBalances(ctx, in)
-}
-
-func (c *grpcChainClient) Validators(ctx context.Context, in *ethpb.ListValidatorsRequest) (*ethpb.Validators, error) {
-	return c.beaconChainClient.ListValidators(ctx, in)
-}
-
-func (c *grpcChainClient) ValidatorQueue(ctx context.Context, in *empty.Empty) (*ethpb.ValidatorQueue, error) {
-	return c.beaconChainClient.GetValidatorQueue(ctx, in)
-}
-
-func (c *grpcChainClient) ValidatorPerformance(ctx context.Context, in *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error) {
-	return c.beaconChainClient.GetValidatorPerformance(ctx, in)
-}
-
-func (c *grpcChainClient) ValidatorParticipation(ctx context.Context, in *ethpb.GetValidatorParticipationRequest) (*ethpb.ValidatorParticipationResponse, error) {
-	return c.beaconChainClient.GetValidatorParticipation(ctx, in)
-}

api/client/beacon/chain/interfaces.go

@@ -1,17 +0,0 @@
-package chain
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type Client interface {
-	ChainHead(ctx context.Context, in *empty.Empty) (*ethpb.ChainHead, error)
-	ValidatorBalances(ctx context.Context, in *ethpb.ListValidatorBalancesRequest) (*ethpb.ValidatorBalances, error)
-	Validators(ctx context.Context, in *ethpb.ListValidatorsRequest) (*ethpb.Validators, error)
-	ValidatorQueue(ctx context.Context, in *empty.Empty) (*ethpb.ValidatorQueue, error)
-	ValidatorParticipation(ctx context.Context, in *ethpb.GetValidatorParticipationRequest) (*ethpb.ValidatorParticipationResponse, error)
-	ValidatorPerformance(context.Context, *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error)
-}

api/client/beacon/checkpoint.go

@@ -0,0 +1,276 @@
+package beacon
+
+import (
+	"context"
+	"fmt"
+	"path"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/pkg/errors"
+	base "github.com/prysmaticlabs/prysm/v5/api/client"
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
+	"github.com/prysmaticlabs/prysm/v5/encoding/ssz/detect"
+	"github.com/prysmaticlabs/prysm/v5/io/file"
+	"github.com/prysmaticlabs/prysm/v5/runtime/version"
+	"github.com/prysmaticlabs/prysm/v5/time/slots"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/mod/semver"
+)
+
+var errCheckpointBlockMismatch = errors.New("mismatch between checkpoint sync state and block")
+
+// OriginData represents the BeaconState and ReadOnlySignedBeaconBlock necessary to start an empty Beacon Node
+// using Checkpoint Sync.
+type OriginData struct {
+	sb []byte
+	bb []byte
+	st state.BeaconState
+	b  interfaces.ReadOnlySignedBeaconBlock
+	vu *detect.VersionedUnmarshaler
+	br [32]byte
+	sr [32]byte
+}
+
+// SaveBlock saves the downloaded block to a unique file in the given path.
+// For readability and collision avoidance, the file name includes: type, config name, slot and root
+func (o *OriginData) SaveBlock(dir string) (string, error) {
+	blockPath := path.Join(dir, fname("block", o.vu, o.b.Block().Slot(), o.br))
+	return blockPath, file.WriteFile(blockPath, o.BlockBytes())
+}
+
+// SaveState saves the downloaded state to a unique file in the given path.
+// For readability and collision avoidance, the file name includes: type, config name, slot and root
+func (o *OriginData) SaveState(dir string) (string, error) {
+	statePath := path.Join(dir, fname("state", o.vu, o.st.Slot(), o.sr))
+	return statePath, file.WriteFile(statePath, o.StateBytes())
+}
+
+// StateBytes returns the ssz-encoded bytes of the downloaded BeaconState value.
+func (o *OriginData) StateBytes() []byte {
+	return o.sb
+}
+
+// BlockBytes returns the ssz-encoded bytes of the downloaded ReadOnlySignedBeaconBlock value.
+func (o *OriginData) BlockBytes() []byte {
+	return o.bb
+}
+
+func fname(prefix string, vu *detect.VersionedUnmarshaler, slot primitives.Slot, root [32]byte) string {
+	return fmt.Sprintf("%s_%s_%s_%d-%#x.ssz", prefix, vu.Config.ConfigName, version.String(vu.Fork), slot, root)
+}
+
+// DownloadFinalizedData downloads the most recently finalized state, and the block most recently applied to that state.
+// This pair can be used to initialize a new beacon node via checkpoint sync.
+func DownloadFinalizedData(ctx context.Context, client *Client) (*OriginData, error) {
+	sb, err := client.GetState(ctx, IdFinalized)
+	if err != nil {
+		return nil, err
+	}
+	vu, err := detect.FromState(sb)
+	if err != nil {
+		return nil, errors.Wrap(err, "error detecting chain config for finalized state")
+	}
+
+	log.WithFields(logrus.Fields{
+		"name": vu.Config.ConfigName,
+		"fork": version.String(vu.Fork),
+	}).Info("Detected supported config in remote finalized state")
+
+	s, err := vu.UnmarshalBeaconState(sb)
+	if err != nil {
+		return nil, errors.Wrap(err, "error unmarshaling finalized state to correct version")
+	}
+
+	slot := s.LatestBlockHeader().Slot
+	bb, err := client.GetBlock(ctx, IdFromSlot(slot))
+	if err != nil {
+		return nil, errors.Wrapf(err, "error requesting block by slot = %d", slot)
+	}
+	b, err := vu.UnmarshalBeaconBlock(bb)
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to unmarshal block to a supported type using the detected fork schedule")
+	}
+	br, err := b.Block().HashTreeRoot()
+	if err != nil {
+		return nil, errors.Wrap(err, "error computing hash_tree_root of retrieved block")
+	}
+	bodyRoot, err := b.Block().Body().HashTreeRoot()
+	if err != nil {
+		return nil, errors.Wrap(err, "error computing hash_tree_root of retrieved block body")
+	}
+
+	sbr := bytesutil.ToBytes32(s.LatestBlockHeader().BodyRoot)
+	if sbr != bodyRoot {
+		return nil, errors.Wrapf(errCheckpointBlockMismatch, "state body root = %#x, block body root = %#x", sbr, bodyRoot)
+	}
+	sr, err := s.HashTreeRoot(ctx)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to compute htr for finalized state at slot=%d", s.Slot())
+	}
+
+	log.
+		WithField("blockSlot", b.Block().Slot()).
+		WithField("stateSlot", s.Slot()).
+		WithField("stateRoot", hexutil.Encode(sr[:])).
+		WithField("blockRoot", hexutil.Encode(br[:])).
+		Info("Downloaded checkpoint sync state and block.")
+	return &OriginData{
+		st: s,
+		b:  b,
+		sb: sb,
+		bb: bb,
+		vu: vu,
+		br: br,
+		sr: sr,
+	}, nil
+}
+
+// WeakSubjectivityData represents the state root, block root and epoch of the BeaconState + ReadOnlySignedBeaconBlock
+// that falls at the beginning of the current weak subjectivity period. These values can be used to construct
+// a weak subjectivity checkpoint beacon node flag to be used for validation.
+type WeakSubjectivityData struct {
+	BlockRoot [32]byte
+	StateRoot [32]byte
+	Epoch     primitives.Epoch
+}
+
+// CheckpointString returns the standard string representation of a Checkpoint.
+// The format is a hex-encoded block root, followed by the epoch of the block, separated by a colon. For example:
+// "0x1c35540cac127315fabb6bf29181f2ae0de1a3fc909d2e76ba771e61312cc49a:74888"
+func (wsd *WeakSubjectivityData) CheckpointString() string {
+	return fmt.Sprintf("%#x:%d", wsd.BlockRoot, wsd.Epoch)
+}
+
+// ComputeWeakSubjectivityCheckpoint attempts to use the prysm weak_subjectivity api
+// to obtain the current weak_subjectivity checkpoint.
+// For non-prysm nodes, the same computation will be performed with extra steps,
+// using the head state downloaded from the beacon node api.
+func ComputeWeakSubjectivityCheckpoint(ctx context.Context, client *Client) (*WeakSubjectivityData, error) {
+	ws, err := client.GetWeakSubjectivity(ctx)
+	if err != nil {
+		// a 404/405 is expected if querying an endpoint that doesn't support the weak subjectivity checkpoint api
+		if !errors.Is(err, base.ErrNotOK) {
+			return nil, errors.Wrap(err, "unexpected API response for prysm-only weak subjectivity checkpoint API")
+		}
+		// fall back to vanilla Beacon Node API method
+		return computeBackwardsCompatible(ctx, client)
+	}
+	log.Printf("server weak subjectivity checkpoint response - epoch=%d, block_root=%#x, state_root=%#x", ws.Epoch, ws.BlockRoot, ws.StateRoot)
+	return ws, nil
+}
+
+const (
+	prysmMinimumVersion     = "v2.0.7"
+	prysmImplementationName = "Prysm"
+)
+
+// errUnsupportedPrysmCheckpointVersion indicates remote beacon node can't be used for checkpoint retrieval.
+var errUnsupportedPrysmCheckpointVersion = errors.New("node does not meet minimum version requirements for checkpoint retrieval")
+
+// for older endpoints or clients that do not support the weak_subjectivity api method
+// we gather the necessary data for a checkpoint sync by:
+// - inspecting the remote server's head state and computing the weak subjectivity epoch locally
+// - requesting the state at the first slot of the epoch
+// - using hash_tree_root(state.latest_block_header) to compute the block the state integrates
+// - requesting that block by its root
+func computeBackwardsCompatible(ctx context.Context, client *Client) (*WeakSubjectivityData, error) {
+	log.Print("falling back to generic checkpoint derivation, weak_subjectivity API not supported by server")
+	nv, err := client.GetNodeVersion(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to proceed with fallback method without confirming node version")
+	}
+	if nv.implementation == prysmImplementationName && semver.Compare(nv.semver, prysmMinimumVersion) < 0 {
+		return nil, errors.Wrapf(errUnsupportedPrysmCheckpointVersion, "%s < minimum (%s)", nv.semver, prysmMinimumVersion)
+	}
+	epoch, err := getWeakSubjectivityEpochFromHead(ctx, client)
+	if err != nil {
+		return nil, errors.Wrap(err, "error computing weak subjectivity epoch via head state inspection")
+	}
+
+	// use first slot of the epoch for the state slot
+	slot, err := slots.EpochStart(epoch)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error computing first slot of epoch=%d", epoch)
+	}
+
+	log.Printf("requesting checkpoint state at slot %d", slot)
+	// get the state at the first slot of the epoch
+	sb, err := client.GetState(ctx, IdFromSlot(slot))
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to request state by slot from api, slot=%d", slot)
+	}
+
+	// ConfigFork is used to unmarshal the BeaconState so we can read the block root in latest_block_header
+	vu, err := detect.FromState(sb)
+	if err != nil {
+		return nil, errors.Wrap(err, "error detecting chain config for beacon state")
+	}
+	log.Printf("detected supported config in checkpoint state, name=%s, fork=%s", vu.Config.ConfigName, version.String(vu.Fork))
+
+	s, err := vu.UnmarshalBeaconState(sb)
+	if err != nil {
+		return nil, errors.Wrap(err, "error using detected config fork to unmarshal state bytes")
+	}
+
+	// compute state and block roots
+	sr, err := s.HashTreeRoot(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "error computing hash_tree_root of state")
+	}
+
+	h := s.LatestBlockHeader()
+	h.StateRoot = sr[:]
+	br, err := h.HashTreeRoot()
+	if err != nil {
+		return nil, errors.Wrap(err, "error while computing block root using state data")
+	}
+
+	bb, err := client.GetBlock(ctx, IdFromRoot(br))
+	if err != nil {
+		return nil, errors.Wrapf(err, "error requesting block by root = %d", br)
+	}
+	b, err := vu.UnmarshalBeaconBlock(bb)
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to unmarshal block to a supported type using the detected fork schedule")
+	}
+	br, err = b.Block().HashTreeRoot()
+	if err != nil {
+		return nil, errors.Wrap(err, "error computing hash_tree_root for block obtained via root")
+	}
+
+	return &WeakSubjectivityData{
+		Epoch:     epoch,
+		BlockRoot: br,
+		StateRoot: sr,
+	}, nil
+}
+
+// this method downloads the head state, which can be used to find the correct chain config
+// and use prysm's helper methods to compute the latest weak subjectivity epoch.
+func getWeakSubjectivityEpochFromHead(ctx context.Context, client *Client) (primitives.Epoch, error) {
+	headBytes, err := client.GetState(ctx, IdHead)
+	if err != nil {
+		return 0, err
+	}
+	vu, err := detect.FromState(headBytes)
+	if err != nil {
+		return 0, errors.Wrap(err, "error detecting chain config for beacon state")
+	}
+	log.Printf("detected supported config in remote head state, name=%s, fork=%s", vu.Config.ConfigName, version.String(vu.Fork))
+	headState, err := vu.UnmarshalBeaconState(headBytes)
+	if err != nil {
+		return 0, errors.Wrap(err, "error unmarshaling state to correct version")
+	}
+
+	epoch, err := helpers.LatestWeakSubjectivityEpoch(ctx, headState, vu.Config)
+	if err != nil {
+		return 0, errors.Wrap(err, "error computing the weak subjectivity epoch from head state")
+	}
+
+	log.Printf("(computed client-side) weak subjectivity epoch = %d", epoch)
+	return epoch, nil
+}

api/client/beacon/checkpoint_test.go

@@ -1,4 +1,4 @@
-package checkpoint
+package beacon
 
 import (
 	"bytes"
@@ -9,23 +9,37 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	blocktest "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks/testing"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/encoding/ssz/detect"
 	"github.com/prysmaticlabs/prysm/v5/network/forks"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	"github.com/prysmaticlabs/prysm/v5/testing/util"
 	"github.com/prysmaticlabs/prysm/v5/time/slots"
+
+	"github.com/prysmaticlabs/prysm/v5/config/params"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/encoding/ssz/detect"
+	"github.com/prysmaticlabs/prysm/v5/runtime/version"
+
+	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 )
 
+type testRT struct {
+	rt func(*http.Request) (*http.Response, error)
+}
+
+func (rt *testRT) RoundTrip(req *http.Request) (*http.Response, error) {
+	if rt.rt != nil {
+		return rt.rt(req)
+	}
+	return nil, errors.New("RoundTripper not implemented")
+}
+
+var _ http.RoundTripper = &testRT{}
+
 func marshalToEnvelope(val interface{}) ([]byte, error) {
 	raw, err := json.Marshal(val)
 	if err != nil {
@@ -51,6 +65,35 @@ func TestMarshalToEnvelope(t *testing.T) {
 	require.Equal(t, expected, string(encoded))
 }
 
+func TestFallbackVersionCheck(t *testing.T) {
+	trans := &testRT{rt: func(req *http.Request) (*http.Response, error) {
+		res := &http.Response{Request: req}
+		switch req.URL.Path {
+		case getNodeVersionPath:
+			res.StatusCode = http.StatusOK
+			b := bytes.NewBuffer(nil)
+			d := struct {
+				Version string `json:"version"`
+			}{
+				Version: "Prysm/v2.0.5 (linux amd64)",
+			}
+			encoded, err := marshalToEnvelope(d)
+			require.NoError(t, err)
+			b.Write(encoded)
+			res.Body = io.NopCloser(b)
+		case getWeakSubjectivityPath:
+			res.StatusCode = http.StatusNotFound
+		}
+		return res, nil
+	}}
+
+	c, err := NewClient("http://localhost:3500", client.WithRoundTripper(trans))
+	require.NoError(t, err)
+	ctx := context.Background()
+	_, err = ComputeWeakSubjectivityCheckpoint(ctx, c)
+	require.ErrorIs(t, err, errUnsupportedPrysmCheckpointVersion)
+}
+
 func TestFname(t *testing.T) {
 	vu := &detect.VersionedUnmarshaler{
 		Config: params.MainnetConfig(),
@@ -119,7 +162,7 @@ func TestDownloadWeakSubjectivityCheckpoint(t *testing.T) {
 
 	wsSerialized, err := wst.MarshalSSZ()
 	require.NoError(t, err)
-	expectedWSD := beacon.WeakSubjectivityData{
+	expectedWSD := WeakSubjectivityData{
 		BlockRoot: bRoot,
 		StateRoot: wRoot,
 		Epoch:     epoch,
@@ -128,7 +171,7 @@ func TestDownloadWeakSubjectivityCheckpoint(t *testing.T) {
 	trans := &testRT{rt: func(req *http.Request) (*http.Response, error) {
 		res := &http.Response{Request: req}
 		switch req.URL.Path {
-		case beacon.GetWeakSubjectivityPath:
+		case getWeakSubjectivityPath:
 			res.StatusCode = http.StatusOK
 			cp := struct {
 				Epoch string `json:"epoch"`
@@ -147,10 +190,10 @@ func TestDownloadWeakSubjectivityCheckpoint(t *testing.T) {
 			rb, err := marshalToEnvelope(wsr)
 			require.NoError(t, err)
 			res.Body = io.NopCloser(bytes.NewBuffer(rb))
-		case beacon.RenderGetStatePath(beacon.IdFromSlot(wSlot)):
+		case renderGetStatePath(IdFromSlot(wSlot)):
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(wsSerialized))
-		case beacon.RenderGetBlockPath(beacon.IdFromRoot(bRoot)):
+		case renderGetBlockPath(IdFromRoot(bRoot)):
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(serBlock))
 		}
@@ -158,7 +201,7 @@ func TestDownloadWeakSubjectivityCheckpoint(t *testing.T) {
 		return res, nil
 	}}
 
-	c, err := beacon.NewClient("http://localhost:3500", client.WithRoundTripper(trans))
+	c, err := NewClient("http://localhost:3500", client.WithRoundTripper(trans))
 	require.NoError(t, err)
 
 	wsd, err := ComputeWeakSubjectivityCheckpoint(ctx, c)
@@ -222,7 +265,7 @@ func TestDownloadBackwardsCompatibleCombined(t *testing.T) {
 	trans := &testRT{rt: func(req *http.Request) (*http.Response, error) {
 		res := &http.Response{Request: req}
 		switch req.URL.Path {
-		case beacon.GetNodeVersionPath:
+		case getNodeVersionPath:
 			res.StatusCode = http.StatusOK
 			b := bytes.NewBuffer(nil)
 			d := struct {
@@ -234,15 +277,15 @@ func TestDownloadBackwardsCompatibleCombined(t *testing.T) {
 			require.NoError(t, err)
 			b.Write(encoded)
 			res.Body = io.NopCloser(b)
-		case beacon.GetWeakSubjectivityPath:
+		case getWeakSubjectivityPath:
 			res.StatusCode = http.StatusNotFound
-		case beacon.RenderGetStatePath(beacon.IdHead):
+		case renderGetStatePath(IdHead):
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(serialized))
-		case beacon.RenderGetStatePath(beacon.IdFromSlot(wSlot)):
+		case renderGetStatePath(IdFromSlot(wSlot)):
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(wsSerialized))
-		case beacon.RenderGetBlockPath(beacon.IdFromRoot(bRoot)):
+		case renderGetBlockPath(IdFromRoot(bRoot)):
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(serBlock))
 		}
@@ -250,7 +293,7 @@ func TestDownloadBackwardsCompatibleCombined(t *testing.T) {
 		return res, nil
 	}}
 
-	c, err := beacon.NewClient("http://localhost:3500", client.WithRoundTripper(trans))
+	c, err := NewClient("http://localhost:3500", client.WithRoundTripper(trans))
 	require.NoError(t, err)
 
 	wsPub, err := ComputeWeakSubjectivityCheckpoint(ctx, c)
@@ -267,13 +310,13 @@ func TestGetWeakSubjectivityEpochFromHead(t *testing.T) {
 	require.NoError(t, err)
 	trans := &testRT{rt: func(req *http.Request) (*http.Response, error) {
 		res := &http.Response{Request: req}
-		if req.URL.Path == beacon.RenderGetStatePath(beacon.IdHead) {
+		if req.URL.Path == renderGetStatePath(IdHead) {
 			res.StatusCode = http.StatusOK
 			res.Body = io.NopCloser(bytes.NewBuffer(serialized))
 		}
 		return res, nil
 	}}
-	c, err := beacon.NewClient("http://localhost:3500", client.WithRoundTripper(trans))
+	c, err := NewClient("http://localhost:3500", client.WithRoundTripper(trans))
 	require.NoError(t, err)
 	actualEpoch, err := getWeakSubjectivityEpochFromHead(context.Background(), c)
 	require.NoError(t, err)
@@ -345,3 +388,96 @@ func populateValidators(cfg *params.BeaconChainConfig, st state.BeaconState, val
 	}
 	return st.SetBalances(balances)
 }
+
+func TestDownloadFinalizedData(t *testing.T) {
+	ctx := context.Background()
+	cfg := params.MainnetConfig().Copy()
+
+	// avoid the altair zone because genesis tests are easier to set up
+	epoch := cfg.AltairForkEpoch - 1
+	// set up checkpoint state, using the epoch that will be computed as the ws checkpoint state based on the head state
+	slot, err := slots.EpochStart(epoch)
+	require.NoError(t, err)
+	st, err := util.NewBeaconState()
+	require.NoError(t, err)
+	fork, err := forkForEpoch(cfg, epoch)
+	require.NoError(t, err)
+	require.NoError(t, st.SetFork(fork))
+	require.NoError(t, st.SetSlot(slot))
+
+	// set up checkpoint block
+	b, err := blocks.NewSignedBeaconBlock(util.NewBeaconBlock())
+	require.NoError(t, err)
+	b, err = blocktest.SetBlockParentRoot(b, cfg.ZeroHash)
+	require.NoError(t, err)
+	b, err = blocktest.SetBlockSlot(b, slot)
+	require.NoError(t, err)
+	b, err = blocktest.SetProposerIndex(b, 0)
+	require.NoError(t, err)
+
+	// set up state header pointing at checkpoint block - this is how the block is downloaded by root
+	header, err := b.Header()
+	require.NoError(t, err)
+	require.NoError(t, st.SetLatestBlockHeader(header.Header))
+
+	// order of operations can be confusing here:
+	// - when computing the state root, make sure block header is complete, EXCEPT the state root should be zero-value
+	// - before computing the block root (to match the request route), the block should include the state root
+	//   *computed from the state with a header that does not have a state root set yet*
+	sr, err := st.HashTreeRoot(ctx)
+	require.NoError(t, err)
+
+	b, err = blocktest.SetBlockStateRoot(b, sr)
+	require.NoError(t, err)
+	mb, err := b.MarshalSSZ()
+	require.NoError(t, err)
+	br, err := b.Block().HashTreeRoot()
+	require.NoError(t, err)
+
+	ms, err := st.MarshalSSZ()
+	require.NoError(t, err)
+
+	trans := &testRT{rt: func(req *http.Request) (*http.Response, error) {
+		res := &http.Response{Request: req}
+		switch req.URL.Path {
+		case renderGetStatePath(IdFinalized):
+			res.StatusCode = http.StatusOK
+			res.Body = io.NopCloser(bytes.NewBuffer(ms))
+		case renderGetBlockPath(IdFromSlot(b.Block().Slot())):
+			res.StatusCode = http.StatusOK
+			res.Body = io.NopCloser(bytes.NewBuffer(mb))
+		default:
+			res.StatusCode = http.StatusInternalServerError
+			res.Body = io.NopCloser(bytes.NewBufferString(""))
+		}
+
+		return res, nil
+	}}
+	c, err := NewClient("http://localhost:3500", client.WithRoundTripper(trans))
+	require.NoError(t, err)
+	// sanity check before we go through checkpoint
+	// make sure we can download the state and unmarshal it with the VersionedUnmarshaler
+	sb, err := c.GetState(ctx, IdFinalized)
+	require.NoError(t, err)
+	require.Equal(t, true, bytes.Equal(sb, ms))
+	vu, err := detect.FromState(sb)
+	require.NoError(t, err)
+	us, err := vu.UnmarshalBeaconState(sb)
+	require.NoError(t, err)
+	ushtr, err := us.HashTreeRoot(ctx)
+	require.NoError(t, err)
+	require.Equal(t, sr, ushtr)
+
+	expected := &OriginData{
+		sb: ms,
+		bb: mb,
+		br: br,
+		sr: sr,
+	}
+	od, err := DownloadFinalizedData(ctx, c)
+	require.NoError(t, err)
+	require.Equal(t, true, bytes.Equal(expected.sb, od.sb))
+	require.Equal(t, true, bytes.Equal(expected.bb, od.bb))
+	require.Equal(t, expected.br, od.br)
+	require.Equal(t, expected.sr, od.sr)
+}

api/client/beacon/client.go

@@ -11,6 +11,7 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"text/template"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
@@ -28,13 +29,12 @@ const (
 	getSignedBlockPath       = "/eth/v2/beacon/blocks"
 	getBlockRootPath         = "/eth/v1/beacon/blocks/{{.Id}}/root"
 	getForkForStatePath      = "/eth/v1/beacon/states/{{.Id}}/fork"
+	getWeakSubjectivityPath  = "/prysm/v1/beacon/weak_subjectivity"
 	getForkSchedulePath      = "/eth/v1/config/fork_schedule"
 	getConfigSpecPath        = "/eth/v1/config/spec"
 	getStatePath             = "/eth/v2/debug/beacon/states"
+	getNodeVersionPath       = "/eth/v1/node/version"
 	changeBLStoExecutionPath = "/eth/v1/beacon/pool/bls_to_execution_changes"
-
-	GetNodeVersionPath      = "/eth/v1/node/version"
-	GetWeakSubjectivityPath = "/prysm/v1/beacon/weak_subjectivity"
 )
 
 // StateOrBlockId represents the block_id / state_id parameters that several of the Eth Beacon API methods accept.
@@ -63,8 +63,24 @@ func IdFromSlot(s primitives.Slot) StateOrBlockId {
 	return StateOrBlockId(strconv.FormatUint(uint64(s), 10))
 }
 
-// RenderGetBlockPath formats a block id into a path for the GetBlock API endpoint.
-func RenderGetBlockPath(id StateOrBlockId) string {
+// idTemplate is used to create template functions that can interpolate StateOrBlockId values.
+func idTemplate(ts string) func(StateOrBlockId) string {
+	t := template.Must(template.New("").Parse(ts))
+	f := func(id StateOrBlockId) string {
+		b := bytes.NewBuffer(nil)
+		err := t.Execute(b, struct{ Id string }{Id: string(id)})
+		if err != nil {
+			panic(fmt.Sprintf("invalid idTemplate: %s", ts))
+		}
+		return b.String()
+	}
+	// run the template to ensure that it is valid
+	// this should happen load time (using package scoped vars) to ensure runtime errors aren't possible
+	_ = f(IdGenesis)
+	return f
+}
+
+func renderGetBlockPath(id StateOrBlockId) string {
 	return path.Join(getSignedBlockPath, string(id))
 }
 
@@ -88,7 +104,7 @@ func NewClient(host string, opts ...client.ClientOpt) (*Client, error) {
 // for the named identifiers.
 // The return value contains the ssz-encoded bytes.
 func (c *Client) GetBlock(ctx context.Context, blockId StateOrBlockId) ([]byte, error) {
-	blockPath := RenderGetBlockPath(blockId)
+	blockPath := renderGetBlockPath(blockId)
 	b, err := c.Get(ctx, blockPath, client.WithSSZEncoding())
 	if err != nil {
 		return nil, errors.Wrapf(err, "error requesting state by id = %s", blockId)
@@ -96,6 +112,8 @@ func (c *Client) GetBlock(ctx context.Context, blockId StateOrBlockId) ([]byte,
 	return b, nil
 }
 
+var getBlockRootTpl = idTemplate(getBlockRootPath)
+
 // GetBlockRoot retrieves the hash_tree_root of the BeaconBlock for the given block id.
 // Block identifier can be one of: "head" (canonical head in node's view), "genesis", "finalized",
 // <slot>, <hex encoded blockRoot with 0x prefix>. Variables of type StateOrBlockId are exported by this package
@@ -118,6 +136,8 @@ func (c *Client) GetBlockRoot(ctx context.Context, blockId StateOrBlockId) ([32]
 	return bytesutil.ToBytes32(rs), nil
 }
 
+var getForkTpl = idTemplate(getForkForStatePath)
+
 // GetFork queries the Beacon Node API for the Fork from the state identified by stateId.
 // Block identifier can be one of: "head" (canonical head in node's view), "genesis", "finalized",
 // <slot>, <hex encoded blockRoot with 0x prefix>. Variables of type StateOrBlockId are exported by this package
@@ -175,10 +195,6 @@ type NodeVersion struct {
 	systemInfo     string
 }
 
-func (nv *NodeVersion) SetImplementation(impl string) {
-	nv.implementation = impl
-}
-
 var versionRE = regexp.MustCompile(`^(\w+)/(v\d+\.\d+\.\d+[-a-zA-Z0-9]*)\s*/?(.*)$`)
 
 func parseNodeVersion(v string) (*NodeVersion, error) {
@@ -196,7 +212,7 @@ func parseNodeVersion(v string) (*NodeVersion, error) {
 // GetNodeVersion requests that the beacon node identify information about its implementation in a format
 // similar to a HTTP User-Agent field. ex: Lighthouse/v0.1.5 (Linux x86_64)
 func (c *Client) GetNodeVersion(ctx context.Context) (*NodeVersion, error) {
-	b, err := c.Get(ctx, GetNodeVersionPath)
+	b, err := c.Get(ctx, getNodeVersionPath)
 	if err != nil {
 		return nil, errors.Wrap(err, "error requesting node version")
 	}
@@ -212,8 +228,7 @@ func (c *Client) GetNodeVersion(ctx context.Context) (*NodeVersion, error) {
 	return parseNodeVersion(d.Data.Version)
 }
 
-// RenderGetStatePath formats a state id into a path for the GetState API endpoint.
-func RenderGetStatePath(id StateOrBlockId) string {
+func renderGetStatePath(id StateOrBlockId) string {
 	return path.Join(getStatePath, string(id))
 }
 
@@ -231,29 +246,13 @@ func (c *Client) GetState(ctx context.Context, stateId StateOrBlockId) ([]byte,
 	return b, nil
 }
 
-// WeakSubjectivityData represents the state root, block root and epoch of the BeaconState + ReadOnlySignedBeaconBlock
-// that falls at the beginning of the current weak subjectivity period. These values can be used to construct
-// a weak subjectivity checkpoint beacon node flag to be used for validation.
-type WeakSubjectivityData struct {
-	BlockRoot [32]byte
-	StateRoot [32]byte
-	Epoch     primitives.Epoch
-}
-
-// CheckpointString returns the standard string representation of a Checkpoint.
-// The format is a hex-encoded block root, followed by the epoch of the block, separated by a colon. For example:
-// "0x1c35540cac127315fabb6bf29181f2ae0de1a3fc909d2e76ba771e61312cc49a:74888"
-func (wsd *WeakSubjectivityData) CheckpointString() string {
-	return fmt.Sprintf("%#x:%d", wsd.BlockRoot, wsd.Epoch)
-}
-
 // GetWeakSubjectivity calls a proposed API endpoint that is unique to prysm
 // This api method does the following:
 // - computes weak subjectivity epoch
 // - finds the highest non-skipped block preceding the epoch
 // - returns the htr of the found block and returns this + the value of state_root from the block
 func (c *Client) GetWeakSubjectivity(ctx context.Context) (*WeakSubjectivityData, error) {
-	body, err := c.Get(ctx, GetWeakSubjectivityPath)
+	body, err := c.Get(ctx, getWeakSubjectivityPath)
 	if err != nil {
 		return nil, err
 	}

api/client/beacon/client_test.go

@@ -97,31 +97,31 @@ func TestValidHostname(t *testing.T) {
 		{
 			name:    "hostname with port",
 			hostArg: "mydomain.org:3500",
-			path:    GetNodeVersionPath,
+			path:    getNodeVersionPath,
 			joined:  "http://mydomain.org:3500/eth/v1/node/version",
 		},
 		{
 			name:    "https scheme, hostname with port",
 			hostArg: "https://mydomain.org:3500",
-			path:    GetNodeVersionPath,
+			path:    getNodeVersionPath,
 			joined:  "https://mydomain.org:3500/eth/v1/node/version",
 		},
 		{
 			name:    "http scheme, hostname without port",
 			hostArg: "http://mydomain.org",
-			path:    GetNodeVersionPath,
+			path:    getNodeVersionPath,
 			joined:  "http://mydomain.org/eth/v1/node/version",
 		},
 		{
 			name:    "http scheme, trailing slash, hostname without port",
 			hostArg: "http://mydomain.org/",
-			path:    GetNodeVersionPath,
+			path:    getNodeVersionPath,
 			joined:  "http://mydomain.org/eth/v1/node/version",
 		},
 		{
 			name:    "http scheme, hostname with basic auth creds and no port",
 			hostArg: "http://username:pass@mydomain.org/",
-			path:    GetNodeVersionPath,
+			path:    getNodeVersionPath,
 			joined:  "http://username:pass@mydomain.org/eth/v1/node/version",
 		},
 	}

api/client/beacon/health.go

@@ -1,30 +1,32 @@
-package health
+package beacon
 
 import (
 	"context"
 	"sync"
+
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/iface"
 )
 
-type healthTracker struct {
+type NodeHealthTracker struct {
 	isHealthy  *bool
 	healthChan chan bool
-	node       HealthNode
+	node       iface.HealthNode
 	sync.RWMutex
 }
 
-func NewTracker(node HealthNode) HealthTracker {
-	return &healthTracker{
+func NewNodeHealthTracker(node iface.HealthNode) *NodeHealthTracker {
+	return &NodeHealthTracker{
 		node:       node,
 		healthChan: make(chan bool, 1),
 	}
 }
 
 // HealthUpdates provides a read-only channel for health updates.
-func (n *healthTracker) HealthUpdates() <-chan bool {
+func (n *NodeHealthTracker) HealthUpdates() <-chan bool {
 	return n.healthChan
 }
 
-func (n *healthTracker) IsHealthy(_ context.Context) bool {
+func (n *NodeHealthTracker) IsHealthy() bool {
 	n.RLock()
 	defer n.RUnlock()
 	if n.isHealthy == nil {
@@ -33,7 +35,7 @@ func (n *healthTracker) IsHealthy(_ context.Context) bool {
 	return *n.isHealthy
 }
 
-func (n *healthTracker) CheckHealth(ctx context.Context) bool {
+func (n *NodeHealthTracker) CheckHealth(ctx context.Context) bool {
 	n.Lock()
 	defer n.Unlock()
 
@@ -46,13 +48,8 @@ func (n *healthTracker) CheckHealth(ctx context.Context) bool {
 	if isStatusChanged {
 		// Update the health status
 		n.isHealthy = &newStatus
-		// Send the new status to the health channel, potentially overwriting the existing value
-		select {
-		case <-n.healthChan:
-			n.healthChan <- newStatus
-		default:
-			n.healthChan <- newStatus
-		}
+		// Send the new status to the health channel
+		n.healthChan <- newStatus
 	}
 	return newStatus
 }

api/client/beacon/health/BUILD.bazel

@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "health_mock.go",
-        "interfaces.go",
-        "tracker.go",
-    ],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/health",
-    visibility = ["//visibility:public"],
-    deps = ["@org_uber_go_mock//gomock:go_default_library"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["tracker_test.go"],
-    embed = [":go_default_library"],
-    deps = ["@org_uber_go_mock//gomock:go_default_library"],
-)

api/client/beacon/health_test.go

@@ -1,17 +1,14 @@
-package health
+package beacon
 
 import (
 	"context"
 	"sync"
 	"testing"
 
+	healthTesting "github.com/prysmaticlabs/prysm/v5/api/client/beacon/testing"
 	"go.uber.org/mock/gomock"
 )
 
-var (
-	_ = HealthTracker(&MockHealthClient{})
-)
-
 func TestNodeHealth_IsHealthy(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -23,11 +20,11 @@ func TestNodeHealth_IsHealthy(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			n := &healthTracker{
+			n := &NodeHealthTracker{
 				isHealthy:  &tt.isHealthy,
 				healthChan: make(chan bool, 1),
 			}
-			if got := n.IsHealthy(context.Background()); got != tt.want {
+			if got := n.IsHealthy(); got != tt.want {
 				t.Errorf("IsHealthy() = %v, want %v", got, tt.want)
 			}
 		})
@@ -50,9 +47,9 @@ func TestNodeHealth_UpdateNodeHealth(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
-			client := NewMockHealthClient(ctrl)
+			client := healthTesting.NewMockHealthClient(ctrl)
 			client.EXPECT().IsHealthy(gomock.Any()).Return(tt.newStatus)
-			n := &healthTracker{
+			n := &NodeHealthTracker{
 				isHealthy:  &tt.initial,
 				node:       client,
 				healthChan: make(chan bool, 1),
@@ -83,13 +80,19 @@ func TestNodeHealth_UpdateNodeHealth(t *testing.T) {
 func TestNodeHealth_Concurrency(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
-	client := NewMockHealthClient(ctrl)
-	n := NewTracker(client)
+	client := healthTesting.NewMockHealthClient(ctrl)
+	n := NewNodeHealthTracker(client)
 	var wg sync.WaitGroup
 
 	// Number of goroutines to spawn for both reading and writing
 	numGoroutines := 6
 
+	go func() {
+		for range n.HealthUpdates() {
+			// Consume values to avoid blocking on channel send.
+		}
+	}()
+
 	wg.Add(numGoroutines * 2) // for readers and writers
 
 	// Concurrently update health status
@@ -107,7 +110,7 @@ func TestNodeHealth_Concurrency(t *testing.T) {
 	for i := 0; i < numGoroutines; i++ {
 		go func() {
 			defer wg.Done()
-			_ = n.IsHealthy(context.Background()) // Just read the value
+			_ = n.IsHealthy() // Just read the value
 		}()
 	}
 

api/client/beacon/iface/BUILD.bazel

@@ -2,8 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    testonly = True,
-    srcs = ["json.go"],
-    importpath = "github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/prysm/testing",
+    srcs = ["health.go"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/iface",
     visibility = ["//visibility:public"],
 )

api/client/beacon/iface/health.go

@@ -1,10 +1,10 @@
-package health
+package iface
 
 import "context"
 
 type HealthTracker interface {
 	HealthUpdates() <-chan bool
-	IsHealthy(ctx context.Context) bool
+	IsHealthy() bool
 	CheckHealth(ctx context.Context) bool
 }
 

api/client/beacon/mock/chain_client_mock.go

@@ -1,132 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/v5/validator/client/iface (interfaces: ChainClient)
-//
-// Generated by this command:
-//
-//	mockgen -package=validator_mock -destination=testing/validator-mock/chain_client_mock.go github.com/prysmaticlabs/prysm/v5/validator/client/iface ChainClient
-//
-
-// Package validator_mock is a generated GoMock package.
-package mock
-
-import (
-	context "context"
-	reflect "reflect"
-
-	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	gomock "go.uber.org/mock/gomock"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-)
-
-// MockChainClient is a mock of ChainClient interface.
-type MockChainClient struct {
-	ctrl     *gomock.Controller
-	recorder *MockChainClientMockRecorder
-}
-
-// MockChainClientMockRecorder is the mock recorder for MockChainClient.
-type MockChainClientMockRecorder struct {
-	mock *MockChainClient
-}
-
-// NewMockChainClient creates a new mock instance.
-func NewMockChainClient(ctrl *gomock.Controller) *MockChainClient {
-	mock := &MockChainClient{ctrl: ctrl}
-	mock.recorder = &MockChainClientMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockChainClient) EXPECT() *MockChainClientMockRecorder {
-	return m.recorder
-}
-
-// ChainHead mocks base method.
-func (m *MockChainClient) ChainHead(arg0 context.Context, arg1 *emptypb.Empty) (*eth.ChainHead, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ChainHead", arg0, arg1)
-	ret0, _ := ret[0].(*eth.ChainHead)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ChainHead indicates an expected call of ChainHead.
-func (mr *MockChainClientMockRecorder) ChainHead(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainHead", reflect.TypeOf((*MockChainClient)(nil).ChainHead), arg0, arg1)
-}
-
-// ValidatorBalances mocks base method.
-func (m *MockChainClient) ValidatorBalances(arg0 context.Context, arg1 *eth.ListValidatorBalancesRequest) (*eth.ValidatorBalances, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorBalances", arg0, arg1)
-	ret0, _ := ret[0].(*eth.ValidatorBalances)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorBalances indicates an expected call of ValidatorBalances.
-func (mr *MockChainClientMockRecorder) ValidatorBalances(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorBalances", reflect.TypeOf((*MockChainClient)(nil).ValidatorBalances), arg0, arg1)
-}
-
-// ValidatorParticipation mocks base method.
-func (m *MockChainClient) ValidatorParticipation(arg0 context.Context, arg1 *eth.GetValidatorParticipationRequest) (*eth.ValidatorParticipationResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorParticipation", arg0, arg1)
-	ret0, _ := ret[0].(*eth.ValidatorParticipationResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorParticipation indicates an expected call of ValidatorParticipation.
-func (mr *MockChainClientMockRecorder) ValidatorParticipation(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorParticipation", reflect.TypeOf((*MockChainClient)(nil).ValidatorParticipation), arg0, arg1)
-}
-
-// ValidatorPerformance mocks base method.
-func (m *MockChainClient) ValidatorPerformance(arg0 context.Context, arg1 *eth.ValidatorPerformanceRequest) (*eth.ValidatorPerformanceResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorPerformance", arg0, arg1)
-	ret0, _ := ret[0].(*eth.ValidatorPerformanceResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorPerformance indicates an expected call of ValidatorPerformance.
-func (mr *MockChainClientMockRecorder) ValidatorPerformance(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorPerformance", reflect.TypeOf((*MockChainClient)(nil).ValidatorPerformance), arg0, arg1)
-}
-
-// ValidatorQueue mocks base method.
-func (m *MockChainClient) ValidatorQueue(arg0 context.Context, arg1 *emptypb.Empty) (*eth.ValidatorQueue, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorQueue", arg0, arg1)
-	ret0, _ := ret[0].(*eth.ValidatorQueue)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorQueue indicates an expected call of ValidatorQueue.
-func (mr *MockChainClientMockRecorder) ValidatorQueue(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorQueue", reflect.TypeOf((*MockChainClient)(nil).ValidatorQueue), arg0, arg1)
-}
-
-// Validators mocks base method.
-func (m *MockChainClient) Validators(arg0 context.Context, arg1 *eth.ListValidatorsRequest) (*eth.Validators, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Validators", arg0, arg1)
-	ret0, _ := ret[0].(*eth.Validators)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Validators indicates an expected call of Validators.
-func (mr *MockChainClientMockRecorder) Validators(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validators", reflect.TypeOf((*MockChainClient)(nil).Validators), arg0, arg1)
-}

api/client/beacon/mock/duties_mock.go

@@ -1,102 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: validator/client/beacon-api/duties.go
-//
-// Generated by this command:
-//
-//	mockgen -package=mock -source=validator/client/beacon-api/duties.go -destination=validator/client/beacon-api/mock/duties_mock.go
-//
-
-// Package mock is a generated GoMock package.
-package mock
-
-import (
-	context "context"
-	reflect "reflect"
-
-	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	primitives "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	gomock "go.uber.org/mock/gomock"
-)
-
-// MockdutiesProvider is a mock of dutiesProvider interface.
-type MockdutiesProvider struct {
-	ctrl     *gomock.Controller
-	recorder *MockdutiesProviderMockRecorder
-}
-
-// MockdutiesProviderMockRecorder is the mock recorder for MockdutiesProvider.
-type MockdutiesProviderMockRecorder struct {
-	mock *MockdutiesProvider
-}
-
-// NewMockdutiesProvider creates a new mock instance.
-func NewMockdutiesProvider(ctrl *gomock.Controller) *MockdutiesProvider {
-	mock := &MockdutiesProvider{ctrl: ctrl}
-	mock.recorder = &MockdutiesProviderMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockdutiesProvider) EXPECT() *MockdutiesProviderMockRecorder {
-	return m.recorder
-}
-
-// AttesterDuties mocks base method.
-func (m *MockdutiesProvider) AttesterDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.AttesterDuty, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AttesterDuties", ctx, epoch, validatorIndices)
-	ret0, _ := ret[0].([]*structs.AttesterDuty)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// AttesterDuties indicates an expected call of AttesterDuties.
-func (mr *MockdutiesProviderMockRecorder) AttesterDuties(ctx, epoch, validatorIndices any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttesterDuties", reflect.TypeOf((*MockdutiesProvider)(nil).AttesterDuties), ctx, epoch, validatorIndices)
-}
-
-// Committees mocks base method.
-func (m *MockdutiesProvider) Committees(ctx context.Context, epoch primitives.Epoch) ([]*structs.Committee, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Committees", ctx, epoch)
-	ret0, _ := ret[0].([]*structs.Committee)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Committees indicates an expected call of Committees.
-func (mr *MockdutiesProviderMockRecorder) Committees(ctx, epoch any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Committees", reflect.TypeOf((*MockdutiesProvider)(nil).Committees), ctx, epoch)
-}
-
-// ProposerDuties mocks base method.
-func (m *MockdutiesProvider) ProposerDuties(ctx context.Context, epoch primitives.Epoch) ([]*structs.ProposerDuty, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ProposerDuties", ctx, epoch)
-	ret0, _ := ret[0].([]*structs.ProposerDuty)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ProposerDuties indicates an expected call of ProposerDuties.
-func (mr *MockdutiesProviderMockRecorder) ProposerDuties(ctx, epoch any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposerDuties", reflect.TypeOf((*MockdutiesProvider)(nil).ProposerDuties), ctx, epoch)
-}
-
-// SyncDuties mocks base method.
-func (m *MockdutiesProvider) SyncDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.SyncCommitteeDuty, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncDuties", ctx, epoch, validatorIndices)
-	ret0, _ := ret[0].([]*structs.SyncCommitteeDuty)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// SyncDuties indicates an expected call of SyncDuties.
-func (mr *MockdutiesProviderMockRecorder) SyncDuties(ctx, epoch, validatorIndices any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncDuties", reflect.TypeOf((*MockdutiesProvider)(nil).SyncDuties), ctx, epoch, validatorIndices)
-}

api/client/beacon/mock/node_client_mock.go

@@ -1,115 +0,0 @@
-//
-// Generated by this command:
-//
-//	mockgen -package=validator_mock -destination=testing/validator-mock/node_client_mock.go github.com/prysmaticlabs/prysm/v5/validator/client/iface NodeClient
-//
-
-// Package validator_mock is a generated GoMock package.
-package mock
-
-import (
-	context "context"
-	reflect "reflect"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/health"
-	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	gomock "go.uber.org/mock/gomock"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-)
-
-// MockNodeClient is a mock of NodeClient interface.
-type MockNodeClient struct {
-	ctrl     *gomock.Controller
-	recorder *MockNodeClientMockRecorder
-}
-
-// MockNodeClientMockRecorder is the mock recorder for MockNodeClient.
-type MockNodeClientMockRecorder struct {
-	mock *MockNodeClient
-}
-
-// NewMockNodeClient creates a new mock instance.
-func NewMockNodeClient(ctrl *gomock.Controller) *MockNodeClient {
-	mock := &MockNodeClient{ctrl: ctrl}
-	mock.recorder = &MockNodeClientMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockNodeClient) EXPECT() *MockNodeClientMockRecorder {
-	return m.recorder
-}
-
-// Genesis mocks base method.
-func (m *MockNodeClient) Genesis(arg0 context.Context, arg1 *emptypb.Empty) (*eth.Genesis, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Genesis", arg0, arg1)
-	ret0, _ := ret[0].(*eth.Genesis)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Genesis indicates an expected call of Genesis.
-func (mr *MockNodeClientMockRecorder) Genesis(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Genesis", reflect.TypeOf((*MockNodeClient)(nil).Genesis), arg0, arg1)
-}
-
-// HealthTracker mocks base method.
-func (m *MockNodeClient) HealthTracker() health.HealthTracker {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "HealthTracker")
-	ret0, _ := ret[0].(health.HealthTracker)
-	return ret0
-}
-
-// HealthTracker indicates an expected call of HealthTracker.
-func (mr *MockNodeClientMockRecorder) HealthTracker() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HealthTracker", reflect.TypeOf((*MockNodeClient)(nil).HealthTracker))
-}
-
-// Peers mocks base method.
-func (m *MockNodeClient) Peers(arg0 context.Context, arg1 *emptypb.Empty) (*eth.Peers, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Peers", arg0, arg1)
-	ret0, _ := ret[0].(*eth.Peers)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Peers indicates an expected call of Peers.
-func (mr *MockNodeClientMockRecorder) Peers(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Peers", reflect.TypeOf((*MockNodeClient)(nil).Peers), arg0, arg1)
-}
-
-// SyncStatus mocks base method.
-func (m *MockNodeClient) SyncStatus(arg0 context.Context, arg1 *emptypb.Empty) (*eth.SyncStatus, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncStatus", arg0, arg1)
-	ret0, _ := ret[0].(*eth.SyncStatus)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// SyncStatus indicates an expected call of SyncStatus.
-func (mr *MockNodeClientMockRecorder) SyncStatus(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncStatus", reflect.TypeOf((*MockNodeClient)(nil).SyncStatus), arg0, arg1)
-}
-
-// Version mocks base method.
-func (m *MockNodeClient) Version(arg0 context.Context, arg1 *emptypb.Empty) (*eth.Version, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Version", arg0, arg1)
-	ret0, _ := ret[0].(*eth.Version)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Version indicates an expected call of Version.
-func (mr *MockNodeClientMockRecorder) Version(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Version", reflect.TypeOf((*MockNodeClient)(nil).Version), arg0, arg1)
-}

api/client/beacon/mock/prysm_chain_client_mock.go

@@ -1,73 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/v5/validator/client/iface (interfaces: PrysmChainClient)
-//
-// Generated by this command:
-//
-//	mockgen -package=validator_mock -destination=testing/validator-mock/prysm_chain_client_mock.go github.com/prysmaticlabs/prysm/v5/validator/client/iface PrysmChainClient
-//
-
-// Package validator_mock is a generated GoMock package.
-package mock
-
-import (
-	context "context"
-	reflect "reflect"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	validator "github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	gomock "go.uber.org/mock/gomock"
-)
-
-// MockPrysmChainClient is a mock of PrysmChainClient interface.
-type MockPrysmChainClient struct {
-	ctrl     *gomock.Controller
-	recorder *MockPrysmChainClientMockRecorder
-}
-
-// MockPrysmChainClientMockRecorder is the mock recorder for MockPrysmChainClient.
-type MockPrysmChainClientMockRecorder struct {
-	mock *MockPrysmChainClient
-}
-
-// NewMockPrysmChainClient creates a new mock instance.
-func NewMockPrysmChainClient(ctrl *gomock.Controller) *MockPrysmChainClient {
-	mock := &MockPrysmChainClient{ctrl: ctrl}
-	mock.recorder = &MockPrysmChainClientMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockPrysmChainClient) EXPECT() *MockPrysmChainClientMockRecorder {
-	return m.recorder
-}
-
-// ValidatorCount mocks base method.
-func (m *MockPrysmChainClient) ValidatorCount(arg0 context.Context, arg1 string, arg2 []validator.Status) ([]beacon.ValidatorCount, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorCount", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]beacon.ValidatorCount)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorCount indicates an expected call of ValidatorCount.
-func (mr *MockPrysmChainClientMockRecorder) ValidatorCount(arg0, arg1, arg2 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorCount", reflect.TypeOf((*MockPrysmChainClient)(nil).ValidatorCount), arg0, arg1, arg2)
-}
-
-// ValidatorPerformance mocks base method.
-func (m *MockPrysmChainClient) ValidatorPerformance(arg0 context.Context, arg1 *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorPerformance", arg0, arg1)
-	ret0, _ := ret[0].(*ethpb.ValidatorPerformanceResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ValidatorPerformance indicates an expected call of ValidatorPerformance.
-func (mr *MockPrysmChainClientMockRecorder) ValidatorPerformance(arg0, arg1 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorCount", reflect.TypeOf((*MockPrysmChainClient)(nil).ValidatorPerformance), arg0, arg1)
-}

api/client/beacon/mock/state_validators_mock.go

@@ -1,87 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: validator/client/beacon-api/state_validators.go
-//
-// Generated by this command:
-//
-//	mockgen -package=mock -source=validator/client/beacon-api/state_validators.go -destination=validator/client/beacon-api/mock/state_validators_mock.go
-//
-
-// Package mock is a generated GoMock package.
-package mock
-
-import (
-	context "context"
-	reflect "reflect"
-
-	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	primitives "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	gomock "go.uber.org/mock/gomock"
-)
-
-// MockStateValidatorsProvider is a mock of StateValidatorsProvider interface.
-type MockStateValidatorsProvider struct {
-	ctrl     *gomock.Controller
-	recorder *MockStateValidatorsProviderMockRecorder
-}
-
-// MockStateValidatorsProviderMockRecorder is the mock recorder for MockStateValidatorsProvider.
-type MockStateValidatorsProviderMockRecorder struct {
-	mock *MockStateValidatorsProvider
-}
-
-// NewMockStateValidatorsProvider creates a new mock instance.
-func NewMockStateValidatorsProvider(ctrl *gomock.Controller) *MockStateValidatorsProvider {
-	mock := &MockStateValidatorsProvider{ctrl: ctrl}
-	mock.recorder = &MockStateValidatorsProviderMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockStateValidatorsProvider) EXPECT() *MockStateValidatorsProviderMockRecorder {
-	return m.recorder
-}
-
-// StateValidators mocks base method.
-func (m *MockStateValidatorsProvider) StateValidators(arg0 context.Context, arg1 []string, arg2 []primitives.ValidatorIndex, arg3 []string) (*structs.GetValidatorsResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateValidators", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(*structs.GetValidatorsResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateValidators indicates an expected call of StateValidators.
-func (mr *MockStateValidatorsProviderMockRecorder) StateValidators(arg0, arg1, arg2, arg3 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateValidators", reflect.TypeOf((*MockStateValidatorsProvider)(nil).StateValidators), arg0, arg1, arg2, arg3)
-}
-
-// StateValidatorsForHead mocks base method.
-func (m *MockStateValidatorsProvider) StateValidatorsForHead(arg0 context.Context, arg1 []string, arg2 []primitives.ValidatorIndex, arg3 []string) (*structs.GetValidatorsResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateValidatorsForHead", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(*structs.GetValidatorsResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateValidatorsForHead indicates an expected call of StateValidatorsForHead.
-func (mr *MockStateValidatorsProviderMockRecorder) StateValidatorsForHead(arg0, arg1, arg2, arg3 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateValidatorsForHead", reflect.TypeOf((*MockStateValidatorsProvider)(nil).StateValidatorsForHead), arg0, arg1, arg2, arg3)
-}
-
-// StateValidatorsForSlot mocks base method.
-func (m *MockStateValidatorsProvider) StateValidatorsForSlot(arg0 context.Context, arg1 primitives.Slot, arg2 []string, arg3 []primitives.ValidatorIndex, arg4 []string) (*structs.GetValidatorsResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateValidatorsForSlot", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(*structs.GetValidatorsResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateValidatorsForSlot indicates an expected call of StateValidatorsForSlot.
-func (mr *MockStateValidatorsProviderMockRecorder) StateValidatorsForSlot(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateValidatorsForSlot", reflect.TypeOf((*MockStateValidatorsProvider)(nil).StateValidatorsForSlot), arg0, arg1, arg2, arg3, arg4)
-}

api/client/beacon/node/BUILD.bazel

@@ -1,44 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "client.go",
-        "grpc_node_client.go",
-        "interfaces.go",
-        "rest_client.go",
-    ],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/node",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//api/client:go_default_library",
-        "//api/client/beacon/health:go_default_library",
-        "//api/client/beacon/shared_providers:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//config/features:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//validator/helpers:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@com_github_golang_protobuf//ptypes/empty",
-        "@com_github_pkg_errors//:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
-        "@org_golang_google_grpc//:go_default_library",
-        "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["rest_client_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//api/client/beacon/mock:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//testing/assert:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
-        "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
-        "@org_uber_go_mock//gomock:go_default_library",
-    ],
-)

api/client/beacon/node/client.go

@@ -1,28 +0,0 @@
-package node
-
-import (
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/health"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	validatorHelpers "github.com/prysmaticlabs/prysm/v5/validator/helpers"
-)
-
-func NewClient(validatorConn validatorHelpers.NodeConnection, jsonRestHandler client.JsonRestHandler) Client {
-	grpcClient := NewNodeClient(validatorConn.GetGrpcClientConn())
-	if features.Get().EnableBeaconRESTApi {
-		return NewNodeClientWithFallback(jsonRestHandler, grpcClient)
-	} else {
-		return grpcClient
-	}
-}
-
-func NewNodeClientWithFallback(jsonRestHandler client.JsonRestHandler, fallbackClient Client) Client {
-	b := &beaconapiNodeClient{
-		jsonRestHandler: jsonRestHandler,
-		fallbackClient:  fallbackClient,
-		genesisProvider: shared_providers.NewGenesis(jsonRestHandler),
-	}
-	b.healthTracker = health.NewTracker(b)
-	return b
-}

api/client/beacon/node/grpc_node_client.go

@@ -1,55 +0,0 @@
-package node
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/health"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	log "github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-)
-
-var (
-	_ = Client(&grpcNodeClient{})
-)
-
-type grpcNodeClient struct {
-	nodeClient    ethpb.NodeClient
-	healthTracker health.HealthTracker
-}
-
-func (c *grpcNodeClient) SyncStatus(ctx context.Context, in *empty.Empty) (*ethpb.SyncStatus, error) {
-	return c.nodeClient.GetSyncStatus(ctx, in)
-}
-
-func (c *grpcNodeClient) Genesis(ctx context.Context, in *empty.Empty) (*ethpb.Genesis, error) {
-	return c.nodeClient.GetGenesis(ctx, in)
-}
-
-func (c *grpcNodeClient) Version(ctx context.Context, in *empty.Empty) (*ethpb.Version, error) {
-	return c.nodeClient.GetVersion(ctx, in)
-}
-
-func (c *grpcNodeClient) Peers(ctx context.Context, in *empty.Empty) (*ethpb.Peers, error) {
-	return c.nodeClient.ListPeers(ctx, in)
-}
-
-func (c *grpcNodeClient) IsHealthy(ctx context.Context) bool {
-	_, err := c.nodeClient.GetHealth(ctx, &ethpb.HealthRequest{})
-	if err != nil {
-		log.WithError(err).Debug("failed to get health of node")
-		return false
-	}
-	return true
-}
-
-func (c *grpcNodeClient) HealthTracker() health.HealthTracker {
-	return c.healthTracker
-}
-
-func NewNodeClient(cc grpc.ClientConnInterface) Client {
-	g := &grpcNodeClient{nodeClient: ethpb.NewNodeClient(cc)}
-	g.healthTracker = health.NewTracker(g)
-	return g
-}

api/client/beacon/node/interfaces.go

@@ -1,17 +0,0 @@
-package node
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/health"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type Client interface {
-	SyncStatus(ctx context.Context, in *empty.Empty) (*ethpb.SyncStatus, error)
-	Genesis(ctx context.Context, in *empty.Empty) (*ethpb.Genesis, error)
-	Version(ctx context.Context, in *empty.Empty) (*ethpb.Version, error)
-	Peers(ctx context.Context, in *empty.Empty) (*ethpb.Peers, error)
-	HealthTracker() health.HealthTracker
-}

api/client/beacon/prysm_api/client.go

@@ -1,30 +0,0 @@
-package prysm_api
-
-import (
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/chain"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/node"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	validatorHelpers "github.com/prysmaticlabs/prysm/v5/validator/helpers"
-	"google.golang.org/grpc"
-)
-
-func NewClient(validatorConn validatorHelpers.NodeConnection, jsonRestHandler client.JsonRestHandler) Client {
-	if features.Get().EnableBeaconRESTApi {
-		return NewPrysmChainRestClient(jsonRestHandler, node.NewClient(validatorConn, jsonRestHandler))
-	} else {
-		return NewGrpcPrysmChainClient(validatorConn.GetGrpcClientConn())
-	}
-}
-
-// NewPrysmChainClient returns implementation of Client.
-func NewPrysmChainRestClient(jsonRestHandler client.JsonRestHandler, nodeClient node.Client) Client {
-	return prysmChainClient{
-		jsonRestHandler: jsonRestHandler,
-		nodeClient:      nodeClient,
-	}
-}
-
-func NewGrpcPrysmChainClient(cc grpc.ClientConnInterface) Client {
-	return &grpcPrysmChainClient{chainClient: chain.NewGrpcChainClient(cc)}
-}

api/client/beacon/prysm_api/interfaces.go

@@ -1,15 +0,0 @@
-package prysm_api
-
-import (
-	"context"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-// Client defines an interface required to implement all the prysm specific custom endpoints.
-type Client interface {
-	ValidatorCount(context.Context, string, []validator.Status) ([]beacon.ValidatorCount, error)
-	ValidatorPerformance(context.Context, *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error)
-}

api/client/beacon/prysm_api/rest_client.go

@@ -1,108 +0,0 @@
-package prysm_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	neturl "net/url"
-	"strconv"
-	"strings"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/node"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	validator2 "github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type prysmChainClient struct {
-	jsonRestHandler client.JsonRestHandler
-	nodeClient      node.Client
-}
-
-func (c prysmChainClient) ValidatorCount(ctx context.Context, stateID string, statuses []validator2.Status) ([]beacon.ValidatorCount, error) {
-	// Check node version for prysm beacon node as it is a custom endpoint for prysm beacon node.
-	nodeVersion, err := c.nodeClient.Version(ctx, nil)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get node version")
-	}
-
-	if !strings.Contains(strings.ToLower(nodeVersion.Version), "prysm") {
-		return nil, client.ErrNotSupported
-	}
-
-	queryParams := neturl.Values{}
-	for _, status := range statuses {
-		queryParams.Add("status", status.String())
-	}
-
-	queryUrl := apiutil.BuildURL(fmt.Sprintf("/eth/v1/beacon/states/%s/validator_count", stateID), queryParams)
-
-	var validatorCountResponse structs.GetValidatorCountResponse
-	if err = c.jsonRestHandler.Get(ctx, queryUrl, &validatorCountResponse); err != nil {
-		return nil, err
-	}
-
-	if validatorCountResponse.Data == nil {
-		return nil, errors.New("validator count data is nil")
-	}
-
-	if len(statuses) != 0 && len(statuses) != len(validatorCountResponse.Data) {
-		return nil, errors.New("mismatch between validator count data and the number of statuses provided")
-	}
-
-	var resp []beacon.ValidatorCount
-	for _, vc := range validatorCountResponse.Data {
-		count, err := strconv.ParseUint(vc.Count, 10, 64)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to parse validator count %s", vc.Count)
-		}
-
-		resp = append(resp, beacon.ValidatorCount{
-			Status: vc.Status,
-			Count:  count,
-		})
-	}
-
-	return resp, nil
-}
-
-func (c prysmChainClient) ValidatorPerformance(ctx context.Context, in *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error) {
-	// Check node version for prysm beacon node as it is a custom endpoint for prysm beacon node.
-	nodeVersion, err := c.nodeClient.Version(ctx, nil)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get node version")
-	}
-
-	if !strings.Contains(strings.ToLower(nodeVersion.Version), "prysm") {
-		return nil, client.ErrNotSupported
-	}
-
-	request, err := json.Marshal(structs.GetValidatorPerformanceRequest{
-		PublicKeys: in.PublicKeys,
-		Indices:    in.Indices,
-	})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal request")
-	}
-	resp := &structs.GetValidatorPerformanceResponse{}
-	if err = c.jsonRestHandler.Post(ctx, "/prysm/validators/performance", nil, bytes.NewBuffer(request), resp); err != nil {
-		return nil, err
-	}
-
-	return &ethpb.ValidatorPerformanceResponse{
-		CurrentEffectiveBalances:      resp.CurrentEffectiveBalances,
-		CorrectlyVotedSource:          resp.CorrectlyVotedSource,
-		CorrectlyVotedTarget:          resp.CorrectlyVotedTarget,
-		CorrectlyVotedHead:            resp.CorrectlyVotedHead,
-		BalancesBeforeEpochTransition: resp.BalancesBeforeEpochTransition,
-		BalancesAfterEpochTransition:  resp.BalancesAfterEpochTransition,
-		MissingValidators:             resp.MissingValidators,
-		PublicKeys:                    resp.PublicKeys,
-		InactivityScores:              resp.InactivityScores,
-	}, nil
-}

api/client/beacon/shared_providers/BUILD.bazel

@@ -1,42 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "duties.go",
-        "genesis.go",
-        "interfaces.go",
-        "providers.go",
-        "state_validators.go",
-    ],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//api/client:go_default_library",
-        "//api/client/apiutil:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//consensus-types/primitives:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "duties_test.go",
-        "genesis_test.go",
-        "state_validators_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//api/client/apiutil:go_default_library",
-        "//api/client/beacon/mock:go_default_library",
-        "//api/server/structs:go_default_library",
-        "//consensus-types/primitives:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-        "@org_uber_go_mock//gomock:go_default_library",
-    ],
-)

api/client/beacon/shared_providers/duties.go

@@ -1,132 +0,0 @@
-package shared_providers
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"strconv"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-)
-
-type dutiesProvider struct {
-	jsonRestHandler client.JsonRestHandler
-}
-
-// Committees retrieves the committees for the given epoch
-func (c dutiesProvider) Committees(ctx context.Context, epoch primitives.Epoch) ([]*structs.Committee, error) {
-	committeeParams := url.Values{}
-	committeeParams.Add("epoch", strconv.FormatUint(uint64(epoch), 10))
-	committeesRequest := apiutil.BuildURL("/eth/v1/beacon/states/head/committees", committeeParams)
-
-	var stateCommittees structs.GetCommitteesResponse
-	if err := c.jsonRestHandler.Get(ctx, committeesRequest, &stateCommittees); err != nil {
-		return nil, err
-	}
-
-	if stateCommittees.Data == nil {
-		return nil, errors.New("state committees data is nil")
-	}
-
-	for index, committee := range stateCommittees.Data {
-		if committee == nil {
-			return nil, errors.Errorf("committee at index `%d` is nil", index)
-		}
-	}
-
-	return stateCommittees.Data, nil
-}
-
-// AttesterDuties retrieves the attester duties for the given epoch and validatorIndices
-func (c dutiesProvider) AttesterDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.AttesterDuty, error) {
-	jsonValidatorIndices := make([]string, len(validatorIndices))
-	for index, validatorIndex := range validatorIndices {
-		jsonValidatorIndices[index] = strconv.FormatUint(uint64(validatorIndex), 10)
-	}
-
-	validatorIndicesBytes, err := json.Marshal(jsonValidatorIndices)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal validator indices")
-	}
-
-	attesterDuties := &structs.GetAttesterDutiesResponse{}
-	if err = c.jsonRestHandler.Post(
-		ctx,
-		fmt.Sprintf("/eth/v1/validator/duties/attester/%d", epoch),
-		nil,
-		bytes.NewBuffer(validatorIndicesBytes),
-		attesterDuties,
-	); err != nil {
-		return nil, err
-	}
-
-	for index, attesterDuty := range attesterDuties.Data {
-		if attesterDuty == nil {
-			return nil, errors.Errorf("attester duty at index `%d` is nil", index)
-		}
-	}
-
-	return attesterDuties.Data, nil
-}
-
-// ProposerDuties retrieves the proposer duties for the given epoch
-func (c dutiesProvider) ProposerDuties(ctx context.Context, epoch primitives.Epoch) ([]*structs.ProposerDuty, error) {
-	proposerDuties := structs.GetProposerDutiesResponse{}
-	if err := c.jsonRestHandler.Get(ctx, fmt.Sprintf("/eth/v1/validator/duties/proposer/%d", epoch), &proposerDuties); err != nil {
-		return nil, err
-	}
-
-	if proposerDuties.Data == nil {
-		return nil, errors.New("proposer duties data is nil")
-	}
-
-	for index, proposerDuty := range proposerDuties.Data {
-		if proposerDuty == nil {
-			return nil, errors.Errorf("proposer duty at index `%d` is nil", index)
-		}
-	}
-
-	return proposerDuties.Data, nil
-}
-
-// SyncDuties retrieves the sync committee duties for the given epoch and validatorIndices
-func (c dutiesProvider) SyncDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.SyncCommitteeDuty, error) {
-	jsonValidatorIndices := make([]string, len(validatorIndices))
-	for index, validatorIndex := range validatorIndices {
-		jsonValidatorIndices[index] = strconv.FormatUint(uint64(validatorIndex), 10)
-	}
-
-	validatorIndicesBytes, err := json.Marshal(jsonValidatorIndices)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal validator indices")
-	}
-
-	syncDuties := structs.GetSyncCommitteeDutiesResponse{}
-	if err = c.jsonRestHandler.Post(
-		ctx,
-		fmt.Sprintf("/eth/v1/validator/duties/sync/%d", epoch),
-		nil,
-		bytes.NewBuffer(validatorIndicesBytes),
-		&syncDuties,
-	); err != nil {
-		return nil, err
-	}
-
-	if syncDuties.Data == nil {
-		return nil, errors.New("sync duties data is nil")
-	}
-
-	for index, syncDuty := range syncDuties.Data {
-		if syncDuty == nil {
-			return nil, errors.Errorf("sync duty at index `%d` is nil", index)
-		}
-	}
-
-	return syncDuties.Data, nil
-}

api/client/beacon/shared_providers/duties_test.go

@@ -1,508 +0,0 @@
-package shared_providers
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-const getAttesterDutiesTestEndpoint = "/eth/v1/validator/duties/attester"
-const getProposerDutiesTestEndpoint = "/eth/v1/validator/duties/proposer"
-const getSyncDutiesTestEndpoint = "/eth/v1/validator/duties/sync"
-const getCommitteesTestEndpoint = "/eth/v1/beacon/states/head/committees"
-
-func TestGetAttesterDuties_Valid(t *testing.T) {
-	stringValidatorIndices := []string{"2", "9"}
-	const epoch = primitives.Epoch(1)
-
-	validatorIndicesBytes, err := json.Marshal(stringValidatorIndices)
-	require.NoError(t, err)
-
-	expectedAttesterDuties := structs.GetAttesterDutiesResponse{
-		Data: []*structs.AttesterDuty{
-			{
-				Pubkey:                  hexutil.Encode([]byte{1}),
-				ValidatorIndex:          "2",
-				CommitteeIndex:          "3",
-				CommitteeLength:         "4",
-				CommitteesAtSlot:        "5",
-				ValidatorCommitteeIndex: "6",
-				Slot:                    "7",
-			},
-			{
-				Pubkey:                  hexutil.Encode([]byte{8}),
-				ValidatorIndex:          "9",
-				CommitteeIndex:          "10",
-				CommitteeLength:         "11",
-				CommitteesAtSlot:        "12",
-				ValidatorCommitteeIndex: "13",
-				Slot:                    "14",
-			},
-		},
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	validatorIndices := []primitives.ValidatorIndex{2, 9}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getAttesterDutiesTestEndpoint, epoch),
-		nil,
-		bytes.NewBuffer(validatorIndicesBytes),
-		&structs.GetAttesterDutiesResponse{},
-	).Return(
-		nil,
-	).SetArg(
-		4,
-		expectedAttesterDuties,
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	attesterDuties, err := dutiesProvider.AttesterDuties(ctx, epoch, validatorIndices)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedAttesterDuties.Data, attesterDuties)
-}
-
-func TestGetAttesterDuties_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getAttesterDutiesTestEndpoint, epoch),
-		gomock.Any(),
-		gomock.Any(),
-		gomock.Any(),
-	).Return(
-		errors.New("foo error"),
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.AttesterDuties(ctx, epoch, nil)
-	assert.ErrorContains(t, "foo error", err)
-}
-
-func TestGetAttesterDuties_NilAttesterDuty(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getAttesterDutiesTestEndpoint, epoch),
-		gomock.Any(),
-		gomock.Any(),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		4,
-		structs.GetAttesterDutiesResponse{
-			Data: []*structs.AttesterDuty{nil},
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.AttesterDuties(ctx, epoch, nil)
-	assert.ErrorContains(t, "attester duty at index `0` is nil", err)
-}
-
-func TestGetProposerDuties_Valid(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	expectedProposerDuties := structs.GetProposerDutiesResponse{
-		Data: []*structs.ProposerDuty{
-			{
-				Pubkey:         hexutil.Encode([]byte{1}),
-				ValidatorIndex: "2",
-				Slot:           "3",
-			},
-			{
-				Pubkey:         hexutil.Encode([]byte{4}),
-				ValidatorIndex: "5",
-				Slot:           "6",
-			},
-		},
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getProposerDutiesTestEndpoint, epoch),
-		&structs.GetProposerDutiesResponse{},
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		expectedProposerDuties,
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	proposerDuties, err := dutiesProvider.ProposerDuties(ctx, epoch)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedProposerDuties.Data, proposerDuties)
-}
-
-func TestGetProposerDuties_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getProposerDutiesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		errors.New("foo error"),
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.ProposerDuties(ctx, epoch)
-	assert.ErrorContains(t, "foo error", err)
-}
-
-func TestGetProposerDuties_NilData(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getProposerDutiesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		structs.GetProposerDutiesResponse{
-			Data: nil,
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.ProposerDuties(ctx, epoch)
-	assert.ErrorContains(t, "proposer duties data is nil", err)
-}
-
-func TestGetProposerDuties_NilProposerDuty(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getProposerDutiesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		structs.GetProposerDutiesResponse{
-			Data: []*structs.ProposerDuty{nil},
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.ProposerDuties(ctx, epoch)
-	assert.ErrorContains(t, "proposer duty at index `0` is nil", err)
-}
-
-func TestGetSyncDuties_Valid(t *testing.T) {
-	stringValidatorIndices := []string{"2", "6"}
-	const epoch = primitives.Epoch(1)
-
-	validatorIndicesBytes, err := json.Marshal(stringValidatorIndices)
-	require.NoError(t, err)
-
-	expectedSyncDuties := structs.GetSyncCommitteeDutiesResponse{
-		Data: []*structs.SyncCommitteeDuty{
-			{
-				Pubkey:         hexutil.Encode([]byte{1}),
-				ValidatorIndex: "2",
-				ValidatorSyncCommitteeIndices: []string{
-					"3",
-					"4",
-				},
-			},
-			{
-				Pubkey:         hexutil.Encode([]byte{5}),
-				ValidatorIndex: "6",
-				ValidatorSyncCommitteeIndices: []string{
-					"7",
-					"8",
-				},
-			},
-		},
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	validatorIndices := []primitives.ValidatorIndex{2, 6}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getSyncDutiesTestEndpoint, epoch),
-		nil,
-		bytes.NewBuffer(validatorIndicesBytes),
-		&structs.GetSyncCommitteeDutiesResponse{},
-	).Return(
-		nil,
-	).SetArg(
-		4,
-		expectedSyncDuties,
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	syncDuties, err := dutiesProvider.SyncDuties(ctx, epoch, validatorIndices)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedSyncDuties.Data, syncDuties)
-}
-
-func TestGetSyncDuties_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getSyncDutiesTestEndpoint, epoch),
-		gomock.Any(),
-		gomock.Any(),
-		gomock.Any(),
-	).Return(
-		errors.New("foo error"),
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.SyncDuties(ctx, epoch, nil)
-	assert.ErrorContains(t, "foo error", err)
-}
-
-func TestGetSyncDuties_NilData(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getSyncDutiesTestEndpoint, epoch),
-		gomock.Any(),
-		gomock.Any(),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		4,
-		structs.GetSyncCommitteeDutiesResponse{
-			Data: nil,
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.SyncDuties(ctx, epoch, nil)
-	assert.ErrorContains(t, "sync duties data is nil", err)
-}
-
-func TestGetSyncDuties_NilSyncDuty(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		fmt.Sprintf("%s/%d", getSyncDutiesTestEndpoint, epoch),
-		gomock.Any(),
-		gomock.Any(),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		4,
-		structs.GetSyncCommitteeDutiesResponse{
-			Data: []*structs.SyncCommitteeDuty{nil},
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.SyncDuties(ctx, epoch, nil)
-	assert.ErrorContains(t, "sync duty at index `0` is nil", err)
-}
-
-func TestGetCommittees_Valid(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	expectedCommittees := structs.GetCommitteesResponse{
-		Data: []*structs.Committee{
-			{
-				Index: "1",
-				Slot:  "2",
-				Validators: []string{
-					"3",
-					"4",
-				},
-			},
-			{
-				Index: "5",
-				Slot:  "6",
-				Validators: []string{
-					"7",
-					"8",
-				},
-			},
-		},
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?epoch=%d", getCommitteesTestEndpoint, epoch),
-		&structs.GetCommitteesResponse{},
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		expectedCommittees,
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	committees, err := dutiesProvider.Committees(ctx, epoch)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedCommittees.Data, committees)
-}
-
-func TestGetCommittees_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?epoch=%d", getCommitteesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		errors.New("foo error"),
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.Committees(ctx, epoch)
-	assert.ErrorContains(t, "foo error", err)
-}
-
-func TestGetCommittees_NilData(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?epoch=%d", getCommitteesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		structs.GetCommitteesResponse{
-			Data: nil,
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.Committees(ctx, epoch)
-	assert.ErrorContains(t, "state committees data is nil", err)
-}
-
-func TestGetCommittees_NilCommittee(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?epoch=%d", getCommitteesTestEndpoint, epoch),
-		gomock.Any(),
-	).Return(
-		nil,
-	).SetArg(
-		2,
-		structs.GetCommitteesResponse{
-			Data: []*structs.Committee{nil},
-		},
-	).Times(1)
-
-	dutiesProvider := &dutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.Committees(ctx, epoch)
-	assert.ErrorContains(t, "committee at index `0` is nil", err)
-}

api/client/beacon/shared_providers/genesis.go

@@ -1,38 +0,0 @@
-package shared_providers
-
-import (
-	"context"
-	"sync"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-)
-
-type genesisProvider struct {
-	jsonRestHandler client.JsonRestHandler
-	genesis         *structs.Genesis
-	once            sync.Once
-}
-
-// GetGenesis gets the genesis information from the beacon node via the /eth/v1/beacon/genesis endpoint
-func (c *genesisProvider) Genesis(ctx context.Context) (*structs.Genesis, error) {
-	genesisJson := &structs.GetGenesisResponse{}
-	var doErr error
-	c.once.Do(func() {
-		if err := c.jsonRestHandler.Get(ctx, "/eth/v1/beacon/genesis", genesisJson); err != nil {
-			doErr = err
-			return
-		}
-		if genesisJson.Data == nil {
-			doErr = errors.New("genesis data is nil")
-			return
-		}
-		c.genesis = genesisJson.Data
-	})
-	if doErr != nil {
-		// Allow another call because the current one returned an error
-		c.once = sync.Once{}
-	}
-	return c.genesis, doErr
-}

api/client/beacon/shared_providers/interfaces.go

@@ -1,25 +0,0 @@
-package shared_providers
-
-import (
-	"context"
-
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-)
-
-type Genesis interface {
-	Genesis(ctx context.Context) (*structs.Genesis, error)
-}
-
-type StateValidators interface {
-	StateValidators(context.Context, []string, []primitives.ValidatorIndex, []string) (*structs.GetValidatorsResponse, error)
-	StateValidatorsForSlot(context.Context, primitives.Slot, []string, []primitives.ValidatorIndex, []string) (*structs.GetValidatorsResponse, error)
-	StateValidatorsForHead(context.Context, []string, []primitives.ValidatorIndex, []string) (*structs.GetValidatorsResponse, error)
-}
-
-type Duties interface {
-	AttesterDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.AttesterDuty, error)
-	ProposerDuties(ctx context.Context, epoch primitives.Epoch) ([]*structs.ProposerDuty, error)
-	SyncDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) ([]*structs.SyncCommitteeDuty, error)
-	Committees(ctx context.Context, epoch primitives.Epoch) ([]*structs.Committee, error)
-}

api/client/beacon/shared_providers/providers.go

@@ -1,17 +0,0 @@
-package shared_providers
-
-import (
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-)
-
-func NewStateValidators(jsonRestHandler client.JsonRestHandler) StateValidators {
-	return &stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
-}
-
-func NewDuties(jsonRestHandler client.JsonRestHandler) Duties {
-	return &dutiesProvider{jsonRestHandler: jsonRestHandler}
-}
-
-func NewGenesis(jsonRestHandler client.JsonRestHandler) Genesis {
-	return &genesisProvider{jsonRestHandler: jsonRestHandler}
-}

api/client/beacon/structs.go

@@ -1,145 +0,0 @@
-package beacon
-
-import (
-	"encoding/json"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type BeaconCommitteeSelection struct {
-	SelectionProof []byte
-	Slot           primitives.Slot
-	ValidatorIndex primitives.ValidatorIndex
-}
-
-type beaconCommitteeSelectionJson struct {
-	SelectionProof string `json:"selection_proof"`
-	Slot           string `json:"slot"`
-	ValidatorIndex string `json:"validator_index"`
-}
-
-func (b *BeaconCommitteeSelection) MarshalJSON() ([]byte, error) {
-	return json.Marshal(beaconCommitteeSelectionJson{
-		SelectionProof: hexutil.Encode(b.SelectionProof),
-		Slot:           strconv.FormatUint(uint64(b.Slot), 10),
-		ValidatorIndex: strconv.FormatUint(uint64(b.ValidatorIndex), 10),
-	})
-}
-
-func (b *BeaconCommitteeSelection) UnmarshalJSON(input []byte) error {
-	var bjson beaconCommitteeSelectionJson
-	err := json.Unmarshal(input, &bjson)
-	if err != nil {
-		return errors.Wrap(err, "failed to unmarshal beacon committee selection")
-	}
-
-	slot, err := strconv.ParseUint(bjson.Slot, 10, 64)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse slot")
-	}
-
-	vIdx, err := strconv.ParseUint(bjson.ValidatorIndex, 10, 64)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse validator index")
-	}
-
-	selectionProof, err := hexutil.Decode(bjson.SelectionProof)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse selection proof")
-	}
-
-	b.Slot = primitives.Slot(slot)
-	b.SelectionProof = selectionProof
-	b.ValidatorIndex = primitives.ValidatorIndex(vIdx)
-
-	return nil
-}
-
-type SyncCommitteeSelection struct {
-	SelectionProof    []byte
-	Slot              primitives.Slot
-	SubcommitteeIndex primitives.CommitteeIndex
-	ValidatorIndex    primitives.ValidatorIndex
-}
-
-type syncCommitteeSelectionJson struct {
-	SelectionProof    string `json:"selection_proof"`
-	Slot              string `json:"slot"`
-	SubcommitteeIndex string `json:"subcommittee_index"`
-	ValidatorIndex    string `json:"validator_index"`
-}
-
-func (s *SyncCommitteeSelection) MarshalJSON() ([]byte, error) {
-	return json.Marshal(syncCommitteeSelectionJson{
-		SelectionProof:    hexutil.Encode(s.SelectionProof),
-		Slot:              strconv.FormatUint(uint64(s.Slot), 10),
-		SubcommitteeIndex: strconv.FormatUint(uint64(s.SubcommitteeIndex), 10),
-		ValidatorIndex:    strconv.FormatUint(uint64(s.ValidatorIndex), 10),
-	})
-}
-
-func (s *SyncCommitteeSelection) UnmarshalJSON(input []byte) error {
-	var resJson syncCommitteeSelectionJson
-	err := json.Unmarshal(input, &resJson)
-	if err != nil {
-		return errors.Wrap(err, "failed to unmarshal sync committee selection")
-	}
-
-	slot, err := strconv.ParseUint(resJson.Slot, 10, 64)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse slot")
-	}
-
-	vIdx, err := strconv.ParseUint(resJson.ValidatorIndex, 10, 64)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse validator index")
-	}
-
-	subcommIdx, err := strconv.ParseUint(resJson.SubcommitteeIndex, 10, 64)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse subcommittee index")
-	}
-
-	selectionProof, err := hexutil.Decode(resJson.SelectionProof)
-	if err != nil {
-		return errors.Wrap(err, "failed to parse selection proof")
-	}
-
-	s.Slot = primitives.Slot(slot)
-	s.SelectionProof = selectionProof
-	s.ValidatorIndex = primitives.ValidatorIndex(vIdx)
-	s.SubcommitteeIndex = primitives.CommitteeIndex(subcommIdx)
-
-	return nil
-}
-
-type AggregatedSelectionResponse struct {
-	Data []BeaconCommitteeSelection `json:"data"`
-}
-
-type AggregatedSyncSelectionResponse struct {
-	Data []SyncCommitteeSelection `json:"data"`
-}
-
-type AttesterDuty struct {
-	CommitteeIndex          primitives.CommitteeIndex
-	Slot                    primitives.Slot
-	CommitteeLength         uint64
-	ValidatorCommitteeIndex uint64
-	CommitteesAtSlot        uint64
-}
-
-type ValidatorForDuty struct {
-	Pubkey []byte
-	Index  primitives.ValidatorIndex
-	Status ethpb.ValidatorStatus
-}
-
-type ValidatorCount struct {
-	Status string
-	Count  uint64
-}

api/client/beacon/template.go

@@ -1,34 +0,0 @@
-package beacon
-
-import (
-	"bytes"
-	"fmt"
-	"text/template"
-)
-
-type templateFn func(StateOrBlockId) string
-
-var getBlockRootTpl templateFn
-var getForkTpl templateFn
-
-func init() {
-	// idTemplate is used to create template functions that can interpolate StateOrBlockId values.
-	idTemplate := func(ts string) func(StateOrBlockId) string {
-		t := template.Must(template.New("").Parse(ts))
-		f := func(id StateOrBlockId) string {
-			b := bytes.NewBuffer(nil)
-			err := t.Execute(b, struct{ Id string }{Id: string(id)})
-			if err != nil {
-				panic(fmt.Sprintf("invalid idTemplate: %s", ts))
-			}
-			return b.String()
-		}
-		// run the template to ensure that it is valid
-		// this should happen load time (using package scoped vars) to ensure runtime errors aren't possible
-		_ = f(IdGenesis)
-		return f
-	}
-
-	getBlockRootTpl = idTemplate(getBlockRootPath)
-	getForkTpl = idTemplate(getForkForStatePath)
-}

api/client/beacon/testing/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@prysm//tools/go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["mock.go"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/testing",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//api/client/beacon/iface:go_default_library",
+        "@org_uber_go_mock//gomock:go_default_library",
+    ],
+)

api/client/beacon/testing/mock.go

@@ -1,26 +1,21 @@
-package health
+package testing
 
 import (
 	"context"
 	"reflect"
-	"sync"
 
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/iface"
 	"go.uber.org/mock/gomock"
 )
 
-// NewMockHealthClient creates a new mock instance.
-func NewMockHealthClient(ctrl *gomock.Controller) *MockHealthClient {
-	mock := &MockHealthClient{ctrl: ctrl}
-	mock.recorder = &MockHealthClientMockRecorder{mock}
-	return mock
-}
+var (
+	_ = iface.HealthNode(&MockHealthClient{})
+)
 
 // MockHealthClient is a mock of HealthClient interface.
 type MockHealthClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockHealthClientMockRecorder
-	Health   bool
-	sync.Mutex
 }
 
 // MockHealthClientMockRecorder is the mock recorder for MockHealthClient.
@@ -30,8 +25,6 @@ type MockHealthClientMockRecorder struct {
 
 // IsHealthy mocks base method.
 func (m *MockHealthClient) IsHealthy(arg0 context.Context) bool {
-	m.Lock()
-	defer m.Unlock()
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "IsHealthy", arg0)
 	ret0, ok := ret[0].(bool)
@@ -41,16 +34,6 @@ func (m *MockHealthClient) IsHealthy(arg0 context.Context) bool {
 	return ret0
 }
 
-func (m *MockHealthClient) HealthUpdates() <-chan bool {
-	ch := make(chan bool, 2)
-	ch <- m.Health
-	return ch
-}
-
-func (m *MockHealthClient) CheckHealth(_ context.Context) bool {
-	return m.Health
-}
-
 // EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockHealthClient) EXPECT() *MockHealthClientMockRecorder {
 	return m.recorder
@@ -58,8 +41,13 @@ func (m *MockHealthClient) EXPECT() *MockHealthClientMockRecorder {
 
 // IsHealthy indicates an expected call of IsHealthy.
 func (mr *MockHealthClientMockRecorder) IsHealthy(arg0 any) *gomock.Call {
-	mr.mock.Lock()
-	defer mr.mock.Unlock()
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHealthy", reflect.TypeOf((*MockHealthClient)(nil).IsHealthy), arg0)
 }
+
+// NewMockHealthClient creates a new mock instance.
+func NewMockHealthClient(ctrl *gomock.Controller) *MockHealthClient {
+	mock := &MockHealthClient{ctrl: ctrl}
+	mock.recorder = &MockHealthClientMockRecorder{mock}
+	return mock
+}

api/client/beacon/validator_api/client.go

@@ -1,38 +0,0 @@
-package validator_api
-
-import (
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/node"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/prysm_api"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	validatorHelpers "github.com/prysmaticlabs/prysm/v5/validator/helpers"
-)
-
-func NewClient(
-	validatorConn validatorHelpers.NodeConnection,
-	jsonRestHandler client.JsonRestHandler,
-	opt ...ValidatorClientOpt,
-) Client {
-	if features.Get().EnableBeaconRESTApi {
-		return NewBeaconApiValidatorClient(jsonRestHandler, opt...)
-	} else {
-		return NewGrpcValidatorClient(validatorConn.GetGrpcClientConn())
-	}
-}
-
-func NewBeaconApiValidatorClient(jsonRestHandler client.JsonRestHandler, opts ...ValidatorClientOpt) Client {
-	c := &beaconApiValidatorClient{
-		genesisProvider:         shared_providers.NewGenesis(jsonRestHandler),
-		dutiesProvider:          shared_providers.NewDuties(jsonRestHandler),
-		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
-		jsonRestHandler:         jsonRestHandler,
-		beaconBlockConverter:    beaconApiBeaconBlockConverter{},
-		prysmChainClient:        prysm_api.NewPrysmChainRestClient(jsonRestHandler, node.NewNodeClientWithFallback(jsonRestHandler, nil)), //TODO: this is really bad design...
-		isEventStreamRunning:    false,
-	}
-	for _, o := range opts {
-		o(c)
-	}
-	return c
-}

api/client/beacon/validator_api/duties.go

@@ -1,228 +0,0 @@
-package validator_api
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"golang.org/x/sync/errgroup"
-)
-
-func (c *beaconApiValidatorClient) duties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.ValidatorDutiesContainer, error) {
-	vals, err := c.validatorsForDuties(ctx, in.PublicKeys)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get validators for duties")
-	}
-
-	// Sync committees are an Altair feature
-	fetchSyncDuties := in.Epoch >= params.BeaconConfig().AltairForkEpoch
-
-	errCh := make(chan error, 1)
-
-	var currentEpochDuties []*ethpb.ValidatorDuty
-	go func() {
-		currentEpochDuties, err = c.dutiesForEpoch(ctx, in.Epoch, vals, fetchSyncDuties)
-		if err != nil {
-			errCh <- errors.Wrapf(err, "failed to get duties for current epoch `%d`", in.Epoch)
-			return
-		}
-		errCh <- nil
-	}()
-
-	nextEpochDuties, err := c.dutiesForEpoch(ctx, in.Epoch+1, vals, fetchSyncDuties)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get duties for next epoch `%d`", in.Epoch+1)
-	}
-
-	if err = <-errCh; err != nil {
-		return nil, err
-	}
-
-	return &ethpb.ValidatorDutiesContainer{
-		CurrentEpochDuties: currentEpochDuties,
-		NextEpochDuties:    nextEpochDuties,
-	}, nil
-}
-
-func (c *beaconApiValidatorClient) dutiesForEpoch(
-	ctx context.Context,
-	epoch primitives.Epoch,
-	vals []beacon.ValidatorForDuty,
-	fetchSyncDuties bool,
-) ([]*ethpb.ValidatorDuty, error) {
-	indices := make([]primitives.ValidatorIndex, len(vals))
-	for i, v := range vals {
-		indices[i] = v.Index
-	}
-
-	// Below variables MUST NOT be used in the main function before wg.Wait().
-	// This is because they are populated in goroutines and wg.Wait()
-	// will return only once all goroutines finish their execution.
-
-	// Mapping from a validator index to its attesting committee's index and slot
-	attesterDutiesMapping := make(map[primitives.ValidatorIndex]beacon.AttesterDuty)
-	// Set containing all validator indices that are part of a sync committee for this epoch
-	syncDutiesMapping := make(map[primitives.ValidatorIndex]bool)
-	// Mapping from a validator index to its proposal slot
-	proposerDutySlots := make(map[primitives.ValidatorIndex][]primitives.Slot)
-
-	var wg errgroup.Group
-
-	wg.Go(func() error {
-		attesterDuties, err := c.dutiesProvider.AttesterDuties(ctx, epoch, indices)
-		if err != nil {
-			return errors.Wrapf(err, "failed to get attester duties for epoch `%d`", epoch)
-		}
-
-		for _, duty := range attesterDuties {
-			validatorIndex, err := strconv.ParseUint(duty.ValidatorIndex, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester validator index `%s`", duty.ValidatorIndex)
-			}
-			slot, err := strconv.ParseUint(duty.Slot, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester slot `%s`", duty.Slot)
-			}
-			committeeIndex, err := strconv.ParseUint(duty.CommitteeIndex, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester committee index `%s`", duty.CommitteeIndex)
-			}
-			committeeLength, err := strconv.ParseUint(duty.CommitteeLength, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester committee length `%s`", duty.CommitteeLength)
-			}
-			validatorCommitteeIndex, err := strconv.ParseUint(duty.ValidatorCommitteeIndex, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester validator committee index `%s`", duty.ValidatorCommitteeIndex)
-			}
-			committeesAtSlot, err := strconv.ParseUint(duty.CommitteesAtSlot, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse attester committees at slot `%s`", duty.CommitteesAtSlot)
-			}
-			attesterDutiesMapping[primitives.ValidatorIndex(validatorIndex)] = beacon.AttesterDuty{
-				Slot:                    primitives.Slot(slot),
-				CommitteeIndex:          primitives.CommitteeIndex(committeeIndex),
-				CommitteeLength:         committeeLength,
-				ValidatorCommitteeIndex: validatorCommitteeIndex,
-				CommitteesAtSlot:        committeesAtSlot,
-			}
-		}
-		return nil
-	})
-
-	if fetchSyncDuties {
-		wg.Go(func() error {
-			syncDuties, err := c.dutiesProvider.SyncDuties(ctx, epoch, indices)
-			if err != nil {
-				return errors.Wrapf(err, "failed to get sync duties for epoch `%d`", epoch)
-			}
-			for _, syncDuty := range syncDuties {
-				validatorIndex, err := strconv.ParseUint(syncDuty.ValidatorIndex, 10, 64)
-				if err != nil {
-					return errors.Wrapf(err, "failed to parse sync validator index `%s`", syncDuty.ValidatorIndex)
-				}
-				syncDutiesMapping[primitives.ValidatorIndex(validatorIndex)] = true
-			}
-			return nil
-		})
-	}
-
-	wg.Go(func() error {
-		proposerDuties, err := c.dutiesProvider.ProposerDuties(ctx, epoch)
-		if err != nil {
-			return errors.Wrapf(err, "failed to get proposer duties for epoch `%d`", epoch)
-		}
-
-		for _, proposerDuty := range proposerDuties {
-			validatorIndex, err := strconv.ParseUint(proposerDuty.ValidatorIndex, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse proposer validator index `%s`", proposerDuty.ValidatorIndex)
-			}
-			slot, err := strconv.ParseUint(proposerDuty.Slot, 10, 64)
-			if err != nil {
-				return errors.Wrapf(err, "failed to parse proposer slot `%s`", proposerDuty.Slot)
-			}
-			proposerDutySlots[primitives.ValidatorIndex(validatorIndex)] =
-				append(proposerDutySlots[primitives.ValidatorIndex(validatorIndex)], primitives.Slot(slot))
-		}
-		return nil
-	})
-
-	if err := wg.Wait(); err != nil {
-		return nil, err
-	}
-
-	duties := make([]*ethpb.ValidatorDuty, len(vals))
-	for i, v := range vals {
-		att, ok := attesterDutiesMapping[v.Index]
-		if !ok {
-			log.Debugf("failed to find attester duty for validator `%d`", v.Index)
-		}
-
-		duties[i] = &ethpb.ValidatorDuty{
-			ValidatorCommitteeIndex: att.ValidatorCommitteeIndex,
-			CommitteeLength:         att.CommitteeLength,
-			CommitteeIndex:          att.CommitteeIndex,
-			AttesterSlot:            att.Slot,
-			CommitteesAtSlot:        att.CommitteesAtSlot,
-			ProposerSlots:           proposerDutySlots[v.Index],
-			PublicKey:               v.Pubkey,
-			Status:                  v.Status,
-			ValidatorIndex:          v.Index,
-			IsSyncCommittee:         syncDutiesMapping[v.Index],
-		}
-	}
-
-	return duties, nil
-}
-
-func (c *beaconApiValidatorClient) validatorsForDuties(ctx context.Context, pubkeys [][]byte) ([]beacon.ValidatorForDuty, error) {
-	vals := make([]beacon.ValidatorForDuty, 0, len(pubkeys))
-	stringPubkeysToPubkeys := make(map[string][]byte, len(pubkeys))
-	stringPubkeys := make([]string, len(pubkeys))
-
-	for i, pk := range pubkeys {
-		stringPk := hexutil.Encode(pk)
-		stringPubkeysToPubkeys[stringPk] = pk
-		stringPubkeys[i] = stringPk
-	}
-
-	statusesWithDuties := []string{validator.ActiveOngoing.String(), validator.ActiveExiting.String()}
-	stateValidatorsResponse, err := c.stateValidatorsProvider.StateValidators(ctx, stringPubkeys, nil, statusesWithDuties)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get state validators")
-	}
-
-	for _, validatorContainer := range stateValidatorsResponse.Data {
-		val := beacon.ValidatorForDuty{}
-
-		validatorIndex, err := strconv.ParseUint(validatorContainer.Index, 10, 64)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to parse validator index %s", validatorContainer.Index)
-		}
-		val.Index = primitives.ValidatorIndex(validatorIndex)
-
-		stringPubkey := validatorContainer.Validator.Pubkey
-		pubkey, ok := stringPubkeysToPubkeys[stringPubkey]
-		if !ok {
-			return nil, errors.Wrapf(err, "returned public key %s not requested", stringPubkey)
-		}
-		val.Pubkey = pubkey
-
-		status, ok := beaconAPITogRPCValidatorStatus[validatorContainer.Status]
-		if !ok {
-			return nil, errors.New("invalid validator status " + validatorContainer.Status)
-		}
-		val.Status = status
-
-		vals = append(vals, val)
-	}
-
-	return vals, nil
-}

api/client/beacon/validator_api/interfaces.go

@@ -1,46 +0,0 @@
-package validator_api
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	"github.com/prysmaticlabs/prysm/v5/api/client/event"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type Client interface {
-	Duties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.ValidatorDutiesContainer, error)
-	DomainData(ctx context.Context, in *ethpb.DomainRequest) (*ethpb.DomainResponse, error)
-	WaitForChainStart(ctx context.Context, in *empty.Empty) (*ethpb.ChainStartResponse, error)
-	ValidatorIndex(ctx context.Context, in *ethpb.ValidatorIndexRequest) (*ethpb.ValidatorIndexResponse, error)
-	ValidatorStatus(ctx context.Context, in *ethpb.ValidatorStatusRequest) (*ethpb.ValidatorStatusResponse, error)
-	MultipleValidatorStatus(ctx context.Context, in *ethpb.MultipleValidatorStatusRequest) (*ethpb.MultipleValidatorStatusResponse, error)
-	BeaconBlock(ctx context.Context, in *ethpb.BlockRequest) (*ethpb.GenericBeaconBlock, error)
-	ProposeBeaconBlock(ctx context.Context, in *ethpb.GenericSignedBeaconBlock) (*ethpb.ProposeResponse, error)
-	PrepareBeaconProposer(ctx context.Context, in *ethpb.PrepareBeaconProposerRequest) (*empty.Empty, error)
-	FeeRecipientByPubKey(ctx context.Context, in *ethpb.FeeRecipientByPubKeyRequest) (*ethpb.FeeRecipientByPubKeyResponse, error)
-	AttestationData(ctx context.Context, in *ethpb.AttestationDataRequest) (*ethpb.AttestationData, error)
-	ProposeAttestation(ctx context.Context, in *ethpb.Attestation) (*ethpb.AttestResponse, error)
-	ProposeAttestationElectra(ctx context.Context, in *ethpb.SingleAttestation) (*ethpb.AttestResponse, error)
-	SubmitAggregateSelectionProof(ctx context.Context, in *ethpb.AggregateSelectionRequest, index primitives.ValidatorIndex, committeeLength uint64) (*ethpb.AggregateSelectionResponse, error)
-	SubmitAggregateSelectionProofElectra(ctx context.Context, in *ethpb.AggregateSelectionRequest, _ primitives.ValidatorIndex, _ uint64) (*ethpb.AggregateSelectionElectraResponse, error)
-	SubmitSignedAggregateSelectionProof(ctx context.Context, in *ethpb.SignedAggregateSubmitRequest) (*ethpb.SignedAggregateSubmitResponse, error)
-	SubmitSignedAggregateSelectionProofElectra(ctx context.Context, in *ethpb.SignedAggregateSubmitElectraRequest) (*ethpb.SignedAggregateSubmitResponse, error)
-	ProposeExit(ctx context.Context, in *ethpb.SignedVoluntaryExit) (*ethpb.ProposeExitResponse, error)
-	SubscribeCommitteeSubnets(ctx context.Context, in *ethpb.CommitteeSubnetsSubscribeRequest, duties []*ethpb.ValidatorDuty) (*empty.Empty, error)
-	CheckDoppelGanger(ctx context.Context, in *ethpb.DoppelGangerRequest) (*ethpb.DoppelGangerResponse, error)
-	SyncMessageBlockRoot(ctx context.Context, in *empty.Empty) (*ethpb.SyncMessageBlockRootResponse, error)
-	SubmitSyncMessage(ctx context.Context, in *ethpb.SyncCommitteeMessage) (*empty.Empty, error)
-	SyncSubcommitteeIndex(ctx context.Context, in *ethpb.SyncSubcommitteeIndexRequest) (*ethpb.SyncSubcommitteeIndexResponse, error)
-	SyncCommitteeContribution(ctx context.Context, in *ethpb.SyncCommitteeContributionRequest) (*ethpb.SyncCommitteeContribution, error)
-	SubmitSignedContributionAndProof(ctx context.Context, in *ethpb.SignedContributionAndProof) (*empty.Empty, error)
-	SubmitValidatorRegistrations(ctx context.Context, in *ethpb.SignedValidatorRegistrationsV1) (*empty.Empty, error)
-	StartEventStream(ctx context.Context, topics []string, eventsChannel chan<- *event.Event)
-	EventStreamIsRunning() bool
-	AggregatedSelections(ctx context.Context, selections []beacon.BeaconCommitteeSelection) ([]beacon.BeaconCommitteeSelection, error)
-	AggregatedSyncSelections(ctx context.Context, selections []beacon.SyncCommitteeSelection) ([]beacon.SyncCommitteeSelection, error)
-	Host() string
-	SetHost(host string)
-}

api/client/beacon/validator_api/log.go

@@ -1,5 +0,0 @@
-package validator_api
-
-import "github.com/sirupsen/logrus"
-
-var log = logrus.WithField("prefix", "beacon-api")

api/client/beacon/validator_api/propose_attestation.go

@@ -1,87 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-)
-
-func (c *beaconApiValidatorClient) proposeAttestation(ctx context.Context, attestation *ethpb.Attestation) (*ethpb.AttestResponse, error) {
-	if err := helpers.ValidateNilAttestation(attestation); err != nil {
-		return nil, err
-	}
-	marshalledAttestation, err := json.Marshal(jsonifyAttestations([]*ethpb.Attestation{attestation}))
-	if err != nil {
-		return nil, err
-	}
-
-	headers := map[string]string{"Eth-Consensus-Version": version.String(attestation.Version())}
-	err = c.jsonRestHandler.Post(
-		ctx,
-		"/eth/v2/beacon/pool/attestations",
-		headers,
-		bytes.NewBuffer(marshalledAttestation),
-		nil,
-	)
-	errJson := &httputil.DefaultJsonError{}
-	if err != nil {
-		// TODO: remove this when v2 becomes default
-		if !errors.As(err, &errJson) {
-			return nil, err
-		}
-		if errJson.Code != http.StatusNotFound {
-			return nil, errJson
-		}
-		log.Debug("Endpoint /eth/v2/beacon/pool/attestations is not supported, falling back to older endpoints for submit attestation.")
-		if err = c.jsonRestHandler.Post(
-			ctx,
-			"/eth/v1/beacon/pool/attestations",
-			nil,
-			bytes.NewBuffer(marshalledAttestation),
-			nil,
-		); err != nil {
-			return nil, err
-		}
-	}
-
-	attestationDataRoot, err := attestation.Data.HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to compute attestation data root")
-	}
-
-	return &ethpb.AttestResponse{AttestationDataRoot: attestationDataRoot[:]}, nil
-}
-
-func (c *beaconApiValidatorClient) proposeAttestationElectra(ctx context.Context, attestation *ethpb.SingleAttestation) (*ethpb.AttestResponse, error) {
-	if err := helpers.ValidateNilAttestation(attestation); err != nil {
-		return nil, err
-	}
-	marshalledAttestation, err := json.Marshal(jsonifySingleAttestations([]*ethpb.SingleAttestation{attestation}))
-	if err != nil {
-		return nil, err
-	}
-	headers := map[string]string{"Eth-Consensus-Version": version.String(attestation.Version())}
-	if err = c.jsonRestHandler.Post(
-		ctx,
-		"/eth/v2/beacon/pool/attestations",
-		headers,
-		bytes.NewBuffer(marshalledAttestation),
-		nil,
-	); err != nil {
-		return nil, err
-	}
-
-	attestationDataRoot, err := attestation.Data.HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to compute attestation data root")
-	}
-
-	return &ethpb.AttestResponse{AttestationDataRoot: attestationDataRoot[:]}, nil
-}

api/client/beacon/validator_api/propose_attestation_test.go

@@ -1,336 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/validator_api/test_helpers"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestProposeAttestation(t *testing.T) {
-	attestation := &ethpb.Attestation{
-		AggregationBits: test_helpers.FillByteSlice(4, 74),
-		Data: &ethpb.AttestationData{
-			Slot:            75,
-			CommitteeIndex:  76,
-			BeaconBlockRoot: test_helpers.FillByteSlice(32, 38),
-			Source: &ethpb.Checkpoint{
-				Epoch: 78,
-				Root:  test_helpers.FillByteSlice(32, 79),
-			},
-			Target: &ethpb.Checkpoint{
-				Epoch: 80,
-				Root:  test_helpers.FillByteSlice(32, 81),
-			},
-		},
-		Signature: test_helpers.FillByteSlice(96, 82),
-	}
-
-	tests := []struct {
-		name                 string
-		attestation          *ethpb.Attestation
-		expectedErrorMessage string
-		endpointError        error
-		endpointCall         int
-	}{
-		{
-			name:         "valid",
-			attestation:  attestation,
-			endpointCall: 1,
-		},
-		{
-			name:                 "nil attestation",
-			expectedErrorMessage: "attestation is nil",
-		},
-		{
-			name: "nil attestation data",
-			attestation: &ethpb.Attestation{
-				AggregationBits: test_helpers.FillByteSlice(4, 74),
-				Signature:       test_helpers.FillByteSlice(96, 82),
-			},
-			expectedErrorMessage: "attestation is nil",
-		},
-		{
-			name: "nil source checkpoint",
-			attestation: &ethpb.Attestation{
-				AggregationBits: test_helpers.FillByteSlice(4, 74),
-				Data: &ethpb.AttestationData{
-					Target: &ethpb.Checkpoint{},
-				},
-				Signature: test_helpers.FillByteSlice(96, 82),
-			},
-			expectedErrorMessage: "attestation's source can't be nil",
-		},
-		{
-			name: "nil target checkpoint",
-			attestation: &ethpb.Attestation{
-				AggregationBits: test_helpers.FillByteSlice(4, 74),
-				Data: &ethpb.AttestationData{
-					Source: &ethpb.Checkpoint{},
-				},
-				Signature: test_helpers.FillByteSlice(96, 82),
-			},
-			expectedErrorMessage: "attestation's target can't be nil",
-		},
-		{
-			name: "nil aggregation bits",
-			attestation: &ethpb.Attestation{
-				Data: &ethpb.AttestationData{
-					Source: &ethpb.Checkpoint{},
-					Target: &ethpb.Checkpoint{},
-				},
-				Signature: test_helpers.FillByteSlice(96, 82),
-			},
-			expectedErrorMessage: "attestation's bitfield can't be nil",
-		},
-		{
-			name:                 "bad request",
-			attestation:          attestation,
-			expectedErrorMessage: "bad request",
-			endpointError:        errors.New("bad request"),
-			endpointCall:         1,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			ctrl := gomock.NewController(t)
-			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-			var marshalledAttestations []byte
-			if helpers.ValidateNilAttestation(test.attestation) == nil {
-				b, err := json.Marshal(jsonifyAttestations([]*ethpb.Attestation{test.attestation}))
-				require.NoError(t, err)
-				marshalledAttestations = b
-			}
-
-			ctx := context.Background()
-
-			headers := map[string]string{"Eth-Consensus-Version": version.String(test.attestation.Version())}
-			jsonRestHandler.EXPECT().Post(
-				gomock.Any(),
-				"/eth/v2/beacon/pool/attestations",
-				headers,
-				bytes.NewBuffer(marshalledAttestations),
-				nil,
-			).Return(
-				test.endpointError,
-			).Times(test.endpointCall)
-
-			validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-			proposeResponse, err := validatorClient.proposeAttestation(ctx, test.attestation)
-			if test.expectedErrorMessage != "" {
-				require.ErrorContains(t, test.expectedErrorMessage, err)
-				return
-			}
-
-			require.NoError(t, err)
-			require.NotNil(t, proposeResponse)
-
-			expectedAttestationDataRoot, err := attestation.Data.HashTreeRoot()
-			require.NoError(t, err)
-
-			// Make sure that the attestation data root is set
-			assert.DeepEqual(t, expectedAttestationDataRoot[:], proposeResponse.AttestationDataRoot)
-		})
-	}
-}
-
-func TestProposeAttestationFallBack(t *testing.T) {
-	attestation := &ethpb.Attestation{
-		AggregationBits: test_helpers.FillByteSlice(4, 74),
-		Data: &ethpb.AttestationData{
-			Slot:            75,
-			CommitteeIndex:  76,
-			BeaconBlockRoot: test_helpers.FillByteSlice(32, 38),
-			Source: &ethpb.Checkpoint{
-				Epoch: 78,
-				Root:  test_helpers.FillByteSlice(32, 79),
-			},
-			Target: &ethpb.Checkpoint{
-				Epoch: 80,
-				Root:  test_helpers.FillByteSlice(32, 81),
-			},
-		},
-		Signature: test_helpers.FillByteSlice(96, 82),
-	}
-
-	ctrl := gomock.NewController(t)
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	var marshalledAttestations []byte
-	if helpers.ValidateNilAttestation(attestation) == nil {
-		b, err := json.Marshal(jsonifyAttestations([]*ethpb.Attestation{attestation}))
-		require.NoError(t, err)
-		marshalledAttestations = b
-	}
-
-	ctx := context.Background()
-	headers := map[string]string{"Eth-Consensus-Version": version.String(attestation.Version())}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/beacon/pool/attestations",
-		headers,
-		bytes.NewBuffer(marshalledAttestations),
-		nil,
-	).Return(
-		&httputil.DefaultJsonError{
-			Code: http.StatusNotFound,
-		},
-	).Times(1)
-
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v1/beacon/pool/attestations",
-		nil,
-		bytes.NewBuffer(marshalledAttestations),
-		nil,
-	).Return(
-		nil,
-	).Times(1)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	proposeResponse, err := validatorClient.proposeAttestation(ctx, attestation)
-
-	require.NoError(t, err)
-	require.NotNil(t, proposeResponse)
-
-	expectedAttestationDataRoot, err := attestation.Data.HashTreeRoot()
-	require.NoError(t, err)
-
-	// Make sure that the attestation data root is set
-	assert.DeepEqual(t, expectedAttestationDataRoot[:], proposeResponse.AttestationDataRoot)
-}
-
-func TestProposeAttestationElectra(t *testing.T) {
-	attestation := &ethpb.SingleAttestation{
-		AttesterIndex: 74,
-		Data: &ethpb.AttestationData{
-			Slot:            75,
-			CommitteeIndex:  76,
-			BeaconBlockRoot: test_helpers.FillByteSlice(32, 38),
-			Source: &ethpb.Checkpoint{
-				Epoch: 78,
-				Root:  test_helpers.FillByteSlice(32, 79),
-			},
-			Target: &ethpb.Checkpoint{
-				Epoch: 80,
-				Root:  test_helpers.FillByteSlice(32, 81),
-			},
-		},
-		Signature:   test_helpers.FillByteSlice(96, 82),
-		CommitteeId: 83,
-	}
-
-	tests := []struct {
-		name                 string
-		attestation          *ethpb.SingleAttestation
-		expectedErrorMessage string
-		endpointError        error
-		endpointCall         int
-	}{
-		{
-			name:         "valid",
-			attestation:  attestation,
-			endpointCall: 1,
-		},
-		{
-			name:                 "nil attestation",
-			expectedErrorMessage: "attestation is nil",
-		},
-		{
-			name: "nil attestation data",
-			attestation: &ethpb.SingleAttestation{
-				AttesterIndex: 74,
-				Signature:     test_helpers.FillByteSlice(96, 82),
-				CommitteeId:   83,
-			},
-			expectedErrorMessage: "attestation is nil",
-		},
-		{
-			name: "nil source checkpoint",
-			attestation: &ethpb.SingleAttestation{
-				AttesterIndex: 74,
-				Data: &ethpb.AttestationData{
-					Target: &ethpb.Checkpoint{},
-				},
-				Signature:   test_helpers.FillByteSlice(96, 82),
-				CommitteeId: 83,
-			},
-			expectedErrorMessage: "attestation's source can't be nil",
-		},
-		{
-			name: "nil target checkpoint",
-			attestation: &ethpb.SingleAttestation{
-				AttesterIndex: 74,
-				Data: &ethpb.AttestationData{
-					Source: &ethpb.Checkpoint{},
-				},
-				Signature:   test_helpers.FillByteSlice(96, 82),
-				CommitteeId: 83,
-			},
-			expectedErrorMessage: "attestation's target can't be nil",
-		},
-		{
-			name:                 "bad request",
-			attestation:          attestation,
-			expectedErrorMessage: "bad request",
-			endpointError:        errors.New("bad request"),
-			endpointCall:         1,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			ctrl := gomock.NewController(t)
-			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-			var marshalledAttestations []byte
-			if helpers.ValidateNilAttestation(test.attestation) == nil {
-				b, err := json.Marshal(jsonifySingleAttestations([]*ethpb.SingleAttestation{test.attestation}))
-				require.NoError(t, err)
-				marshalledAttestations = b
-			}
-
-			ctx := context.Background()
-			headers := map[string]string{"Eth-Consensus-Version": version.String(test.attestation.Version())}
-			jsonRestHandler.EXPECT().Post(
-				gomock.Any(),
-				"/eth/v2/beacon/pool/attestations",
-				headers,
-				bytes.NewBuffer(marshalledAttestations),
-				nil,
-			).Return(
-				test.endpointError,
-			).Times(test.endpointCall)
-
-			validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-			proposeResponse, err := validatorClient.proposeAttestationElectra(ctx, test.attestation)
-			if test.expectedErrorMessage != "" {
-				require.ErrorContains(t, test.expectedErrorMessage, err)
-				return
-			}
-
-			require.NoError(t, err)
-			require.NotNil(t, proposeResponse)
-
-			expectedAttestationDataRoot, err := attestation.Data.HashTreeRoot()
-			require.NoError(t, err)
-
-			// Make sure that the attestation data root is set
-			assert.DeepEqual(t, expectedAttestationDataRoot[:], proposeResponse.AttestationDataRoot)
-		})
-	}
-}

api/client/beacon/validator_api/propose_beacon_block_blinded_electra_test.go

@@ -1,50 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	rpctesting "github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/eth/shared/testing"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestProposeBeaconBlock_BlindedElectra(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	var block structs.SignedBlindedBeaconBlockElectra
-	err := json.Unmarshal([]byte(rpctesting.BlindedElectraBlock), &block)
-	require.NoError(t, err)
-	genericSignedBlock, err := block.ToGeneric()
-	require.NoError(t, err)
-
-	electraBytes, err := json.Marshal(block)
-	require.NoError(t, err)
-	// Make sure that what we send in the POST body is the marshalled version of the protobuf block
-	headers := map[string]string{"Eth-Consensus-Version": "electra"}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/beacon/blinded_blocks",
-		headers,
-		bytes.NewBuffer(electraBytes),
-		nil,
-	)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	proposeResponse, err := validatorClient.proposeBeaconBlock(context.Background(), genericSignedBlock)
-	assert.NoError(t, err)
-	require.NotNil(t, proposeResponse)
-
-	expectedBlockRoot, err := genericSignedBlock.GetBlindedElectra().HashTreeRoot()
-	require.NoError(t, err)
-
-	// Make sure that the block root is set
-	assert.DeepEqual(t, expectedBlockRoot[:], proposeResponse.BlockRoot)
-}

api/client/beacon/validator_api/propose_beacon_block_blinded_fulu_test.go

@@ -1,50 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	rpctesting "github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/eth/shared/testing"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestProposeBeaconBlock_BlindedFulu(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	var block structs.SignedBlindedBeaconBlockFulu
-	err := json.Unmarshal([]byte(rpctesting.BlindedFuluBlock), &block)
-	require.NoError(t, err)
-	genericSignedBlock, err := block.ToGeneric()
-	require.NoError(t, err)
-
-	fuluBytes, err := json.Marshal(block)
-	require.NoError(t, err)
-	// Make sure that what we send in the POST body is the marshalled version of the protobuf block
-	headers := map[string]string{"Eth-Consensus-Version": "fulu"}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/beacon/blinded_blocks",
-		headers,
-		bytes.NewBuffer(fuluBytes),
-		nil,
-	)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	proposeResponse, err := validatorClient.proposeBeaconBlock(context.Background(), genericSignedBlock)
-	assert.NoError(t, err)
-	require.NotNil(t, proposeResponse)
-
-	expectedBlockRoot, err := genericSignedBlock.GetBlindedFulu().HashTreeRoot()
-	require.NoError(t, err)
-
-	// Make sure that the block root is set
-	assert.DeepEqual(t, expectedBlockRoot[:], proposeResponse.BlockRoot)
-}

api/client/beacon/validator_api/propose_beacon_block_electra_test.go

@@ -1,50 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	rpctesting "github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/eth/shared/testing"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestProposeBeaconBlock_Electra(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	var blockContents structs.SignedBeaconBlockContentsElectra
-	err := json.Unmarshal([]byte(rpctesting.ElectraBlockContents), &blockContents)
-	require.NoError(t, err)
-	genericSignedBlock, err := blockContents.ToGeneric()
-	require.NoError(t, err)
-
-	electraBytes, err := json.Marshal(blockContents)
-	require.NoError(t, err)
-	// Make sure that what we send in the POST body is the marshalled version of the protobuf block
-	headers := map[string]string{"Eth-Consensus-Version": "electra"}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/beacon/blocks",
-		headers,
-		bytes.NewBuffer(electraBytes),
-		nil,
-	)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	proposeResponse, err := validatorClient.proposeBeaconBlock(context.Background(), genericSignedBlock)
-	assert.NoError(t, err)
-	require.NotNil(t, proposeResponse)
-
-	expectedBlockRoot, err := genericSignedBlock.GetElectra().Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	// Make sure that the block root is set
-	assert.DeepEqual(t, expectedBlockRoot[:], proposeResponse.BlockRoot)
-}

api/client/beacon/validator_api/propose_beacon_block_fulu_test.go

@@ -1,50 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	rpctesting "github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/eth/shared/testing"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestProposeBeaconBlock_Fulu(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	var blockContents structs.SignedBeaconBlockContentsFulu
-	err := json.Unmarshal([]byte(rpctesting.FuluBlockContents), &blockContents)
-	require.NoError(t, err)
-	genericSignedBlock, err := blockContents.ToGeneric()
-	require.NoError(t, err)
-
-	fuluBytes, err := json.Marshal(blockContents)
-	require.NoError(t, err)
-	// Make sure that what we send in the POST body is the marshalled version of the protobuf block
-	headers := map[string]string{"Eth-Consensus-Version": "fulu"}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/beacon/blocks",
-		headers,
-		bytes.NewBuffer(fuluBytes),
-		nil,
-	)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	proposeResponse, err := validatorClient.proposeBeaconBlock(context.Background(), genericSignedBlock)
-	assert.NoError(t, err)
-	require.NotNil(t, proposeResponse)
-
-	expectedBlockRoot, err := genericSignedBlock.GetFulu().Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	// Make sure that the block root is set
-	assert.DeepEqual(t, expectedBlockRoot[:], proposeResponse.BlockRoot)
-}

api/client/beacon/validator_api/rest_client.go

@@ -1,388 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
-	"github.com/prysmaticlabs/prysm/v5/api/client"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/prysm_api"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
-	"github.com/prysmaticlabs/prysm/v5/api/client/event"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
-	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-type ValidatorClientOpt func(*beaconApiValidatorClient)
-
-type beaconApiValidatorClient struct {
-	genesisProvider         shared_providers.Genesis
-	dutiesProvider          shared_providers.Duties
-	stateValidatorsProvider shared_providers.StateValidators
-	jsonRestHandler         client.JsonRestHandler
-	beaconBlockConverter    BeaconBlockConverter
-	prysmChainClient        prysm_api.Client
-	isEventStreamRunning    bool
-}
-
-func (c *beaconApiValidatorClient) waitForChainStart(ctx context.Context) (*ethpb.ChainStartResponse, error) {
-	genesis, err := c.genesisProvider.Genesis(ctx)
-
-	for err != nil {
-		jsonErr := &httputil.DefaultJsonError{}
-		httpNotFound := errors.As(err, &jsonErr) && jsonErr.Code == http.StatusNotFound
-		if !httpNotFound {
-			return nil, errors.Wrap(err, "failed to get genesis data")
-		}
-
-		// Error 404 means that the chain genesis info is not yet known, so we query it every second until it's ready
-		select {
-		case <-time.After(time.Second):
-			genesis, err = c.genesisProvider.Genesis(ctx)
-		case <-ctx.Done():
-			return nil, errors.New("context canceled")
-		}
-	}
-
-	genesisTime, err := strconv.ParseUint(genesis.GenesisTime, 10, 64)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to parse genesis time: %s", genesis.GenesisTime)
-	}
-
-	if !apiutil.ValidRoot(genesis.GenesisValidatorsRoot) {
-		return nil, errors.Errorf("invalid genesis validators root: %s", genesis.GenesisValidatorsRoot)
-	}
-
-	genesisValidatorRoot, err := hexutil.Decode(genesis.GenesisValidatorsRoot)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to decode genesis validators root")
-	}
-
-	chainStartResponse := &ethpb.ChainStartResponse{
-		Started:               true,
-		GenesisTime:           genesisTime,
-		GenesisValidatorsRoot: genesisValidatorRoot,
-	}
-
-	return chainStartResponse, nil
-}
-
-func (c *beaconApiValidatorClient) Duties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.ValidatorDutiesContainer, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.Duties")
-	defer span.End()
-	return wrapInMetrics[*ethpb.ValidatorDutiesContainer]("Duties", func() (*ethpb.ValidatorDutiesContainer, error) {
-		return c.duties(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) CheckDoppelGanger(ctx context.Context, in *ethpb.DoppelGangerRequest) (*ethpb.DoppelGangerResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.CheckDoppelGanger")
-	defer span.End()
-	return wrapInMetrics[*ethpb.DoppelGangerResponse]("CheckDoppelGanger", func() (*ethpb.DoppelGangerResponse, error) {
-		return c.checkDoppelGanger(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) DomainData(ctx context.Context, in *ethpb.DomainRequest) (*ethpb.DomainResponse, error) {
-	if len(in.Domain) != 4 {
-		return nil, errors.Errorf("invalid domain type: %s", hexutil.Encode(in.Domain))
-	}
-
-	ctx, span := trace.StartSpan(ctx, "beacon-api.DomainData")
-	defer span.End()
-
-	domainType := bytesutil.ToBytes4(in.Domain)
-
-	return wrapInMetrics[*ethpb.DomainResponse]("DomainData", func() (*ethpb.DomainResponse, error) {
-		return c.domainData(ctx, in.Epoch, domainType)
-	})
-}
-
-func (c *beaconApiValidatorClient) AttestationData(ctx context.Context, in *ethpb.AttestationDataRequest) (*ethpb.AttestationData, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.AttestationData")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.AttestationData]("AttestationData", func() (*ethpb.AttestationData, error) {
-		return c.attestationData(ctx, in.Slot, in.CommitteeIndex)
-	})
-}
-
-func (c *beaconApiValidatorClient) BeaconBlock(ctx context.Context, in *ethpb.BlockRequest) (*ethpb.GenericBeaconBlock, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.BeaconBlock")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.GenericBeaconBlock]("BeaconBlock", func() (*ethpb.GenericBeaconBlock, error) {
-		return c.beaconBlock(ctx, in.Slot, in.RandaoReveal, in.Graffiti)
-	})
-}
-
-func (c *beaconApiValidatorClient) FeeRecipientByPubKey(_ context.Context, _ *ethpb.FeeRecipientByPubKeyRequest) (*ethpb.FeeRecipientByPubKeyResponse, error) {
-	return nil, nil
-}
-
-func (c *beaconApiValidatorClient) SyncCommitteeContribution(ctx context.Context, in *ethpb.SyncCommitteeContributionRequest) (*ethpb.SyncCommitteeContribution, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SyncCommitteeContribution")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.SyncCommitteeContribution]("SyncCommitteeContribution", func() (*ethpb.SyncCommitteeContribution, error) {
-		return c.syncCommitteeContribution(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) SyncMessageBlockRoot(ctx context.Context, _ *empty.Empty) (*ethpb.SyncMessageBlockRootResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SyncMessageBlockRoot")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.SyncMessageBlockRootResponse]("SyncMessageBlockRoot", func() (*ethpb.SyncMessageBlockRootResponse, error) {
-		return c.syncMessageBlockRoot(ctx)
-	})
-}
-
-func (c *beaconApiValidatorClient) SyncSubcommitteeIndex(ctx context.Context, in *ethpb.SyncSubcommitteeIndexRequest) (*ethpb.SyncSubcommitteeIndexResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SyncSubcommitteeIndex")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.SyncSubcommitteeIndexResponse]("SyncSubcommitteeIndex", func() (*ethpb.SyncSubcommitteeIndexResponse, error) {
-		return c.syncSubcommitteeIndex(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) MultipleValidatorStatus(ctx context.Context, in *ethpb.MultipleValidatorStatusRequest) (*ethpb.MultipleValidatorStatusResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.MultipleValidatorStatus")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.MultipleValidatorStatusResponse]("MultipleValidatorStatus", func() (*ethpb.MultipleValidatorStatusResponse, error) {
-		return c.multipleValidatorStatus(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) PrepareBeaconProposer(ctx context.Context, in *ethpb.PrepareBeaconProposerRequest) (*empty.Empty, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.PrepareBeaconProposer")
-	defer span.End()
-
-	return wrapInMetrics[*empty.Empty]("PrepareBeaconProposer", func() (*empty.Empty, error) {
-		return new(empty.Empty), c.prepareBeaconProposer(ctx, in.Recipients)
-	})
-}
-
-func (c *beaconApiValidatorClient) ProposeAttestation(ctx context.Context, in *ethpb.Attestation) (*ethpb.AttestResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ProposeAttestation")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.AttestResponse]("ProposeAttestation", func() (*ethpb.AttestResponse, error) {
-		return c.proposeAttestation(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) ProposeAttestationElectra(ctx context.Context, in *ethpb.SingleAttestation) (*ethpb.AttestResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ProposeAttestationElectra")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.AttestResponse]("ProposeAttestationElectra", func() (*ethpb.AttestResponse, error) {
-		return c.proposeAttestationElectra(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) ProposeBeaconBlock(ctx context.Context, in *ethpb.GenericSignedBeaconBlock) (*ethpb.ProposeResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ProposeBeaconBlock")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.ProposeResponse]("ProposeBeaconBlock", func() (*ethpb.ProposeResponse, error) {
-		return c.proposeBeaconBlock(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) ProposeExit(ctx context.Context, in *ethpb.SignedVoluntaryExit) (*ethpb.ProposeExitResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ProposeExit")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.ProposeExitResponse]("ProposeExit", func() (*ethpb.ProposeExitResponse, error) {
-		return c.proposeExit(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) StreamBlocksAltair(ctx context.Context, in *ethpb.StreamBlocksRequest) (ethpb.BeaconNodeValidator_StreamBlocksAltairClient, error) {
-	return c.streamBlocks(ctx, in, time.Second), nil
-}
-
-func (c *beaconApiValidatorClient) SubmitAggregateSelectionProof(ctx context.Context, in *ethpb.AggregateSelectionRequest, index primitives.ValidatorIndex, committeeLength uint64) (*ethpb.AggregateSelectionResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitAggregateSelectionProof")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.AggregateSelectionResponse]("SubmitAggregateSelectionProof", func() (*ethpb.AggregateSelectionResponse, error) {
-		return c.submitAggregateSelectionProof(ctx, in, index, committeeLength)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitAggregateSelectionProofElectra(ctx context.Context, in *ethpb.AggregateSelectionRequest, index primitives.ValidatorIndex, committeeLength uint64) (*ethpb.AggregateSelectionElectraResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitAggregateSelectionProofElectra")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.AggregateSelectionElectraResponse]("SubmitAggregateSelectionProofElectra", func() (*ethpb.AggregateSelectionElectraResponse, error) {
-		return c.submitAggregateSelectionProofElectra(ctx, in, index, committeeLength)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitSignedAggregateSelectionProof(ctx context.Context, in *ethpb.SignedAggregateSubmitRequest) (*ethpb.SignedAggregateSubmitResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitSignedAggregateSelectionProof")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.SignedAggregateSubmitResponse]("SubmitSignedAggregateSelectionProof", func() (*ethpb.SignedAggregateSubmitResponse, error) {
-		return c.submitSignedAggregateSelectionProof(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitSignedAggregateSelectionProofElectra(ctx context.Context, in *ethpb.SignedAggregateSubmitElectraRequest) (*ethpb.SignedAggregateSubmitResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitSignedAggregateSelectionProofElectra")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.SignedAggregateSubmitResponse]("SubmitSignedAggregateSelectionProofElectra", func() (*ethpb.SignedAggregateSubmitResponse, error) {
-		return c.submitSignedAggregateSelectionProofElectra(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitSignedContributionAndProof(ctx context.Context, in *ethpb.SignedContributionAndProof) (*empty.Empty, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitSignedContributionAndProof")
-	defer span.End()
-
-	return wrapInMetrics[*empty.Empty]("SubmitSignedContributionAndProof", func() (*empty.Empty, error) {
-		return new(empty.Empty), c.submitSignedContributionAndProof(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitSyncMessage(ctx context.Context, in *ethpb.SyncCommitteeMessage) (*empty.Empty, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitSyncMessage")
-	defer span.End()
-
-	return wrapInMetrics[*empty.Empty]("SubmitSyncMessage", func() (*empty.Empty, error) {
-		return new(empty.Empty), c.submitSyncMessage(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubmitValidatorRegistrations(ctx context.Context, in *ethpb.SignedValidatorRegistrationsV1) (*empty.Empty, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubmitValidatorRegistrations")
-	defer span.End()
-
-	return wrapInMetrics[*empty.Empty]("SubmitValidatorRegistrations", func() (*empty.Empty, error) {
-		return new(empty.Empty), c.submitValidatorRegistrations(ctx, in.Messages)
-	})
-}
-
-func (c *beaconApiValidatorClient) SubscribeCommitteeSubnets(ctx context.Context, in *ethpb.CommitteeSubnetsSubscribeRequest, duties []*ethpb.ValidatorDuty) (*empty.Empty, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.SubscribeCommitteeSubnets")
-	defer span.End()
-
-	return wrapInMetrics[*empty.Empty]("SubscribeCommitteeSubnets", func() (*empty.Empty, error) {
-		return new(empty.Empty), c.subscribeCommitteeSubnets(ctx, in, duties)
-	})
-}
-
-func (c *beaconApiValidatorClient) ValidatorIndex(ctx context.Context, in *ethpb.ValidatorIndexRequest) (*ethpb.ValidatorIndexResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ValidatorIndex")
-	defer span.End()
-
-	return wrapInMetrics[*ethpb.ValidatorIndexResponse]("ValidatorIndex", func() (*ethpb.ValidatorIndexResponse, error) {
-		return c.validatorIndex(ctx, in)
-	})
-}
-
-func (c *beaconApiValidatorClient) ValidatorStatus(ctx context.Context, in *ethpb.ValidatorStatusRequest) (*ethpb.ValidatorStatusResponse, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.ValidatorStatus")
-	defer span.End()
-
-	return c.validatorStatus(ctx, in)
-}
-
-// Deprecated: Do not use.
-func (c *beaconApiValidatorClient) WaitForChainStart(ctx context.Context, _ *empty.Empty) (*ethpb.ChainStartResponse, error) {
-	return c.waitForChainStart(ctx)
-}
-
-func (c *beaconApiValidatorClient) StartEventStream(ctx context.Context, topics []string, eventsChannel chan<- *event.Event) {
-	client := &http.Client{} // event stream should not be subject to the same settings as other api calls, so we won't use c.jsonRestHandler.HttpClient()
-	eventStream, err := event.NewEventStream(ctx, client, c.jsonRestHandler.Host(), topics)
-	if err != nil {
-		eventsChannel <- &event.Event{
-			EventType: event.EventError,
-			Data:      []byte(errors.Wrap(err, "failed to start event stream").Error()),
-		}
-		return
-	}
-	c.isEventStreamRunning = true
-	eventStream.Subscribe(eventsChannel)
-	c.isEventStreamRunning = false
-}
-
-func (c *beaconApiValidatorClient) EventStreamIsRunning() bool {
-	return c.isEventStreamRunning
-}
-
-func (c *beaconApiValidatorClient) AggregatedSelections(ctx context.Context, selections []beacon.BeaconCommitteeSelection) ([]beacon.BeaconCommitteeSelection, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.AggregatedSelections")
-	defer span.End()
-
-	return wrapInMetrics[[]beacon.BeaconCommitteeSelection]("AggregatedSelections", func() ([]beacon.BeaconCommitteeSelection, error) {
-		return c.aggregatedSelection(ctx, selections)
-	})
-}
-
-func (c *beaconApiValidatorClient) AggregatedSyncSelections(ctx context.Context, selections []beacon.SyncCommitteeSelection) ([]beacon.SyncCommitteeSelection, error) {
-	ctx, span := trace.StartSpan(ctx, "beacon-api.AggregatedSyncSelections")
-	defer span.End()
-
-	return wrapInMetrics[[]beacon.SyncCommitteeSelection]("AggregatedSyncSelections", func() ([]beacon.SyncCommitteeSelection, error) {
-		return c.aggregatedSyncSelections(ctx, selections)
-	})
-}
-
-func (c *beaconApiValidatorClient) aggregatedSelection(ctx context.Context, selections []beacon.BeaconCommitteeSelection) ([]beacon.BeaconCommitteeSelection, error) {
-	body, err := json.Marshal(selections)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal selections")
-	}
-
-	var resp beacon.AggregatedSelectionResponse
-	err = c.jsonRestHandler.Post(ctx, "/eth/v1/validator/beacon_committee_selections", nil, bytes.NewBuffer(body), &resp)
-	if err != nil {
-		return nil, errors.Wrap(err, "error calling post endpoint")
-	}
-	if len(resp.Data) == 0 {
-		return nil, errors.New("no aggregated selection returned")
-	}
-	if len(selections) != len(resp.Data) {
-		return nil, errors.New("mismatching number of selections")
-	}
-
-	return resp.Data, nil
-}
-
-func wrapInMetrics[Resp any](action string, f func() (Resp, error)) (Resp, error) {
-	now := time.Now()
-	resp, err := f()
-	httpActionCount.WithLabelValues(action).Inc()
-	if err == nil {
-		httpActionLatency.WithLabelValues(action).Observe(time.Since(now).Seconds())
-	} else {
-		failedHTTPActionCount.WithLabelValues(action).Inc()
-	}
-	return resp, err
-}
-
-func (c *beaconApiValidatorClient) Host() string {
-	return c.jsonRestHandler.Host()
-}
-
-func (c *beaconApiValidatorClient) SetHost(host string) {
-	c.jsonRestHandler.SetHost(host)
-}

api/client/beacon/validator_api/submit_aggregate_selection_proof.go

@@ -1,175 +0,0 @@
-package validator_api
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-)
-
-func (c *beaconApiValidatorClient) submitAggregateSelectionProof(
-	ctx context.Context,
-	in *ethpb.AggregateSelectionRequest,
-	index primitives.ValidatorIndex,
-	committeeLength uint64,
-) (*ethpb.AggregateSelectionResponse, error) {
-	attestationDataRoot, err := c.getAttestationDataRootFromRequest(ctx, in, committeeLength)
-	if err != nil {
-		return nil, err
-	}
-
-	aggregateAttestationResponse, err := c.aggregateAttestation(ctx, in.Slot, attestationDataRoot, in.CommitteeIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	var attData *structs.Attestation
-	if err := json.Unmarshal(aggregateAttestationResponse.Data, &attData); err != nil {
-		return nil, errors.Wrap(err, "failed to unmarshal aggregate attestation data")
-	}
-
-	aggregatedAttestation, err := convertAttestationToProto(attData)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to convert aggregate attestation json to proto")
-	}
-
-	return &ethpb.AggregateSelectionResponse{
-		AggregateAndProof: &ethpb.AggregateAttestationAndProof{
-			AggregatorIndex: index,
-			Aggregate:       aggregatedAttestation,
-			SelectionProof:  in.SlotSignature,
-		},
-	}, nil
-}
-
-func (c *beaconApiValidatorClient) submitAggregateSelectionProofElectra(
-	ctx context.Context,
-	in *ethpb.AggregateSelectionRequest,
-	index primitives.ValidatorIndex,
-	committeeLength uint64,
-) (*ethpb.AggregateSelectionElectraResponse, error) {
-	attestationDataRoot, err := c.getAttestationDataRootFromRequest(ctx, in, committeeLength)
-	if err != nil {
-		return nil, err
-	}
-
-	aggregateAttestationResponse, err := c.aggregateAttestationElectra(ctx, in.Slot, attestationDataRoot, in.CommitteeIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	var attData *structs.AttestationElectra
-	if err := json.Unmarshal(aggregateAttestationResponse.Data, &attData); err != nil {
-		return nil, errors.Wrap(err, "failed to unmarshal aggregate attestation electra data")
-	}
-
-	aggregatedAttestation, err := convertAttestationElectraToProto(attData)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to convert aggregate attestation json to proto")
-	}
-
-	return &ethpb.AggregateSelectionElectraResponse{
-		AggregateAndProof: &ethpb.AggregateAttestationAndProofElectra{
-			AggregatorIndex: index,
-			Aggregate:       aggregatedAttestation,
-			SelectionProof:  in.SlotSignature,
-		},
-	}, nil
-}
-
-func (c *beaconApiValidatorClient) getAttestationDataRootFromRequest(ctx context.Context, in *ethpb.AggregateSelectionRequest, committeeLength uint64) ([]byte, error) {
-	isOptimistic, err := c.isOptimistic(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// An optimistic validator MUST NOT participate in attestation. (i.e., sign across the DOMAIN_BEACON_ATTESTER, DOMAIN_SELECTION_PROOF or DOMAIN_AGGREGATE_AND_PROOF domains).
-	if isOptimistic {
-		return nil, errors.New("the node is currently optimistic and cannot serve validators")
-	}
-
-	isAggregator, err := helpers.IsAggregator(committeeLength, in.SlotSignature)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get aggregator status")
-	}
-	if !isAggregator {
-		return nil, errors.New("validator is not an aggregator")
-	}
-
-	attestationData, err := c.attestationData(ctx, in.Slot, in.CommitteeIndex)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get attestation data for slot=%d and committee_index=%d", in.Slot, in.CommitteeIndex)
-	}
-
-	attestationDataRoot, err := attestationData.HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to calculate attestation data root")
-	}
-	return attestationDataRoot[:], nil
-}
-
-func (c *beaconApiValidatorClient) aggregateAttestation(
-	ctx context.Context,
-	slot primitives.Slot,
-	attestationDataRoot []byte,
-	committeeIndex primitives.CommitteeIndex,
-) (*structs.AggregateAttestationResponse, error) {
-	params := url.Values{}
-	params.Add("slot", strconv.FormatUint(uint64(slot), 10))
-	params.Add("attestation_data_root", hexutil.Encode(attestationDataRoot))
-	params.Add("committee_index", strconv.FormatUint(uint64(committeeIndex), 10))
-	endpoint := apiutil.BuildURL("/eth/v2/validator/aggregate_attestation", params)
-
-	var aggregateAttestationResponse structs.AggregateAttestationResponse
-	err := c.jsonRestHandler.Get(ctx, endpoint, &aggregateAttestationResponse)
-	errJson := &httputil.DefaultJsonError{}
-	if err != nil {
-		// TODO: remove this when v2 becomes default
-		if !errors.As(err, &errJson) {
-			return nil, err
-		}
-		if errJson.Code != http.StatusNotFound {
-			return nil, errJson
-		}
-		log.Debug("Endpoint /eth/v2/validator/aggregate_attestation is not supported, falling back to older endpoints for get aggregated attestation.")
-		params = url.Values{}
-		params.Add("slot", strconv.FormatUint(uint64(slot), 10))
-		params.Add("attestation_data_root", hexutil.Encode(attestationDataRoot))
-		oldEndpoint := apiutil.BuildURL("/eth/v1/validator/aggregate_attestation", params)
-		if err = c.jsonRestHandler.Get(ctx, oldEndpoint, &aggregateAttestationResponse); err != nil {
-			return nil, err
-		}
-	}
-
-	return &aggregateAttestationResponse, nil
-}
-
-func (c *beaconApiValidatorClient) aggregateAttestationElectra(
-	ctx context.Context,
-	slot primitives.Slot,
-	attestationDataRoot []byte,
-	committeeIndex primitives.CommitteeIndex,
-) (*structs.AggregateAttestationResponse, error) {
-	params := url.Values{}
-	params.Add("slot", strconv.FormatUint(uint64(slot), 10))
-	params.Add("attestation_data_root", hexutil.Encode(attestationDataRoot))
-	params.Add("committee_index", strconv.FormatUint(uint64(committeeIndex), 10))
-	endpoint := apiutil.BuildURL("/eth/v2/validator/aggregate_attestation", params)
-
-	var aggregateAttestationResponse structs.AggregateAttestationResponse
-	if err := c.jsonRestHandler.Get(ctx, endpoint, &aggregateAttestationResponse); err != nil {
-		return nil, err
-	}
-
-	return &aggregateAttestationResponse, nil
-}

api/client/beacon/validator_api/submit_aggregate_selection_proof_test.go

@@ -1,470 +0,0 @@
-package validator_api
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/validator_api/test_helpers"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestSubmitAggregateSelectionProof(t *testing.T) {
-	const (
-		pubkeyStr                    = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13"
-		syncingEndpoint              = "/eth/v1/node/syncing"
-		attestationDataEndpoint      = "/eth/v1/validator/attestation_data"
-		aggregateAttestationEndpoint = "/eth/v2/validator/aggregate_attestation"
-		validatorIndex               = primitives.ValidatorIndex(55293)
-		slotSignature                = "0x8776a37d6802c4797d113169c5fcfda50e68a32058eb6356a6f00d06d7da64c841a00c7c38b9b94a204751eca53707bd03523ce4797827d9bacff116a6e776a20bbccff4b683bf5201b610797ed0502557a58a65c8395f8a1649b976c3112d15"
-		slot                         = primitives.Slot(123)
-		committeeIndex               = primitives.CommitteeIndex(1)
-		committeesAtSlot             = uint64(1)
-	)
-
-	attestationDataResponse := generateValidAttestation(uint64(slot), uint64(committeeIndex))
-	attestationDataProto, err := attestationDataResponse.Data.ToConsensus()
-	require.NoError(t, err)
-	attestationDataRootBytes, err := attestationDataProto.HashTreeRoot()
-	require.NoError(t, err)
-
-	aggregateAttestation := &ethpb.Attestation{
-		AggregationBits: test_helpers.FillByteSlice(4, 74),
-		Data:            attestationDataProto,
-		Signature:       test_helpers.FillByteSlice(96, 82),
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	tests := []struct {
-		name                       string
-		isOptimistic               bool
-		syncingErr                 error
-		attestationDataErr         error
-		aggregateAttestationErr    error
-		attestationDataCalled      int
-		aggregateAttestationCalled int
-		expectedErrorMsg           string
-		committeesAtSlot           uint64
-	}{
-		{
-			name:                       "success",
-			attestationDataCalled:      1,
-			aggregateAttestationCalled: 1,
-		},
-		{
-			name:             "head is optimistic",
-			isOptimistic:     true,
-			expectedErrorMsg: "the node is currently optimistic and cannot serve validators",
-		},
-		{
-			name:             "syncing error",
-			syncingErr:       errors.New("bad request"),
-			expectedErrorMsg: "failed to get syncing status",
-		},
-		{
-			name:                  "attestation data error",
-			attestationDataCalled: 1,
-			attestationDataErr:    errors.New("bad request"),
-			expectedErrorMsg:      fmt.Sprintf("failed to get attestation data for slot=%d and committee_index=%d", slot, committeeIndex),
-		},
-		{
-			name:                       "aggregate attestation error",
-			attestationDataCalled:      1,
-			aggregateAttestationCalled: 1,
-			aggregateAttestationErr:    errors.New("bad request"),
-			expectedErrorMsg:           "bad request",
-		},
-		{
-			name:             "validator is not an aggregator",
-			committeesAtSlot: 64,
-			expectedErrorMsg: "validator is not an aggregator",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			ctx := context.Background()
-			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-			// Call node syncing endpoint to check if head is optimistic.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				syncingEndpoint,
-				&structs.SyncStatusResponse{},
-			).SetArg(
-				2,
-				structs.SyncStatusResponse{
-					Data: &structs.SyncStatusResponseData{
-						IsOptimistic: test.isOptimistic,
-					},
-				},
-			).Return(
-				test.syncingErr,
-			).Times(1)
-
-			// Call attestation data to get attestation data root to query aggregate attestation.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				fmt.Sprintf("%s?committee_index=%d&slot=%d", attestationDataEndpoint, committeeIndex, slot),
-				&structs.GetAttestationDataResponse{},
-			).SetArg(
-				2,
-				attestationDataResponse,
-			).Return(
-				test.attestationDataErr,
-			).Times(test.attestationDataCalled)
-
-			attestationJSON, err := json.Marshal(jsonifyAttestation(aggregateAttestation))
-			require.NoError(t, err)
-
-			// Call attestation data to get attestation data root to query aggregate attestation.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				fmt.Sprintf("%s?attestation_data_root=%s&committee_index=%d&slot=%d", aggregateAttestationEndpoint, hexutil.Encode(attestationDataRootBytes[:]), committeeIndex, slot),
-				&structs.AggregateAttestationResponse{},
-			).SetArg(
-				2,
-				structs.AggregateAttestationResponse{
-					Data: attestationJSON,
-				},
-			).Return(
-				test.aggregateAttestationErr,
-			).Times(test.aggregateAttestationCalled)
-
-			pubkey, err := hexutil.Decode(pubkeyStr)
-			require.NoError(t, err)
-
-			slotSignatureBytes, err := hexutil.Decode(slotSignature)
-			require.NoError(t, err)
-
-			expectedResponse := &ethpb.AggregateSelectionResponse{
-				AggregateAndProof: &ethpb.AggregateAttestationAndProof{
-					AggregatorIndex: primitives.ValidatorIndex(55293),
-					Aggregate:       aggregateAttestation,
-					SelectionProof:  slotSignatureBytes,
-				},
-			}
-
-			validatorClient := &beaconApiValidatorClient{
-				jsonRestHandler:         jsonRestHandler,
-				stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
-				dutiesProvider:          shared_providers.NewDuties(jsonRestHandler),
-			}
-
-			committees := committeesAtSlot
-			if test.committeesAtSlot != 0 {
-				committees = test.committeesAtSlot
-			}
-			actualResponse, err := validatorClient.submitAggregateSelectionProof(ctx, &ethpb.AggregateSelectionRequest{
-				Slot:           slot,
-				CommitteeIndex: committeeIndex,
-				PublicKey:      pubkey,
-				SlotSignature:  slotSignatureBytes,
-			}, validatorIndex, committees)
-			if test.expectedErrorMsg == "" {
-				require.NoError(t, err)
-				assert.DeepEqual(t, expectedResponse, actualResponse)
-			} else {
-				require.ErrorContains(t, test.expectedErrorMsg, err)
-			}
-		})
-	}
-}
-
-func TestSubmitAggregateSelectionProofFallBack(t *testing.T) {
-	const (
-		pubkeyStr                      = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13"
-		syncingEndpoint                = "/eth/v1/node/syncing"
-		attestationDataEndpoint        = "/eth/v1/validator/attestation_data"
-		aggregateAttestationEndpoint   = "/eth/v1/validator/aggregate_attestation"
-		aggregateAttestationV2Endpoint = "/eth/v2/validator/aggregate_attestation"
-		validatorIndex                 = primitives.ValidatorIndex(55293)
-		slotSignature                  = "0x8776a37d6802c4797d113169c5fcfda50e68a32058eb6356a6f00d06d7da64c841a00c7c38b9b94a204751eca53707bd03523ce4797827d9bacff116a6e776a20bbccff4b683bf5201b610797ed0502557a58a65c8395f8a1649b976c3112d15"
-		slot                           = primitives.Slot(123)
-		committeeIndex                 = primitives.CommitteeIndex(1)
-		committeesAtSlot               = uint64(1)
-	)
-
-	attestationDataResponse := generateValidAttestation(uint64(slot), uint64(committeeIndex))
-	attestationDataProto, err := attestationDataResponse.Data.ToConsensus()
-	require.NoError(t, err)
-	attestationDataRootBytes, err := attestationDataProto.HashTreeRoot()
-	require.NoError(t, err)
-
-	aggregateAttestation := &ethpb.Attestation{
-		AggregationBits: test_helpers.FillByteSlice(4, 74),
-		Data:            attestationDataProto,
-		Signature:       test_helpers.FillByteSlice(96, 82),
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	ctx := context.Background()
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-	// Call node syncing endpoint to check if head is optimistic.
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		syncingEndpoint,
-		&structs.SyncStatusResponse{},
-	).SetArg(
-		2,
-		structs.SyncStatusResponse{
-			Data: &structs.SyncStatusResponseData{
-				IsOptimistic: false,
-			},
-		},
-	).Return(
-		nil,
-	).Times(1)
-
-	// Call attestation data to get attestation data root to query aggregate attestation.
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?committee_index=%d&slot=%d", attestationDataEndpoint, committeeIndex, slot),
-		&structs.GetAttestationDataResponse{},
-	).SetArg(
-		2,
-		attestationDataResponse,
-	).Return(
-		nil,
-	).Times(1)
-
-	attestationJSON, err := json.Marshal(jsonifyAttestation(aggregateAttestation))
-	require.NoError(t, err)
-
-	// Call attestation data to get attestation data root to query aggregate attestation.
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?attestation_data_root=%s&committee_index=%d&slot=%d", aggregateAttestationV2Endpoint, hexutil.Encode(attestationDataRootBytes[:]), committeeIndex, slot),
-		&structs.AggregateAttestationResponse{},
-	).Return(
-		&httputil.DefaultJsonError{
-			Code: http.StatusNotFound,
-		},
-	).Times(1)
-
-	// Call attestation data to get attestation data root to query aggregate attestation.
-	jsonRestHandler.EXPECT().Get(
-		gomock.Any(),
-		fmt.Sprintf("%s?attestation_data_root=%s&slot=%d", aggregateAttestationEndpoint, hexutil.Encode(attestationDataRootBytes[:]), slot),
-		&structs.AggregateAttestationResponse{},
-	).SetArg(
-		2,
-		structs.AggregateAttestationResponse{
-			Data: attestationJSON,
-		},
-	).Return(
-		nil,
-	).Times(1)
-
-	pubkey, err := hexutil.Decode(pubkeyStr)
-	require.NoError(t, err)
-
-	slotSignatureBytes, err := hexutil.Decode(slotSignature)
-	require.NoError(t, err)
-
-	expectedResponse := &ethpb.AggregateSelectionResponse{
-		AggregateAndProof: &ethpb.AggregateAttestationAndProof{
-			AggregatorIndex: primitives.ValidatorIndex(55293),
-			Aggregate:       aggregateAttestation,
-			SelectionProof:  slotSignatureBytes,
-		},
-	}
-
-	validatorClient := &beaconApiValidatorClient{
-		jsonRestHandler:         jsonRestHandler,
-		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
-		dutiesProvider:          shared_providers.NewDuties(jsonRestHandler),
-	}
-
-	actualResponse, err := validatorClient.submitAggregateSelectionProof(ctx, &ethpb.AggregateSelectionRequest{
-		Slot:           slot,
-		CommitteeIndex: committeeIndex,
-		PublicKey:      pubkey,
-		SlotSignature:  slotSignatureBytes,
-	}, validatorIndex, committeesAtSlot)
-
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedResponse, actualResponse)
-
-}
-
-func TestSubmitAggregateSelectionProofElectra(t *testing.T) {
-	const (
-		pubkeyStr                    = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13"
-		syncingEndpoint              = "/eth/v1/node/syncing"
-		attestationDataEndpoint      = "/eth/v1/validator/attestation_data"
-		aggregateAttestationEndpoint = "/eth/v2/validator/aggregate_attestation"
-		validatorIndex               = primitives.ValidatorIndex(55293)
-		slotSignature                = "0x8776a37d6802c4797d113169c5fcfda50e68a32058eb6356a6f00d06d7da64c841a00c7c38b9b94a204751eca53707bd03523ce4797827d9bacff116a6e776a20bbccff4b683bf5201b610797ed0502557a58a65c8395f8a1649b976c3112d15"
-		slot                         = primitives.Slot(123)
-		committeeIndex               = primitives.CommitteeIndex(1)
-		committeesAtSlot             = uint64(1)
-	)
-
-	attestationDataResponse := generateValidAttestation(uint64(slot), uint64(committeeIndex))
-	attestationDataProto, err := attestationDataResponse.Data.ToConsensus()
-	require.NoError(t, err)
-	attestationDataRootBytes, err := attestationDataProto.HashTreeRoot()
-	require.NoError(t, err)
-
-	aggregateAttestation := &ethpb.AttestationElectra{
-		AggregationBits: test_helpers.FillByteSlice(4, 74),
-		Data:            attestationDataProto,
-		Signature:       test_helpers.FillByteSlice(96, 82),
-		CommitteeBits:   test_helpers.FillByteSlice(8, 83),
-	}
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	tests := []struct {
-		name                       string
-		isOptimistic               bool
-		syncingErr                 error
-		attestationDataErr         error
-		aggregateAttestationErr    error
-		attestationDataCalled      int
-		aggregateAttestationCalled int
-		expectedErrorMsg           string
-		committeesAtSlot           uint64
-	}{
-		{
-			name:                       "success",
-			attestationDataCalled:      1,
-			aggregateAttestationCalled: 1,
-		},
-		{
-			name:             "head is optimistic",
-			isOptimistic:     true,
-			expectedErrorMsg: "the node is currently optimistic and cannot serve validators",
-		},
-		{
-			name:             "syncing error",
-			syncingErr:       errors.New("bad request"),
-			expectedErrorMsg: "failed to get syncing status",
-		},
-		{
-			name:                  "attestation data error",
-			attestationDataCalled: 1,
-			attestationDataErr:    errors.New("bad request"),
-			expectedErrorMsg:      fmt.Sprintf("failed to get attestation data for slot=%d and committee_index=%d", slot, committeeIndex),
-		},
-		{
-			name:                       "aggregate attestation error",
-			attestationDataCalled:      1,
-			aggregateAttestationCalled: 1,
-			aggregateAttestationErr:    errors.New("bad request"),
-			expectedErrorMsg:           "bad request",
-		},
-		{
-			name:             "validator is not an aggregator",
-			committeesAtSlot: 64,
-			expectedErrorMsg: "validator is not an aggregator",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			ctx := context.Background()
-			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-
-			// Call node syncing endpoint to check if head is optimistic.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				syncingEndpoint,
-				&structs.SyncStatusResponse{},
-			).SetArg(
-				2,
-				structs.SyncStatusResponse{
-					Data: &structs.SyncStatusResponseData{
-						IsOptimistic: test.isOptimistic,
-					},
-				},
-			).Return(
-				test.syncingErr,
-			).Times(1)
-
-			// Call attestation data to get attestation data root to query aggregate attestation.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				fmt.Sprintf("%s?committee_index=%d&slot=%d", attestationDataEndpoint, committeeIndex, slot),
-				&structs.GetAttestationDataResponse{},
-			).SetArg(
-				2,
-				attestationDataResponse,
-			).Return(
-				test.attestationDataErr,
-			).Times(test.attestationDataCalled)
-
-			attestationJSON, err := json.Marshal(jsonifyAttestationElectra(aggregateAttestation))
-			require.NoError(t, err)
-
-			// Call attestation data to get attestation data root to query aggregate attestation.
-			jsonRestHandler.EXPECT().Get(
-				gomock.Any(),
-				fmt.Sprintf("%s?attestation_data_root=%s&committee_index=%d&slot=%d", aggregateAttestationEndpoint, hexutil.Encode(attestationDataRootBytes[:]), committeeIndex, slot),
-				&structs.AggregateAttestationResponse{},
-			).SetArg(
-				2,
-				structs.AggregateAttestationResponse{
-					Data: attestationJSON,
-				},
-			).Return(
-				test.aggregateAttestationErr,
-			).Times(test.aggregateAttestationCalled)
-
-			pubkey, err := hexutil.Decode(pubkeyStr)
-			require.NoError(t, err)
-
-			slotSignatureBytes, err := hexutil.Decode(slotSignature)
-			require.NoError(t, err)
-
-			expectedResponse := &ethpb.AggregateSelectionElectraResponse{
-				AggregateAndProof: &ethpb.AggregateAttestationAndProofElectra{
-					AggregatorIndex: primitives.ValidatorIndex(55293),
-					Aggregate:       aggregateAttestation,
-					SelectionProof:  slotSignatureBytes,
-				},
-			}
-
-			validatorClient := &beaconApiValidatorClient{
-				jsonRestHandler:         jsonRestHandler,
-				stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
-				dutiesProvider:          shared_providers.NewDuties(jsonRestHandler),
-			}
-
-			committees := committeesAtSlot
-			if test.committeesAtSlot != 0 {
-				committees = test.committeesAtSlot
-			}
-			actualResponse, err := validatorClient.submitAggregateSelectionProofElectra(ctx, &ethpb.AggregateSelectionRequest{
-				Slot:           slot,
-				CommitteeIndex: committeeIndex,
-				PublicKey:      pubkey,
-				SlotSignature:  slotSignatureBytes,
-			}, validatorIndex, committees)
-			if test.expectedErrorMsg == "" {
-				require.NoError(t, err)
-				assert.DeepEqual(t, expectedResponse, actualResponse)
-			} else {
-				require.ErrorContains(t, test.expectedErrorMsg, err)
-			}
-		})
-	}
-}

api/client/beacon/validator_api/submit_signed_aggregate_proof.go

@@ -1,68 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-)
-
-func (c *beaconApiValidatorClient) submitSignedAggregateSelectionProof(ctx context.Context, in *ethpb.SignedAggregateSubmitRequest) (*ethpb.SignedAggregateSubmitResponse, error) {
-	body, err := json.Marshal([]*structs.SignedAggregateAttestationAndProof{jsonifySignedAggregateAndProof(in.SignedAggregateAndProof)})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal SignedAggregateAttestationAndProof")
-	}
-	headers := map[string]string{"Eth-Consensus-Version": version.String(in.SignedAggregateAndProof.Version())}
-	err = c.jsonRestHandler.Post(ctx, "/eth/v2/validator/aggregate_and_proofs", headers, bytes.NewBuffer(body), nil)
-	errJson := &httputil.DefaultJsonError{}
-	if err != nil {
-		// TODO: remove this when v2 becomes default
-		if !errors.As(err, &errJson) {
-			return nil, err
-		}
-		if errJson.Code != http.StatusNotFound {
-			return nil, errJson
-		}
-		log.Debug("Endpoint /eth/v2/validator/aggregate_and_proofs is not supported, falling back to older endpoints for publish aggregate and proofs.")
-		if err = c.jsonRestHandler.Post(
-			ctx,
-			"/eth/v1/validator/aggregate_and_proofs",
-			nil,
-			bytes.NewBuffer(body),
-			nil,
-		); err != nil {
-			return nil, err
-		}
-	}
-
-	attestationDataRoot, err := in.SignedAggregateAndProof.Message.Aggregate.Data.HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to compute attestation data root")
-	}
-
-	return &ethpb.SignedAggregateSubmitResponse{AttestationDataRoot: attestationDataRoot[:]}, nil
-}
-
-func (c *beaconApiValidatorClient) submitSignedAggregateSelectionProofElectra(ctx context.Context, in *ethpb.SignedAggregateSubmitElectraRequest) (*ethpb.SignedAggregateSubmitResponse, error) {
-	body, err := json.Marshal([]*structs.SignedAggregateAttestationAndProofElectra{jsonifySignedAggregateAndProofElectra(in.SignedAggregateAndProof)})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal SignedAggregateAttestationAndProofElectra")
-	}
-	headers := map[string]string{"Eth-Consensus-Version": version.String(in.SignedAggregateAndProof.Version())}
-	if err = c.jsonRestHandler.Post(ctx, "/eth/v2/validator/aggregate_and_proofs", headers, bytes.NewBuffer(body), nil); err != nil {
-		return nil, err
-	}
-
-	attestationDataRoot, err := in.SignedAggregateAndProof.Message.Aggregate.Data.HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to compute attestation data root")
-	}
-
-	return &ethpb.SignedAggregateSubmitResponse{AttestationDataRoot: attestationDataRoot[:]}, nil
-}

api/client/beacon/validator_api/submit_signed_aggregate_proof_test.go

@@ -1,239 +0,0 @@
-package validator_api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http"
-	"testing"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
-	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/validator_api/test_helpers"
-	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/network/httputil"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-	"github.com/prysmaticlabs/prysm/v5/testing/assert"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"go.uber.org/mock/gomock"
-)
-
-func TestSubmitSignedAggregateSelectionProof_Valid(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	signedAggregateAndProof := generateSignedAggregateAndProofJson()
-	marshalledSignedAggregateSignedAndProof, err := json.Marshal([]*structs.SignedAggregateAttestationAndProof{jsonifySignedAggregateAndProof(signedAggregateAndProof)})
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	headers := map[string]string{"Eth-Consensus-Version": version.String(signedAggregateAndProof.Message.Version())}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/validator/aggregate_and_proofs",
-		headers,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProof),
-		nil,
-	).Return(
-		nil,
-	).Times(1)
-
-	attestationDataRoot, err := signedAggregateAndProof.Message.Aggregate.Data.HashTreeRoot()
-	require.NoError(t, err)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	resp, err := validatorClient.submitSignedAggregateSelectionProof(ctx, &ethpb.SignedAggregateSubmitRequest{
-		SignedAggregateAndProof: signedAggregateAndProof,
-	})
-	require.NoError(t, err)
-	assert.DeepEqual(t, attestationDataRoot[:], resp.AttestationDataRoot)
-}
-
-func TestSubmitSignedAggregateSelectionProof_BadRequest(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	signedAggregateAndProof := generateSignedAggregateAndProofJson()
-	marshalledSignedAggregateSignedAndProof, err := json.Marshal([]*structs.SignedAggregateAttestationAndProof{jsonifySignedAggregateAndProof(signedAggregateAndProof)})
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	headers := map[string]string{"Eth-Consensus-Version": version.String(signedAggregateAndProof.Message.Version())}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/validator/aggregate_and_proofs",
-		headers,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProof),
-		nil,
-	).Return(
-		errors.New("bad request"),
-	).Times(1)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	_, err = validatorClient.submitSignedAggregateSelectionProof(ctx, &ethpb.SignedAggregateSubmitRequest{
-		SignedAggregateAndProof: signedAggregateAndProof,
-	})
-	assert.ErrorContains(t, "bad request", err)
-}
-
-func TestSubmitSignedAggregateSelectionProof_Fallback(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	signedAggregateAndProof := generateSignedAggregateAndProofJson()
-	marshalledSignedAggregateSignedAndProof, err := json.Marshal([]*structs.SignedAggregateAttestationAndProof{jsonifySignedAggregateAndProof(signedAggregateAndProof)})
-	require.NoError(t, err)
-
-	ctx := context.Background()
-
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	headers := map[string]string{"Eth-Consensus-Version": version.String(signedAggregateAndProof.Message.Version())}
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/validator/aggregate_and_proofs",
-		headers,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProof),
-		nil,
-	).Return(
-		&httputil.DefaultJsonError{
-			Code: http.StatusNotFound,
-		},
-	).Times(1)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v1/validator/aggregate_and_proofs",
-		nil,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProof),
-		nil,
-	).Return(
-		nil,
-	).Times(1)
-
-	attestationDataRoot, err := signedAggregateAndProof.Message.Aggregate.Data.HashTreeRoot()
-	require.NoError(t, err)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	resp, err := validatorClient.submitSignedAggregateSelectionProof(ctx, &ethpb.SignedAggregateSubmitRequest{
-		SignedAggregateAndProof: signedAggregateAndProof,
-	})
-	require.NoError(t, err)
-	assert.DeepEqual(t, attestationDataRoot[:], resp.AttestationDataRoot)
-}
-
-func TestSubmitSignedAggregateSelectionProofElectra_Valid(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	signedAggregateAndProofElectra := generateSignedAggregateAndProofElectraJson()
-	marshalledSignedAggregateSignedAndProofElectra, err := json.Marshal([]*structs.SignedAggregateAttestationAndProofElectra{jsonifySignedAggregateAndProofElectra(signedAggregateAndProofElectra)})
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	headers := map[string]string{"Eth-Consensus-Version": version.String(signedAggregateAndProofElectra.Message.Version())}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/validator/aggregate_and_proofs",
-		headers,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProofElectra),
-		nil,
-	).Return(
-		nil,
-	).Times(1)
-
-	attestationDataRoot, err := signedAggregateAndProofElectra.Message.Aggregate.Data.HashTreeRoot()
-	require.NoError(t, err)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	resp, err := validatorClient.submitSignedAggregateSelectionProofElectra(ctx, &ethpb.SignedAggregateSubmitElectraRequest{
-		SignedAggregateAndProof: signedAggregateAndProofElectra,
-	})
-	require.NoError(t, err)
-	assert.DeepEqual(t, attestationDataRoot[:], resp.AttestationDataRoot)
-}
-
-func TestSubmitSignedAggregateSelectionProofElectra_BadRequest(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	signedAggregateAndProofElectra := generateSignedAggregateAndProofElectraJson()
-	marshalledSignedAggregateSignedAndProofElectra, err := json.Marshal([]*structs.SignedAggregateAttestationAndProofElectra{jsonifySignedAggregateAndProofElectra(signedAggregateAndProofElectra)})
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	headers := map[string]string{"Eth-Consensus-Version": version.String(signedAggregateAndProofElectra.Message.Version())}
-	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
-	jsonRestHandler.EXPECT().Post(
-		gomock.Any(),
-		"/eth/v2/validator/aggregate_and_proofs",
-		headers,
-		bytes.NewBuffer(marshalledSignedAggregateSignedAndProofElectra),
-		nil,
-	).Return(
-		errors.New("bad request"),
-	).Times(1)
-
-	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
-	_, err = validatorClient.submitSignedAggregateSelectionProofElectra(ctx, &ethpb.SignedAggregateSubmitElectraRequest{
-		SignedAggregateAndProof: signedAggregateAndProofElectra,
-	})
-	assert.ErrorContains(t, "bad request", err)
-}
-
-func generateSignedAggregateAndProofJson() *ethpb.SignedAggregateAttestationAndProof {
-	return &ethpb.SignedAggregateAttestationAndProof{
-		Message: &ethpb.AggregateAttestationAndProof{
-			AggregatorIndex: 72,
-			Aggregate: &ethpb.Attestation{
-				AggregationBits: test_helpers.FillByteSlice(4, 74),
-				Data: &ethpb.AttestationData{
-					Slot:            75,
-					CommitteeIndex:  76,
-					BeaconBlockRoot: test_helpers.FillByteSlice(32, 38),
-					Source: &ethpb.Checkpoint{
-						Epoch: 78,
-						Root:  test_helpers.FillByteSlice(32, 79),
-					},
-					Target: &ethpb.Checkpoint{
-						Epoch: 80,
-						Root:  test_helpers.FillByteSlice(32, 81),
-					},
-				},
-				Signature: test_helpers.FillByteSlice(96, 82),
-			},
-			SelectionProof: test_helpers.FillByteSlice(96, 82),
-		},
-		Signature: test_helpers.FillByteSlice(96, 82),
-	}
-}
-
-func generateSignedAggregateAndProofElectraJson() *ethpb.SignedAggregateAttestationAndProofElectra {
-	return &ethpb.SignedAggregateAttestationAndProofElectra{
-		Message: &ethpb.AggregateAttestationAndProofElectra{
-			AggregatorIndex: 72,
-			Aggregate: &ethpb.AttestationElectra{
-				AggregationBits: test_helpers.FillByteSlice(4, 74),
-				Data: &ethpb.AttestationData{
-					Slot:            75,
-					CommitteeIndex:  76,
-					BeaconBlockRoot: test_helpers.FillByteSlice(32, 38),
-					Source: &ethpb.Checkpoint{
-						Epoch: 78,
-						Root:  test_helpers.FillByteSlice(32, 79),
-					},
-					Target: &ethpb.Checkpoint{
-						Epoch: 80,
-						Root:  test_helpers.FillByteSlice(32, 81),
-					},
-				},
-				Signature:     test_helpers.FillByteSlice(96, 82),
-				CommitteeBits: test_helpers.FillByteSlice(8, 83),
-			},
-			SelectionProof: test_helpers.FillByteSlice(96, 84),
-		},
-		Signature: test_helpers.FillByteSlice(96, 85),
-	}
-}

api/client/builder/BUILD.bazel

@@ -12,11 +12,8 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//api:go_default_library",
-        "//api/client:go_default_library",
-        "//api/server:go_default_library",
         "//api/server/structs:go_default_library",
         "//config/fieldparams:go_default_library",
-        "//config/params:go_default_library",
         "//consensus-types:go_default_library",
         "//consensus-types/blocks:go_default_library",
         "//consensus-types/interfaces:go_default_library",
@@ -24,16 +21,14 @@ go_library(
         "//encoding/bytesutil:go_default_library",
         "//math:go_default_library",
         "//monitoring/tracing:go_default_library",
-        "//monitoring/tracing/trace:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//runtime/version:go_default_library",
-        "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prysmaticlabs_fastssz//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
-        "@io_opentelemetry_go_contrib_instrumentation_net_http_otelhttp//:go_default_library",
+        "@io_opencensus_go//trace:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
@@ -47,7 +42,6 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":go_default_library"],
     deps = [
-        "//api:go_default_library",
         "//api/server/structs:go_default_library",
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
@@ -61,7 +55,6 @@ go_test(
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
         "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
     ],

api/client/builder/bid.go

@@ -1,12 +1,12 @@
 package builder
 
 import (
+	"github.com/pkg/errors"
 	ssz "github.com/prysmaticlabs/fastssz"
 	consensus_types "github.com/prysmaticlabs/prysm/v5/consensus-types"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	v1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 )
@@ -22,6 +22,7 @@ type SignedBid interface {
 // Bid is an interface describing the method set of a builder bid.
 type Bid interface {
 	Header() (interfaces.ExecutionData, error)
+	BlobKzgCommitments() ([][]byte, error)
 	Value() primitives.Wei
 	Pubkey() []byte
 	Version() int
@@ -30,18 +31,6 @@ type Bid interface {
 	HashTreeRootWith(hh *ssz.Hasher) error
 }
 
-// BidDeneb is an interface that exposes newly added kzg commitments on top of builder bid
-type BidDeneb interface {
-	Bid
-	BlobKzgCommitments() [][]byte
-}
-
-// BidElectra is an interface that exposes the newly added execution requests on top of the builder bid
-type BidElectra interface {
-	BidDeneb
-	ExecutionRequests() *v1.ExecutionRequests
-}
-
 type signedBuilderBid struct {
 	p *ethpb.SignedBuilderBid
 }
@@ -126,6 +115,11 @@ func (b builderBid) Header() (interfaces.ExecutionData, error) {
 	return blocks.WrappedExecutionPayloadHeader(b.p.Header)
 }
 
+// BlobKzgCommitments --
+func (b builderBid) BlobKzgCommitments() ([][]byte, error) {
+	return [][]byte{}, errors.New("blob kzg commitments not available before Deneb")
+}
+
 // Version --
 func (b builderBid) Version() int {
 	return version.Bellatrix
@@ -175,6 +169,11 @@ func (b builderBidCapella) Header() (interfaces.ExecutionData, error) {
 	return blocks.WrappedExecutionPayloadHeaderCapella(b.p.Header)
 }
 
+// BlobKzgCommitments --
+func (b builderBidCapella) BlobKzgCommitments() ([][]byte, error) {
+	return [][]byte{}, errors.New("blob kzg commitments not available before Deneb")
+}
+
 // Version --
 func (b builderBidCapella) Version() int {
 	return version.Capella
@@ -255,8 +254,8 @@ func (b builderBidDeneb) Header() (interfaces.ExecutionData, error) {
 }
 
 // BlobKzgCommitments --
-func (b builderBidDeneb) BlobKzgCommitments() [][]byte {
-	return b.p.BlobKzgCommitments
+func (b builderBidDeneb) BlobKzgCommitments() ([][]byte, error) {
+	return b.p.BlobKzgCommitments, nil
 }
 
 type signedBuilderBidDeneb struct {
@@ -291,95 +290,3 @@ func (b signedBuilderBidDeneb) Version() int {
 func (b signedBuilderBidDeneb) IsNil() bool {
 	return b.p == nil
 }
-
-type builderBidElectra struct {
-	p *ethpb.BuilderBidElectra
-}
-
-// WrappedBuilderBidElectra is a constructor which wraps a protobuf bid into an interface.
-func WrappedBuilderBidElectra(p *ethpb.BuilderBidElectra) (Bid, error) {
-	w := builderBidElectra{p: p}
-	if w.IsNil() {
-		return nil, consensus_types.ErrNilObjectWrapped
-	}
-	return w, nil
-}
-
-// Version --
-func (b builderBidElectra) Version() int {
-	return version.Electra
-}
-
-// Value --
-func (b builderBidElectra) Value() primitives.Wei {
-	return primitives.LittleEndianBytesToWei(b.p.Value)
-}
-
-// Pubkey --
-func (b builderBidElectra) Pubkey() []byte {
-	return b.p.Pubkey
-}
-
-// IsNil --
-func (b builderBidElectra) IsNil() bool {
-	return b.p == nil
-}
-
-// HashTreeRoot --
-func (b builderBidElectra) HashTreeRoot() ([32]byte, error) {
-	return b.p.HashTreeRoot()
-}
-
-// HashTreeRootWith --
-func (b builderBidElectra) HashTreeRootWith(hh *ssz.Hasher) error {
-	return b.p.HashTreeRootWith(hh)
-}
-
-// Header --
-func (b builderBidElectra) Header() (interfaces.ExecutionData, error) {
-	// We have to convert big endian to little endian because the value is coming from the execution layer.
-	return blocks.WrappedExecutionPayloadHeaderDeneb(b.p.Header)
-}
-
-// ExecutionRequests --
-func (b builderBidElectra) ExecutionRequests() *v1.ExecutionRequests {
-	return b.p.ExecutionRequests // does not copy
-}
-
-// BlobKzgCommitments --
-func (b builderBidElectra) BlobKzgCommitments() [][]byte {
-	return b.p.BlobKzgCommitments
-}
-
-type signedBuilderBidElectra struct {
-	p *ethpb.SignedBuilderBidElectra
-}
-
-// WrappedSignedBuilderBidElectra is a constructor which wraps a protobuf signed bit into an interface.
-func WrappedSignedBuilderBidElectra(p *ethpb.SignedBuilderBidElectra) (SignedBid, error) {
-	w := signedBuilderBidElectra{p: p}
-	if w.IsNil() {
-		return nil, consensus_types.ErrNilObjectWrapped
-	}
-	return w, nil
-}
-
-// Message --
-func (b signedBuilderBidElectra) Message() (Bid, error) {
-	return WrappedBuilderBidElectra(b.p.Message)
-}
-
-// Signature --
-func (b signedBuilderBidElectra) Signature() []byte {
-	return b.p.Signature
-}
-
-// Version --
-func (b signedBuilderBidElectra) Version() int {
-	return version.Electra
-}
-
-// IsNil --
-func (b signedBuilderBidElectra) IsNil() bool {
-	return b.p == nil
-}

api/client/builder/client.go

@@ -14,19 +14,16 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/api"
-	"github.com/prysmaticlabs/prysm/v5/api/client"
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing"
-	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
 	v1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 	log "github.com/sirupsen/logrus"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"go.opencensus.io/trace"
 )
 
 const (
@@ -36,14 +33,9 @@ const (
 	postRegisterValidatorPath  = "/eth/v1/builder/validators"
 )
 
-var (
-	vrExample             = &ethpb.SignedValidatorRegistrationV1{}
-	vrSize                = vrExample.SizeSSZ()
-	errMalformedHostname  = errors.New("hostname must include port, separated by one colon, like example.com:3500")
-	errMalformedRequest   = errors.New("required request data are missing")
-	errNotBlinded         = errors.New("submitted block is not blinded")
-	errVersionUnsupported = errors.New("version is not supported")
-)
+var errMalformedHostname = errors.New("hostname must include port, separated by one colon, like example.com:3500")
+var errMalformedRequest = errors.New("required request data are missing")
+var errNotBlinded = errors.New("submitted block is not blinded")
 
 // ClientOpt is a functional option for the Client type (http.Client wrapper)
 type ClientOpt func(*Client)
@@ -58,12 +50,6 @@ func WithObserver(m observer) ClientOpt {
 	}
 }
 
-func WithSSZ() ClientOpt {
-	return func(c *Client) {
-		c.sszEnabled = true
-	}
-}
-
 type requestLogger struct{}
 
 func (*requestLogger) observe(r *http.Request) (e error) {
@@ -107,10 +93,9 @@ type BuilderClient interface {
 
 // Client provides a collection of helper methods for calling Builder API endpoints.
 type Client struct {
-	hc         *http.Client
-	baseURL    *url.URL
-	obvs       []observer
-	sszEnabled bool
+	hc      *http.Client
+	baseURL *url.URL
+	obvs    []observer
 }
 
 // NewClient constructs a new client with the provided options (ex WithTimeout).
@@ -122,7 +107,7 @@ func NewClient(host string, opts ...ClientOpt) (*Client, error) {
 		return nil, err
 	}
 	c := &Client{
-		hc:      &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)},
+		hc:      &http.Client{},
 		baseURL: u,
 	}
 	for _, o := range opts {
@@ -152,7 +137,7 @@ func (c *Client) NodeURL() string {
 type reqOption func(*http.Request)
 
 // do is a generic, opinionated request function to reduce boilerplate amongst the methods in this package api/client/builder.
-func (c *Client) do(ctx context.Context, method string, path string, body io.Reader, opts ...reqOption) (res []byte, header http.Header, err error) {
+func (c *Client) do(ctx context.Context, method string, path string, body io.Reader, opts ...reqOption) (res []byte, err error) {
 	ctx, span := trace.StartSpan(ctx, "builder.client.do")
 	defer func() {
 		tracing.AnnotateError(span, err)
@@ -161,7 +146,7 @@ func (c *Client) do(ctx context.Context, method string, path string, body io.Rea
 
 	u := c.baseURL.ResolveReference(&url.URL{Path: path})
 
-	span.SetAttributes(trace.StringAttribute("url", u.String()),
+	span.AddAttributes(trace.StringAttribute("url", u.String()),
 		trace.StringAttribute("method", method))
 
 	req, err := http.NewRequestWithContext(ctx, method, u.String(), body)
@@ -191,12 +176,11 @@ func (c *Client) do(ctx context.Context, method string, path string, body io.Rea
 		err = non200Err(r)
 		return
 	}
-	res, err = io.ReadAll(io.LimitReader(r.Body, client.MaxBodySize))
+	res, err = io.ReadAll(r.Body)
 	if err != nil {
 		err = errors.Wrap(err, "error reading http response body from builder server")
 		return
 	}
-	header = r.Header
 	return
 }
 
@@ -226,145 +210,48 @@ func (c *Client) GetHeader(ctx context.Context, slot primitives.Slot, parentHash
 	if err != nil {
 		return nil, err
 	}
-	var getOpts reqOption
-	if c.sszEnabled {
-		getOpts = func(r *http.Request) {
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-	} else {
-		getOpts = func(r *http.Request) {
-			r.Header.Set("Accept", api.JsonMediaType)
-		}
-	}
-	data, header, err := c.do(ctx, http.MethodGet, path, nil, getOpts)
+	hb, err := c.do(ctx, http.MethodGet, path, nil)
 	if err != nil {
-		return nil, errors.Wrap(err, "error getting header from builder server")
+		return nil, err
 	}
-
-	bid, err := c.parseHeaderResponse(data, header)
-	if err != nil {
-		return nil, errors.Wrapf(
-			err,
-			"error rendering exec header template with slot=%d, parentHash=%#x, pubkey=%#x",
-			slot,
-			parentHash,
-			pubkey,
-		)
+	v := &VersionResponse{}
+	if err := json.Unmarshal(hb, v); err != nil {
+		return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 	}
-	return bid, nil
-}
-
-func (c *Client) parseHeaderResponse(data []byte, header http.Header) (SignedBid, error) {
-	var versionHeader string
-	if c.sszEnabled || header.Get(api.VersionHeader) != "" {
-		versionHeader = header.Get(api.VersionHeader)
-	} else {
-		// If we don't have a version header, attempt to parse JSON for version
-		v := &VersionResponse{}
-		if err := json.Unmarshal(data, v); err != nil {
-			return nil, errors.Wrap(
-				err,
-				"error unmarshaling builder GetHeader response",
-			)
+	switch strings.ToLower(v.Version) {
+	case strings.ToLower(version.String(version.Deneb)):
+		hr := &ExecHeaderResponseDeneb{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 		}
-		versionHeader = strings.ToLower(v.Version)
-	}
-
-	ver, err := version.FromString(versionHeader)
-	if err != nil {
-		return nil, errors.Wrap(err, fmt.Sprintf("unsupported header version %s", versionHeader))
-	}
-
-	if ver >= version.Electra {
-		return c.parseHeaderElectra(data)
-	}
-	if ver >= version.Deneb {
-		return c.parseHeaderDeneb(data)
-	}
-	if ver >= version.Capella {
-		return c.parseHeaderCapella(data)
-	}
-	if ver >= version.Bellatrix {
-		return c.parseHeaderBellatrix(data)
-	}
-
-	return nil, fmt.Errorf("unsupported header version %s", versionHeader)
-}
-
-func (c *Client) parseHeaderElectra(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidElectra{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidElectra SSZ")
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrapf(err, "could not extract proto message from header")
 		}
-		return WrappedSignedBuilderBidElectra(sb)
-	}
-	hr := &ExecHeaderResponseElectra{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseElectra JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseElectra to proto")
-	}
-	return WrappedSignedBuilderBidElectra(p)
-}
-
-func (c *Client) parseHeaderDeneb(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidDeneb{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidDeneb SSZ")
+		return WrappedSignedBuilderBidDeneb(p)
+	case strings.ToLower(version.String(version.Capella)):
+		hr := &ExecHeaderResponseCapella{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 		}
-		return WrappedSignedBuilderBidDeneb(sb)
-	}
-	hr := &ExecHeaderResponseDeneb{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseDeneb JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseDeneb to proto")
-	}
-	return WrappedSignedBuilderBidDeneb(p)
-}
-
-func (c *Client) parseHeaderCapella(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidCapella{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidCapella SSZ")
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrapf(err, "could not extract proto message from header")
 		}
-		return WrappedSignedBuilderBidCapella(sb)
-	}
-	hr := &ExecHeaderResponseCapella{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseCapella JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseCapella to proto")
-	}
-	return WrappedSignedBuilderBidCapella(p)
-}
-
-func (c *Client) parseHeaderBellatrix(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBid{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBid SSZ")
+		return WrappedSignedBuilderBidCapella(p)
+	case strings.ToLower(version.String(version.Bellatrix)):
+		hr := &ExecHeaderResponse{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 		}
-		return WrappedSignedBuilderBid(sb)
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrap(err, "could not extract proto message from header")
+		}
+		return WrappedSignedBuilderBid(p)
+	default:
+		return nil, fmt.Errorf("unsupported header version %s", strings.ToLower(v.Version))
 	}
-	hr := &ExecHeaderResponse{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponse JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponse to proto")
-	}
-	return WrappedSignedBuilderBid(p)
 }
 
 // RegisterValidator encodes the SignedValidatorRegistrationV1 message to json (including hex-encoding the byte
@@ -372,250 +259,73 @@ func (c *Client) parseHeaderBellatrix(data []byte) (SignedBid, error) {
 func (c *Client) RegisterValidator(ctx context.Context, svr []*ethpb.SignedValidatorRegistrationV1) error {
 	ctx, span := trace.StartSpan(ctx, "builder.client.RegisterValidator")
 	defer span.End()
-	span.SetAttributes(trace.Int64Attribute("num_reqs", int64(len(svr))))
+	span.AddAttributes(trace.Int64Attribute("num_reqs", int64(len(svr))))
 
 	if len(svr) == 0 {
 		err := errors.Wrap(errMalformedRequest, "empty validator registration list")
 		tracing.AnnotateError(span, err)
 		return err
 	}
-
-	var (
-		body     []byte
-		err      error
-		postOpts reqOption
-	)
-	if c.sszEnabled {
-		postOpts = func(r *http.Request) {
-			r.Header.Set("Content-Type", api.OctetStreamMediaType)
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-		body, err = sszValidatorRegisterRequest(svr)
-		if err != nil {
-			err := errors.Wrap(err, "error ssz encoding the SignedValidatorRegistration value body in RegisterValidator")
-			tracing.AnnotateError(span, err)
-			return err
-		}
-	} else {
-		postOpts = func(r *http.Request) {
-			r.Header.Set("Content-Type", api.JsonMediaType)
-			r.Header.Set("Accept", api.JsonMediaType)
-		}
-		body, err = jsonValidatorRegisterRequest(svr)
-		if err != nil {
-			err := errors.Wrap(err, "error json encoding the SignedValidatorRegistration value body in RegisterValidator")
-			tracing.AnnotateError(span, err)
-			return err
-		}
-	}
-
-	if _, _, err = c.do(ctx, http.MethodPost, postRegisterValidatorPath, bytes.NewBuffer(body), postOpts); err != nil {
-		return errors.Wrap(err, "do")
-	}
-	log.WithField("registrationCount", len(svr)).Debug("Successfully registered validator(s) on builder")
-	return nil
-}
-
-func jsonValidatorRegisterRequest(svr []*ethpb.SignedValidatorRegistrationV1) ([]byte, error) {
 	vs := make([]*structs.SignedValidatorRegistration, len(svr))
 	for i := 0; i < len(svr); i++ {
 		vs[i] = structs.SignedValidatorRegistrationFromConsensus(svr[i])
 	}
 	body, err := json.Marshal(vs)
 	if err != nil {
-		return nil, err
+		err := errors.Wrap(err, "error encoding the SignedValidatorRegistration value body in RegisterValidator")
+		tracing.AnnotateError(span, err)
+		return err
 	}
-	return body, nil
-}
 
-func sszValidatorRegisterRequest(svr []*ethpb.SignedValidatorRegistrationV1) ([]byte, error) {
-	if uint64(len(svr)) > params.BeaconConfig().ValidatorRegistryLimit {
-		return nil, errors.Wrap(errMalformedRequest, "validator registry limit exceeded")
-	}
-	ssz := make([]byte, vrSize*len(svr))
-	for i, vr := range svr {
-		sszrep, err := vr.MarshalSSZ()
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to marshal validator registry ssz")
-		}
-		copy(ssz[i*vrSize:(i+1)*vrSize], sszrep)
-	}
-	return ssz, nil
+	_, err = c.do(ctx, http.MethodPost, postRegisterValidatorPath, bytes.NewBuffer(body))
+	return err
 }
 
 var errResponseVersionMismatch = errors.New("builder API response uses a different version than requested in " + api.VersionHeader + " header")
 
-func getVersionsBlockToPayload(blockVersion int) (int, error) {
-	if blockVersion >= version.Deneb {
-		return version.Deneb, nil
-	}
-	if blockVersion == version.Capella {
-		return version.Capella, nil
-	}
-	if blockVersion == version.Bellatrix {
-		return version.Bellatrix, nil
-	}
-	return 0, errors.Wrapf(errVersionUnsupported, "block version %d", blockVersion)
-}
-
 // SubmitBlindedBlock calls the builder API endpoint that binds the validator to the builder and submits the block.
 // The response is the full execution payload used to create the blinded block.
 func (c *Client) SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	body, postOpts, err := c.buildBlindedBlockRequest(sb)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// post the blinded block - the execution payload response should contain the unblinded payload, along with the
-	// blobs bundle if it is post deneb.
-	data, header, err := c.do(ctx, http.MethodPost, postBlindedBeaconBlockPath, bytes.NewBuffer(body), postOpts)
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "error posting the blinded block to the builder api")
-	}
-
-	ver, err := c.checkBlockVersion(data, header)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	expectedPayloadVer, err := getVersionsBlockToPayload(sb.Version())
-	if err != nil {
-		return nil, nil, err
-	}
-	gotPayloadVer, err := getVersionsBlockToPayload(ver)
-	if err != nil {
-		return nil, nil, err
-	}
-	if expectedPayloadVer != gotPayloadVer {
-		return nil, nil, errors.Wrapf(errResponseVersionMismatch, "expected payload version %d, got %d", expectedPayloadVer, gotPayloadVer)
-	}
-
-	ed, blobs, err := c.parseBlindedBlockResponse(data, ver)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ed, blobs, nil
-}
-
-func (c *Client) checkBlockVersion(respBytes []byte, header http.Header) (int, error) {
-	var versionHeader string
-	if c.sszEnabled {
-		versionHeader = strings.ToLower(header.Get(api.VersionHeader))
-	} else {
-		// fallback to JSON-based version extraction
-		v := &VersionResponse{}
-		if err := json.Unmarshal(respBytes, v); err != nil {
-			return 0, errors.Wrapf(err, "error unmarshaling JSON version fallback")
-		}
-		versionHeader = strings.ToLower(v.Version)
-	}
-
-	ver, err := version.FromString(versionHeader)
-	if err != nil {
-		return 0, errors.Wrapf(err, "unsupported header version %s", versionHeader)
-	}
-
-	return ver, nil
-}
-
-// Helper: build request body for SubmitBlindedBlock
-func (c *Client) buildBlindedBlockRequest(sb interfaces.ReadOnlySignedBeaconBlock) ([]byte, reqOption, error) {
 	if !sb.IsBlinded() {
 		return nil, nil, errNotBlinded
 	}
 
-	if c.sszEnabled {
-		body, err := sb.MarshalSSZ()
-		if err != nil {
-			return nil, nil, errors.Wrap(err, "could not marshal SSZ for blinded block")
-		}
-		opt := func(r *http.Request) {
-			r.Header.Set(api.VersionHeader, version.String(sb.Version()))
-			r.Header.Set("Content-Type", api.OctetStreamMediaType)
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-		return body, opt, nil
-	}
-
+	// massage the proto struct type data into the api response type.
 	mj, err := structs.SignedBeaconBlockMessageJsoner(sb)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "error generating blinded beacon block post request")
 	}
+
 	body, err := json.Marshal(mj)
 	if err != nil {
-		return nil, nil, errors.Wrap(err, "error marshaling blinded block to JSON")
+		return nil, nil, errors.Wrap(err, "error marshaling blinded block post request to json")
 	}
-	opt := func(r *http.Request) {
-		r.Header.Set(api.VersionHeader, version.String(sb.Version()))
+	postOpts := func(r *http.Request) {
+		r.Header.Add("Eth-Consensus-Version", version.String(sb.Version()))
 		r.Header.Set("Content-Type", api.JsonMediaType)
 		r.Header.Set("Accept", api.JsonMediaType)
 	}
-	return body, opt, nil
-}
-
-// Helper: parse the response returned by SubmitBlindedBlock
-func (c *Client) parseBlindedBlockResponse(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	if c.sszEnabled {
-		return c.parseBlindedBlockResponseSSZ(respBytes, forkVersion)
+	// post the blinded block - the execution payload response should contain the unblinded payload, along with the
+	// blobs bundle if it is post deneb.
+	rb, err := c.do(ctx, http.MethodPost, postBlindedBeaconBlockPath, bytes.NewBuffer(body), postOpts)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "error posting the blinded block to the builder api")
 	}
-	return c.parseBlindedBlockResponseJSON(respBytes, forkVersion)
-}
-
-func (c *Client) parseBlindedBlockResponseSSZ(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	if forkVersion >= version.Deneb {
-		payloadAndBlobs := &v1.ExecutionPayloadDenebAndBlobsBundle{}
-		if err := payloadAndBlobs.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayloadDenebAndBlobsBundle SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payloadAndBlobs.Payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, payloadAndBlobs.BlobsBundle, nil
-	} else if forkVersion >= version.Capella {
-		payload := &v1.ExecutionPayloadCapella{}
-		if err := payload.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayloadCapella SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, nil, nil
-	} else if forkVersion >= version.Bellatrix {
-		payload := &v1.ExecutionPayload{}
-		if err := payload.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayload SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, nil, nil
-	} else {
-		return nil, nil, fmt.Errorf("unsupported header version %s", version.String(forkVersion))
-	}
-}
-
-func (c *Client) parseBlindedBlockResponseJSON(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+	// ExecutionPayloadResponse parses just the outer container and the Value key, enabling it to use the .Value
+	// key to determine which underlying data type to use to finish the unmarshaling.
 	ep := &ExecutionPayloadResponse{}
-	if err := json.Unmarshal(respBytes, ep); err != nil {
-		return nil, nil, errors.Wrap(err, "error unmarshaling ExecutionPayloadResponse")
+	if err := json.Unmarshal(rb, ep); err != nil {
+		return nil, nil, errors.Wrap(err, "error unmarshaling the builder ExecutionPayloadResponse")
 	}
+	if strings.ToLower(ep.Version) != version.String(sb.Version()) {
+		return nil, nil, errors.Wrapf(errResponseVersionMismatch, "req=%s, recv=%s", strings.ToLower(ep.Version), version.String(sb.Version()))
+	}
+	// This parses the rest of the response and returns the inner data field.
 	pp, err := ep.ParsePayload()
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed to parse payload with version=%s", ep.Version)
+		return nil, nil, errors.Wrapf(err, "failed to parse execution payload from builder with version=%s", ep.Version)
 	}
+	// Get the payload as a proto.Message so it can be wrapped as an execution payload interface.
 	pb, err := pp.PayloadProto()
 	if err != nil {
 		return nil, nil, err
@@ -624,13 +334,11 @@ func (c *Client) parseBlindedBlockResponseJSON(
 	if err != nil {
 		return nil, nil, err
 	}
-
-	// Check if it contains blobs
 	bb, ok := pp.(BlobBundler)
 	if ok {
 		bbpb, err := bb.BundleProto()
 		if err != nil {
-			return nil, nil, errors.Wrapf(err, "failed to extract blobs bundle from version=%s", ep.Version)
+			return nil, nil, errors.Wrapf(err, "failed to extract blobs bundle from builder response with version=%s", ep.Version)
 		}
 		return ed, bbpb, nil
 	}
@@ -641,15 +349,12 @@ func (c *Client) parseBlindedBlockResponseJSON(
 // response, and an error response may have an error message. This method will return a nil value for error in the
 // happy path, and an error with information about the server response body for a non-200 response.
 func (c *Client) Status(ctx context.Context) error {
-	getOpts := func(r *http.Request) {
-		r.Header.Set("Accept", api.JsonMediaType)
-	}
-	_, _, err := c.do(ctx, http.MethodGet, getStatus, nil, getOpts)
+	_, err := c.do(ctx, http.MethodGet, getStatus, nil)
 	return err
 }
 
 func non200Err(response *http.Response) error {
-	bodyBytes, err := io.ReadAll(io.LimitReader(response.Body, client.MaxErrBodySize))
+	bodyBytes, err := io.ReadAll(response.Body)
 	var errMessage ErrorMessage
 	var body string
 	if err != nil {
@@ -659,18 +364,6 @@ func non200Err(response *http.Response) error {
 	}
 	msg := fmt.Sprintf("code=%d, url=%s, body=%s", response.StatusCode, response.Request.URL, body)
 	switch response.StatusCode {
-	case http.StatusUnsupportedMediaType:
-		log.WithError(ErrUnsupportedMediaType).Debug(msg)
-		if jsonErr := json.Unmarshal(bodyBytes, &errMessage); jsonErr != nil {
-			return errors.Wrap(jsonErr, "unable to read response body")
-		}
-		return errors.Wrap(ErrUnsupportedMediaType, errMessage.Message)
-	case http.StatusNotAcceptable:
-		log.WithError(ErrNotAcceptable).Debug(msg)
-		if jsonErr := json.Unmarshal(bodyBytes, &errMessage); jsonErr != nil {
-			return errors.Wrap(jsonErr, "unable to read response body")
-		}
-		return errors.Wrap(ErrNotAcceptable, errMessage.Message)
 	case http.StatusNoContent:
 		log.WithError(ErrNoContent).Debug(msg)
 		return ErrNoContent

api/client/builder/client_test.go

@@ -8,14 +8,15 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strconv"
 	"testing"
 
 	"github.com/prysmaticlabs/go-bitfield"
-	"github.com/prysmaticlabs/prysm/v5/api"
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	types "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
 	v1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -87,90 +88,43 @@ func TestClient_RegisterValidator(t *testing.T) {
 	ctx := context.Background()
 	expectedBody := `[{"message":{"fee_recipient":"0x0000000000000000000000000000000000000000","gas_limit":"23","timestamp":"42","pubkey":"0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"},"signature":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"}]`
 	expectedPath := "/eth/v1/builder/validators"
-	t.Run("JSON success", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
-				body, err := io.ReadAll(r.Body)
-				defer func() {
-					require.NoError(t, r.Body.Close())
-				}()
-				require.NoError(t, err)
-				require.Equal(t, expectedBody, string(body))
-				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, http.MethodPost, r.Method)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBuffer(nil)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:      hc,
-			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
-		}
-		reg := &eth.SignedValidatorRegistrationV1{
-			Message: &eth.ValidatorRegistrationV1{
-				FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
-				GasLimit:     23,
-				Timestamp:    42,
-				Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-			},
-			Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-		}
-		require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
-	})
-	t.Run("SSZ success", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				body, err := io.ReadAll(r.Body)
-				defer func() {
-					require.NoError(t, r.Body.Close())
-				}()
-				require.NoError(t, err)
-				request := &eth.SignedValidatorRegistrationV1{}
-				itemBytes := body[:request.SizeSSZ()]
-				require.NoError(t, request.UnmarshalSSZ(itemBytes))
-				jsRequest := structs.SignedValidatorRegistrationFromConsensus(request)
-				js, err := json.Marshal([]*structs.SignedValidatorRegistration{jsRequest})
-				require.NoError(t, err)
-
-				require.Equal(t, expectedBody, string(js))
-				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, http.MethodPost, r.Method)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBuffer(nil)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		reg := &eth.SignedValidatorRegistrationV1{
-			Message: &eth.ValidatorRegistrationV1{
-				FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
-				GasLimit:     23,
-				Timestamp:    42,
-				Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-			},
-			Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-		}
-		require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
-	})
+	hc := &http.Client{
+		Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
+			body, err := io.ReadAll(r.Body)
+			defer func() {
+				require.NoError(t, r.Body.Close())
+			}()
+			require.NoError(t, err)
+			require.Equal(t, expectedBody, string(body))
+			require.Equal(t, expectedPath, r.URL.Path)
+			require.Equal(t, http.MethodPost, r.Method)
+			return &http.Response{
+				StatusCode: http.StatusOK,
+				Body:       io.NopCloser(bytes.NewBuffer(nil)),
+				Request:    r.Clone(ctx),
+			}, nil
+		}),
+	}
+	c := &Client{
+		hc:      hc,
+		baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
+	}
+	reg := &eth.SignedValidatorRegistrationV1{
+		Message: &eth.ValidatorRegistrationV1{
+			FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
+			GasLimit:     23,
+			Timestamp:    42,
+			Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
+		},
+		Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
+	}
+	require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
 }
 
 func TestClient_GetHeader(t *testing.T) {
 	ctx := context.Background()
 	expectedPath := "/eth/v1/builder/header/23/0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2/0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"
-	var slot primitives.Slot = 23
+	var slot types.Slot = 23
 	parentHash := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
 	pubkey := ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a")
 	t.Run("server error", func(t *testing.T) {
@@ -220,7 +174,6 @@ func TestClient_GetHeader(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleHeaderResponse)),
@@ -252,56 +205,9 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
 		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
 	})
-	t.Run("bellatrix ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponse), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "bellatrix")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedSig := ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505")
-		require.Equal(t, true, bytes.Equal(expectedSig, h.Signature()))
-		expectedTxRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.TransactionsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedTxRoot, withdrawalsRoot))
-		require.Equal(t, uint64(1), bidHeader.GasUsed())
-		// this matches the value in the testExampleHeaderResponse
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-	})
 	t.Run("capella", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				require.Equal(t, expectedPath, r.URL.Path)
 				return &http.Response{
 					StatusCode: http.StatusOK,
@@ -330,52 +236,9 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
 		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
 	})
-	t.Run("capella ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseCapella{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseCapella), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "capella")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-	})
 	t.Run("deneb", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				require.Equal(t, expectedPath, r.URL.Path)
 				return &http.Response{
 					StatusCode: http.StatusOK,
@@ -404,59 +267,9 @@ func TestClient_GetHeader(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
 		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		dbid, ok := bid.(builderBidDeneb)
-		require.Equal(t, true, ok)
-		kcgCommitments := dbid.BlobKzgCommitments()
-		require.Equal(t, len(kcgCommitments) > 0, true)
-		for i := range kcgCommitments {
-			require.Equal(t, len(kcgCommitments[i]) == 48, true)
-		}
-	})
-	t.Run("deneb ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseDeneb), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "deneb")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
 
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
+		kcgCommitments, err := bid.BlobKzgCommitments()
 		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		dbid, ok := bid.(builderBidDeneb)
-		require.Equal(t, true, ok)
-		kcgCommitments := dbid.BlobKzgCommitments()
 		require.Equal(t, len(kcgCommitments) > 0, true)
 		for i := range kcgCommitments {
 			require.Equal(t, len(kcgCommitments[i]) == 48, true)
@@ -478,107 +291,7 @@ func TestClient_GetHeader(t *testing.T) {
 			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
 		}
 		_, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.ErrorContains(t, "could not convert ExecHeaderResponseDeneb to proto: too many blob commitments: 7", err)
-	})
-	t.Run("electra", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBufferString(testExampleHeaderResponseElectra)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:      hc,
-			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		ebid, ok := bid.(builderBidElectra)
-		require.Equal(t, true, ok)
-		kcgCommitments := ebid.BlobKzgCommitments()
-		require.Equal(t, len(kcgCommitments) > 0, true)
-		for i := range kcgCommitments {
-			require.Equal(t, len(kcgCommitments[i]) == 48, true)
-		}
-		requests := ebid.ExecutionRequests()
-		require.Equal(t, 1, len(requests.Deposits))
-		require.Equal(t, 1, len(requests.Withdrawals))
-		require.Equal(t, 1, len(requests.Consolidations))
-
-	})
-	t.Run("electra ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseElectra{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseElectra), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "electra")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		ebid, ok := bid.(builderBidElectra)
-		require.Equal(t, true, ok)
-		kcgCommitments := ebid.BlobKzgCommitments()
-		require.Equal(t, len(kcgCommitments) > 0, true)
-		for i := range kcgCommitments {
-			require.Equal(t, len(kcgCommitments[i]) == 48, true)
-		}
-		requests := ebid.ExecutionRequests()
-		require.Equal(t, 1, len(requests.Deposits))
-		require.Equal(t, 1, len(requests.Withdrawals))
-		require.Equal(t, 1, len(requests.Consolidations))
-
+		require.ErrorContains(t, "could not extract proto message from header: too many blob commitments: 7", err)
 	})
 	t.Run("unsupported version", func(t *testing.T) {
 		hc := &http.Client{
@@ -608,8 +321,8 @@ func TestSubmitBlindedBlock(t *testing.T) {
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
 				require.Equal(t, "bellatrix", r.Header.Get("Eth-Consensus-Version"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayload)),
@@ -631,53 +344,13 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		require.Equal(t, fmt.Sprintf("%#x", bfpg.SSZBytes()), fmt.Sprintf("%#x", ep.BaseFeePerGas()))
 		require.Equal(t, uint64(1), ep.GasLimit())
 	})
-	t.Run("bellatrix ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "bellatrix", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecutionPayloadResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayload), epr))
-				ep := &ExecutionPayload{}
-				require.NoError(t, json.Unmarshal(epr.Data, ep))
-				pro, err := ep.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "bellatrix")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbbb, err := blocks.NewSignedBeaconBlock(testSignedBlindedBeaconBlockBellatrix(t))
-		require.NoError(t, err)
-		ep, _, err := c.SubmitBlindedBlock(ctx, sbbb)
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), ep.ParentHash()))
-		bfpg, err := stringToUint256("452312848583266388373324160190187140051835877600158453279131187530910662656")
-		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf("%#x", bfpg.SSZBytes()), fmt.Sprintf("%#x", ep.BaseFeePerGas()))
-		require.Equal(t, uint64(1), ep.GasLimit())
-	})
 	t.Run("capella", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "capella", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "capella", r.Header.Get("Eth-Consensus-Version"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayloadCapella)),
@@ -697,49 +370,7 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 1, len(withdrawals))
 		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-	})
-	t.Run("capella ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "capella", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecutionPayloadResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadCapella), epr))
-				ep := &ExecutionPayloadCapella{}
-				require.NoError(t, json.Unmarshal(epr.Data, ep))
-				pro, err := ep.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "capella")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(testSignedBlindedBeaconBlockCapella(t))
-		require.NoError(t, err)
-		ep, _, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
+		assert.Equal(t, types.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
 		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
 		assert.Equal(t, uint64(1), withdrawals[0].Amount)
 	})
@@ -748,9 +379,9 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "deneb", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "deneb", r.Header.Get("Eth-Consensus-Version"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				var req structs.SignedBlindedBeaconBlockDeneb
 				err := json.NewDecoder(r.Body).Decode(&req)
 				require.NoError(t, err)
@@ -778,141 +409,7 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 1, len(withdrawals))
 		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
-	t.Run("deneb ssz", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockDeneb(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "deneb", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecPayloadResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadDeneb), epr))
-				pro, blob, err := epr.ToProto()
-				require.NoError(t, err)
-				combined := &v1.ExecutionPayloadDenebAndBlobsBundle{
-					Payload:     pro,
-					BlobsBundle: blob,
-				}
-				ssz, err := combined.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "deneb")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
-	t.Run("electra", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockElectra(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "electra", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
-				var req structs.SignedBlindedBeaconBlockElectra
-				err := json.NewDecoder(r.Body).Decode(&req)
-				require.NoError(t, err)
-				block, err := req.ToConsensus()
-				require.NoError(t, err)
-				require.DeepEqual(t, block, test)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayloadDeneb)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:      hc,
-			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
-		}
-
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
-	t.Run("electra ssz", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockElectra(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "electra", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecPayloadResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadDeneb), epr))
-				pro, blob, err := epr.ToProto()
-				require.NoError(t, err)
-				combined := &v1.ExecutionPayloadDenebAndBlobsBundle{
-					Payload:     pro,
-					BlobsBundle: blob,
-				}
-				ssz, err := combined.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "electra")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
+		assert.Equal(t, types.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
 		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
 		assert.Equal(t, uint64(1), withdrawals[0].Amount)
 		require.NotNil(t, blobBundle)
@@ -1043,13 +540,7 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1068,8 +559,8 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 					},
 				},
 				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      make(bitfield.Bitvector512, 64),
+					SyncCommitteeSignature: make([]byte, 48),
+					SyncCommitteeBits:      bitfield.Bitvector512{0x01},
 				},
 				ExecutionPayloadHeader: &v1.ExecutionPayloadHeader{
 					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1083,7 +574,7 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 					GasUsed:          1,
 					Timestamp:        1,
 					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    ezDecode(t, "0x4523128485832663883733241601901871400518358776001584532791311875"),
+					BaseFeePerGas:    []byte(strconv.FormatUint(1, 10)),
 					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 				},
@@ -1191,13 +682,7 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1216,8 +701,8 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 					},
 				},
 				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      make(bitfield.Bitvector512, 64),
+					SyncCommitteeSignature: make([]byte, 48),
+					SyncCommitteeBits:      bitfield.Bitvector512{0x01},
 				},
 				ExecutionPayloadHeader: &v1.ExecutionPayloadHeaderCapella{
 					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1231,7 +716,7 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 					GasUsed:          1,
 					Timestamp:        1,
 					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    ezDecode(t, "0x4523128485832663883733241601901871400518358776001584532791311875"),
+					BaseFeePerGas:    []byte(strconv.FormatUint(1, 10)),
 					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					WithdrawalsRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1344,13 +829,7 @@ func testSignedBlindedBeaconBlockDeneb(t *testing.T) *eth.SignedBlindedBeaconBlo
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1397,163 +876,6 @@ func testSignedBlindedBeaconBlockDeneb(t *testing.T) *eth.SignedBlindedBeaconBlo
 	}
 }
 
-func testSignedBlindedBeaconBlockElectra(t *testing.T) *eth.SignedBlindedBeaconBlockElectra {
-	basebytes, err := bytesutil.Uint256ToSSZBytes("14074904626401341155369551180448584754667373453244490859944217516317499064576")
-	if err != nil {
-		log.Error(err)
-	}
-	return &eth.SignedBlindedBeaconBlockElectra{
-		Message: &eth.BlindedBeaconBlockElectra{
-			Slot:          1,
-			ProposerIndex: 1,
-			ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-			StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-			Body: &eth.BlindedBeaconBlockBodyElectra{
-				RandaoReveal: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-				Eth1Data: &eth.Eth1Data{
-					DepositRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					DepositCount: 1,
-					BlockHash:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-				},
-				Graffiti: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-				ProposerSlashings: []*eth.ProposerSlashing{
-					{
-						Header_1: &eth.SignedBeaconBlockHeader{
-							Header: &eth.BeaconBlockHeader{
-								Slot:          1,
-								ProposerIndex: 1,
-								ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								BodyRoot:      ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-						Header_2: &eth.SignedBeaconBlockHeader{
-							Header: &eth.BeaconBlockHeader{
-								Slot:          1,
-								ProposerIndex: 1,
-								ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								BodyRoot:      ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				AttesterSlashings: []*eth.AttesterSlashingElectra{
-					{
-						Attestation_1: &eth.IndexedAttestationElectra{
-							AttestingIndices: []uint64{1},
-							Data: &eth.AttestationData{
-								Slot:            1,
-								CommitteeIndex:  1,
-								BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								Source: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-								Target: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-						Attestation_2: &eth.IndexedAttestationElectra{
-							AttestingIndices: []uint64{1},
-							Data: &eth.AttestationData{
-								Slot:            1,
-								CommitteeIndex:  1,
-								BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								Source: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-								Target: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				Attestations: []*eth.AttestationElectra{
-					{
-						AggregationBits: bitfield.Bitlist{0x01},
-						Data: &eth.AttestationData{
-							Slot:            1,
-							CommitteeIndex:  1,
-							BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							Source: &eth.Checkpoint{
-								Epoch: 1,
-								Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Target: &eth.Checkpoint{
-								Epoch: 1,
-								Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-						},
-						CommitteeBits: make(bitfield.Bitvector64, 8),
-						Signature:     ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-					},
-				},
-				Deposits: []*eth.Deposit{
-					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
-						Data: &eth.Deposit_Data{
-							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							Amount:                1,
-							Signature:             ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				VoluntaryExits: []*eth.SignedVoluntaryExit{
-					{
-						Exit: &eth.VoluntaryExit{
-							Epoch:          1,
-							ValidatorIndex: 1,
-						},
-						Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-					},
-				},
-				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      ezDecode(t, "0x6451e9f951ebf05edc01de67e593484b672877054f055903ff0df1a1a945cf30ca26bb4d4b154f94a1bc776bcf5d0efb3603e1f9b8ee2499ccdcfe2a18cef458"),
-				},
-				ExecutionRequests: &v1.ExecutionRequests{},
-				ExecutionPayloadHeader: &v1.ExecutionPayloadHeaderDeneb{
-					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					FeeRecipient:     ezDecode(t, "0xabcf8e0d4e9587369b2301d0790347320302cc09"),
-					StateRoot:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					ReceiptsRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					LogsBloom:        ezDecode(t, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
-					PrevRandao:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BlockNumber:      1,
-					GasLimit:         1,
-					GasUsed:          1,
-					Timestamp:        1,
-					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    basebytes,
-					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					WithdrawalsRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BlobGasUsed:      1,
-					ExcessBlobGas:    2,
-				},
-			},
-		},
-		Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-	}
-}
-
 func TestRequestLogger(t *testing.T) {
 	wo := WithObserver(&requestLogger{})
 	c, err := NewClient("localhost:3500", wo)

api/client/builder/errors.go

@@ -15,9 +15,3 @@ var ErrBadRequest = errors.Wrap(ErrNotOK, "recv 400 BadRequest response from API
 // ErrNoContent specifically means that a '204 - No Content' response was received from the API.
 // Typically, a 204 is a success but in this case for the Header API means No header is available
 var ErrNoContent = errors.New("recv 204 no content response from API, No header is available")
-
-// ErrUnsupportedMediaType specifically means that a '415 - Unsupported Media Type' was received from the API.
-var ErrUnsupportedMediaType = errors.Wrap(ErrNotOK, "The media type in \"Content-Type\" header is unsupported, and the request has been rejected. This occurs when a HTTP request supplies a payload in a content-type that the server is not able to handle.")
-
-// ErrNotAcceptable specifically means that a '406 - Not Acceptable' was received from the API.
-var ErrNotAcceptable = errors.Wrap(ErrNotOK, "The accept header value is not acceptable")

api/client/builder/types.go

@@ -5,15 +5,12 @@ import (
 	"fmt"
 	"math/big"
 	"strconv"
-	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v5/api/server"
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
 	consensusblocks "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	types "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
 	"github.com/prysmaticlabs/prysm/v5/math"
@@ -416,10 +413,54 @@ func FromProtoDeneb(payload *v1.ExecutionPayloadDeneb) (ExecutionPayloadDeneb, e
 	}, nil
 }
 
+var errInvalidTypeConversion = errors.New("unable to translate between api and foreign type")
+
+// ExecutionPayloadResponseFromData converts an ExecutionData interface value to a payload response.
+// This involves serializing the execution payload value so that the abstract payload envelope can be used.
+func ExecutionPayloadResponseFromData(ed interfaces.ExecutionData, bundle *v1.BlobsBundle) (*ExecutionPayloadResponse, error) {
+	pb := ed.Proto()
+	var data interface{}
+	var err error
+	var ver string
+	switch pbStruct := pb.(type) {
+	case *v1.ExecutionPayload:
+		ver = version.String(version.Bellatrix)
+		data, err = FromProto(pbStruct)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to convert a Bellatrix ExecutionPayload to an API response")
+		}
+	case *v1.ExecutionPayloadCapella:
+		ver = version.String(version.Capella)
+		data, err = FromProtoCapella(pbStruct)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to convert a Capella ExecutionPayload to an API response")
+		}
+	case *v1.ExecutionPayloadDeneb:
+		ver = version.String(version.Deneb)
+		payloadStruct, err := FromProtoDeneb(pbStruct)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to convert a Deneb ExecutionPayload to an API response")
+		}
+		data = &ExecutionPayloadDenebAndBlobsBundle{
+			ExecutionPayload: &payloadStruct,
+			BlobsBundle:      FromBundleProto(bundle),
+		}
+	default:
+		return nil, errInvalidTypeConversion
+	}
+	encoded, err := json.Marshal(data)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to marshal execution payload version=%s", ver)
+	}
+	return &ExecutionPayloadResponse{
+		Version: ver,
+		Data:    encoded,
+	}, nil
+}
+
 // ExecHeaderResponseCapella is the response of builder API /eth/v1/builder/header/{slot}/{parent_hash}/{pubkey} for Capella.
 type ExecHeaderResponseCapella struct {
-	Version string `json:"version"`
-	Data    struct {
+	Data struct {
 		Signature hexutil.Bytes      `json:"signature"`
 		Message   *BuilderBidCapella `json:"message"`
 	} `json:"data"`
@@ -563,25 +604,17 @@ type BlobBundler interface {
 	BundleProto() (*v1.BlobsBundle, error)
 }
 
-// ParsedExecutionRequests can retrieve the underlying execution requests for the given execution payload response.
-type ParsedExecutionRequests interface {
-	ExecutionRequestsProto() (*v1.ExecutionRequests, error)
-}
-
 func (r *ExecutionPayloadResponse) ParsePayload() (ParsedPayload, error) {
 	var toProto ParsedPayload
-	v, err := version.FromString(strings.ToLower(r.Version))
-	if err != nil {
-		return nil, errors.Wrap(err, fmt.Sprintf("unsupported version %s", strings.ToLower(r.Version)))
-	}
-	if v >= version.Deneb {
-		toProto = &ExecutionPayloadDenebAndBlobsBundle{}
-	} else if v >= version.Capella {
-		toProto = &ExecutionPayloadCapella{}
-	} else if v >= version.Bellatrix {
+	switch r.Version {
+	case version.String(version.Bellatrix):
 		toProto = &ExecutionPayload{}
-	} else {
-		return nil, fmt.Errorf("unsupported version %s", strings.ToLower(r.Version))
+	case version.String(version.Capella):
+		toProto = &ExecutionPayloadCapella{}
+	case version.String(version.Deneb):
+		toProto = &ExecutionPayloadDenebAndBlobsBundle{}
+	default:
+		return nil, consensusblocks.ErrUnsupportedVersion
 	}
 
 	if err := json.Unmarshal(r.Data, toProto); err != nil {
@@ -956,8 +989,7 @@ func (ch *BLSToExecutionChange) MarshalJSON() ([]byte, error) {
 
 // ExecHeaderResponseDeneb is the header response for builder API /eth/v1/builder/header/{slot}/{parent_hash}/{pubkey}.
 type ExecHeaderResponseDeneb struct {
-	Version string `json:"version"`
-	Data    struct {
+	Data struct {
 		Signature hexutil.Bytes    `json:"signature"`
 		Message   *BuilderBidDeneb `json:"message"`
 	} `json:"data"`
@@ -981,7 +1013,7 @@ func (bb *BuilderBidDeneb) ToProto() (*eth.BuilderBidDeneb, error) {
 	if err != nil {
 		return nil, err
 	}
-	if len(bb.BlobKzgCommitments) > params.BeaconConfig().DeprecatedMaxBlobsPerBlock {
+	if len(bb.BlobKzgCommitments) > fieldparams.MaxBlobsPerBlock {
 		return nil, fmt.Errorf("too many blob commitments: %d", len(bb.BlobKzgCommitments))
 	}
 	kzgCommitments := make([][]byte, len(bb.BlobKzgCommitments))
@@ -1274,208 +1306,6 @@ func (p *ExecutionPayloadDeneb) ToProto() (*v1.ExecutionPayloadDeneb, error) {
 	}, nil
 }
 
-// ExecHeaderResponseElectra is the header response for builder API /eth/v1/builder/header/{slot}/{parent_hash}/{pubkey}.
-type ExecHeaderResponseElectra struct {
-	Version string `json:"version"`
-	Data    struct {
-		Signature hexutil.Bytes      `json:"signature"`
-		Message   *BuilderBidElectra `json:"message"`
-	} `json:"data"`
-}
-
-// ToProto creates a SignedBuilderBidElectra Proto from ExecHeaderResponseElectra.
-func (ehr *ExecHeaderResponseElectra) ToProto() (*eth.SignedBuilderBidElectra, error) {
-	bb, err := ehr.Data.Message.ToProto()
-	if err != nil {
-		return nil, err
-	}
-	return &eth.SignedBuilderBidElectra{
-		Message:   bb,
-		Signature: bytesutil.SafeCopyBytes(ehr.Data.Signature),
-	}, nil
-}
-
-// ToProto creates a BuilderBidElectra Proto from BuilderBidElectra.
-func (bb *BuilderBidElectra) ToProto() (*eth.BuilderBidElectra, error) {
-	header, err := bb.Header.ToProto()
-	if err != nil {
-		return nil, err
-	}
-	if len(bb.BlobKzgCommitments) > params.BeaconConfig().MaxBlobsPerBlockByVersion(version.Electra) {
-		return nil, fmt.Errorf("blob commitment count %d exceeds the maximum %d", len(bb.BlobKzgCommitments), params.BeaconConfig().MaxBlobsPerBlockByVersion(version.Electra))
-	}
-	kzgCommitments := make([][]byte, len(bb.BlobKzgCommitments))
-	for i, commit := range bb.BlobKzgCommitments {
-		if len(commit) != fieldparams.BLSPubkeyLength {
-			return nil, fmt.Errorf("commitment length %d is not %d", len(commit), fieldparams.BLSPubkeyLength)
-		}
-		kzgCommitments[i] = bytesutil.SafeCopyBytes(commit)
-	}
-	// post electra execution requests should not be nil, if no requests exist use an empty request
-	if bb.ExecutionRequests == nil {
-		return nil, errors.New("bid contains nil execution requests")
-	}
-	executionRequests, err := bb.ExecutionRequests.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to convert ExecutionRequests")
-	}
-	return &eth.BuilderBidElectra{
-		Header:             header,
-		BlobKzgCommitments: kzgCommitments,
-		ExecutionRequests:  executionRequests,
-		// Note that SSZBytes() reverses byte order for the little-endian representation.
-		// Uint256.Bytes() is big-endian, SSZBytes takes this value and reverses it.
-		Value:  bytesutil.SafeCopyBytes(bb.Value.SSZBytes()),
-		Pubkey: bytesutil.SafeCopyBytes(bb.Pubkey),
-	}, nil
-}
-
-// ExecutionRequestsV1 is a wrapper for different execution requests
-type ExecutionRequestsV1 struct {
-	Deposits       []*DepositRequestV1       `json:"deposits"`
-	Withdrawals    []*WithdrawalRequestV1    `json:"withdrawals"`
-	Consolidations []*ConsolidationRequestV1 `json:"consolidations"`
-}
-
-func (er *ExecutionRequestsV1) ToProto() (*v1.ExecutionRequests, error) {
-	if uint64(len(er.Deposits)) > params.BeaconConfig().MaxDepositRequestsPerPayload {
-		return nil, fmt.Errorf("deposit requests count %d exceeds the maximum %d", len(er.Deposits), params.BeaconConfig().MaxDepositRequestsPerPayload)
-	}
-	deposits := make([]*v1.DepositRequest, len(er.Deposits))
-	for i, dep := range er.Deposits {
-		d, err := dep.ToProto()
-		if err != nil {
-			return nil, err
-		}
-		deposits[i] = d
-	}
-	if uint64(len(er.Withdrawals)) > params.BeaconConfig().MaxWithdrawalRequestsPerPayload {
-		return nil, fmt.Errorf("withdrawal requests count %d exceeds the maximum %d", len(er.Withdrawals), params.BeaconConfig().MaxWithdrawalRequestsPerPayload)
-	}
-	withdrawals := make([]*v1.WithdrawalRequest, len(er.Withdrawals))
-	for i, wr := range er.Withdrawals {
-		w, err := wr.ToProto()
-		if err != nil {
-			return nil, err
-		}
-		withdrawals[i] = w
-	}
-	if uint64(len(er.Consolidations)) > params.BeaconConfig().MaxConsolidationsRequestsPerPayload {
-		return nil, fmt.Errorf("consolidation requests count %d exceeds the maximum %d", len(er.Consolidations), params.BeaconConfig().MaxConsolidationsRequestsPerPayload)
-	}
-	consolidations := make([]*v1.ConsolidationRequest, len(er.Consolidations))
-	for i, con := range er.Consolidations {
-		c, err := con.ToProto()
-		if err != nil {
-			return nil, err
-		}
-		consolidations[i] = c
-	}
-	return &v1.ExecutionRequests{
-		Deposits:       deposits,
-		Withdrawals:    withdrawals,
-		Consolidations: consolidations,
-	}, nil
-}
-
-// BuilderBidElectra is a field of ExecHeaderResponseElectra.
-type BuilderBidElectra struct {
-	Header             *ExecutionPayloadHeaderDeneb `json:"header"`
-	BlobKzgCommitments []hexutil.Bytes              `json:"blob_kzg_commitments"`
-	ExecutionRequests  *ExecutionRequestsV1         `json:"execution_requests"`
-	Value              Uint256                      `json:"value"`
-	Pubkey             hexutil.Bytes                `json:"pubkey"`
-}
-
-// WithdrawalRequestV1 is a field of ExecutionRequestsV1.
-type WithdrawalRequestV1 struct {
-	SourceAddress   hexutil.Bytes `json:"source_address"`
-	ValidatorPubkey hexutil.Bytes `json:"validator_pubkey"`
-	Amount          Uint256       `json:"amount"`
-}
-
-func (wr *WithdrawalRequestV1) ToProto() (*v1.WithdrawalRequest, error) {
-	srcAddress, err := bytesutil.DecodeHexWithLength(wr.SourceAddress.String(), common.AddressLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "source_address")
-	}
-	pubkey, err := bytesutil.DecodeHexWithLength(wr.ValidatorPubkey.String(), fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "validator_pubkey")
-	}
-
-	return &v1.WithdrawalRequest{
-		SourceAddress:   srcAddress,
-		ValidatorPubkey: pubkey,
-		Amount:          wr.Amount.Uint64(),
-	}, nil
-}
-
-// DepositRequestV1 is a field of ExecutionRequestsV1.
-type DepositRequestV1 struct {
-	PubKey hexutil.Bytes `json:"pubkey"`
-	// withdrawalCredentials: DATA, 32 Bytes
-	WithdrawalCredentials hexutil.Bytes `json:"withdrawal_credentials"`
-	// amount: QUANTITY, 64 Bits
-	Amount Uint256 `json:"amount"`
-	// signature: DATA, 96 Bytes
-	Signature hexutil.Bytes `json:"signature"`
-	// index: QUANTITY, 64 Bits
-	Index Uint256 `json:"index"`
-}
-
-func (dr *DepositRequestV1) ToProto() (*v1.DepositRequest, error) {
-	pubkey, err := bytesutil.DecodeHexWithLength(dr.PubKey.String(), fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "pubkey")
-	}
-	wc, err := bytesutil.DecodeHexWithLength(dr.WithdrawalCredentials.String(), fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "withdrawal_credentials")
-	}
-	sig, err := bytesutil.DecodeHexWithLength(dr.Signature.String(), fieldparams.BLSSignatureLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "signature")
-	}
-	return &v1.DepositRequest{
-		Pubkey:                pubkey,
-		WithdrawalCredentials: wc,
-		Amount:                dr.Amount.Uint64(),
-		Signature:             sig,
-		Index:                 dr.Index.Uint64(),
-	}, nil
-}
-
-// ConsolidationRequestV1 is a field of ExecutionRequestsV1.
-type ConsolidationRequestV1 struct {
-	// sourceAddress: DATA, 20 Bytes
-	SourceAddress hexutil.Bytes `json:"source_address"`
-	// sourcePubkey: DATA, 48 Bytes
-	SourcePubkey hexutil.Bytes `json:"source_pubkey"`
-	// targetPubkey: DATA, 48 Bytes
-	TargetPubkey hexutil.Bytes `json:"target_pubkey"`
-}
-
-func (cr *ConsolidationRequestV1) ToProto() (*v1.ConsolidationRequest, error) {
-	srcAddress, err := bytesutil.DecodeHexWithLength(cr.SourceAddress.String(), common.AddressLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "source_address")
-	}
-	sourcePubkey, err := bytesutil.DecodeHexWithLength(cr.SourcePubkey.String(), fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "source_pubkey")
-	}
-	targetPubkey, err := bytesutil.DecodeHexWithLength(cr.TargetPubkey.String(), fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "target_pubkey")
-	}
-	return &v1.ConsolidationRequest{
-		SourceAddress: srcAddress,
-		SourcePubkey:  sourcePubkey,
-		TargetPubkey:  targetPubkey,
-	}, nil
-}
-
 // ErrorMessage is a JSON representation of the builder API's returned error message.
 type ErrorMessage struct {
 	Code        int      `json:"code"`

api/client/builder/types_test.go

@@ -12,7 +12,6 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
@@ -154,64 +153,6 @@ var testExampleHeaderResponseDeneb = `{
   }
 }`
 
-var testExampleHeaderResponseElectra = `{
-  "version": "electra",
-  "data": {
-    "message": {
-      "header": {
-        "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-        "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "prev_randao": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "block_number": "1",
-        "gas_limit": "1",
-        "gas_used": "1",
-        "timestamp": "1",
-        "extra_data": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "base_fee_per_gas": "1",
-        "blob_gas_used": "1",
-        "excess_blob_gas": "1",
-        "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "transactions_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "withdrawals_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-      },
-      "blob_kzg_commitments": [
-        "0xa94170080872584e54a1cf092d845703b13907f2e6b3b1c0ad573b910530499e3bcd48c6378846b80d2bfa58c81cf3d5"
-      ],
-      "execution_requests": {
-        "deposits": [
-          {
-            "pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "withdrawal_credentials": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "amount": "1",
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-            "index": "1"
-          }
-        ],
-        "withdrawals": [
-          {
-            "source_address": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-            "validator_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "amount": "1"
-          }
-        ],
-        "consolidations": [
-          {
-            "source_address": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-            "source_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "target_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"
-          }
-        ]
-      },
-      "value": "652312848583266388373324160190187140051835877600158453279131187530910662656",
-      "pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"
-    },
-    "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-  }
-}`
-
 var testExampleHeaderResponseDenebNoBundle = `{
   "version": "deneb",
   "data": {
@@ -1973,8 +1914,7 @@ func TestEmptyResponseBody(t *testing.T) {
 		var b []byte
 		r := &ExecutionPayloadResponse{}
 		err := json.Unmarshal(b, r)
-		var syntaxError *json.SyntaxError
-		ok := errors.As(err, &syntaxError)
+		_, ok := err.(*json.SyntaxError)
 		require.Equal(t, true, ok)
 	})
 	t.Run("empty object", func(t *testing.T) {
@@ -1982,9 +1922,9 @@ func TestEmptyResponseBody(t *testing.T) {
 		emptyResponse := &ExecutionPayloadResponse{}
 		require.NoError(t, json.Unmarshal(empty, emptyResponse))
 		_, err := emptyResponse.ParsePayload()
-		require.ErrorContains(t, "unsupported version", err)
+		require.ErrorIs(t, err, consensusblocks.ErrUnsupportedVersion)
 	})
-	versions := []int{version.Bellatrix, version.Capella, version.Deneb, version.Electra}
+	versions := []int{version.Bellatrix, version.Capella, version.Deneb}
 	for i := range versions {
 		vstr := version.String(versions[i])
 		t.Run("populated version without payload"+vstr, func(t *testing.T) {

api/client/client.go

@@ -10,18 +10,11 @@ import (
 	"github.com/pkg/errors"
 )
 
-const (
-	MaxBodySize      int64 = 1 << 23 // 8MB default, WithMaxBodySize can override
-	MaxBodySizeState int64 = 1 << 29 // 512MB
-	MaxErrBodySize   int64 = 1 << 17 // 128KB
-)
-
 // Client is a wrapper object around the HTTP client.
 type Client struct {
-	hc          *http.Client
-	baseURL     *url.URL
-	token       string
-	maxBodySize int64
+	hc      *http.Client
+	baseURL *url.URL
+	token   string
 }
 
 // NewClient constructs a new client with the provided options (ex WithTimeout).
@@ -33,9 +26,8 @@ func NewClient(host string, opts ...ClientOpt) (*Client, error) {
 		return nil, err
 	}
 	c := &Client{
-		hc:          &http.Client{},
-		baseURL:     u,
-		maxBodySize: MaxBodySize,
+		hc:      &http.Client{},
+		baseURL: u,
 	}
 	for _, o := range opts {
 		o(c)
@@ -80,7 +72,7 @@ func (c *Client) NodeURL() string {
 // Get is a generic, opinionated GET function to reduce boilerplate amongst the getters in this package.
 func (c *Client) Get(ctx context.Context, path string, opts ...ReqOption) ([]byte, error) {
 	u := c.baseURL.ResolveReference(&url.URL{Path: path})
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), http.NoBody)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +89,7 @@ func (c *Client) Get(ctx context.Context, path string, opts ...ReqOption) ([]byt
 	if r.StatusCode != http.StatusOK {
 		return nil, Non200Err(r)
 	}
-	b, err := io.ReadAll(io.LimitReader(r.Body, c.maxBodySize))
+	b, err := io.ReadAll(r.Body)
 	if err != nil {
 		return nil, errors.Wrap(err, "error reading http response body")
 	}

api/client/errors.go

@@ -24,20 +24,17 @@ var ErrInvalidNodeVersion = errors.New("invalid node version response")
 // ErrConnectionIssue represents a connection problem.
 var ErrConnectionIssue = errors.New("could not connect")
 
-// ErrNotSupported represents a connection to a beacon node that is non prysm or wrong version
-var ErrNotSupported = errors.New("endpoint not supported")
-
 // Non200Err is a function that parses an HTTP response to handle responses that are not 200 with a formatted error.
-func Non200Err(r *http.Response) error {
-	b, err := io.ReadAll(io.LimitReader(r.Body, MaxErrBodySize))
+func Non200Err(response *http.Response) error {
+	bodyBytes, err := io.ReadAll(response.Body)
 	var body string
 	if err != nil {
 		body = "(Unable to read response body.)"
 	} else {
-		body = "response body:\n" + string(b)
+		body = "response body:\n" + string(bodyBytes)
 	}
-	msg := fmt.Sprintf("code=%d, url=%s, body=%s", r.StatusCode, r.Request.URL, body)
-	switch r.StatusCode {
+	msg := fmt.Sprintf("code=%d, url=%s, body=%s", response.StatusCode, response.Request.URL, body)
+	switch response.StatusCode {
 	case http.StatusNotFound:
 		return errors.Wrap(ErrNotFound, msg)
 	default:

api/client/event/BUILD.bazel

@@ -2,10 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "event_stream.go",
-        "utils.go",
-    ],
+    srcs = ["event_stream.go"],
     importpath = "github.com/prysmaticlabs/prysm/v5/api/client/event",
     visibility = ["//visibility:public"],
     deps = [
@@ -18,10 +15,7 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "event_stream_test.go",
-        "utils_test.go",
-    ],
+    srcs = ["event_stream_test.go"],
     embed = [":go_default_library"],
     deps = [
         "//testing/require:go_default_library",

api/client/event/event_stream.go

@@ -93,7 +93,6 @@ func (h *EventStream) Subscribe(eventsChannel chan<- *Event) {
 			EventType: EventConnectionError,
 			Data:      []byte(errors.Wrap(err, client.ErrConnectionIssue.Error()).Error()),
 		}
-		return
 	}
 
 	defer func() {
@@ -103,8 +102,6 @@ func (h *EventStream) Subscribe(eventsChannel chan<- *Event) {
 	}()
 	// Create a new scanner to read lines from the response body
 	scanner := bufio.NewScanner(resp.Body)
-	// Set the split function for the scanning operation
-	scanner.Split(scanLinesWithCarriage)
 
 	var eventType, data string // Variables to store event type and data
 
@@ -116,7 +113,7 @@ func (h *EventStream) Subscribe(eventsChannel chan<- *Event) {
 			close(eventsChannel)
 			return
 		default:
-			line := scanner.Text()
+			line := scanner.Text() // TODO(13730): scanner does not handle /r and does not fully adhere to https://html.spec.whatwg.org/multipage/server-sent-events.html#the-eventsource-interface
 			// Handle the event based on your specific format
 			if line == "" {
 				// Empty line indicates the end of an event

api/client/event/event_stream_test.go

@@ -40,12 +40,11 @@ func TestNewEventStream(t *testing.T) {
 
 func TestEventStream(t *testing.T) {
 	mux := http.NewServeMux()
-	mux.HandleFunc("/eth/v1/events", func(w http.ResponseWriter, _ *http.Request) {
+	mux.HandleFunc("/eth/v1/events", func(w http.ResponseWriter, r *http.Request) {
 		flusher, ok := w.(http.Flusher)
 		require.Equal(t, true, ok)
-		for i := 1; i <= 3; i++ {
-			events := [3]string{"event: head\ndata: data%d\n\n", "event: head\rdata: data%d\r\r", "event: head\r\ndata: data%d\r\n\r\n"}
-			_, err := fmt.Fprintf(w, events[i-1], i)
+		for i := 1; i <= 2; i++ {
+			_, err := fmt.Fprintf(w, "event: head\ndata: data%d\n\n", i)
 			require.NoError(t, err)
 			flusher.Flush()                    // Trigger flush to simulate streaming data
 			time.Sleep(100 * time.Millisecond) // Simulate delay between events
@@ -63,7 +62,7 @@ func TestEventStream(t *testing.T) {
 	// Collect events
 	var events []*Event
 
-	for len(events) != 3 {
+	for len(events) != 2 {
 		select {
 		case event := <-eventsChannel:
 			log.Info(event)
@@ -72,30 +71,10 @@ func TestEventStream(t *testing.T) {
 	}
 
 	// Assertions to verify the events content
-	expectedData := []string{"data1", "data2", "data3"}
+	expectedData := []string{"data1", "data2"}
 	for i, event := range events {
 		if string(event.Data) != expectedData[i] {
 			t.Errorf("Expected event data %q, got %q", expectedData[i], string(event.Data))
 		}
 	}
 }
-
-func TestEventStreamRequestError(t *testing.T) {
-	topics := []string{"head"}
-	eventsChannel := make(chan *Event, 1)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// use valid url that will result in failed request with nil body
-	stream, err := NewEventStream(ctx, http.DefaultClient, "http://badhost:1234", topics)
-	require.NoError(t, err)
-
-	// error will happen when request is made, should be received over events channel
-	go stream.Subscribe(eventsChannel)
-
-	event := <-eventsChannel
-	if event.EventType != EventConnectionError {
-		t.Errorf("Expected event type %q, got %q", EventConnectionError, event.EventType)
-	}
-
-}

api/client/event/utils.go

@@ -1,36 +0,0 @@
-package event
-
-import (
-	"bytes"
-)
-
-// adapted from ScanLines in scan.go to handle carriage return characters as separators
-func scanLinesWithCarriage(data []byte, atEOF bool) (advance int, token []byte, err error) {
-	if atEOF && len(data) == 0 {
-		return 0, nil, nil
-	}
-	if i, j := bytes.IndexByte(data, '\n'), bytes.IndexByte(data, '\r'); i >= 0 || j >= 0 {
-		in := i
-		// Select the first index of \n or \r or the second index of \r if it is followed by \n
-		if i < 0 || (i > j && i != j+1 && j >= 0) {
-			in = j
-		}
-
-		// We have a full newline-terminated line.
-		return in + 1, dropCR(data[0:in]), nil
-	}
-	// If we're at EOF, we have a final, non-terminated line. Return it.
-	if atEOF {
-		return len(data), dropCR(data), nil
-	}
-	// Request more data.
-	return 0, nil, nil
-}
-
-// dropCR drops a terminal \r from the data.
-func dropCR(data []byte) []byte {
-	if len(data) > 0 && data[len(data)-1] == '\r' {
-		return data[0 : len(data)-1]
-	}
-	return data
-}

api/client/event/utils_test.go

@@ -1,97 +0,0 @@
-package event
-
-import (
-	"bufio"
-	"bytes"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-)
-
-func TestScanLinesWithCarriage(t *testing.T) {
-	testCases := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "LF line endings",
-			input:    "line1\nline2\nline3",
-			expected: []string{"line1", "line2", "line3"},
-		},
-		{
-			name:     "CR line endings",
-			input:    "line1\rline2\rline3",
-			expected: []string{"line1", "line2", "line3"},
-		},
-		{
-			name:     "CRLF line endings",
-			input:    "line1\r\nline2\r\nline3",
-			expected: []string{"line1", "line2", "line3"},
-		},
-		{
-			name:     "Mixed line endings",
-			input:    "line1\nline2\rline3\r\nline4",
-			expected: []string{"line1", "line2", "line3", "line4"},
-		},
-		{
-			name:     "Empty lines",
-			input:    "line1\n\nline2\r\rline3",
-			expected: []string{"line1", "", "line2", "", "line3"},
-		},
-		{
-			name:     "Empty lines 2",
-			input:    "line1\n\rline2\n\rline3",
-			expected: []string{"line1", "", "line2", "", "line3"},
-		},
-		{
-			name:     "No line endings",
-			input:    "single line without ending",
-			expected: []string{"single line without ending"},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			scanner := bufio.NewScanner(bytes.NewReader([]byte(tc.input)))
-			scanner.Split(scanLinesWithCarriage)
-
-			var lines []string
-			for scanner.Scan() {
-				lines = append(lines, scanner.Text())
-			}
-
-			require.NoError(t, scanner.Err())
-			require.Equal(t, len(tc.expected), len(lines), "Number of lines does not match")
-			for i, line := range lines {
-				require.Equal(t, tc.expected[i], line, "Line %d does not match", i)
-			}
-		})
-	}
-}
-
-// TestScanLinesWithCarriageEdgeCases tests edge cases and potential error scenarios
-func TestScanLinesWithCarriageEdgeCases(t *testing.T) {
-	t.Run("Empty input", func(t *testing.T) {
-		scanner := bufio.NewScanner(bytes.NewReader([]byte("")))
-		scanner.Split(scanLinesWithCarriage)
-		require.Equal(t, scanner.Scan(), false)
-		require.NoError(t, scanner.Err())
-	})
-
-	t.Run("Very long line", func(t *testing.T) {
-		longLine := bytes.Repeat([]byte("a"), bufio.MaxScanTokenSize+1)
-		scanner := bufio.NewScanner(bytes.NewReader(longLine))
-		scanner.Split(scanLinesWithCarriage)
-		require.Equal(t, scanner.Scan(), false)
-		require.NotNil(t, scanner.Err())
-	})
-
-	t.Run("Line ending at max token size", func(t *testing.T) {
-		input := append(bytes.Repeat([]byte("a"), bufio.MaxScanTokenSize-1), '\n')
-		scanner := bufio.NewScanner(bytes.NewReader(input))
-		scanner.Split(scanLinesWithCarriage)
-		require.Equal(t, scanner.Scan(), true)
-		require.Equal(t, string(bytes.Repeat([]byte("a"), bufio.MaxScanTokenSize-1)), scanner.Text())
-	})
-}

api/client/options.go

@@ -46,10 +46,3 @@ func WithAuthenticationToken(token string) ClientOpt {
 		c.token = token
 	}
 }
-
-// WithMaxBodySize overrides the default max body size of 8MB.
-func WithMaxBodySize(size int64) ClientOpt {
-	return func(c *Client) {
-		c.maxBodySize = size
-	}
-}

api/client/validator/BUILD.bazel

@@ -2,8 +2,8 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["rest_client.go"],
-    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/validator/keymanager_api",
+    srcs = ["client.go"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/validator",
     visibility = ["//visibility:public"],
     deps = [
         "//api/client:go_default_library",

api/client/validator/client.go

@@ -1,4 +1,4 @@
-package keymanager_api
+package validator
 
 import (
 	"context"

api/gateway/BUILD.bazel

@@ -0,0 +1,43 @@
+load("@prysm//tools/go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "gateway.go",
+        "log.go",
+        "modifiers.go",
+        "options.go",
+    ],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/gateway",
+    visibility = [
+        "//beacon-chain:__subpackages__",
+        "//validator:__subpackages__",
+    ],
+    deps = [
+        "//api/server:go_default_library",
+        "//runtime:go_default_library",
+        "@com_github_gorilla_mux//:go_default_library",
+        "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+        "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//connectivity:go_default_library",
+        "@org_golang_google_grpc//credentials:go_default_library",
+        "@org_golang_google_grpc//credentials/insecure:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["gateway_test.go"],
+    embed = [":go_default_library"],
+    deps = [
+        "//cmd/beacon-chain/flags:go_default_library",
+        "//testing/assert:go_default_library",
+        "//testing/require:go_default_library",
+        "@com_github_gorilla_mux//:go_default_library",
+        "@com_github_sirupsen_logrus//hooks/test:go_default_library",
+        "@com_github_urfave_cli_v2//:go_default_library",
+    ],
+)

api/gateway/gateway.go

@@ -0,0 +1,212 @@
+// Package gateway defines a grpc-gateway server that serves HTTP-JSON traffic and acts a proxy between HTTP and gRPC.
+package gateway
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/server"
+	"github.com/prysmaticlabs/prysm/v5/runtime"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/connectivity"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+var _ runtime.Service = (*Gateway)(nil)
+
+// PbMux serves grpc-gateway requests for selected patterns using registered protobuf handlers.
+type PbMux struct {
+	Registrations []PbHandlerRegistration // Protobuf registrations to be registered in Mux.
+	Patterns      []string                // URL patterns that will be handled by Mux.
+	Mux           *gwruntime.ServeMux     // The router that will be used for grpc-gateway requests.
+}
+
+// PbHandlerRegistration is a function that registers a protobuf handler.
+type PbHandlerRegistration func(context.Context, *gwruntime.ServeMux, *grpc.ClientConn) error
+
+// MuxHandler is a function that implements the mux handler functionality.
+type MuxHandler func(
+	h http.HandlerFunc,
+	w http.ResponseWriter,
+	req *http.Request,
+)
+
+// Config parameters for setting up the gateway service.
+type config struct {
+	maxCallRecvMsgSize uint64
+	remoteCert         string
+	gatewayAddr        string
+	remoteAddr         string
+	allowedOrigins     []string
+	muxHandler         MuxHandler
+	pbHandlers         []*PbMux
+	router             *mux.Router
+	timeout            time.Duration
+}
+
+// Gateway is the gRPC gateway to serve HTTP JSON traffic as a proxy and forward it to the gRPC server.
+type Gateway struct {
+	cfg          *config
+	conn         *grpc.ClientConn
+	server       *http.Server
+	cancel       context.CancelFunc
+	ctx          context.Context
+	startFailure error
+}
+
+// New returns a new instance of the Gateway.
+func New(ctx context.Context, opts ...Option) (*Gateway, error) {
+	g := &Gateway{
+		ctx: ctx,
+		cfg: &config{},
+	}
+	for _, opt := range opts {
+		if err := opt(g); err != nil {
+			return nil, err
+		}
+	}
+	if g.cfg.router == nil {
+		g.cfg.router = mux.NewRouter()
+	}
+	return g, nil
+}
+
+// Start the gateway service.
+func (g *Gateway) Start() {
+	ctx, cancel := context.WithCancel(g.ctx)
+	g.cancel = cancel
+
+	conn, err := g.dial(ctx, "tcp", g.cfg.remoteAddr)
+	if err != nil {
+		log.WithError(err).Error("Failed to connect to gRPC server")
+		g.startFailure = err
+		return
+	}
+	g.conn = conn
+
+	for _, h := range g.cfg.pbHandlers {
+		for _, r := range h.Registrations {
+			if err := r(ctx, h.Mux, g.conn); err != nil {
+				log.WithError(err).Error("Failed to register handler")
+				g.startFailure = err
+				return
+			}
+		}
+		for _, p := range h.Patterns {
+			g.cfg.router.PathPrefix(p).Handler(h.Mux)
+		}
+	}
+
+	corsMux := server.CorsHandler(g.cfg.allowedOrigins).Middleware(g.cfg.router)
+
+	if g.cfg.muxHandler != nil {
+		g.cfg.router.PathPrefix("/").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			g.cfg.muxHandler(corsMux.ServeHTTP, w, r)
+		})
+	}
+
+	g.server = &http.Server{
+		Addr:              g.cfg.gatewayAddr,
+		Handler:           corsMux,
+		ReadHeaderTimeout: time.Second,
+	}
+
+	go func() {
+		log.WithField("address", g.cfg.gatewayAddr).Info("Starting gRPC gateway")
+		if err := g.server.ListenAndServe(); err != http.ErrServerClosed {
+			log.WithError(err).Error("Failed to start gRPC gateway")
+			g.startFailure = err
+			return
+		}
+	}()
+}
+
+// Status of grpc gateway. Returns an error if this service is unhealthy.
+func (g *Gateway) Status() error {
+	if g.startFailure != nil {
+		return g.startFailure
+	}
+	if s := g.conn.GetState(); s != connectivity.Ready {
+		return fmt.Errorf("grpc server is %s", s)
+	}
+	return nil
+}
+
+// Stop the gateway with a graceful shutdown.
+func (g *Gateway) Stop() error {
+	if g.server != nil {
+		shutdownCtx, shutdownCancel := context.WithTimeout(g.ctx, 2*time.Second)
+		defer shutdownCancel()
+		if err := g.server.Shutdown(shutdownCtx); err != nil {
+			if errors.Is(err, context.DeadlineExceeded) {
+				log.Warn("Existing connections terminated")
+			} else {
+				log.WithError(err).Error("Failed to gracefully shut down server")
+			}
+		}
+	}
+	if g.cancel != nil {
+		g.cancel()
+	}
+	return nil
+}
+
+// dial the gRPC server.
+func (g *Gateway) dial(ctx context.Context, network, addr string) (*grpc.ClientConn, error) {
+	switch network {
+	case "tcp":
+		return g.dialTCP(ctx, addr)
+	case "unix":
+		return g.dialUnix(ctx, addr)
+	default:
+		return nil, fmt.Errorf("unsupported network type %q", network)
+	}
+}
+
+// dialTCP creates a client connection via TCP.
+// "addr" must be a valid TCP address with a port number.
+func (g *Gateway) dialTCP(ctx context.Context, addr string) (*grpc.ClientConn, error) {
+	var security grpc.DialOption
+	if len(g.cfg.remoteCert) > 0 {
+		creds, err := credentials.NewClientTLSFromFile(g.cfg.remoteCert, "")
+		if err != nil {
+			return nil, err
+		}
+		security = grpc.WithTransportCredentials(creds)
+	} else {
+		// Use insecure credentials when there's no remote cert provided.
+		security = grpc.WithTransportCredentials(insecure.NewCredentials())
+	}
+	opts := []grpc.DialOption{
+		security,
+		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(int(g.cfg.maxCallRecvMsgSize))),
+	}
+	return grpc.DialContext(ctx, addr, opts...)
+}
+
+// dialUnix creates a client connection via a unix domain socket.
+// "addr" must be a valid path to the socket.
+func (g *Gateway) dialUnix(ctx context.Context, addr string) (*grpc.ClientConn, error) {
+	d := func(addr string, timeout time.Duration) (net.Conn, error) {
+		return net.DialTimeout("unix", addr, timeout)
+	}
+	f := func(ctx context.Context, addr string) (net.Conn, error) {
+		if deadline, ok := ctx.Deadline(); ok {
+			return d(addr, time.Until(deadline))
+		}
+		return d(addr, 0)
+	}
+	opts := []grpc.DialOption{
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithContextDialer(f),
+		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(int(g.cfg.maxCallRecvMsgSize))),
+	}
+	return grpc.DialContext(ctx, addr, opts...)
+}

api/gateway/gateway_test.go

@@ -0,0 +1,107 @@
+package gateway
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/gorilla/mux"
+	"github.com/prysmaticlabs/prysm/v5/cmd/beacon-chain/flags"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
+	logTest "github.com/sirupsen/logrus/hooks/test"
+	"github.com/urfave/cli/v2"
+)
+
+func TestGateway_Customized(t *testing.T) {
+	r := mux.NewRouter()
+	cert := "cert"
+	origins := []string{"origin"}
+	size := uint64(100)
+
+	opts := []Option{
+		WithRouter(r),
+		WithRemoteCert(cert),
+		WithAllowedOrigins(origins),
+		WithMaxCallRecvMsgSize(size),
+		WithMuxHandler(func(
+			_ http.HandlerFunc,
+			_ http.ResponseWriter,
+			_ *http.Request,
+		) {
+		}),
+	}
+
+	g, err := New(context.Background(), opts...)
+	require.NoError(t, err)
+
+	assert.Equal(t, r, g.cfg.router)
+	assert.Equal(t, cert, g.cfg.remoteCert)
+	require.Equal(t, 1, len(g.cfg.allowedOrigins))
+	assert.Equal(t, origins[0], g.cfg.allowedOrigins[0])
+	assert.Equal(t, size, g.cfg.maxCallRecvMsgSize)
+}
+
+func TestGateway_StartStop(t *testing.T) {
+	hook := logTest.NewGlobal()
+
+	app := cli.App{}
+	set := flag.NewFlagSet("test", 0)
+	ctx := cli.NewContext(&app, set, nil)
+
+	gatewayPort := ctx.Int(flags.GRPCGatewayPort.Name)
+	gatewayHost := ctx.String(flags.GRPCGatewayHost.Name)
+	rpcHost := ctx.String(flags.RPCHost.Name)
+	selfAddress := fmt.Sprintf("%s:%d", rpcHost, ctx.Int(flags.RPCPort.Name))
+	gatewayAddress := fmt.Sprintf("%s:%d", gatewayHost, gatewayPort)
+
+	opts := []Option{
+		WithGatewayAddr(gatewayAddress),
+		WithRemoteAddr(selfAddress),
+		WithMuxHandler(func(
+			_ http.HandlerFunc,
+			_ http.ResponseWriter,
+			_ *http.Request,
+		) {
+		}),
+	}
+
+	g, err := New(context.Background(), opts...)
+	require.NoError(t, err)
+
+	g.Start()
+	go func() {
+		require.LogsContain(t, hook, "Starting gRPC gateway")
+		require.LogsDoNotContain(t, hook, "Starting API middleware")
+	}()
+	err = g.Stop()
+	require.NoError(t, err)
+}
+
+func TestGateway_NilHandler_NotFoundHandlerRegistered(t *testing.T) {
+	app := cli.App{}
+	set := flag.NewFlagSet("test", 0)
+	ctx := cli.NewContext(&app, set, nil)
+
+	gatewayPort := ctx.Int(flags.GRPCGatewayPort.Name)
+	gatewayHost := ctx.String(flags.GRPCGatewayHost.Name)
+	rpcHost := ctx.String(flags.RPCHost.Name)
+	selfAddress := fmt.Sprintf("%s:%d", rpcHost, ctx.Int(flags.RPCPort.Name))
+	gatewayAddress := fmt.Sprintf("%s:%d", gatewayHost, gatewayPort)
+
+	opts := []Option{
+		WithGatewayAddr(gatewayAddress),
+		WithRemoteAddr(selfAddress),
+	}
+
+	g, err := New(context.Background(), opts...)
+	require.NoError(t, err)
+
+	writer := httptest.NewRecorder()
+	g.cfg.router.ServeHTTP(writer, &http.Request{Method: "GET", Host: "localhost", URL: &url.URL{Path: "/foo"}})
+	assert.Equal(t, http.StatusNotFound, writer.Code)
+}

api/gateway/log.go

@@ -0,0 +1,5 @@
+package gateway
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "gateway")

api/gateway/modifiers.go

@@ -0,0 +1,30 @@
+package gateway
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"google.golang.org/protobuf/proto"
+)
+
+func HttpResponseModifier(ctx context.Context, w http.ResponseWriter, _ proto.Message) error {
+	md, ok := gwruntime.ServerMetadataFromContext(ctx)
+	if !ok {
+		return nil
+	}
+	// set http status code
+	if vals := md.HeaderMD.Get("x-http-code"); len(vals) > 0 {
+		code, err := strconv.Atoi(vals[0])
+		if err != nil {
+			return err
+		}
+		// delete the headers to not expose any grpc-metadata in http response
+		delete(md.HeaderMD, "x-http-code")
+		delete(w.Header(), "Grpc-Metadata-X-Http-Code")
+		w.WriteHeader(code)
+	}
+
+	return nil
+}

api/gateway/options.go

@@ -0,0 +1,79 @@
+package gateway
+
+import (
+	"time"
+
+	"github.com/gorilla/mux"
+	gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+)
+
+type Option func(g *Gateway) error
+
+func WithPbHandlers(handlers []*PbMux) Option {
+	return func(g *Gateway) error {
+		g.cfg.pbHandlers = handlers
+		return nil
+	}
+}
+
+func WithMuxHandler(m MuxHandler) Option {
+	return func(g *Gateway) error {
+		g.cfg.muxHandler = m
+		return nil
+	}
+}
+
+func WithGatewayAddr(addr string) Option {
+	return func(g *Gateway) error {
+		g.cfg.gatewayAddr = addr
+		return nil
+	}
+}
+
+func WithRemoteAddr(addr string) Option {
+	return func(g *Gateway) error {
+		g.cfg.remoteAddr = addr
+		return nil
+	}
+}
+
+// WithRouter allows adding a custom mux router to the gateway.
+func WithRouter(r *mux.Router) Option {
+	return func(g *Gateway) error {
+		g.cfg.router = r
+		return nil
+	}
+}
+
+// WithAllowedOrigins allows adding a set of allowed origins to the gateway.
+func WithAllowedOrigins(origins []string) Option {
+	return func(g *Gateway) error {
+		g.cfg.allowedOrigins = origins
+		return nil
+	}
+}
+
+// WithRemoteCert allows adding a custom certificate to the gateway,
+func WithRemoteCert(cert string) Option {
+	return func(g *Gateway) error {
+		g.cfg.remoteCert = cert
+		return nil
+	}
+}
+
+// WithMaxCallRecvMsgSize allows specifying the maximum allowed gRPC message size.
+func WithMaxCallRecvMsgSize(size uint64) Option {
+	return func(g *Gateway) error {
+		g.cfg.maxCallRecvMsgSize = size
+		return nil
+	}
+}
+
+// WithTimeout allows changing the timeout value for API calls.
+func WithTimeout(seconds uint64) Option {
+	return func(g *Gateway) error {
+		g.cfg.timeout = time.Second * time.Duration(seconds)
+		gwruntime.DefaultContextTimeout = time.Second * time.Duration(seconds)
+		return nil
+	}
+}

api/grpc/BUILD.bazel

@@ -22,7 +22,9 @@ go_test(
     deps = [
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
+        "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library",
         "@com_github_sirupsen_logrus//hooks/test:go_default_library",
+        "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//metadata:go_default_library",
     ],
 )

api/grpc/grpcutils.go

@@ -2,6 +2,8 @@ package grpc
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"strings"
 	"time"
 
@@ -74,8 +76,21 @@ func AppendHeaders(parent context.Context, headers []string) context.Context {
 				logrus.Warnf("Incorrect gRPC header flag format. Skipping %v", keyValue[0])
 				continue
 			}
-			parent = metadata.AppendToOutgoingContext(parent, keyValue[0], strings.Join(keyValue[1:], "=")) // nolint:fatcontext
+			parent = metadata.AppendToOutgoingContext(parent, keyValue[0], strings.Join(keyValue[1:], "="))
 		}
 	}
 	return parent
 }
+
+// AppendCustomErrorHeader sets a CustomErrorMetadataKey gRPC header on the passed in context,
+// using the passed in error data as the header's value. The data is serialized as JSON.
+func AppendCustomErrorHeader(ctx context.Context, errorData interface{}) error {
+	j, err := json.Marshal(errorData)
+	if err != nil {
+		return fmt.Errorf("could not marshal error data into JSON: %w", err)
+	}
+	if err := grpc.SetHeader(ctx, metadata.Pairs(CustomErrorMetadataKey, string(j))); err != nil {
+		return fmt.Errorf("could not set custom error header: %w", err)
+	}
+	return nil
+}

api/grpc/grpcutils_test.go

@@ -2,11 +2,15 @@ package grpc
 
 import (
 	"context"
+	"encoding/json"
+	"strings"
 	"testing"
 
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/prysmaticlabs/prysm/v5/testing/assert"
 	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	logTest "github.com/sirupsen/logrus/hooks/test"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
 
@@ -58,3 +62,17 @@ func TestAppendHeaders(t *testing.T) {
 		assert.Equal(t, "value=1", md.Get("first")[0])
 	})
 }
+
+func TestAppendCustomErrorHeader(t *testing.T) {
+	stream := &runtime.ServerTransportStream{}
+	ctx := grpc.NewContextWithServerTransportStream(context.Background(), stream)
+	data := &customErrorData{Message: "foo"}
+	require.NoError(t, AppendCustomErrorHeader(ctx, data))
+	// The stream used in test setup sets the metadata key in lowercase.
+	value, ok := stream.Header()[strings.ToLower(CustomErrorMetadataKey)]
+	require.Equal(t, true, ok, "Failed to retrieve custom error metadata value")
+	expected, err := json.Marshal(data)
+	require.NoError(t, err)
+	assert.Equal(t, string(expected), value[0])
+
+}

api/headers.go

@@ -1,7 +1,5 @@
 package api
 
-import "net/http"
-
 const (
 	VersionHeader                 = "Eth-Consensus-Version"
 	ExecutionPayloadBlindedHeader = "Eth-Execution-Payload-Blinded"
@@ -12,9 +10,3 @@ const (
 	EventStreamMediaType          = "text/event-stream"
 	KeepAlive                     = "keep-alive"
 )
-
-// SetSSEHeaders sets the headers needed for a server-sent event response.
-func SetSSEHeaders(w http.ResponseWriter) {
-	w.Header().Set("Content-Type", EventStreamMediaType)
-	w.Header().Set("Connection", KeepAlive)
-}