move api util outside the client package

.buildkite-bazelrc

@@ -50,7 +50,7 @@ build:nostamp --nostamp
 
 # Build metadata
 build --build_metadata=ROLE=CI
-build --build_metadata=REPO_URL=https://github.com/OffchainLabs/prysm.git
+build --build_metadata=REPO_URL=https://github.com/prysmaticlabs/prysm.git
 build --workspace_status_command=./hack/workspace_status_ci.sh
 
 # Buildbuddy

.deepsource.toml

@@ -11,7 +11,7 @@ name = "go"
 enabled = true
 
 [analyzers.meta]
-import_paths = ["github.com/OffchainLabs/prysm/v6"]
+import_paths = ["github.com/prysmaticlabs/prysm/v5"]
 
 [[analyzers]]
 name = "test-coverage"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: 🐞 Bug report
 description: Report a bug or problem with running Prysm
-type: "Bug"
+labels: ["Bug"]
 body:
   - type: markdown
     attributes:

.github/actions/gomodtidy/Dockerfile

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

.github/workflows/changelog.yml

@@ -18,7 +18,7 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@aa2ab1243d6e0d5b405b973c89fa4d06a2d0fff7 # 1.1.2
         with:
           repo: OffchainLabs/unclog
-          version: "tags/v0.1.5"
+          version: "tags/v0.1.3"
           file: "unclog"
 
       - name: Get new changelog files

.github/workflows/check-specrefs.yml

@@ -1,43 +0,0 @@
-name: Check Spec References
-on: [push, pull_request]
-
-jobs:
-  check-specrefs:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Check version consistency
-      run: |
-        WORKSPACE_VERSION=$(grep 'consensus_spec_version = ' WORKSPACE | sed 's/.*"\(.*\)"/\1/')
-        ETHSPECIFY_VERSION=$(grep '^version:' specrefs/.ethspecify.yml | sed 's/version: //')
-        if [ "$WORKSPACE_VERSION" != "$ETHSPECIFY_VERSION" ]; then
-          echo "Version mismatch between WORKSPACE and ethspecify"
-          echo "  WORKSPACE: $WORKSPACE_VERSION"
-          echo "  specrefs/.ethspecify.yml: $ETHSPECIFY_VERSION"
-          exit 1
-        else
-          echo "Versions match: $WORKSPACE_VERSION"
-        fi
-
-    - name: Install ethspecify
-      run: python3 -mpip install ethspecify
-
-    - name: Update spec references
-      run: ethspecify process --path=specrefs
-
-    - name: Check for differences
-      run: |
-        if ! git diff --exit-code specrefs >/dev/null; then
-          echo "Spec references are out-of-date!"
-          echo ""
-          git --no-pager diff specrefs
-          exit 1
-        else
-          echo "Spec references are up-to-date!"
-        fi
-
-    - name: Check spec references
-      run: ethspecify check --path=specrefs

.github/workflows/fuzz.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.25.1'
+          go-version: '1.23.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.25.1'
+          go-version: '1.23.5'
       - uses: shogo82148/actions-go-fuzz/run@v0
         with:
           packages: ${{ matrix.package }}

.github/workflows/go.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go 1.24
         uses: actions/setup-go@v4
         with:
-          go-version: '1.25.1'
+          go-version: '1.24.0'
       - name: Run Gosec Security Scanner
         run: | # https://github.com/securego/gosec/issues/469
           export PATH=$PATH:$(go env GOPATH)/bin
@@ -44,27 +44,27 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
-      - name: Set up Go 1.25.1
-        uses: actions/setup-go@v5
+      - name: Set up Go 1.24
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.25.1'
+          go-version: '1.24.0'
+          id: go
 
       - name: Golangci-lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v5
         with:
-          version: v2.4
+          version: v1.64.5
+          args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number
 
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.25.1
+      - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: '1.25.1'
+          go-version: '1.24.0'
         id: go
 
       - name: Check out code into the Go module directory

.golangci.yml

@@ -1,41 +1,90 @@
-version: "2"
 run:
-  go: 1.23.5
-linters:
-  enable:
-    - errcheck
-    - ineffassign
-    - govet
-  disable:
-    - staticcheck
-    - unused
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    paths:
-      - validator/web/site_data.go
-      - .*_test.go
-      - proto
-      - tools/analyzers
-      - third_party$
-      - builtin$
-      - examples$
+  timeout: 10m
+  go: '1.23.5'
 
-formatters:
-  enable:
-    - gofmt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - validator/web/site_data.go
-      - .*_test.go
-      - proto
-      - tools/analyzers
-      - third_party$
-      - builtin$
-      - examples$
+issues:
+  exclude-files:
+    - validator/web/site_data.go
+    - .*_test.go
+  exclude-dirs:
+    - proto
+    - tools/analyzers
+
+linters:
+  enable-all: true
+  disable:
+    # Deprecated linters:
+    - govet
+
+    # Disabled for now:
+    - asasalint
+    - bodyclose
+    - containedctx
+    - contextcheck
+    - cyclop
+    - depguard
+    - dogsled
+    - dupl
+    - durationcheck
+    - errname
+    - err113
+    - exhaustive
+    - exhaustruct
+    - forbidigo
+    - forcetypeassert
+    - funlen
+    - gci
+    - gochecknoglobals
+    - gochecknoinits
+    - goconst
+    - gocritic
+    - gocyclo
+    - godot
+    - godox
+    - gofumpt
+    - gomoddirectives
+    - gosec
+    - inamedparam
+    - interfacebloat
+    - intrange
+    - ireturn
+    - lll
+    - maintidx
+    - makezero
+    - mnd
+    - musttag
+    - nakedret
+    - nestif
+    - nilnil
+    - nlreturn
+    - noctx
+    - nolintlint
+    - nonamedreturns
+    - nosprintfhostport
+    - perfsprint
+    - prealloc
+    - predeclared
+    - promlinter
+    - protogetter
+    - recvcheck
+    - revive
+    - spancheck
+    - staticcheck
+    - stylecheck
+    - tagalign
+    - tagliatelle
+    - thelper
+    - unparam
+    - usetesting
+    - varnamelen
+    - wrapcheck
+    - wsl
+
+linters-settings:
+  gocognit:
+    # TODO: We should target for < 50
+    min-complexity: 65
+
+output:
+  print-issued-lines: true
+  sort-results: true

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/OffchainLabs/prysm
+go_import_path: github.com/prysmaticlabs/prysm
 sudo: false
 matrix:
   include:

BUILD.bazel

@@ -6,13 +6,13 @@ load("@io_bazel_rules_go//go:def.bzl", "nogo")
 load("@bazel_skylib//rules:common_settings.bzl", "string_setting")
 load("@prysm//tools/nogo_config:def.bzl", "nogo_config_exclude")
 
-prefix = "github.com/OffchainLabs/prysm"
+prefix = "github.com/prysmaticlabs/prysm"
 
 exports_files([
     "LICENSE.md",
 ])
 
-# gazelle:prefix github.com/OffchainLabs/prysm/v6
+# gazelle:prefix github.com/prysmaticlabs/prysm/v5
 # gazelle:map_kind go_library go_library @prysm//tools/go:def.bzl
 # gazelle:map_kind go_test go_test @prysm//tools/go:def.bzl
 # gazelle:map_kind go_repository go_repository @prysm//tools/go:def.bzl
@@ -194,7 +194,6 @@ nogo(
         "//tools/analyzers/gocognit:go_default_library",
         "//tools/analyzers/ineffassign:go_default_library",
         "//tools/analyzers/interfacechecker:go_default_library",
-        "//tools/analyzers/logcapitalization:go_default_library",
         "//tools/analyzers/logruswitherror:go_default_library",
         "//tools/analyzers/maligned:go_default_library",
         "//tools/analyzers/nop:go_default_library",

CHANGELOG.md

@@ -4,209 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.
 
-## [v6.0.4](https://github.com/prysmaticlabs/prysm/compare/v6.0.3...v6.0.4) - 2025-06-05
-
-This release has more work on PeerDAS, and light client support. Additionally, we have a few bug fixes:
-- Blob cache size now correctly set at startup.
-- A fix for slashing protection history exports where the validator database was in a nested folder.
-- Corrected behavior of the API call for state committees with an invalid request.
-- `/bin/sh` is now symlinked to `/bin/bash` for Prysm docker images.
-
-In the [Hoodi](https://github.com/eth-clients/hoodi) testnet, the default gas limit is raised to 60M gas. 
-
-### Added
-
-- Add light client mainnet spec test. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15295)
-- Add support for light client req/resp domain. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15281)
-- Added /bin/sh simlink to docker images. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15294)
-- Added Prysm build data to otel tracing spans. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15302)
-- Add light client minimal spec test support for `update_ranking` tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15297)
-- Add fulu operation and epoch processing spec tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15284)
-- Updated e2e Beacon API evaluator to support more endpoints, including the ones introduced in Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15304)
-- Data column sidecars verification methods. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15232)
-- Implement data column sidecars filesystem. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15257)
-- Add blob schedule support from https://github.com/ethereum/consensus-specs/pull/4277. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15272)
--  random forkchoice spec tests for fulu. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15287)
-- Add ability to download nightly test vectors. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15312)
-- PeerDAS: Validation pipeline for data column sidecars received via gossip. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15310)
-- PeerDAS: Implement P2P. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15347)
-- PeerDAS: Implement the blockchain package. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15350)
-
-### Changed
-
-- Update spec tests to v1.6.0-alpha.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15306)
-- PeerDAS: Refactor the reconstruction pipeline. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15309)
-- PeerDAS: `DataColumnStorage.Get` - Exit early no columns are available. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15309)
-- Default hoodi testnet builder gas limit to 60M. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15361)
-
-### Fixed
-
-- Fix cyclical dependencies issue when using testing/util package. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15248)
-- Set seen blob cache size correctly based on current slot time at start up. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15348)
-- Fix `slashing-protection-history export` failing when `validator.db` is in a nested folder like `data/direct/`. (#14954). [[PR]](https://github.com/prysmaticlabs/prysm/pull/15351)
-- Made `/eth/v1/beacon/states/{state_id}/committees` endpoint return `400` when slot does not belong to the specified epoch, aligning with the Beacon API spec (#15355). [[PR]](https://github.com/prysmaticlabs/prysm/pull/15356)
-- Removed eager validator context cancellation that was causing validator builder registrations to fail occasionally. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15369)
-
-## [v6.0.3](https://github.com/prysmaticlabs/prysm/compare/v6.0.2...v6.0.3) - 2025-05-21
-
-This release has important bugfixes for users of the [Beacon API](https://ethereum.github.io/beacon-APIs/). These fixes include:
-- Fixed pending consolidations endpoint to return the correct response.
-- Fixed incorrect field name from pending partial withdrawals response.
-- Fixed attester slashing to return an empty array instead of nil/null. 
-- Fixed validator participation and active set changes endpoints to accept a `{state_id}` parameter. 
-
-Other improvements include:
-- Disabled deposit log processing routine for Electra and beyond.
-
-Operators are encouraged to update at their own convenience.
-
-### Added
-
-- ssz static spec tests for fulu. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15279)
-- finality and merkle proof spec tests for fulu. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15286)
-- sanity and rewards spec tests for fulu. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15285)
-
-### Changed
-
-- Added more tracing spans to various helpers related to GetDuties. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15271)
-- Disable log processing after deposit requests are activated. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15274)
-
-### Fixed
-
-- fixed wrong handler for get pending consolidations endpoint. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15290)
-- Fixed /eth/v2/beacon/pool/attester_slashings no slashings returns empty array instead of nil. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15291)
-- Fix Prysm endpoints `/prysm/v1/validators/{state_id}/participation` and `/prysm/v1/validators/{state_id}/active_set_changes` to properly handle `{state_id}`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15245)
-
-## [v6.0.2](https://github.com/prysmaticlabs/prysm/compare/v6.0.1...v6.0.2) - 2025-05-12
-
-This is a patch release to fix a few important bugs. Most importantly, we have adjusted the index limit for field tries in the beacon state to better support Pectra states. This should alleviate memory issues that clients are seeing since Pectra mainnet fork.
-
-### Added
-
-- Enable light client gossip for optimistic and finality updates. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15220)
-- Implement peerDAS core functions. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15192)
-- Force duties start on received blocks. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15251)
-- Added additional tracing spans for the GetDuties routine. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15258)
-
-### Changed
-
-- Use otelgrpc for tracing grpc server and client. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15237)
-- Upgraded ristretto to v2.2.0, for RISC-V support. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15170)
-- Update spec to v1.5.0 compliance which changes minimal execution requests size. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15256)
-- Increase indices limit in field trie rebuilding. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15252)
-- Increase sepolia gas limit to 60M. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15253)
-
-### Fixed
-
-- Fixed wrong field name in pending partial withdrawals was returned on state json representation, described in https://github.com/ethereum/consensus-specs/blob/dev/specs/electra/beacon-chain.md#pendingpartialwithdrawal. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15254)
-- Fixed gocognit on propose block rest path. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15147)
-
-## [v6.0.1](https://github.com/prysmaticlabs/prysm/compare/v6.0.0...v6.0.1) - 2025-05-02
-
-This release fixes two bugs related to the `payload_attributes` [event stream](https://ethereum.github.io/beacon-APIs/#/Events/eventstream). If you are using or planning to use this endpoint, upgrading to version 6.0.1 is mandatory.  
-Also, a reminder: like other Beacon API endpoints, when a node is syncing, it may return historical data as `finalized` or `head`. Until the node is fully synced to the head of the chain, you should avoid using this data, depending on your application's needs.
-
-We currently recommend against using the `--enable-beacon-rest-api` flag on Mainnet. As you may have noticed, we put a deprecation notice on our gRPC code, in particular on gRPC-related flags. The reason for this is that we want to eventually remove gRPC and have REST HTTP as the standard way of communication between the validator client and the beacon node. That being said, the REST option is still unstable and thus marked as experimental in the flag's description (the flag is `--enable-beacon-rest-api`). Therefore we encourage everyone to keep using gRPC, which is currently the default. It is fine to test the REST option on testnets, but doing it on Mainnet can lead to missing attestations and even missing blocks.
-
-**Updating to v6.0.0 or later is required for Pectra Mainnet!**
-
-This patch release has a few important fixes from v6.0.0. Updating to this release is encouraged.
-
-### Added
-
-- `UpgradeToFulu` spectests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15190)
-- PeerDAS related KZG wrappers. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15186)
-- Add light client p2p broadcaster functions. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15175)
-- Added immediate broadcasting of proposer slashings when equivocating blocks are detected during block processing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14693)
-- Added 2 new errors: `HeadStateErr` and `ErrCouldNotVerifyBlockHeader`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14693)
-- Implement pending consolidations Beacon API endpoint. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15219)
-- PeerDAS: Add needed proto files and corresponding generated code. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15187)
-- Add light client p2p validator and subscriber functions. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15214)
-
-### Changed
-
-- Refactored internal function `reValidateSubscriptions` to `pruneSubscriptions` in `beacon-chain/sync/subscriber.go` for improved clarity, addressing a TODO comment. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15160)
-- Updated geth to v1.15.9. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15216)
-- Removed the slot from `UpdateDuties`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15223)
-- Update hoodie bootnodes. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15240)
-
-### Fixed
-
-- avoid nondeterministic default fork value when generate genesis. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15151)
-- `UpgradeToFulu`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15190)
-- fixed underflow with balances in leaking edge case with expected withdrawals. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15191)
-- Fixes our generated ssz files to have the correct package name. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15199)
-- Fixes our blob sidecar by root request lists for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15209)
-- Ensure that the `payload_attributes` event has a consistent view of the head state by passing the head block in the event and using stategen to retrieve the corresponding state. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15213)
-- Pass parent context to update duties when dependent roots change. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15221)
-- Process slots across epoch for payload attribute event. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15228)
-- extend the payload attribute computation deadline to the beginning of the proposal slot. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15230)
-
-### Security
-
-- Fix CVE-2025-22869. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15204)
-- Fix CVE-2025-22870. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15204)
-- Fix CVE-2025-22872. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15204)
-- Fix CVE-2025-30204. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15204)
-
-## [v6.0.0](https://github.com/prysmaticlabs/prysm/compare/v5.3.2...v6.0.0) - 2025-04-21
-
-This release introduces Mainnet support for the upcoming Electra + Prague (Pectra) fork. The fork is scheduled for mainnet epoch 364032 (May 7, 2025, 10:05:11 UTC). You MUST update Prysm Beacon Node, Prysm Validator Client, and your execution layer client to the Pectra ready release prior to the fork to stay on the correct chain.
-
-Besides Pectra, we have more light client API support, cleanups, and a few bugfixes. Please review the changelog below and update your client as soon as practical before May 7.
-
-This release is **mandatory** for all operators before May 7.
-
-### Added
-
-- Implemented validator identities Beacon API endpoint. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15086)
-- Add SSZ support to light client updates by range API. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15082)
-- Add light client ssz types to the spec test. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15097)
-- Added the ability for execution requests to be tested in e2e with electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14971)
-- Add warning messages for gas limit ranges that might be problematic. Low gas limits (≤10% of default) may cause transactions to fail, while high gas limits (>150% of default) could lead to block propagation issues. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15078)
-- Add light client store object to the beacon node object. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15120)
-- prysmctl option in wrapper script to generate devnet ssz. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15145)
-- Add support for Electra fork epoch. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15132)
-
-### Changed
-
-- The validator client will no longer use the full list of committee values but instead use the committee length and validator committee index. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15039)
-- Remove the header `Content-Disposition` from the `httputil.WriteSSZ` function. No `filename` parameter is needed anymore. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15092)
-- Sort attestations in proposer block by reward. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15093)
-- More efficient query method for stategen to retrieve blocks between a given state and the replay target block. This avoids attempting to look up blocks that are not needed for head replay queries, which may be missing due to a previous rollback bug. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15063)
-- removed old web3signer metrics in favor for a universal one. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14920)
-- Deprecated everything related with the gRPC API. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14944)
-- Migrate Prysm repo to Offchain Labs organization ahead of Pectra upgrade v6. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15140)
-
-### Deprecated
-
-- deprecates and removes usage of the `--trace` flag and`--cpuprofile` flag in favor of just using `--pprof`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15083)
-
-### Removed
-
-- Remove /eth/v1/beacon/states/head/committees call when getting duties. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15039)
-- Removed unused hack scripts. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15157)
-- Remove `disable-committee-aware-packing` flag. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15162)
-- Remove deprecated flags for the major release. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15165)
-- Removed Beacon API endpoints which have been deprecated at the Deneb fork. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15166)
-
-### Fixed
-
-- The `--rpc` flag will now properly enable the keymanager APIs without web. The `--web` will enable both validator api endpoints and web. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15080)
-- Use latest state to pack attestation. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15113)
-- Clean up dangling block index entries for blocks that were previously deleted by incomplete cleanup code. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15040)
-- Fixed to use io stream instead of stream read. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15089)
-- When using a DV, send all aggregations for a slot and committee. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15110)
-- Fixed a bug in consolidation request processing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15122)
-- Fix State Getter for pending withdrawal balance. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15123)
-- Fixed a bug in checking for attestation lengths in our block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15134)
-- Fix Committee Index Check For Aggregates. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15146)
-- Fix filtering by committee index post-Electra in `ListAttestationsV2`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15148)
-- Peers giving invalid data in range syncing are now downscored. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15149)
-- Adding fork guard to attestation api endpoints so that it doesn't accidentally include wrong attestation types in the pool. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15161)
-- fixed underflow with balances in leaking edge case with expected withdrawals. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15191)
-- Attribute block and blob issues to correct peers during range syncing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15173)
-
 ## [v5.3.2](https://github.com/prysmaticlabs/prysm/compare/v5.3.1...v5.3.2) - 2025-03-25
 
 This release introduces support for the `Hoodi` testnet.
@@ -2993,7 +2790,7 @@ There are two known issues with this release:
 
 ### Added
 
-- Web3Signer support. See the [documentation](https://prysm.offchainlabs.com/docs/manage-wallet/web3signer/) for more
+- Web3Signer support. See the [documentation](https://docs.prylabs.network/docs/next/wallet/web3signer) for more
   details.
 - Bellatrix support. See [kiln testnet instructions](https://hackmd.io/OqIoTiQvS9KOIataIFksBQ?view)
 - Weak subjectivity sync / checkpoint sync. This is an experimental feature and may have unintended side effects for
@@ -3458,4 +3255,4 @@ There are no security updates in this release.
 
 # Older than v2.0.0
 
-For changelog history for releases older than v2.0.0, please refer to https://github.com/prysmaticlabs/prysm/releases
+For changelog history for releases older than v2.0.0, please refer to https://github.com/prysmaticlabs/prysm/releases

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Note: The latest and most up-to-date documentation can be found on our [docs por
 
 Excited by our work and want to get involved in building out our sharding releases? Or maybe you haven't learned as much about the Ethereum protocol but are a savvy developer? 
 
-You can explore our [Open Issues](https://github.com/OffchainLabs/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/prysm) drop us a line there if you want to get more involved or have any questions on our implementation!
+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.
@@ -15,15 +15,15 @@ You can explore our [Open Issues](https://github.com/OffchainLabs/prysm/issues)
 
 **2. Fork the Prysm repo.**
 
-Sign in to your GitHub account or create a new account if you do not have one already. Then navigate your browser to https://github.com/OffchainLabs/prysm/. In the upper right hand corner of the page, click “fork”. This will create a copy of the Prysm repo in your account.
+Sign in to your GitHub account or create a new account if you do not have one already. Then navigate your browser to https://github.com/prysmaticlabs/prysm/. In the upper right hand corner of the page, click “fork”. This will create a copy of the Prysm repo in your account.
 
 **3. Create a local clone of Prysm.**
 
 ```
-$ mkdir -p $GOPATH/src/github.com/OffchainLabs
-$ cd $GOPATH/src/github.com/OffchainLabs
-$ git clone https://github.com/OffchainLabs/prysm.git
-$ cd $GOPATH/src/github.com/OffchainLabs/prysm
+$ mkdir -p $GOPATH/src/github.com/prysmaticlabs
+$ cd $GOPATH/src/github.com/prysmaticlabs
+$ git clone https://github.com/prysmaticlabs/prysm.git
+$ cd $GOPATH/src/github.com/prysmaticlabs/prysm
 ```
 
 **4. Link your local clone to the fork on your GitHub repo.**
@@ -35,13 +35,13 @@ $ git remote add myprysmrepo https://github.com/<your_github_user_name>/prysm.gi
 **5. Link your local clone to the Prysmatic Labs repo so that you can easily fetch future changes to the Prysmatic Labs repo.**
 
 ```
-$ git remote add prysm https://github.com/OffchainLabs/prysm.git
+$ git remote add prysm https://github.com/prysmaticlabs/prysm.git
 $ git remote -v (you should see myrepo and prysm in the list of remotes)
 ```
 
 **6. Find an issue to work on.**
 
-Check out open issues at https://github.com/OffchainLabs/prysm/issues and pick one. Leave a comment to let the development team know that you would like to work on it. Or examine the code for areas that can be improved and leave a comment to the development team to ask if they would like you to work on it.
+Check out open issues at https://github.com/prysmaticlabs/prysm/issues and pick one. Leave a comment to let the development team know that you would like to work on it. Or examine the code for areas that can be improved and leave a comment to the development team to ask if they would like you to work on it.
 
 **7. Create a local branch with a name that clearly identifies what you will be working on.**
 
@@ -129,7 +129,7 @@ All PRs must must include a changelog fragment file in the `changelog` directory
 
 **17. Create a pull request.**
 
-Navigate your browser to https://github.com/OffchainLabs/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/OffchainLabs/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.
+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.**
 

DEPENDENCIES.md

@@ -2,7 +2,7 @@
 
 Prysm is go project with many complicated dependencies, including some c++ based libraries. There
 are two parts to Prysm's dependency management. Go modules and bazel managed dependencies. Be sure 
-to read [Why Bazel?](https://prysm.offchainlabs.com/docs/install-prysm/install-with-bazel/#why-bazel) to fully
+to read [Why Bazel?](https://github.com/prysmaticlabs/documentation/issues/138) to fully
 understand the reasoning behind an additional layer of build tooling via Bazel rather than a pure
 "go build" project.
 
@@ -60,7 +60,7 @@ bazel build //beacon-chain --config=release
 Example:
 
 ```bash
-go get github.com/OffchainLabs/example@v1.2.3
+go get github.com/prysmaticlabs/example@v1.2.3
 bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=deps.bzl%prysm_deps -prune=true
 ```
 

INTEROP.md

@@ -10,7 +10,7 @@ This README details how to setup Prysm for interop testing for usage with other
 ## Installation & Setup
 
 1. Install [Bazel](https://docs.bazel.build/versions/master/install.html) **(Recommended)**
-2. `git clone https://github.com/OffchainLabs/prysm && cd prysm`
+2. `git clone https://github.com/prysmaticlabs/prysm && cd prysm`
 3. `bazel build //cmd/...`
 
 ## Starting from Genesis

README.md

@@ -3,11 +3,11 @@
 <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/OffchainLabs/prysm)](https://goreportcard.com/report/github.com/OffchainLabs/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)
 [![Execution_API_Version 1.0.0-beta.2](https://img.shields.io/badge/Execution%20API%20Version-v1.0.0.beta.2-blue.svg)](https://github.com/ethereum/execution-apis/tree/v1.0.0-beta.2/src/engine)
-[![Discord](https://user-images.githubusercontent.com/7288322/34471967-1df7808a-efbb-11e7-9088-ed0b04151291.png)](https://discord.gg/prysm)
-[![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/OffchainLabs/prysm/badge)](https://www.gitpoap.io/gh/OffchainLabs/prysm)
+[![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>
 
@@ -17,7 +17,7 @@
 
 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/OffchainLabs/prysm/releases) for details of the latest releases and upcoming breaking changes.
+See the [Changelog](https://github.com/prysmaticlabs/prysm/releases) for details of the latest releases and upcoming breaking changes.
 
 ---
 
@@ -25,7 +25,7 @@ See the [Changelog](https://github.com/OffchainLabs/prysm/releases) for details
 
 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/prysm)** for support.
+💬 **Need help?** Join our **[Discord Community](https://discord.gg/prysmaticlabs)** for support.
 
 ---
 
@@ -46,8 +46,8 @@ To participate in staking, you can join the **[official Ethereum launchpad](http
 
 Prysm maintains two permanent branches:
 
-- **[`master`](https://github.com/OffchainLabs/prysm/tree/master)** - This points to the latest stable release. It is ideal for most users.
-- **[`develop`](https://github.com/OffchainLabs/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 and contains the latest PRs. Developers should base their PRs on this branch.
 
 ### 🛠 Contribution Guide
 

SECURITY.md

@@ -2,10 +2,10 @@
 
 ## Supported Versions
 
-[Releases](https://github.com/OffchainLabs/prysm/releases/) contains all available releases. We recommend using the [most recently released version](https://github.com/OffchainLabs/prysm/releases/latest).
+[Releases](https://github.com/prysmaticlabs/prysm/releases/) contains all available releases. We recommend using the [most recently released version](https://github.com/prysmaticlabs/prysm/releases/latest).
 
 ## Reporting a Vulnerability
 
-Please see our signed [security.txt](https://github.com/OffchainLabs/prysm/blob/develop/.well-known/security.txt) for preferred encryption and reporting destination.
+Please see our signed [security.txt](https://github.com/prysmaticlabs/prysm/blob/develop/.well-known/security.txt) for preferred encryption and reporting destination.
 
 **Please do not file a public ticket** mentioning the vulnerability, as doing so could increase the likelihood of the vulnerability being used before a fix has been created, released and installed on the network.

WORKSPACE

@@ -1,7 +1,7 @@
 workspace(name = "prysm")
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "rules_pkg",
@@ -16,6 +16,8 @@ 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",
@@ -158,15 +160,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",
     ],
-    sha256 = "a729c8ed2447c90fe140077689079ca0acfb7580ec41637f312d650ce9d93d96",
+    strip_prefix = "rules_go-cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9",
     urls = [
-        "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.57.0/rules_go-v0.57.0.zip",
-        "https://github.com/bazel-contrib/rules_go/releases/download/v0.57.0/rules_go-v0.57.0.zip",
+        "https://github.com/bazel-contrib/rules_go/archive/cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9.tar.gz",
     ],
 )
 
@@ -190,7 +192,7 @@ load("@rules_oci//oci:pull.bzl", "oci_pull")
 # A multi-arch base image
 oci_pull(
     name = "linux_debian11_multiarch_base",  # Debian bullseye
-    digest = "sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf",
+    digest = "sha256:b82f113425c5b5c714151aaacd8039bc141821cdcd3c65202d42bdf9c43ae60b",  # 2023-12-12
     image = "gcr.io/prysmaticlabs/distroless/cc-debian11",
     platforms = [
         "linux/amd64",
@@ -208,7 +210,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.25.1",
+    go_version = "1.24.0",
     nogo = "@//:nogo",
 )
 
@@ -253,18 +255,56 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.6.0-beta.0"
+consensus_spec_version = "v1.5.0-beta.4"
 
-load("@prysm//tools:download_spectests.bzl", "consensus_spec_tests")
+bls_test_version = "v0.1.1"
 
-consensus_spec_tests(
-    name = "consensus_spec_tests",
-    flavors = {
-        "general": "sha256-rT3jQp2+ZaDiO66gIQggetzqr+kGeexaLqEhbx4HDMY=",
-        "minimal": "sha256-wowwwyvd0KJLsE+oDOtPkrhZyJndJpJ0lbXYsLH6XBw=",
-        "mainnet": "sha256-4ZLrLNeO7NihZ4TuWH5V5fUhvW9Y3mAPBQDCqrfShps=",
-    },
-    version = consensus_spec_version,
+http_archive(
+    name = "consensus_spec_tests_general",
+    build_file_content = """
+filegroup(
+    name = "test_data",
+    srcs = glob([
+        "**/*.ssz_snappy",
+        "**/*.yaml",
+    ]),
+    visibility = ["//visibility:public"],
+)
+    """,
+    integrity = "sha256-QG0NUqaCvP5lKaKKwF/fmeICZVjONMlb7EE+MtYl0C0=",
+    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version,
+)
+
+http_archive(
+    name = "consensus_spec_tests_minimal",
+    build_file_content = """
+filegroup(
+    name = "test_data",
+    srcs = glob([
+        "**/*.ssz_snappy",
+        "**/*.yaml",
+    ]),
+    visibility = ["//visibility:public"],
+)
+    """,
+    integrity = "sha256-8NQngTSSqzW/j3tOUi3r5h+94ChRbLNWTt7BOGqr4+E=",
+    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version,
+)
+
+http_archive(
+    name = "consensus_spec_tests_mainnet",
+    build_file_content = """
+filegroup(
+    name = "test_data",
+    srcs = glob([
+        "**/*.ssz_snappy",
+        "**/*.yaml",
+    ]),
+    visibility = ["//visibility:public"],
+)
+    """,
+    integrity = "sha256-gFqxbaBnJ7dtdoj0zFbVrtlHv/bLNuWjrTHkyCAjFjI=",
+    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version,
 )
 
 http_archive(
@@ -278,13 +318,11 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-sBe3Rx8zGq9IrvfgIhZQpYidGjy3mE1SiCb6/+pjLdY=",
+    integrity = "sha256-9paalF0POULpP2ga+4ouHSETKYrWNCUCZoJHPuFw06E=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )
 
-bls_test_version = "v0.1.1"
-
 http_archive(
     name = "bls_spec_tests",
     build_file_content = """
@@ -300,6 +338,22 @@ filegroup(
     url = "https://github.com/ethereum/bls12-381-tests/releases/download/%s/bls_tests_yaml.tar.gz" % bls_test_version,
 )
 
+http_archive(
+    name = "eth2_networks",
+    build_file_content = """
+filegroup(
+    name = "configs",
+    srcs = glob([
+        "shared/**/config.yaml",
+    ]),
+    visibility = ["//visibility:public"],
+)
+    """,
+    sha256 = "77e7e3ed65e33b7bb19d30131f4c2bb39e4dfeb188ab9ae84651c3cc7600131d",
+    strip_prefix = "eth2-networks-934c948e69205dcf2deb87e4ae6cc140c335f94d",
+    url = "https://github.com/eth-clients/eth2-networks/archive/934c948e69205dcf2deb87e4ae6cc140c335f94d.tar.gz",
+)
+
 http_archive(
     name = "holesky_testnet",
     build_file_content = """
@@ -311,25 +365,9 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-htyxg8Ln2o8eCiifFN7/hcHGZg8Ir9CPzCEx+FUnnCs=",
-    strip_prefix = "holesky-8aec65f11f0c986d6b76b2eb902420635eb9b815",
-    url = "https://github.com/eth-clients/holesky/archive/8aec65f11f0c986d6b76b2eb902420635eb9b815.tar.gz",
-)
-
-http_archive(
-    name = "mainnet",
-    build_file_content = """
-filegroup(
-    name = "configs",
-    srcs = [
-        "metadata/config.yaml",
-    ],
-    visibility = ["//visibility:public"],
-)
-""",
-    integrity = "sha256-NZr/gsQK9rBHRnznlPBiNzJpK8MPMrfUa3f+QYqn1+g=",
-    strip_prefix = "mainnet-978f1794eada6f85bee76e4d2d5959a5fb8e0cc5",
-    url = "https://github.com/eth-clients/mainnet/archive/978f1794eada6f85bee76e4d2d5959a5fb8e0cc5.tar.gz",
+    integrity = "sha256-YVFFrCmjoGZ3fXMWpsCpSsYbANy1grnqYwOLKIg2SsA=",
+    strip_prefix = "holesky-32a72e21c6e53c262f27d50dd540cb654517d03a",
+    url = "https://github.com/eth-clients/holesky/archive/32a72e21c6e53c262f27d50dd540cb654517d03a.tar.gz",  # 2025-03-17
 )
 
 http_archive(
@@ -343,9 +381,9 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-+UZgfvBcea0K0sbvAJZOz5ZNmxdWZYbohP38heUuc6w=",
-    strip_prefix = "sepolia-f9158732adb1a2a6440613ad2232eb50e7384c4f",
-    url = "https://github.com/eth-clients/sepolia/archive/f9158732adb1a2a6440613ad2232eb50e7384c4f.tar.gz",
+    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(
@@ -359,17 +397,17 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-G+4c9c/vci1OyPrQJnQCI+ZCv/E0cWN4hrHDY3i7ns0=",
-    strip_prefix = "hoodi-b6ee51b2045a5e7fe3efac52534f75b080b049c6",
-    url = "https://github.com/eth-clients/hoodi/archive/b6ee51b2045a5e7fe3efac52534f75b080b049c6.tar.gz",
+    integrity = "sha256-dPiEWUd8QvbYGwGtIm0QtCekitVLOLsW5rpQIGzz8PU=",
+    strip_prefix = "hoodi-828c2c940e1141092bd4bb979cef547ea926d272",
+    url = "https://github.com/eth-clients/hoodi/archive/828c2c940e1141092bd4bb979cef547ea926d272.tar.gz",
 )
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "7c3ebd7aaedd86fa5dc479a0fda803f602caaf78d8aff7ce83b89e1b8ae7442a",
-    strip_prefix = "protobuf-28.3",
+    sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
+    strip_prefix = "protobuf-25.1",
     urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v28.3.tar.gz",
+        "https://github.com/protocolbuffers/protobuf/archive/v25.1.tar.gz",
     ],
 )
 

api/BUILD.bazel

@@ -7,7 +7,7 @@ go_library(
         "headers.go",
         "jwt.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/api",
+    importpath = "github.com/prysmaticlabs/prysm/v5/api",
     visibility = ["//visibility:public"],
     deps = [
         "//crypto/rand:go_default_library",

api/apiutil/BUILD.bazel

@@ -1,29 +1,9 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
+load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "common.go",
-        "header.go",
-    ],
-    importpath = "github.com/OffchainLabs/prysm/v6/api/apiutil",
+    srcs = ["common.go"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/apiutil",
     visibility = ["//visibility:public"],
-    deps = [
-        "//consensus-types/primitives:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "common_test.go",
-        "header_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//consensus-types/primitives:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-    ],
+    deps = ["//consensus-types/primitives:go_default_library"],
 )

api/apiutil/common.go

@@ -3,17 +3,24 @@ package apiutil
 import (
 	"fmt"
 	neturl "net/url"
+	"regexp"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 )
 
-// Uint64ToString is a util function that will convert uints to string
+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)
 }
 
-// BuildURL is a util function that assists with adding query parameters to the url
 func BuildURL(path string, queryParams ...neturl.Values) string {
 	if len(queryParams) == 0 {
 		return path

api/apiutil/common_test.go

@@ -1,37 +0,0 @@
-package apiutil
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-)
-
-func TestBeaconApiHelpers_TestUint64ToString(t *testing.T) {
-	const expectedResult = "1234"
-	const val = uint64(1234)
-
-	assert.Equal(t, expectedResult, Uint64ToString(val))
-	assert.Equal(t, expectedResult, Uint64ToString(primitives.Slot(val)))
-	assert.Equal(t, expectedResult, Uint64ToString(primitives.ValidatorIndex(val)))
-	assert.Equal(t, expectedResult, Uint64ToString(primitives.CommitteeIndex(val)))
-	assert.Equal(t, expectedResult, Uint64ToString(primitives.Epoch(val)))
-}
-
-func TestBuildURL_NoParams(t *testing.T) {
-	wanted := "/aaa/bbb/ccc"
-	actual := BuildURL("/aaa/bbb/ccc")
-	assert.Equal(t, wanted, actual)
-}
-
-func TestBuildURL_WithParams(t *testing.T) {
-	params := url.Values{}
-	params.Add("xxxx", "1")
-	params.Add("yyyy", "2")
-	params.Add("zzzz", "3")
-
-	wanted := "/aaa/bbb/ccc?xxxx=1&yyyy=2&zzzz=3"
-	actual := BuildURL("/aaa/bbb/ccc", params)
-	assert.Equal(t, wanted, actual)
-}

api/apiutil/header.go

@@ -1,122 +0,0 @@
-package apiutil
-
-import (
-	"mime"
-	"sort"
-	"strconv"
-	"strings"
-
-	log "github.com/sirupsen/logrus"
-)
-
-type mediaRange struct {
-	mt   string  // canonicalised media‑type, e.g. "application/json"
-	q    float64 // quality factor (0‑1)
-	raw  string  // original string – useful for logging/debugging
-	spec int     // 2=exact, 1=type/*, 0=*/*
-}
-
-func parseMediaRange(field string) (mediaRange, bool) {
-	field = strings.TrimSpace(field)
-
-	mt, params, err := mime.ParseMediaType(field)
-	if err != nil {
-		log.WithError(err).Debug("Failed to parse header field")
-		return mediaRange{}, false
-	}
-
-	r := mediaRange{mt: mt, q: 1, spec: 2, raw: field}
-
-	if qs, ok := params["q"]; ok {
-		v, err := strconv.ParseFloat(qs, 64)
-		if err != nil || v < 0 || v > 1 {
-			log.WithField("q", qs).Debug("Invalid quality factor (0‑1)")
-			return mediaRange{}, false // skip invalid entry
-		}
-		r.q = v
-	}
-
-	switch {
-	case mt == "*/*":
-		r.spec = 0
-	case strings.HasSuffix(mt, "/*"):
-		r.spec = 1
-	}
-	return r, true
-}
-
-func hasExplicitQ(r mediaRange) bool {
-	return strings.Contains(strings.ToLower(r.raw), ";q=")
-}
-
-// ParseAccept returns media ranges sorted by q (desc) then specificity.
-func ParseAccept(header string) []mediaRange {
-	if header == "" {
-		return []mediaRange{{mt: "*/*", q: 1, spec: 0, raw: "*/*"}}
-	}
-
-	var out []mediaRange
-	for _, field := range strings.Split(header, ",") {
-		if r, ok := parseMediaRange(field); ok {
-			out = append(out, r)
-		}
-	}
-
-	sort.SliceStable(out, func(i, j int) bool {
-		ei, ej := hasExplicitQ(out[i]), hasExplicitQ(out[j])
-		if ei != ej {
-			return ei // explicit beats implicit
-		}
-		if out[i].q != out[j].q {
-			return out[i].q > out[j].q
-		}
-		return out[i].spec > out[j].spec
-	})
-	return out
-}
-
-// Matches reports whether content type is acceptable per the header.
-func Matches(header, ct string) bool {
-	for _, r := range ParseAccept(header) {
-		switch {
-		case r.q == 0:
-			continue
-		case r.mt == "*/*":
-			return true
-		case strings.HasSuffix(r.mt, "/*"):
-			if strings.HasPrefix(ct, r.mt[:len(r.mt)-1]) {
-				return true
-			}
-		case r.mt == ct:
-			return true
-		}
-	}
-	return false
-}
-
-// Negotiate selects the best server type according to the header.
-// Returns the chosen type and true, or "", false when nothing matches.
-func Negotiate(header string, serverTypes []string) (string, bool) {
-	for _, r := range ParseAccept(header) {
-		if r.q == 0 {
-			continue
-		}
-		for _, s := range serverTypes {
-			if Matches(r.mt, s) {
-				return s, true
-			}
-		}
-	}
-	return "", false
-}
-
-// PrimaryAcceptMatches only checks if the first accept matches
-func PrimaryAcceptMatches(header, produced string) bool {
-	for _, r := range ParseAccept(header) {
-		if r.q == 0 {
-			continue // explicitly unacceptable – skip
-		}
-		return Matches(r.mt, produced)
-	}
-	return false
-}

api/apiutil/header_test.go

@@ -1,174 +0,0 @@
-package apiutil
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-)
-
-func TestParseAccept(t *testing.T) {
-	type want struct {
-		mt   string
-		q    float64
-		spec int
-	}
-
-	cases := []struct {
-		name   string
-		header string
-		want   []want
-	}{
-		{
-			name:   "empty header becomes */*;q=1",
-			header: "",
-			want:   []want{{mt: "*/*", q: 1, spec: 0}},
-		},
-		{
-			name:   "quality ordering then specificity",
-			header: "application/json;q=0.2, */*;q=0.1, application/xml;q=0.5, text/*;q=0.5",
-			want: []want{
-				{mt: "application/xml", q: 0.5, spec: 2},
-				{mt: "text/*", q: 0.5, spec: 1},
-				{mt: "application/json", q: 0.2, spec: 2},
-				{mt: "*/*", q: 0.1, spec: 0},
-			},
-		},
-		{
-			name:   "invalid pieces are skipped",
-			header: "text/plain; q=boom, application/json",
-			want:   []want{{mt: "application/json", q: 1, spec: 2}},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got := ParseAccept(tc.header)
-			gotProjected := make([]want, len(got))
-			for i, g := range got {
-				gotProjected[i] = want{mt: g.mt, q: g.q, spec: g.spec}
-			}
-			require.DeepEqual(t, gotProjected, tc.want)
-		})
-	}
-}
-
-func TestMatches(t *testing.T) {
-	cases := []struct {
-		name    string
-		accept  string
-		ct      string
-		matches bool
-	}{
-		{"exact match", "application/json", "application/json", true},
-		{"type wildcard", "application/*;q=0.8", "application/xml", true},
-		{"global wildcard", "*/*;q=0.1", "image/png", true},
-		{"explicitly unacceptable (q=0)", "text/*;q=0", "text/plain", false},
-		{"no match", "image/png", "application/json", false},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got := Matches(tc.accept, tc.ct)
-			require.Equal(t, tc.matches, got)
-		})
-	}
-}
-
-func TestNegotiate(t *testing.T) {
-	cases := []struct {
-		name        string
-		accept      string
-		serverTypes []string
-		wantType    string
-		ok          bool
-	}{
-		{
-			name:        "highest quality wins",
-			accept:      "application/json;q=0.8,application/xml;q=0.9",
-			serverTypes: []string{"application/json", "application/xml"},
-			wantType:    "application/xml",
-			ok:          true,
-		},
-		{
-			name:        "wildcard matches first server type",
-			accept:      "*/*;q=0.5",
-			serverTypes: []string{"application/octet-stream", "application/json"},
-			wantType:    "application/octet-stream",
-			ok:          true,
-		},
-		{
-			name:        "no acceptable type",
-			accept:      "image/png",
-			serverTypes: []string{"application/json"},
-			wantType:    "",
-			ok:          false,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got, ok := Negotiate(tc.accept, tc.serverTypes)
-			require.Equal(t, tc.ok, ok)
-			require.Equal(t, tc.wantType, got)
-		})
-	}
-}
-
-func TestPrimaryAcceptMatches(t *testing.T) {
-	tests := []struct {
-		name     string
-		accept   string
-		produced string
-		expect   bool
-	}{
-		{
-			name:     "prefers json",
-			accept:   "application/json;q=0.9,application/xml",
-			produced: "application/json",
-			expect:   true,
-		},
-		{
-			name:     "wildcard application beats other wildcard",
-			accept:   "application/*;q=0.2,*/*;q=0.1",
-			produced: "application/xml",
-			expect:   true,
-		},
-		{
-			name:     "json wins",
-			accept:   "application/xml;q=0.8,application/json;q=0.9",
-			produced: "application/json",
-			expect:   true,
-		},
-		{
-			name:     "json loses",
-			accept:   "application/xml;q=0.8,application/json;q=0.9,application/octet-stream;q=0.99",
-			produced: "application/json",
-			expect:   false,
-		},
-		{
-			name:     "json wins with non q option",
-			accept:   "application/xml;q=0.8,image/png,application/json;q=0.9",
-			produced: "application/json",
-			expect:   true,
-		},
-		{
-			name:     "json not primary",
-			accept:   "image/png,application/json",
-			produced: "application/json",
-			expect:   false,
-		},
-		{
-			name:     "absent header",
-			accept:   "",
-			produced: "text/plain",
-			expect:   true,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := PrimaryAcceptMatches(tc.accept, tc.produced)
-			require.Equal(t, got, tc.expect)
-		})
-	}
-}

api/client/BUILD.bazel

@@ -5,16 +5,31 @@ go_library(
     srcs = [
         "client.go",
         "errors.go",
+        "json_rest_handler.go",
         "options.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/api/client",
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_pkg_errors//:go_default_library"],
+    deps = [
+        "//api:go_default_library",
+        "//network/httputil:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+    ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = ["client_test.go"],
+    srcs = [
+        "client_test.go",
+        "json_rest_handler_test.go",
+    ],
     embed = [":go_default_library"],
-    deps = ["//testing/require: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",
+    ],
 )

api/client/beacon/BUILD.bazel

@@ -6,9 +6,10 @@ go_library(
         "client.go",
         "doc.go",
         "log.go",
+        "structs.go",
         "template.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/api/client/beacon",
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon",
     visibility = ["//visibility:public"],
     deps = [
         "//api/client:go_default_library",
@@ -16,6 +17,7 @@ go_library(
         "//api/server/structs:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//encoding/bytesutil:go_default_library",
+        "//network/forks:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",

api/client/beacon/chain/BUILD.bazel

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,31 @@
+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,12 +1,10 @@
-package grpc_api
+package chain
 
 import (
 	"context"
 
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"github.com/golang/protobuf/ptypes/empty"
-	"google.golang.org/grpc"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 type grpcChainClient struct {
@@ -36,7 +34,3 @@ func (c *grpcChainClient) ValidatorPerformance(ctx context.Context, in *ethpb.Va
 func (c *grpcChainClient) ValidatorParticipation(ctx context.Context, in *ethpb.GetValidatorParticipationRequest) (*ethpb.ValidatorParticipationResponse, error) {
 	return c.beaconChainClient.GetValidatorParticipation(ctx, in)
 }
-
-func NewGrpcChainClient(cc grpc.ClientConnInterface) iface.ChainClient {
-	return &grpcChainClient{ethpb.NewBeaconChainClient(cc)}
-}

api/client/beacon/chain/interfaces.go

@@ -1,13 +1,13 @@
-package iface
+package chain
 
 import (
 	"context"
 
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/golang/protobuf/ptypes/empty"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
-type ChainClient interface {
+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)

api/client/beacon/chain/rest_client.go

@@ -1,24 +1,25 @@
-package beacon_api
+package chain
 
 import (
 	"context"
 	"reflect"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/time/slots"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/client"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/shared_providers"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/time/slots"
 )
 
 type beaconApiChainClient struct {
-	fallbackClient          iface.ChainClient
-	jsonRestHandler         RestHandler
-	stateValidatorsProvider StateValidatorsProvider
+	fallbackClient          Client
+	jsonRestHandler         client.JsonRestHandler
+	stateValidatorsProvider shared_providers.StateValidators
 }
 
 func (c beaconApiChainClient) headBlockHeaders(ctx context.Context) (*structs.GetBlockHeaderResponse, error) {
@@ -332,11 +333,3 @@ func (c beaconApiChainClient) ValidatorParticipation(ctx context.Context, in *et
 	// TODO: Implement me
 	return nil, errors.New("beaconApiChainClient.ValidatorParticipation is not implemented. To use a fallback client, pass a fallback client as the last argument of NewBeaconApiChainClientWithFallback.")
 }
-
-func NewBeaconApiChainClientWithFallback(jsonRestHandler RestHandler, fallbackClient iface.ChainClient) iface.ChainClient {
-	return &beaconApiChainClient{
-		jsonRestHandler:         jsonRestHandler,
-		fallbackClient:          fallbackClient,
-		stateValidatorsProvider: beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler},
-	}
-}

api/client/beacon/chain/rest_client_test.go

@@ -1,20 +1,21 @@
-package beacon_api
+package chain
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"math"
 	"strconv"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/time/slots"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"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"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
+	"github.com/prysmaticlabs/prysm/v5/time/slots"
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
@@ -25,7 +26,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("invalid token", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		beaconChainClient := beaconApiChainClient{}
 		_, err := beaconChainClient.Validators(ctx, &ethpb.ListValidatorsRequest{
@@ -37,7 +38,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("query filter epoch overflow", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		beaconChainClient := beaconApiChainClient{}
 		_, err := beaconChainClient.Validators(ctx, &ethpb.ListValidatorsRequest{
@@ -51,7 +52,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("fails to get validators for epoch filter", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 		stateValidatorsProvider.EXPECT().StateValidatorsForSlot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -71,7 +72,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("fails to get validators for genesis filter", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 		stateValidatorsProvider.EXPECT().StateValidatorsForSlot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -89,7 +90,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("fails to get validators for nil filter", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 		stateValidatorsProvider.EXPECT().StateValidatorsForHead(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -107,7 +108,7 @@ func TestListValidators(t *testing.T) {
 	t.Run("fails to get latest block header for nil filter", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 		stateValidatorsProvider.EXPECT().StateValidatorsForHead(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -180,7 +181,7 @@ func TestListValidators(t *testing.T) {
 			t.Run(testCase.name, func(t *testing.T) {
 				ctrl := gomock.NewController(t)
 				defer ctrl.Finish()
-				ctx := t.Context()
+				ctx := context.Background()
 
 				stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 				stateValidatorsProvider.EXPECT().StateValidatorsForHead(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -321,7 +322,7 @@ func TestListValidators(t *testing.T) {
 			t.Run(testCase.name, func(t *testing.T) {
 				ctrl := gomock.NewController(t)
 				defer ctrl.Finish()
-				ctx := t.Context()
+				ctx := context.Background()
 
 				stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 				stateValidatorsProvider.EXPECT().StateValidatorsForSlot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
@@ -549,7 +550,7 @@ func TestListValidators(t *testing.T) {
 			t.Run(testCase.name, func(t *testing.T) {
 				ctrl := gomock.NewController(t)
 				defer ctrl.Finish()
-				ctx := t.Context()
+				ctx := context.Background()
 
 				stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 				stateValidatorsProvider.EXPECT().StateValidatorsForSlot(gomock.Any(), primitives.Slot(0), make([]string, 0), []primitives.ValidatorIndex{}, nil).Return(
@@ -737,7 +738,7 @@ func TestGetChainHead(t *testing.T) {
 			t.Run(testCase.name, func(t *testing.T) {
 				ctrl := gomock.NewController(t)
 				defer ctrl.Finish()
-				ctx := t.Context()
+				ctx := context.Background()
 
 				finalityCheckpointsResponse := structs.GetFinalityCheckpointsResponse{}
 				jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -835,7 +836,7 @@ func TestGetChainHead(t *testing.T) {
 			t.Run(testCase.name, func(t *testing.T) {
 				ctrl := gomock.NewController(t)
 				defer ctrl.Finish()
-				ctx := t.Context()
+				ctx := context.Background()
 
 				jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
@@ -865,7 +866,7 @@ func TestGetChainHead(t *testing.T) {
 	t.Run("returns a valid chain head", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		ctx := t.Context()
+		ctx := context.Background()
 
 		jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 

api/client/beacon/client.go

@@ -9,16 +9,18 @@ import (
 	"net/url"
 	"path"
 	"regexp"
+	"sort"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/client"
-	"github.com/OffchainLabs/prysm/v6/api/server"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/client"
+	"github.com/prysmaticlabs/prysm/v5/api/server"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
+	"github.com/prysmaticlabs/prysm/v5/network/forks"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/sirupsen/logrus"
 )
 
@@ -135,6 +137,24 @@ func (c *Client) GetFork(ctx context.Context, stateId StateOrBlockId) (*ethpb.Fo
 	return fr.ToConsensus()
 }
 
+// GetForkSchedule retrieve all forks, past present and future, of which this node is aware.
+func (c *Client) GetForkSchedule(ctx context.Context) (forks.OrderedSchedule, error) {
+	body, err := c.Get(ctx, getForkSchedulePath)
+	if err != nil {
+		return nil, errors.Wrap(err, "error requesting fork schedule")
+	}
+	fsr := &forkScheduleResponse{}
+	err = json.Unmarshal(body, fsr)
+	if err != nil {
+		return nil, err
+	}
+	ofs, err := fsr.OrderedForkSchedule()
+	if err != nil {
+		return nil, errors.Wrap(err, fmt.Sprintf("problem unmarshaling %s response", getForkSchedulePath))
+	}
+	return ofs, nil
+}
+
 // GetConfigSpec retrieve the current configs of the network used by the beacon node.
 func (c *Client) GetConfigSpec(ctx context.Context) (*structs.GetSpecResponse, error) {
 	body, err := c.Get(ctx, getConfigSpecPath)
@@ -314,3 +334,31 @@ func (c *Client) GetBLStoExecutionChanges(ctx context.Context) (*structs.BLSToEx
 	}
 	return poolResponse, nil
 }
+
+type forkScheduleResponse struct {
+	Data []structs.Fork
+}
+
+func (fsr *forkScheduleResponse) OrderedForkSchedule() (forks.OrderedSchedule, error) {
+	ofs := make(forks.OrderedSchedule, 0)
+	for _, d := range fsr.Data {
+		epoch, err := strconv.ParseUint(d.Epoch, 10, 64)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error parsing epoch %s", d.Epoch)
+		}
+		vSlice, err := hexutil.Decode(d.CurrentVersion)
+		if err != nil {
+			return nil, err
+		}
+		if len(vSlice) != 4 {
+			return nil, fmt.Errorf("got %d byte version, expected 4 bytes. version hex=%s", len(vSlice), d.CurrentVersion)
+		}
+		version := bytesutil.ToBytes4(vSlice)
+		ofs = append(ofs, forks.ForkScheduleEntry{
+			Version: version,
+			Epoch:   primitives.Epoch(epoch),
+		})
+	}
+	sort.Sort(ofs)
+	return ofs, nil
+}

api/client/beacon/client_test.go

@@ -4,8 +4,8 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/client"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
+	"github.com/prysmaticlabs/prysm/v5/api/client"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 )
 
 func TestParseNodeVersion(t *testing.T) {

api/client/beacon/health/BUILD.bazel

@@ -0,0 +1,20 @@
+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/health_mock.go

@@ -0,0 +1,65 @@
+package health
+
+import (
+	"context"
+	"reflect"
+	"sync"
+
+	"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
+}
+
+// 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.
+type MockHealthClientMockRecorder struct {
+	mock *MockHealthClient
+}
+
+// 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)
+	if !ok {
+		return false
+	}
+	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
+}
+
+// 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)
+}

api/client/beacon/health/interfaces.go

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

api/client/beacon/health/tracker.go

@@ -0,0 +1,58 @@
+package health
+
+import (
+	"context"
+	"sync"
+)
+
+type healthTracker struct {
+	isHealthy  *bool
+	healthChan chan bool
+	node       HealthNode
+	sync.RWMutex
+}
+
+func NewTracker(node HealthNode) HealthTracker {
+	return &healthTracker{
+		node:       node,
+		healthChan: make(chan bool, 1),
+	}
+}
+
+// HealthUpdates provides a read-only channel for health updates.
+func (n *healthTracker) HealthUpdates() <-chan bool {
+	return n.healthChan
+}
+
+func (n *healthTracker) IsHealthy(_ context.Context) bool {
+	n.RLock()
+	defer n.RUnlock()
+	if n.isHealthy == nil {
+		return false
+	}
+	return *n.isHealthy
+}
+
+func (n *healthTracker) CheckHealth(ctx context.Context) bool {
+	n.Lock()
+	defer n.Unlock()
+
+	newStatus := n.node.IsHealthy(ctx)
+	if n.isHealthy == nil {
+		n.isHealthy = &newStatus
+	}
+
+	isStatusChanged := newStatus != *n.isHealthy
+	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
+		}
+	}
+	return newStatus
+}

api/client/beacon/health/tracker_test.go

@@ -0,0 +1,115 @@
+package health
+
+import (
+	"context"
+	"sync"
+	"testing"
+
+	"go.uber.org/mock/gomock"
+)
+
+var (
+	_ = HealthTracker(&MockHealthClient{})
+)
+
+func TestNodeHealth_IsHealthy(t *testing.T) {
+	tests := []struct {
+		name      string
+		isHealthy bool
+		want      bool
+	}{
+		{"initially healthy", true, true},
+		{"initially unhealthy", false, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			n := &healthTracker{
+				isHealthy:  &tt.isHealthy,
+				healthChan: make(chan bool, 1),
+			}
+			if got := n.IsHealthy(context.Background()); got != tt.want {
+				t.Errorf("IsHealthy() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestNodeHealth_UpdateNodeHealth(t *testing.T) {
+	tests := []struct {
+		name       string
+		initial    bool // Initial health status
+		newStatus  bool // Status to update to
+		shouldSend bool // Should a message be sent through the channel
+	}{
+		{"healthy to unhealthy", true, false, true},
+		{"unhealthy to healthy", false, true, true},
+		{"remain healthy", true, true, false},
+		{"remain unhealthy", false, false, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+			client := NewMockHealthClient(ctrl)
+			client.EXPECT().IsHealthy(gomock.Any()).Return(tt.newStatus)
+			n := &healthTracker{
+				isHealthy:  &tt.initial,
+				node:       client,
+				healthChan: make(chan bool, 1),
+			}
+
+			s := n.CheckHealth(context.Background())
+			// Check if health status was updated
+			if s != tt.newStatus {
+				t.Errorf("UpdateNodeHealth() failed to update isHealthy from %v to %v", tt.initial, tt.newStatus)
+			}
+
+			select {
+			case status := <-n.HealthUpdates():
+				if !tt.shouldSend {
+					t.Errorf("UpdateNodeHealth() unexpectedly sent status %v to HealthCh", status)
+				} else if status != tt.newStatus {
+					t.Errorf("UpdateNodeHealth() sent wrong status %v, want %v", status, tt.newStatus)
+				}
+			default:
+				if tt.shouldSend {
+					t.Error("UpdateNodeHealth() did not send any status to HealthCh when expected")
+				}
+			}
+		})
+	}
+}
+
+func TestNodeHealth_Concurrency(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+	client := NewMockHealthClient(ctrl)
+	n := NewTracker(client)
+	var wg sync.WaitGroup
+
+	// Number of goroutines to spawn for both reading and writing
+	numGoroutines := 6
+
+	wg.Add(numGoroutines * 2) // for readers and writers
+
+	// Concurrently update health status
+	for i := 0; i < numGoroutines; i++ {
+		go func() {
+			defer wg.Done()
+			client.EXPECT().IsHealthy(gomock.Any()).Return(false).Times(1)
+			n.CheckHealth(context.Background())
+			client.EXPECT().IsHealthy(gomock.Any()).Return(true).Times(1)
+			n.CheckHealth(context.Background())
+		}()
+	}
+
+	// Concurrently read health status
+	for i := 0; i < numGoroutines; i++ {
+		go func() {
+			defer wg.Done()
+			_ = n.IsHealthy(context.Background()) // Just read the value
+		}()
+	}
+
+	wg.Wait() // Wait for all goroutines to finish
+}

api/client/beacon/mock/BUILD.bazel

@@ -1,26 +1,28 @@
 load("@prysm//tools/go:def.bzl", "go_library")
 
-package(default_testonly = True)
-
 go_library(
     name = "go_default_library",
     srcs = [
+        "beacon_block_converter_mock.go",
         "chain_client_mock.go",
+        "duties_mock.go",
+        "genesis_mock.go",
+        "json_rest_handler_mock.go",
         "node_client_mock.go",
         "prysm_chain_client_mock.go",
+        "state_validators_mock.go",
         "validator_client_mock.go",
-        "validator_mock.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/testing/validator-mock",
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock",
     visibility = ["//visibility:public"],
     deps = [
+        "//api/client/beacon:go_default_library",
+        "//api/client/beacon/health:go_default_library",
         "//api/client/event:go_default_library",
-        "//config/proposer:go_default_library",
+        "//api/server/structs:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/validator:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//validator/client/iface:go_default_library",
-        "//validator/keymanager:go_default_library",
         "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
         "@org_uber_go_mock//gomock:go_default_library",
     ],

api/client/beacon/mock/beacon_block_converter_mock.go

@@ -12,8 +12,8 @@ package mock
 import (
 	reflect "reflect"
 
-	structs "github.com/OffchainLabs/prysm/v6/api/server/structs"
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -21,7 +21,6 @@ import (
 type MockBeaconBlockConverter struct {
 	ctrl     *gomock.Controller
 	recorder *MockBeaconBlockConverterMockRecorder
-	isgomock struct{}
 }
 
 // MockBeaconBlockConverterMockRecorder is the mock recorder for MockBeaconBlockConverter.

api/client/beacon/mock/chain_client_mock.go

@@ -1,19 +1,19 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/OffchainLabs/prysm/v6/validator/client/iface (interfaces: ChainClient)
+// 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/OffchainLabs/prysm/v6/validator/client/iface ChainClient
+//	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 validator_mock
+package mock
 
 import (
 	context "context"
 	reflect "reflect"
 
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	gomock "go.uber.org/mock/gomock"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
@@ -22,7 +22,6 @@ import (
 type MockChainClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockChainClientMockRecorder
-	isgomock struct{}
 }
 
 // MockChainClientMockRecorder is the mock recorder for MockChainClient.
@@ -43,48 +42,48 @@ func (m *MockChainClient) EXPECT() *MockChainClientMockRecorder {
 }
 
 // ChainHead mocks base method.
-func (m *MockChainClient) ChainHead(ctx context.Context, in *emptypb.Empty) (*eth.ChainHead, error) {
+func (m *MockChainClient) ChainHead(arg0 context.Context, arg1 *emptypb.Empty) (*eth.ChainHead, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ChainHead", ctx, in)
+	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(ctx, in any) *gomock.Call {
+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), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainHead", reflect.TypeOf((*MockChainClient)(nil).ChainHead), arg0, arg1)
 }
 
 // ValidatorBalances mocks base method.
-func (m *MockChainClient) ValidatorBalances(ctx context.Context, in *eth.ListValidatorBalancesRequest) (*eth.ValidatorBalances, error) {
+func (m *MockChainClient) ValidatorBalances(arg0 context.Context, arg1 *eth.ListValidatorBalancesRequest) (*eth.ValidatorBalances, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorBalances", ctx, in)
+	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(ctx, in any) *gomock.Call {
+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), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorBalances", reflect.TypeOf((*MockChainClient)(nil).ValidatorBalances), arg0, arg1)
 }
 
 // ValidatorParticipation mocks base method.
-func (m *MockChainClient) ValidatorParticipation(ctx context.Context, in *eth.GetValidatorParticipationRequest) (*eth.ValidatorParticipationResponse, error) {
+func (m *MockChainClient) ValidatorParticipation(arg0 context.Context, arg1 *eth.GetValidatorParticipationRequest) (*eth.ValidatorParticipationResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorParticipation", ctx, in)
+	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(ctx, in any) *gomock.Call {
+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), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorParticipation", reflect.TypeOf((*MockChainClient)(nil).ValidatorParticipation), arg0, arg1)
 }
 
 // ValidatorPerformance mocks base method.
@@ -103,31 +102,31 @@ func (mr *MockChainClientMockRecorder) ValidatorPerformance(arg0, arg1 any) *gom
 }
 
 // ValidatorQueue mocks base method.
-func (m *MockChainClient) ValidatorQueue(ctx context.Context, in *emptypb.Empty) (*eth.ValidatorQueue, error) {
+func (m *MockChainClient) ValidatorQueue(arg0 context.Context, arg1 *emptypb.Empty) (*eth.ValidatorQueue, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorQueue", ctx, in)
+	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(ctx, in any) *gomock.Call {
+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), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorQueue", reflect.TypeOf((*MockChainClient)(nil).ValidatorQueue), arg0, arg1)
 }
 
 // Validators mocks base method.
-func (m *MockChainClient) Validators(ctx context.Context, in *eth.ListValidatorsRequest) (*eth.Validators, error) {
+func (m *MockChainClient) Validators(arg0 context.Context, arg1 *eth.ListValidatorsRequest) (*eth.Validators, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Validators", ctx, in)
+	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(ctx, in any) *gomock.Call {
+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), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validators", reflect.TypeOf((*MockChainClient)(nil).Validators), arg0, arg1)
 }

api/client/beacon/mock/duties_mock.go

@@ -13,8 +13,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	structs "github.com/OffchainLabs/prysm/v6/api/server/structs"
-	primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
+	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	primitives "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -22,7 +22,6 @@ import (
 type MockdutiesProvider struct {
 	ctrl     *gomock.Controller
 	recorder *MockdutiesProviderMockRecorder
-	isgomock struct{}
 }
 
 // MockdutiesProviderMockRecorder is the mock recorder for MockdutiesProvider.
@@ -43,10 +42,10 @@ func (m *MockdutiesProvider) EXPECT() *MockdutiesProviderMockRecorder {
 }
 
 // AttesterDuties mocks base method.
-func (m *MockdutiesProvider) AttesterDuties(ctx context.Context, epoch primitives.Epoch, validatorIndices []primitives.ValidatorIndex) (*structs.GetAttesterDutiesResponse, error) {
+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.GetAttesterDutiesResponse)
+	ret0, _ := ret[0].([]*structs.AttesterDuty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -73,10 +72,10 @@ func (mr *MockdutiesProviderMockRecorder) Committees(ctx, epoch any) *gomock.Cal
 }
 
 // ProposerDuties mocks base method.
-func (m *MockdutiesProvider) ProposerDuties(ctx context.Context, epoch primitives.Epoch) (*structs.GetProposerDutiesResponse, error) {
+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.GetProposerDutiesResponse)
+	ret0, _ := ret[0].([]*structs.ProposerDuty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }

api/client/beacon/mock/genesis_mock.go

@@ -13,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	structs "github.com/OffchainLabs/prysm/v6/api/server/structs"
+	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -21,7 +21,6 @@ import (
 type MockGenesisProvider struct {
 	ctrl     *gomock.Controller
 	recorder *MockGenesisProviderMockRecorder
-	isgomock struct{}
 }
 
 // MockGenesisProviderMockRecorder is the mock recorder for MockGenesisProvider.

api/client/beacon/mock/json_rest_handler_mock.go

@@ -22,7 +22,6 @@ import (
 type MockJsonRestHandler struct {
 	ctrl     *gomock.Controller
 	recorder *MockJsonRestHandlerMockRecorder
-	isgomock struct{}
 }
 
 // MockJsonRestHandlerMockRecorder is the mock recorder for MockJsonRestHandler.
@@ -56,22 +55,6 @@ func (mr *MockJsonRestHandlerMockRecorder) Get(ctx, endpoint, resp any) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockJsonRestHandler)(nil).Get), ctx, endpoint, resp)
 }
 
-// GetSSZ mocks base method.
-func (m *MockJsonRestHandler) GetSSZ(ctx context.Context, endpoint string) ([]byte, http.Header, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetSSZ", ctx, endpoint)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(http.Header)
-	ret2, _ := ret[2].(error)
-	return ret0, ret1, ret2
-}
-
-// GetSSZ indicates an expected call of GetSSZ.
-func (mr *MockJsonRestHandlerMockRecorder) GetSSZ(ctx, endpoint any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSSZ", reflect.TypeOf((*MockJsonRestHandler)(nil).GetSSZ), ctx, endpoint)
-}
-
 // Host mocks base method.
 func (m *MockJsonRestHandler) Host() string {
 	m.ctrl.T.Helper()
@@ -114,22 +97,6 @@ func (mr *MockJsonRestHandlerMockRecorder) Post(ctx, endpoint, headers, data, re
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Post", reflect.TypeOf((*MockJsonRestHandler)(nil).Post), ctx, endpoint, headers, data, resp)
 }
 
-// Post mocks base method.
-func (m *MockJsonRestHandler) PostSSZ(ctx context.Context, endpoint string, headers map[string]string, data *bytes.Buffer) ([]byte, http.Header, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "PostSSZ", ctx, endpoint, headers, data)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(http.Header)
-	ret2, _ := ret[2].(error)
-	return ret0,ret1,ret2
-}
-
-// Post indicates an expected call of Post.
-func (mr *MockJsonRestHandlerMockRecorder) PostSSZ(ctx, endpoint, headers, data any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostSSZ", reflect.TypeOf((*MockJsonRestHandler)(nil).PostSSZ), ctx, endpoint, headers, data)
-}
-
 // SetHost mocks base method.
 func (m *MockJsonRestHandler) SetHost(host string) {
 	m.ctrl.T.Helper()

api/client/beacon/mock/node_client_mock.go

@@ -1,19 +1,18 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/OffchainLabs/prysm/v6/validator/client/iface (interfaces: NodeClient)
 //
 // Generated by this command:
 //
-//	mockgen -package=validator_mock -destination=testing/validator-mock/node_client_mock.go github.com/OffchainLabs/prysm/v6/validator/client/iface NodeClient
+//	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 validator_mock
+package mock
 
 import (
 	context "context"
 	reflect "reflect"
 
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	"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"
 )
@@ -56,18 +55,18 @@ func (mr *MockNodeClientMockRecorder) Genesis(arg0, arg1 any) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Genesis", reflect.TypeOf((*MockNodeClient)(nil).Genesis), arg0, arg1)
 }
 
-// IsHealthy mocks base method.
-func (m *MockNodeClient) IsHealthy(arg0 context.Context) bool {
+// HealthTracker mocks base method.
+func (m *MockNodeClient) HealthTracker() health.HealthTracker {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "IsHealthy", arg0)
-	ret0, _ := ret[0].(bool)
+	ret := m.ctrl.Call(m, "HealthTracker")
+	ret0, _ := ret[0].(health.HealthTracker)
 	return ret0
 }
 
-// IsHealthy indicates an expected call of IsHealthy.
-func (mr *MockNodeClientMockRecorder) IsHealthy(arg0 any) *gomock.Call {
+// 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, "IsHealthy", reflect.TypeOf((*MockNodeClient)(nil).IsHealthy), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HealthTracker", reflect.TypeOf((*MockNodeClient)(nil).HealthTracker))
 }
 
 // Peers mocks base method.

api/client/beacon/mock/prysm_chain_client_mock.go

@@ -1,21 +1,21 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/OffchainLabs/prysm/v6/validator/client/iface (interfaces: PrysmChainClient)
+// 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/OffchainLabs/prysm/v6/validator/client/iface PrysmChainClient
+//	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 validator_mock
+package mock
 
 import (
 	context "context"
 	reflect "reflect"
 
-	validator "github.com/OffchainLabs/prysm/v6/consensus-types/validator"
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	iface "github.com/OffchainLabs/prysm/v6/validator/client/iface"
+	"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"
 )
 
@@ -23,7 +23,6 @@ import (
 type MockPrysmChainClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockPrysmChainClientMockRecorder
-	isgomock struct{}
 }
 
 // MockPrysmChainClientMockRecorder is the mock recorder for MockPrysmChainClient.
@@ -44,10 +43,10 @@ func (m *MockPrysmChainClient) EXPECT() *MockPrysmChainClientMockRecorder {
 }
 
 // ValidatorCount mocks base method.
-func (m *MockPrysmChainClient) ValidatorCount(arg0 context.Context, arg1 string, arg2 []validator.Status) ([]iface.ValidatorCount, error) {
+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].([]iface.ValidatorCount)
+	ret0, _ := ret[0].([]beacon.ValidatorCount)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -59,10 +58,10 @@ func (mr *MockPrysmChainClientMockRecorder) ValidatorCount(arg0, arg1, arg2 any)
 }
 
 // ValidatorPerformance mocks base method.
-func (m *MockPrysmChainClient) ValidatorPerformance(arg0 context.Context, arg1 *eth.ValidatorPerformanceRequest) (*eth.ValidatorPerformanceResponse, error) {
+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].(*eth.ValidatorPerformanceResponse)
+	ret0, _ := ret[0].(*ethpb.ValidatorPerformanceResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -70,5 +69,5 @@ func (m *MockPrysmChainClient) ValidatorPerformance(arg0 context.Context, arg1 *
 // 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, "ValidatorPerformance", reflect.TypeOf((*MockPrysmChainClient)(nil).ValidatorPerformance), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorCount", reflect.TypeOf((*MockPrysmChainClient)(nil).ValidatorPerformance), arg0, arg1)
 }

api/client/beacon/mock/state_validators_mock.go

@@ -13,8 +13,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	structs "github.com/OffchainLabs/prysm/v6/api/server/structs"
-	primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
+	structs "github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	primitives "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -22,7 +22,6 @@ import (
 type MockStateValidatorsProvider struct {
 	ctrl     *gomock.Controller
 	recorder *MockStateValidatorsProviderMockRecorder
-	isgomock struct{}
 }
 
 // MockStateValidatorsProviderMockRecorder is the mock recorder for MockStateValidatorsProvider.

api/client/beacon/mock/validator_client_mock.go

@@ -1,22 +1,22 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/OffchainLabs/prysm/v6/validator/client/iface (interfaces: ValidatorClient)
+// Source: github.com/prysmaticlabs/prysm/v5/validator/client/iface (interfaces: ValidatorClient)
 //
 // Generated by this command:
 //
-//	mockgen -package=validator_mock -destination=testing/validator-mock/validator_client_mock.go github.com/OffchainLabs/prysm/v6/validator/client/iface ValidatorClient
+//	mockgen -package=validator_mock -destination=testing/validator-mock/validator_client_mock.go github.com/prysmaticlabs/prysm/v5/validator/client/iface ValidatorClient
 //
 
 // Package validator_mock is a generated GoMock package.
-package validator_mock
+package mock
 
 import (
 	context "context"
 	reflect "reflect"
 
-	event "github.com/OffchainLabs/prysm/v6/api/client/event"
-	primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	iface "github.com/OffchainLabs/prysm/v6/validator/client/iface"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	event "github.com/prysmaticlabs/prysm/v5/api/client/event"
+	primitives "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	gomock "go.uber.org/mock/gomock"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
@@ -25,7 +25,6 @@ import (
 type MockValidatorClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockValidatorClientMockRecorder
-	isgomock struct{}
 }
 
 // MockValidatorClientMockRecorder is the mock recorder for MockValidatorClient.
@@ -46,108 +45,108 @@ func (m *MockValidatorClient) EXPECT() *MockValidatorClientMockRecorder {
 }
 
 // AggregatedSelections mocks base method.
-func (m *MockValidatorClient) AggregatedSelections(ctx context.Context, selections []iface.BeaconCommitteeSelection) ([]iface.BeaconCommitteeSelection, error) {
+func (m *MockValidatorClient) AggregatedSelections(arg0 context.Context, arg1 []beacon.BeaconCommitteeSelection) ([]beacon.BeaconCommitteeSelection, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AggregatedSelections", ctx, selections)
-	ret0, _ := ret[0].([]iface.BeaconCommitteeSelection)
+	ret := m.ctrl.Call(m, "AggregatedSelections", arg0, arg1)
+	ret0, _ := ret[0].([]beacon.BeaconCommitteeSelection)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // AggregatedSelections indicates an expected call of AggregatedSelections.
-func (mr *MockValidatorClientMockRecorder) AggregatedSelections(ctx, selections any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) AggregatedSelections(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AggregatedSelections", reflect.TypeOf((*MockValidatorClient)(nil).AggregatedSelections), ctx, selections)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AggregatedSelections", reflect.TypeOf((*MockValidatorClient)(nil).AggregatedSelections), arg0, arg1)
 }
 
 // AggregatedSyncSelections mocks base method.
-func (m *MockValidatorClient) AggregatedSyncSelections(ctx context.Context, selections []iface.SyncCommitteeSelection) ([]iface.SyncCommitteeSelection, error) {
+func (m *MockValidatorClient) AggregatedSyncSelections(arg0 context.Context, arg1 []beacon.SyncCommitteeSelection) ([]beacon.SyncCommitteeSelection, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AggregatedSyncSelections", ctx, selections)
-	ret0, _ := ret[0].([]iface.SyncCommitteeSelection)
+	ret := m.ctrl.Call(m, "AggregatedSyncSelections", arg0, arg1)
+	ret0, _ := ret[0].([]beacon.SyncCommitteeSelection)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // AggregatedSyncSelections indicates an expected call of AggregatedSyncSelections.
-func (mr *MockValidatorClientMockRecorder) AggregatedSyncSelections(ctx, selections any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) AggregatedSyncSelections(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AggregatedSyncSelections", reflect.TypeOf((*MockValidatorClient)(nil).AggregatedSyncSelections), ctx, selections)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AggregatedSyncSelections", reflect.TypeOf((*MockValidatorClient)(nil).AggregatedSyncSelections), arg0, arg1)
 }
 
 // AttestationData mocks base method.
-func (m *MockValidatorClient) AttestationData(ctx context.Context, in *eth.AttestationDataRequest) (*eth.AttestationData, error) {
+func (m *MockValidatorClient) AttestationData(arg0 context.Context, arg1 *eth.AttestationDataRequest) (*eth.AttestationData, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AttestationData", ctx, in)
+	ret := m.ctrl.Call(m, "AttestationData", arg0, arg1)
 	ret0, _ := ret[0].(*eth.AttestationData)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // AttestationData indicates an expected call of AttestationData.
-func (mr *MockValidatorClientMockRecorder) AttestationData(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) AttestationData(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttestationData", reflect.TypeOf((*MockValidatorClient)(nil).AttestationData), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttestationData", reflect.TypeOf((*MockValidatorClient)(nil).AttestationData), arg0, arg1)
 }
 
 // BeaconBlock mocks base method.
-func (m *MockValidatorClient) BeaconBlock(ctx context.Context, in *eth.BlockRequest) (*eth.GenericBeaconBlock, error) {
+func (m *MockValidatorClient) BeaconBlock(arg0 context.Context, arg1 *eth.BlockRequest) (*eth.GenericBeaconBlock, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "BeaconBlock", ctx, in)
+	ret := m.ctrl.Call(m, "BeaconBlock", arg0, arg1)
 	ret0, _ := ret[0].(*eth.GenericBeaconBlock)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // BeaconBlock indicates an expected call of BeaconBlock.
-func (mr *MockValidatorClientMockRecorder) BeaconBlock(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) BeaconBlock(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeaconBlock", reflect.TypeOf((*MockValidatorClient)(nil).BeaconBlock), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeaconBlock", reflect.TypeOf((*MockValidatorClient)(nil).BeaconBlock), arg0, arg1)
 }
 
 // CheckDoppelGanger mocks base method.
-func (m *MockValidatorClient) CheckDoppelGanger(ctx context.Context, in *eth.DoppelGangerRequest) (*eth.DoppelGangerResponse, error) {
+func (m *MockValidatorClient) CheckDoppelGanger(arg0 context.Context, arg1 *eth.DoppelGangerRequest) (*eth.DoppelGangerResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "CheckDoppelGanger", ctx, in)
+	ret := m.ctrl.Call(m, "CheckDoppelGanger", arg0, arg1)
 	ret0, _ := ret[0].(*eth.DoppelGangerResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CheckDoppelGanger indicates an expected call of CheckDoppelGanger.
-func (mr *MockValidatorClientMockRecorder) CheckDoppelGanger(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) CheckDoppelGanger(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckDoppelGanger", reflect.TypeOf((*MockValidatorClient)(nil).CheckDoppelGanger), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckDoppelGanger", reflect.TypeOf((*MockValidatorClient)(nil).CheckDoppelGanger), arg0, arg1)
 }
 
 // DomainData mocks base method.
-func (m *MockValidatorClient) DomainData(ctx context.Context, in *eth.DomainRequest) (*eth.DomainResponse, error) {
+func (m *MockValidatorClient) DomainData(arg0 context.Context, arg1 *eth.DomainRequest) (*eth.DomainResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DomainData", ctx, in)
+	ret := m.ctrl.Call(m, "DomainData", arg0, arg1)
 	ret0, _ := ret[0].(*eth.DomainResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // DomainData indicates an expected call of DomainData.
-func (mr *MockValidatorClientMockRecorder) DomainData(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) DomainData(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DomainData", reflect.TypeOf((*MockValidatorClient)(nil).DomainData), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DomainData", reflect.TypeOf((*MockValidatorClient)(nil).DomainData), arg0, arg1)
 }
 
 // Duties mocks base method.
-func (m *MockValidatorClient) Duties(ctx context.Context, in *eth.DutiesRequest) (*eth.ValidatorDutiesContainer, error) {
+func (m *MockValidatorClient) Duties(arg0 context.Context, arg1 *eth.DutiesRequest) (*eth.ValidatorDutiesContainer, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Duties", ctx, in)
+	ret := m.ctrl.Call(m, "Duties", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ValidatorDutiesContainer)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // Duties indicates an expected call of Duties.
-func (mr *MockValidatorClientMockRecorder) Duties(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) Duties(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Duties", reflect.TypeOf((*MockValidatorClient)(nil).Duties), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Duties", reflect.TypeOf((*MockValidatorClient)(nil).Duties), arg0, arg1)
 }
 
 // EventStreamIsRunning mocks base method.
@@ -165,18 +164,18 @@ func (mr *MockValidatorClientMockRecorder) EventStreamIsRunning() *gomock.Call {
 }
 
 // FeeRecipientByPubKey mocks base method.
-func (m *MockValidatorClient) FeeRecipientByPubKey(ctx context.Context, in *eth.FeeRecipientByPubKeyRequest) (*eth.FeeRecipientByPubKeyResponse, error) {
+func (m *MockValidatorClient) FeeRecipientByPubKey(arg0 context.Context, arg1 *eth.FeeRecipientByPubKeyRequest) (*eth.FeeRecipientByPubKeyResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "FeeRecipientByPubKey", ctx, in)
+	ret := m.ctrl.Call(m, "FeeRecipientByPubKey", arg0, arg1)
 	ret0, _ := ret[0].(*eth.FeeRecipientByPubKeyResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // FeeRecipientByPubKey indicates an expected call of FeeRecipientByPubKey.
-func (mr *MockValidatorClientMockRecorder) FeeRecipientByPubKey(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) FeeRecipientByPubKey(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeeRecipientByPubKey", reflect.TypeOf((*MockValidatorClient)(nil).FeeRecipientByPubKey), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeeRecipientByPubKey", reflect.TypeOf((*MockValidatorClient)(nil).FeeRecipientByPubKey), arg0, arg1)
 }
 
 // Host mocks base method.
@@ -194,325 +193,325 @@ func (mr *MockValidatorClientMockRecorder) Host() *gomock.Call {
 }
 
 // MultipleValidatorStatus mocks base method.
-func (m *MockValidatorClient) MultipleValidatorStatus(ctx context.Context, in *eth.MultipleValidatorStatusRequest) (*eth.MultipleValidatorStatusResponse, error) {
+func (m *MockValidatorClient) MultipleValidatorStatus(arg0 context.Context, arg1 *eth.MultipleValidatorStatusRequest) (*eth.MultipleValidatorStatusResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MultipleValidatorStatus", ctx, in)
+	ret := m.ctrl.Call(m, "MultipleValidatorStatus", arg0, arg1)
 	ret0, _ := ret[0].(*eth.MultipleValidatorStatusResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // MultipleValidatorStatus indicates an expected call of MultipleValidatorStatus.
-func (mr *MockValidatorClientMockRecorder) MultipleValidatorStatus(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) MultipleValidatorStatus(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MultipleValidatorStatus", reflect.TypeOf((*MockValidatorClient)(nil).MultipleValidatorStatus), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MultipleValidatorStatus", reflect.TypeOf((*MockValidatorClient)(nil).MultipleValidatorStatus), arg0, arg1)
 }
 
 // PrepareBeaconProposer mocks base method.
-func (m *MockValidatorClient) PrepareBeaconProposer(ctx context.Context, in *eth.PrepareBeaconProposerRequest) (*emptypb.Empty, error) {
+func (m *MockValidatorClient) PrepareBeaconProposer(arg0 context.Context, arg1 *eth.PrepareBeaconProposerRequest) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "PrepareBeaconProposer", ctx, in)
+	ret := m.ctrl.Call(m, "PrepareBeaconProposer", arg0, arg1)
 	ret0, _ := ret[0].(*emptypb.Empty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // PrepareBeaconProposer indicates an expected call of PrepareBeaconProposer.
-func (mr *MockValidatorClientMockRecorder) PrepareBeaconProposer(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) PrepareBeaconProposer(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareBeaconProposer", reflect.TypeOf((*MockValidatorClient)(nil).PrepareBeaconProposer), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareBeaconProposer", reflect.TypeOf((*MockValidatorClient)(nil).PrepareBeaconProposer), arg0, arg1)
 }
 
 // ProposeAttestation mocks base method.
-func (m *MockValidatorClient) ProposeAttestation(ctx context.Context, in *eth.Attestation) (*eth.AttestResponse, error) {
+func (m *MockValidatorClient) ProposeAttestation(arg0 context.Context, arg1 *eth.Attestation) (*eth.AttestResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ProposeAttestation", ctx, in)
+	ret := m.ctrl.Call(m, "ProposeAttestation", arg0, arg1)
 	ret0, _ := ret[0].(*eth.AttestResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ProposeAttestation indicates an expected call of ProposeAttestation.
-func (mr *MockValidatorClientMockRecorder) ProposeAttestation(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ProposeAttestation(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeAttestation", reflect.TypeOf((*MockValidatorClient)(nil).ProposeAttestation), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeAttestation", reflect.TypeOf((*MockValidatorClient)(nil).ProposeAttestation), arg0, arg1)
 }
 
 // ProposeAttestationElectra mocks base method.
-func (m *MockValidatorClient) ProposeAttestationElectra(ctx context.Context, in *eth.SingleAttestation) (*eth.AttestResponse, error) {
+func (m *MockValidatorClient) ProposeAttestationElectra(arg0 context.Context, arg1 *eth.SingleAttestation) (*eth.AttestResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ProposeAttestationElectra", ctx, in)
+	ret := m.ctrl.Call(m, "ProposeAttestationElectra", arg0, arg1)
 	ret0, _ := ret[0].(*eth.AttestResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ProposeAttestationElectra indicates an expected call of ProposeAttestationElectra.
-func (mr *MockValidatorClientMockRecorder) ProposeAttestationElectra(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ProposeAttestationElectra(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeAttestationElectra", reflect.TypeOf((*MockValidatorClient)(nil).ProposeAttestationElectra), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeAttestationElectra", reflect.TypeOf((*MockValidatorClient)(nil).ProposeAttestationElectra), arg0, arg1)
 }
 
 // ProposeBeaconBlock mocks base method.
-func (m *MockValidatorClient) ProposeBeaconBlock(ctx context.Context, in *eth.GenericSignedBeaconBlock) (*eth.ProposeResponse, error) {
+func (m *MockValidatorClient) ProposeBeaconBlock(arg0 context.Context, arg1 *eth.GenericSignedBeaconBlock) (*eth.ProposeResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ProposeBeaconBlock", ctx, in)
+	ret := m.ctrl.Call(m, "ProposeBeaconBlock", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ProposeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ProposeBeaconBlock indicates an expected call of ProposeBeaconBlock.
-func (mr *MockValidatorClientMockRecorder) ProposeBeaconBlock(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ProposeBeaconBlock(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeBeaconBlock", reflect.TypeOf((*MockValidatorClient)(nil).ProposeBeaconBlock), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeBeaconBlock", reflect.TypeOf((*MockValidatorClient)(nil).ProposeBeaconBlock), arg0, arg1)
 }
 
 // ProposeExit mocks base method.
-func (m *MockValidatorClient) ProposeExit(ctx context.Context, in *eth.SignedVoluntaryExit) (*eth.ProposeExitResponse, error) {
+func (m *MockValidatorClient) ProposeExit(arg0 context.Context, arg1 *eth.SignedVoluntaryExit) (*eth.ProposeExitResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ProposeExit", ctx, in)
+	ret := m.ctrl.Call(m, "ProposeExit", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ProposeExitResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ProposeExit indicates an expected call of ProposeExit.
-func (mr *MockValidatorClientMockRecorder) ProposeExit(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ProposeExit(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeExit", reflect.TypeOf((*MockValidatorClient)(nil).ProposeExit), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeExit", reflect.TypeOf((*MockValidatorClient)(nil).ProposeExit), arg0, arg1)
 }
 
 // SetHost mocks base method.
-func (m *MockValidatorClient) SetHost(host string) {
+func (m *MockValidatorClient) SetHost(arg0 string) {
 	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "SetHost", host)
+	m.ctrl.Call(m, "SetHost", arg0)
 }
 
 // SetHost indicates an expected call of SetHost.
-func (mr *MockValidatorClientMockRecorder) SetHost(host any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SetHost(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHost", reflect.TypeOf((*MockValidatorClient)(nil).SetHost), host)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHost", reflect.TypeOf((*MockValidatorClient)(nil).SetHost), arg0)
 }
 
 // StartEventStream mocks base method.
-func (m *MockValidatorClient) StartEventStream(ctx context.Context, topics []string, eventsChannel chan<- *event.Event) {
+func (m *MockValidatorClient) StartEventStream(arg0 context.Context, arg1 []string, arg2 chan<- *event.Event) {
 	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "StartEventStream", ctx, topics, eventsChannel)
+	m.ctrl.Call(m, "StartEventStream", arg0, arg1, arg2)
 }
 
 // StartEventStream indicates an expected call of StartEventStream.
-func (mr *MockValidatorClientMockRecorder) StartEventStream(ctx, topics, eventsChannel any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) StartEventStream(arg0, arg1, arg2 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartEventStream", reflect.TypeOf((*MockValidatorClient)(nil).StartEventStream), ctx, topics, eventsChannel)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartEventStream", reflect.TypeOf((*MockValidatorClient)(nil).StartEventStream), arg0, arg1, arg2)
 }
 
 // SubmitAggregateSelectionProof mocks base method.
-func (m *MockValidatorClient) SubmitAggregateSelectionProof(ctx context.Context, in *eth.AggregateSelectionRequest, index primitives.ValidatorIndex, committeeLength uint64) (*eth.AggregateSelectionResponse, error) {
+func (m *MockValidatorClient) SubmitAggregateSelectionProof(arg0 context.Context, arg1 *eth.AggregateSelectionRequest, arg2 primitives.ValidatorIndex, arg3 uint64) (*eth.AggregateSelectionResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitAggregateSelectionProof", ctx, in, index, committeeLength)
+	ret := m.ctrl.Call(m, "SubmitAggregateSelectionProof", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*eth.AggregateSelectionResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitAggregateSelectionProof indicates an expected call of SubmitAggregateSelectionProof.
-func (mr *MockValidatorClientMockRecorder) SubmitAggregateSelectionProof(ctx, in, index, committeeLength any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitAggregateSelectionProof(arg0, arg1, arg2, arg3 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitAggregateSelectionProof), ctx, in, index, committeeLength)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitAggregateSelectionProof), arg0, arg1, arg2, arg3)
 }
 
 // SubmitAggregateSelectionProofElectra mocks base method.
-func (m *MockValidatorClient) SubmitAggregateSelectionProofElectra(ctx context.Context, in *eth.AggregateSelectionRequest, arg2 primitives.ValidatorIndex, arg3 uint64) (*eth.AggregateSelectionElectraResponse, error) {
+func (m *MockValidatorClient) SubmitAggregateSelectionProofElectra(arg0 context.Context, arg1 *eth.AggregateSelectionRequest, arg2 primitives.ValidatorIndex, arg3 uint64) (*eth.AggregateSelectionElectraResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitAggregateSelectionProofElectra", ctx, in, arg2, arg3)
+	ret := m.ctrl.Call(m, "SubmitAggregateSelectionProofElectra", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*eth.AggregateSelectionElectraResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitAggregateSelectionProofElectra indicates an expected call of SubmitAggregateSelectionProofElectra.
-func (mr *MockValidatorClientMockRecorder) SubmitAggregateSelectionProofElectra(ctx, in, arg2, arg3 any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitAggregateSelectionProofElectra(arg0, arg1, arg2, arg3 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProofElectra", reflect.TypeOf((*MockValidatorClient)(nil).SubmitAggregateSelectionProofElectra), ctx, in, arg2, arg3)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProofElectra", reflect.TypeOf((*MockValidatorClient)(nil).SubmitAggregateSelectionProofElectra), arg0, arg1, arg2, arg3)
 }
 
 // SubmitSignedAggregateSelectionProof mocks base method.
-func (m *MockValidatorClient) SubmitSignedAggregateSelectionProof(ctx context.Context, in *eth.SignedAggregateSubmitRequest) (*eth.SignedAggregateSubmitResponse, error) {
+func (m *MockValidatorClient) SubmitSignedAggregateSelectionProof(arg0 context.Context, arg1 *eth.SignedAggregateSubmitRequest) (*eth.SignedAggregateSubmitResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitSignedAggregateSelectionProof", ctx, in)
+	ret := m.ctrl.Call(m, "SubmitSignedAggregateSelectionProof", arg0, arg1)
 	ret0, _ := ret[0].(*eth.SignedAggregateSubmitResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitSignedAggregateSelectionProof indicates an expected call of SubmitSignedAggregateSelectionProof.
-func (mr *MockValidatorClientMockRecorder) SubmitSignedAggregateSelectionProof(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitSignedAggregateSelectionProof(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedAggregateSelectionProof), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedAggregateSelectionProof), arg0, arg1)
 }
 
 // SubmitSignedAggregateSelectionProofElectra mocks base method.
-func (m *MockValidatorClient) SubmitSignedAggregateSelectionProofElectra(ctx context.Context, in *eth.SignedAggregateSubmitElectraRequest) (*eth.SignedAggregateSubmitResponse, error) {
+func (m *MockValidatorClient) SubmitSignedAggregateSelectionProofElectra(arg0 context.Context, arg1 *eth.SignedAggregateSubmitElectraRequest) (*eth.SignedAggregateSubmitResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitSignedAggregateSelectionProofElectra", ctx, in)
+	ret := m.ctrl.Call(m, "SubmitSignedAggregateSelectionProofElectra", arg0, arg1)
 	ret0, _ := ret[0].(*eth.SignedAggregateSubmitResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitSignedAggregateSelectionProofElectra indicates an expected call of SubmitSignedAggregateSelectionProofElectra.
-func (mr *MockValidatorClientMockRecorder) SubmitSignedAggregateSelectionProofElectra(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitSignedAggregateSelectionProofElectra(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProofElectra", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedAggregateSelectionProofElectra), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProofElectra", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedAggregateSelectionProofElectra), arg0, arg1)
 }
 
 // SubmitSignedContributionAndProof mocks base method.
-func (m *MockValidatorClient) SubmitSignedContributionAndProof(ctx context.Context, in *eth.SignedContributionAndProof) (*emptypb.Empty, error) {
+func (m *MockValidatorClient) SubmitSignedContributionAndProof(arg0 context.Context, arg1 *eth.SignedContributionAndProof) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitSignedContributionAndProof", ctx, in)
+	ret := m.ctrl.Call(m, "SubmitSignedContributionAndProof", arg0, arg1)
 	ret0, _ := ret[0].(*emptypb.Empty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitSignedContributionAndProof indicates an expected call of SubmitSignedContributionAndProof.
-func (mr *MockValidatorClientMockRecorder) SubmitSignedContributionAndProof(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitSignedContributionAndProof(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedContributionAndProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedContributionAndProof), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedContributionAndProof", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSignedContributionAndProof), arg0, arg1)
 }
 
 // SubmitSyncMessage mocks base method.
-func (m *MockValidatorClient) SubmitSyncMessage(ctx context.Context, in *eth.SyncCommitteeMessage) (*emptypb.Empty, error) {
+func (m *MockValidatorClient) SubmitSyncMessage(arg0 context.Context, arg1 *eth.SyncCommitteeMessage) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitSyncMessage", ctx, in)
+	ret := m.ctrl.Call(m, "SubmitSyncMessage", arg0, arg1)
 	ret0, _ := ret[0].(*emptypb.Empty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitSyncMessage indicates an expected call of SubmitSyncMessage.
-func (mr *MockValidatorClientMockRecorder) SubmitSyncMessage(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitSyncMessage(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncMessage", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSyncMessage), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncMessage", reflect.TypeOf((*MockValidatorClient)(nil).SubmitSyncMessage), arg0, arg1)
 }
 
 // SubmitValidatorRegistrations mocks base method.
-func (m *MockValidatorClient) SubmitValidatorRegistrations(ctx context.Context, in *eth.SignedValidatorRegistrationsV1) (*emptypb.Empty, error) {
+func (m *MockValidatorClient) SubmitValidatorRegistrations(arg0 context.Context, arg1 *eth.SignedValidatorRegistrationsV1) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitValidatorRegistrations", ctx, in)
+	ret := m.ctrl.Call(m, "SubmitValidatorRegistrations", arg0, arg1)
 	ret0, _ := ret[0].(*emptypb.Empty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubmitValidatorRegistrations indicates an expected call of SubmitValidatorRegistrations.
-func (mr *MockValidatorClientMockRecorder) SubmitValidatorRegistrations(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubmitValidatorRegistrations(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitValidatorRegistrations", reflect.TypeOf((*MockValidatorClient)(nil).SubmitValidatorRegistrations), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitValidatorRegistrations", reflect.TypeOf((*MockValidatorClient)(nil).SubmitValidatorRegistrations), arg0, arg1)
 }
 
 // SubscribeCommitteeSubnets mocks base method.
-func (m *MockValidatorClient) SubscribeCommitteeSubnets(ctx context.Context, in *eth.CommitteeSubnetsSubscribeRequest, duties []*eth.ValidatorDuty) (*emptypb.Empty, error) {
+func (m *MockValidatorClient) SubscribeCommitteeSubnets(arg0 context.Context, arg1 *eth.CommitteeSubnetsSubscribeRequest, arg2 []*eth.ValidatorDuty) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubscribeCommitteeSubnets", ctx, in, duties)
+	ret := m.ctrl.Call(m, "SubscribeCommitteeSubnets", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*emptypb.Empty)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SubscribeCommitteeSubnets indicates an expected call of SubscribeCommitteeSubnets.
-func (mr *MockValidatorClientMockRecorder) SubscribeCommitteeSubnets(ctx, in, duties any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SubscribeCommitteeSubnets(arg0, arg1, arg2 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeCommitteeSubnets", reflect.TypeOf((*MockValidatorClient)(nil).SubscribeCommitteeSubnets), ctx, in, duties)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeCommitteeSubnets", reflect.TypeOf((*MockValidatorClient)(nil).SubscribeCommitteeSubnets), arg0, arg1, arg2)
 }
 
 // SyncCommitteeContribution mocks base method.
-func (m *MockValidatorClient) SyncCommitteeContribution(ctx context.Context, in *eth.SyncCommitteeContributionRequest) (*eth.SyncCommitteeContribution, error) {
+func (m *MockValidatorClient) SyncCommitteeContribution(arg0 context.Context, arg1 *eth.SyncCommitteeContributionRequest) (*eth.SyncCommitteeContribution, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncCommitteeContribution", ctx, in)
+	ret := m.ctrl.Call(m, "SyncCommitteeContribution", arg0, arg1)
 	ret0, _ := ret[0].(*eth.SyncCommitteeContribution)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SyncCommitteeContribution indicates an expected call of SyncCommitteeContribution.
-func (mr *MockValidatorClientMockRecorder) SyncCommitteeContribution(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SyncCommitteeContribution(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeContribution", reflect.TypeOf((*MockValidatorClient)(nil).SyncCommitteeContribution), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeContribution", reflect.TypeOf((*MockValidatorClient)(nil).SyncCommitteeContribution), arg0, arg1)
 }
 
 // SyncMessageBlockRoot mocks base method.
-func (m *MockValidatorClient) SyncMessageBlockRoot(ctx context.Context, in *emptypb.Empty) (*eth.SyncMessageBlockRootResponse, error) {
+func (m *MockValidatorClient) SyncMessageBlockRoot(arg0 context.Context, arg1 *emptypb.Empty) (*eth.SyncMessageBlockRootResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncMessageBlockRoot", ctx, in)
+	ret := m.ctrl.Call(m, "SyncMessageBlockRoot", arg0, arg1)
 	ret0, _ := ret[0].(*eth.SyncMessageBlockRootResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SyncMessageBlockRoot indicates an expected call of SyncMessageBlockRoot.
-func (mr *MockValidatorClientMockRecorder) SyncMessageBlockRoot(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SyncMessageBlockRoot(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncMessageBlockRoot", reflect.TypeOf((*MockValidatorClient)(nil).SyncMessageBlockRoot), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncMessageBlockRoot", reflect.TypeOf((*MockValidatorClient)(nil).SyncMessageBlockRoot), arg0, arg1)
 }
 
 // SyncSubcommitteeIndex mocks base method.
-func (m *MockValidatorClient) SyncSubcommitteeIndex(ctx context.Context, in *eth.SyncSubcommitteeIndexRequest) (*eth.SyncSubcommitteeIndexResponse, error) {
+func (m *MockValidatorClient) SyncSubcommitteeIndex(arg0 context.Context, arg1 *eth.SyncSubcommitteeIndexRequest) (*eth.SyncSubcommitteeIndexResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncSubcommitteeIndex", ctx, in)
+	ret := m.ctrl.Call(m, "SyncSubcommitteeIndex", arg0, arg1)
 	ret0, _ := ret[0].(*eth.SyncSubcommitteeIndexResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // SyncSubcommitteeIndex indicates an expected call of SyncSubcommitteeIndex.
-func (mr *MockValidatorClientMockRecorder) SyncSubcommitteeIndex(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) SyncSubcommitteeIndex(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncSubcommitteeIndex", reflect.TypeOf((*MockValidatorClient)(nil).SyncSubcommitteeIndex), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncSubcommitteeIndex", reflect.TypeOf((*MockValidatorClient)(nil).SyncSubcommitteeIndex), arg0, arg1)
 }
 
 // ValidatorIndex mocks base method.
-func (m *MockValidatorClient) ValidatorIndex(ctx context.Context, in *eth.ValidatorIndexRequest) (*eth.ValidatorIndexResponse, error) {
+func (m *MockValidatorClient) ValidatorIndex(arg0 context.Context, arg1 *eth.ValidatorIndexRequest) (*eth.ValidatorIndexResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorIndex", ctx, in)
+	ret := m.ctrl.Call(m, "ValidatorIndex", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ValidatorIndexResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ValidatorIndex indicates an expected call of ValidatorIndex.
-func (mr *MockValidatorClientMockRecorder) ValidatorIndex(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ValidatorIndex(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorIndex", reflect.TypeOf((*MockValidatorClient)(nil).ValidatorIndex), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorIndex", reflect.TypeOf((*MockValidatorClient)(nil).ValidatorIndex), arg0, arg1)
 }
 
 // ValidatorStatus mocks base method.
-func (m *MockValidatorClient) ValidatorStatus(ctx context.Context, in *eth.ValidatorStatusRequest) (*eth.ValidatorStatusResponse, error) {
+func (m *MockValidatorClient) ValidatorStatus(arg0 context.Context, arg1 *eth.ValidatorStatusRequest) (*eth.ValidatorStatusResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ValidatorStatus", ctx, in)
+	ret := m.ctrl.Call(m, "ValidatorStatus", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ValidatorStatusResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // ValidatorStatus indicates an expected call of ValidatorStatus.
-func (mr *MockValidatorClientMockRecorder) ValidatorStatus(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) ValidatorStatus(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorStatus", reflect.TypeOf((*MockValidatorClient)(nil).ValidatorStatus), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorStatus", reflect.TypeOf((*MockValidatorClient)(nil).ValidatorStatus), arg0, arg1)
 }
 
 // WaitForChainStart mocks base method.
-func (m *MockValidatorClient) WaitForChainStart(ctx context.Context, in *emptypb.Empty) (*eth.ChainStartResponse, error) {
+func (m *MockValidatorClient) WaitForChainStart(arg0 context.Context, arg1 *emptypb.Empty) (*eth.ChainStartResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "WaitForChainStart", ctx, in)
+	ret := m.ctrl.Call(m, "WaitForChainStart", arg0, arg1)
 	ret0, _ := ret[0].(*eth.ChainStartResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // WaitForChainStart indicates an expected call of WaitForChainStart.
-func (mr *MockValidatorClientMockRecorder) WaitForChainStart(ctx, in any) *gomock.Call {
+func (mr *MockValidatorClientMockRecorder) WaitForChainStart(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForChainStart", reflect.TypeOf((*MockValidatorClient)(nil).WaitForChainStart), ctx, in)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForChainStart", reflect.TypeOf((*MockValidatorClient)(nil).WaitForChainStart), arg0, arg1)
 }

api/client/beacon/node/BUILD.bazel

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,28 @@
+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,21 +1,22 @@
-package grpc_api
+package node
 
 import (
 	"context"
 
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"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 (
-	_ = iface.NodeClient(&grpcNodeClient{})
+	_ = Client(&grpcNodeClient{})
 )
 
 type grpcNodeClient struct {
-	nodeClient ethpb.NodeClient
+	nodeClient    ethpb.NodeClient
+	healthTracker health.HealthTracker
 }
 
 func (c *grpcNodeClient) SyncStatus(ctx context.Context, in *empty.Empty) (*ethpb.SyncStatus, error) {
@@ -37,13 +38,18 @@ func (c *grpcNodeClient) Peers(ctx context.Context, in *empty.Empty) (*ethpb.Pee
 func (c *grpcNodeClient) IsHealthy(ctx context.Context) bool {
 	_, err := c.nodeClient.GetHealth(ctx, &ethpb.HealthRequest{})
 	if err != nil {
-		log.WithError(err).Error("Failed to get health of node")
+		log.WithError(err).Debug("failed to get health of node")
 		return false
 	}
 	return true
 }
 
-func NewNodeClient(cc grpc.ClientConnInterface) iface.NodeClient {
+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,16 +1,17 @@
-package iface
+package node
 
 import (
 	"context"
 
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"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 NodeClient interface {
+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)
-	IsHealthy(ctx context.Context) bool
+	HealthTracker() health.HealthTracker
 }

api/client/beacon/node/rest_client.go

@@ -1,29 +1,32 @@
-package beacon_api
+package node
 
 import (
 	"context"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
+	"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/api/server/structs"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 var (
-	_ = iface.NodeClient(&beaconApiNodeClient{})
+	_ = Client(&beaconapiNodeClient{})
 )
 
-type beaconApiNodeClient struct {
-	fallbackClient  iface.NodeClient
-	jsonRestHandler RestHandler
-	genesisProvider GenesisProvider
+type beaconapiNodeClient struct {
+	fallbackClient  Client
+	jsonRestHandler client.JsonRestHandler
+	genesisProvider shared_providers.Genesis
+	healthTracker   health.HealthTracker
 }
 
-func (c *beaconApiNodeClient) SyncStatus(ctx context.Context, _ *empty.Empty) (*ethpb.SyncStatus, error) {
+func (c *beaconapiNodeClient) SyncStatus(ctx context.Context, _ *empty.Empty) (*ethpb.SyncStatus, error) {
 	syncingResponse := structs.SyncStatusResponse{}
 	if err := c.jsonRestHandler.Get(ctx, "/eth/v1/node/syncing", &syncingResponse); err != nil {
 		return nil, err
@@ -38,7 +41,7 @@ func (c *beaconApiNodeClient) SyncStatus(ctx context.Context, _ *empty.Empty) (*
 	}, nil
 }
 
-func (c *beaconApiNodeClient) Genesis(ctx context.Context, _ *empty.Empty) (*ethpb.Genesis, error) {
+func (c *beaconapiNodeClient) Genesis(ctx context.Context, _ *empty.Empty) (*ethpb.Genesis, error) {
 	genesisJson, err := c.genesisProvider.Genesis(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get genesis")
@@ -77,7 +80,7 @@ func (c *beaconApiNodeClient) Genesis(ctx context.Context, _ *empty.Empty) (*eth
 	}, nil
 }
 
-func (c *beaconApiNodeClient) Version(ctx context.Context, _ *empty.Empty) (*ethpb.Version, error) {
+func (c *beaconapiNodeClient) Version(ctx context.Context, _ *empty.Empty) (*ethpb.Version, error) {
 	var versionResponse structs.GetVersionResponse
 	if err := c.jsonRestHandler.Get(ctx, "/eth/v1/node/version", &versionResponse); err != nil {
 		return nil, err
@@ -92,28 +95,19 @@ func (c *beaconApiNodeClient) Version(ctx context.Context, _ *empty.Empty) (*eth
 	}, nil
 }
 
-func (c *beaconApiNodeClient) Peers(ctx context.Context, in *empty.Empty) (*ethpb.Peers, error) {
+func (c *beaconapiNodeClient) Peers(ctx context.Context, in *empty.Empty) (*ethpb.Peers, error) {
 	if c.fallbackClient != nil {
 		return c.fallbackClient.Peers(ctx, in)
 	}
 
 	// TODO: Implement me
-	return nil, errors.New("beaconApiNodeClient.Peers is not implemented. To use a fallback client, pass a fallback client as the last argument of NewBeaconApiNodeClientWithFallback.")
+	return nil, errors.New("beaconapiNodeClient.Peers is not implemented. To use a fallback client, pass a fallback client as the last argument of NewBeaconApiNodeClientWithFallback.")
 }
 
-func (c *beaconApiNodeClient) IsHealthy(ctx context.Context) bool {
-	if err := c.jsonRestHandler.Get(ctx, "/eth/v1/node/health", nil); err != nil {
-		log.WithError(err).Error("failed to get health of node")
-		return false
-	}
-	return true
+func (c *beaconapiNodeClient) IsHealthy(ctx context.Context) bool {
+	return c.jsonRestHandler.Get(ctx, "/eth/v1/node/health", nil) == nil
 }
 
-func NewNodeClientWithFallback(jsonRestHandler RestHandler, fallbackClient iface.NodeClient) iface.NodeClient {
-	b := &beaconApiNodeClient{
-		jsonRestHandler: jsonRestHandler,
-		fallbackClient:  fallbackClient,
-		genesisProvider: &beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler},
-	}
-	return b
+func (c *beaconapiNodeClient) HealthTracker() health.HealthTracker {
+	return c.healthTracker
 }

api/client/beacon/node/rest_client_test.go

@@ -1,14 +1,15 @@
-package beacon_api
+package node
 
 import (
+	"context"
 	"errors"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -108,7 +109,7 @@ func TestGetGenesis(t *testing.T) {
 		t.Run(testCase.name, func(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
-			ctx := t.Context()
+			ctx := context.Background()
 
 			genesisProvider := mock.NewMockGenesisProvider(ctrl)
 			genesisProvider.EXPECT().Genesis(
@@ -134,7 +135,7 @@ func TestGetGenesis(t *testing.T) {
 				)
 			}
 
-			nodeClient := &beaconApiNodeClient{
+			nodeClient := &beaconapiNodeClient{
 				genesisProvider: genesisProvider,
 				jsonRestHandler: jsonRestHandler,
 			}
@@ -197,7 +198,7 @@ func TestGetSyncStatus(t *testing.T) {
 		t.Run(testCase.name, func(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
-			ctx := t.Context()
+			ctx := context.Background()
 
 			syncingResponse := structs.SyncStatusResponse{}
 			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -212,7 +213,7 @@ func TestGetSyncStatus(t *testing.T) {
 				testCase.restEndpointResponse,
 			)
 
-			nodeClient := &beaconApiNodeClient{jsonRestHandler: jsonRestHandler}
+			nodeClient := &beaconapiNodeClient{jsonRestHandler: jsonRestHandler}
 			syncStatus, err := nodeClient.SyncStatus(ctx, &emptypb.Empty{})
 
 			if testCase.expectedResponse == nil {
@@ -261,7 +262,7 @@ func TestGetVersion(t *testing.T) {
 		t.Run(testCase.name, func(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
-			ctx := t.Context()
+			ctx := context.Background()
 
 			var versionResponse structs.GetVersionResponse
 			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -276,7 +277,7 @@ func TestGetVersion(t *testing.T) {
 				testCase.restEndpointResponse,
 			)
 
-			nodeClient := &beaconApiNodeClient{jsonRestHandler: jsonRestHandler}
+			nodeClient := &beaconapiNodeClient{jsonRestHandler: jsonRestHandler}
 			version, err := nodeClient.Version(ctx, &emptypb.Empty{})
 
 			if testCase.expectedResponse == nil {

api/client/beacon/prysm_api/BUILD.bazel

@@ -3,60 +3,53 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
-        "grpc_beacon_chain_client.go",
-        "grpc_node_client.go",
-        "grpc_prysm_beacon_chain_client.go",
-        "grpc_validator_client.go",
+        "client.go",
+        "grpc_client.go",
+        "interfaces.go",
+        "rest_client.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/validator/client/grpc-api",
-    visibility = ["//validator:__subpackages__"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/prysm_api",
+    visibility = ["//visibility:public"],
     deps = [
         "//api/client:go_default_library",
-        "//api/client/event:go_default_library",
+        "//api/client/apiutil:go_default_library",
+        "//api/client/beacon:go_default_library",
+        "//api/client/beacon/chain:go_default_library",
+        "//api/client/beacon/node:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/rpc/eth/helpers:go_default_library",
         "//beacon-chain/state/state-native:go_default_library",
         "//config/features:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/validator:go_default_library",
-        "//encoding/bytesutil:go_default_library",
-        "//monitoring/tracing/trace:go_default_library",
         "//proto/eth/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//validator/client/iface:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
+        "//validator/helpers: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_grpc//codes:go_default_library",
-        "@org_golang_google_grpc//status:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    size = "small",
     srcs = [
-        "grpc_prysm_beacon_chain_client_test.go",
-        "grpc_validator_client_test.go",
+        "grpc_client_test.go",
+        "rest_client_test.go",
     ],
     embed = [":go_default_library"],
     deps = [
-        "//api/client/event:go_default_library",
+        "//api/client/beacon:go_default_library",
+        "//api/client/beacon/mock:go_default_library",
+        "//api/client/beacon/node:go_default_library",
         "//api/server/structs:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/validator:go_default_library",
+        "//encoding/bytesutil:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//testing/assert:go_default_library",
-        "//testing/mock:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
-        "//testing/validator-mock:go_default_library",
-        "//validator/client/iface:go_default_library",
-        "@com_github_sirupsen_logrus//hooks/test:go_default_library",
-        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
         "@org_uber_go_mock//gomock:go_default_library",
     ],
 )

api/client/beacon/prysm_api/client.go

@@ -0,0 +1,30 @@
+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/grpc_client.go

@@ -1,27 +1,27 @@
-package grpc_api
+package prysm_api
 
 import (
 	"context"
 	"fmt"
 	"sort"
 
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/eth/helpers"
-	statenative "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/validator"
-	eth "github.com/OffchainLabs/prysm/v6/proto/eth/v1"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
-	"google.golang.org/grpc"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/chain"
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/rpc/eth/helpers"
+	statenative "github.com/prysmaticlabs/prysm/v5/beacon-chain/state/state-native"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
+	eth "github.com/prysmaticlabs/prysm/v5/proto/eth/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 type grpcPrysmChainClient struct {
-	chainClient iface.ChainClient
+	chainClient chain.Client
 }
 
-func (g grpcPrysmChainClient) ValidatorCount(ctx context.Context, _ string, statuses []validator.Status) ([]iface.ValidatorCount, error) {
+func (g grpcPrysmChainClient) ValidatorCount(ctx context.Context, _ string, statuses []validator.Status) ([]beacon.ValidatorCount, error) {
 	resp, err := g.chainClient.Validators(ctx, &ethpb.ListValidatorsRequest{PageSize: 0})
 	if err != nil {
 		return nil, errors.Wrap(err, "list validators failed")
@@ -52,7 +52,7 @@ func (g grpcPrysmChainClient) ValidatorCount(ctx context.Context, _ string, stat
 }
 
 // validatorCountByStatus returns a slice of validator count for each status in the given epoch.
-func validatorCountByStatus(validators []*ethpb.Validator, statuses []validator.Status, epoch primitives.Epoch) ([]iface.ValidatorCount, error) {
+func validatorCountByStatus(validators []*ethpb.Validator, statuses []validator.Status, epoch primitives.Epoch) ([]beacon.ValidatorCount, error) {
 	countByStatus := make(map[validator.Status]uint64)
 	for _, val := range validators {
 		readOnlyVal, err := statenative.NewValidator(val)
@@ -75,9 +75,9 @@ func validatorCountByStatus(validators []*ethpb.Validator, statuses []validator.
 		}
 	}
 
-	var resp []iface.ValidatorCount
+	var resp []beacon.ValidatorCount
 	for status, count := range countByStatus {
-		resp = append(resp, iface.ValidatorCount{
+		resp = append(resp, beacon.ValidatorCount{
 			Status: status.String(),
 			Count:  count,
 		})
@@ -94,7 +94,3 @@ func validatorCountByStatus(validators []*ethpb.Validator, statuses []validator.
 func (c *grpcPrysmChainClient) ValidatorPerformance(ctx context.Context, in *ethpb.ValidatorPerformanceRequest) (*ethpb.ValidatorPerformanceResponse, error) {
 	return c.chainClient.ValidatorPerformance(ctx, in)
 }
-
-func NewGrpcPrysmChainClient(cc grpc.ClientConnInterface) iface.PrysmChainClient {
-	return &grpcPrysmChainClient{chainClient: &grpcChainClient{ethpb.NewBeaconChainClient(cc)}}
-}

api/client/beacon/prysm_api/grpc_client_test.go

@@ -1,20 +1,21 @@
-package grpc_api
+package prysm_api
 
 import (
+	"context"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/validator"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/testing/util"
-	mock "github.com/OffchainLabs/prysm/v6/testing/validator-mock"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"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"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
+	"github.com/prysmaticlabs/prysm/v5/testing/util"
 	"go.uber.org/mock/gomock"
 )
 
-func TestGetValidatorCount(t *testing.T) {
+func TestGRPC_GetValidatorCount(t *testing.T) {
 	st, _ := util.DeterministicGenesisState(t, 10)
 	farFutureEpoch := params.BeaconConfig().FarFutureEpoch
 	validators := []*ethpb.Validator{
@@ -91,12 +92,12 @@ func TestGetValidatorCount(t *testing.T) {
 		name             string
 		statuses         []string
 		currentEpoch     int
-		expectedResponse []iface.ValidatorCount
+		expectedResponse []beacon.ValidatorCount
 	}{
 		{
 			name:     "Head count active validators",
 			statuses: []string{"active"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active",
 					Count:  13,
@@ -106,7 +107,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count active ongoing validators",
 			statuses: []string{"active_ongoing"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active_ongoing",
 					Count:  11,
@@ -116,7 +117,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count active exiting validators",
 			statuses: []string{"active_exiting"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active_exiting",
 					Count:  1,
@@ -126,7 +127,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count active slashed validators",
 			statuses: []string{"active_slashed"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active_slashed",
 					Count:  1,
@@ -136,7 +137,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count pending validators",
 			statuses: []string{"pending"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "pending",
 					Count:  6,
@@ -146,7 +147,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count pending initialized validators",
 			statuses: []string{"pending_initialized"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "pending_initialized",
 					Count:  1,
@@ -156,7 +157,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count pending queued validators",
 			statuses: []string{"pending_queued"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "pending_queued",
 					Count:  5,
@@ -167,7 +168,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count exited validators",
 			statuses:     []string{"exited"},
 			currentEpoch: 35,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "exited",
 					Count:  6,
@@ -178,7 +179,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count exited slashed validators",
 			statuses:     []string{"exited_slashed"},
 			currentEpoch: 35,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "exited_slashed",
 					Count:  2,
@@ -189,7 +190,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count exited unslashed validators",
 			statuses:     []string{"exited_unslashed"},
 			currentEpoch: 35,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "exited_unslashed",
 					Count:  4,
@@ -200,7 +201,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count withdrawal validators",
 			statuses:     []string{"withdrawal"},
 			currentEpoch: 45,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "withdrawal",
 					Count:  2,
@@ -211,7 +212,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count withdrawal possible validators",
 			statuses:     []string{"withdrawal_possible"},
 			currentEpoch: 45,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "withdrawal_possible",
 					Count:  1,
@@ -222,7 +223,7 @@ func TestGetValidatorCount(t *testing.T) {
 			name:         "Head count withdrawal done validators",
 			statuses:     []string{"withdrawal_done"},
 			currentEpoch: 45,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "withdrawal_done",
 					Count:  1,
@@ -232,7 +233,7 @@ func TestGetValidatorCount(t *testing.T) {
 		{
 			name:     "Head count active and pending validators",
 			statuses: []string{"active", "pending"},
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active",
 					Count:  13,
@@ -245,7 +246,7 @@ func TestGetValidatorCount(t *testing.T) {
 		},
 		{
 			name: "Head count of ALL validators",
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active",
 					Count:  13,
@@ -317,7 +318,7 @@ func TestGetValidatorCount(t *testing.T) {
 				require.Equal(t, true, ok)
 				statuses = append(statuses, valStatus)
 			}
-			vcCountResp, err := prysmBeaconChainClient.ValidatorCount(t.Context(), "", statuses)
+			vcCountResp, err := prysmBeaconChainClient.ValidatorCount(context.Background(), "", statuses)
 			require.NoError(t, err)
 			require.DeepEqual(t, test.expectedResponse, vcCountResp)
 		})

api/client/beacon/prysm_api/interfaces.go

@@ -0,0 +1,15 @@
+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,4 +1,4 @@
-package beacon_api
+package prysm_api
 
 import (
 	"bytes"
@@ -9,28 +9,22 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	validator2 "github.com/OffchainLabs/prysm/v6/consensus-types/validator"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
 	"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"
 )
 
-// NewPrysmChainClient returns implementation of iface.PrysmChainClient.
-func NewPrysmChainClient(jsonRestHandler RestHandler, nodeClient iface.NodeClient) iface.PrysmChainClient {
-	return prysmChainClient{
-		jsonRestHandler: jsonRestHandler,
-		nodeClient:      nodeClient,
-	}
-}
-
 type prysmChainClient struct {
-	jsonRestHandler RestHandler
-	nodeClient      iface.NodeClient
+	jsonRestHandler client.JsonRestHandler
+	nodeClient      node.Client
 }
 
-func (c prysmChainClient) ValidatorCount(ctx context.Context, stateID string, statuses []validator2.Status) ([]iface.ValidatorCount, error) {
+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 {
@@ -38,7 +32,7 @@ func (c prysmChainClient) ValidatorCount(ctx context.Context, stateID string, st
 	}
 
 	if !strings.Contains(strings.ToLower(nodeVersion.Version), "prysm") {
-		return nil, iface.ErrNotSupported
+		return nil, client.ErrNotSupported
 	}
 
 	queryParams := neturl.Values{}
@@ -61,14 +55,14 @@ func (c prysmChainClient) ValidatorCount(ctx context.Context, stateID string, st
 		return nil, errors.New("mismatch between validator count data and the number of statuses provided")
 	}
 
-	var resp []iface.ValidatorCount
+	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, iface.ValidatorCount{
+		resp = append(resp, beacon.ValidatorCount{
 			Status: vc.Status,
 			Count:  count,
 		})
@@ -85,7 +79,7 @@ func (c prysmChainClient) ValidatorPerformance(ctx context.Context, in *ethpb.Va
 	}
 
 	if !strings.Contains(strings.ToLower(nodeVersion.Version), "prysm") {
-		return nil, iface.ErrNotSupported
+		return nil, client.ErrNotSupported
 	}
 
 	request, err := json.Marshal(structs.GetValidatorPerformanceRequest{

api/client/beacon/prysm_api/rest_client_test.go

@@ -1,18 +1,20 @@
-package beacon_api
+package prysm_api
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/validator"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/node"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
+	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	"go.uber.org/mock/gomock"
 )
 
@@ -26,7 +28,7 @@ func TestGetValidatorCount(t *testing.T) {
 		versionResponse             structs.GetVersionResponse
 		validatorCountResponse      structs.GetValidatorCountResponse
 		validatorCountCalled        int
-		expectedResponse            []iface.ValidatorCount
+		expectedResponse            []beacon.ValidatorCount
 		expectedError               string
 	}{
 		{
@@ -45,7 +47,7 @@ func TestGetValidatorCount(t *testing.T) {
 				},
 			},
 			validatorCountCalled: 1,
-			expectedResponse: []iface.ValidatorCount{
+			expectedResponse: []beacon.ValidatorCount{
 				{
 					Status: "active",
 					Count:  10,
@@ -115,7 +117,7 @@ func TestGetValidatorCount(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			ctx := t.Context()
+			ctx := context.Background()
 			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
 			// Expect node version endpoint call.
@@ -144,8 +146,8 @@ func TestGetValidatorCount(t *testing.T) {
 			).Times(test.validatorCountCalled)
 
 			// Type assertion.
-			var client iface.PrysmChainClient = &prysmChainClient{
-				nodeClient:      &beaconApiNodeClient{jsonRestHandler: jsonRestHandler},
+			var client Client = &prysmChainClient{
+				nodeClient:      node.NewNodeClientWithFallback(jsonRestHandler, nil),
 				jsonRestHandler: jsonRestHandler,
 			}
 
@@ -169,7 +171,7 @@ func Test_beaconApiBeaconChainClient_GetValidatorPerformance(t *testing.T) {
 		bytesutil.ToBytes48([]byte{3}),
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -206,8 +208,8 @@ func Test_beaconApiBeaconChainClient_GetValidatorPerformance(t *testing.T) {
 		nil,
 	)
 
-	var client iface.PrysmChainClient = &prysmChainClient{
-		nodeClient:      &beaconApiNodeClient{jsonRestHandler: jsonRestHandler},
+	var client Client = &prysmChainClient{
+		nodeClient:      node.NewNodeClientWithFallback(jsonRestHandler, nil),
 		jsonRestHandler: jsonRestHandler,
 	}
 

api/client/beacon/shared_providers/BUILD.bazel

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,132 @@
+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

@@ -0,0 +1,508 @@
+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

@@ -0,0 +1,38 @@
+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/genesis_test.go

@@ -1,13 +1,14 @@
-package beacon_api
+package shared_providers
 
 import (
+	"context"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	"go.uber.org/mock/gomock"
 )
 
@@ -15,7 +16,7 @@ func TestGetGenesis_ValidGenesis(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	genesisResponseJson := structs.GetGenesisResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -35,7 +36,7 @@ func TestGetGenesis_ValidGenesis(t *testing.T) {
 		},
 	).Times(1)
 
-	genesisProvider := &beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler}
+	genesisProvider := &genesisProvider{jsonRestHandler: jsonRestHandler}
 	resp, err := genesisProvider.Genesis(ctx)
 	assert.NoError(t, err)
 	require.NotNil(t, resp)
@@ -47,7 +48,7 @@ func TestGetGenesis_NilData(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	genesisResponseJson := structs.GetGenesisResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -62,7 +63,7 @@ func TestGetGenesis_NilData(t *testing.T) {
 		structs.GetGenesisResponse{Data: nil},
 	).Times(1)
 
-	genesisProvider := &beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler}
+	genesisProvider := &genesisProvider{jsonRestHandler: jsonRestHandler}
 	_, err := genesisProvider.Genesis(ctx)
 	assert.ErrorContains(t, "genesis data is nil", err)
 }
@@ -71,7 +72,7 @@ func TestGetGenesis_EndpointCalledOnlyOnce(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	genesisResponseJson := structs.GetGenesisResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -91,7 +92,7 @@ func TestGetGenesis_EndpointCalledOnlyOnce(t *testing.T) {
 		},
 	).Times(1)
 
-	genesisProvider := &beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler}
+	genesisProvider := &genesisProvider{jsonRestHandler: jsonRestHandler}
 	_, err := genesisProvider.Genesis(ctx)
 	assert.NoError(t, err)
 	resp, err := genesisProvider.Genesis(ctx)
@@ -105,7 +106,7 @@ func TestGetGenesis_EndpointCanBeCalledAgainAfterError(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	genesisResponseJson := structs.GetGenesisResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -132,7 +133,7 @@ func TestGetGenesis_EndpointCanBeCalledAgainAfterError(t *testing.T) {
 		},
 	).Times(1)
 
-	genesisProvider := &beaconApiGenesisProvider{jsonRestHandler: jsonRestHandler}
+	genesisProvider := &genesisProvider{jsonRestHandler: jsonRestHandler}
 	_, err := genesisProvider.Genesis(ctx)
 	require.ErrorContains(t, "foo", err)
 	resp, err := genesisProvider.Genesis(ctx)

api/client/beacon/shared_providers/interfaces.go

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,17 @@
+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/shared_providers/state_validators.go

@@ -1,4 +1,4 @@
-package beacon_api
+package shared_providers
 
 import (
 	"bytes"
@@ -8,23 +8,18 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"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 StateValidatorsProvider 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 stateValidatorsProvider struct {
+	jsonRestHandler client.JsonRestHandler
 }
 
-type beaconApiStateValidatorsProvider struct {
-	jsonRestHandler RestHandler
-}
-
-func (c beaconApiStateValidatorsProvider) StateValidators(
+func (c stateValidatorsProvider) StateValidators(
 	ctx context.Context,
 	stringPubkeys []string,
 	indexes []primitives.ValidatorIndex,
@@ -34,7 +29,7 @@ func (c beaconApiStateValidatorsProvider) StateValidators(
 	return c.getStateValidatorsHelper(ctx, "/eth/v1/beacon/states/head/validators", append(stringIndices, stringPubkeys...), statuses)
 }
 
-func (c beaconApiStateValidatorsProvider) StateValidatorsForSlot(
+func (c stateValidatorsProvider) StateValidatorsForSlot(
 	ctx context.Context,
 	slot primitives.Slot,
 	stringPubkeys []string,
@@ -45,7 +40,7 @@ func (c beaconApiStateValidatorsProvider) StateValidatorsForSlot(
 	return c.getStateValidatorsHelper(ctx, fmt.Sprintf("/eth/v1/beacon/states/%d/validators", slot), append(stringIndices, stringPubkeys...), statuses)
 }
 
-func (c beaconApiStateValidatorsProvider) StateValidatorsForHead(
+func (c stateValidatorsProvider) StateValidatorsForHead(
 	ctx context.Context,
 	stringPubkeys []string,
 	indices []primitives.ValidatorIndex,
@@ -67,7 +62,7 @@ func convertValidatorIndicesToStrings(indices []primitives.ValidatorIndex) []str
 	return result
 }
 
-func (c beaconApiStateValidatorsProvider) getStateValidatorsHelper(
+func (c stateValidatorsProvider) getStateValidatorsHelper(
 	ctx context.Context,
 	endpoint string,
 	vals []string,

api/client/beacon/shared_providers/state_validators_test.go

@@ -1,18 +1,19 @@
-package beacon_api
+package shared_providers
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"net/url"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
+	"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"
 )
 
@@ -67,7 +68,7 @@ func TestGetStateValidators_Nominal_POST(t *testing.T) {
 		},
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Post(
 		gomock.Any(),
@@ -84,7 +85,7 @@ func TestGetStateValidators_Nominal_POST(t *testing.T) {
 		},
 	).Times(1)
 
-	stateValidatorsProvider := beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler}
+	stateValidatorsProvider := stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
 	actual, err := stateValidatorsProvider.StateValidators(ctx, []string{
 		"0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13", // active_ongoing
 		"0x80000e851c0f53c3246ff726d7ff7766661ca5e12a07c45c114d208d54f0f8233d4380b2e9aff759d69795d1df905526", // active_exiting
@@ -153,7 +154,7 @@ func TestGetStateValidators_Nominal_GET(t *testing.T) {
 		},
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	// First return an error from POST call.
 	jsonRestHandler.EXPECT().Post(
@@ -190,7 +191,7 @@ func TestGetStateValidators_Nominal_GET(t *testing.T) {
 		},
 	).Times(1)
 
-	stateValidatorsProvider := beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler}
+	stateValidatorsProvider := stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
 	actual, err := stateValidatorsProvider.StateValidators(ctx, []string{
 		"0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13", // active_ongoing
 		"0x80000e851c0f53c3246ff726d7ff7766661ca5e12a07c45c114d208d54f0f8233d4380b2e9aff759d69795d1df905526", // active_exiting
@@ -222,7 +223,7 @@ func TestGetStateValidators_GetRestJsonResponseOnError(t *testing.T) {
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	// First call POST.
 	jsonRestHandler.EXPECT().Post(
@@ -254,7 +255,7 @@ func TestGetStateValidators_GetRestJsonResponseOnError(t *testing.T) {
 		errors.New("an error"),
 	).Times(1)
 
-	stateValidatorsProvider := beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler}
+	stateValidatorsProvider := stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
 	_, err = stateValidatorsProvider.StateValidators(ctx, []string{
 		"0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13", // active_ongoing
 	},
@@ -275,7 +276,7 @@ func TestGetStateValidators_DataIsNil_POST(t *testing.T) {
 	reqBytes, err := json.Marshal(req)
 	require.NoError(t, err)
 
-	ctx := t.Context()
+	ctx := context.Background()
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
@@ -293,7 +294,7 @@ func TestGetStateValidators_DataIsNil_POST(t *testing.T) {
 		},
 	).Times(1)
 
-	stateValidatorsProvider := beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler}
+	stateValidatorsProvider := stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
 	_, err = stateValidatorsProvider.StateValidators(ctx, []string{
 		"0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13", // active_ongoing
 	},
@@ -314,7 +315,7 @@ func TestGetStateValidators_DataIsNil_GET(t *testing.T) {
 	reqBytes, err := json.Marshal(req)
 	require.NoError(t, err)
 
-	ctx := t.Context()
+	ctx := context.Background()
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
@@ -353,7 +354,7 @@ func TestGetStateValidators_DataIsNil_GET(t *testing.T) {
 		},
 	).Times(1)
 
-	stateValidatorsProvider := beaconApiStateValidatorsProvider{jsonRestHandler: jsonRestHandler}
+	stateValidatorsProvider := stateValidatorsProvider{jsonRestHandler: jsonRestHandler}
 	_, err = stateValidatorsProvider.StateValidators(ctx, []string{
 		"0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13", // active_ongoing
 	},

api/client/beacon/structs.go

@@ -0,0 +1,145 @@
+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/validator_api/BUILD.bazel

@@ -4,30 +4,26 @@ go_library(
     name = "go_default_library",
     srcs = [
         "attestation_data.go",
-        "beacon_api_beacon_chain_client.go",
         "beacon_api_helpers.go",
-        "beacon_api_node_client.go",
-        "beacon_api_validator_client.go",
         "beacon_block_converter.go",
         "beacon_block_json_helpers.go",
         "beacon_block_proto_helpers.go",
-        "beacon_committee_selections.go",
+        "client.go",
         "domain_data.go",
         "doppelganger.go",
         "duties.go",
-        "genesis.go",
         "get_beacon_block.go",
+        "grpc_client.go",
         "index.go",
+        "interfaces.go",
         "log.go",
         "metrics.go",
         "prepare_beacon_proposer.go",
         "propose_attestation.go",
         "propose_beacon_block.go",
         "propose_exit.go",
-        "prysm_beacon_chain_client.go",
         "registration.go",
-        "rest_handler_client.go",
-        "state_validators.go",
+        "rest_client.go",
         "status.go",
         "stream_blocks.go",
         "submit_aggregate_selection_proof.go",
@@ -37,27 +33,32 @@ go_library(
         "sync_committee.go",
         "sync_committee_selections.go",
     ],
-    importpath = "github.com/OffchainLabs/prysm/v6/validator/client/beacon-api",
-    visibility = ["//validator:__subpackages__"],
+    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon/validator_api",
+    visibility = ["//visibility:public"],
     deps = [
-        "//api:go_default_library",
-        "//api/apiutil:go_default_library",
+        "//api/client:go_default_library",
+        "//api/client/apiutil:go_default_library",
+        "//api/client/beacon:go_default_library",
+        "//api/client/beacon/node:go_default_library",
+        "//api/client/beacon/prysm_api:go_default_library",
+        "//api/client/beacon/shared_providers:go_default_library",
         "//api/client/event:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/core/signing:go_default_library",
-        "//config/fieldparams:go_default_library",
+        "//config/features:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/validator:go_default_library",
         "//encoding/bytesutil:go_default_library",
         "//monitoring/tracing/trace:go_default_library",
+        "//network/forks:go_default_library",
         "//network/httputil:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//runtime/version:go_default_library",
         "//time/slots:go_default_library",
-        "//validator/client/iface: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",
@@ -65,38 +66,41 @@ go_library(
         "@com_github_prometheus_client_golang//prometheus/promauto: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",
         "@org_golang_x_sync//errgroup:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    size = "small",
     srcs = [
         "attestation_data_test.go",
-        "beacon_api_beacon_chain_client_test.go",
         "beacon_api_helpers_test.go",
-        "beacon_api_node_client_test.go",
-        "beacon_api_validator_client_test.go",
         "beacon_block_converter_test.go",
         "beacon_block_json_helpers_test.go",
         "beacon_block_proto_helpers_test.go",
-        "beacon_committee_selections_test.go",
         "domain_data_test.go",
         "doppelganger_test.go",
         "duties_test.go",
-        "genesis_test.go",
         "get_beacon_block_test.go",
+        "grpc_client_test.go",
         "index_test.go",
         "prepare_beacon_proposer_test.go",
         "propose_attestation_test.go",
+        "propose_beacon_block_altair_test.go",
+        "propose_beacon_block_blinded_bellatrix_test.go",
+        "propose_beacon_block_blinded_capella_test.go",
+        "propose_beacon_block_blinded_deneb_test.go",
+        "propose_beacon_block_blinded_electra_test.go",
+        "propose_beacon_block_blinded_fulu_test.go",
+        "propose_beacon_block_capella_test.go",
+        "propose_beacon_block_deneb_test.go",
+        "propose_beacon_block_electra_test.go",
+        "propose_beacon_block_fulu_test.go",
+        "propose_beacon_block_phase0_test.go",
         "propose_beacon_block_test.go",
         "propose_exit_test.go",
-        "prysm_beacon_chain_client_test.go",
         "registration_test.go",
-        "rest_handler_client_test.go",
-        "state_validators_test.go",
+        "rest_client_test.go",
         "status_test.go",
         "stream_blocks_test.go",
         "submit_aggregate_selection_proof_test.go",
@@ -109,32 +113,34 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//api:go_default_library",
-        "//api/apiutil:go_default_library",
+        "//api/client:go_default_library",
+        "//api/client/apiutil:go_default_library",
+        "//api/client/beacon:go_default_library",
+        "//api/client/beacon/mock:go_default_library",
+        "//api/client/beacon/node:go_default_library",
+        "//api/client/beacon/prysm_api:go_default_library",
+        "//api/client/beacon/shared_providers:go_default_library",
+        "//api/client/beacon/validator_api/test_helpers:go_default_library",
+        "//api/client/event:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/rpc/eth/shared/testing:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
-        "//consensus-types/validator:go_default_library",
         "//encoding/bytesutil:go_default_library",
         "//network/httputil:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//runtime/version:go_default_library",
         "//testing/assert:go_default_library",
+        "//testing/mock:go_default_library",
         "//testing/require:go_default_library",
         "//time/slots:go_default_library",
-        "//validator/client/beacon-api/mock:go_default_library",
-        "//validator/client/beacon-api/test-helpers:go_default_library",
-        "//validator/client/iface: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",
         "@com_github_sirupsen_logrus//hooks/test: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/validator_api/attestation_data.go

@@ -1,17 +1,16 @@
-package beacon_api
+package validator_api
 
 import (
 	"context"
 	"net/url"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	"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/consensus-types/primitives"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 func (c *beaconApiValidatorClient) attestationData(
@@ -40,7 +39,11 @@ func (c *beaconApiValidatorClient) attestationData(
 		return nil, errors.Wrapf(err, "failed to parse attestation committee index: %s", attestationData.CommitteeIndex)
 	}
 
-	beaconBlockRoot, err := bytesutil.DecodeHexWithLength(attestationData.BeaconBlockRoot, fieldparams.RootLength)
+	if !apiutil.ValidRoot(attestationData.BeaconBlockRoot) {
+		return nil, errors.Errorf("invalid beacon block root: %s", attestationData.BeaconBlockRoot)
+	}
+
+	beaconBlockRoot, err := hexutil.Decode(attestationData.BeaconBlockRoot)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to decode beacon block root: %s", attestationData.BeaconBlockRoot)
 	}
@@ -59,7 +62,11 @@ func (c *beaconApiValidatorClient) attestationData(
 		return nil, errors.Wrapf(err, "failed to parse attestation source epoch: %s", attestationData.Source.Epoch)
 	}
 
-	sourceRoot, err := bytesutil.DecodeHexWithLength(attestationData.Source.Root, fieldparams.RootLength)
+	if !apiutil.ValidRoot(attestationData.Source.Root) {
+		return nil, errors.Errorf("invalid attestation source root: %s", attestationData.Source.Root)
+	}
+
+	sourceRoot, err := hexutil.Decode(attestationData.Source.Root)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to decode attestation source root: %s", attestationData.Source.Root)
 	}
@@ -73,7 +80,11 @@ func (c *beaconApiValidatorClient) attestationData(
 		return nil, errors.Wrapf(err, "failed to parse attestation target epoch: %s", attestationData.Target.Epoch)
 	}
 
-	targetRoot, err := bytesutil.DecodeHexWithLength(attestationData.Target.Root, fieldparams.RootLength)
+	if !apiutil.ValidRoot(attestationData.Target.Root) {
+		return nil, errors.Errorf("invalid attestation target root: %s", attestationData.Target.Root)
+	}
+
+	targetRoot, err := hexutil.Decode(attestationData.Target.Root)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to decode attestation target root: %s", attestationData.Target.Root)
 	}

api/client/beacon/validator_api/attestation_data_test.go

@@ -1,22 +1,23 @@
-package beacon_api
+package validator_api
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strconv"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"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"
 )
 
 func TestGetAttestationData_ValidAttestation(t *testing.T) {
-	ctx := t.Context()
+	ctx := context.Background()
 	expectedSlot := uint64(5)
 	expectedCommitteeIndex := uint64(6)
 	expectedBeaconBlockRoot := "0x0636045df9bdda3ab96592cf5389032c8ec3977f911e2b53509b348dfe164d4d"
@@ -75,7 +76,7 @@ func TestGetAttestationData_ValidAttestation(t *testing.T) {
 }
 
 func TestGetAttestationData_InvalidData(t *testing.T) {
-	ctx := t.Context()
+	ctx := context.Background()
 
 	testCases := []struct {
 		name                 string
@@ -107,7 +108,7 @@ func TestGetAttestationData_InvalidData(t *testing.T) {
 				attestation.Data.BeaconBlockRoot = "foo"
 				return attestation
 			},
-			expectedErrorMessage: "failed to decode beacon block root: foo",
+			expectedErrorMessage: "invalid beacon block root: foo",
 		},
 		{
 			name: "invalid slot",
@@ -143,7 +144,7 @@ func TestGetAttestationData_InvalidData(t *testing.T) {
 				attestation.Data.Source.Root = "foo"
 				return attestation
 			},
-			expectedErrorMessage: "failed to decode attestation source root: foo",
+			expectedErrorMessage: "invalid attestation source root: foo",
 		},
 		{
 			name: "nil target",
@@ -170,7 +171,7 @@ func TestGetAttestationData_InvalidData(t *testing.T) {
 				attestation.Data.Target.Root = "foo"
 				return attestation
 			},
-			expectedErrorMessage: "failed to decode attestation target root: foo",
+			expectedErrorMessage: "invalid attestation target root: foo",
 		},
 	}
 
@@ -203,7 +204,7 @@ func TestGetAttestationData_JsonResponseError(t *testing.T) {
 	const slot = primitives.Slot(1)
 	const committeeIndex = primitives.CommitteeIndex(2)
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()

api/client/beacon/validator_api/beacon_api_helpers.go

@@ -1,4 +1,4 @@
-package beacon_api
+package validator_api
 
 import (
 	"bytes"
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 var beaconAPITogRPCValidatorStatus = map[string]ethpb.ValidatorStatus{

api/client/beacon/validator_api/beacon_api_helpers_test.go

@@ -1,18 +1,95 @@
-package beacon_api
+package validator_api
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
+	"net/url"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
+	"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"
 )
 
+func TestBeaconApiHelpers(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		valid bool
+	}{
+		{
+			name:  "correct format",
+			input: "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+			valid: true,
+		},
+		{
+			name:  "root too small",
+			input: "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f",
+			valid: false,
+		},
+		{
+			name:  "root too big",
+			input: "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f22",
+			valid: false,
+		},
+		{
+			name:  "empty root",
+			input: "",
+			valid: false,
+		},
+		{
+			name:  "no 0x prefix",
+			input: "cf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+			valid: false,
+		},
+		{
+			name:  "invalid characters",
+			input: "0xzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
+			valid: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.valid, apiutil.ValidRoot(tt.input))
+		})
+	}
+}
+
+func TestBeaconApiHelpers_TestUint64ToString(t *testing.T) {
+	const expectedResult = "1234"
+	const val = uint64(1234)
+
+	assert.Equal(t, expectedResult, apiutil.Uint64ToString(val))
+	assert.Equal(t, expectedResult, apiutil.Uint64ToString(primitives.Slot(val)))
+	assert.Equal(t, expectedResult, apiutil.Uint64ToString(primitives.ValidatorIndex(val)))
+	assert.Equal(t, expectedResult, apiutil.Uint64ToString(primitives.CommitteeIndex(val)))
+	assert.Equal(t, expectedResult, apiutil.Uint64ToString(primitives.Epoch(val)))
+}
+
+func TestBuildURL_NoParams(t *testing.T) {
+	wanted := "/aaa/bbb/ccc"
+	actual := apiutil.BuildURL("/aaa/bbb/ccc")
+	assert.Equal(t, wanted, actual)
+}
+
+func TestBuildURL_WithParams(t *testing.T) {
+	params := url.Values{}
+	params.Add("xxxx", "1")
+	params.Add("yyyy", "2")
+	params.Add("zzzz", "3")
+
+	wanted := "/aaa/bbb/ccc?xxxx=1&yyyy=2&zzzz=3"
+	actual := apiutil.BuildURL("/aaa/bbb/ccc", params)
+	assert.Equal(t, wanted, actual)
+}
+
 const forkEndpoint = "/eth/v1/beacon/states/head/fork"
 
 func TestGetFork_Nominal(t *testing.T) {
@@ -30,7 +107,7 @@ func TestGetFork_Nominal(t *testing.T) {
 		},
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Get(
 		gomock.Any(),
@@ -58,7 +135,7 @@ func TestGetFork_Invalid(t *testing.T) {
 
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Get(
 		gomock.Any(),
@@ -97,7 +174,7 @@ func TestGetHeaders_Nominal(t *testing.T) {
 		},
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Get(
 		gomock.Any(),
@@ -125,7 +202,7 @@ func TestGetHeaders_Invalid(t *testing.T) {
 
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Get(
 		gomock.Any(),
@@ -168,7 +245,7 @@ func TestGetLiveness_Nominal(t *testing.T) {
 		},
 	}
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 	jsonRestHandler.EXPECT().Post(
@@ -195,7 +272,7 @@ func TestGetLiveness_Invalid(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 	jsonRestHandler.EXPECT().Post(
@@ -245,7 +322,7 @@ func TestGetIsSyncing_Nominal(t *testing.T) {
 				},
 			}
 
-			ctx := t.Context()
+			ctx := context.Background()
 
 			jsonRestHandler.EXPECT().Get(
 				gomock.Any(),
@@ -276,7 +353,7 @@ func TestGetIsSyncing_Invalid(t *testing.T) {
 	syncingResponseJson := structs.SyncStatusResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	jsonRestHandler.EXPECT().Get(
 		gomock.Any(),

api/client/beacon/validator_api/beacon_block_converter.go

@@ -1,16 +1,16 @@
-package beacon_api
+package validator_api
 
 import (
 	"math/big"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
+	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 type BeaconBlockConverter interface {

api/client/beacon/validator_api/beacon_block_converter_test.go

@@ -1,18 +1,18 @@
-package beacon_api
+package validator_api
 
 import (
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	testhelpers "github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/test-helpers"
+	"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/testing/assert"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 )
 
 func TestGetBeaconBlockConverter_Phase0Valid(t *testing.T) {
-	expectedBeaconBlock := testhelpers.GenerateProtoPhase0BeaconBlock()
+	expectedBeaconBlock := test_helpers.GenerateProtoPhase0BeaconBlock()
 	beaconBlockConverter := &beaconApiBeaconBlockConverter{}
-	beaconBlock, err := beaconBlockConverter.ConvertRESTPhase0BlockToProto(testhelpers.GenerateJsonPhase0BeaconBlock())
+	beaconBlock, err := beaconBlockConverter.ConvertRESTPhase0BlockToProto(test_helpers.GenerateJsonPhase0BeaconBlock())
 	require.NoError(t, err)
 	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
 }
@@ -27,7 +27,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "nil body",
 			expectedErrorMessage: "block body is nil",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body = nil
 				return beaconBlock
 			},
@@ -36,7 +36,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "nil eth1 data",
 			expectedErrorMessage: "eth1 data is nil",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Eth1Data = nil
 				return beaconBlock
 			},
@@ -45,7 +45,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad slot",
 			expectedErrorMessage: "failed to parse slot `foo`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Slot = "foo"
 				return beaconBlock
 			},
@@ -54,7 +54,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad proposer index",
 			expectedErrorMessage: "failed to parse proposer index `bar`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.ProposerIndex = "bar"
 				return beaconBlock
 			},
@@ -63,7 +63,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad parent root",
 			expectedErrorMessage: "failed to decode parent root `foo`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.ParentRoot = "foo"
 				return beaconBlock
 			},
@@ -72,7 +72,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad state root",
 			expectedErrorMessage: "failed to decode state root `bar`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.StateRoot = "bar"
 				return beaconBlock
 			},
@@ -81,7 +81,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad randao reveal",
 			expectedErrorMessage: "failed to decode randao reveal `foo`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.RandaoReveal = "foo"
 				return beaconBlock
 			},
@@ -90,7 +90,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad deposit root",
 			expectedErrorMessage: "failed to decode deposit root `bar`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Eth1Data.DepositRoot = "bar"
 				return beaconBlock
 			},
@@ -99,7 +99,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad deposit count",
 			expectedErrorMessage: "failed to parse deposit count `foo`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Eth1Data.DepositCount = "foo"
 				return beaconBlock
 			},
@@ -108,7 +108,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad block hash",
 			expectedErrorMessage: "failed to decode block hash `bar`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Eth1Data.BlockHash = "bar"
 				return beaconBlock
 			},
@@ -117,7 +117,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad graffiti",
 			expectedErrorMessage: "failed to decode graffiti `foo`",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Graffiti = "foo"
 				return beaconBlock
 			},
@@ -126,7 +126,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad proposer slashings",
 			expectedErrorMessage: "failed to get proposer slashings",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.ProposerSlashings[0] = nil
 				return beaconBlock
 			},
@@ -135,7 +135,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad attester slashings",
 			expectedErrorMessage: "failed to get attester slashings",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.AttesterSlashings[0] = nil
 				return beaconBlock
 			},
@@ -144,7 +144,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad attestations",
 			expectedErrorMessage: "failed to get attestations",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Attestations[0] = nil
 				return beaconBlock
 			},
@@ -153,7 +153,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad deposits",
 			expectedErrorMessage: "failed to get deposits",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.Deposits[0] = nil
 				return beaconBlock
 			},
@@ -162,7 +162,7 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 			name:                 "bad voluntary exits",
 			expectedErrorMessage: "failed to get voluntary exits",
 			generateData: func() *structs.BeaconBlock {
-				beaconBlock := testhelpers.GenerateJsonPhase0BeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonPhase0BeaconBlock()
 				beaconBlock.Body.VoluntaryExits[0] = nil
 				return beaconBlock
 			},
@@ -181,9 +181,9 @@ func TestGetBeaconBlockConverter_Phase0Error(t *testing.T) {
 }
 
 func TestGetBeaconBlockConverter_AltairValid(t *testing.T) {
-	expectedBeaconBlock := testhelpers.GenerateProtoAltairBeaconBlock()
+	expectedBeaconBlock := test_helpers.GenerateProtoAltairBeaconBlock()
 	beaconBlockConverter := &beaconApiBeaconBlockConverter{}
-	beaconBlock, err := beaconBlockConverter.ConvertRESTAltairBlockToProto(testhelpers.GenerateJsonAltairBeaconBlock())
+	beaconBlock, err := beaconBlockConverter.ConvertRESTAltairBlockToProto(test_helpers.GenerateJsonAltairBeaconBlock())
 	require.NoError(t, err)
 	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
 }
@@ -198,7 +198,7 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 			name:                 "nil body",
 			expectedErrorMessage: "block body is nil",
 			generateData: func() *structs.BeaconBlockAltair {
-				beaconBlock := testhelpers.GenerateJsonAltairBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonAltairBeaconBlock()
 				beaconBlock.Body = nil
 				return beaconBlock
 			},
@@ -207,7 +207,7 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 			name:                 "nil sync aggregate",
 			expectedErrorMessage: "sync aggregate is nil",
 			generateData: func() *structs.BeaconBlockAltair {
-				beaconBlock := testhelpers.GenerateJsonAltairBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonAltairBeaconBlock()
 				beaconBlock.Body.SyncAggregate = nil
 				return beaconBlock
 			},
@@ -216,7 +216,7 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 			name:                 "bad phase0 fields",
 			expectedErrorMessage: "failed to get the phase0 fields of the altair block",
 			generateData: func() *structs.BeaconBlockAltair {
-				beaconBlock := testhelpers.GenerateJsonAltairBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonAltairBeaconBlock()
 				beaconBlock.Body.Eth1Data = nil
 				return beaconBlock
 			},
@@ -225,7 +225,7 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 			name:                 "bad sync committee bits",
 			expectedErrorMessage: "failed to decode sync committee bits `foo`",
 			generateData: func() *structs.BeaconBlockAltair {
-				beaconBlock := testhelpers.GenerateJsonAltairBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonAltairBeaconBlock()
 				beaconBlock.Body.SyncAggregate.SyncCommitteeBits = "foo"
 				return beaconBlock
 			},
@@ -234,7 +234,7 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 			name:                 "bad sync committee signature",
 			expectedErrorMessage: "failed to decode sync committee signature `bar`",
 			generateData: func() *structs.BeaconBlockAltair {
-				beaconBlock := testhelpers.GenerateJsonAltairBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonAltairBeaconBlock()
 				beaconBlock.Body.SyncAggregate.SyncCommitteeSignature = "bar"
 				return beaconBlock
 			},
@@ -253,9 +253,9 @@ func TestGetBeaconBlockConverter_AltairError(t *testing.T) {
 }
 
 func TestGetBeaconBlockConverter_BellatrixValid(t *testing.T) {
-	expectedBeaconBlock := testhelpers.GenerateProtoBellatrixBeaconBlock()
+	expectedBeaconBlock := test_helpers.GenerateProtoBellatrixBeaconBlock()
 	beaconBlockConverter := &beaconApiBeaconBlockConverter{}
-	beaconBlock, err := beaconBlockConverter.ConvertRESTBellatrixBlockToProto(testhelpers.GenerateJsonBellatrixBeaconBlock())
+	beaconBlock, err := beaconBlockConverter.ConvertRESTBellatrixBlockToProto(test_helpers.GenerateJsonBellatrixBeaconBlock())
 	require.NoError(t, err)
 	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
 }
@@ -270,7 +270,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "nil body",
 			expectedErrorMessage: "block body is nil",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body = nil
 				return beaconBlock
 			},
@@ -279,7 +279,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "nil execution payload",
 			expectedErrorMessage: "execution payload is nil",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload = nil
 				return beaconBlock
 			},
@@ -288,7 +288,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad altair fields",
 			expectedErrorMessage: "failed to get the altair fields of the bellatrix block",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.Eth1Data = nil
 				return beaconBlock
 			},
@@ -297,7 +297,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad parent hash",
 			expectedErrorMessage: "failed to decode execution payload parent hash `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.ParentHash = "foo"
 				return beaconBlock
 			},
@@ -306,7 +306,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad fee recipient",
 			expectedErrorMessage: "failed to decode execution payload fee recipient `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.FeeRecipient = "bar"
 				return beaconBlock
 			},
@@ -315,7 +315,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad state root",
 			expectedErrorMessage: "failed to decode execution payload state root `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.StateRoot = "foo"
 				return beaconBlock
 			},
@@ -324,7 +324,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad receipts root",
 			expectedErrorMessage: "failed to decode execution payload receipts root `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.ReceiptsRoot = "bar"
 				return beaconBlock
 			},
@@ -333,7 +333,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad logs bloom",
 			expectedErrorMessage: "failed to decode execution payload logs bloom `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.LogsBloom = "foo"
 				return beaconBlock
 			},
@@ -342,7 +342,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad prev randao",
 			expectedErrorMessage: "failed to decode execution payload prev randao `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.PrevRandao = "bar"
 				return beaconBlock
 			},
@@ -351,7 +351,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad block number",
 			expectedErrorMessage: "failed to parse execution payload block number `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.BlockNumber = "foo"
 				return beaconBlock
 			},
@@ -360,7 +360,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad gas limit",
 			expectedErrorMessage: "failed to parse execution payload gas limit `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.GasLimit = "bar"
 				return beaconBlock
 			},
@@ -369,7 +369,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad gas used",
 			expectedErrorMessage: "failed to parse execution payload gas used `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.GasUsed = "foo"
 				return beaconBlock
 			},
@@ -378,7 +378,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad timestamp",
 			expectedErrorMessage: "failed to parse execution payload timestamp `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.Timestamp = "bar"
 				return beaconBlock
 			},
@@ -387,7 +387,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad extra data",
 			expectedErrorMessage: "failed to decode execution payload extra data `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.ExtraData = "foo"
 				return beaconBlock
 			},
@@ -396,7 +396,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad base fee per gas",
 			expectedErrorMessage: "failed to parse execution payload base fee per gas `bar`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.BaseFeePerGas = "bar"
 				return beaconBlock
 			},
@@ -405,7 +405,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad block hash",
 			expectedErrorMessage: "failed to decode execution payload block hash `foo`",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.BlockHash = "foo"
 				return beaconBlock
 			},
@@ -414,7 +414,7 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 			name:                 "bad transactions",
 			expectedErrorMessage: "failed to get execution payload transactions",
 			generateData: func() *structs.BeaconBlockBellatrix {
-				beaconBlock := testhelpers.GenerateJsonBellatrixBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonBellatrixBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.Transactions[0] = "bar"
 				return beaconBlock
 			},
@@ -433,9 +433,9 @@ func TestGetBeaconBlockConverter_BellatrixError(t *testing.T) {
 }
 
 func TestGetBeaconBlockConverter_CapellaValid(t *testing.T) {
-	expectedBeaconBlock := testhelpers.GenerateProtoCapellaBeaconBlock()
+	expectedBeaconBlock := test_helpers.GenerateProtoCapellaBeaconBlock()
 	beaconBlockConverter := &beaconApiBeaconBlockConverter{}
-	beaconBlock, err := beaconBlockConverter.ConvertRESTCapellaBlockToProto(testhelpers.GenerateJsonCapellaBeaconBlock())
+	beaconBlock, err := beaconBlockConverter.ConvertRESTCapellaBlockToProto(test_helpers.GenerateJsonCapellaBeaconBlock())
 	require.NoError(t, err)
 	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
 }
@@ -450,7 +450,7 @@ func TestGetBeaconBlockConverter_CapellaError(t *testing.T) {
 			name:                 "nil body",
 			expectedErrorMessage: "block body is nil",
 			generateData: func() *structs.BeaconBlockCapella {
-				beaconBlock := testhelpers.GenerateJsonCapellaBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonCapellaBeaconBlock()
 				beaconBlock.Body = nil
 				return beaconBlock
 			},
@@ -459,7 +459,7 @@ func TestGetBeaconBlockConverter_CapellaError(t *testing.T) {
 			name:                 "nil execution payload",
 			expectedErrorMessage: "execution payload is nil",
 			generateData: func() *structs.BeaconBlockCapella {
-				beaconBlock := testhelpers.GenerateJsonCapellaBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonCapellaBeaconBlock()
 				beaconBlock.Body.ExecutionPayload = nil
 				return beaconBlock
 			},
@@ -468,7 +468,7 @@ func TestGetBeaconBlockConverter_CapellaError(t *testing.T) {
 			name:                 "bad bellatrix fields",
 			expectedErrorMessage: "failed to get the bellatrix fields of the capella block",
 			generateData: func() *structs.BeaconBlockCapella {
-				beaconBlock := testhelpers.GenerateJsonCapellaBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonCapellaBeaconBlock()
 				beaconBlock.Body.Eth1Data = nil
 				return beaconBlock
 			},
@@ -477,7 +477,7 @@ func TestGetBeaconBlockConverter_CapellaError(t *testing.T) {
 			name:                 "bad withdrawals",
 			expectedErrorMessage: "failed to get withdrawals",
 			generateData: func() *structs.BeaconBlockCapella {
-				beaconBlock := testhelpers.GenerateJsonCapellaBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonCapellaBeaconBlock()
 				beaconBlock.Body.ExecutionPayload.Withdrawals[0] = nil
 				return beaconBlock
 			},
@@ -486,7 +486,7 @@ func TestGetBeaconBlockConverter_CapellaError(t *testing.T) {
 			name:                 "bad bls execution changes",
 			expectedErrorMessage: "failed to get bls to execution changes",
 			generateData: func() *structs.BeaconBlockCapella {
-				beaconBlock := testhelpers.GenerateJsonCapellaBeaconBlock()
+				beaconBlock := test_helpers.GenerateJsonCapellaBeaconBlock()
 				beaconBlock.Body.BLSToExecutionChanges[0] = nil
 				return beaconBlock
 			},

api/client/beacon/validator_api/beacon_block_json_helpers.go

@@ -1,13 +1,13 @@
-package beacon_api
+package validator_api
 
 import (
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 func jsonifyTransactions(transactions [][]byte) []string {
@@ -19,6 +19,23 @@ func jsonifyTransactions(transactions [][]byte) []string {
 	return jsonTransactions
 }
 
+func jsonifyBlsToExecutionChanges(blsToExecutionChanges []*ethpb.SignedBLSToExecutionChange) []*structs.SignedBLSToExecutionChange {
+	jsonBlsToExecutionChanges := make([]*structs.SignedBLSToExecutionChange, len(blsToExecutionChanges))
+	for index, signedBlsToExecutionChange := range blsToExecutionChanges {
+		blsToExecutionChangeJson := &structs.BLSToExecutionChange{
+			ValidatorIndex:     apiutil.Uint64ToString(signedBlsToExecutionChange.Message.ValidatorIndex),
+			FromBLSPubkey:      hexutil.Encode(signedBlsToExecutionChange.Message.FromBlsPubkey),
+			ToExecutionAddress: hexutil.Encode(signedBlsToExecutionChange.Message.ToExecutionAddress),
+		}
+		signedJson := &structs.SignedBLSToExecutionChange{
+			Message:   blsToExecutionChangeJson,
+			Signature: hexutil.Encode(signedBlsToExecutionChange.Signature),
+		}
+		jsonBlsToExecutionChanges[index] = signedJson
+	}
+	return jsonBlsToExecutionChanges
+}
+
 func jsonifyEth1Data(eth1Data *ethpb.Eth1Data) *structs.Eth1Data {
 	return &structs.Eth1Data{
 		BlockHash:    hexutil.Encode(eth1Data.BlockHash),
@@ -43,6 +60,52 @@ func jsonifySingleAttestations(attestations []*ethpb.SingleAttestation) []*struc
 	return jsonAttestations
 }
 
+func jsonifyAttesterSlashings(attesterSlashings []*ethpb.AttesterSlashing) []*structs.AttesterSlashing {
+	jsonAttesterSlashings := make([]*structs.AttesterSlashing, len(attesterSlashings))
+	for index, attesterSlashing := range attesterSlashings {
+		jsonAttesterSlashing := &structs.AttesterSlashing{
+			Attestation1: jsonifyIndexedAttestation(attesterSlashing.Attestation_1),
+			Attestation2: jsonifyIndexedAttestation(attesterSlashing.Attestation_2),
+		}
+		jsonAttesterSlashings[index] = jsonAttesterSlashing
+	}
+	return jsonAttesterSlashings
+}
+
+func jsonifyDeposits(deposits []*ethpb.Deposit) []*structs.Deposit {
+	jsonDeposits := make([]*structs.Deposit, len(deposits))
+	for depositIndex, deposit := range deposits {
+		proofs := make([]string, len(deposit.Proof))
+		for proofIndex, proof := range deposit.Proof {
+			proofs[proofIndex] = hexutil.Encode(proof)
+		}
+
+		jsonDeposit := &structs.Deposit{
+			Data: &structs.DepositData{
+				Amount:                apiutil.Uint64ToString(deposit.Data.Amount),
+				Pubkey:                hexutil.Encode(deposit.Data.PublicKey),
+				Signature:             hexutil.Encode(deposit.Data.Signature),
+				WithdrawalCredentials: hexutil.Encode(deposit.Data.WithdrawalCredentials),
+			},
+			Proof: proofs,
+		}
+		jsonDeposits[depositIndex] = jsonDeposit
+	}
+	return jsonDeposits
+}
+
+func jsonifyProposerSlashings(proposerSlashings []*ethpb.ProposerSlashing) []*structs.ProposerSlashing {
+	jsonProposerSlashings := make([]*structs.ProposerSlashing, len(proposerSlashings))
+	for index, proposerSlashing := range proposerSlashings {
+		jsonProposerSlashing := &structs.ProposerSlashing{
+			SignedHeader1: jsonifySignedBeaconBlockHeader(proposerSlashing.Header_1),
+			SignedHeader2: jsonifySignedBeaconBlockHeader(proposerSlashing.Header_2),
+		}
+		jsonProposerSlashings[index] = jsonProposerSlashing
+	}
+	return jsonProposerSlashings
+}
+
 // JsonifySignedVoluntaryExits converts an array of voluntary exit structs to a JSON hex string compatible format.
 func JsonifySignedVoluntaryExits(voluntaryExits []*ethpb.SignedVoluntaryExit) []*structs.SignedVoluntaryExit {
 	jsonSignedVoluntaryExits := make([]*structs.SignedVoluntaryExit, len(voluntaryExits))

api/client/beacon/validator_api/beacon_block_json_helpers_test.go

@@ -0,0 +1,648 @@
+package validator_api
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+)
+
+func TestBeaconBlockJsonHelpers_JsonifyTransactions(t *testing.T) {
+	input := [][]byte{{1}, {2}, {3}, {4}}
+
+	expectedResult := []string{
+		hexutil.Encode([]byte{1}),
+		hexutil.Encode([]byte{2}),
+		hexutil.Encode([]byte{3}),
+		hexutil.Encode([]byte{4}),
+	}
+
+	result := jsonifyTransactions(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyBlsToExecutionChanges(t *testing.T) {
+	input := []*ethpb.SignedBLSToExecutionChange{
+		{
+			Message: &ethpb.BLSToExecutionChange{
+				ValidatorIndex:     1,
+				FromBlsPubkey:      []byte{2},
+				ToExecutionAddress: []byte{3},
+			},
+			Signature: []byte{7},
+		},
+		{
+			Message: &ethpb.BLSToExecutionChange{
+				ValidatorIndex:     4,
+				FromBlsPubkey:      []byte{5},
+				ToExecutionAddress: []byte{6},
+			},
+			Signature: []byte{8},
+		},
+	}
+
+	expectedResult := []*structs.SignedBLSToExecutionChange{
+		{
+			Message: &structs.BLSToExecutionChange{
+				ValidatorIndex:     "1",
+				FromBLSPubkey:      hexutil.Encode([]byte{2}),
+				ToExecutionAddress: hexutil.Encode([]byte{3}),
+			},
+			Signature: hexutil.Encode([]byte{7}),
+		},
+		{
+			Message: &structs.BLSToExecutionChange{
+				ValidatorIndex:     "4",
+				FromBLSPubkey:      hexutil.Encode([]byte{5}),
+				ToExecutionAddress: hexutil.Encode([]byte{6}),
+			},
+			Signature: hexutil.Encode([]byte{8}),
+		},
+	}
+
+	assert.DeepEqual(t, expectedResult, structs.SignedBLSChangesFromConsensus(input))
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyEth1Data(t *testing.T) {
+	input := &ethpb.Eth1Data{
+		DepositRoot:  []byte{1},
+		DepositCount: 2,
+		BlockHash:    []byte{3},
+	}
+
+	expectedResult := &structs.Eth1Data{
+		DepositRoot:  hexutil.Encode([]byte{1}),
+		DepositCount: "2",
+		BlockHash:    hexutil.Encode([]byte{3}),
+	}
+
+	result := jsonifyEth1Data(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyAttestations(t *testing.T) {
+	input := []*ethpb.Attestation{
+		{
+			AggregationBits: []byte{1},
+			Data: &ethpb.AttestationData{
+				Slot:            2,
+				CommitteeIndex:  3,
+				BeaconBlockRoot: []byte{4},
+				Source: &ethpb.Checkpoint{
+					Epoch: 5,
+					Root:  []byte{6},
+				},
+				Target: &ethpb.Checkpoint{
+					Epoch: 7,
+					Root:  []byte{8},
+				},
+			},
+			Signature: []byte{9},
+		},
+		{
+			AggregationBits: []byte{10},
+			Data: &ethpb.AttestationData{
+				Slot:            11,
+				CommitteeIndex:  12,
+				BeaconBlockRoot: []byte{13},
+				Source: &ethpb.Checkpoint{
+					Epoch: 14,
+					Root:  []byte{15},
+				},
+				Target: &ethpb.Checkpoint{
+					Epoch: 16,
+					Root:  []byte{17},
+				},
+			},
+			Signature: []byte{18},
+		},
+	}
+
+	expectedResult := []*structs.Attestation{
+		{
+			AggregationBits: hexutil.Encode([]byte{1}),
+			Data: &structs.AttestationData{
+				Slot:            "2",
+				CommitteeIndex:  "3",
+				BeaconBlockRoot: hexutil.Encode([]byte{4}),
+				Source: &structs.Checkpoint{
+					Epoch: "5",
+					Root:  hexutil.Encode([]byte{6}),
+				},
+				Target: &structs.Checkpoint{
+					Epoch: "7",
+					Root:  hexutil.Encode([]byte{8}),
+				},
+			},
+			Signature: hexutil.Encode([]byte{9}),
+		},
+		{
+			AggregationBits: hexutil.Encode([]byte{10}),
+			Data: &structs.AttestationData{
+				Slot:            "11",
+				CommitteeIndex:  "12",
+				BeaconBlockRoot: hexutil.Encode([]byte{13}),
+				Source: &structs.Checkpoint{
+					Epoch: "14",
+					Root:  hexutil.Encode([]byte{15}),
+				},
+				Target: &structs.Checkpoint{
+					Epoch: "16",
+					Root:  hexutil.Encode([]byte{17}),
+				},
+			},
+			Signature: hexutil.Encode([]byte{18}),
+		},
+	}
+
+	result := jsonifyAttestations(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyAttesterSlashings(t *testing.T) {
+	input := []*ethpb.AttesterSlashing{
+		{
+			Attestation_1: &ethpb.IndexedAttestation{
+				AttestingIndices: []uint64{1, 2},
+				Data: &ethpb.AttestationData{
+					Slot:            3,
+					CommitteeIndex:  4,
+					BeaconBlockRoot: []byte{5},
+					Source: &ethpb.Checkpoint{
+						Epoch: 6,
+						Root:  []byte{7},
+					},
+					Target: &ethpb.Checkpoint{
+						Epoch: 8,
+						Root:  []byte{9},
+					},
+				},
+				Signature: []byte{10},
+			},
+			Attestation_2: &ethpb.IndexedAttestation{
+				AttestingIndices: []uint64{11, 12},
+				Data: &ethpb.AttestationData{
+					Slot:            13,
+					CommitteeIndex:  14,
+					BeaconBlockRoot: []byte{15},
+					Source: &ethpb.Checkpoint{
+						Epoch: 16,
+						Root:  []byte{17},
+					},
+					Target: &ethpb.Checkpoint{
+						Epoch: 18,
+						Root:  []byte{19},
+					},
+				},
+				Signature: []byte{20},
+			},
+		},
+		{
+			Attestation_1: &ethpb.IndexedAttestation{
+				AttestingIndices: []uint64{21, 22},
+				Data: &ethpb.AttestationData{
+					Slot:            23,
+					CommitteeIndex:  24,
+					BeaconBlockRoot: []byte{25},
+					Source: &ethpb.Checkpoint{
+						Epoch: 26,
+						Root:  []byte{27},
+					},
+					Target: &ethpb.Checkpoint{
+						Epoch: 28,
+						Root:  []byte{29},
+					},
+				},
+				Signature: []byte{30},
+			},
+			Attestation_2: &ethpb.IndexedAttestation{
+				AttestingIndices: []uint64{31, 32},
+				Data: &ethpb.AttestationData{
+					Slot:            33,
+					CommitteeIndex:  34,
+					BeaconBlockRoot: []byte{35},
+					Source: &ethpb.Checkpoint{
+						Epoch: 36,
+						Root:  []byte{37},
+					},
+					Target: &ethpb.Checkpoint{
+						Epoch: 38,
+						Root:  []byte{39},
+					},
+				},
+				Signature: []byte{40},
+			},
+		},
+	}
+
+	expectedResult := []*structs.AttesterSlashing{
+		{
+			Attestation1: &structs.IndexedAttestation{
+				AttestingIndices: []string{"1", "2"},
+				Data: &structs.AttestationData{
+					Slot:            "3",
+					CommitteeIndex:  "4",
+					BeaconBlockRoot: hexutil.Encode([]byte{5}),
+					Source: &structs.Checkpoint{
+						Epoch: "6",
+						Root:  hexutil.Encode([]byte{7}),
+					},
+					Target: &structs.Checkpoint{
+						Epoch: "8",
+						Root:  hexutil.Encode([]byte{9}),
+					},
+				},
+				Signature: hexutil.Encode([]byte{10}),
+			},
+			Attestation2: &structs.IndexedAttestation{
+				AttestingIndices: []string{"11", "12"},
+				Data: &structs.AttestationData{
+					Slot:            "13",
+					CommitteeIndex:  "14",
+					BeaconBlockRoot: hexutil.Encode([]byte{15}),
+					Source: &structs.Checkpoint{
+						Epoch: "16",
+						Root:  hexutil.Encode([]byte{17}),
+					},
+					Target: &structs.Checkpoint{
+						Epoch: "18",
+						Root:  hexutil.Encode([]byte{19}),
+					},
+				},
+				Signature: hexutil.Encode([]byte{20}),
+			},
+		},
+		{
+			Attestation1: &structs.IndexedAttestation{
+				AttestingIndices: []string{"21", "22"},
+				Data: &structs.AttestationData{
+					Slot:            "23",
+					CommitteeIndex:  "24",
+					BeaconBlockRoot: hexutil.Encode([]byte{25}),
+					Source: &structs.Checkpoint{
+						Epoch: "26",
+						Root:  hexutil.Encode([]byte{27}),
+					},
+					Target: &structs.Checkpoint{
+						Epoch: "28",
+						Root:  hexutil.Encode([]byte{29}),
+					},
+				},
+				Signature: hexutil.Encode([]byte{30}),
+			},
+			Attestation2: &structs.IndexedAttestation{
+				AttestingIndices: []string{"31", "32"},
+				Data: &structs.AttestationData{
+					Slot:            "33",
+					CommitteeIndex:  "34",
+					BeaconBlockRoot: hexutil.Encode([]byte{35}),
+					Source: &structs.Checkpoint{
+						Epoch: "36",
+						Root:  hexutil.Encode([]byte{37}),
+					},
+					Target: &structs.Checkpoint{
+						Epoch: "38",
+						Root:  hexutil.Encode([]byte{39}),
+					},
+				},
+				Signature: hexutil.Encode([]byte{40}),
+			},
+		},
+	}
+
+	result := jsonifyAttesterSlashings(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyDeposits(t *testing.T) {
+	input := []*ethpb.Deposit{
+		{
+			Proof: [][]byte{{1}, {2}},
+			Data: &ethpb.Deposit_Data{
+				PublicKey:             []byte{3},
+				WithdrawalCredentials: []byte{4},
+				Amount:                5,
+				Signature:             []byte{6},
+			},
+		},
+		{
+			Proof: [][]byte{
+				{7},
+				{8},
+			},
+			Data: &ethpb.Deposit_Data{
+				PublicKey:             []byte{9},
+				WithdrawalCredentials: []byte{10},
+				Amount:                11,
+				Signature:             []byte{12},
+			},
+		},
+	}
+
+	expectedResult := []*structs.Deposit{
+		{
+			Proof: []string{
+				hexutil.Encode([]byte{1}),
+				hexutil.Encode([]byte{2}),
+			},
+			Data: &structs.DepositData{
+				Pubkey:                hexutil.Encode([]byte{3}),
+				WithdrawalCredentials: hexutil.Encode([]byte{4}),
+				Amount:                "5",
+				Signature:             hexutil.Encode([]byte{6}),
+			},
+		},
+		{
+			Proof: []string{
+				hexutil.Encode([]byte{7}),
+				hexutil.Encode([]byte{8}),
+			},
+			Data: &structs.DepositData{
+				Pubkey:                hexutil.Encode([]byte{9}),
+				WithdrawalCredentials: hexutil.Encode([]byte{10}),
+				Amount:                "11",
+				Signature:             hexutil.Encode([]byte{12}),
+			},
+		},
+	}
+
+	result := jsonifyDeposits(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyProposerSlashings(t *testing.T) {
+	input := []*ethpb.ProposerSlashing{
+		{
+			Header_1: &ethpb.SignedBeaconBlockHeader{
+				Header: &ethpb.BeaconBlockHeader{
+					Slot:          1,
+					ProposerIndex: 2,
+					ParentRoot:    []byte{3},
+					StateRoot:     []byte{4},
+					BodyRoot:      []byte{5},
+				},
+				Signature: []byte{6},
+			},
+			Header_2: &ethpb.SignedBeaconBlockHeader{
+				Header: &ethpb.BeaconBlockHeader{
+					Slot:          7,
+					ProposerIndex: 8,
+					ParentRoot:    []byte{9},
+					StateRoot:     []byte{10},
+					BodyRoot:      []byte{11},
+				},
+				Signature: []byte{12},
+			},
+		},
+		{
+			Header_1: &ethpb.SignedBeaconBlockHeader{
+				Header: &ethpb.BeaconBlockHeader{
+					Slot:          13,
+					ProposerIndex: 14,
+					ParentRoot:    []byte{15},
+					StateRoot:     []byte{16},
+					BodyRoot:      []byte{17},
+				},
+				Signature: []byte{18},
+			},
+			Header_2: &ethpb.SignedBeaconBlockHeader{
+				Header: &ethpb.BeaconBlockHeader{
+					Slot:          19,
+					ProposerIndex: 20,
+					ParentRoot:    []byte{21},
+					StateRoot:     []byte{22},
+					BodyRoot:      []byte{23},
+				},
+				Signature: []byte{24},
+			},
+		},
+	}
+
+	expectedResult := []*structs.ProposerSlashing{
+		{
+			SignedHeader1: &structs.SignedBeaconBlockHeader{
+				Message: &structs.BeaconBlockHeader{
+					Slot:          "1",
+					ProposerIndex: "2",
+					ParentRoot:    hexutil.Encode([]byte{3}),
+					StateRoot:     hexutil.Encode([]byte{4}),
+					BodyRoot:      hexutil.Encode([]byte{5}),
+				},
+				Signature: hexutil.Encode([]byte{6}),
+			},
+			SignedHeader2: &structs.SignedBeaconBlockHeader{
+				Message: &structs.BeaconBlockHeader{
+					Slot:          "7",
+					ProposerIndex: "8",
+					ParentRoot:    hexutil.Encode([]byte{9}),
+					StateRoot:     hexutil.Encode([]byte{10}),
+					BodyRoot:      hexutil.Encode([]byte{11}),
+				},
+				Signature: hexutil.Encode([]byte{12}),
+			},
+		},
+		{
+			SignedHeader1: &structs.SignedBeaconBlockHeader{
+				Message: &structs.BeaconBlockHeader{
+					Slot:          "13",
+					ProposerIndex: "14",
+					ParentRoot:    hexutil.Encode([]byte{15}),
+					StateRoot:     hexutil.Encode([]byte{16}),
+					BodyRoot:      hexutil.Encode([]byte{17}),
+				},
+				Signature: hexutil.Encode([]byte{18}),
+			},
+			SignedHeader2: &structs.SignedBeaconBlockHeader{
+				Message: &structs.BeaconBlockHeader{
+					Slot:          "19",
+					ProposerIndex: "20",
+					ParentRoot:    hexutil.Encode([]byte{21}),
+					StateRoot:     hexutil.Encode([]byte{22}),
+					BodyRoot:      hexutil.Encode([]byte{23}),
+				},
+				Signature: hexutil.Encode([]byte{24}),
+			},
+		},
+	}
+
+	result := jsonifyProposerSlashings(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifySignedVoluntaryExits(t *testing.T) {
+	input := []*ethpb.SignedVoluntaryExit{
+		{
+			Exit: &ethpb.VoluntaryExit{
+				Epoch:          1,
+				ValidatorIndex: 2,
+			},
+			Signature: []byte{3},
+		},
+		{
+			Exit: &ethpb.VoluntaryExit{
+				Epoch:          4,
+				ValidatorIndex: 5,
+			},
+			Signature: []byte{6},
+		},
+	}
+
+	expectedResult := []*structs.SignedVoluntaryExit{
+		{
+			Message: &structs.VoluntaryExit{
+				Epoch:          "1",
+				ValidatorIndex: "2",
+			},
+			Signature: hexutil.Encode([]byte{3}),
+		},
+		{
+			Message: &structs.VoluntaryExit{
+				Epoch:          "4",
+				ValidatorIndex: "5",
+			},
+			Signature: hexutil.Encode([]byte{6}),
+		},
+	}
+
+	result := JsonifySignedVoluntaryExits(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifySignedBeaconBlockHeader(t *testing.T) {
+	input := &ethpb.SignedBeaconBlockHeader{
+		Header: &ethpb.BeaconBlockHeader{
+			Slot:          1,
+			ProposerIndex: 2,
+			ParentRoot:    []byte{3},
+			StateRoot:     []byte{4},
+			BodyRoot:      []byte{5},
+		},
+		Signature: []byte{6},
+	}
+
+	expectedResult := &structs.SignedBeaconBlockHeader{
+		Message: &structs.BeaconBlockHeader{
+			Slot:          "1",
+			ProposerIndex: "2",
+			ParentRoot:    hexutil.Encode([]byte{3}),
+			StateRoot:     hexutil.Encode([]byte{4}),
+			BodyRoot:      hexutil.Encode([]byte{5}),
+		},
+		Signature: hexutil.Encode([]byte{6}),
+	}
+
+	result := jsonifySignedBeaconBlockHeader(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyIndexedAttestation(t *testing.T) {
+	input := &ethpb.IndexedAttestation{
+		AttestingIndices: []uint64{1, 2},
+		Data: &ethpb.AttestationData{
+			Slot:            3,
+			CommitteeIndex:  4,
+			BeaconBlockRoot: []byte{5},
+			Source: &ethpb.Checkpoint{
+				Epoch: 6,
+				Root:  []byte{7},
+			},
+			Target: &ethpb.Checkpoint{
+				Epoch: 8,
+				Root:  []byte{9},
+			},
+		},
+		Signature: []byte{10},
+	}
+
+	expectedResult := &structs.IndexedAttestation{
+		AttestingIndices: []string{"1", "2"},
+		Data: &structs.AttestationData{
+			Slot:            "3",
+			CommitteeIndex:  "4",
+			BeaconBlockRoot: hexutil.Encode([]byte{5}),
+			Source: &structs.Checkpoint{
+				Epoch: "6",
+				Root:  hexutil.Encode([]byte{7}),
+			},
+			Target: &structs.Checkpoint{
+				Epoch: "8",
+				Root:  hexutil.Encode([]byte{9}),
+			},
+		},
+		Signature: hexutil.Encode([]byte{10}),
+	}
+
+	result := jsonifyIndexedAttestation(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyAttestationData(t *testing.T) {
+	input := &ethpb.AttestationData{
+		Slot:            1,
+		CommitteeIndex:  2,
+		BeaconBlockRoot: []byte{3},
+		Source: &ethpb.Checkpoint{
+			Epoch: 4,
+			Root:  []byte{5},
+		},
+		Target: &ethpb.Checkpoint{
+			Epoch: 6,
+			Root:  []byte{7},
+		},
+	}
+
+	expectedResult := &structs.AttestationData{
+		Slot:            "1",
+		CommitteeIndex:  "2",
+		BeaconBlockRoot: hexutil.Encode([]byte{3}),
+		Source: &structs.Checkpoint{
+			Epoch: "4",
+			Root:  hexutil.Encode([]byte{5}),
+		},
+		Target: &structs.Checkpoint{
+			Epoch: "6",
+			Root:  hexutil.Encode([]byte{7}),
+		},
+	}
+
+	result := jsonifyAttestationData(input)
+	assert.DeepEqual(t, expectedResult, result)
+}
+
+func TestBeaconBlockJsonHelpers_JsonifyWithdrawals(t *testing.T) {
+	input := []*enginev1.Withdrawal{
+		{
+			Index:          1,
+			ValidatorIndex: 2,
+			Address:        []byte{3},
+			Amount:         4,
+		},
+		{
+			Index:          5,
+			ValidatorIndex: 6,
+			Address:        []byte{7},
+			Amount:         8,
+		},
+	}
+
+	expectedResult := []*structs.Withdrawal{
+		{
+			WithdrawalIndex:  "1",
+			ValidatorIndex:   "2",
+			ExecutionAddress: hexutil.Encode([]byte{3}),
+			Amount:           "4",
+		},
+		{
+			WithdrawalIndex:  "5",
+			ValidatorIndex:   "6",
+			ExecutionAddress: hexutil.Encode([]byte{7}),
+			Amount:           "8",
+		},
+	}
+
+	result := jsonifyWithdrawals(input)
+	assert.DeepEqual(t, expectedResult, result)
+}

api/client/beacon/validator_api/beacon_block_proto_helpers.go

@@ -1,14 +1,14 @@
-package beacon_api
+package validator_api
 
 import (
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 func convertProposerSlashingsToProto(jsonProposerSlashings []*structs.ProposerSlashing) ([]*ethpb.ProposerSlashing, error) {

api/client/beacon/validator_api/beacon_block_proto_helpers_test.go

@@ -1,14 +1,14 @@
-package beacon_api
+package validator_api
 
 import (
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 )
 
 func TestBeaconBlockProtoHelpers_ConvertProposerSlashingsToProto(t *testing.T) {

api/client/beacon/validator_api/client.go

@@ -0,0 +1,38 @@
+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/domain_data.go

@@ -1,20 +1,20 @@
-package beacon_api
+package validator_api
 
 import (
 	"context"
 
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing"
-	fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
-	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/signing"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/network/forks"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 func (c *beaconApiValidatorClient) domainData(ctx context.Context, epoch primitives.Epoch, domainType [4]byte) (*ethpb.DomainResponse, error) {
 	// Get the fork version from the given epoch
-	fork, err := params.Fork(epoch)
+	fork, err := forks.Fork(epoch)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get fork version for epoch %d", epoch)
 	}
@@ -25,7 +25,11 @@ func (c *beaconApiValidatorClient) domainData(ctx context.Context, epoch primiti
 		return nil, errors.Wrapf(err, "failed to get genesis info")
 	}
 
-	genesisValidatorRoot, err := bytesutil.DecodeHexWithLength(genesis.GenesisValidatorsRoot, fieldparams.RootLength)
+	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")
 	}

api/client/beacon/validator_api/domain_data_test.go

@@ -1,16 +1,17 @@
-package beacon_api
+package validator_api
 
 import (
+	"context"
 	"errors"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/config/params"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"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/config/params"
+	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"
 )
 
@@ -32,7 +33,7 @@ func TestGetDomainData_ValidDomainData(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	// Make sure that Genesis() is called exactly once
 	genesisProvider := mock.NewMockGenesisProvider(ctrl)
@@ -61,7 +62,7 @@ func TestGetDomainData_GenesisError(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	// Make sure that Genesis() is called exactly once
 	genesisProvider := mock.NewMockGenesisProvider(ctrl)
@@ -80,7 +81,7 @@ func TestGetDomainData_InvalidGenesisRoot(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	// Make sure that Genesis() is called exactly once
 	genesisProvider := mock.NewMockGenesisProvider(ctrl)
@@ -91,5 +92,5 @@ func TestGetDomainData_InvalidGenesisRoot(t *testing.T) {
 
 	validatorClient := &beaconApiValidatorClient{genesisProvider: genesisProvider}
 	_, err := validatorClient.domainData(ctx, epoch, domainType)
-	assert.ErrorContains(t, "failed to decode genesis validators root: foo", err)
+	assert.ErrorContains(t, "invalid genesis validators root: foo", err)
 }

api/client/beacon/validator_api/doppelganger.go

@@ -1,4 +1,4 @@
-package beacon_api
+package validator_api
 
 import (
 	"context"
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/runtime/version"
-	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"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"
+	"github.com/prysmaticlabs/prysm/v5/runtime/version"
+	"github.com/prysmaticlabs/prysm/v5/time/slots"
 )
 
 type DoppelGangerInfo struct {

api/client/beacon/validator_api/doppelganger_test.go

@@ -1,17 +1,18 @@
-package beacon_api
+package validator_api
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	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"
 )
 
@@ -377,7 +378,7 @@ func TestCheckDoppelGanger_Nominal(t *testing.T) {
 			}
 
 			doppelGangerActualOutput, err := validatorClient.CheckDoppelGanger(
-				t.Context(),
+				context.Background(),
 				testCase.doppelGangerInput,
 			)
 
@@ -811,7 +812,7 @@ func TestCheckDoppelGanger_Errors(t *testing.T) {
 			}
 
 			_, err := validatorClient.CheckDoppelGanger(
-				t.Context(),
+				context.Background(),
 				&ethpb.DoppelGangerRequest{
 					ValidatorRequests: testCase.inputValidatorRequests,
 				},

api/client/beacon/validator_api/duties.go

@@ -0,0 +1,228 @@
+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/duties_test.go

@@ -1,514 +1,24 @@
-package beacon_api
+package validator_api
 
 import (
-	"bytes"
-	"encoding/json"
-	"errors"
+	"context"
 	"fmt"
 	"strconv"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon/mock"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/config/params"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	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"
 )
 
-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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{jsonRestHandler: jsonRestHandler}
-	attesterDuties, err := dutiesProvider.AttesterDuties(ctx, epoch, validatorIndices)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedAttesterDuties.Data, attesterDuties.Data)
-}
-
-func TestGetAttesterDuties_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{jsonRestHandler: jsonRestHandler}
-	proposerDuties, err := dutiesProvider.ProposerDuties(ctx, epoch)
-	require.NoError(t, err)
-	assert.DeepEqual(t, expectedProposerDuties.Data, proposerDuties.Data)
-}
-
-func TestGetProposerDuties_HttpError(t *testing.T) {
-	const epoch = primitives.Epoch(1)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	ctx := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{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 := t.Context()
-
-	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 := &beaconApiDutiesProvider{jsonRestHandler: jsonRestHandler}
-	_, err := dutiesProvider.Committees(ctx, epoch)
-	assert.ErrorContains(t, "committee at index `0` is nil", err)
-}
-
 func TestGetDutiesForEpoch_Error(t *testing.T) {
 	const epoch = primitives.Epoch(1)
 	pubkeys := [][]byte{{1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}}
@@ -603,7 +113,7 @@ func TestGetDutiesForEpoch_Error(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			ctx := t.Context()
+			ctx := context.Background()
 
 			var attesterDuties []*structs.AttesterDuty
 			if testCase.generateAttesterDuties == nil {
@@ -632,7 +142,7 @@ func TestGetDutiesForEpoch_Error(t *testing.T) {
 				epoch,
 				gomock.Any(),
 			).Return(
-				&structs.GetAttesterDutiesResponse{Data: attesterDuties},
+				attesterDuties,
 				testCase.fetchAttesterDutiesError,
 			).AnyTimes()
 
@@ -640,9 +150,7 @@ func TestGetDutiesForEpoch_Error(t *testing.T) {
 				ctx,
 				epoch,
 			).Return(
-				&structs.GetProposerDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          proposerDuties},
+				proposerDuties,
 				testCase.fetchProposerDutiesError,
 			).AnyTimes()
 
@@ -655,19 +163,18 @@ func TestGetDutiesForEpoch_Error(t *testing.T) {
 				testCase.fetchSyncDutiesError,
 			).AnyTimes()
 
-			vals := make([]validatorForDuty, len(pubkeys))
+			vals := make([]beacon.ValidatorForDuty, len(pubkeys))
 			for i := 0; i < len(pubkeys); i++ {
-				vals[i] = validatorForDuty{
-					pubkey: pubkeys[i],
-					index:  validatorIndices[i],
-					status: ethpb.ValidatorStatus_ACTIVE,
+				vals[i] = beacon.ValidatorForDuty{
+					Pubkey: pubkeys[i],
+					Index:  validatorIndices[i],
+					Status: ethpb.ValidatorStatus_ACTIVE,
 				}
 			}
 
 			validatorClient := &beaconApiValidatorClient{dutiesProvider: dutiesProvider}
-			err := validatorClient.dutiesForEpoch(
+			_, err := validatorClient.dutiesForEpoch(
 				ctx,
-				&ethpb.ValidatorDutiesContainer{},
 				epoch,
 				vals,
 				true,
@@ -704,7 +211,7 @@ func TestGetDutiesForEpoch_Valid(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			ctx := t.Context()
+			ctx := context.Background()
 
 			dutiesProvider := mock.NewMockdutiesProvider(ctrl)
 
@@ -713,10 +220,7 @@ func TestGetDutiesForEpoch_Valid(t *testing.T) {
 				epoch,
 				validatorIndices,
 			).Return(
-				&structs.GetAttesterDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots),
-				},
+				generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots),
 				nil,
 			).Times(1)
 
@@ -724,10 +228,7 @@ func TestGetDutiesForEpoch_Valid(t *testing.T) {
 				ctx,
 				epoch,
 			).Return(
-				&structs.GetProposerDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
-				},
+				generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
 				nil,
 			).Times(1)
 
@@ -882,24 +383,21 @@ func TestGetDutiesForEpoch_Valid(t *testing.T) {
 			}
 
 			validatorClient := &beaconApiValidatorClient{dutiesProvider: dutiesProvider}
-			vals := make([]validatorForDuty, len(pubkeys))
+			vals := make([]beacon.ValidatorForDuty, len(pubkeys))
 			for i := 0; i < len(pubkeys); i++ {
-				vals[i] = validatorForDuty{
-					pubkey: pubkeys[i],
-					index:  validatorIndices[i],
-					status: ethpb.ValidatorStatus_ACTIVE,
+				vals[i] = beacon.ValidatorForDuty{
+					Pubkey: pubkeys[i],
+					Index:  validatorIndices[i],
+					Status: ethpb.ValidatorStatus_ACTIVE,
 				}
 			}
-			dutiesContainer := &ethpb.ValidatorDutiesContainer{}
-			err := validatorClient.dutiesForEpoch(
+			duties, err := validatorClient.dutiesForEpoch(
 				ctx,
-				dutiesContainer,
 				epoch,
 				vals,
 				testCase.fetchSyncDuties,
 			)
 			require.NoError(t, err)
-			duties := dutiesContainer.CurrentEpochDuties
 			require.Equal(t, len(expectedDuties), len(duties))
 			for i, duty := range expectedDuties {
 				assert.Equal(t, duty.CommitteeIndex, duties[i].CommitteeIndex)
@@ -932,14 +430,14 @@ func TestGetDuties_Valid(t *testing.T) {
 			valCount := 12
 			pubkeys := make([][]byte, valCount)
 			validatorIndices := make([]primitives.ValidatorIndex, valCount)
-			vals := make([]validatorForDuty, valCount)
+			vals := make([]beacon.ValidatorForDuty, valCount)
 			for i := 0; i < valCount; i++ {
 				pubkeys[i] = []byte(strconv.Itoa(i))
 				validatorIndices[i] = primitives.ValidatorIndex(i)
-				vals[i] = validatorForDuty{
-					pubkey: pubkeys[i],
-					index:  validatorIndices[i],
-					status: ethpb.ValidatorStatus_ACTIVE,
+				vals[i] = beacon.ValidatorForDuty{
+					Pubkey: pubkeys[i],
+					Index:  validatorIndices[i],
+					Status: ethpb.ValidatorStatus_ACTIVE,
 				}
 			}
 
@@ -950,7 +448,7 @@ func TestGetDuties_Valid(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			ctx := t.Context()
+			ctx := context.Background()
 
 			dutiesProvider := mock.NewMockdutiesProvider(ctrl)
 
@@ -959,10 +457,7 @@ func TestGetDuties_Valid(t *testing.T) {
 				testCase.epoch,
 				validatorIndices,
 			).Return(
-				&structs.GetAttesterDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots),
-				},
+				generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots),
 				nil,
 			).Times(2)
 
@@ -970,10 +465,7 @@ func TestGetDuties_Valid(t *testing.T) {
 				ctx,
 				testCase.epoch,
 			).Return(
-				&structs.GetProposerDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
-				},
+				generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
 				nil,
 			).Times(2)
 
@@ -994,10 +486,7 @@ func TestGetDuties_Valid(t *testing.T) {
 				testCase.epoch+1,
 				validatorIndices,
 			).Return(
-				&structs.GetAttesterDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          reverseSlice(generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots)),
-				},
+				reverseSlice(generateValidAttesterDuties(pubkeys, validatorIndices, committeeIndices, committeeSlots)),
 				nil,
 			).Times(2)
 
@@ -1005,10 +494,7 @@ func TestGetDuties_Valid(t *testing.T) {
 				ctx,
 				testCase.epoch+1,
 			).Return(
-				&structs.GetProposerDutiesResponse{
-					DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-					Data:          generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
-				},
+				generateValidProposerDuties(pubkeys, validatorIndices, proposerSlots),
 				nil,
 			).Times(2)
 
@@ -1139,28 +625,22 @@ func TestGetDuties_Valid(t *testing.T) {
 				stateValidatorsProvider: stateValidatorsProvider,
 			}
 
-			expectedContainer := &ethpb.ValidatorDutiesContainer{}
-			err := validatorClient.dutiesForEpoch(
+			expectedCurrentEpochDuties, err := validatorClient.dutiesForEpoch(
 				ctx,
-				expectedContainer,
 				testCase.epoch,
 				vals,
 				fetchSyncDuties,
 			)
 			require.NoError(t, err)
 
-			expectedCurrentEpochDuties := expectedContainer.CurrentEpochDuties
-			expectedNextContainer := &ethpb.ValidatorDutiesContainer{}
-			err = validatorClient.dutiesForEpoch(
+			expectedNextEpochDuties, err := validatorClient.dutiesForEpoch(
 				ctx,
-				expectedNextContainer,
 				testCase.epoch+1,
 				vals,
 				fetchSyncDuties,
 			)
 			require.NoError(t, err)
 
-			expectedNextEpochDuties := expectedNextContainer.CurrentEpochDuties
 			expectedDuties := &ethpb.ValidatorDutiesContainer{
 				CurrentEpochDuties: expectedCurrentEpochDuties,
 				NextEpochDuties:    expectedNextEpochDuties,
@@ -1172,8 +652,7 @@ func TestGetDuties_Valid(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			assert.DeepEqual(t, expectedDuties.NextEpochDuties, duties.NextEpochDuties)
-			assert.DeepEqual(t, expectedDuties.CurrentEpochDuties, duties.CurrentEpochDuties)
+			assert.DeepEqual(t, expectedDuties, duties)
 		})
 	}
 }
@@ -1182,7 +661,7 @@ func TestGetDuties_GetStateValidatorsFailed(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 
 	stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
 	stateValidatorsProvider.EXPECT().StateValidators(
@@ -1211,7 +690,7 @@ func TestGetDuties_GetDutiesForEpochFailed(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	ctx := t.Context()
+	ctx := context.Background()
 	pubkey := []byte{1, 2, 3}
 
 	stateValidatorsProvider := mock.NewMockStateValidatorsProvider(ctrl)
@@ -1236,23 +715,20 @@ func TestGetDuties_GetDutiesForEpochFailed(t *testing.T) {
 	dutiesProvider := mock.NewMockdutiesProvider(ctrl)
 	dutiesProvider.EXPECT().AttesterDuties(
 		ctx,
-		gomock.Any(),
+		primitives.Epoch(1),
 		gomock.Any(),
 	).Return(
-		&structs.GetAttesterDutiesResponse{
-			DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-			Data:          []*structs.AttesterDuty{}},
+		nil,
 		errors.New("foo error"),
-	).Times(2)
+	).Times(1)
+	dutiesProvider.EXPECT().AttesterDuties(
+		ctx,
+		primitives.Epoch(2),
+		gomock.Any(),
+	).Times(1)
 	dutiesProvider.EXPECT().ProposerDuties(
 		ctx,
 		gomock.Any(),
-	).Return(
-		&structs.GetProposerDutiesResponse{
-			DependentRoot: "0xdeadbeef000000000000000000000000000000000000000000000000",
-			Data:          []*structs.ProposerDuty{},
-		},
-		nil,
 	).Times(2)
 
 	validatorClient := &beaconApiValidatorClient{
@@ -1264,7 +740,7 @@ func TestGetDuties_GetDutiesForEpochFailed(t *testing.T) {
 		Epoch:      1,
 		PublicKeys: [][]byte{pubkey},
 	})
-	assert.ErrorContains(t, "failed to get duties for", err)
+	assert.ErrorContains(t, "failed to get duties for current epoch `1`", err)
 	assert.ErrorContains(t, "foo error", err)
 }
 

api/client/beacon/validator_api/get_beacon_block.go

@@ -0,0 +1,243 @@
+package validator_api
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	neturl "net/url"
+
+	"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/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/network/httputil"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/runtime/version"
+)
+
+type abstractProduceBlockResponseJson struct {
+	Version string          `json:"version"`
+	Data    json.RawMessage `json:"data"`
+}
+
+func (c *beaconApiValidatorClient) beaconBlock(ctx context.Context, slot primitives.Slot, randaoReveal, graffiti []byte) (*ethpb.GenericBeaconBlock, error) {
+	queryParams := neturl.Values{}
+	queryParams.Add("randao_reveal", hexutil.Encode(randaoReveal))
+	if len(graffiti) > 0 {
+		queryParams.Add("graffiti", hexutil.Encode(graffiti))
+	}
+
+	var ver string
+	var blinded bool
+	var decoder *json.Decoder
+
+	// Try v3 endpoint first. If it's not supported, then we fall back to older endpoints.
+	// We try the blinded block endpoint first. If it fails, we assume that we got a full block and try the full block endpoint.
+	queryUrl := apiutil.BuildURL(fmt.Sprintf("/eth/v3/validator/blocks/%d", slot), queryParams)
+	produceBlockV3ResponseJson := structs.ProduceBlockV3Response{}
+	err := c.jsonRestHandler.Get(ctx, queryUrl, &produceBlockV3ResponseJson)
+	errJson := &httputil.DefaultJsonError{}
+	if err != nil {
+		if !errors.As(err, &errJson) {
+			return nil, err
+		}
+		if errJson.Code != http.StatusNotFound {
+			return nil, errJson
+		}
+		log.Debug("Endpoint /eth/v3/validator/blocks is not supported, falling back to older endpoints for block proposal.")
+		fallbackResp, err := c.fallBackToBlinded(ctx, slot, queryParams)
+		errJson = &httputil.DefaultJsonError{}
+		if err != nil {
+			if !errors.As(err, &errJson) {
+				return nil, err
+			}
+			log.Debug("Endpoint /eth/v1/validator/blinded_blocks failed to produce a blinded block, trying /eth/v2/validator/blocks.")
+			fallbackResp, err = c.fallBackToFull(ctx, slot, queryParams)
+			if err != nil {
+				return nil, err
+			}
+			blinded = false
+		} else {
+			blinded = true
+		}
+		ver = fallbackResp.Version
+		decoder = json.NewDecoder(bytes.NewReader(fallbackResp.Data))
+	} else {
+		ver = produceBlockV3ResponseJson.Version
+		blinded = produceBlockV3ResponseJson.ExecutionPayloadBlinded
+		decoder = json.NewDecoder(bytes.NewReader(produceBlockV3ResponseJson.Data))
+	}
+	return processBlockResponse(ver, blinded, decoder)
+}
+
+// nolint: gocognit
+func processBlockResponse(ver string, isBlinded bool, decoder *json.Decoder) (*ethpb.GenericBeaconBlock, error) {
+	var response *ethpb.GenericBeaconBlock
+	if decoder == nil {
+		return nil, errors.New("no produce block json decoder found")
+	}
+	switch ver {
+	case version.String(version.Phase0):
+		jsonPhase0Block := structs.BeaconBlock{}
+		if err := decoder.Decode(&jsonPhase0Block); err != nil {
+			return nil, errors.Wrap(err, "failed to decode phase0 block response json")
+		}
+		genericBlock, err := jsonPhase0Block.ToGeneric()
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to get phase0 block")
+		}
+		response = genericBlock
+	case version.String(version.Altair):
+		jsonAltairBlock := structs.BeaconBlockAltair{}
+		if err := decoder.Decode(&jsonAltairBlock); err != nil {
+			return nil, errors.Wrap(err, "failed to decode altair block response json")
+		}
+		genericBlock, err := jsonAltairBlock.ToGeneric()
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to get altair block")
+		}
+		response = genericBlock
+	case version.String(version.Bellatrix):
+		if isBlinded {
+			jsonBellatrixBlock := structs.BlindedBeaconBlockBellatrix{}
+			if err := decoder.Decode(&jsonBellatrixBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode blinded bellatrix block response json")
+			}
+			genericBlock, err := jsonBellatrixBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get blinded bellatrix block")
+			}
+			response = genericBlock
+		} else {
+			jsonBellatrixBlock := structs.BeaconBlockBellatrix{}
+			if err := decoder.Decode(&jsonBellatrixBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode bellatrix block response json")
+			}
+			genericBlock, err := jsonBellatrixBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get bellatrix block")
+			}
+			response = genericBlock
+		}
+	case version.String(version.Capella):
+		if isBlinded {
+			jsonCapellaBlock := structs.BlindedBeaconBlockCapella{}
+			if err := decoder.Decode(&jsonCapellaBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode blinded capella block response json")
+			}
+			genericBlock, err := jsonCapellaBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get blinded capella block")
+			}
+			response = genericBlock
+		} else {
+			jsonCapellaBlock := structs.BeaconBlockCapella{}
+			if err := decoder.Decode(&jsonCapellaBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode capella block response json")
+			}
+			genericBlock, err := jsonCapellaBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get capella block")
+			}
+			response = genericBlock
+		}
+	case version.String(version.Deneb):
+		if isBlinded {
+			jsonDenebBlock := structs.BlindedBeaconBlockDeneb{}
+			if err := decoder.Decode(&jsonDenebBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode blinded deneb block response json")
+			}
+			genericBlock, err := jsonDenebBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get blinded deneb block")
+			}
+			response = genericBlock
+		} else {
+			jsonDenebBlockContents := structs.BeaconBlockContentsDeneb{}
+			if err := decoder.Decode(&jsonDenebBlockContents); err != nil {
+				return nil, errors.Wrap(err, "failed to decode deneb block response json")
+			}
+			genericBlock, err := jsonDenebBlockContents.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get deneb block")
+			}
+			response = genericBlock
+		}
+	case version.String(version.Electra):
+		if isBlinded {
+			jsonElectraBlock := structs.BlindedBeaconBlockElectra{}
+			if err := decoder.Decode(&jsonElectraBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode blinded electra block response json")
+			}
+			genericBlock, err := jsonElectraBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get blinded electra block")
+			}
+			response = genericBlock
+		} else {
+			jsonElectraBlockContents := structs.BeaconBlockContentsElectra{}
+			if err := decoder.Decode(&jsonElectraBlockContents); err != nil {
+				return nil, errors.Wrap(err, "failed to decode electra block response json")
+			}
+			genericBlock, err := jsonElectraBlockContents.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get electra block")
+			}
+			response = genericBlock
+		}
+	case version.String(version.Fulu):
+		if isBlinded {
+			jsonFuluBlock := structs.BlindedBeaconBlockFulu{}
+			if err := decoder.Decode(&jsonFuluBlock); err != nil {
+				return nil, errors.Wrap(err, "failed to decode blinded fulu block response json")
+			}
+			genericBlock, err := jsonFuluBlock.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get blinded fulu block")
+			}
+			response = genericBlock
+		} else {
+			jsonFuluBlockContents := structs.BeaconBlockContentsFulu{}
+			if err := decoder.Decode(&jsonFuluBlockContents); err != nil {
+				return nil, errors.Wrap(err, "failed to decode fulu block response json")
+			}
+			genericBlock, err := jsonFuluBlockContents.ToGeneric()
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get fulu block")
+			}
+			response = genericBlock
+		}
+	default:
+		return nil, errors.Errorf("unsupported consensus version `%s`", ver)
+	}
+	return response, nil
+}
+
+func (c *beaconApiValidatorClient) fallBackToBlinded(
+	ctx context.Context,
+	slot primitives.Slot,
+	queryParams neturl.Values,
+) (*abstractProduceBlockResponseJson, error) {
+	resp := &abstractProduceBlockResponseJson{}
+	url := apiutil.BuildURL(fmt.Sprintf("/eth/v1/validator/blinded_blocks/%d", slot), queryParams)
+	if err := c.jsonRestHandler.Get(ctx, url, resp); err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
+func (c *beaconApiValidatorClient) fallBackToFull(
+	ctx context.Context,
+	slot primitives.Slot,
+	queryParams neturl.Values,
+) (*abstractProduceBlockResponseJson, error) {
+	resp := &abstractProduceBlockResponseJson{}
+	url := apiutil.BuildURL(fmt.Sprintf("/eth/v2/validator/blocks/%d", slot), queryParams)
+	if err := c.jsonRestHandler.Get(ctx, url, resp); err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

api/client/beacon/validator_api/get_beacon_block_test.go

@@ -0,0 +1,700 @@
+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/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 TestGetBeaconBlock_RequestFailed(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		gomock.Any(),
+		gomock.Any(),
+	).Return(
+		errors.New("foo error"),
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	_, err := validatorClient.beaconBlock(ctx, 1, []byte{1}, []byte{2})
+	assert.ErrorContains(t, "foo error", err)
+}
+
+func TestGetBeaconBlock_Error(t *testing.T) {
+	testCases := []struct {
+		name                 string
+		beaconBlock          interface{}
+		expectedErrorMessage string
+		consensusVersion     string
+		blinded              bool
+		data                 json.RawMessage
+	}{
+		{
+			name:                 "phase0 block decoding failed",
+			expectedErrorMessage: "failed to decode phase0 block response json",
+			consensusVersion:     "phase0",
+			data:                 []byte{},
+		},
+		{
+			name:                 "altair block decoding failed",
+			expectedErrorMessage: "failed to decode altair block response json",
+			consensusVersion:     "altair",
+			data:                 []byte{},
+		},
+		{
+			name:                 "bellatrix block decoding failed",
+			expectedErrorMessage: "failed to decode bellatrix block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "bellatrix",
+			blinded:              false,
+			data:                 []byte{},
+		},
+		{
+			name:                 "blinded bellatrix block decoding failed",
+			expectedErrorMessage: "failed to decode bellatrix block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "bellatrix",
+			blinded:              true,
+			data:                 []byte{},
+		},
+		{
+			name:                 "capella block decoding failed",
+			expectedErrorMessage: "failed to decode capella block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "capella",
+			blinded:              false,
+			data:                 []byte{},
+		},
+		{
+			name:                 "blinded capella block decoding failed",
+			expectedErrorMessage: "failed to decode capella block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "capella",
+			blinded:              true,
+			data:                 []byte{},
+		},
+		{
+			name:                 "deneb block decoding failed",
+			expectedErrorMessage: "failed to decode deneb block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "deneb",
+			blinded:              false,
+			data:                 []byte{},
+		},
+		{
+			name:                 "blinded deneb block decoding failed",
+			expectedErrorMessage: "failed to decode deneb block response json",
+			beaconBlock:          "foo",
+			consensusVersion:     "deneb",
+			blinded:              true,
+			data:                 []byte{},
+		},
+		{
+			name:                 "unsupported consensus version",
+			expectedErrorMessage: "unsupported consensus version `foo`",
+			consensusVersion:     "foo",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+
+			ctx := context.Background()
+
+			jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+			jsonRestHandler.EXPECT().Get(
+				gomock.Any(),
+				gomock.Any(),
+				&structs.ProduceBlockV3Response{},
+			).SetArg(
+				2,
+				structs.ProduceBlockV3Response{
+					Version: testCase.consensusVersion,
+					Data:    testCase.data,
+				},
+			).Return(
+				nil,
+			).Times(1)
+
+			validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+			_, err := validatorClient.beaconBlock(ctx, 1, []byte{1}, []byte{2})
+			assert.ErrorContains(t, testCase.expectedErrorMessage, err)
+		})
+	}
+}
+
+func TestGetBeaconBlock_Phase0Valid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoPhase0BeaconBlock()
+	block := test_helpers.GenerateJsonPhase0BeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version: "phase0",
+			Data:    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Phase0{
+			Phase0: proto,
+		},
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_AltairValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoAltairBeaconBlock()
+	block := test_helpers.GenerateJsonAltairBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version: "altair",
+			Data:    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Altair{
+			Altair: proto,
+		},
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_BellatrixValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBellatrixBeaconBlock()
+	block := test_helpers.GenerateJsonBellatrixBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "bellatrix",
+			ExecutionPayloadBlinded: false,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Bellatrix{
+			Bellatrix: proto,
+		},
+		IsBlinded: false,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_BlindedBellatrixValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBlindedBellatrixBeaconBlock()
+	block := test_helpers.GenerateJsonBlindedBellatrixBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "bellatrix",
+			ExecutionPayloadBlinded: true,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_BlindedBellatrix{
+			BlindedBellatrix: proto,
+		},
+		IsBlinded: true,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_CapellaValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoCapellaBeaconBlock()
+	block := test_helpers.GenerateJsonCapellaBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "capella",
+			ExecutionPayloadBlinded: false,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Capella{
+			Capella: proto,
+		},
+		IsBlinded: false,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_BlindedCapellaValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBlindedCapellaBeaconBlock()
+	block := test_helpers.GenerateJsonBlindedCapellaBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "capella",
+			ExecutionPayloadBlinded: true,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_BlindedCapella{
+			BlindedCapella: proto,
+		},
+		IsBlinded: true,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_DenebValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoDenebBeaconBlockContents()
+	block := test_helpers.GenerateJsonDenebBeaconBlockContents()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "deneb",
+			ExecutionPayloadBlinded: false,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Deneb{
+			Deneb: proto,
+		},
+		IsBlinded: false,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_BlindedDenebValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBlindedDenebBeaconBlock()
+	block := test_helpers.GenerateJsonBlindedDenebBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "deneb",
+			ExecutionPayloadBlinded: true,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_BlindedDeneb{
+			BlindedDeneb: proto,
+		},
+		IsBlinded: true,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_ElectraValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoElectraBeaconBlockContents()
+	block := test_helpers.GenerateJsonElectraBeaconBlockContents()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "electra",
+			ExecutionPayloadBlinded: false,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Electra{
+			Electra: proto,
+		},
+		IsBlinded: false,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_BlindedElectraValid(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBlindedElectraBeaconBlock()
+	block := test_helpers.GenerateJsonBlindedElectraBeaconBlock()
+	bytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).SetArg(
+		2,
+		structs.ProduceBlockV3Response{
+			Version:                 "electra",
+			ExecutionPayloadBlinded: true,
+			Data:                    bytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_BlindedElectra{
+			BlindedElectra: proto,
+		},
+		IsBlinded: true,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_FallbackToBlindedBlock(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoBlindedDenebBeaconBlock()
+	block := test_helpers.GenerateJsonBlindedDenebBeaconBlock()
+	blockBytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).Return(
+		&httputil.DefaultJsonError{Code: http.StatusNotFound},
+	).Times(1)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v1/validator/blinded_blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&abstractProduceBlockResponseJson{},
+	).SetArg(
+		2,
+		abstractProduceBlockResponseJson{
+			Version: "deneb",
+			Data:    blockBytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_BlindedDeneb{
+			BlindedDeneb: proto,
+		},
+		IsBlinded: true,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}
+
+func TestGetBeaconBlock_FallbackToFullBlock(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	proto := test_helpers.GenerateProtoDenebBeaconBlockContents()
+	block := test_helpers.GenerateJsonDenebBeaconBlockContents()
+	blockBytes, err := json.Marshal(block)
+	require.NoError(t, err)
+
+	const slot = primitives.Slot(1)
+	randaoReveal := []byte{2}
+	graffiti := []byte{3}
+
+	ctx := context.Background()
+
+	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v3/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&structs.ProduceBlockV3Response{},
+	).Return(
+		&httputil.DefaultJsonError{Code: http.StatusNotFound},
+	).Times(1)
+	jsonRestHandler.EXPECT().Get(
+		gomock.Any(),
+		fmt.Sprintf("/eth/v1/validator/blinded_blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&abstractProduceBlockResponseJson{},
+	).Return(
+		&httputil.DefaultJsonError{Code: http.StatusInternalServerError},
+	).Times(1)
+	jsonRestHandler.EXPECT().Get(
+		ctx,
+		fmt.Sprintf("/eth/v2/validator/blocks/%d?graffiti=%s&randao_reveal=%s", slot, hexutil.Encode(graffiti), hexutil.Encode(randaoReveal)),
+		&abstractProduceBlockResponseJson{},
+	).SetArg(
+		2,
+		abstractProduceBlockResponseJson{
+			Version: "deneb",
+			Data:    blockBytes,
+		},
+	).Return(
+		nil,
+	).Times(1)
+
+	validatorClient := &beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+	beaconBlock, err := validatorClient.beaconBlock(ctx, slot, randaoReveal, graffiti)
+	require.NoError(t, err)
+
+	expectedBeaconBlock := &ethpb.GenericBeaconBlock{
+		Block: &ethpb.GenericBeaconBlock_Deneb{
+			Deneb: proto,
+		},
+		IsBlinded: false,
+	}
+
+	assert.DeepEqual(t, expectedBeaconBlock, beaconBlock)
+}

api/client/beacon/validator_api/grpc_client.go

@@ -1,26 +1,21 @@
-package grpc_api
+package validator_api
 
 import (
 	"context"
 	"encoding/json"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/client"
-	eventClient "github.com/OffchainLabs/prysm/v6/api/client/event"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/config/features"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/validator/client/iface"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/prysmaticlabs/prysm/v5/api/client"
+	"github.com/prysmaticlabs/prysm/v5/api/client/beacon"
+	eventClient "github.com/prysmaticlabs/prysm/v5/api/client/event"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
+	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 type grpcValidatorClient struct {
@@ -29,31 +24,9 @@ type grpcValidatorClient struct {
 }
 
 func (c *grpcValidatorClient) Duties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.ValidatorDutiesContainer, error) {
-	if features.Get().DisableDutiesV2 {
-		return c.getDuties(ctx, in)
-	}
-	dutiesResponse, err := c.beaconNodeValidatorClient.GetDutiesV2(ctx, in)
-	if err != nil {
-		if status.Code(err) == codes.Unimplemented {
-			log.Warn("GetDutiesV2 returned status code unavailable, falling back to GetDuties")
-			return c.getDuties(ctx, in)
-		}
-		return nil, errors.Wrap(
-			client.ErrConnectionIssue,
-			errors.Wrap(err, "getDutiesV2").Error(),
-		)
-	}
-	return toValidatorDutiesContainerV2(dutiesResponse)
-}
-
-// getDuties is calling the v1 of get duties
-func (c *grpcValidatorClient) getDuties(ctx context.Context, in *ethpb.DutiesRequest) (*ethpb.ValidatorDutiesContainer, error) {
 	dutiesResponse, err := c.beaconNodeValidatorClient.GetDuties(ctx, in)
 	if err != nil {
-		return nil, errors.Wrap(
-			client.ErrConnectionIssue,
-			errors.Wrap(err, "getDuties").Error(),
-		)
+		return nil, err
 	}
 	return toValidatorDutiesContainer(dutiesResponse)
 }
@@ -76,8 +49,6 @@ func toValidatorDutiesContainer(dutiesResponse *ethpb.DutiesResponse) (*ethpb.Va
 		nextDuties[i] = duty
 	}
 	return &ethpb.ValidatorDutiesContainer{
-		PrevDependentRoot:  dutiesResponse.PreviousDutyDependentRoot,
-		CurrDependentRoot:  dutiesResponse.CurrentDutyDependentRoot,
 		CurrentEpochDuties: currentDuties,
 		NextEpochDuties:    nextDuties,
 	}, nil
@@ -107,46 +78,6 @@ func toValidatorDuty(duty *ethpb.DutiesResponse_Duty) (*ethpb.ValidatorDuty, err
 	}, nil
 }
 
-func toValidatorDutiesContainerV2(dutiesResponse *ethpb.DutiesV2Response) (*ethpb.ValidatorDutiesContainer, error) {
-	currentDuties := make([]*ethpb.ValidatorDuty, len(dutiesResponse.CurrentEpochDuties))
-	for i, cd := range dutiesResponse.CurrentEpochDuties {
-		duty, err := toValidatorDutyV2(cd)
-		if err != nil {
-			return nil, err
-		}
-		currentDuties[i] = duty
-	}
-	nextDuties := make([]*ethpb.ValidatorDuty, len(dutiesResponse.NextEpochDuties))
-	for i, nd := range dutiesResponse.NextEpochDuties {
-		duty, err := toValidatorDutyV2(nd)
-		if err != nil {
-			return nil, err
-		}
-		nextDuties[i] = duty
-	}
-	return &ethpb.ValidatorDutiesContainer{
-		PrevDependentRoot:  dutiesResponse.PreviousDutyDependentRoot,
-		CurrDependentRoot:  dutiesResponse.CurrentDutyDependentRoot,
-		CurrentEpochDuties: currentDuties,
-		NextEpochDuties:    nextDuties,
-	}, nil
-}
-
-func toValidatorDutyV2(duty *ethpb.DutiesV2Response_Duty) (*ethpb.ValidatorDuty, error) {
-	return &ethpb.ValidatorDuty{
-		CommitteeLength:         duty.CommitteeLength,
-		CommitteeIndex:          duty.CommitteeIndex,
-		CommitteesAtSlot:        duty.CommitteesAtSlot, // GRPC doesn't use this value though
-		ValidatorCommitteeIndex: duty.ValidatorCommitteeIndex,
-		AttesterSlot:            duty.AttesterSlot,
-		ProposerSlots:           duty.ProposerSlots,
-		PublicKey:               bytesutil.SafeCopyBytes(duty.PublicKey),
-		Status:                  duty.Status,
-		ValidatorIndex:          duty.ValidatorIndex,
-		IsSyncCommittee:         duty.IsSyncCommittee,
-	}, nil
-}
-
 func (c *grpcValidatorClient) CheckDoppelGanger(ctx context.Context, in *ethpb.DoppelGangerRequest) (*ethpb.DoppelGangerResponse, error) {
 	return c.beaconNodeValidatorClient.CheckDoppelGanger(ctx, in)
 }
@@ -270,15 +201,15 @@ func (c *grpcValidatorClient) AggregatedSigAndAggregationBits(
 	return c.beaconNodeValidatorClient.AggregatedSigAndAggregationBits(ctx, in)
 }
 
-func (*grpcValidatorClient) AggregatedSelections(context.Context, []iface.BeaconCommitteeSelection) ([]iface.BeaconCommitteeSelection, error) {
-	return nil, iface.ErrNotSupported
+func (*grpcValidatorClient) AggregatedSelections(context.Context, []beacon.BeaconCommitteeSelection) ([]beacon.BeaconCommitteeSelection, error) {
+	return nil, client.ErrNotSupported
 }
 
-func (*grpcValidatorClient) AggregatedSyncSelections(context.Context, []iface.SyncCommitteeSelection) ([]iface.SyncCommitteeSelection, error) {
-	return nil, iface.ErrNotSupported
+func (*grpcValidatorClient) AggregatedSyncSelections(context.Context, []beacon.SyncCommitteeSelection) ([]beacon.SyncCommitteeSelection, error) {
+	return nil, client.ErrNotSupported
 }
 
-func NewGrpcValidatorClient(cc grpc.ClientConnInterface) iface.ValidatorClient {
+func NewGrpcValidatorClient(cc grpc.ClientConnInterface) Client {
 	return &grpcValidatorClient{ethpb.NewBeaconNodeValidatorClient(cc), false}
 }
 
@@ -292,7 +223,7 @@ func (c *grpcValidatorClient) StartEventStream(ctx context.Context, topics []str
 		}
 		return
 	}
-	// TODO(13563): ONLY WORKS WITH HEAD TOPIC.
+	// TODO(13563): ONLY WORKS WITH HEAD TOPIC RIGHT NOW/ONLY PROVIDES THE SLOT
 	containsHead := false
 	for i := range topics {
 		if topics[i] == eventClient.EventHead {
@@ -322,6 +253,7 @@ func (c *grpcValidatorClient) StartEventStream(ctx context.Context, topics []str
 		select {
 		case <-ctx.Done():
 			log.Info("Context canceled, stopping event stream")
+			close(eventsChannel)
 			c.isEventStreamRunning = false
 			return
 		default:
@@ -353,9 +285,7 @@ func (c *grpcValidatorClient) StartEventStream(ctx context.Context, topics []str
 				continue
 			}
 			b, err := json.Marshal(structs.HeadEvent{
-				Slot:                      strconv.FormatUint(uint64(res.Slot), 10),
-				PreviousDutyDependentRoot: hexutil.Encode(res.PreviousDutyDependentRoot),
-				CurrentDutyDependentRoot:  hexutil.Encode(res.CurrentDutyDependentRoot),
+				Slot: strconv.FormatUint(uint64(res.Slot), 10),
 			})
 			if err != nil {
 				eventsChannel <- &eventClient.Event{
@@ -376,10 +306,10 @@ func (c *grpcValidatorClient) EventStreamIsRunning() bool {
 }
 
 func (*grpcValidatorClient) Host() string {
-	log.Warn(iface.ErrNotSupported)
+	log.Warn(client.ErrNotSupported)
 	return ""
 }
 
 func (*grpcValidatorClient) SetHost(_ string) {
-	log.Warn(iface.ErrNotSupported)
+	log.Warn(client.ErrNotSupported)
 }

api/client/beacon/validator_api/grpc_client_test.go

@@ -1,4 +1,4 @@
-package grpc_api
+package validator_api
 
 import (
 	"context"
@@ -7,18 +7,19 @@ import (
 	"testing"
 	"time"
 
-	eventClient "github.com/OffchainLabs/prysm/v6/api/client/event"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	mock2 "github.com/OffchainLabs/prysm/v6/testing/mock"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
+	eventClient "github.com/prysmaticlabs/prysm/v5/api/client/event"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/v5/testing/assert"
+	mock2 "github.com/prysmaticlabs/prysm/v5/testing/mock"
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	logTest "github.com/sirupsen/logrus/hooks/test"
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
+// toValidatorDutiesContainer is assumed to be available from your package, returning a *v1alpha1.ValidatorDutiesContainer.
 func TestToValidatorDutiesContainer_HappyPath(t *testing.T) {
 	// Create a mock DutiesResponse with current and next duties.
 	dutiesResp := &eth.DutiesResponse{
@@ -70,59 +71,6 @@ func TestToValidatorDutiesContainer_HappyPath(t *testing.T) {
 	assert.DeepEqual(t, firstNextDuty.ProposerSlots, expectedNextDuty.ProposerSlots)
 }
 
-func TestToValidatorDutiesContainerV2_HappyPath(t *testing.T) {
-	// Create a mock DutiesResponse with current and next duties.
-	dutiesResp := &eth.DutiesV2Response{
-		CurrentEpochDuties: []*eth.DutiesV2Response_Duty{
-			{
-				CommitteeLength:         2,
-				CommitteeIndex:          4,
-				ValidatorCommitteeIndex: 1,
-				AttesterSlot:            200,
-				ProposerSlots:           []primitives.Slot{400},
-				PublicKey:               []byte{0xAA, 0xBB},
-				Status:                  eth.ValidatorStatus_ACTIVE,
-				ValidatorIndex:          101,
-				IsSyncCommittee:         false,
-				CommitteesAtSlot:        2,
-			},
-		},
-		NextEpochDuties: []*eth.DutiesV2Response_Duty{
-			{
-				CommitteeLength:         2,
-				CommitteeIndex:          8,
-				ValidatorCommitteeIndex: 1,
-				AttesterSlot:            600,
-				ProposerSlots:           []primitives.Slot{700, 701},
-				PublicKey:               []byte{0xCC, 0xDD},
-				Status:                  eth.ValidatorStatus_ACTIVE,
-				ValidatorIndex:          301,
-				IsSyncCommittee:         true,
-				CommitteesAtSlot:        3,
-			},
-		},
-	}
-
-	gotContainer, err := toValidatorDutiesContainerV2(dutiesResp)
-	require.NoError(t, err)
-
-	// Validate we have the correct number of duties in current and next epochs.
-	assert.Equal(t, len(gotContainer.CurrentEpochDuties), len(dutiesResp.CurrentEpochDuties))
-	assert.Equal(t, len(gotContainer.NextEpochDuties), len(dutiesResp.NextEpochDuties))
-
-	firstCurrentDuty := gotContainer.CurrentEpochDuties[0]
-	expectedCurrentDuty := dutiesResp.CurrentEpochDuties[0]
-	assert.DeepEqual(t, firstCurrentDuty.PublicKey, expectedCurrentDuty.PublicKey)
-	assert.Equal(t, firstCurrentDuty.ValidatorIndex, expectedCurrentDuty.ValidatorIndex)
-	assert.DeepEqual(t, firstCurrentDuty.ProposerSlots, expectedCurrentDuty.ProposerSlots)
-
-	firstNextDuty := gotContainer.NextEpochDuties[0]
-	expectedNextDuty := dutiesResp.NextEpochDuties[0]
-	assert.DeepEqual(t, firstNextDuty.PublicKey, expectedNextDuty.PublicKey)
-	assert.Equal(t, firstNextDuty.ValidatorIndex, expectedNextDuty.ValidatorIndex)
-	assert.DeepEqual(t, firstNextDuty.ProposerSlots, expectedNextDuty.ProposerSlots)
-}
-
 func TestWaitForChainStart_StreamSetupFails(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
@@ -134,14 +82,14 @@ func TestWaitForChainStart_StreamSetupFails(t *testing.T) {
 	).Return(nil, errors.New("failed stream"))
 
 	validatorClient := &grpcValidatorClient{beaconNodeValidatorClient, true}
-	_, err := validatorClient.WaitForChainStart(t.Context(), &emptypb.Empty{})
+	_, err := validatorClient.WaitForChainStart(context.Background(), &emptypb.Empty{})
 	want := "could not setup beacon chain ChainStart streaming client"
 	assert.ErrorContains(t, want, err)
 }
 
 func TestStartEventStream(t *testing.T) {
 	hook := logTest.NewGlobal()
-	ctx, cancel := context.WithCancel(t.Context())
+	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()

api/client/beacon/validator_api/index.go

@@ -1,14 +1,14 @@
-package beacon_api
+package validator_api
 
 import (
 	"context"
 	"fmt"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"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"
 )
 
 // IndexNotFoundError represents an error scenario where no validator index matches a pubkey.

api/client/beacon/validator_api/index_test.go

@@ -1,20 +1,22 @@
-package beacon_api
+package validator_api
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"net/url"
 	"testing"
 
-	"github.com/OffchainLabs/prysm/v6/api/apiutil"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/validator/client/beacon-api/mock"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/apiutil"
+	"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/server/structs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
+	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"
 )
 
@@ -38,7 +40,7 @@ func TestIndex_Nominal(t *testing.T) {
 	defer ctrl.Finish()
 
 	pubKey, reqBuffer := getPubKeyAndReqBuffer(t)
-	ctx := t.Context()
+	ctx := context.Background()
 
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -67,9 +69,7 @@ func TestIndex_Nominal(t *testing.T) {
 	).Times(1)
 
 	validatorClient := beaconApiValidatorClient{
-		stateValidatorsProvider: beaconApiStateValidatorsProvider{
-			jsonRestHandler: jsonRestHandler,
-		},
+		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
 	}
 
 	validatorIndex, err := validatorClient.ValidatorIndex(
@@ -88,7 +88,7 @@ func TestIndex_UnexistingValidator(t *testing.T) {
 	defer ctrl.Finish()
 
 	pubKey, reqBuffer := getPubKeyAndReqBuffer(t)
-	ctx := t.Context()
+	ctx := context.Background()
 
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -109,9 +109,7 @@ func TestIndex_UnexistingValidator(t *testing.T) {
 	).Times(1)
 
 	validatorClient := beaconApiValidatorClient{
-		stateValidatorsProvider: beaconApiStateValidatorsProvider{
-			jsonRestHandler: jsonRestHandler,
-		},
+		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
 	}
 
 	_, err := validatorClient.ValidatorIndex(
@@ -130,7 +128,7 @@ func TestIndex_BadIndexError(t *testing.T) {
 	defer ctrl.Finish()
 
 	pubKey, reqBuffer := getPubKeyAndReqBuffer(t)
-	ctx := t.Context()
+	ctx := context.Background()
 
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -159,9 +157,7 @@ func TestIndex_BadIndexError(t *testing.T) {
 	).Times(1)
 
 	validatorClient := beaconApiValidatorClient{
-		stateValidatorsProvider: beaconApiStateValidatorsProvider{
-			jsonRestHandler: jsonRestHandler,
-		},
+		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
 	}
 
 	_, err := validatorClient.ValidatorIndex(
@@ -179,7 +175,7 @@ func TestIndex_JsonResponseError(t *testing.T) {
 	defer ctrl.Finish()
 
 	pubKey, reqBuffer := getPubKeyAndReqBuffer(t)
-	ctx := t.Context()
+	ctx := context.Background()
 
 	stateValidatorsResponseJson := structs.GetValidatorsResponse{}
 	jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
@@ -216,9 +212,7 @@ func TestIndex_JsonResponseError(t *testing.T) {
 	).Times(1)
 
 	validatorClient := beaconApiValidatorClient{
-		stateValidatorsProvider: beaconApiStateValidatorsProvider{
-			jsonRestHandler: jsonRestHandler,
-		},
+		stateValidatorsProvider: shared_providers.NewStateValidators(jsonRestHandler),
 	}
 
 	_, err := validatorClient.ValidatorIndex(

api/client/beacon/validator_api/interfaces.go

@@ -0,0 +1,46 @@
+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,4 +1,4 @@
-package beacon_api
+package validator_api
 
 import "github.com/sirupsen/logrus"
 

api/client/beacon/validator_api/metrics.go

@@ -1,4 +1,4 @@
-package beacon_api
+package validator_api
 
 import (
 	"github.com/prometheus/client_golang/prometheus"

api/client/beacon/validator_api/prepare_beacon_proposer.go

@@ -1,4 +1,4 @@
-package beacon_api
+package validator_api
 
 import (
 	"bytes"
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
+	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
 
 func (c *beaconApiValidatorClient) prepareBeaconProposer(ctx context.Context, recipients []*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer) error {