Merge tag 'v5.3.0' of github.com:prysmaticlabs/prysm

Merge tag 'v5.0.3' of github.com:prysmaticlabs/prysm
Merge tag 'v4.2.1'
2026-01-10 13:58:09 -05:00 · 2025-02-12 12:59:53 -06:00 · 2024-04-04 19:28:49 -05:00 · 2024-01-31 07:05:10 -06:00 · 2024-01-11 09:31:14 -06:00 · 2023-04-20 13:51:55 -05:00
450 changed files with 10572 additions and 12462 deletions
--- a/.github/actions/gomodtidy/Dockerfile
+++ b/.github/actions/gomodtidy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine
+FROM golang:1.23-alpine

 COPY entrypoint.sh /entrypoint.sh

--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout source code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@v3

      - name: Download unclog binary
        uses: dsaltares/fetch-gh-release-asset@aa2ab1243d6e0d5b405b973c89fa4d06a2d0fff7 # 1.1.2
@@ -23,7 +23,7 @@ jobs:

      - name: Get new changelog files
        id: new-changelog-files
-        uses: OffchainLabs/gh-action-changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # v4.0.8
+        uses: tj-actions/changed-files@v45
        with:
          files: |
            changelog/**.md
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -28,15 +28,15 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-      - name: Set up Go 1.24
+      - name: Set up Go 1.23
        uses: actions/setup-go@v4
        with:
-          go-version: '1.24.0'
+          go-version: '1.23.5'
      - name: Run Gosec Security Scanner
        run: | # https://github.com/securego/gosec/issues/469
          export PATH=$PATH:$(go env GOPATH)/bin
-          go install github.com/securego/gosec/v2/cmd/gosec@v2.22.1
-          gosec -exclude-generated -exclude=G307,G115 -exclude-dir=crypto/bls/herumi ./...
+          go install github.com/securego/gosec/v2/cmd/gosec@v2.19.0
+          gosec -exclude-generated -exclude=G307 -exclude-dir=crypto/bls/herumi ./...

  lint:
    name: Lint
@@ -45,16 +45,16 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Set up Go 1.24
+      - name: Set up Go 1.23
        uses: actions/setup-go@v4
        with:
-          go-version: '1.24.0'
+          go-version: '1.23.5'
          id: go

      - name: Golangci-lint
        uses: golangci/golangci-lint-action@v5
        with:
-          version: v1.64.5
+          version: v1.63.4
          args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number

  build:
@@ -64,7 +64,7 @@ jobs:
      - name: Set up Go 1.x
        uses: actions/setup-go@v4
        with:
-          go-version: '1.24.0'
+          go-version: '1.23.5'
        id: go

      - name: Check out code into the Go module directory
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -75,7 +75,6 @@ linters:
    - tagliatelle
    - thelper
    - unparam
-    - usetesting
    - varnamelen
    - wrapcheck
    - wsl
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -165,7 +165,7 @@ STATICCHECK_ANALYZERS = [
    "sa6006",
    "sa9001",
    "sa9002",
-    "sa9003",
+    #"sa9003", # Doesn't build. See https://github.com/dominikh/go-tools/pull/1483
    "sa9004",
    "sa9005",
    "sa9006",
@@ -197,7 +197,6 @@ nogo(
        "//tools/analyzers/logruswitherror:go_default_library",
        "//tools/analyzers/maligned:go_default_library",
        "//tools/analyzers/nop:go_default_library",
-        "//tools/analyzers/nopanic:go_default_library",
        "//tools/analyzers/properpermissions:go_default_library",
        "//tools/analyzers/recursivelock:go_default_library",
        "//tools/analyzers/shadowpredecl:go_default_library",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,237 +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.

-## [v5.3.1](https://github.com/prysmaticlabs/prysm/compare/v5.3.0...v5.3.1) - 2025-03-13
-
-This release is packed with critical fixes for **Electra** and some important fixes for mainnet too. 
-
-The release highlights include:
-
- Ensure that deleting a block from the database clears its entry in the slot->root db index. This issue was causing some operators to have a bricked database, requiring a full resync. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15011)
- Updated go to go1.24.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Added a feature flag to sync from an arbitrary beacon block root at startup. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15000)
- Updated default gas limit from 30M to 36M. Override this with `--suggested-gas-limit=` in the validator client. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14858)
-
-Known issues in **Electra**:
-
- Duplicate attestations are needlessly processed. This is being addressed in [[PR]](https://github.com/prysmaticlabs/prysm/pull/15034).
-
-Testnet operators are strongly encouraged to update to this release. There are many fixes and improvements from the Holesky upgrade incident.
-
-Mainner operators are recommended to update to this release at their regular cadence. 
-
-### Added
-
- enable E2E for minimal and mainnet tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14842)
- enable web3signer E2E for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14936)
- Enable multiclient E2E for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14946)
- Enable Scenario E2E tests with electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14946)
- Add endpoint for getting pending deposits. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14941)
- Add request hash to header for builder: executable data to block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14955)
- Log execution requests in each block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14956)
- Add endpoint for getting pending partial withdrawals. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14949)
- Tracked validators cache: Added the `ItemCount` method. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14957)
- Tracked validators cache: Added the `Indices` method. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14957)
- Added deposit request testing for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14964)
- Added support for otel tracing transport in HTTP clients in Prysm. This allows for tracing headers to be sent with http requests such that spans between the validator and beacon chain can be connected in the tracing graph. This change does nothing without `--enable-tracing`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14972)
- Add SSZ support to light client finality and optimistic APIs. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14836)
- add log to committee index when committeebits are not the expected length of 1. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14993)
- Add acceptable address types for static peers. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14886)
- Added a feature flag to sync from an arbitrary beacon block root at startup. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15000)
-
-### Changed
-
- updates geth to 1.15.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14842)
- Updates blst to v3.14.0 and fixes the references in our deps.bzl file. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14921)
- Updated tracing exporter from jaeger to otelhttp. This should not be a breaking change. Jaeger supports otel format, however you may need to update your URL as the default otel-collector port is 4318. See the [OpenTelemtry Protocol Exporter docs](https://opentelemetry.io/docs/specs/otel/protocol/exporter/) for more details. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14928)
- Don't use MaxCover for Electra on-chain attestations. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14925)
- Tracked validators cache: Remove validators from the cache if not seen after 1 hour. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14957)
- execution requests errors on ssz length have been improved. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14962)
- deprecate beacon api endpoints based on [3.0.0 release](https://github.com/ethereum/beacon-APIs/pull/506) for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14967)
- Use go-cmp for printing better diffs for assertions.DeepEqual. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14978)
- Reorganized beacon chain flags in `--help` text into logical sections. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14959)
- `--validators-registration-batch-size`: Change default value from `0` to `200`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14981)
- Updated go to go1.24.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Updated gosec to v2.22.1 and golangci to v1.64.5. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Updated github.com/trailofbits/go-mutexasserts. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Updated rules_go to cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9 to support go1.24.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Validate blob sidecar re-order signature and bad parent block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15013)
- Updated default gas limit from 30M to 36M. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14858)
- Ignore errors from `hasSeenBit` and don't pack unaggregated attestations. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15018)
-
-### Removed
-
- Remove Fulu state and block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14905)
- Removed the log summarizing all started services. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14958)
-
-### Fixed
-
- fixed max and target blob per block from static to dynamic values. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14911)
- refactored publish block and block ssz functions to fix gocognit. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14913)
- refactored publish blinded block and blinded block ssz to correctly deal with version headers and sent blocks. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14913)
- Only check for electra related engine methods if electra is active. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14924)
- Fixed bug that breaks new blob storage layout code on Windows, caused by accidental use of platform-dependent path parsing package. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14931)
- Fix E2E Process Deposit Evaluator for Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14933)
- Fixed the `bazel run //:gazelle` command in `DEPENDENCIES.md`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14934)
- Fix E2E Deposit Activation Evaluator for Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14938)
- Dedicated processing of `SingleAttestation` in the monitor service. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14965)
- adding in content type and accept headers for builder API call on registration. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14961)
- fixed gocognit in block conversions between json and proto types. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14953)
- Lint: Fix violations of S1009: should omit nil check; len() for nil slices is defined as zero. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14973)
- Lint: Fix violations of non-constant format string in call. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14974)
- Fixed violations of gosec G301. This is a check that created files and directories have file permissions 0750 and 0600 respectively. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14980)
- Check for the correct attester slashing type during gossip validation. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14985)
- cosmetic fix for post electra validator logs displaying attestation committee information correctly. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14992)
- fix inserting the wrong committee index into the seen cache for electra attestations. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14998)
- Allow any block type to be unmarshaled rather than only phase0 blocks in `slotByBlockRoot`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15008)
- Fixed pruner to not block while pruning large database by introducing batchSize. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14929)
- Decompose Electra block attestations to prevent redundant packing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14896)
- Fixed use of deprecated rand.Seed. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- Fixed build issue with SszGen where the go binary was not present in the $PATH. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14969)
- fixed /eth/v1/config/spec displays BLOB_SIDECAR_SUBNET_COUNT,BLOB_SIDECAR_SUBNET_COUNT_ELECTRA. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15016)
- Ensure that deleting a block from the database clears its entry in the slot->root db index. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15011)
- Broadcasting BLS to execution changes should not use the request context in a go routine. Use context.Background() for the broadcasting go routine. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15019)
- /eth/v1/validator/sync_committee_contribution should check for optimistic status and return a 503 if it's optimistic. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15022)
- Fixes printing superfluous response.WriteHeader call from error in builder. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15025)
- Fixes e2e run with builder having wrong gaslimit header due to not being set on eth1 nodes. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15025)
- Fixed a bug in the event stream handler when processing payload attribute events where the timestamp and slot of the event would be based on the head rather than the current slot. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14963)
- Handle unaggregated attestations when decomposing Electra block attestations. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15027)
-
-## [v5.3.0](https://github.com/prysmaticlabs/prysm/compare/v5.2.0...v5.3.0) - 2025-02-12
-
-This release includes support for Pectra activation in the [Holesky](https://github.com/eth-clients/holesky) and [Sepolia](https://github.com/eth-clients/sepolia) testnets! The release contains many fixes for Electra that have been found in rigorous testing through devnets in the last few months.
-
-For mainnet, we have a few nice features for you to try:
-
- [PR #14023](https://github.com/prysmaticlabs/prysm/pull/14023) introduces a new file layout structure for storing blobs. Rather than storing all blob root directories in one parent directory, blob root directories are organized in subdirectories by epoch. This should vastly decrease the blob cache warmup time when Prysm is starting. Try this feature with `--blob-storage-layout=by-epoch`.
-
-Updating to this release is **required** for Holesky and Sepolia operators and it is **recommended** for mainnet users as there are a few bug fixes that apply to deneb logic.
-
-### Added
-
- Added an error field to log `Finished building block`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14696)
- Implemented a new `EmptyExecutionPayloadHeader` function. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14713)
- Added proper gas limit check for header from the builder. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14707)
- `Finished building block`: Display error only if not nil. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14722)
- Added light client feature flag check to RPC handlers. [PR](https://github.com/prysmaticlabs/prysm/pull/14736). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14782)
- Added support to update target and max blob count to different values per hard fork config. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14678)
- Log before blob filesystem cache warm-up. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14735)
- New design for the attestation pool. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14324)
- Add field param placeholder for Electra blob target and max to pass spec tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14733)
- Light client: Add better error handling. [PR](https://github.com/prysmaticlabs/prysm/pull/14749). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14782)
- Add EIP-7691: Blob throughput increase. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14750)
- Trace IDONTWANT Messages in Pubsub. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14778)
- Add Fulu fork boilerplate. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14771)
- DB optimization for saving light client bootstraps (save unique sync committees only). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14782)
- Separate type for unaggregated network attestations. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14659)
- Remote signer electra fork support. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14477)
- Add Electra test case to rewards API. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14816)
- Update `proto_test.go` to Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14817)
- Update slasher service to Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14812)
- Builder API endpoint to support Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14344)
- Added protoc toolchains with a version of v25.3. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14818)
- Add test cases for the eth_lightclient_bootstrap API SSZ support. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14824)
- Handle `AttesterSlashingElectra` everywhere in the codebase. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14823)
- Add Beacon DB pruning service to prune historical data older than MIN_EPOCHS_FOR_BLOCK_REQUESTS (roughly equivalent to the weak subjectivity period). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14687)
- Nil consolidation request check for core processing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14851)
- Updated blob sidecar api endpoint for Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14852)
- Slashing pool service to convert slashings from Phase0 to Electra at the fork. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14844)
- check to stop eth1 voting after electra and eth1 deposits stop. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14835)
- WARN log message on node startup advising of the upcoming deprecation of the --enable-historical-state-representation feature flag. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14856)
- Beacon API event support for `SingleAttestation` and `SignedAggregateAttestationAndProofElectra`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14855)
- Added Electra tests for `TestLightClient_NewLightClientOptimisticUpdateFromBeaconState` and `TestLightClient_NewLightClientFinalityUpdateFromBeaconState`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14783)
- New option to select an alternate blob storage layout. Rather than a flat directory with a subdir for each block root, a multi-level scheme is used to organize blobs by epoch/slot/root, enabling leaner syscalls, indexing and pruning. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14023)
- Send pending att queue's attestations through the notification feed. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14862)
- Prune all pending deposits and proofs in post-Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14829)
- Add Pectra testnet dates. (Sepolia and Holesky). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14884)
-
-### Changed
-
- Process light client finality updates only for new finalized epochs instead of doing it for every block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14713)
- Refactor subnets subscriptions. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14711)
- Refactor RPC handlers subscriptions. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14732)
- Go deps upgrade, from `ioutil` to `io`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14737)
- Move successfully registered validator(s) on builder log to debug. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14735)
- Update some test files to use `crypto/rand` instead of `math/rand`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14747)
- Re-organize the content of the `*.proto` files (No functional change). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14755)
- SSZ files generation: Remove the `// Hash: ...` header.[[PR]](https://github.com/prysmaticlabs/prysm/pull/14760)
- Updated Electra spec definition for `process_epoch`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14768)
- Update our `go-libp2p-pubsub` dependency. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14770)
- Re-organize the content of files to ease the creation of a new fork boilerplate. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14761)
- Updated spec definition electra `process_registry_updates`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14767)
- Fixed Metadata errors for peers connected via QUIC. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14776)
- Updated spec definitions for `process_slashings` in godocs. Simplified `ProcessSlashings` API. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14766)
- Update spec tests to v1.5.0-beta.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14788)
- Process light client finality updates only for new finalized epochs instead of doing it for every block. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14718)
- Update blobs by rpc topics from V2 to V1. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14785)
- Updated geth to 1.14~. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14351)
- E2e tests start from bellatrix. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14351)
- Version pinning unclog after making some ux improvements. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14802)
- Remove helpers to check for execution/compounding withdrawal credentials and expose them as methods. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14808)
- Refactor `2006-01-02 15:04:05` to `time.DateTime`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14792)
- Updated Prysm to Go v1.23.5. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14818)
- Updated Bazel version to v7.4.1. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14818)
- Updated rules_go to v0.46.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14818)
- Updated golang.org/x/tools to be compatible with v1.23.5. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14818)
- CI now requires proto files to be properly formatted with clang-format. [[PR](https://github.com/prysmaticlabs/prysm/pull/14831)]. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14831)
- Improved test coverage of beacon-chain/core/electra/churn.go. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14837)
- Update electra spec test to beta1. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14841)
- Move deposit request nil check to apply all. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14849)
- Do not mark blocks as invalid on context deadlines during state transition. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14838)
- Update electra core processing to not mark block bad if execution request error. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14826)
- Dependency: Updated go-ethereum to v1.14.13. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14872)
- improving readability on proposer settings loader. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14868)
- Removes existing validator.processSlot span and adds validator.processSlot span to slotCtx. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14874)
- DownloadFinalizedData has moved from the api/client package to beacon-chain/sync/checkpoint. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14871)
- Updated Blob-Batch-Limit to increase to 192 for electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14883)
- Updated Blob-Batch-Limit-Burst-Factor to increase to 3. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14883)
- Changed the derived batch limit when serving blobs. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14883)
- Updated go-libp2p-pubsub to v0.13.0. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14890)
- Rename light client flag from `enable-lightclient` to `enable-light-client`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14887)
- Update electra spec test to beta2. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14901)
-
-### Removed
-
- Cleanup ProcessSlashings method to remove unnecessary argument. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14762)
- Remove `/proto/eth/v2` directory. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14765)
- Remove `/memsize/` pprof endpoint as it will no longer be supported in go 1.23. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14351)
- Clean `TestCanUpgrade*` tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14791)
- Remove `Copy()` from the `ReadOnlyBeaconBlock` interface. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14811)
- Removed a tracing span on signature requests. These requests usually took less than 5 nanoseconds and are generally not worth tracing. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14864)
-
-### Fixed
-
- Added check to prevent nil pointer deference or out of bounds array access when validating the BLSToExecutionChange on an impossibly nil validator. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14705)
- EIP-7691: Ensure new blobs subnets are subscribed on epoch in advance. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14759)
- Fix kzg commitment inclusion proof depth minimal value. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14787)
- Replace exampleIP to `96.7.129.13`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14795)
- Fixed a p2p test to reliably return a static IP through DNS resolution. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14800)
- `ToBlinded`: Use Fulu struct for Fulu (instead of Electra). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14797)
- fix panic with type cast on pbgenericblock(). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14801)
- Prysmctl generate genesis state: fix truncation of ExtraData to 32 bytes to satisfy SSZ marshaling. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14803)
- added conditional evaluators to fix scenario e2e tests. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14798)
- Use `SingleAttestation` for Fulu in p2p attestation map. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14809)
- `UpgradeToFulu`: Respect the specification. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14821)
- `nodeFilter`: Implement `filterPeerForBlobSubnet` to avoid error logs. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14822)
- Fixed deposit packing for post-Electra: early return if EIP-6110 is applied. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14697)
- Fix batch process new pending deposits by getting validators from state. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14827)
- Fix handling unfound block at slot. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14852)
- Fixed incorrect attester slashing length check. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14833)
- Fix monitor service for Electra. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14853)
- add more nil checks on ToConsensus functions for added safety. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14867)
- Fix electra state to safe share references on pending fields when append. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14895)
- Add missing config values from the spec. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14903)
- We remove the unused `rebuildTrie` assignments for fields which do not use them. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14906)
- fix block api endpoint to handle blocks with the same structure but on different forks (i.e. fulu and electra). [[PR]](https://github.com/prysmaticlabs/prysm/pull/14897)
- We change how we track blob indexes during their reconstruction from the EL to prevent. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14909)
- We now use the correct maximum value when serving blobs for electra blocks. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14910)
-
-### Security
-
- go version upgrade to 1.22.10 for CVE CVE-2024-34156. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14729)
- Update golang.org/x/crypto to v0.31.0 to address CVE-2024-45337. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14777)
- Update golang.org/x/net to v0.33.0 to address CVE-2024-45338. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14780)
-
 ## [v5.2.0](https://github.com/prysmaticlabs/prysm/compare/v5.1.2...v5.2.0)

 Updating to this release is highly recommended, especially for users running v5.1.1 or v5.1.2.
@@ -3218,4 +2987,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
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -55,7 +55,7 @@ bazel build //beacon-chain --config=release
 ## Adding / updating dependencies

 1. Add your dependency as you would with go modules. I.e. `go get ...`
-1. Run `bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=deps.bzl%prysm_deps -prune=true` to update the bazel managed dependencies.
+1. Run `bazel run //:gazelle -- update-repos -from_file=go.mod` to update the bazel managed dependencies.

 Example:

--- a/48
+++ b/48
@@ -160,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",
    ],
-    strip_prefix = "rules_go-cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9",
+    sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
    urls = [
-        "https://github.com/bazel-contrib/rules_go/archive/cf3c3af34bd869b864f5f2b98e2f41c2b220d6c9.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
    ],
 )

@@ -210,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.24.0",
+    go_version = "1.23.5",
    nogo = "@//:nogo",
 )

@@ -255,7 +255,7 @@ filegroup(
    url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )

-consensus_spec_version = "v1.5.0-beta.3"
+consensus_spec_version = "v1.5.0-beta.2"

 bls_test_version = "v0.1.1"

@@ -271,7 +271,7 @@ filegroup(
    visibility = ["//visibility:public"],
 )
    """,
-    integrity = "sha256-z+j0BEJuXMBKbGL+7jq35zddzZMW1je8/uvTz5+wboQ=",
+    integrity = "sha256-X/bMxbKg1clo2aFEjBoeuFq/U+BF1eQopgRP/7nI3Qg=",
    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version,
 )

@@ -287,7 +287,7 @@ filegroup(
    visibility = ["//visibility:public"],
 )
    """,
-    integrity = "sha256-5/YUOXH65CmM1plZ8twJ3BQxwM51jgSpOB8/VSBI19k=",
+    integrity = "sha256-WSxdri5OJGuNApW+odKle5UzToDyEOx+F3lMiqamJAg=",
    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version,
 )

@@ -303,7 +303,7 @@ filegroup(
    visibility = ["//visibility:public"],
 )
    """,
-    integrity = "sha256-iZ2eNhwRnbxrjR+5gMBUYakaCXicvPChwFUkZtQUbbI=",
+    integrity = "sha256-LYE8l3y/zSt4YVrehrJ3ralqtgeYNildiIp+HR6+xAI=",
    url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version,
 )

@@ -318,7 +318,7 @@ filegroup(
    visibility = ["//visibility:public"],
 )
    """,
-    integrity = "sha256-inAXV7xNM5J1aUdP7JNXFO2iFFZ7dth38Ji+mJW50Ts=",
+    integrity = "sha256-jvZQ90qcJMTOqMsPO7sgeEVQmewZTHcz7LVDkNqwTFQ=",
    strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
    url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )
@@ -365,9 +365,9 @@ filegroup(
    visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-YVFFrCmjoGZ3fXMWpsCpSsYbANy1grnqYwOLKIg2SsA=",
-    strip_prefix = "holesky-32a72e21c6e53c262f27d50dd540cb654517d03a",
-    url = "https://github.com/eth-clients/holesky/archive/32a72e21c6e53c262f27d50dd540cb654517d03a.tar.gz",  # 2025-03-17
+    integrity = "sha256-b7ZTT+olF+VXEJYNTV5jggNtCkt9dOejm1i2VE+zy+0=",
+    strip_prefix = "holesky-874c199423ccd180607320c38cbaca05d9a1573a",
+    url = "https://github.com/eth-clients/holesky/archive/874c199423ccd180607320c38cbaca05d9a1573a.tar.gz",  # 2024-06-18
 )

 http_archive(
@@ -381,25 +381,9 @@ filegroup(
    visibility = ["//visibility:public"],
 )
 """,
-    integrity = "sha256-b5F7Wg9LLMqGRIpP2uqb/YsSFVn2ynzlV7g/Nb1EFLk=",
-    strip_prefix = "sepolia-562d9938f08675e9ba490a1dfba21fb05843f39f",
-    url = "https://github.com/eth-clients/sepolia/archive/562d9938f08675e9ba490a1dfba21fb05843f39f.tar.gz",  # 2025-03-17
-)
-
-http_archive(
-    name = "hoodi_testnet",
-    build_file_content = """
-filegroup(
-    name = "configs",
-    srcs = [
-        "metadata/config.yaml",
-    ],
-    visibility = ["//visibility:public"],
-)
-""",
-    integrity = "sha256-dPiEWUd8QvbYGwGtIm0QtCekitVLOLsW5rpQIGzz8PU=",
-    strip_prefix = "hoodi-828c2c940e1141092bd4bb979cef547ea926d272",
-    url = "https://github.com/eth-clients/hoodi/archive/828c2c940e1141092bd4bb979cef547ea926d272.tar.gz",
+    integrity = "sha256-cY/UgpCcYEhQf7JefD65FI8tn/A+rAvKhcm2/qiVdqY=",
+    strip_prefix = "sepolia-f2c219a93c4491cee3d90c18f2f8e82aed850eab",
+    url = "https://github.com/eth-clients/sepolia/archive/f2c219a93c4491cee3d90c18f2f8e82aed850eab.tar.gz",  # 2024-09-19
 )

 http_archive(
@@ -447,7 +431,7 @@ gometalinter_dependencies()

 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

-gazelle_dependencies(go_sdk = "go_sdk")
+gazelle_dependencies()

 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

--- a/api/client/beacon/BUILD.bazel
+++ b/api/client/beacon/BUILD.bazel
@@ -7,7 +7,6 @@ go_library(
        "doc.go",
        "health.go",
        "log.go",
-        "template.go",
    ],
    importpath = "github.com/prysmaticlabs/prysm/v5/api/client/beacon",
    visibility = ["//visibility:public"],
--- a/api/client/beacon/client.go
+++ b/api/client/beacon/client.go
@@ -11,6 +11,7 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"text/template"

 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
@@ -63,6 +64,23 @@ func IdFromSlot(s primitives.Slot) StateOrBlockId {
 	return StateOrBlockId(strconv.FormatUint(uint64(s), 10))
 }

+// idTemplate is used to create template functions that can interpolate StateOrBlockId values.
+func idTemplate(ts string) func(StateOrBlockId) string {
+	t := template.Must(template.New("").Parse(ts))
+	f := func(id StateOrBlockId) string {
+		b := bytes.NewBuffer(nil)
+		err := t.Execute(b, struct{ Id string }{Id: string(id)})
+		if err != nil {
+			panic(fmt.Sprintf("invalid idTemplate: %s", ts))
+		}
+		return b.String()
+	}
+	// run the template to ensure that it is valid
+	// this should happen load time (using package scoped vars) to ensure runtime errors aren't possible
+	_ = f(IdGenesis)
+	return f
+}
+
 // RenderGetBlockPath formats a block id into a path for the GetBlock API endpoint.
 func RenderGetBlockPath(id StateOrBlockId) string {
 	return path.Join(getSignedBlockPath, string(id))
@@ -96,6 +114,8 @@ func (c *Client) GetBlock(ctx context.Context, blockId StateOrBlockId) ([]byte,
 	return b, nil
 }

+var getBlockRootTpl = idTemplate(getBlockRootPath)
+
 // GetBlockRoot retrieves the hash_tree_root of the BeaconBlock for the given block id.
 // Block identifier can be one of: "head" (canonical head in node's view), "genesis", "finalized",
 // <slot>, <hex encoded blockRoot with 0x prefix>. Variables of type StateOrBlockId are exported by this package
@@ -118,6 +138,8 @@ func (c *Client) GetBlockRoot(ctx context.Context, blockId StateOrBlockId) ([32]
 	return bytesutil.ToBytes32(rs), nil
 }

+var getForkTpl = idTemplate(getForkForStatePath)
+
 // GetFork queries the Beacon Node API for the Fork from the state identified by stateId.
 // Block identifier can be one of: "head" (canonical head in node's view), "genesis", "finalized",
 // <slot>, <hex encoded blockRoot with 0x prefix>. Variables of type StateOrBlockId are exported by this package
--- a/api/client/beacon/template.go
+++ b/api/client/beacon/template.go
@@ -1,34 +0,0 @@
-package beacon
-
-import (
-	"bytes"
-	"fmt"
-	"text/template"
-)
-
-type templateFn func(StateOrBlockId) string
-
-var getBlockRootTpl templateFn
-var getForkTpl templateFn
-
-func init() {
-	// idTemplate is used to create template functions that can interpolate StateOrBlockId values.
-	idTemplate := func(ts string) func(StateOrBlockId) string {
-		t := template.Must(template.New("").Parse(ts))
-		f := func(id StateOrBlockId) string {
-			b := bytes.NewBuffer(nil)
-			err := t.Execute(b, struct{ Id string }{Id: string(id)})
-			if err != nil {
-				panic(fmt.Sprintf("invalid idTemplate: %s", ts))
-			}
-			return b.String()
-		}
-		// run the template to ensure that it is valid
-		// this should happen load time (using package scoped vars) to ensure runtime errors aren't possible
-		_ = f(IdGenesis)
-		return f
-	}
-
-	getBlockRootTpl = idTemplate(getBlockRootPath)
-	getForkTpl = idTemplate(getForkForStatePath)
-}
--- a/api/client/builder/BUILD.bazel
+++ b/api/client/builder/BUILD.bazel
@@ -33,7 +33,6 @@ go_library(
        "@com_github_pkg_errors//:go_default_library",
        "@com_github_prysmaticlabs_fastssz//:go_default_library",
        "@com_github_sirupsen_logrus//:go_default_library",
-        "@io_opentelemetry_go_contrib_instrumentation_net_http_otelhttp//:go_default_library",
        "@org_golang_google_protobuf//proto:go_default_library",
    ],
 )
@@ -47,7 +46,6 @@ go_test(
    data = glob(["testdata/**"]),
    embed = [":go_default_library"],
    deps = [
-        "//api:go_default_library",
        "//api/server/structs:go_default_library",
        "//config/fieldparams:go_default_library",
        "//config/params:go_default_library",
--- a/api/client/builder/client.go
+++ b/api/client/builder/client.go
@@ -16,7 +16,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/api"
 	"github.com/prysmaticlabs/prysm/v5/api/client"
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
@@ -26,7 +25,6 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 	log "github.com/sirupsen/logrus"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 )

 const (
@@ -36,14 +34,9 @@ const (
 	postRegisterValidatorPath  = "/eth/v1/builder/validators"
 )

-var (
-	vrExample             = &ethpb.SignedValidatorRegistrationV1{}
-	vrSize                = vrExample.SizeSSZ()
-	errMalformedHostname  = errors.New("hostname must include port, separated by one colon, like example.com:3500")
-	errMalformedRequest   = errors.New("required request data are missing")
-	errNotBlinded         = errors.New("submitted block is not blinded")
-	errVersionUnsupported = errors.New("version is not supported")
-)
+var errMalformedHostname = errors.New("hostname must include port, separated by one colon, like example.com:3500")
+var errMalformedRequest = errors.New("required request data are missing")
+var errNotBlinded = errors.New("submitted block is not blinded")

 // ClientOpt is a functional option for the Client type (http.Client wrapper)
 type ClientOpt func(*Client)
@@ -58,12 +51,6 @@ func WithObserver(m observer) ClientOpt {
 	}
 }

-func WithSSZ() ClientOpt {
-	return func(c *Client) {
-		c.sszEnabled = true
-	}
-}
-
 type requestLogger struct{}

 func (*requestLogger) observe(r *http.Request) (e error) {
@@ -107,10 +94,9 @@ type BuilderClient interface {

 // Client provides a collection of helper methods for calling Builder API endpoints.
 type Client struct {
-	hc         *http.Client
-	baseURL    *url.URL
-	obvs       []observer
-	sszEnabled bool
+	hc      *http.Client
+	baseURL *url.URL
+	obvs    []observer
 }

 // NewClient constructs a new client with the provided options (ex WithTimeout).
@@ -122,7 +108,7 @@ func NewClient(host string, opts ...ClientOpt) (*Client, error) {
 		return nil, err
 	}
 	c := &Client{
-		hc:      &http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)},
+		hc:      &http.Client{},
 		baseURL: u,
 	}
 	for _, o := range opts {
@@ -152,7 +138,7 @@ func (c *Client) NodeURL() string {
 type reqOption func(*http.Request)

 // do is a generic, opinionated request function to reduce boilerplate amongst the methods in this package api/client/builder.
-func (c *Client) do(ctx context.Context, method string, path string, body io.Reader, opts ...reqOption) (res []byte, header http.Header, err error) {
+func (c *Client) do(ctx context.Context, method string, path string, body io.Reader, opts ...reqOption) (res []byte, err error) {
 	ctx, span := trace.StartSpan(ctx, "builder.client.do")
 	defer func() {
 		tracing.AnnotateError(span, err)
@@ -196,7 +182,6 @@ func (c *Client) do(ctx context.Context, method string, path string, body io.Rea
 		err = errors.Wrap(err, "error reading http response body from builder server")
 		return
 	}
-	header = r.Header
 	return
 }

@@ -226,145 +211,64 @@ func (c *Client) GetHeader(ctx context.Context, slot primitives.Slot, parentHash
 	if err != nil {
 		return nil, err
 	}
-	var getOpts reqOption
-	if c.sszEnabled {
-		getOpts = func(r *http.Request) {
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-	} else {
-		getOpts = func(r *http.Request) {
-			r.Header.Set("Accept", api.JsonMediaType)
-		}
-	}
-	data, header, err := c.do(ctx, http.MethodGet, path, nil, getOpts)
+	hb, err := c.do(ctx, http.MethodGet, path, nil)
 	if err != nil {
-		return nil, errors.Wrap(err, "error getting header from builder server")
+		return nil, err
+	}
+	v := &VersionResponse{}
+	if err := json.Unmarshal(hb, v); err != nil {
+		return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 	}

-	bid, err := c.parseHeaderResponse(data, header)
+	ver, err := version.FromString(strings.ToLower(v.Version))
 	if err != nil {
-		return nil, errors.Wrapf(
-			err,
-			"error rendering exec header template with slot=%d, parentHash=%#x, pubkey=%#x",
-			slot,
-			parentHash,
-			pubkey,
-		)
+		return nil, errors.Wrap(err, fmt.Sprintf("unsupported header version %s", strings.ToLower(v.Version)))
 	}
-	return bid, nil
-}
-
-func (c *Client) parseHeaderResponse(data []byte, header http.Header) (SignedBid, error) {
-	var versionHeader string
-	if c.sszEnabled || header.Get(api.VersionHeader) != "" {
-		versionHeader = header.Get(api.VersionHeader)
-	} else {
-		// If we don't have a version header, attempt to parse JSON for version
-		v := &VersionResponse{}
-		if err := json.Unmarshal(data, v); err != nil {
-			return nil, errors.Wrap(
-				err,
-				"error unmarshaling builder GetHeader response",
-			)
-		}
-		versionHeader = strings.ToLower(v.Version)
-	}
-
-	ver, err := version.FromString(versionHeader)
-	if err != nil {
-		return nil, errors.Wrap(err, fmt.Sprintf("unsupported header version %s", versionHeader))
-	}
-
 	if ver >= version.Electra {
-		return c.parseHeaderElectra(data)
+		hr := &ExecHeaderResponseElectra{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
+		}
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrapf(err, "could not extract proto message from header")
+		}
+		return WrappedSignedBuilderBidElectra(p)
 	}
 	if ver >= version.Deneb {
-		return c.parseHeaderDeneb(data)
+		hr := &ExecHeaderResponseDeneb{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
+		}
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrapf(err, "could not extract proto message from header")
+		}
+		return WrappedSignedBuilderBidDeneb(p)
 	}
 	if ver >= version.Capella {
-		return c.parseHeaderCapella(data)
+		hr := &ExecHeaderResponseCapella{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
+		}
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrapf(err, "could not extract proto message from header")
+		}
+		return WrappedSignedBuilderBidCapella(p)
 	}
 	if ver >= version.Bellatrix {
-		return c.parseHeaderBellatrix(data)
-	}
-
-	return nil, fmt.Errorf("unsupported header version %s", versionHeader)
-}
-
-func (c *Client) parseHeaderElectra(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidElectra{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidElectra SSZ")
+		hr := &ExecHeaderResponse{}
+		if err := json.Unmarshal(hb, hr); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshaling the builder GetHeader response, using slot=%d, parentHash=%#x, pubkey=%#x", slot, parentHash, pubkey)
 		}
-		return WrappedSignedBuilderBidElectra(sb)
-	}
-	hr := &ExecHeaderResponseElectra{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseElectra JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseElectra to proto")
-	}
-	return WrappedSignedBuilderBidElectra(p)
-}
-
-func (c *Client) parseHeaderDeneb(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidDeneb{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidDeneb SSZ")
+		p, err := hr.ToProto()
+		if err != nil {
+			return nil, errors.Wrap(err, "could not extract proto message from header")
 		}
-		return WrappedSignedBuilderBidDeneb(sb)
+		return WrappedSignedBuilderBid(p)
 	}
-	hr := &ExecHeaderResponseDeneb{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseDeneb JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseDeneb to proto")
-	}
-	return WrappedSignedBuilderBidDeneb(p)
-}
-
-func (c *Client) parseHeaderCapella(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBidCapella{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBidCapella SSZ")
-		}
-		return WrappedSignedBuilderBidCapella(sb)
-	}
-	hr := &ExecHeaderResponseCapella{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponseCapella JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponseCapella to proto")
-	}
-	return WrappedSignedBuilderBidCapella(p)
-}
-
-func (c *Client) parseHeaderBellatrix(data []byte) (SignedBid, error) {
-	if c.sszEnabled {
-		sb := &ethpb.SignedBuilderBid{}
-		if err := sb.UnmarshalSSZ(data); err != nil {
-			return nil, errors.Wrap(err, "could not unmarshal SignedBuilderBid SSZ")
-		}
-		return WrappedSignedBuilderBid(sb)
-	}
-	hr := &ExecHeaderResponse{}
-	if err := json.Unmarshal(data, hr); err != nil {
-		return nil, errors.Wrap(err, "could not unmarshal ExecHeaderResponse JSON")
-	}
-	p, err := hr.ToProto()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert ExecHeaderResponse to proto")
-	}
-	return WrappedSignedBuilderBid(p)
+	return nil, fmt.Errorf("unsupported header version %s", strings.ToLower(v.Version))
 }

 // RegisterValidator encodes the SignedValidatorRegistrationV1 message to json (including hex-encoding the byte
@@ -379,243 +283,70 @@ func (c *Client) RegisterValidator(ctx context.Context, svr []*ethpb.SignedValid
 		tracing.AnnotateError(span, err)
 		return err
 	}
-
-	var (
-		body     []byte
-		err      error
-		postOpts reqOption
-	)
-	if c.sszEnabled {
-		postOpts = func(r *http.Request) {
-			r.Header.Set("Content-Type", api.OctetStreamMediaType)
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-		body, err = sszValidatorRegisterRequest(svr)
-		if err != nil {
-			err := errors.Wrap(err, "error ssz encoding the SignedValidatorRegistration value body in RegisterValidator")
-			tracing.AnnotateError(span, err)
-			return err
-		}
-	} else {
-		postOpts = func(r *http.Request) {
-			r.Header.Set("Content-Type", api.JsonMediaType)
-			r.Header.Set("Accept", api.JsonMediaType)
-		}
-		body, err = jsonValidatorRegisterRequest(svr)
-		if err != nil {
-			err := errors.Wrap(err, "error json encoding the SignedValidatorRegistration value body in RegisterValidator")
-			tracing.AnnotateError(span, err)
-			return err
-		}
-	}
-
-	if _, _, err = c.do(ctx, http.MethodPost, postRegisterValidatorPath, bytes.NewBuffer(body), postOpts); err != nil {
-		return errors.Wrap(err, "do")
-	}
-	log.WithField("registrationCount", len(svr)).Debug("Successfully registered validator(s) on builder")
-	return nil
-}
-
-func jsonValidatorRegisterRequest(svr []*ethpb.SignedValidatorRegistrationV1) ([]byte, error) {
 	vs := make([]*structs.SignedValidatorRegistration, len(svr))
 	for i := 0; i < len(svr); i++ {
 		vs[i] = structs.SignedValidatorRegistrationFromConsensus(svr[i])
 	}
 	body, err := json.Marshal(vs)
 	if err != nil {
-		return nil, err
+		err := errors.Wrap(err, "error encoding the SignedValidatorRegistration value body in RegisterValidator")
+		tracing.AnnotateError(span, err)
+		return err
 	}
-	return body, nil
-}

-func sszValidatorRegisterRequest(svr []*ethpb.SignedValidatorRegistrationV1) ([]byte, error) {
-	if uint64(len(svr)) > params.BeaconConfig().ValidatorRegistryLimit {
-		return nil, errors.Wrap(errMalformedRequest, "validator registry limit exceeded")
+	_, err = c.do(ctx, http.MethodPost, postRegisterValidatorPath, bytes.NewBuffer(body))
+	if err != nil {
+		return err
 	}
-	ssz := make([]byte, vrSize*len(svr))
-	for i, vr := range svr {
-		sszrep, err := vr.MarshalSSZ()
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to marshal validator registry ssz")
-		}
-		copy(ssz[i*vrSize:(i+1)*vrSize], sszrep)
-	}
-	return ssz, nil
+	log.WithField("registrationCount", len(svr)).Debug("Successfully registered validator(s) on builder")
+	return nil
 }

 var errResponseVersionMismatch = errors.New("builder API response uses a different version than requested in " + api.VersionHeader + " header")

-func getVersionsBlockToPayload(blockVersion int) (int, error) {
-	if blockVersion >= version.Deneb {
-		return version.Deneb, nil
-	}
-	if blockVersion == version.Capella {
-		return version.Capella, nil
-	}
-	if blockVersion == version.Bellatrix {
-		return version.Bellatrix, nil
-	}
-	return 0, errors.Wrapf(errVersionUnsupported, "block version %d", blockVersion)
-}
-
 // SubmitBlindedBlock calls the builder API endpoint that binds the validator to the builder and submits the block.
 // The response is the full execution payload used to create the blinded block.
 func (c *Client) SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	body, postOpts, err := c.buildBlindedBlockRequest(sb)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// post the blinded block - the execution payload response should contain the unblinded payload, along with the
-	// blobs bundle if it is post deneb.
-	data, header, err := c.do(ctx, http.MethodPost, postBlindedBeaconBlockPath, bytes.NewBuffer(body), postOpts)
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "error posting the blinded block to the builder api")
-	}
-
-	ver, err := c.checkBlockVersion(data, header)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	expectedPayloadVer, err := getVersionsBlockToPayload(sb.Version())
-	if err != nil {
-		return nil, nil, err
-	}
-	gotPayloadVer, err := getVersionsBlockToPayload(ver)
-	if err != nil {
-		return nil, nil, err
-	}
-	if expectedPayloadVer != gotPayloadVer {
-		return nil, nil, errors.Wrapf(errResponseVersionMismatch, "expected payload version %d, got %d", expectedPayloadVer, gotPayloadVer)
-	}
-
-	ed, blobs, err := c.parseBlindedBlockResponse(data, ver)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ed, blobs, nil
-}
-
-func (c *Client) checkBlockVersion(respBytes []byte, header http.Header) (int, error) {
-	var versionHeader string
-	if c.sszEnabled {
-		versionHeader = strings.ToLower(header.Get(api.VersionHeader))
-	} else {
-		// fallback to JSON-based version extraction
-		v := &VersionResponse{}
-		if err := json.Unmarshal(respBytes, v); err != nil {
-			return 0, errors.Wrapf(err, "error unmarshaling JSON version fallback")
-		}
-		versionHeader = strings.ToLower(v.Version)
-	}
-
-	ver, err := version.FromString(versionHeader)
-	if err != nil {
-		return 0, errors.Wrapf(err, "unsupported header version %s", versionHeader)
-	}
-
-	return ver, nil
-}
-
-// Helper: build request body for SubmitBlindedBlock
-func (c *Client) buildBlindedBlockRequest(sb interfaces.ReadOnlySignedBeaconBlock) ([]byte, reqOption, error) {
 	if !sb.IsBlinded() {
 		return nil, nil, errNotBlinded
 	}

-	if c.sszEnabled {
-		body, err := sb.MarshalSSZ()
-		if err != nil {
-			return nil, nil, errors.Wrap(err, "could not marshal SSZ for blinded block")
-		}
-		opt := func(r *http.Request) {
-			r.Header.Set(api.VersionHeader, version.String(sb.Version()))
-			r.Header.Set("Content-Type", api.OctetStreamMediaType)
-			r.Header.Set("Accept", api.OctetStreamMediaType)
-		}
-		return body, opt, nil
-	}
-
+	// massage the proto struct type data into the api response type.
 	mj, err := structs.SignedBeaconBlockMessageJsoner(sb)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "error generating blinded beacon block post request")
 	}
+
 	body, err := json.Marshal(mj)
 	if err != nil {
-		return nil, nil, errors.Wrap(err, "error marshaling blinded block to JSON")
+		return nil, nil, errors.Wrap(err, "error marshaling blinded block post request to json")
 	}
-	opt := func(r *http.Request) {
-		r.Header.Set(api.VersionHeader, version.String(sb.Version()))
+	postOpts := func(r *http.Request) {
+		r.Header.Add("Eth-Consensus-Version", version.String(sb.Version()))
 		r.Header.Set("Content-Type", api.JsonMediaType)
 		r.Header.Set("Accept", api.JsonMediaType)
 	}
-	return body, opt, nil
-}
-
-// Helper: parse the response returned by SubmitBlindedBlock
-func (c *Client) parseBlindedBlockResponse(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	if c.sszEnabled {
-		return c.parseBlindedBlockResponseSSZ(respBytes, forkVersion)
+	// post the blinded block - the execution payload response should contain the unblinded payload, along with the
+	// blobs bundle if it is post deneb.
+	rb, err := c.do(ctx, http.MethodPost, postBlindedBeaconBlockPath, bytes.NewBuffer(body), postOpts)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "error posting the blinded block to the builder api")
 	}
-	return c.parseBlindedBlockResponseJSON(respBytes, forkVersion)
-}
-
-func (c *Client) parseBlindedBlockResponseSSZ(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
-	if forkVersion >= version.Deneb {
-		payloadAndBlobs := &v1.ExecutionPayloadDenebAndBlobsBundle{}
-		if err := payloadAndBlobs.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayloadDenebAndBlobsBundle SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payloadAndBlobs.Payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, payloadAndBlobs.BlobsBundle, nil
-	} else if forkVersion >= version.Capella {
-		payload := &v1.ExecutionPayloadCapella{}
-		if err := payload.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayloadCapella SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, nil, nil
-	} else if forkVersion >= version.Bellatrix {
-		payload := &v1.ExecutionPayload{}
-		if err := payload.UnmarshalSSZ(respBytes); err != nil {
-			return nil, nil, errors.Wrap(err, "unable to unmarshal ExecutionPayload SSZ")
-		}
-		ed, err := blocks.NewWrappedExecutionData(payload)
-		if err != nil {
-			return nil, nil, errors.Wrapf(err, "unable to wrap execution data for %s", version.String(forkVersion))
-		}
-		return ed, nil, nil
-	} else {
-		return nil, nil, fmt.Errorf("unsupported header version %s", version.String(forkVersion))
-	}
-}
-
-func (c *Client) parseBlindedBlockResponseJSON(
-	respBytes []byte,
-	forkVersion int,
-) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+	// ExecutionPayloadResponse parses just the outer container and the Value key, enabling it to use the .Value
+	// key to determine which underlying data type to use to finish the unmarshaling.
 	ep := &ExecutionPayloadResponse{}
-	if err := json.Unmarshal(respBytes, ep); err != nil {
-		return nil, nil, errors.Wrap(err, "error unmarshaling ExecutionPayloadResponse")
+	if err := json.Unmarshal(rb, ep); err != nil {
+		return nil, nil, errors.Wrap(err, "error unmarshaling the builder ExecutionPayloadResponse")
 	}
+	if strings.ToLower(ep.Version) != version.String(sb.Version()) {
+		return nil, nil, errors.Wrapf(errResponseVersionMismatch, "req=%s, recv=%s", strings.ToLower(ep.Version), version.String(sb.Version()))
+	}
+	// This parses the rest of the response and returns the inner data field.
 	pp, err := ep.ParsePayload()
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed to parse payload with version=%s", ep.Version)
+		return nil, nil, errors.Wrapf(err, "failed to parse execution payload from builder with version=%s", ep.Version)
 	}
+	// Get the payload as a proto.Message so it can be wrapped as an execution payload interface.
 	pb, err := pp.PayloadProto()
 	if err != nil {
 		return nil, nil, err
@@ -624,13 +355,11 @@ func (c *Client) parseBlindedBlockResponseJSON(
 	if err != nil {
 		return nil, nil, err
 	}
-
-	// Check if it contains blobs
 	bb, ok := pp.(BlobBundler)
 	if ok {
 		bbpb, err := bb.BundleProto()
 		if err != nil {
-			return nil, nil, errors.Wrapf(err, "failed to extract blobs bundle from version=%s", ep.Version)
+			return nil, nil, errors.Wrapf(err, "failed to extract blobs bundle from builder response with version=%s", ep.Version)
 		}
 		return ed, bbpb, nil
 	}
@@ -641,10 +370,7 @@ func (c *Client) parseBlindedBlockResponseJSON(
 // response, and an error response may have an error message. This method will return a nil value for error in the
 // happy path, and an error with information about the server response body for a non-200 response.
 func (c *Client) Status(ctx context.Context) error {
-	getOpts := func(r *http.Request) {
-		r.Header.Set("Accept", api.JsonMediaType)
-	}
-	_, _, err := c.do(ctx, http.MethodGet, getStatus, nil, getOpts)
+	_, err := c.do(ctx, http.MethodGet, getStatus, nil)
 	return err
 }

@@ -659,18 +385,6 @@ func non200Err(response *http.Response) error {
 	}
 	msg := fmt.Sprintf("code=%d, url=%s, body=%s", response.StatusCode, response.Request.URL, body)
 	switch response.StatusCode {
-	case http.StatusUnsupportedMediaType:
-		log.WithError(ErrUnsupportedMediaType).Debug(msg)
-		if jsonErr := json.Unmarshal(bodyBytes, &errMessage); jsonErr != nil {
-			return errors.Wrap(jsonErr, "unable to read response body")
-		}
-		return errors.Wrap(ErrUnsupportedMediaType, errMessage.Message)
-	case http.StatusNotAcceptable:
-		log.WithError(ErrNotAcceptable).Debug(msg)
-		if jsonErr := json.Unmarshal(bodyBytes, &errMessage); jsonErr != nil {
-			return errors.Wrap(jsonErr, "unable to read response body")
-		}
-		return errors.Wrap(ErrNotAcceptable, errMessage.Message)
 	case http.StatusNoContent:
 		log.WithError(ErrNoContent).Debug(msg)
 		return ErrNoContent
--- a/api/client/builder/client_test.go
+++ b/api/client/builder/client_test.go
@@ -8,10 +8,10 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strconv"
 	"testing"

 	"github.com/prysmaticlabs/go-bitfield"
-	"github.com/prysmaticlabs/prysm/v5/api"
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
@@ -87,84 +87,37 @@ func TestClient_RegisterValidator(t *testing.T) {
 	ctx := context.Background()
 	expectedBody := `[{"message":{"fee_recipient":"0x0000000000000000000000000000000000000000","gas_limit":"23","timestamp":"42","pubkey":"0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"},"signature":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"}]`
 	expectedPath := "/eth/v1/builder/validators"
-	t.Run("JSON success", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
-				body, err := io.ReadAll(r.Body)
-				defer func() {
-					require.NoError(t, r.Body.Close())
-				}()
-				require.NoError(t, err)
-				require.Equal(t, expectedBody, string(body))
-				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, http.MethodPost, r.Method)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBuffer(nil)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:      hc,
-			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
-		}
-		reg := &eth.SignedValidatorRegistrationV1{
-			Message: &eth.ValidatorRegistrationV1{
-				FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
-				GasLimit:     23,
-				Timestamp:    42,
-				Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-			},
-			Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-		}
-		require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
-	})
-	t.Run("SSZ success", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				body, err := io.ReadAll(r.Body)
-				defer func() {
-					require.NoError(t, r.Body.Close())
-				}()
-				require.NoError(t, err)
-				request := &eth.SignedValidatorRegistrationV1{}
-				itemBytes := body[:request.SizeSSZ()]
-				require.NoError(t, request.UnmarshalSSZ(itemBytes))
-				jsRequest := structs.SignedValidatorRegistrationFromConsensus(request)
-				js, err := json.Marshal([]*structs.SignedValidatorRegistration{jsRequest})
-				require.NoError(t, err)
-
-				require.Equal(t, expectedBody, string(js))
-				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, http.MethodPost, r.Method)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBuffer(nil)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		reg := &eth.SignedValidatorRegistrationV1{
-			Message: &eth.ValidatorRegistrationV1{
-				FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
-				GasLimit:     23,
-				Timestamp:    42,
-				Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-			},
-			Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-		}
-		require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
-	})
+	hc := &http.Client{
+		Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
+			body, err := io.ReadAll(r.Body)
+			defer func() {
+				require.NoError(t, r.Body.Close())
+			}()
+			require.NoError(t, err)
+			require.Equal(t, expectedBody, string(body))
+			require.Equal(t, expectedPath, r.URL.Path)
+			require.Equal(t, http.MethodPost, r.Method)
+			return &http.Response{
+				StatusCode: http.StatusOK,
+				Body:       io.NopCloser(bytes.NewBuffer(nil)),
+				Request:    r.Clone(ctx),
+			}, nil
+		}),
+	}
+	c := &Client{
+		hc:      hc,
+		baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
+	}
+	reg := &eth.SignedValidatorRegistrationV1{
+		Message: &eth.ValidatorRegistrationV1{
+			FeeRecipient: ezDecode(t, params.BeaconConfig().EthBurnAddressHex),
+			GasLimit:     23,
+			Timestamp:    42,
+			Pubkey:       ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
+		},
+		Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
+	}
+	require.NoError(t, c.RegisterValidator(ctx, []*eth.SignedValidatorRegistrationV1{reg}))
 }

 func TestClient_GetHeader(t *testing.T) {
@@ -220,7 +173,6 @@ func TestClient_GetHeader(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, expectedPath, r.URL.Path)
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleHeaderResponse)),
@@ -252,56 +204,9 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
 		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
 	})
-	t.Run("bellatrix ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponse), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "bellatrix")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedSig := ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505")
-		require.Equal(t, true, bytes.Equal(expectedSig, h.Signature()))
-		expectedTxRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.TransactionsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedTxRoot, withdrawalsRoot))
-		require.Equal(t, uint64(1), bidHeader.GasUsed())
-		// this matches the value in the testExampleHeaderResponse
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-	})
 	t.Run("capella", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				require.Equal(t, expectedPath, r.URL.Path)
 				return &http.Response{
 					StatusCode: http.StatusOK,
@@ -330,52 +235,9 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
 		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
 	})
-	t.Run("capella ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseCapella{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseCapella), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "capella")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-	})
 	t.Run("deneb", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				require.Equal(t, expectedPath, r.URL.Path)
 				return &http.Response{
 					StatusCode: http.StatusOK,
@@ -412,56 +274,6 @@ func TestClient_GetHeader(t *testing.T) {
 			require.Equal(t, len(kcgCommitments[i]) == 48, true)
 		}
 	})
-	t.Run("deneb ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseDeneb), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "deneb")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		dbid, ok := bid.(builderBidDeneb)
-		require.Equal(t, true, ok)
-		kcgCommitments := dbid.BlobKzgCommitments()
-		require.Equal(t, len(kcgCommitments) > 0, true)
-		for i := range kcgCommitments {
-			require.Equal(t, len(kcgCommitments[i]) == 48, true)
-		}
-	})
 	t.Run("deneb, too many kzg commitments", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
@@ -478,12 +290,11 @@ func TestClient_GetHeader(t *testing.T) {
 			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
 		}
 		_, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.ErrorContains(t, "could not convert ExecHeaderResponseDeneb to proto: too many blob commitments: 7", err)
+		require.ErrorContains(t, "could not extract proto message from header: too many blob commitments: 7", err)
 	})
 	t.Run("electra", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
 				require.Equal(t, expectedPath, r.URL.Path)
 				return &http.Response{
 					StatusCode: http.StatusOK,
@@ -524,61 +335,6 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, 1, len(requests.Withdrawals))
 		require.Equal(t, 1, len(requests.Consolidations))

-	})
-	t.Run("electra ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				require.Equal(t, expectedPath, r.URL.Path)
-				epr := &ExecHeaderResponseElectra{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleHeaderResponseElectra), epr))
-				pro, err := epr.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "electra")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		h, err := c.GetHeader(ctx, slot, bytesutil.ToBytes32(parentHash), bytesutil.ToBytes48(pubkey))
-		require.NoError(t, err)
-		expectedWithdrawalsRoot := ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-		bid, err := h.Message()
-		require.NoError(t, err)
-		bidHeader, err := bid.Header()
-		require.NoError(t, err)
-		withdrawalsRoot, err := bidHeader.WithdrawalsRoot()
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(expectedWithdrawalsRoot, withdrawalsRoot))
-
-		bidStr := "652312848583266388373324160190187140051835877600158453279131187530910662656"
-		value, err := stringToUint256(bidStr)
-		require.NoError(t, err)
-		require.Equal(t, 0, value.Int.Cmp(primitives.WeiToBigInt(bid.Value())))
-		require.Equal(t, bidStr, primitives.WeiToBigInt(bid.Value()).String())
-		ebid, ok := bid.(builderBidElectra)
-		require.Equal(t, true, ok)
-		kcgCommitments := ebid.BlobKzgCommitments()
-		require.Equal(t, len(kcgCommitments) > 0, true)
-		for i := range kcgCommitments {
-			require.Equal(t, len(kcgCommitments[i]) == 48, true)
-		}
-		requests := ebid.ExecutionRequests()
-		require.Equal(t, 1, len(requests.Deposits))
-		require.Equal(t, 1, len(requests.Withdrawals))
-		require.Equal(t, 1, len(requests.Consolidations))
-
 	})
 	t.Run("unsupported version", func(t *testing.T) {
 		hc := &http.Client{
@@ -608,8 +364,8 @@ func TestSubmitBlindedBlock(t *testing.T) {
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
 				require.Equal(t, "bellatrix", r.Header.Get("Eth-Consensus-Version"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayload)),
@@ -631,53 +387,13 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		require.Equal(t, fmt.Sprintf("%#x", bfpg.SSZBytes()), fmt.Sprintf("%#x", ep.BaseFeePerGas()))
 		require.Equal(t, uint64(1), ep.GasLimit())
 	})
-	t.Run("bellatrix ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "bellatrix", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecutionPayloadResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayload), epr))
-				ep := &ExecutionPayload{}
-				require.NoError(t, json.Unmarshal(epr.Data, ep))
-				pro, err := ep.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "bellatrix")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbbb, err := blocks.NewSignedBeaconBlock(testSignedBlindedBeaconBlockBellatrix(t))
-		require.NoError(t, err)
-		ep, _, err := c.SubmitBlindedBlock(ctx, sbbb)
-		require.NoError(t, err)
-		require.Equal(t, true, bytes.Equal(ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), ep.ParentHash()))
-		bfpg, err := stringToUint256("452312848583266388373324160190187140051835877600158453279131187530910662656")
-		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf("%#x", bfpg.SSZBytes()), fmt.Sprintf("%#x", ep.BaseFeePerGas()))
-		require.Equal(t, uint64(1), ep.GasLimit())
-	})
 	t.Run("capella", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "capella", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "capella", r.Header.Get("Eth-Consensus-Version"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				return &http.Response{
 					StatusCode: http.StatusOK,
 					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayloadCapella)),
@@ -701,56 +417,14 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
 		assert.Equal(t, uint64(1), withdrawals[0].Amount)
 	})
-	t.Run("capella ssz", func(t *testing.T) {
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "capella", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecutionPayloadResponse{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadCapella), epr))
-				ep := &ExecutionPayloadCapella{}
-				require.NoError(t, json.Unmarshal(epr.Data, ep))
-				pro, err := ep.ToProto()
-				require.NoError(t, err)
-				ssz, err := pro.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "capella")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(testSignedBlindedBeaconBlockCapella(t))
-		require.NoError(t, err)
-		ep, _, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-	})
 	t.Run("deneb", func(t *testing.T) {
 		test := testSignedBlindedBeaconBlockDeneb(t)
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
 				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "deneb", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
+				require.Equal(t, "deneb", r.Header.Get("Eth-Consensus-Version"))
+				require.Equal(t, "application/json", r.Header.Get("Content-Type"))
+				require.Equal(t, "application/json", r.Header.Get("Accept"))
 				var req structs.SignedBlindedBeaconBlockDeneb
 				err := json.NewDecoder(r.Body).Decode(&req)
 				require.NoError(t, err)
@@ -783,140 +457,6 @@ func TestSubmitBlindedBlock(t *testing.T) {
 		assert.Equal(t, uint64(1), withdrawals[0].Amount)
 		require.NotNil(t, blobBundle)
 	})
-	t.Run("deneb ssz", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockDeneb(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "deneb", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecPayloadResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadDeneb), epr))
-				pro, blob, err := epr.ToProto()
-				require.NoError(t, err)
-				combined := &v1.ExecutionPayloadDenebAndBlobsBundle{
-					Payload:     pro,
-					BlobsBundle: blob,
-				}
-				ssz, err := combined.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "deneb")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
-	t.Run("electra", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockElectra(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "electra", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.JsonMediaType, r.Header.Get("Accept"))
-				var req structs.SignedBlindedBeaconBlockElectra
-				err := json.NewDecoder(r.Body).Decode(&req)
-				require.NoError(t, err)
-				block, err := req.ToConsensus()
-				require.NoError(t, err)
-				require.DeepEqual(t, block, test)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       io.NopCloser(bytes.NewBufferString(testExampleExecutionPayloadDeneb)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:      hc,
-			baseURL: &url.URL{Host: "localhost:3500", Scheme: "http"},
-		}
-
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
-	t.Run("electra ssz", func(t *testing.T) {
-		test := testSignedBlindedBeaconBlockElectra(t)
-		hc := &http.Client{
-			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
-				require.Equal(t, postBlindedBeaconBlockPath, r.URL.Path)
-				require.Equal(t, "electra", r.Header.Get(api.VersionHeader))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Content-Type"))
-				require.Equal(t, api.OctetStreamMediaType, r.Header.Get("Accept"))
-				epr := &ExecPayloadResponseDeneb{}
-				require.NoError(t, json.Unmarshal([]byte(testExampleExecutionPayloadDeneb), epr))
-				pro, blob, err := epr.ToProto()
-				require.NoError(t, err)
-				combined := &v1.ExecutionPayloadDenebAndBlobsBundle{
-					Payload:     pro,
-					BlobsBundle: blob,
-				}
-				ssz, err := combined.MarshalSSZ()
-				require.NoError(t, err)
-				header := http.Header{}
-				header.Set(api.VersionHeader, "electra")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Header:     header,
-					Body:       io.NopCloser(bytes.NewBuffer(ssz)),
-					Request:    r.Clone(ctx),
-				}, nil
-			}),
-		}
-		c := &Client{
-			hc:         hc,
-			baseURL:    &url.URL{Host: "localhost:3500", Scheme: "http"},
-			sszEnabled: true,
-		}
-		sbb, err := blocks.NewSignedBeaconBlock(test)
-		require.NoError(t, err)
-
-		ep, blobBundle, err := c.SubmitBlindedBlock(ctx, sbb)
-		require.NoError(t, err)
-		withdrawals, err := ep.Withdrawals()
-		require.NoError(t, err)
-		require.Equal(t, 1, len(withdrawals))
-		assert.Equal(t, uint64(1), withdrawals[0].Index)
-		assert.Equal(t, primitives.ValidatorIndex(1), withdrawals[0].ValidatorIndex)
-		assert.DeepEqual(t, ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943"), withdrawals[0].Address)
-		assert.Equal(t, uint64(1), withdrawals[0].Amount)
-		require.NotNil(t, blobBundle)
-	})
 	t.Run("mismatched versions, expected bellatrix got capella", func(t *testing.T) {
 		hc := &http.Client{
 			Transport: roundtrip(func(r *http.Request) (*http.Response, error) {
@@ -1043,13 +583,7 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1068,8 +602,8 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 					},
 				},
 				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      make(bitfield.Bitvector512, 64),
+					SyncCommitteeSignature: make([]byte, 48),
+					SyncCommitteeBits:      bitfield.Bitvector512{0x01},
 				},
 				ExecutionPayloadHeader: &v1.ExecutionPayloadHeader{
 					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1083,7 +617,7 @@ func testSignedBlindedBeaconBlockBellatrix(t *testing.T) *eth.SignedBlindedBeaco
 					GasUsed:          1,
 					Timestamp:        1,
 					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    ezDecode(t, "0x4523128485832663883733241601901871400518358776001584532791311875"),
+					BaseFeePerGas:    []byte(strconv.FormatUint(1, 10)),
 					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 				},
@@ -1191,13 +725,7 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1216,8 +744,8 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 					},
 				},
 				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      make(bitfield.Bitvector512, 64),
+					SyncCommitteeSignature: make([]byte, 48),
+					SyncCommitteeBits:      bitfield.Bitvector512{0x01},
 				},
 				ExecutionPayloadHeader: &v1.ExecutionPayloadHeaderCapella{
 					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1231,7 +759,7 @@ func testSignedBlindedBeaconBlockCapella(t *testing.T) *eth.SignedBlindedBeaconB
 					GasUsed:          1,
 					Timestamp:        1,
 					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    ezDecode(t, "0x4523128485832663883733241601901871400518358776001584532791311875"),
+					BaseFeePerGas:    []byte(strconv.FormatUint(1, 10)),
 					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
 					WithdrawalsRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1344,13 +872,7 @@ func testSignedBlindedBeaconBlockDeneb(t *testing.T) *eth.SignedBlindedBeaconBlo
 				},
 				Deposits: []*eth.Deposit{
 					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
+						Proof: [][]byte{ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")},
 						Data: &eth.Deposit_Data{
 							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
 							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
@@ -1397,163 +919,6 @@ func testSignedBlindedBeaconBlockDeneb(t *testing.T) *eth.SignedBlindedBeaconBlo
 	}
 }

-func testSignedBlindedBeaconBlockElectra(t *testing.T) *eth.SignedBlindedBeaconBlockElectra {
-	basebytes, err := bytesutil.Uint256ToSSZBytes("14074904626401341155369551180448584754667373453244490859944217516317499064576")
-	if err != nil {
-		log.Error(err)
-	}
-	return &eth.SignedBlindedBeaconBlockElectra{
-		Message: &eth.BlindedBeaconBlockElectra{
-			Slot:          1,
-			ProposerIndex: 1,
-			ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-			StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-			Body: &eth.BlindedBeaconBlockBodyElectra{
-				RandaoReveal: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-				Eth1Data: &eth.Eth1Data{
-					DepositRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					DepositCount: 1,
-					BlockHash:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-				},
-				Graffiti: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-				ProposerSlashings: []*eth.ProposerSlashing{
-					{
-						Header_1: &eth.SignedBeaconBlockHeader{
-							Header: &eth.BeaconBlockHeader{
-								Slot:          1,
-								ProposerIndex: 1,
-								ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								BodyRoot:      ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-						Header_2: &eth.SignedBeaconBlockHeader{
-							Header: &eth.BeaconBlockHeader{
-								Slot:          1,
-								ProposerIndex: 1,
-								ParentRoot:    ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								StateRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								BodyRoot:      ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				AttesterSlashings: []*eth.AttesterSlashingElectra{
-					{
-						Attestation_1: &eth.IndexedAttestationElectra{
-							AttestingIndices: []uint64{1},
-							Data: &eth.AttestationData{
-								Slot:            1,
-								CommitteeIndex:  1,
-								BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								Source: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-								Target: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-						Attestation_2: &eth.IndexedAttestationElectra{
-							AttestingIndices: []uint64{1},
-							Data: &eth.AttestationData{
-								Slot:            1,
-								CommitteeIndex:  1,
-								BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								Source: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-								Target: &eth.Checkpoint{
-									Epoch: 1,
-									Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-								},
-							},
-							Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				Attestations: []*eth.AttestationElectra{
-					{
-						AggregationBits: bitfield.Bitlist{0x01},
-						Data: &eth.AttestationData{
-							Slot:            1,
-							CommitteeIndex:  1,
-							BeaconBlockRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							Source: &eth.Checkpoint{
-								Epoch: 1,
-								Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-							Target: &eth.Checkpoint{
-								Epoch: 1,
-								Root:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							},
-						},
-						CommitteeBits: make(bitfield.Bitvector64, 8),
-						Signature:     ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-					},
-				},
-				Deposits: []*eth.Deposit{
-					{
-						Proof: func() [][]byte {
-							b := make([][]byte, 33)
-							for i := range b {
-								b[i] = ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-							}
-							return b
-						}(),
-						Data: &eth.Deposit_Data{
-							PublicKey:             ezDecode(t, "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a"),
-							WithdrawalCredentials: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-							Amount:                1,
-							Signature:             ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-						},
-					},
-				},
-				VoluntaryExits: []*eth.SignedVoluntaryExit{
-					{
-						Exit: &eth.VoluntaryExit{
-							Epoch:          1,
-							ValidatorIndex: 1,
-						},
-						Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-					},
-				},
-				SyncAggregate: &eth.SyncAggregate{
-					SyncCommitteeSignature: make([]byte, 96),
-					SyncCommitteeBits:      ezDecode(t, "0x6451e9f951ebf05edc01de67e593484b672877054f055903ff0df1a1a945cf30ca26bb4d4b154f94a1bc776bcf5d0efb3603e1f9b8ee2499ccdcfe2a18cef458"),
-				},
-				ExecutionRequests: &v1.ExecutionRequests{},
-				ExecutionPayloadHeader: &v1.ExecutionPayloadHeaderDeneb{
-					ParentHash:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					FeeRecipient:     ezDecode(t, "0xabcf8e0d4e9587369b2301d0790347320302cc09"),
-					StateRoot:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					ReceiptsRoot:     ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					LogsBloom:        ezDecode(t, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
-					PrevRandao:       ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BlockNumber:      1,
-					GasLimit:         1,
-					GasUsed:          1,
-					Timestamp:        1,
-					ExtraData:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BaseFeePerGas:    basebytes,
-					BlockHash:        ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					TransactionsRoot: ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					WithdrawalsRoot:  ezDecode(t, "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"),
-					BlobGasUsed:      1,
-					ExcessBlobGas:    2,
-				},
-			},
-		},
-		Signature: ezDecode(t, "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"),
-	}
-}
-
 func TestRequestLogger(t *testing.T) {
 	wo := WithObserver(&requestLogger{})
 	c, err := NewClient("localhost:3500", wo)
--- a/api/client/builder/errors.go
+++ b/api/client/builder/errors.go
@@ -15,9 +15,3 @@ var ErrBadRequest = errors.Wrap(ErrNotOK, "recv 400 BadRequest response from API
 // ErrNoContent specifically means that a '204 - No Content' response was received from the API.
 // Typically, a 204 is a success but in this case for the Header API means No header is available
 var ErrNoContent = errors.New("recv 204 no content response from API, No header is available")
-
-// ErrUnsupportedMediaType specifically means that a '415 - Unsupported Media Type' was received from the API.
-var ErrUnsupportedMediaType = errors.Wrap(ErrNotOK, "The media type in \"Content-Type\" header is unsupported, and the request has been rejected. This occurs when a HTTP request supplies a payload in a content-type that the server is not able to handle.")
-
-// ErrNotAcceptable specifically means that a '406 - Not Acceptable' was received from the API.
-var ErrNotAcceptable = errors.Wrap(ErrNotOK, "The accept header value is not acceptable")
--- a/api/server/structs/BUILD.bazel
+++ b/api/server/structs/BUILD.bazel
@@ -4,11 +4,9 @@ go_library(
    name = "go_default_library",
    srcs = [
        "block.go",
-        "block_execution.go",
        "conversions.go",
        "conversions_blob.go",
        "conversions_block.go",
-        "conversions_block_execution.go",
        "conversions_lightclient.go",
        "conversions_state.go",
        "endpoints_beacon.go",
@@ -49,16 +47,10 @@ go_library(

 go_test(
    name = "go_default_test",
-    srcs = [
-        "conversions_block_execution_test.go",
-        "conversions_test.go",
-    ],
+    srcs = ["conversions_test.go"],
    embed = [":go_default_library"],
    deps = [
-        "//proto/engine/v1:go_default_library",
        "//proto/prysm/v1alpha1:go_default_library",
        "//testing/require:go_default_library",
-        "@com_github_ethereum_go_ethereum//common:go_default_library",
-        "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
    ],
 )
--- a/api/server/structs/block.go
+++ b/api/server/structs/block.go
@@ -186,6 +186,40 @@ type BlindedBeaconBlockBodyBellatrix struct {
 	ExecutionPayloadHeader *ExecutionPayloadHeader `json:"execution_payload_header"`
 }

+type ExecutionPayload struct {
+	ParentHash    string   `json:"parent_hash"`
+	FeeRecipient  string   `json:"fee_recipient"`
+	StateRoot     string   `json:"state_root"`
+	ReceiptsRoot  string   `json:"receipts_root"`
+	LogsBloom     string   `json:"logs_bloom"`
+	PrevRandao    string   `json:"prev_randao"`
+	BlockNumber   string   `json:"block_number"`
+	GasLimit      string   `json:"gas_limit"`
+	GasUsed       string   `json:"gas_used"`
+	Timestamp     string   `json:"timestamp"`
+	ExtraData     string   `json:"extra_data"`
+	BaseFeePerGas string   `json:"base_fee_per_gas"`
+	BlockHash     string   `json:"block_hash"`
+	Transactions  []string `json:"transactions"`
+}
+
+type ExecutionPayloadHeader struct {
+	ParentHash       string `json:"parent_hash"`
+	FeeRecipient     string `json:"fee_recipient"`
+	StateRoot        string `json:"state_root"`
+	ReceiptsRoot     string `json:"receipts_root"`
+	LogsBloom        string `json:"logs_bloom"`
+	PrevRandao       string `json:"prev_randao"`
+	BlockNumber      string `json:"block_number"`
+	GasLimit         string `json:"gas_limit"`
+	GasUsed          string `json:"gas_used"`
+	Timestamp        string `json:"timestamp"`
+	ExtraData        string `json:"extra_data"`
+	BaseFeePerGas    string `json:"base_fee_per_gas"`
+	BlockHash        string `json:"block_hash"`
+	TransactionsRoot string `json:"transactions_root"`
+}
+
 // ----------------------------------------------------------------------------
 // Capella
 // ----------------------------------------------------------------------------
@@ -264,6 +298,42 @@ type BlindedBeaconBlockBodyCapella struct {
 	BLSToExecutionChanges  []*SignedBLSToExecutionChange  `json:"bls_to_execution_changes"`
 }

+type ExecutionPayloadCapella struct {
+	ParentHash    string        `json:"parent_hash"`
+	FeeRecipient  string        `json:"fee_recipient"`
+	StateRoot     string        `json:"state_root"`
+	ReceiptsRoot  string        `json:"receipts_root"`
+	LogsBloom     string        `json:"logs_bloom"`
+	PrevRandao    string        `json:"prev_randao"`
+	BlockNumber   string        `json:"block_number"`
+	GasLimit      string        `json:"gas_limit"`
+	GasUsed       string        `json:"gas_used"`
+	Timestamp     string        `json:"timestamp"`
+	ExtraData     string        `json:"extra_data"`
+	BaseFeePerGas string        `json:"base_fee_per_gas"`
+	BlockHash     string        `json:"block_hash"`
+	Transactions  []string      `json:"transactions"`
+	Withdrawals   []*Withdrawal `json:"withdrawals"`
+}
+
+type ExecutionPayloadHeaderCapella struct {
+	ParentHash       string `json:"parent_hash"`
+	FeeRecipient     string `json:"fee_recipient"`
+	StateRoot        string `json:"state_root"`
+	ReceiptsRoot     string `json:"receipts_root"`
+	LogsBloom        string `json:"logs_bloom"`
+	PrevRandao       string `json:"prev_randao"`
+	BlockNumber      string `json:"block_number"`
+	GasLimit         string `json:"gas_limit"`
+	GasUsed          string `json:"gas_used"`
+	Timestamp        string `json:"timestamp"`
+	ExtraData        string `json:"extra_data"`
+	BaseFeePerGas    string `json:"base_fee_per_gas"`
+	BlockHash        string `json:"block_hash"`
+	TransactionsRoot string `json:"transactions_root"`
+	WithdrawalsRoot  string `json:"withdrawals_root"`
+}
+
 // ----------------------------------------------------------------------------
 // Deneb
 // ----------------------------------------------------------------------------
@@ -356,6 +426,46 @@ type BlindedBeaconBlockBodyDeneb struct {
 	BlobKzgCommitments     []string                      `json:"blob_kzg_commitments"`
 }

+type ExecutionPayloadDeneb struct {
+	ParentHash    string        `json:"parent_hash"`
+	FeeRecipient  string        `json:"fee_recipient"`
+	StateRoot     string        `json:"state_root"`
+	ReceiptsRoot  string        `json:"receipts_root"`
+	LogsBloom     string        `json:"logs_bloom"`
+	PrevRandao    string        `json:"prev_randao"`
+	BlockNumber   string        `json:"block_number"`
+	GasLimit      string        `json:"gas_limit"`
+	GasUsed       string        `json:"gas_used"`
+	Timestamp     string        `json:"timestamp"`
+	ExtraData     string        `json:"extra_data"`
+	BaseFeePerGas string        `json:"base_fee_per_gas"`
+	BlockHash     string        `json:"block_hash"`
+	Transactions  []string      `json:"transactions"`
+	Withdrawals   []*Withdrawal `json:"withdrawals"`
+	BlobGasUsed   string        `json:"blob_gas_used"`
+	ExcessBlobGas string        `json:"excess_blob_gas"`
+}
+
+type ExecutionPayloadHeaderDeneb struct {
+	ParentHash       string `json:"parent_hash"`
+	FeeRecipient     string `json:"fee_recipient"`
+	StateRoot        string `json:"state_root"`
+	ReceiptsRoot     string `json:"receipts_root"`
+	LogsBloom        string `json:"logs_bloom"`
+	PrevRandao       string `json:"prev_randao"`
+	BlockNumber      string `json:"block_number"`
+	GasLimit         string `json:"gas_limit"`
+	GasUsed          string `json:"gas_used"`
+	Timestamp        string `json:"timestamp"`
+	ExtraData        string `json:"extra_data"`
+	BaseFeePerGas    string `json:"base_fee_per_gas"`
+	BlockHash        string `json:"block_hash"`
+	TransactionsRoot string `json:"transactions_root"`
+	WithdrawalsRoot  string `json:"withdrawals_root"`
+	BlobGasUsed      string `json:"blob_gas_used"`
+	ExcessBlobGas    string `json:"excess_blob_gas"`
+}
+
 // ----------------------------------------------------------------------------
 // Electra
 // ----------------------------------------------------------------------------
@@ -450,6 +560,14 @@ type BlindedBeaconBlockBodyElectra struct {
 	ExecutionRequests      *ExecutionRequests            `json:"execution_requests"`
 }

+type (
+	ExecutionRequests struct {
+		Deposits       []*DepositRequest       `json:"deposits"`
+		Withdrawals    []*WithdrawalRequest    `json:"withdrawals"`
+		Consolidations []*ConsolidationRequest `json:"consolidations"`
+	}
+)
+
 // ----------------------------------------------------------------------------
 // Fulu
 // ----------------------------------------------------------------------------
@@ -461,14 +579,14 @@ type SignedBeaconBlockContentsFulu struct {
 }

 type BeaconBlockContentsFulu struct {
-	Block     *BeaconBlockElectra `json:"block"`
-	KzgProofs []string            `json:"kzg_proofs"`
-	Blobs     []string            `json:"blobs"`
+	Block     *BeaconBlockFulu `json:"block"`
+	KzgProofs []string         `json:"kzg_proofs"`
+	Blobs     []string         `json:"blobs"`
 }

 type SignedBeaconBlockFulu struct {
-	Message   *BeaconBlockElectra `json:"message"`
-	Signature string              `json:"signature"`
+	Message   *BeaconBlockFulu `json:"message"`
+	Signature string           `json:"signature"`
 }

 var _ SignedMessageJsoner = &SignedBeaconBlockFulu{}
@@ -481,12 +599,36 @@ func (s *SignedBeaconBlockFulu) SigString() string {
 	return s.Signature
 }

+type BeaconBlockFulu struct {
+	Slot          string               `json:"slot"`
+	ProposerIndex string               `json:"proposer_index"`
+	ParentRoot    string               `json:"parent_root"`
+	StateRoot     string               `json:"state_root"`
+	Body          *BeaconBlockBodyFulu `json:"body"`
+}
+
+type BeaconBlockBodyFulu struct {
+	RandaoReveal          string                        `json:"randao_reveal"`
+	Eth1Data              *Eth1Data                     `json:"eth1_data"`
+	Graffiti              string                        `json:"graffiti"`
+	ProposerSlashings     []*ProposerSlashing           `json:"proposer_slashings"`
+	AttesterSlashings     []*AttesterSlashingElectra    `json:"attester_slashings"`
+	Attestations          []*AttestationElectra         `json:"attestations"`
+	Deposits              []*Deposit                    `json:"deposits"`
+	VoluntaryExits        []*SignedVoluntaryExit        `json:"voluntary_exits"`
+	SyncAggregate         *SyncAggregate                `json:"sync_aggregate"`
+	ExecutionPayload      *ExecutionPayloadDeneb        `json:"execution_payload"`
+	BLSToExecutionChanges []*SignedBLSToExecutionChange `json:"bls_to_execution_changes"`
+	BlobKzgCommitments    []string                      `json:"blob_kzg_commitments"`
+	ExecutionRequests     *ExecutionRequests            `json:"execution_requests"`
+}
+
 type BlindedBeaconBlockFulu struct {
-	Slot          string                         `json:"slot"`
-	ProposerIndex string                         `json:"proposer_index"`
-	ParentRoot    string                         `json:"parent_root"`
-	StateRoot     string                         `json:"state_root"`
-	Body          *BlindedBeaconBlockBodyElectra `json:"body"`
+	Slot          string                      `json:"slot"`
+	ProposerIndex string                      `json:"proposer_index"`
+	ParentRoot    string                      `json:"parent_root"`
+	StateRoot     string                      `json:"state_root"`
+	Body          *BlindedBeaconBlockBodyFulu `json:"body"`
 }

 type SignedBlindedBeaconBlockFulu struct {
@@ -503,3 +645,19 @@ func (s *SignedBlindedBeaconBlockFulu) MessageRawJson() ([]byte, error) {
 func (s *SignedBlindedBeaconBlockFulu) SigString() string {
 	return s.Signature
 }
+
+type BlindedBeaconBlockBodyFulu struct {
+	RandaoReveal           string                        `json:"randao_reveal"`
+	Eth1Data               *Eth1Data                     `json:"eth1_data"`
+	Graffiti               string                        `json:"graffiti"`
+	ProposerSlashings      []*ProposerSlashing           `json:"proposer_slashings"`
+	AttesterSlashings      []*AttesterSlashingElectra    `json:"attester_slashings"`
+	Attestations           []*AttestationElectra         `json:"attestations"`
+	Deposits               []*Deposit                    `json:"deposits"`
+	VoluntaryExits         []*SignedVoluntaryExit        `json:"voluntary_exits"`
+	SyncAggregate          *SyncAggregate                `json:"sync_aggregate"`
+	ExecutionPayloadHeader *ExecutionPayloadHeaderDeneb  `json:"execution_payload_header"`
+	BLSToExecutionChanges  []*SignedBLSToExecutionChange `json:"bls_to_execution_changes"`
+	BlobKzgCommitments     []string                      `json:"blob_kzg_commitments"`
+	ExecutionRequests      *ExecutionRequests            `json:"execution_requests"`
+}
--- a/api/server/structs/block_execution.go
+++ b/api/server/structs/block_execution.go
@@ -1,157 +0,0 @@
-package structs
-
-// ----------------------------------------------------------------------------
-// Bellatrix
-// ----------------------------------------------------------------------------
-
-type ExecutionPayload struct {
-	ParentHash    string   `json:"parent_hash"`
-	FeeRecipient  string   `json:"fee_recipient"`
-	StateRoot     string   `json:"state_root"`
-	ReceiptsRoot  string   `json:"receipts_root"`
-	LogsBloom     string   `json:"logs_bloom"`
-	PrevRandao    string   `json:"prev_randao"`
-	BlockNumber   string   `json:"block_number"`
-	GasLimit      string   `json:"gas_limit"`
-	GasUsed       string   `json:"gas_used"`
-	Timestamp     string   `json:"timestamp"`
-	ExtraData     string   `json:"extra_data"`
-	BaseFeePerGas string   `json:"base_fee_per_gas"`
-	BlockHash     string   `json:"block_hash"`
-	Transactions  []string `json:"transactions"`
-}
-
-type ExecutionPayloadHeader struct {
-	ParentHash       string `json:"parent_hash"`
-	FeeRecipient     string `json:"fee_recipient"`
-	StateRoot        string `json:"state_root"`
-	ReceiptsRoot     string `json:"receipts_root"`
-	LogsBloom        string `json:"logs_bloom"`
-	PrevRandao       string `json:"prev_randao"`
-	BlockNumber      string `json:"block_number"`
-	GasLimit         string `json:"gas_limit"`
-	GasUsed          string `json:"gas_used"`
-	Timestamp        string `json:"timestamp"`
-	ExtraData        string `json:"extra_data"`
-	BaseFeePerGas    string `json:"base_fee_per_gas"`
-	BlockHash        string `json:"block_hash"`
-	TransactionsRoot string `json:"transactions_root"`
-}
-
-// ----------------------------------------------------------------------------
-// Capella
-// ----------------------------------------------------------------------------
-
-type ExecutionPayloadCapella struct {
-	ParentHash    string        `json:"parent_hash"`
-	FeeRecipient  string        `json:"fee_recipient"`
-	StateRoot     string        `json:"state_root"`
-	ReceiptsRoot  string        `json:"receipts_root"`
-	LogsBloom     string        `json:"logs_bloom"`
-	PrevRandao    string        `json:"prev_randao"`
-	BlockNumber   string        `json:"block_number"`
-	GasLimit      string        `json:"gas_limit"`
-	GasUsed       string        `json:"gas_used"`
-	Timestamp     string        `json:"timestamp"`
-	ExtraData     string        `json:"extra_data"`
-	BaseFeePerGas string        `json:"base_fee_per_gas"`
-	BlockHash     string        `json:"block_hash"`
-	Transactions  []string      `json:"transactions"`
-	Withdrawals   []*Withdrawal `json:"withdrawals"`
-}
-
-type ExecutionPayloadHeaderCapella struct {
-	ParentHash       string `json:"parent_hash"`
-	FeeRecipient     string `json:"fee_recipient"`
-	StateRoot        string `json:"state_root"`
-	ReceiptsRoot     string `json:"receipts_root"`
-	LogsBloom        string `json:"logs_bloom"`
-	PrevRandao       string `json:"prev_randao"`
-	BlockNumber      string `json:"block_number"`
-	GasLimit         string `json:"gas_limit"`
-	GasUsed          string `json:"gas_used"`
-	Timestamp        string `json:"timestamp"`
-	ExtraData        string `json:"extra_data"`
-	BaseFeePerGas    string `json:"base_fee_per_gas"`
-	BlockHash        string `json:"block_hash"`
-	TransactionsRoot string `json:"transactions_root"`
-	WithdrawalsRoot  string `json:"withdrawals_root"`
-}
-
-// ----------------------------------------------------------------------------
-// Deneb
-// ----------------------------------------------------------------------------
-
-type ExecutionPayloadDeneb struct {
-	ParentHash    string        `json:"parent_hash"`
-	FeeRecipient  string        `json:"fee_recipient"`
-	StateRoot     string        `json:"state_root"`
-	ReceiptsRoot  string        `json:"receipts_root"`
-	LogsBloom     string        `json:"logs_bloom"`
-	PrevRandao    string        `json:"prev_randao"`
-	BlockNumber   string        `json:"block_number"`
-	GasLimit      string        `json:"gas_limit"`
-	GasUsed       string        `json:"gas_used"`
-	Timestamp     string        `json:"timestamp"`
-	ExtraData     string        `json:"extra_data"`
-	BaseFeePerGas string        `json:"base_fee_per_gas"`
-	BlockHash     string        `json:"block_hash"`
-	Transactions  []string      `json:"transactions"`
-	Withdrawals   []*Withdrawal `json:"withdrawals"`
-	BlobGasUsed   string        `json:"blob_gas_used"`
-	ExcessBlobGas string        `json:"excess_blob_gas"`
-}
-
-type ExecutionPayloadHeaderDeneb struct {
-	ParentHash       string `json:"parent_hash"`
-	FeeRecipient     string `json:"fee_recipient"`
-	StateRoot        string `json:"state_root"`
-	ReceiptsRoot     string `json:"receipts_root"`
-	LogsBloom        string `json:"logs_bloom"`
-	PrevRandao       string `json:"prev_randao"`
-	BlockNumber      string `json:"block_number"`
-	GasLimit         string `json:"gas_limit"`
-	GasUsed          string `json:"gas_used"`
-	Timestamp        string `json:"timestamp"`
-	ExtraData        string `json:"extra_data"`
-	BaseFeePerGas    string `json:"base_fee_per_gas"`
-	BlockHash        string `json:"block_hash"`
-	TransactionsRoot string `json:"transactions_root"`
-	WithdrawalsRoot  string `json:"withdrawals_root"`
-	BlobGasUsed      string `json:"blob_gas_used"`
-	ExcessBlobGas    string `json:"excess_blob_gas"`
-}
-
-// ----------------------------------------------------------------------------
-// Electra
-// ----------------------------------------------------------------------------
-
-type ExecutionRequests struct {
-	Deposits       []*DepositRequest       `json:"deposits"`
-	Withdrawals    []*WithdrawalRequest    `json:"withdrawals"`
-	Consolidations []*ConsolidationRequest `json:"consolidations"`
-}
-
-type DepositRequest struct {
-	Pubkey                string `json:"pubkey"`
-	WithdrawalCredentials string `json:"withdrawal_credentials"`
-	Amount                string `json:"amount"`
-	Signature             string `json:"signature"`
-	Index                 string `json:"index"`
-}
-
-type WithdrawalRequest struct {
-	SourceAddress   string `json:"source_address"`
-	ValidatorPubkey string `json:"validator_pubkey"`
-	Amount          string `json:"amount"`
-}
-
-type ConsolidationRequest struct {
-	SourceAddress string `json:"source_address"`
-	SourcePubkey  string `json:"source_pubkey"`
-	TargetPubkey  string `json:"target_pubkey"`
-}
-
-// ----------------------------------------------------------------------------
-// Fulu
-// ----------------------------------------------------------------------------
--- a/api/server/structs/conversions.go
+++ b/api/server/structs/conversions.go
@@ -889,6 +889,126 @@ func WithdrawalFromConsensus(w *enginev1.Withdrawal) *Withdrawal {
 	}
 }

+func WithdrawalRequestsFromConsensus(ws []*enginev1.WithdrawalRequest) []*WithdrawalRequest {
+	result := make([]*WithdrawalRequest, len(ws))
+	for i, w := range ws {
+		result[i] = WithdrawalRequestFromConsensus(w)
+	}
+	return result
+}
+
+func WithdrawalRequestFromConsensus(w *enginev1.WithdrawalRequest) *WithdrawalRequest {
+	return &WithdrawalRequest{
+		SourceAddress:   hexutil.Encode(w.SourceAddress),
+		ValidatorPubkey: hexutil.Encode(w.ValidatorPubkey),
+		Amount:          fmt.Sprintf("%d", w.Amount),
+	}
+}
+
+func (w *WithdrawalRequest) ToConsensus() (*enginev1.WithdrawalRequest, error) {
+	src, err := bytesutil.DecodeHexWithLength(w.SourceAddress, common.AddressLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "SourceAddress")
+	}
+	pubkey, err := bytesutil.DecodeHexWithLength(w.ValidatorPubkey, fieldparams.BLSPubkeyLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "ValidatorPubkey")
+	}
+	amount, err := strconv.ParseUint(w.Amount, 10, 64)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "Amount")
+	}
+	return &enginev1.WithdrawalRequest{
+		SourceAddress:   src,
+		ValidatorPubkey: pubkey,
+		Amount:          amount,
+	}, nil
+}
+
+func ConsolidationRequestsFromConsensus(cs []*enginev1.ConsolidationRequest) []*ConsolidationRequest {
+	result := make([]*ConsolidationRequest, len(cs))
+	for i, c := range cs {
+		result[i] = ConsolidationRequestFromConsensus(c)
+	}
+	return result
+}
+
+func ConsolidationRequestFromConsensus(c *enginev1.ConsolidationRequest) *ConsolidationRequest {
+	return &ConsolidationRequest{
+		SourceAddress: hexutil.Encode(c.SourceAddress),
+		SourcePubkey:  hexutil.Encode(c.SourcePubkey),
+		TargetPubkey:  hexutil.Encode(c.TargetPubkey),
+	}
+}
+
+func (c *ConsolidationRequest) ToConsensus() (*enginev1.ConsolidationRequest, error) {
+	srcAddress, err := bytesutil.DecodeHexWithLength(c.SourceAddress, common.AddressLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "SourceAddress")
+	}
+	srcPubkey, err := bytesutil.DecodeHexWithLength(c.SourcePubkey, fieldparams.BLSPubkeyLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "SourcePubkey")
+	}
+	targetPubkey, err := bytesutil.DecodeHexWithLength(c.TargetPubkey, fieldparams.BLSPubkeyLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "TargetPubkey")
+	}
+	return &enginev1.ConsolidationRequest{
+		SourceAddress: srcAddress,
+		SourcePubkey:  srcPubkey,
+		TargetPubkey:  targetPubkey,
+	}, nil
+}
+
+func DepositRequestsFromConsensus(ds []*enginev1.DepositRequest) []*DepositRequest {
+	result := make([]*DepositRequest, len(ds))
+	for i, d := range ds {
+		result[i] = DepositRequestFromConsensus(d)
+	}
+	return result
+}
+
+func DepositRequestFromConsensus(d *enginev1.DepositRequest) *DepositRequest {
+	return &DepositRequest{
+		Pubkey:                hexutil.Encode(d.Pubkey),
+		WithdrawalCredentials: hexutil.Encode(d.WithdrawalCredentials),
+		Amount:                fmt.Sprintf("%d", d.Amount),
+		Signature:             hexutil.Encode(d.Signature),
+		Index:                 fmt.Sprintf("%d", d.Index),
+	}
+}
+
+func (d *DepositRequest) ToConsensus() (*enginev1.DepositRequest, error) {
+	pubkey, err := bytesutil.DecodeHexWithLength(d.Pubkey, fieldparams.BLSPubkeyLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "Pubkey")
+	}
+	withdrawalCredentials, err := bytesutil.DecodeHexWithLength(d.WithdrawalCredentials, fieldparams.RootLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "WithdrawalCredentials")
+	}
+	amount, err := strconv.ParseUint(d.Amount, 10, 64)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "Amount")
+	}
+	sig, err := bytesutil.DecodeHexWithLength(d.Signature, fieldparams.BLSSignatureLength)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "Signature")
+	}
+	index, err := strconv.ParseUint(d.Index, 10, 64)
+	if err != nil {
+		return nil, server.NewDecodeError(err, "Index")
+	}
+	return &enginev1.DepositRequest{
+		Pubkey:                pubkey,
+		WithdrawalCredentials: withdrawalCredentials,
+		Amount:                amount,
+		Signature:             sig,
+		Index:                 index,
+	}, nil
+}
+
 func ProposerSlashingsToConsensus(src []*ProposerSlashing) ([]*eth.ProposerSlashing, error) {
 	if src == nil {
 		return nil, server.NewDecodeError(errNilValue, "ProposerSlashings")
--- a/api/server/structs/conversions_block.go
+++ b/api/server/structs/conversions_block.go
--- a/api/server/structs/conversions_block_execution.go
+++ b/api/server/structs/conversions_block_execution.go
@@ -1,973 +0,0 @@
-package structs
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/prysmaticlabs/prysm/v5/api/server"
-	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/container/slice"
-	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
-	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
-)
-
-// ----------------------------------------------------------------------------
-// Bellatrix
-// ----------------------------------------------------------------------------
-
-func ExecutionPayloadFromConsensus(payload *enginev1.ExecutionPayload) (*ExecutionPayload, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-	transactions := make([]string, len(payload.Transactions))
-	for i, tx := range payload.Transactions {
-		transactions[i] = hexutil.Encode(tx)
-	}
-
-	return &ExecutionPayload{
-		ParentHash:    hexutil.Encode(payload.ParentHash),
-		FeeRecipient:  hexutil.Encode(payload.FeeRecipient),
-		StateRoot:     hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:  hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:     hexutil.Encode(payload.LogsBloom),
-		PrevRandao:    hexutil.Encode(payload.PrevRandao),
-		BlockNumber:   fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:      fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:       fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:     fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:     hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas: baseFeePerGas,
-		BlockHash:     hexutil.Encode(payload.BlockHash),
-		Transactions:  transactions,
-	}, nil
-}
-
-func (e *ExecutionPayload) ToConsensus() (*enginev1.ExecutionPayload, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayload")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockHash")
-	}
-	err = slice.VerifyMaxLength(e.Transactions, fieldparams.MaxTxsPerPayloadLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Transactions")
-	}
-	payloadTxs := make([][]byte, len(e.Transactions))
-	for i, tx := range e.Transactions {
-		payloadTxs[i], err = bytesutil.DecodeHexWithMaxLength(tx, fieldparams.MaxBytesPerTxLength)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Transactions[%d]", i))
-		}
-	}
-	return &enginev1.ExecutionPayload{
-		ParentHash:    payloadParentHash,
-		FeeRecipient:  payloadFeeRecipient,
-		StateRoot:     payloadStateRoot,
-		ReceiptsRoot:  payloadReceiptsRoot,
-		LogsBloom:     payloadLogsBloom,
-		PrevRandao:    payloadPrevRandao,
-		BlockNumber:   payloadBlockNumber,
-		GasLimit:      payloadGasLimit,
-		GasUsed:       payloadGasUsed,
-		Timestamp:     payloadTimestamp,
-		ExtraData:     payloadExtraData,
-		BaseFeePerGas: payloadBaseFeePerGas,
-		BlockHash:     payloadBlockHash,
-		Transactions:  payloadTxs,
-	}, nil
-}
-
-func ExecutionPayloadHeaderFromConsensus(payload *enginev1.ExecutionPayloadHeader) (*ExecutionPayloadHeader, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ExecutionPayloadHeader{
-		ParentHash:       hexutil.Encode(payload.ParentHash),
-		FeeRecipient:     hexutil.Encode(payload.FeeRecipient),
-		StateRoot:        hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:     hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:        hexutil.Encode(payload.LogsBloom),
-		PrevRandao:       hexutil.Encode(payload.PrevRandao),
-		BlockNumber:      fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:         fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:          fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:        fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:        hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas:    baseFeePerGas,
-		BlockHash:        hexutil.Encode(payload.BlockHash),
-		TransactionsRoot: hexutil.Encode(payload.TransactionsRoot),
-	}, nil
-}
-
-func (e *ExecutionPayloadHeader) ToConsensus() (*enginev1.ExecutionPayloadHeader, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayloadHeader")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockHash")
-	}
-	payloadTxsRoot, err := bytesutil.DecodeHexWithLength(e.TransactionsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.TransactionsRoot")
-	}
-
-	return &enginev1.ExecutionPayloadHeader{
-		ParentHash:       payloadParentHash,
-		FeeRecipient:     payloadFeeRecipient,
-		StateRoot:        payloadStateRoot,
-		ReceiptsRoot:     payloadReceiptsRoot,
-		LogsBloom:        payloadLogsBloom,
-		PrevRandao:       payloadPrevRandao,
-		BlockNumber:      payloadBlockNumber,
-		GasLimit:         payloadGasLimit,
-		GasUsed:          payloadGasUsed,
-		Timestamp:        payloadTimestamp,
-		ExtraData:        payloadExtraData,
-		BaseFeePerGas:    payloadBaseFeePerGas,
-		BlockHash:        payloadBlockHash,
-		TransactionsRoot: payloadTxsRoot,
-	}, nil
-}
-
-// ----------------------------------------------------------------------------
-// Capella
-// ----------------------------------------------------------------------------
-
-func ExecutionPayloadCapellaFromConsensus(payload *enginev1.ExecutionPayloadCapella) (*ExecutionPayloadCapella, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-	transactions := make([]string, len(payload.Transactions))
-	for i, tx := range payload.Transactions {
-		transactions[i] = hexutil.Encode(tx)
-	}
-
-	return &ExecutionPayloadCapella{
-		ParentHash:    hexutil.Encode(payload.ParentHash),
-		FeeRecipient:  hexutil.Encode(payload.FeeRecipient),
-		StateRoot:     hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:  hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:     hexutil.Encode(payload.LogsBloom),
-		PrevRandao:    hexutil.Encode(payload.PrevRandao),
-		BlockNumber:   fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:      fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:       fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:     fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:     hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas: baseFeePerGas,
-		BlockHash:     hexutil.Encode(payload.BlockHash),
-		Transactions:  transactions,
-		Withdrawals:   WithdrawalsFromConsensus(payload.Withdrawals),
-	}, nil
-}
-
-func (e *ExecutionPayloadCapella) ToConsensus() (*enginev1.ExecutionPayloadCapella, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayload")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockHash")
-	}
-	err = slice.VerifyMaxLength(e.Transactions, fieldparams.MaxTxsPerPayloadLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Transactions")
-	}
-	payloadTxs := make([][]byte, len(e.Transactions))
-	for i, tx := range e.Transactions {
-		payloadTxs[i], err = bytesutil.DecodeHexWithMaxLength(tx, fieldparams.MaxBytesPerTxLength)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Transactions[%d]", i))
-		}
-	}
-	err = slice.VerifyMaxLength(e.Withdrawals, fieldparams.MaxWithdrawalsPerPayload)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Withdrawals")
-	}
-	withdrawals := make([]*enginev1.Withdrawal, len(e.Withdrawals))
-	for i, w := range e.Withdrawals {
-		withdrawalIndex, err := strconv.ParseUint(w.WithdrawalIndex, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].WithdrawalIndex", i))
-		}
-		validatorIndex, err := strconv.ParseUint(w.ValidatorIndex, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].ValidatorIndex", i))
-		}
-		address, err := bytesutil.DecodeHexWithLength(w.ExecutionAddress, common.AddressLength)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].ExecutionAddress", i))
-		}
-		amount, err := strconv.ParseUint(w.Amount, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].Amount", i))
-		}
-		withdrawals[i] = &enginev1.Withdrawal{
-			Index:          withdrawalIndex,
-			ValidatorIndex: primitives.ValidatorIndex(validatorIndex),
-			Address:        address,
-			Amount:         amount,
-		}
-	}
-	return &enginev1.ExecutionPayloadCapella{
-		ParentHash:    payloadParentHash,
-		FeeRecipient:  payloadFeeRecipient,
-		StateRoot:     payloadStateRoot,
-		ReceiptsRoot:  payloadReceiptsRoot,
-		LogsBloom:     payloadLogsBloom,
-		PrevRandao:    payloadPrevRandao,
-		BlockNumber:   payloadBlockNumber,
-		GasLimit:      payloadGasLimit,
-		GasUsed:       payloadGasUsed,
-		Timestamp:     payloadTimestamp,
-		ExtraData:     payloadExtraData,
-		BaseFeePerGas: payloadBaseFeePerGas,
-		BlockHash:     payloadBlockHash,
-		Transactions:  payloadTxs,
-		Withdrawals:   withdrawals,
-	}, nil
-}
-
-func ExecutionPayloadHeaderCapellaFromConsensus(payload *enginev1.ExecutionPayloadHeaderCapella) (*ExecutionPayloadHeaderCapella, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ExecutionPayloadHeaderCapella{
-		ParentHash:       hexutil.Encode(payload.ParentHash),
-		FeeRecipient:     hexutil.Encode(payload.FeeRecipient),
-		StateRoot:        hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:     hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:        hexutil.Encode(payload.LogsBloom),
-		PrevRandao:       hexutil.Encode(payload.PrevRandao),
-		BlockNumber:      fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:         fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:          fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:        fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:        hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas:    baseFeePerGas,
-		BlockHash:        hexutil.Encode(payload.BlockHash),
-		TransactionsRoot: hexutil.Encode(payload.TransactionsRoot),
-		WithdrawalsRoot:  hexutil.Encode(payload.WithdrawalsRoot),
-	}, nil
-}
-
-func (e *ExecutionPayloadHeaderCapella) ToConsensus() (*enginev1.ExecutionPayloadHeaderCapella, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayloadHeader")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithMaxLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockHash")
-	}
-	payloadTxsRoot, err := bytesutil.DecodeHexWithMaxLength(e.TransactionsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.TransactionsRoot")
-	}
-	payloadWithdrawalsRoot, err := bytesutil.DecodeHexWithMaxLength(e.WithdrawalsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.WithdrawalsRoot")
-	}
-	return &enginev1.ExecutionPayloadHeaderCapella{
-		ParentHash:       payloadParentHash,
-		FeeRecipient:     payloadFeeRecipient,
-		StateRoot:        payloadStateRoot,
-		ReceiptsRoot:     payloadReceiptsRoot,
-		LogsBloom:        payloadLogsBloom,
-		PrevRandao:       payloadPrevRandao,
-		BlockNumber:      payloadBlockNumber,
-		GasLimit:         payloadGasLimit,
-		GasUsed:          payloadGasUsed,
-		Timestamp:        payloadTimestamp,
-		ExtraData:        payloadExtraData,
-		BaseFeePerGas:    payloadBaseFeePerGas,
-		BlockHash:        payloadBlockHash,
-		TransactionsRoot: payloadTxsRoot,
-		WithdrawalsRoot:  payloadWithdrawalsRoot,
-	}, nil
-}
-
-// ----------------------------------------------------------------------------
-// Deneb
-// ----------------------------------------------------------------------------
-
-func ExecutionPayloadDenebFromConsensus(payload *enginev1.ExecutionPayloadDeneb) (*ExecutionPayloadDeneb, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-	transactions := make([]string, len(payload.Transactions))
-	for i, tx := range payload.Transactions {
-		transactions[i] = hexutil.Encode(tx)
-	}
-
-	return &ExecutionPayloadDeneb{
-		ParentHash:    hexutil.Encode(payload.ParentHash),
-		FeeRecipient:  hexutil.Encode(payload.FeeRecipient),
-		StateRoot:     hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:  hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:     hexutil.Encode(payload.LogsBloom),
-		PrevRandao:    hexutil.Encode(payload.PrevRandao),
-		BlockNumber:   fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:      fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:       fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:     fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:     hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas: baseFeePerGas,
-		BlockHash:     hexutil.Encode(payload.BlockHash),
-		Transactions:  transactions,
-		Withdrawals:   WithdrawalsFromConsensus(payload.Withdrawals),
-		BlobGasUsed:   fmt.Sprintf("%d", payload.BlobGasUsed),
-		ExcessBlobGas: fmt.Sprintf("%d", payload.ExcessBlobGas),
-	}, nil
-}
-
-func (e *ExecutionPayloadDeneb) ToConsensus() (*enginev1.ExecutionPayloadDeneb, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayload")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlockHash")
-	}
-	err = slice.VerifyMaxLength(e.Transactions, fieldparams.MaxTxsPerPayloadLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Transactions")
-	}
-	txs := make([][]byte, len(e.Transactions))
-	for i, tx := range e.Transactions {
-		txs[i], err = bytesutil.DecodeHexWithMaxLength(tx, fieldparams.MaxBytesPerTxLength)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Transactions[%d]", i))
-		}
-	}
-	err = slice.VerifyMaxLength(e.Withdrawals, fieldparams.MaxWithdrawalsPerPayload)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.Withdrawals")
-	}
-	withdrawals := make([]*enginev1.Withdrawal, len(e.Withdrawals))
-	for i, w := range e.Withdrawals {
-		withdrawalIndex, err := strconv.ParseUint(w.WithdrawalIndex, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].WithdrawalIndex", i))
-		}
-		validatorIndex, err := strconv.ParseUint(w.ValidatorIndex, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].ValidatorIndex", i))
-		}
-		address, err := bytesutil.DecodeHexWithLength(w.ExecutionAddress, common.AddressLength)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].ExecutionAddress", i))
-		}
-		amount, err := strconv.ParseUint(w.Amount, 10, 64)
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionPayload.Withdrawals[%d].Amount", i))
-		}
-		withdrawals[i] = &enginev1.Withdrawal{
-			Index:          withdrawalIndex,
-			ValidatorIndex: primitives.ValidatorIndex(validatorIndex),
-			Address:        address,
-			Amount:         amount,
-		}
-	}
-
-	payloadBlobGasUsed, err := strconv.ParseUint(e.BlobGasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlobGasUsed")
-	}
-	payloadExcessBlobGas, err := strconv.ParseUint(e.ExcessBlobGas, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ExcessBlobGas")
-	}
-	return &enginev1.ExecutionPayloadDeneb{
-		ParentHash:    payloadParentHash,
-		FeeRecipient:  payloadFeeRecipient,
-		StateRoot:     payloadStateRoot,
-		ReceiptsRoot:  payloadReceiptsRoot,
-		LogsBloom:     payloadLogsBloom,
-		PrevRandao:    payloadPrevRandao,
-		BlockNumber:   payloadBlockNumber,
-		GasLimit:      payloadGasLimit,
-		GasUsed:       payloadGasUsed,
-		Timestamp:     payloadTimestamp,
-		ExtraData:     payloadExtraData,
-		BaseFeePerGas: payloadBaseFeePerGas,
-		BlockHash:     payloadBlockHash,
-		Transactions:  txs,
-		Withdrawals:   withdrawals,
-		BlobGasUsed:   payloadBlobGasUsed,
-		ExcessBlobGas: payloadExcessBlobGas,
-	}, nil
-}
-
-func ExecutionPayloadHeaderDenebFromConsensus(payload *enginev1.ExecutionPayloadHeaderDeneb) (*ExecutionPayloadHeaderDeneb, error) {
-	baseFeePerGas, err := sszBytesToUint256String(payload.BaseFeePerGas)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ExecutionPayloadHeaderDeneb{
-		ParentHash:       hexutil.Encode(payload.ParentHash),
-		FeeRecipient:     hexutil.Encode(payload.FeeRecipient),
-		StateRoot:        hexutil.Encode(payload.StateRoot),
-		ReceiptsRoot:     hexutil.Encode(payload.ReceiptsRoot),
-		LogsBloom:        hexutil.Encode(payload.LogsBloom),
-		PrevRandao:       hexutil.Encode(payload.PrevRandao),
-		BlockNumber:      fmt.Sprintf("%d", payload.BlockNumber),
-		GasLimit:         fmt.Sprintf("%d", payload.GasLimit),
-		GasUsed:          fmt.Sprintf("%d", payload.GasUsed),
-		Timestamp:        fmt.Sprintf("%d", payload.Timestamp),
-		ExtraData:        hexutil.Encode(payload.ExtraData),
-		BaseFeePerGas:    baseFeePerGas,
-		BlockHash:        hexutil.Encode(payload.BlockHash),
-		TransactionsRoot: hexutil.Encode(payload.TransactionsRoot),
-		WithdrawalsRoot:  hexutil.Encode(payload.WithdrawalsRoot),
-		BlobGasUsed:      fmt.Sprintf("%d", payload.BlobGasUsed),
-		ExcessBlobGas:    fmt.Sprintf("%d", payload.ExcessBlobGas),
-	}, nil
-}
-
-func (e *ExecutionPayloadHeaderDeneb) ToConsensus() (*enginev1.ExecutionPayloadHeaderDeneb, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionPayloadHeader")
-	}
-	payloadParentHash, err := bytesutil.DecodeHexWithLength(e.ParentHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ParentHash")
-	}
-	payloadFeeRecipient, err := bytesutil.DecodeHexWithLength(e.FeeRecipient, fieldparams.FeeRecipientLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.FeeRecipient")
-	}
-	payloadStateRoot, err := bytesutil.DecodeHexWithLength(e.StateRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.StateRoot")
-	}
-	payloadReceiptsRoot, err := bytesutil.DecodeHexWithLength(e.ReceiptsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ReceiptsRoot")
-	}
-	payloadLogsBloom, err := bytesutil.DecodeHexWithLength(e.LogsBloom, fieldparams.LogsBloomLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.LogsBloom")
-	}
-	payloadPrevRandao, err := bytesutil.DecodeHexWithLength(e.PrevRandao, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.PrevRandao")
-	}
-	payloadBlockNumber, err := strconv.ParseUint(e.BlockNumber, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockNumber")
-	}
-	payloadGasLimit, err := strconv.ParseUint(e.GasLimit, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasLimit")
-	}
-	payloadGasUsed, err := strconv.ParseUint(e.GasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.GasUsed")
-	}
-	payloadTimestamp, err := strconv.ParseUint(e.Timestamp, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.Timestamp")
-	}
-	payloadExtraData, err := bytesutil.DecodeHexWithMaxLength(e.ExtraData, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.ExtraData")
-	}
-	payloadBaseFeePerGas, err := bytesutil.Uint256ToSSZBytes(e.BaseFeePerGas)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BaseFeePerGas")
-	}
-	payloadBlockHash, err := bytesutil.DecodeHexWithLength(e.BlockHash, common.HashLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.BlockHash")
-	}
-	payloadTxsRoot, err := bytesutil.DecodeHexWithLength(e.TransactionsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.TransactionsRoot")
-	}
-	payloadWithdrawalsRoot, err := bytesutil.DecodeHexWithLength(e.WithdrawalsRoot, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayloadHeader.WithdrawalsRoot")
-	}
-	payloadBlobGasUsed, err := strconv.ParseUint(e.BlobGasUsed, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.BlobGasUsed")
-	}
-	payloadExcessBlobGas, err := strconv.ParseUint(e.ExcessBlobGas, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ExecutionPayload.ExcessBlobGas")
-	}
-	return &enginev1.ExecutionPayloadHeaderDeneb{
-		ParentHash:       payloadParentHash,
-		FeeRecipient:     payloadFeeRecipient,
-		StateRoot:        payloadStateRoot,
-		ReceiptsRoot:     payloadReceiptsRoot,
-		LogsBloom:        payloadLogsBloom,
-		PrevRandao:       payloadPrevRandao,
-		BlockNumber:      payloadBlockNumber,
-		GasLimit:         payloadGasLimit,
-		GasUsed:          payloadGasUsed,
-		Timestamp:        payloadTimestamp,
-		ExtraData:        payloadExtraData,
-		BaseFeePerGas:    payloadBaseFeePerGas,
-		BlockHash:        payloadBlockHash,
-		TransactionsRoot: payloadTxsRoot,
-		WithdrawalsRoot:  payloadWithdrawalsRoot,
-		BlobGasUsed:      payloadBlobGasUsed,
-		ExcessBlobGas:    payloadExcessBlobGas,
-	}, nil
-}
-
-// ----------------------------------------------------------------------------
-// Electra
-// ----------------------------------------------------------------------------
-
-var (
-	ExecutionPayloadElectraFromConsensus       = ExecutionPayloadDenebFromConsensus
-	ExecutionPayloadHeaderElectraFromConsensus = ExecutionPayloadHeaderDenebFromConsensus
-)
-
-func WithdrawalRequestsFromConsensus(ws []*enginev1.WithdrawalRequest) []*WithdrawalRequest {
-	result := make([]*WithdrawalRequest, len(ws))
-	for i, w := range ws {
-		result[i] = WithdrawalRequestFromConsensus(w)
-	}
-	return result
-}
-
-func WithdrawalRequestFromConsensus(w *enginev1.WithdrawalRequest) *WithdrawalRequest {
-	return &WithdrawalRequest{
-		SourceAddress:   hexutil.Encode(w.SourceAddress),
-		ValidatorPubkey: hexutil.Encode(w.ValidatorPubkey),
-		Amount:          fmt.Sprintf("%d", w.Amount),
-	}
-}
-
-func (w *WithdrawalRequest) ToConsensus() (*enginev1.WithdrawalRequest, error) {
-	if w == nil {
-		return nil, server.NewDecodeError(errNilValue, "WithdrawalRequest")
-	}
-	src, err := bytesutil.DecodeHexWithLength(w.SourceAddress, common.AddressLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "SourceAddress")
-	}
-	pubkey, err := bytesutil.DecodeHexWithLength(w.ValidatorPubkey, fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "ValidatorPubkey")
-	}
-	amount, err := strconv.ParseUint(w.Amount, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Amount")
-	}
-	return &enginev1.WithdrawalRequest{
-		SourceAddress:   src,
-		ValidatorPubkey: pubkey,
-		Amount:          amount,
-	}, nil
-}
-
-func ConsolidationRequestsFromConsensus(cs []*enginev1.ConsolidationRequest) []*ConsolidationRequest {
-	result := make([]*ConsolidationRequest, len(cs))
-	for i, c := range cs {
-		result[i] = ConsolidationRequestFromConsensus(c)
-	}
-	return result
-}
-
-func ConsolidationRequestFromConsensus(c *enginev1.ConsolidationRequest) *ConsolidationRequest {
-	return &ConsolidationRequest{
-		SourceAddress: hexutil.Encode(c.SourceAddress),
-		SourcePubkey:  hexutil.Encode(c.SourcePubkey),
-		TargetPubkey:  hexutil.Encode(c.TargetPubkey),
-	}
-}
-
-func (c *ConsolidationRequest) ToConsensus() (*enginev1.ConsolidationRequest, error) {
-	if c == nil {
-		return nil, server.NewDecodeError(errNilValue, "ConsolidationRequest")
-	}
-	srcAddress, err := bytesutil.DecodeHexWithLength(c.SourceAddress, common.AddressLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "SourceAddress")
-	}
-	srcPubkey, err := bytesutil.DecodeHexWithLength(c.SourcePubkey, fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "SourcePubkey")
-	}
-	targetPubkey, err := bytesutil.DecodeHexWithLength(c.TargetPubkey, fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "TargetPubkey")
-	}
-	return &enginev1.ConsolidationRequest{
-		SourceAddress: srcAddress,
-		SourcePubkey:  srcPubkey,
-		TargetPubkey:  targetPubkey,
-	}, nil
-}
-
-func DepositRequestsFromConsensus(ds []*enginev1.DepositRequest) []*DepositRequest {
-	result := make([]*DepositRequest, len(ds))
-	for i, d := range ds {
-		result[i] = DepositRequestFromConsensus(d)
-	}
-	return result
-}
-
-func DepositRequestFromConsensus(d *enginev1.DepositRequest) *DepositRequest {
-	return &DepositRequest{
-		Pubkey:                hexutil.Encode(d.Pubkey),
-		WithdrawalCredentials: hexutil.Encode(d.WithdrawalCredentials),
-		Amount:                fmt.Sprintf("%d", d.Amount),
-		Signature:             hexutil.Encode(d.Signature),
-		Index:                 fmt.Sprintf("%d", d.Index),
-	}
-}
-
-func (d *DepositRequest) ToConsensus() (*enginev1.DepositRequest, error) {
-	if d == nil {
-		return nil, server.NewDecodeError(errNilValue, "DepositRequest")
-	}
-	pubkey, err := bytesutil.DecodeHexWithLength(d.Pubkey, fieldparams.BLSPubkeyLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Pubkey")
-	}
-	withdrawalCredentials, err := bytesutil.DecodeHexWithLength(d.WithdrawalCredentials, fieldparams.RootLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "WithdrawalCredentials")
-	}
-	amount, err := strconv.ParseUint(d.Amount, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Amount")
-	}
-	sig, err := bytesutil.DecodeHexWithLength(d.Signature, fieldparams.BLSSignatureLength)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Signature")
-	}
-	index, err := strconv.ParseUint(d.Index, 10, 64)
-	if err != nil {
-		return nil, server.NewDecodeError(err, "Index")
-	}
-	return &enginev1.DepositRequest{
-		Pubkey:                pubkey,
-		WithdrawalCredentials: withdrawalCredentials,
-		Amount:                amount,
-		Signature:             sig,
-		Index:                 index,
-	}, nil
-}
-
-func ExecutionRequestsFromConsensus(er *enginev1.ExecutionRequests) *ExecutionRequests {
-	return &ExecutionRequests{
-		Deposits:       DepositRequestsFromConsensus(er.Deposits),
-		Withdrawals:    WithdrawalRequestsFromConsensus(er.Withdrawals),
-		Consolidations: ConsolidationRequestsFromConsensus(er.Consolidations),
-	}
-}
-
-func (e *ExecutionRequests) ToConsensus() (*enginev1.ExecutionRequests, error) {
-	if e == nil {
-		return nil, server.NewDecodeError(errNilValue, "ExecutionRequests")
-	}
-	var err error
-	if err = slice.VerifyMaxLength(e.Deposits, params.BeaconConfig().MaxDepositRequestsPerPayload); err != nil {
-		return nil, err
-	}
-	depositRequests := make([]*enginev1.DepositRequest, len(e.Deposits))
-	for i, d := range e.Deposits {
-		depositRequests[i], err = d.ToConsensus()
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionRequests.Deposits[%d]", i))
-		}
-	}
-
-	if err = slice.VerifyMaxLength(e.Withdrawals, params.BeaconConfig().MaxWithdrawalRequestsPerPayload); err != nil {
-		return nil, err
-	}
-	withdrawalRequests := make([]*enginev1.WithdrawalRequest, len(e.Withdrawals))
-	for i, w := range e.Withdrawals {
-		withdrawalRequests[i], err = w.ToConsensus()
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionRequests.Withdrawals[%d]", i))
-		}
-	}
-
-	if err = slice.VerifyMaxLength(e.Consolidations, params.BeaconConfig().MaxConsolidationsRequestsPerPayload); err != nil {
-		return nil, err
-	}
-	consolidationRequests := make([]*enginev1.ConsolidationRequest, len(e.Consolidations))
-	for i, c := range e.Consolidations {
-		consolidationRequests[i], err = c.ToConsensus()
-		if err != nil {
-			return nil, server.NewDecodeError(err, fmt.Sprintf("ExecutionRequests.Consolidations[%d]", i))
-		}
-	}
-	return &enginev1.ExecutionRequests{
-		Deposits:       depositRequests,
-		Withdrawals:    withdrawalRequests,
-		Consolidations: consolidationRequests,
-	}, nil
-}
-
-// ----------------------------------------------------------------------------
-// Fulu
-// ----------------------------------------------------------------------------
-
-var (
-	ExecutionPayloadFuluFromConsensus       = ExecutionPayloadDenebFromConsensus
-	ExecutionPayloadHeaderFuluFromConsensus = ExecutionPayloadHeaderDenebFromConsensus
-	BeaconBlockFuluFromConsensus            = BeaconBlockElectraFromConsensus
-)
--- a/api/server/structs/conversions_block_execution_test.go
+++ b/api/server/structs/conversions_block_execution_test.go
@@ -1,563 +0,0 @@
-package structs
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-)
-
-func fillByteSlice(sliceLength int, value byte) []byte {
-	bytes := make([]byte, sliceLength)
-
-	for index := range bytes {
-		bytes[index] = value
-	}
-
-	return bytes
-}
-
-// TestExecutionPayloadFromConsensus_HappyPath checks the
-// ExecutionPayloadFromConsensus function under normal conditions.
-func TestExecutionPayloadFromConsensus_HappyPath(t *testing.T) {
-	consensusPayload := &enginev1.ExecutionPayload{
-		ParentHash:    fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:  fillByteSlice(20, 0xbb),
-		StateRoot:     fillByteSlice(32, 0xcc),
-		ReceiptsRoot:  fillByteSlice(32, 0xdd),
-		LogsBloom:     fillByteSlice(256, 0xee),
-		PrevRandao:    fillByteSlice(32, 0xff),
-		BlockNumber:   12345,
-		GasLimit:      15000000,
-		GasUsed:       8000000,
-		Timestamp:     1680000000,
-		ExtraData:     fillByteSlice(8, 0x11),
-		BaseFeePerGas: fillByteSlice(32, 0x01),
-		BlockHash:     fillByteSlice(common.HashLength, 0x22),
-		Transactions: [][]byte{
-			fillByteSlice(10, 0x33),
-			fillByteSlice(10, 0x44),
-		},
-	}
-
-	result, err := ExecutionPayloadFromConsensus(consensusPayload)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.Equal(t, hexutil.Encode(consensusPayload.ParentHash), result.ParentHash)
-	require.Equal(t, hexutil.Encode(consensusPayload.FeeRecipient), result.FeeRecipient)
-	require.Equal(t, hexutil.Encode(consensusPayload.StateRoot), result.StateRoot)
-	require.Equal(t, hexutil.Encode(consensusPayload.ReceiptsRoot), result.ReceiptsRoot)
-	require.Equal(t, fmt.Sprintf("%d", consensusPayload.BlockNumber), result.BlockNumber)
-}
-
-// TestExecutionPayload_ToConsensus_HappyPath checks the
-// (*ExecutionPayload).ToConsensus function under normal conditions.
-func TestExecutionPayload_ToConsensus_HappyPath(t *testing.T) {
-	payload := &ExecutionPayload{
-		ParentHash:    hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:  hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:     hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:  hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:     hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:    hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:   "12345",
-		GasLimit:      "15000000",
-		GasUsed:       "8000000",
-		Timestamp:     "1680000000",
-		ExtraData:     "0x11111111",
-		BaseFeePerGas: "1234",
-		BlockHash:     hexutil.Encode(fillByteSlice(common.HashLength, 0x22)),
-		Transactions: []string{
-			hexutil.Encode(fillByteSlice(10, 0x33)),
-			hexutil.Encode(fillByteSlice(10, 0x44)),
-		},
-	}
-
-	result, err := payload.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, result.ParentHash, fillByteSlice(common.HashLength, 0xaa))
-	require.DeepEqual(t, result.FeeRecipient, fillByteSlice(20, 0xbb))
-	require.DeepEqual(t, result.StateRoot, fillByteSlice(32, 0xcc))
-}
-
-// TestExecutionPayloadHeaderFromConsensus_HappyPath checks the
-// ExecutionPayloadHeaderFromConsensus function under normal conditions.
-func TestExecutionPayloadHeaderFromConsensus_HappyPath(t *testing.T) {
-	consensusHeader := &enginev1.ExecutionPayloadHeader{
-		ParentHash:       fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:     fillByteSlice(20, 0xbb),
-		StateRoot:        fillByteSlice(32, 0xcc),
-		ReceiptsRoot:     fillByteSlice(32, 0xdd),
-		LogsBloom:        fillByteSlice(256, 0xee),
-		PrevRandao:       fillByteSlice(32, 0xff),
-		BlockNumber:      9999,
-		GasLimit:         5000000,
-		GasUsed:          2500000,
-		Timestamp:        1111111111,
-		ExtraData:        fillByteSlice(4, 0x12),
-		BaseFeePerGas:    fillByteSlice(32, 0x34),
-		BlockHash:        fillByteSlice(common.HashLength, 0x56),
-		TransactionsRoot: fillByteSlice(32, 0x78),
-	}
-
-	result, err := ExecutionPayloadHeaderFromConsensus(consensusHeader)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.Equal(t, hexutil.Encode(consensusHeader.ParentHash), result.ParentHash)
-	require.Equal(t, fmt.Sprintf("%d", consensusHeader.BlockNumber), result.BlockNumber)
-}
-
-// TestExecutionPayloadHeader_ToConsensus_HappyPath checks the
-// (*ExecutionPayloadHeader).ToConsensus function under normal conditions.
-func TestExecutionPayloadHeader_ToConsensus_HappyPath(t *testing.T) {
-	header := &ExecutionPayloadHeader{
-		ParentHash:       hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:     hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:        hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:     hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:        hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:       hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:      "9999",
-		GasLimit:         "5000000",
-		GasUsed:          "2500000",
-		Timestamp:        "1111111111",
-		ExtraData:        "0x1234abcd",
-		BaseFeePerGas:    "1234",
-		BlockHash:        hexutil.Encode(fillByteSlice(common.HashLength, 0x56)),
-		TransactionsRoot: hexutil.Encode(fillByteSlice(32, 0x78)),
-	}
-
-	result, err := header.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, hexutil.Encode(result.ParentHash), header.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(result.FeeRecipient), header.FeeRecipient)
-	require.DeepEqual(t, hexutil.Encode(result.StateRoot), header.StateRoot)
-}
-
-// TestExecutionPayloadCapellaFromConsensus_HappyPath checks the
-// ExecutionPayloadCapellaFromConsensus function under normal conditions.
-func TestExecutionPayloadCapellaFromConsensus_HappyPath(t *testing.T) {
-	capellaPayload := &enginev1.ExecutionPayloadCapella{
-		ParentHash:    fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:  fillByteSlice(20, 0xbb),
-		StateRoot:     fillByteSlice(32, 0xcc),
-		ReceiptsRoot:  fillByteSlice(32, 0xdd),
-		LogsBloom:     fillByteSlice(256, 0xee),
-		PrevRandao:    fillByteSlice(32, 0xff),
-		BlockNumber:   123,
-		GasLimit:      9876543,
-		GasUsed:       1234567,
-		Timestamp:     5555555,
-		ExtraData:     fillByteSlice(6, 0x11),
-		BaseFeePerGas: fillByteSlice(32, 0x22),
-		BlockHash:     fillByteSlice(common.HashLength, 0x33),
-		Transactions: [][]byte{
-			fillByteSlice(5, 0x44),
-		},
-		Withdrawals: []*enginev1.Withdrawal{
-			{
-				Index:          1,
-				ValidatorIndex: 2,
-				Address:        fillByteSlice(20, 0xaa),
-				Amount:         100,
-			},
-		},
-	}
-
-	result, err := ExecutionPayloadCapellaFromConsensus(capellaPayload)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.Equal(t, hexutil.Encode(capellaPayload.ParentHash), result.ParentHash)
-	require.Equal(t, len(capellaPayload.Transactions), len(result.Transactions))
-	require.Equal(t, len(capellaPayload.Withdrawals), len(result.Withdrawals))
-}
-
-// TestExecutionPayloadCapella_ToConsensus_HappyPath checks the
-// (*ExecutionPayloadCapella).ToConsensus function under normal conditions.
-func TestExecutionPayloadCapella_ToConsensus_HappyPath(t *testing.T) {
-	capella := &ExecutionPayloadCapella{
-		ParentHash:    hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:  hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:     hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:  hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:     hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:    hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:   "123",
-		GasLimit:      "9876543",
-		GasUsed:       "1234567",
-		Timestamp:     "5555555",
-		ExtraData:     hexutil.Encode(fillByteSlice(6, 0x11)),
-		BaseFeePerGas: "1234",
-		BlockHash:     hexutil.Encode(fillByteSlice(common.HashLength, 0x33)),
-		Transactions: []string{
-			hexutil.Encode(fillByteSlice(5, 0x44)),
-		},
-		Withdrawals: []*Withdrawal{
-			{
-				WithdrawalIndex:  "1",
-				ValidatorIndex:   "2",
-				ExecutionAddress: hexutil.Encode(fillByteSlice(20, 0xaa)),
-				Amount:           "100",
-			},
-		},
-	}
-
-	result, err := capella.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, hexutil.Encode(result.ParentHash), capella.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(result.FeeRecipient), capella.FeeRecipient)
-	require.DeepEqual(t, hexutil.Encode(result.StateRoot), capella.StateRoot)
-}
-
-// TestExecutionPayloadDenebFromConsensus_HappyPath checks the
-// ExecutionPayloadDenebFromConsensus function under normal conditions.
-func TestExecutionPayloadDenebFromConsensus_HappyPath(t *testing.T) {
-	denebPayload := &enginev1.ExecutionPayloadDeneb{
-		ParentHash:    fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:  fillByteSlice(20, 0xbb),
-		StateRoot:     fillByteSlice(32, 0xcc),
-		ReceiptsRoot:  fillByteSlice(32, 0xdd),
-		LogsBloom:     fillByteSlice(256, 0xee),
-		PrevRandao:    fillByteSlice(32, 0xff),
-		BlockNumber:   999,
-		GasLimit:      2222222,
-		GasUsed:       1111111,
-		Timestamp:     666666,
-		ExtraData:     fillByteSlice(6, 0x11),
-		BaseFeePerGas: fillByteSlice(32, 0x22),
-		BlockHash:     fillByteSlice(common.HashLength, 0x33),
-		Transactions: [][]byte{
-			fillByteSlice(5, 0x44),
-		},
-		Withdrawals: []*enginev1.Withdrawal{
-			{
-				Index:          1,
-				ValidatorIndex: 2,
-				Address:        fillByteSlice(20, 0xaa),
-				Amount:         100,
-			},
-		},
-		BlobGasUsed:   1234,
-		ExcessBlobGas: 5678,
-	}
-
-	result, err := ExecutionPayloadDenebFromConsensus(denebPayload)
-	require.NoError(t, err)
-	require.Equal(t, hexutil.Encode(denebPayload.ParentHash), result.ParentHash)
-	require.Equal(t, len(denebPayload.Transactions), len(result.Transactions))
-	require.Equal(t, len(denebPayload.Withdrawals), len(result.Withdrawals))
-	require.Equal(t, "1234", result.BlobGasUsed)
-	require.Equal(t, fmt.Sprintf("%d", denebPayload.BlockNumber), result.BlockNumber)
-}
-
-// TestExecutionPayloadDeneb_ToConsensus_HappyPath checks the
-// (*ExecutionPayloadDeneb).ToConsensus function under normal conditions.
-func TestExecutionPayloadDeneb_ToConsensus_HappyPath(t *testing.T) {
-	deneb := &ExecutionPayloadDeneb{
-		ParentHash:    hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:  hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:     hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:  hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:     hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:    hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:   "999",
-		GasLimit:      "2222222",
-		GasUsed:       "1111111",
-		Timestamp:     "666666",
-		ExtraData:     hexutil.Encode(fillByteSlice(6, 0x11)),
-		BaseFeePerGas: "1234",
-		BlockHash:     hexutil.Encode(fillByteSlice(common.HashLength, 0x33)),
-		Transactions: []string{
-			hexutil.Encode(fillByteSlice(5, 0x44)),
-		},
-		Withdrawals: []*Withdrawal{
-			{
-				WithdrawalIndex:  "1",
-				ValidatorIndex:   "2",
-				ExecutionAddress: hexutil.Encode(fillByteSlice(20, 0xaa)),
-				Amount:           "100",
-			},
-		},
-		BlobGasUsed:   "1234",
-		ExcessBlobGas: "5678",
-	}
-
-	result, err := deneb.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, hexutil.Encode(result.ParentHash), deneb.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(result.FeeRecipient), deneb.FeeRecipient)
-	require.Equal(t, result.BlockNumber, uint64(999))
-}
-
-func TestExecutionPayloadHeaderCapellaFromConsensus_HappyPath(t *testing.T) {
-	capellaHeader := &enginev1.ExecutionPayloadHeaderCapella{
-		ParentHash:       fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:     fillByteSlice(20, 0xbb),
-		StateRoot:        fillByteSlice(32, 0xcc),
-		ReceiptsRoot:     fillByteSlice(32, 0xdd),
-		LogsBloom:        fillByteSlice(256, 0xee),
-		PrevRandao:       fillByteSlice(32, 0xff),
-		BlockNumber:      555,
-		GasLimit:         1111111,
-		GasUsed:          222222,
-		Timestamp:        3333333333,
-		ExtraData:        fillByteSlice(4, 0x12),
-		BaseFeePerGas:    fillByteSlice(32, 0x34),
-		BlockHash:        fillByteSlice(common.HashLength, 0x56),
-		TransactionsRoot: fillByteSlice(32, 0x78),
-		WithdrawalsRoot:  fillByteSlice(32, 0x99),
-	}
-
-	result, err := ExecutionPayloadHeaderCapellaFromConsensus(capellaHeader)
-	require.NoError(t, err)
-	require.Equal(t, hexutil.Encode(capellaHeader.ParentHash), result.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(capellaHeader.WithdrawalsRoot), result.WithdrawalsRoot)
-}
-
-func TestExecutionPayloadHeaderCapella_ToConsensus_HappyPath(t *testing.T) {
-	header := &ExecutionPayloadHeaderCapella{
-		ParentHash:       hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:     hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:        hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:     hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:        hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:       hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:      "555",
-		GasLimit:         "1111111",
-		GasUsed:          "222222",
-		Timestamp:        "3333333333",
-		ExtraData:        "0x1234abcd",
-		BaseFeePerGas:    "1234",
-		BlockHash:        hexutil.Encode(fillByteSlice(common.HashLength, 0x56)),
-		TransactionsRoot: hexutil.Encode(fillByteSlice(32, 0x78)),
-		WithdrawalsRoot:  hexutil.Encode(fillByteSlice(32, 0x99)),
-	}
-
-	result, err := header.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, hexutil.Encode(result.ParentHash), header.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(result.FeeRecipient), header.FeeRecipient)
-	require.DeepEqual(t, hexutil.Encode(result.StateRoot), header.StateRoot)
-	require.DeepEqual(t, hexutil.Encode(result.ReceiptsRoot), header.ReceiptsRoot)
-	require.DeepEqual(t, hexutil.Encode(result.WithdrawalsRoot), header.WithdrawalsRoot)
-}
-
-func TestExecutionPayloadHeaderDenebFromConsensus_HappyPath(t *testing.T) {
-	denebHeader := &enginev1.ExecutionPayloadHeaderDeneb{
-		ParentHash:       fillByteSlice(common.HashLength, 0xaa),
-		FeeRecipient:     fillByteSlice(20, 0xbb),
-		StateRoot:        fillByteSlice(32, 0xcc),
-		ReceiptsRoot:     fillByteSlice(32, 0xdd),
-		LogsBloom:        fillByteSlice(256, 0xee),
-		PrevRandao:       fillByteSlice(32, 0xff),
-		BlockNumber:      999,
-		GasLimit:         5000000,
-		GasUsed:          2500000,
-		Timestamp:        4444444444,
-		ExtraData:        fillByteSlice(4, 0x12),
-		BaseFeePerGas:    fillByteSlice(32, 0x34),
-		BlockHash:        fillByteSlice(common.HashLength, 0x56),
-		TransactionsRoot: fillByteSlice(32, 0x78),
-		WithdrawalsRoot:  fillByteSlice(32, 0x99),
-		BlobGasUsed:      1234,
-		ExcessBlobGas:    5678,
-	}
-
-	result, err := ExecutionPayloadHeaderDenebFromConsensus(denebHeader)
-	require.NoError(t, err)
-	require.Equal(t, hexutil.Encode(denebHeader.ParentHash), result.ParentHash)
-	require.DeepEqual(t, hexutil.Encode(denebHeader.FeeRecipient), result.FeeRecipient)
-	require.DeepEqual(t, hexutil.Encode(denebHeader.StateRoot), result.StateRoot)
-	require.DeepEqual(t, fmt.Sprintf("%d", denebHeader.BlobGasUsed), result.BlobGasUsed)
-}
-
-func TestExecutionPayloadHeaderDeneb_ToConsensus_HappyPath(t *testing.T) {
-	header := &ExecutionPayloadHeaderDeneb{
-		ParentHash:       hexutil.Encode(fillByteSlice(common.HashLength, 0xaa)),
-		FeeRecipient:     hexutil.Encode(fillByteSlice(20, 0xbb)),
-		StateRoot:        hexutil.Encode(fillByteSlice(32, 0xcc)),
-		ReceiptsRoot:     hexutil.Encode(fillByteSlice(32, 0xdd)),
-		LogsBloom:        hexutil.Encode(fillByteSlice(256, 0xee)),
-		PrevRandao:       hexutil.Encode(fillByteSlice(32, 0xff)),
-		BlockNumber:      "999",
-		GasLimit:         "5000000",
-		GasUsed:          "2500000",
-		Timestamp:        "4444444444",
-		ExtraData:        "0x1234abcd",
-		BaseFeePerGas:    "1234",
-		BlockHash:        hexutil.Encode(fillByteSlice(common.HashLength, 0x56)),
-		TransactionsRoot: hexutil.Encode(fillByteSlice(32, 0x78)),
-		WithdrawalsRoot:  hexutil.Encode(fillByteSlice(32, 0x99)),
-		BlobGasUsed:      "1234",
-		ExcessBlobGas:    "5678",
-	}
-
-	result, err := header.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, hexutil.Encode(result.ParentHash), header.ParentHash)
-	require.DeepEqual(t, result.BlobGasUsed, uint64(1234))
-	require.DeepEqual(t, result.ExcessBlobGas, uint64(5678))
-	require.DeepEqual(t, result.BlockNumber, uint64(999))
-}
-
-func TestWithdrawalRequestsFromConsensus_HappyPath(t *testing.T) {
-	consensusRequests := []*enginev1.WithdrawalRequest{
-		{
-			SourceAddress:   fillByteSlice(20, 0xbb),
-			ValidatorPubkey: fillByteSlice(48, 0xbb),
-			Amount:          12345,
-		},
-		{
-			SourceAddress:   fillByteSlice(20, 0xcc),
-			ValidatorPubkey: fillByteSlice(48, 0xcc),
-			Amount:          54321,
-		},
-	}
-
-	result := WithdrawalRequestsFromConsensus(consensusRequests)
-	require.DeepEqual(t, len(result), len(consensusRequests))
-	require.DeepEqual(t, result[0].Amount, fmt.Sprintf("%d", consensusRequests[0].Amount))
-}
-
-func TestWithdrawalRequestFromConsensus_HappyPath(t *testing.T) {
-	req := &enginev1.WithdrawalRequest{
-		SourceAddress:   fillByteSlice(20, 0xbb),
-		ValidatorPubkey: fillByteSlice(48, 0xbb),
-		Amount:          42,
-	}
-	result := WithdrawalRequestFromConsensus(req)
-	require.NotNil(t, result)
-	require.DeepEqual(t, result.SourceAddress, hexutil.Encode(fillByteSlice(20, 0xbb)))
-}
-
-func TestWithdrawalRequest_ToConsensus_HappyPath(t *testing.T) {
-	withdrawalReq := &WithdrawalRequest{
-		SourceAddress:   hexutil.Encode(fillByteSlice(20, 111)),
-		ValidatorPubkey: hexutil.Encode(fillByteSlice(48, 123)),
-		Amount:          "12345",
-	}
-	result, err := withdrawalReq.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, result.Amount, uint64(12345))
-}
-
-func TestConsolidationRequestsFromConsensus_HappyPath(t *testing.T) {
-	consensusRequests := []*enginev1.ConsolidationRequest{
-		{
-			SourceAddress: fillByteSlice(20, 111),
-			SourcePubkey:  fillByteSlice(48, 112),
-			TargetPubkey:  fillByteSlice(48, 113),
-		},
-	}
-	result := ConsolidationRequestsFromConsensus(consensusRequests)
-	require.DeepEqual(t, len(result), len(consensusRequests))
-	require.DeepEqual(t, result[0].SourceAddress, "0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f")
-}
-
-func TestDepositRequestsFromConsensus_HappyPath(t *testing.T) {
-	ds := []*enginev1.DepositRequest{
-		{
-			Pubkey:                fillByteSlice(48, 0xbb),
-			WithdrawalCredentials: fillByteSlice(32, 0xdd),
-			Amount:                98765,
-			Signature:             fillByteSlice(96, 0xff),
-			Index:                 111,
-		},
-	}
-	result := DepositRequestsFromConsensus(ds)
-	require.DeepEqual(t, len(result), len(ds))
-	require.DeepEqual(t, result[0].Amount, "98765")
-}
-
-func TestDepositRequest_ToConsensus_HappyPath(t *testing.T) {
-	req := &DepositRequest{
-		Pubkey:                hexutil.Encode(fillByteSlice(48, 0xbb)),
-		WithdrawalCredentials: hexutil.Encode(fillByteSlice(32, 0xaa)),
-		Amount:                "123",
-		Signature:             hexutil.Encode(fillByteSlice(96, 0xdd)),
-		Index:                 "456",
-	}
-
-	result, err := req.ToConsensus()
-	require.NoError(t, err)
-	require.DeepEqual(t, result.Amount, uint64(123))
-	require.DeepEqual(t, result.Signature, fillByteSlice(96, 0xdd))
-}
-
-func TestExecutionRequestsFromConsensus_HappyPath(t *testing.T) {
-	er := &enginev1.ExecutionRequests{
-		Deposits: []*enginev1.DepositRequest{
-			{
-				Pubkey:                fillByteSlice(48, 0xba),
-				WithdrawalCredentials: fillByteSlice(32, 0xaa),
-				Amount:                33,
-				Signature:             fillByteSlice(96, 0xff),
-				Index:                 44,
-			},
-		},
-		Withdrawals: []*enginev1.WithdrawalRequest{
-			{
-				SourceAddress:   fillByteSlice(20, 0xaa),
-				ValidatorPubkey: fillByteSlice(48, 0xba),
-				Amount:          555,
-			},
-		},
-		Consolidations: []*enginev1.ConsolidationRequest{
-			{
-				SourceAddress: fillByteSlice(20, 0xdd),
-				SourcePubkey:  fillByteSlice(48, 0xdd),
-				TargetPubkey:  fillByteSlice(48, 0xcc),
-			},
-		},
-	}
-
-	result := ExecutionRequestsFromConsensus(er)
-	require.NotNil(t, result)
-	require.Equal(t, 1, len(result.Deposits))
-	require.Equal(t, "33", result.Deposits[0].Amount)
-	require.Equal(t, 1, len(result.Withdrawals))
-	require.Equal(t, "555", result.Withdrawals[0].Amount)
-	require.Equal(t, 1, len(result.Consolidations))
-	require.Equal(t, "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc", result.Consolidations[0].TargetPubkey)
-}
-
-func TestExecutionRequests_ToConsensus_HappyPath(t *testing.T) {
-	execReq := &ExecutionRequests{
-		Deposits: []*DepositRequest{
-			{
-				Pubkey:                hexutil.Encode(fillByteSlice(48, 0xbb)),
-				WithdrawalCredentials: hexutil.Encode(fillByteSlice(32, 0xaa)),
-				Amount:                "33",
-				Signature:             hexutil.Encode(fillByteSlice(96, 0xff)),
-				Index:                 "44",
-			},
-		},
-		Withdrawals: []*WithdrawalRequest{
-			{
-				SourceAddress:   hexutil.Encode(fillByteSlice(20, 0xdd)),
-				ValidatorPubkey: hexutil.Encode(fillByteSlice(48, 0xbb)),
-				Amount:          "555",
-			},
-		},
-		Consolidations: []*ConsolidationRequest{
-			{
-				SourceAddress: hexutil.Encode(fillByteSlice(20, 0xcc)),
-				SourcePubkey:  hexutil.Encode(fillByteSlice(48, 0xbb)),
-				TargetPubkey:  hexutil.Encode(fillByteSlice(48, 0xcc)),
-			},
-		},
-	}
-
-	result, err := execReq.ToConsensus()
-	require.NoError(t, err)
-
-	require.Equal(t, 1, len(result.Deposits))
-	require.Equal(t, uint64(33), result.Deposits[0].Amount)
-	require.Equal(t, 1, len(result.Withdrawals))
-	require.Equal(t, uint64(555), result.Withdrawals[0].Amount)
-	require.Equal(t, 1, len(result.Consolidations))
-	require.DeepEqual(t, fillByteSlice(48, 0xcc), result.Consolidations[0].TargetPubkey)
-}
--- a/api/server/structs/endpoints_beacon.go
+++ b/api/server/structs/endpoints_beacon.go
@@ -78,8 +78,8 @@ type GetBlockHeaderResponse struct {
 }

 type GetValidatorsRequest struct {
-	Ids      []string `json:"ids,omitempty"`
-	Statuses []string `json:"statuses,omitempty"`
+	Ids      []string `json:"ids"`
+	Statuses []string `json:"statuses"`
 }

 type GetValidatorsResponse struct {
@@ -250,17 +250,3 @@ type ChainHead struct {
 	PreviousJustifiedBlockRoot string `json:"previous_justified_block_root"`
 	OptimisticStatus           bool   `json:"optimistic_status"`
 }
-
-type GetPendingDepositsResponse struct {
-	Version             string            `json:"version"`
-	ExecutionOptimistic bool              `json:"execution_optimistic"`
-	Finalized           bool              `json:"finalized"`
-	Data                []*PendingDeposit `json:"data"`
-}
-
-type GetPendingPartialWithdrawalsResponse struct {
-	Version             string                      `json:"version"`
-	ExecutionOptimistic bool                        `json:"execution_optimistic"`
-	Finalized           bool                        `json:"finalized"`
-	Data                []*PendingPartialWithdrawal `json:"data"`
-}
--- a/api/server/structs/endpoints_debug.go
+++ b/api/server/structs/endpoints_debug.go
@@ -54,5 +54,4 @@ type ForkChoiceNodeExtraData struct {
 	Balance                  string `json:"balance"`
 	ExecutionOptimistic      bool   `json:"execution_optimistic"`
 	TimeStamp                string `json:"timestamp"`
-	Target                   string `json:"target"`
 }
--- a/api/server/structs/endpoints_events.go
+++ b/api/server/structs/endpoints_events.go
@@ -20,11 +20,6 @@ type BlockEvent struct {
 	ExecutionOptimistic bool   `json:"execution_optimistic"`
 }

-type BlockGossipEvent struct {
-	Slot  string `json:"slot"`
-	Block string `json:"block"`
-}
-
 type AggregatedAttEventSource struct {
 	Aggregate *Attestation `json:"aggregate"`
 }
--- a/api/server/structs/other.go
+++ b/api/server/structs/other.go
@@ -244,6 +244,26 @@ type Withdrawal struct {
 	Amount           string `json:"amount"`
 }

+type DepositRequest struct {
+	Pubkey                string `json:"pubkey"`
+	WithdrawalCredentials string `json:"withdrawal_credentials"`
+	Amount                string `json:"amount"`
+	Signature             string `json:"signature"`
+	Index                 string `json:"index"`
+}
+
+type WithdrawalRequest struct {
+	SourceAddress   string `json:"source_address"`
+	ValidatorPubkey string `json:"validator_pubkey"`
+	Amount          string `json:"amount"`
+}
+
+type ConsolidationRequest struct {
+	SourceAddress string `json:"source_address"`
+	SourcePubkey  string `json:"source_pubkey"`
+	TargetPubkey  string `json:"target_pubkey"`
+}
+
 type PendingDeposit struct {
 	Pubkey                string `json:"pubkey"`
 	WithdrawalCredentials string `json:"withdrawal_credentials"`
--- a/async/event/subscription.go
+++ b/async/event/subscription.go
@@ -154,7 +154,7 @@ retry:
 				continue retry
 			}
 			if sub == nil {
-				panic("event: ResubscribeFunc returned nil subscription and no error") // lint:nopanic -- This should never happen.
+				panic("event: ResubscribeFunc returned nil subscription and no error")
 			}
 			return sub
 		case <-s.unsub:
--- a/async/multilock.go
+++ b/async/multilock.go
@@ -125,7 +125,7 @@ func getChan(key string) chan byte {

 // Return a new string with unique elements.
 func unique(arr []string) []string {
-	if len(arr) <= 1 {
+	if arr == nil || len(arr) <= 1 {
 		return arr
 	}

--- a/beacon-chain/blockchain/BUILD.bazel
+++ b/beacon-chain/blockchain/BUILD.bazel
@@ -26,7 +26,6 @@ go_library(
        "receive_blob.go",
        "receive_block.go",
        "service.go",
-        "setup_forchoice.go",
        "tracked_proposer.go",
        "weak_subjectivity_checks.go",
    ],
@@ -97,7 +96,6 @@ go_library(
        "@com_github_pkg_errors//:go_default_library",
        "@com_github_prometheus_client_golang//prometheus:go_default_library",
        "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
-        "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
        "@com_github_sirupsen_logrus//:go_default_library",
        "@org_golang_x_sync//errgroup:go_default_library",
    ],
@@ -128,7 +126,6 @@ go_test(
        "receive_block_test.go",
        "service_norace_test.go",
        "service_test.go",
-        "setup_forkchoice_test.go",
        "setup_test.go",
        "weak_subjectivity_checks_test.go",
    ],
@@ -157,7 +154,6 @@ go_test(
        "//beacon-chain/forkchoice/doubly-linked-tree:go_default_library",
        "//beacon-chain/forkchoice/types:go_default_library",
        "//beacon-chain/operations/attestations:go_default_library",
-        "//beacon-chain/operations/attestations/kv:go_default_library",
        "//beacon-chain/operations/blstoexec:go_default_library",
        "//beacon-chain/operations/slashings:go_default_library",
        "//beacon-chain/operations/voluntaryexits:go_default_library",
@@ -189,7 +185,6 @@ go_test(
        "@com_github_ethereum_go_ethereum//core/types:go_default_library",
        "@com_github_holiman_uint256//:go_default_library",
        "@com_github_pkg_errors//:go_default_library",
-        "@com_github_prysmaticlabs_go_bitfield//:go_default_library",
        "@com_github_sirupsen_logrus//:go_default_library",
        "@com_github_sirupsen_logrus//hooks/test:go_default_library",
        "@org_golang_google_protobuf//proto:go_default_library",
--- a/beacon-chain/blockchain/chain_info_forkchoice.go
+++ b/beacon-chain/blockchain/chain_info_forkchoice.go
@@ -3,13 +3,10 @@ package blockchain
 import (
 	"context"

-	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
 	consensus_blocks "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/forkchoice"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
-	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 )

 // CachedHeadRoot returns the corresponding value from Forkchoice
@@ -103,26 +100,3 @@ func (s *Service) ParentRoot(root [32]byte) ([32]byte, error) {
 	defer s.cfg.ForkChoiceStore.RUnlock()
 	return s.cfg.ForkChoiceStore.ParentRoot(root)
 }
-
-// hashForGenesisBlock returns the right hash for the genesis block
-func (s *Service) hashForGenesisBlock(ctx context.Context, root [32]byte) ([]byte, error) {
-	genRoot, err := s.cfg.BeaconDB.GenesisBlockRoot(ctx)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get genesis block root")
-	}
-	if root != genRoot {
-		return nil, errNotGenesisRoot
-	}
-	st, err := s.cfg.BeaconDB.GenesisState(ctx)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get genesis state")
-	}
-	if st.Version() < version.Bellatrix {
-		return nil, nil
-	}
-	header, err := st.LatestExecutionPayloadHeader()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get latest execution payload header")
-	}
-	return bytesutil.SafeCopyBytes(header.BlockHash()), nil
-}
--- a/beacon-chain/blockchain/chain_info_test.go
+++ b/beacon-chain/blockchain/chain_info_test.go
@@ -582,7 +582,6 @@ func TestService_IsOptimisticForRoot_StateSummaryRecovered(t *testing.T) {
 	br, err := b.Block.HashTreeRoot()
 	require.NoError(t, err)
 	util.SaveBlock(t, context.Background(), beaconDB, b)
-	require.NoError(t, beaconDB.SaveGenesisBlockRoot(ctx, [32]byte{}))
 	_, err = c.IsOptimisticForRoot(ctx, br)
 	assert.NoError(t, err)
 	summ, err := beaconDB.StateSummary(ctx, br)
@@ -613,20 +612,3 @@ func TestService_IsFinalized(t *testing.T) {
 	require.Equal(t, true, c.IsFinalized(ctx, br))
 	require.Equal(t, false, c.IsFinalized(ctx, [32]byte{'c'}))
 }
-
-func Test_hashForGenesisRoot(t *testing.T) {
-	beaconDB := testDB.SetupDB(t)
-	ctx := context.Background()
-	c := setupBeaconChain(t, beaconDB)
-	st, _ := util.DeterministicGenesisStateElectra(t, 10)
-	require.NoError(t, c.cfg.BeaconDB.SaveGenesisData(ctx, st))
-	root, err := beaconDB.GenesisBlockRoot(ctx)
-	require.NoError(t, err)
-	genRoot, err := c.hashForGenesisBlock(ctx, [32]byte{'a'})
-	require.ErrorIs(t, err, errNotGenesisRoot)
-	require.IsNil(t, genRoot)
-
-	genRoot, err = c.hashForGenesisBlock(ctx, root)
-	require.NoError(t, err)
-	require.Equal(t, [32]byte{}, [32]byte(genRoot))
-}
--- a/beacon-chain/blockchain/error.go
+++ b/beacon-chain/blockchain/error.go
@@ -30,10 +30,6 @@ var (
 	ErrNotCheckpoint = errors.New("not a checkpoint in forkchoice")
 	// ErrNilHead is returned when no head is present in the blockchain service.
 	ErrNilHead = errors.New("nil head")
-	// errNotGenesisRoot is returned when the root is not the genesis block root.
-	errNotGenesisRoot = errors.New("root is not the genesis block root")
-	// errBlacklistedBlock is returned when a block is blacklisted as invalid.
-	errBlacklistedRoot = errors.New("block root is blacklisted")
 )

 var errMaxBlobsExceeded = errors.New("Expected commitments in block exceeds MAX_BLOBS_PER_BLOCK")
--- a/beacon-chain/blockchain/execution_engine.go
+++ b/beacon-chain/blockchain/execution_engine.go
@@ -69,21 +69,10 @@ func (s *Service) notifyForkchoiceUpdate(ctx context.Context, arg *fcuConfig) (*
 		SafeBlockHash:      justifiedHash[:],
 		FinalizedBlockHash: finalizedHash[:],
 	}
-	if len(fcs.HeadBlockHash) != 32 || [32]byte(fcs.HeadBlockHash) == [32]byte{} {
-		// check if we are sending FCU at genesis
-		hash, err := s.hashForGenesisBlock(ctx, arg.headRoot)
-		if errors.Is(err, errNotGenesisRoot) {
-			log.Error("Sending nil head block hash to execution engine")
-			return nil, nil
-		}
-		if err != nil {
-			return nil, errors.Wrap(err, "could not get head block hash")
-		}
-		fcs.HeadBlockHash = hash
-	}
 	if arg.attributes == nil {
 		arg.attributes = payloadattribute.EmptyWithVersion(headBlk.Version())
 	}
+	go firePayloadAttributesEvent(ctx, s.cfg.StateNotifier.StateFeed(), arg)
 	payloadID, lastValidHash, err := s.cfg.ExecutionEngineCaller.ForkchoiceUpdated(ctx, fcs, arg.attributes)
 	if err != nil {
 		switch {
@@ -170,7 +159,6 @@ func (s *Service) notifyForkchoiceUpdate(ctx context.Context, arg *fcuConfig) (*
 		log.WithFields(logrus.Fields{
 			"blockRoot": fmt.Sprintf("%#x", bytesutil.Trunc(arg.headRoot[:])),
 			"headSlot":  headBlk.Slot(),
-			"nextSlot":  nextSlot,
 			"payloadID": fmt.Sprintf("%#x", bytesutil.Trunc(payloadID[:])),
 		}).Info("Forkchoice updated with payload attributes for proposal")
 		s.cfg.PayloadIDCache.Set(nextSlot, arg.headRoot, pId)
@@ -178,19 +166,40 @@ func (s *Service) notifyForkchoiceUpdate(ctx context.Context, arg *fcuConfig) (*
 		log.WithFields(logrus.Fields{
 			"blockHash": fmt.Sprintf("%#x", headPayload.BlockHash()),
 			"slot":      headBlk.Slot(),
-			"nextSlot":  nextSlot,
 		}).Error("Received nil payload ID on VALID engine response")
 	}
 	return payloadID, nil
 }

-func firePayloadAttributesEvent(_ context.Context, f event.SubscriberSender, nextSlot primitives.Slot) {
-	// the fcu args have differing amounts of completeness based on the code path,
-	// and there is work we only want to do if a client is actually listening to the events beacon api endpoint.
-	// temporary solution: just fire a blank event and fill in the details in the api handler.
+func firePayloadAttributesEvent(ctx context.Context, f event.SubscriberSender, cfg *fcuConfig) {
+	pidx, err := helpers.BeaconProposerIndex(ctx, cfg.headState)
+	if err != nil {
+		log.WithError(err).
+			WithField("head_root", cfg.headRoot[:]).
+			Error("Could not get proposer index for PayloadAttributes event")
+		return
+	}
+	evd := payloadattribute.EventData{
+		ProposerIndex:   pidx,
+		ProposalSlot:    cfg.headState.Slot(),
+		ParentBlockRoot: cfg.headRoot[:],
+		Attributer:      cfg.attributes,
+		HeadRoot:        cfg.headRoot,
+		HeadState:       cfg.headState,
+		HeadBlock:       cfg.headBlock,
+	}
+	if cfg.headBlock != nil && !cfg.headBlock.IsNil() {
+		headPayload, err := cfg.headBlock.Block().Body().Execution()
+		if err != nil {
+			log.WithError(err).Error("Could not get execution payload for head block")
+			return
+		}
+		evd.ParentBlockHash = headPayload.BlockHash()
+		evd.ParentBlockNumber = headPayload.BlockNumber()
+	}
 	f.Send(&feed.Event{
 		Type: statefeed.PayloadAttributes,
-		Data: payloadattribute.EventData{ProposalSlot: nextSlot},
+		Data: evd,
 	})
 }

--- a/beacon-chain/blockchain/execution_engine_test.go
+++ b/beacon-chain/blockchain/execution_engine_test.go
@@ -84,7 +84,7 @@ func Test_NotifyForkchoiceUpdate_GetPayloadAttrErrorCanContinue(t *testing.T) {
 	service.cfg.PayloadIDCache.Set(1, [32]byte{}, [8]byte{})
 	got, err := service.notifyForkchoiceUpdate(ctx, arg)
 	require.NoError(t, err)
-	require.IsNil(t, got)
+	require.DeepEqual(t, got, pid) // We still get a payload ID even though the state is bad. This means it returns until the end.
 }

 func Test_NotifyForkchoiceUpdate(t *testing.T) {
@@ -113,7 +113,6 @@ func Test_NotifyForkchoiceUpdate(t *testing.T) {
 	state, blkRoot, err = prepareForkchoiceState(ctx, 2, bellatrixBlkRoot, altairBlkRoot, params.BeaconConfig().ZeroHash, ojc, ofc)
 	require.NoError(t, err)
 	require.NoError(t, fcs.InsertNode(ctx, state, blkRoot))
-	badHash := [32]byte{'h'}

 	tests := []struct {
 		name             string
@@ -211,7 +210,7 @@ func Test_NotifyForkchoiceUpdate(t *testing.T) {
 			blk: func() interfaces.ReadOnlySignedBeaconBlock {
 				b, err := consensusblocks.NewSignedBeaconBlock(&ethpb.SignedBeaconBlockBellatrix{Block: &ethpb.BeaconBlockBellatrix{
 					Body: &ethpb.BeaconBlockBodyBellatrix{
-						ExecutionPayload: &v1.ExecutionPayload{BlockHash: badHash[:]},
+						ExecutionPayload: &v1.ExecutionPayload{},
 					},
 				}})
 				require.NoError(t, err)
--- a/beacon-chain/blockchain/forkchoice_update_execution.go
+++ b/beacon-chain/blockchain/forkchoice_update_execution.go
@@ -102,10 +102,10 @@ func (s *Service) forkchoiceUpdateWithExecution(ctx context.Context, args *fcuCo
 		log.WithError(err).Error("could not save head")
 	}

-	go firePayloadAttributesEvent(ctx, s.cfg.StateNotifier.StateFeed(), s.CurrentSlot()+1)
-
 	// Only need to prune attestations from pool if the head has changed.
-	s.pruneAttsFromPool(s.ctx, args.headState, args.headBlock)
+	if err := s.pruneAttsFromPool(args.headBlock); err != nil {
+		log.WithError(err).Error("could not prune attestations from pool")
+	}
 	return nil
 }

--- a/beacon-chain/blockchain/head.go
+++ b/beacon-chain/blockchain/head.go
@@ -410,11 +410,7 @@ func (s *Service) saveOrphanedOperations(ctx context.Context, orphanedRoot [32]b
 					return err
 				}
 			} else {
-				if orphanedBlk.Version() >= version.Electra {
-					if err = s.cfg.AttPool.SaveBlockAttestation(a); err != nil {
-						return err
-					}
-				} else if a.IsAggregated() {
+				if a.IsAggregated() {
 					if err = s.cfg.AttPool.SaveAggregatedAttestation(a); err != nil {
 						return err
 					}
--- a/beacon-chain/blockchain/head_test.go
+++ b/beacon-chain/blockchain/head_test.go
@@ -324,72 +324,6 @@ func TestSaveOrphanedAtts(t *testing.T) {
 	require.DeepEqual(t, wantAtts, atts)
 }

-func TestSaveOrphanedAttsElectra(t *testing.T) {
-	ctx := context.Background()
-	beaconDB := testDB.SetupDB(t)
-	service := setupBeaconChain(t, beaconDB)
-	service.genesisTime = time.Now().Add(time.Duration(-10*int64(1)*int64(params.BeaconConfig().SecondsPerSlot)) * time.Second)
-
-	// Chain setup
-	// 0 -- 1 -- 2 -- 3
-	//  \-4
-	st, keys := util.DeterministicGenesisStateElectra(t, 64)
-	blkG, err := util.GenerateFullBlockElectra(st, keys, util.DefaultBlockGenConfig(), 1)
-	assert.NoError(t, err)
-
-	util.SaveBlock(t, ctx, service.cfg.BeaconDB, blkG)
-	rG, err := blkG.Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	blk1, err := util.GenerateFullBlockElectra(st, keys, util.DefaultBlockGenConfig(), 2)
-	assert.NoError(t, err)
-	blk1.Block.ParentRoot = rG[:]
-	r1, err := blk1.Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	blk2, err := util.GenerateFullBlockElectra(st, keys, util.DefaultBlockGenConfig(), 3)
-	assert.NoError(t, err)
-	blk2.Block.ParentRoot = r1[:]
-	r2, err := blk2.Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	blk3, err := util.GenerateFullBlockElectra(st, keys, util.DefaultBlockGenConfig(), 4)
-	assert.NoError(t, err)
-	blk3.Block.ParentRoot = r2[:]
-	r3, err := blk3.Block.HashTreeRoot()
-	require.NoError(t, err)
-
-	blk4 := util.NewBeaconBlockElectra()
-	blk4.Block.Slot = 4
-	blk4.Block.ParentRoot = rG[:]
-	r4, err := blk4.Block.HashTreeRoot()
-	require.NoError(t, err)
-	ojc := &ethpb.Checkpoint{Root: params.BeaconConfig().ZeroHash[:]}
-	ofc := &ethpb.Checkpoint{Root: params.BeaconConfig().ZeroHash[:]}
-
-	for _, blk := range []*ethpb.SignedBeaconBlockElectra{blkG, blk1, blk2, blk3, blk4} {
-		r, err := blk.Block.HashTreeRoot()
-		require.NoError(t, err)
-		state, blkRoot, err := prepareForkchoiceState(ctx, blk.Block.Slot, r, bytesutil.ToBytes32(blk.Block.ParentRoot), [32]byte{}, ojc, ofc)
-		require.NoError(t, err)
-		require.NoError(t, service.cfg.ForkChoiceStore.InsertNode(ctx, state, blkRoot))
-		util.SaveBlock(t, ctx, beaconDB, blk)
-	}
-
-	require.NoError(t, service.saveOrphanedOperations(ctx, r3, r4))
-	require.Equal(t, 3, len(service.cfg.AttPool.BlockAttestations()))
-	wantAtts := []ethpb.Att{
-		blk3.Block.Body.Attestations[0],
-		blk2.Block.Body.Attestations[0],
-		blk1.Block.Body.Attestations[0],
-	}
-	atts := service.cfg.AttPool.BlockAttestations()
-	sort.Slice(atts, func(i, j int) bool {
-		return atts[i].GetData().Slot > atts[j].GetData().Slot
-	})
-	require.DeepEqual(t, wantAtts, atts)
-}
-
 func TestSaveOrphanedOps(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	config := params.BeaconConfig()
--- a/beacon-chain/blockchain/log.go
+++ b/beacon-chain/blockchain/log.go
@@ -69,22 +69,6 @@ func logStateTransitionData(b interfaces.ReadOnlyBeaconBlock) error {
 			log = log.WithField("kzgCommitmentCount", len(kzgs))
 		}
 	}
-	if b.Version() >= version.Electra {
-		eReqs, err := b.Body().ExecutionRequests()
-		if err != nil {
-			log.WithError(err).Error("Failed to get execution requests")
-		} else {
-			if len(eReqs.Deposits) > 0 {
-				log = log.WithField("depositRequestCount", len(eReqs.Deposits))
-			}
-			if len(eReqs.Consolidations) > 0 {
-				log = log.WithField("consolidationRequestCount", len(eReqs.Consolidations))
-			}
-			if len(eReqs.Withdrawals) > 0 {
-				log = log.WithField("withdrawalRequestCount", len(eReqs.Withdrawals))
-			}
-		}
-	}
 	log.Info("Finished applying state transition")
 	return nil
 }
--- a/beacon-chain/blockchain/mock_test.go
+++ b/beacon-chain/blockchain/mock_test.go
@@ -3,7 +3,6 @@ package blockchain
 import (
 	"testing"

-	mock "github.com/prysmaticlabs/prysm/v5/beacon-chain/blockchain/testing"
 	testDB "github.com/prysmaticlabs/prysm/v5/beacon-chain/db/testing"
 	doublylinkedtree "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/doubly-linked-tree"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/startup"
@@ -19,7 +18,6 @@ func testServiceOptsWithDB(t *testing.T) []Option {
 		WithStateGen(stategen.New(beaconDB, fcs)),
 		WithForkChoiceStore(fcs),
 		WithClockSynchronizer(cs),
-		WithStateNotifier(&mock.MockStateNotifier{RecordEvents: true}),
 	}
 }

--- a/beacon-chain/blockchain/options.go
+++ b/beacon-chain/blockchain/options.go
@@ -213,10 +213,3 @@ func WithSyncChecker(checker Checker) Option {
 		return nil
 	}
 }
-
-func WithSlasherEnabled(enabled bool) Option {
-	return func(s *Service) error {
-		s.slasherEnabled = enabled
-		return nil
-	}
-}
--- a/beacon-chain/blockchain/process_attestation.go
+++ b/beacon-chain/blockchain/process_attestation.go
@@ -80,7 +80,7 @@ func (s *Service) OnAttestation(ctx context.Context, a ethpb.Att, disparity time
 	}

 	// Use the target state to verify attesting indices are valid.
-	committees, err := helpers.AttestationCommitteesFromState(ctx, baseState, a)
+	committees, err := helpers.AttestationCommittees(ctx, baseState, a)
 	if err != nil {
 		return err
 	}
--- a/beacon-chain/blockchain/process_block.go
+++ b/beacon-chain/blockchain/process_block.go
@@ -6,7 +6,6 @@ import (
 	"time"

 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/blocks"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
 	coreTime "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/time"
@@ -16,7 +15,6 @@ import (
 	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
 	"github.com/prysmaticlabs/prysm/v5/config/features"
-	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	consensusblocks "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
@@ -175,9 +173,6 @@ func (s *Service) onBlockBatch(ctx context.Context, blks []consensusblocks.ROBlo
 	var set *bls.SignatureBatch
 	boundaries := make(map[[32]byte]state.BeaconState)
 	for i, b := range blks {
-		if features.BlacklistedBlock(b.Root()) {
-			return errBlacklistedRoot
-		}
 		v, h, err := getStateVersionAndPayload(preState)
 		if err != nil {
 			return err
@@ -373,7 +368,7 @@ func (s *Service) handleEpochBoundary(ctx context.Context, slot primitives.Slot,
 func (s *Service) handleBlockAttestations(ctx context.Context, blk interfaces.ReadOnlyBeaconBlock, st state.BeaconState) error {
 	// Feed in block's attestations to fork choice store.
 	for _, a := range blk.Body().Attestations() {
-		committees, err := helpers.AttestationCommitteesFromState(ctx, st, a)
+		committees, err := helpers.AttestationCommittees(ctx, st, a)
 		if err != nil {
 			return err
 		}
@@ -424,98 +419,24 @@ func (s *Service) savePostStateInfo(ctx context.Context, r [32]byte, b interface
 	return nil
 }

-// pruneAttsFromPool removes these attestations from the attestation pool
-// which are covered by attestations from the received block.
-func (s *Service) pruneAttsFromPool(ctx context.Context, headState state.BeaconState, headBlock interfaces.ReadOnlySignedBeaconBlock) {
-	for _, att := range headBlock.Block().Body().Attestations() {
-		if err := s.pruneCoveredAttsFromPool(ctx, headState, att); err != nil {
-			log.WithError(err).Warn("Could not prune attestations covered by a received block's attestation")
-		}
-	}
-}
-
-func (s *Service) pruneCoveredAttsFromPool(ctx context.Context, headState state.BeaconState, att ethpb.Att) error {
-	switch {
-	case !att.IsAggregated():
-		return s.cfg.AttPool.DeleteUnaggregatedAttestation(att)
-	case att.Version() == version.Phase0:
+// This removes the attestations in block `b` from the attestation mem pool.
+func (s *Service) pruneAttsFromPool(headBlock interfaces.ReadOnlySignedBeaconBlock) error {
+	atts := headBlock.Block().Body().Attestations()
+	for _, att := range atts {
 		if features.Get().EnableExperimentalAttestationPool {
-			return errors.Wrap(s.cfg.AttestationCache.DeleteCovered(att), "could not delete covered attestation")
-		}
-		return errors.Wrap(s.cfg.AttPool.DeleteAggregatedAttestation(att), "could not delete aggregated attestation")
-	default:
-		return s.pruneCoveredElectraAttsFromPool(ctx, headState, att)
-	}
-}
-
-// pruneCoveredElectraAttsFromPool handles removing aggregated Electra attestations from the pool after receiving a block.
-// Because in Electra block attestations can combine aggregates for multiple committees, comparing attestation bits
-// of a block attestation with attestations bits of an aggregate can cause unexpected results, leading to covered
-// aggregates not being removed from the pool.
-//
-// To make sure aggregates are removed, we decompose the block attestation into dummy aggregates, with each
-// aggregate accounting for one committee. This allows us to compare aggregates in the same way it's done for
-// Phase0. Even though we can't provide a valid signature for the dummy aggregate, it does not matter because
-// signatures play no part in pruning attestations.
-func (s *Service) pruneCoveredElectraAttsFromPool(ctx context.Context, headState state.BeaconState, att ethpb.Att) error {
-	if att.Version() == version.Phase0 {
-		log.Error("Called pruneCoveredElectraAttsFromPool with a Phase0 attestation")
-		return nil
-	}
-
-	// We don't want to recompute committees. If they are not cached already,
-	// we allow attestations to stay in the pool. If these attestations are
-	// included in a later block, they will be redundant. But given that
-	// they were not cached in the first place, it's unlikely that they
-	// will be chosen into a block.
-	ok, committees, err := helpers.AttestationCommitteesFromCache(ctx, headState, att)
-	if err != nil {
-		return errors.Wrap(err, "could not get attestation committees")
-	}
-	if !ok {
-		log.Debug("Attestation committees are not cached. Skipping attestation pruning.")
-		return nil
-	}
-
-	committeeIndices := att.CommitteeBitsVal().BitIndices()
-	offset := uint64(0)
-
-	// Sanity check as this should never happen
-	if len(committeeIndices) != len(committees) {
-		return errors.New("committee indices and committees have different lengths")
-	}
-
-	for i, c := range committees {
-		ab := bitfield.NewBitlist(uint64(len(c)))
-		for j := uint64(0); j < uint64(len(c)); j++ {
-			ab.SetBitAt(j, att.GetAggregationBits().BitAt(j+offset))
-		}
-
-		cb := primitives.NewAttestationCommitteeBits()
-		cb.SetBitAt(uint64(committeeIndices[i]), true)
-
-		a := &ethpb.AttestationElectra{
-			AggregationBits: ab,
-			Data:            att.GetData(),
-			CommitteeBits:   cb,
-			Signature:       make([]byte, fieldparams.BLSSignatureLength),
-		}
-
-		if features.Get().EnableExperimentalAttestationPool {
-			if err = s.cfg.AttestationCache.DeleteCovered(a); err != nil {
-				return errors.Wrap(err, "could not delete covered attestation")
+			if err := s.cfg.AttestationCache.DeleteCovered(att); err != nil {
+				return errors.Wrap(err, "could not delete attestation")
 			}
-		} else if !a.IsAggregated() {
-			if err = s.cfg.AttPool.DeleteUnaggregatedAttestation(a); err != nil {
-				return errors.Wrap(err, "could not delete unaggregated attestation")
+		} else if att.IsAggregated() {
+			if err := s.cfg.AttPool.DeleteAggregatedAttestation(att); err != nil {
+				return err
+			}
+		} else {
+			if err := s.cfg.AttPool.DeleteUnaggregatedAttestation(att); err != nil {
+				return err
 			}
-		} else if err = s.cfg.AttPool.DeleteAggregatedAttestation(a); err != nil {
-			return errors.Wrap(err, "could not delete aggregated attestation")
 		}
-
-		offset += uint64(len(c))
 	}
-
 	return nil
 }

@@ -729,9 +650,13 @@ func (s *Service) lateBlockTasks(ctx context.Context) {
 	attribute := s.getPayloadAttribute(ctx, headState, s.CurrentSlot()+1, headRoot[:])
 	// return early if we are not proposing next slot
 	if attribute.IsEmpty() {
-		// notifyForkchoiceUpdate fires the payload attribute event. But in this case, we won't
-		// call notifyForkchoiceUpdate, so the event is fired here.
-		go firePayloadAttributesEvent(ctx, s.cfg.StateNotifier.StateFeed(), s.CurrentSlot()+1)
+		fcuArgs := &fcuConfig{
+			headState:  headState,
+			headRoot:   headRoot,
+			headBlock:  nil,
+			attributes: attribute,
+		}
+		go firePayloadAttributesEvent(ctx, s.cfg.StateNotifier.StateFeed(), fcuArgs)
 		return
 	}

--- a/beacon-chain/blockchain/process_block_test.go
+++ b/beacon-chain/blockchain/process_block_test.go
@@ -12,10 +12,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	gethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/blocks"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
 	lightClient "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/light-client"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/signing"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/transition"
@@ -27,7 +25,6 @@ import (
 	mockExecution "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/testing"
 	doublylinkedtree "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/doubly-linked-tree"
 	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/attestations/kv"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
 	"github.com/prysmaticlabs/prysm/v5/config/features"
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
@@ -48,94 +45,6 @@ import (
 	logTest "github.com/sirupsen/logrus/hooks/test"
 )

-func Test_pruneAttsFromPool_Electra(t *testing.T) {
-	ctx := context.Background()
-	logHook := logTest.NewGlobal()
-
-	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig().Copy()
-	cfg.TargetCommitteeSize = 8
-	params.OverrideBeaconConfig(cfg)
-
-	s := Service{
-		cfg: &config{
-			AttPool: kv.NewAttCaches(),
-		},
-	}
-
-	data := &ethpb.AttestationData{
-		BeaconBlockRoot: make([]byte, 32),
-		Source:          &ethpb.Checkpoint{Root: make([]byte, 32)},
-		Target:          &ethpb.Checkpoint{Root: make([]byte, 32)},
-	}
-
-	cb := primitives.NewAttestationCommitteeBits()
-	cb.SetBitAt(0, true)
-	att1 := &ethpb.AttestationElectra{
-		AggregationBits: bitfield.Bitlist{0b10000000, 0b00000001},
-		Data:            data,
-		Signature:       make([]byte, 96),
-		CommitteeBits:   cb,
-	}
-
-	cb = primitives.NewAttestationCommitteeBits()
-	cb.SetBitAt(1, true)
-	att2 := &ethpb.AttestationElectra{
-		AggregationBits: bitfield.Bitlist{0b11110111, 0b00000001},
-		Data:            data,
-		Signature:       make([]byte, 96),
-		CommitteeBits:   cb,
-	}
-
-	cb = primitives.NewAttestationCommitteeBits()
-	cb.SetBitAt(3, true)
-	att3 := &ethpb.AttestationElectra{
-		AggregationBits: bitfield.Bitlist{0b11110111, 0b00000001},
-		Data:            data,
-		Signature:       make([]byte, 96),
-		CommitteeBits:   cb,
-	}
-
-	require.NoError(t, s.cfg.AttPool.SaveUnaggregatedAttestation(att1))
-	require.NoError(t, s.cfg.AttPool.SaveAggregatedAttestation(att2))
-	require.NoError(t, s.cfg.AttPool.SaveAggregatedAttestation(att3))
-
-	cb = primitives.NewAttestationCommitteeBits()
-	cb.SetBitAt(0, true)
-	cb.SetBitAt(1, true)
-	onChainAtt := &ethpb.AttestationElectra{
-		AggregationBits: bitfield.Bitlist{0b10000000, 0b11110111, 0b00000001},
-		Data:            data,
-		Signature:       make([]byte, 96),
-		CommitteeBits:   cb,
-	}
-	bl := &ethpb.SignedBeaconBlockElectra{
-		Block: &ethpb.BeaconBlockElectra{
-			Body: &ethpb.BeaconBlockBodyElectra{
-				Attestations: []*ethpb.AttestationElectra{onChainAtt},
-			},
-		},
-		Signature: make([]byte, 96),
-	}
-	rob, err := consensusblocks.NewSignedBeaconBlock(bl)
-	require.NoError(t, err)
-	st, _ := util.DeterministicGenesisStateElectra(t, 1024)
-	committees, err := helpers.BeaconCommittees(ctx, st, 0)
-	require.NoError(t, err)
-	// Sanity check to make sure the on-chain att will be decomposed
-	// into the correct number of aggregates.
-	require.Equal(t, 4, len(committees))
-
-	s.pruneAttsFromPool(ctx, st, rob)
-	require.LogsDoNotContain(t, logHook, "Could not prune attestations")
-
-	attsInPool := s.cfg.AttPool.UnaggregatedAttestations()
-	assert.Equal(t, 0, len(attsInPool))
-	attsInPool = s.cfg.AttPool.AggregatedAttestations()
-	require.Equal(t, 1, len(attsInPool))
-	assert.DeepEqual(t, att3, attsInPool[0])
-}
-
 func TestStore_OnBlockBatch(t *testing.T) {
 	service, tr := minimalTestService(t)
 	ctx := tr.ctx
@@ -912,8 +821,6 @@ func TestInsertFinalizedDeposits_MultipleFinalizedRoutines(t *testing.T) {
 }

 func TestRemoveBlockAttestationsInPool(t *testing.T) {
-	logHook := logTest.NewGlobal()
-
 	genesis, keys := util.DeterministicGenesisState(t, 64)
 	b, err := util.GenerateFullBlock(genesis, keys, util.DefaultBlockGenConfig(), 1)
 	assert.NoError(t, err)
@@ -933,8 +840,7 @@ func TestRemoveBlockAttestationsInPool(t *testing.T) {
 	require.NoError(t, service.cfg.AttPool.SaveAggregatedAttestations(atts))
 	wsb, err := consensusblocks.NewSignedBeaconBlock(b)
 	require.NoError(t, err)
-	service.pruneAttsFromPool(context.Background(), nil /* state not needed pre-Electra */, wsb)
-	require.LogsDoNotContain(t, logHook, "Could not prune attestations")
+	require.NoError(t, service.pruneAttsFromPool(wsb))
 	require.Equal(t, 0, service.cfg.AttPool.AggregatedAttestationCount())
 }

@@ -1990,7 +1896,6 @@ func TestNoViableHead_Reboot(t *testing.T) {

 	require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, genesisState, genesisRoot), "Could not save genesis state")
 	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, genesisRoot), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveGenesisBlockRoot(ctx, genesisRoot), "Could not save genesis state")

 	for i := 1; i < 6; i++ {
 		driftGenesisTime(service, int64(i), 0)
@@ -2125,7 +2030,6 @@ func TestNoViableHead_Reboot(t *testing.T) {
 	require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, genesisState, jroot))
 	service.cfg.ForkChoiceStore.SetBalancesByRooter(service.cfg.StateGen.ActiveNonSlashedBalancesByRoot)
 	require.NoError(t, service.StartFromSavedState(genesisState))
-	require.NoError(t, service.cfg.BeaconDB.SaveGenesisBlockRoot(ctx, genesisRoot))

 	// Forkchoice has the genesisRoot loaded at startup
 	require.Equal(t, genesisRoot, service.ensureRootNotZeros(service.cfg.ForkChoiceStore.CachedHeadRoot()))
--- a/beacon-chain/blockchain/receive_block.go
+++ b/beacon-chain/blockchain/receive_block.go
@@ -65,10 +65,6 @@ type SlashingReceiver interface {
 func (s *Service) ReceiveBlock(ctx context.Context, block interfaces.ReadOnlySignedBeaconBlock, blockRoot [32]byte, avs das.AvailabilityStore) error {
 	ctx, span := trace.StartSpan(ctx, "blockChain.ReceiveBlock")
 	defer span.End()
-	// Return early if the block is blacklisted
-	if features.BlacklistedBlock(blockRoot) {
-		return errBlacklistedRoot
-	}
 	// Return early if the block has been synced
 	if s.InForkchoice(blockRoot) {
 		log.WithField("blockRoot", fmt.Sprintf("%#x", blockRoot)).Debug("Ignoring already synced block")
@@ -125,7 +121,7 @@ func (s *Service) ReceiveBlock(ctx context.Context, block interfaces.ReadOnlySig
 		return err
 	}
 	// If slasher is configured, forward the attestations in the block via an event feed for processing.
-	if s.slasherEnabled {
+	if features.Get().EnableSlasher {
 		go s.sendBlockAttestationsToSlasher(blockCopy, preState)
 	}

@@ -552,7 +548,7 @@ func (s *Service) sendBlockAttestationsToSlasher(signed interfaces.ReadOnlySigne
 	// is done in the background to avoid adding more load to this critical code path.
 	ctx := context.TODO()
 	for _, att := range signed.Block().Body().Attestations() {
-		committees, err := helpers.AttestationCommitteesFromState(ctx, preState, att)
+		committees, err := helpers.AttestationCommittees(ctx, preState, att)
 		if err != nil {
 			log.WithError(err).Error("Could not get attestation committees")
 			return
--- a/beacon-chain/blockchain/receive_block_test.go
+++ b/beacon-chain/blockchain/receive_block_test.go
@@ -12,7 +12,6 @@ import (
 	statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/das"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/voluntaryexits"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
@@ -42,16 +41,6 @@ func TestService_ReceiveBlock(t *testing.T) {
 	bc.ShardCommitteePeriod = 0 // Required for voluntary exits test in reasonable time.
 	params.OverrideBeaconConfig(bc)

-	badBlock := genFullBlock(t, util.DefaultBlockGenConfig(), 101)
-	badRoot, err := badBlock.Block.HashTreeRoot()
-	require.NoError(t, err)
-	badRoots := make(map[[32]byte]struct{})
-	badRoots[badRoot] = struct{}{}
-	resetCfg := features.InitWithReset(&features.Flags{
-		BlacklistedRoots: badRoots,
-	})
-	defer resetCfg()
-
 	type args struct {
 		block *ethpb.SignedBeaconBlock
 	}
@@ -135,14 +124,8 @@ func TestService_ReceiveBlock(t *testing.T) {
 				}
 			},
 		},
-		{
-			name: "The block is blacklisted",
-			args: args{
-				block: badBlock,
-			},
-			wantedErr: errBlacklistedRoot.Error(),
-		},
 	}
+
 	wg := new(sync.WaitGroup)
 	for _, tt := range tests {
 		wg.Add(1)
--- a/beacon-chain/blockchain/service.go
+++ b/beacon-chain/blockchain/service.go
@@ -3,6 +3,7 @@
 package blockchain

 import (
+	"bytes"
 	"context"
 	"fmt"
 	"runtime"
@@ -22,6 +23,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/db/filesystem"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/execution"
 	f "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice"
+	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/attestations"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/blstoexec"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/slashings"
@@ -30,6 +32,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/startup"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state/stategen"
+	"github.com/prysmaticlabs/prysm/v5/config/features"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
@@ -39,7 +42,6 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	prysmTime "github.com/prysmaticlabs/prysm/v5/time"
 	"github.com/prysmaticlabs/prysm/v5/time/slots"
-	"github.com/sirupsen/logrus"
 )

 // Service represents a service that handles the internal
@@ -63,7 +65,6 @@ type Service struct {
 	blobNotifiers        *blobNotifierMap
 	blockBeingSynced     *currentlySyncingBlock
 	blobStorage          *filesystem.BlobStorage
-	slasherEnabled       bool
 }

 // config options for the service.
@@ -268,18 +269,69 @@ func (s *Service) StartFromSavedState(saved state.BeaconState) error {
 		return err
 	}
 	s.originBlockRoot = originRoot
-	st, err := s.cfg.StateGen.Resume(s.ctx, s.cfg.FinalizedStateAtStartUp)
-	if err != nil {
-		return errors.Wrap(err, "could not get finalized state from db")
+
+	if err := s.initializeHeadFromDB(s.ctx); err != nil {
+		return errors.Wrap(err, "could not set up chain info")
 	}
 	spawnCountdownIfPreGenesis(s.ctx, s.genesisTime, s.cfg.BeaconDB)
-	if err := s.setupForkchoice(st); err != nil {
-		return errors.Wrap(err, "could not set up forkchoice")
+
+	justified, err := s.cfg.BeaconDB.JustifiedCheckpoint(s.ctx)
+	if err != nil {
+		return errors.Wrap(err, "could not get justified checkpoint")
+	}
+	if justified == nil {
+		return errNilJustifiedCheckpoint
+	}
+	finalized, err := s.cfg.BeaconDB.FinalizedCheckpoint(s.ctx)
+	if err != nil {
+		return errors.Wrap(err, "could not get finalized checkpoint")
+	}
+	if finalized == nil {
+		return errNilFinalizedCheckpoint
+	}
+
+	fRoot := s.ensureRootNotZeros(bytesutil.ToBytes32(finalized.Root))
+	s.cfg.ForkChoiceStore.Lock()
+	defer s.cfg.ForkChoiceStore.Unlock()
+	if err := s.cfg.ForkChoiceStore.UpdateJustifiedCheckpoint(s.ctx, &forkchoicetypes.Checkpoint{Epoch: justified.Epoch,
+		Root: bytesutil.ToBytes32(justified.Root)}); err != nil {
+		return errors.Wrap(err, "could not update forkchoice's justified checkpoint")
+	}
+	if err := s.cfg.ForkChoiceStore.UpdateFinalizedCheckpoint(&forkchoicetypes.Checkpoint{Epoch: finalized.Epoch,
+		Root: bytesutil.ToBytes32(finalized.Root)}); err != nil {
+		return errors.Wrap(err, "could not update forkchoice's finalized checkpoint")
+	}
+	s.cfg.ForkChoiceStore.SetGenesisTime(uint64(s.genesisTime.Unix()))
+
+	st, err := s.cfg.StateGen.StateByRoot(s.ctx, fRoot)
+	if err != nil {
+		return errors.Wrap(err, "could not get finalized checkpoint state")
+	}
+	finalizedBlock, err := s.cfg.BeaconDB.Block(s.ctx, fRoot)
+	if err != nil {
+		return errors.Wrap(err, "could not get finalized checkpoint block")
+	}
+	roblock, err := blocks.NewROBlockWithRoot(finalizedBlock, fRoot)
+	if err != nil {
+		return err
+	}
+	if err := s.cfg.ForkChoiceStore.InsertNode(s.ctx, st, roblock); err != nil {
+		return errors.Wrap(err, "could not insert finalized block to forkchoice")
+	}
+	if !features.Get().EnableStartOptimistic {
+		lastValidatedCheckpoint, err := s.cfg.BeaconDB.LastValidatedCheckpoint(s.ctx)
+		if err != nil {
+			return errors.Wrap(err, "could not get last validated checkpoint")
+		}
+		if bytes.Equal(finalized.Root, lastValidatedCheckpoint.Root) {
+			if err := s.cfg.ForkChoiceStore.SetOptimisticToValid(s.ctx, fRoot); err != nil {
+				return errors.Wrap(err, "could not set finalized block as validated")
+			}
+		}
 	}
 	// not attempting to save initial sync blocks here, because there shouldn't be any until
 	// after the statefeed.Initialized event is fired (below)
-	cp := s.FinalizedCheckpt()
-	if err := s.wsVerifier.VerifyWeakSubjectivity(s.ctx, cp.Epoch); err != nil {
+	if err := s.wsVerifier.VerifyWeakSubjectivity(s.ctx, finalized.Epoch); err != nil {
 		// Exit run time if the node failed to verify weak subjectivity checkpoint.
 		return errors.Wrap(err, "could not verify initial checkpoint provided for chain sync")
 	}
@@ -288,6 +340,7 @@ func (s *Service) StartFromSavedState(saved state.BeaconState) error {
 	if err := s.clockSetter.SetClock(startup.NewClock(s.genesisTime, vr)); err != nil {
 		return errors.Wrap(err, "failed to initialize blockchain service")
 	}
+
 	return nil
 }

@@ -317,36 +370,45 @@ func (s *Service) originRootFromSavedState(ctx context.Context) ([32]byte, error
 	return genesisBlkRoot, nil
 }

-// initializeHeadFromDB uses the finalized checkpoint and head block root from forkchoice to set the current head.
+// initializeHeadFromDB uses the finalized checkpoint and head block found in the database to set the current head.
 // Note that this may block until stategen replays blocks between the finalized and head blocks
 // if the head sync flag was specified and the gap between the finalized and head blocks is at least 128 epochs long.
-func (s *Service) initializeHead(ctx context.Context, st state.BeaconState) error {
-	cp := s.FinalizedCheckpt()
-	fRoot := s.ensureRootNotZeros([32]byte(cp.Root))
-	if st == nil || st.IsNil() {
+func (s *Service) initializeHeadFromDB(ctx context.Context) error {
+	finalized, err := s.cfg.BeaconDB.FinalizedCheckpoint(ctx)
+	if err != nil {
+		return errors.Wrap(err, "could not get finalized checkpoint from db")
+	}
+	if finalized == nil {
+		// This should never happen. At chain start, the finalized checkpoint
+		// would be the genesis state and block.
+		return errors.New("no finalized epoch in the database")
+	}
+	finalizedRoot := s.ensureRootNotZeros(bytesutil.ToBytes32(finalized.Root))
+	var finalizedState state.BeaconState
+
+	finalizedState, err = s.cfg.StateGen.Resume(ctx, s.cfg.FinalizedStateAtStartUp)
+	if err != nil {
+		return errors.Wrap(err, "could not get finalized state from db")
+	}
+
+	if finalizedState == nil || finalizedState.IsNil() {
 		return errors.New("finalized state can't be nil")
 	}

-	s.cfg.ForkChoiceStore.RLock()
-	root := s.cfg.ForkChoiceStore.HighestReceivedBlockRoot()
-	s.cfg.ForkChoiceStore.RUnlock()
-	blk, err := s.cfg.BeaconDB.Block(ctx, root)
+	finalizedBlock, err := s.getBlock(ctx, finalizedRoot)
 	if err != nil {
-		return errors.Wrap(err, "could not get head block")
+		return errors.Wrap(err, "could not get finalized block")
 	}
-	if root != fRoot {
-		st, err = s.cfg.StateGen.StateByRoot(ctx, root)
-		if err != nil {
-			return errors.Wrap(err, "could not get head state")
-		}
-	}
-	if err := s.setHead(&head{root, blk, st, blk.Block().Slot(), false}); err != nil {
+	if err := s.setHead(&head{
+		finalizedRoot,
+		finalizedBlock,
+		finalizedState,
+		finalizedBlock.Block().Slot(),
+		false,
+	}); err != nil {
 		return errors.Wrap(err, "could not set head")
 	}
-	log.WithFields(logrus.Fields{
-		"root": fmt.Sprintf("%#x", root),
-		"slot": blk.Block().Slot(),
-	}).Info("Initialized head block from DB")
+
 	return nil
 }

--- a/beacon-chain/blockchain/setup_forchoice.go
+++ b/beacon-chain/blockchain/setup_forchoice.go
@@ -1,175 +0,0 @@
-package blockchain
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-
-	"github.com/pkg/errors"
-	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/state"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
-	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
-	"github.com/prysmaticlabs/prysm/v5/time/slots"
-)
-
-func (s *Service) setupForkchoice(st state.BeaconState) error {
-	if err := s.setupForkchoiceCheckpoints(); err != nil {
-		return errors.Wrap(err, "could not set up forkchoice checkpoints")
-	}
-	if err := s.setupForkchoiceTree(st); err != nil {
-		return errors.Wrap(err, "could not set up forkchoice root")
-	}
-	if err := s.initializeHead(s.ctx, st); err != nil {
-		return errors.Wrap(err, "could not initialize head from db")
-	}
-	return nil
-}
-
-func (s *Service) startupHeadRoot() [32]byte {
-	headStr := features.Get().ForceHead
-	cp := s.FinalizedCheckpt()
-	fRoot := s.ensureRootNotZeros([32]byte(cp.Root))
-	if headStr == "" {
-		return fRoot
-	}
-	if headStr == "head" {
-		root, err := s.cfg.BeaconDB.HeadBlockRoot()
-		if err != nil {
-			log.WithError(err).Error("could not get head block root, starting with finalized block as head")
-			return fRoot
-		}
-		log.Infof("Using Head root of %#x", root)
-		return root
-	}
-	root, err := bytesutil.DecodeHexWithLength(headStr, 32)
-	if err != nil {
-		log.WithError(err).Error("could not parse head root, starting with finalized block as head")
-		return fRoot
-	}
-	return [32]byte(root)
-}
-
-func (s *Service) setupForkchoiceTree(st state.BeaconState) error {
-	headRoot := s.startupHeadRoot()
-	cp := s.FinalizedCheckpt()
-	fRoot := s.ensureRootNotZeros([32]byte(cp.Root))
-	if err := s.setupForkchoiceRoot(st); err != nil {
-		return errors.Wrap(err, "could not set up forkchoice root")
-	}
-	if headRoot == fRoot {
-		return nil
-	}
-	blk, err := s.cfg.BeaconDB.Block(s.ctx, headRoot)
-	if err != nil {
-		log.WithError(err).Error("could not get head block, starting with finalized block as head")
-		return nil
-	}
-	if slots.ToEpoch(blk.Block().Slot()) < cp.Epoch {
-		log.WithField("headRoot", fmt.Sprintf("%#x", headRoot)).Error("head block is older than finalized block, starting with finalized block as head")
-		return nil
-	}
-	chain, err := s.buildForkchoiceChain(s.ctx, blk)
-	if err != nil {
-		log.WithError(err).Error("could not build forkchoice chain, starting with finalized block as head")
-		return nil
-	}
-	s.cfg.ForkChoiceStore.Lock()
-	defer s.cfg.ForkChoiceStore.Unlock()
-	return s.cfg.ForkChoiceStore.InsertChain(s.ctx, chain)
-}
-
-func (s *Service) buildForkchoiceChain(ctx context.Context, head interfaces.ReadOnlySignedBeaconBlock) ([]*forkchoicetypes.BlockAndCheckpoints, error) {
-	chain := []*forkchoicetypes.BlockAndCheckpoints{}
-	cp := s.FinalizedCheckpt()
-	fRoot := s.ensureRootNotZeros([32]byte(cp.Root))
-	jp := s.CurrentJustifiedCheckpt()
-	root, err := head.Block().HashTreeRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get head block root")
-	}
-	for {
-		roblock, err := blocks.NewROBlockWithRoot(head, root)
-		if err != nil {
-			return nil, err
-		}
-		// This chain sets the justified checkpoint for every block, including some that are older than jp.
-		// This should be however safe for forkchoice at startup. An alternative would be to hook during the
-		// block processing pipeline when setting the head state, to compute the right states for the justified
-		// checkpoint.
-		chain = append(chain, &forkchoicetypes.BlockAndCheckpoints{Block: roblock, JustifiedCheckpoint: jp, FinalizedCheckpoint: cp})
-		root = head.Block().ParentRoot()
-		if root == fRoot {
-			break
-		}
-		head, err = s.cfg.BeaconDB.Block(s.ctx, root)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not get block")
-		}
-		if slots.ToEpoch(head.Block().Slot()) < cp.Epoch {
-			return nil, errors.New("head block is not a descendant of the finalized checkpoint")
-		}
-	}
-	return chain, nil
-}
-
-func (s *Service) setupForkchoiceRoot(st state.BeaconState) error {
-	cp := s.FinalizedCheckpt()
-	fRoot := s.ensureRootNotZeros([32]byte(cp.Root))
-	finalizedBlock, err := s.cfg.BeaconDB.Block(s.ctx, fRoot)
-	if err != nil {
-		return errors.Wrap(err, "could not get finalized checkpoint block")
-	}
-	roblock, err := blocks.NewROBlockWithRoot(finalizedBlock, fRoot)
-	if err != nil {
-		return err
-	}
-	if err := s.cfg.ForkChoiceStore.InsertNode(s.ctx, st, roblock); err != nil {
-		return errors.Wrap(err, "could not insert finalized block to forkchoice")
-	}
-	if !features.Get().EnableStartOptimistic {
-		lastValidatedCheckpoint, err := s.cfg.BeaconDB.LastValidatedCheckpoint(s.ctx)
-		if err != nil {
-			return errors.Wrap(err, "could not get last validated checkpoint")
-		}
-		if bytes.Equal(fRoot[:], lastValidatedCheckpoint.Root) {
-			if err := s.cfg.ForkChoiceStore.SetOptimisticToValid(s.ctx, fRoot); err != nil {
-				return errors.Wrap(err, "could not set finalized block as validated")
-			}
-		}
-	}
-	return nil
-}
-
-func (s *Service) setupForkchoiceCheckpoints() error {
-	justified, err := s.cfg.BeaconDB.JustifiedCheckpoint(s.ctx)
-	if err != nil {
-		return errors.Wrap(err, "could not get justified checkpoint")
-	}
-	if justified == nil {
-		return errNilJustifiedCheckpoint
-	}
-	finalized, err := s.cfg.BeaconDB.FinalizedCheckpoint(s.ctx)
-	if err != nil {
-		return errors.Wrap(err, "could not get finalized checkpoint")
-	}
-	if finalized == nil {
-		return errNilFinalizedCheckpoint
-	}
-
-	fRoot := s.ensureRootNotZeros(bytesutil.ToBytes32(finalized.Root))
-	s.cfg.ForkChoiceStore.Lock()
-	defer s.cfg.ForkChoiceStore.Unlock()
-	if err := s.cfg.ForkChoiceStore.UpdateJustifiedCheckpoint(s.ctx, &forkchoicetypes.Checkpoint{Epoch: justified.Epoch,
-		Root: bytesutil.ToBytes32(justified.Root)}); err != nil {
-		return errors.Wrap(err, "could not update forkchoice's justified checkpoint")
-	}
-	if err := s.cfg.ForkChoiceStore.UpdateFinalizedCheckpoint(&forkchoicetypes.Checkpoint{Epoch: finalized.Epoch,
-		Root: fRoot}); err != nil {
-		return errors.Wrap(err, "could not update forkchoice's finalized checkpoint")
-	}
-	s.cfg.ForkChoiceStore.SetGenesisTime(uint64(s.genesisTime.Unix()))
-	return nil
-}
--- a/beacon-chain/blockchain/setup_forkchoice_test.go
+++ b/beacon-chain/blockchain/setup_forkchoice_test.go
@@ -1,128 +0,0 @@
-package blockchain
-
-import (
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/blocks"
-	"github.com/prysmaticlabs/prysm/v5/config/features"
-	"github.com/prysmaticlabs/prysm/v5/config/params"
-	consensusblocks "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-	"github.com/prysmaticlabs/prysm/v5/testing/util"
-	logTest "github.com/sirupsen/logrus/hooks/test"
-)
-
-func Test_startupHeadRoot(t *testing.T) {
-	service, tr := minimalTestService(t)
-	ctx := tr.ctx
-	hook := logTest.NewGlobal()
-	cp := service.FinalizedCheckpt()
-	require.DeepEqual(t, cp.Root, params.BeaconConfig().ZeroHash[:])
-	gr := [32]byte{'r', 'o', 'o', 't'}
-	service.originBlockRoot = gr
-	require.NoError(t, service.cfg.BeaconDB.SaveGenesisBlockRoot(ctx, gr))
-	t.Run("start from finalized", func(t *testing.T) {
-		require.Equal(t, service.startupHeadRoot(), gr)
-	})
-	t.Run("head requested, error path", func(t *testing.T) {
-		resetCfg := features.InitWithReset(&features.Flags{
-			ForceHead: "head",
-		})
-		defer resetCfg()
-		require.Equal(t, service.startupHeadRoot(), gr)
-		require.LogsContain(t, hook, "could not get head block root, starting with finalized block as head")
-	})
-
-	st, _ := util.DeterministicGenesisState(t, 64)
-	hr := [32]byte{'h', 'e', 'a', 'd'}
-	require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, st, hr), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, hr), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, hr))
-
-	t.Run("start from head", func(t *testing.T) {
-		resetCfg := features.InitWithReset(&features.Flags{
-			ForceHead: "head",
-		})
-		defer resetCfg()
-		require.Equal(t, service.startupHeadRoot(), hr)
-	})
-}
-
-func Test_setupForkchoiceTree_Finalized(t *testing.T) {
-	service, tr := minimalTestService(t)
-	ctx := tr.ctx
-
-	st, _ := util.DeterministicGenesisState(t, 64)
-	stateRoot, err := st.HashTreeRoot(ctx)
-	require.NoError(t, err, "Could not hash genesis state")
-
-	require.NoError(t, service.saveGenesisData(ctx, st))
-
-	genesis := blocks.NewGenesisBlock(stateRoot[:])
-	wsb, err := consensusblocks.NewSignedBeaconBlock(genesis)
-	require.NoError(t, err)
-	require.NoError(t, service.cfg.BeaconDB.SaveBlock(ctx, wsb), "Could not save genesis block")
-	parentRoot, err := genesis.Block.HashTreeRoot()
-	require.NoError(t, err, "Could not get signing root")
-	require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, st, parentRoot), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, parentRoot), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveJustifiedCheckpoint(ctx, &ethpb.Checkpoint{Root: parentRoot[:]}))
-	require.NoError(t, service.cfg.BeaconDB.SaveFinalizedCheckpoint(ctx, &ethpb.Checkpoint{Root: parentRoot[:]}))
-	require.NoError(t, service.setupForkchoiceTree(st))
-	require.Equal(t, 1, service.cfg.ForkChoiceStore.NodeCount())
-}
-
-func Test_setupForkchoiceTree_Head(t *testing.T) {
-	service, tr := minimalTestService(t)
-	ctx := tr.ctx
-	resetCfg := features.InitWithReset(&features.Flags{
-		ForceHead: "head",
-	})
-	defer resetCfg()
-
-	genesisState, keys := util.DeterministicGenesisState(t, 64)
-	stateRoot, err := genesisState.HashTreeRoot(ctx)
-	require.NoError(t, err, "Could not hash genesis state")
-	genesis := blocks.NewGenesisBlock(stateRoot[:])
-	wsb, err := consensusblocks.NewSignedBeaconBlock(genesis)
-	require.NoError(t, err)
-	genesisRoot, err := genesis.Block.HashTreeRoot()
-	require.NoError(t, err, "Could not get signing root")
-	require.NoError(t, service.cfg.BeaconDB.SaveBlock(ctx, wsb), "Could not save genesis block")
-	require.NoError(t, service.saveGenesisData(ctx, genesisState))
-
-	require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, genesisState, genesisRoot), "Could not save genesis state")
-	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, genesisRoot), "Could not save genesis state")
-
-	st, err := service.HeadState(ctx)
-	require.NoError(t, err)
-	b, err := util.GenerateFullBlock(st, keys, util.DefaultBlockGenConfig(), primitives.Slot(1))
-	require.NoError(t, err)
-	wsb, err = consensusblocks.NewSignedBeaconBlock(b)
-	require.NoError(t, err)
-	root, err := b.Block.HashTreeRoot()
-	require.NoError(t, err)
-	preState, err := service.getBlockPreState(ctx, wsb.Block())
-	require.NoError(t, err)
-	postState, err := service.validateStateTransition(ctx, preState, wsb)
-	require.NoError(t, err)
-	require.NoError(t, service.savePostStateInfo(ctx, root, wsb, postState))
-
-	b, err = util.GenerateFullBlock(postState, keys, util.DefaultBlockGenConfig(), primitives.Slot(2))
-	require.NoError(t, err)
-	wsb, err = consensusblocks.NewSignedBeaconBlock(b)
-	require.NoError(t, err)
-	root, err = b.Block.HashTreeRoot()
-	require.NoError(t, err)
-	require.NoError(t, service.savePostStateInfo(ctx, root, wsb, preState))
-
-	require.NoError(t, service.cfg.BeaconDB.SaveHeadBlockRoot(ctx, root))
-	cp := service.FinalizedCheckpt()
-	fRoot := service.ensureRootNotZeros([32]byte(cp.Root))
-	require.NotEqual(t, fRoot, root)
-	require.Equal(t, root, service.startupHeadRoot())
-	require.NoError(t, service.setupForkchoiceTree(st))
-	require.Equal(t, 2, service.cfg.ForkChoiceStore.NodeCount())
-}
--- a/beacon-chain/builder/BUILD.bazel
+++ b/beacon-chain/builder/BUILD.bazel
@@ -3,7 +3,6 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 go_library(
    name = "go_default_library",
    srcs = [
-        "log.go",
        "metric.go",
        "option.go",
        "service.go",
--- a/beacon-chain/builder/log.go
+++ b/beacon-chain/builder/log.go
@@ -1,5 +0,0 @@
-package builder
-
-import "github.com/sirupsen/logrus"
-
-var log = logrus.WithField("prefix", "builder")
--- a/beacon-chain/builder/option.go
+++ b/beacon-chain/builder/option.go
@@ -14,16 +14,10 @@ type Option func(s *Service) error
 // FlagOptions for builder service flag configurations.
 func FlagOptions(c *cli.Context) ([]Option, error) {
 	endpoint := c.String(flags.MevRelayEndpoint.Name)
-	sszEnabled := c.Bool(flags.EnableBuilderSSZ.Name)
 	var client *builder.Client
 	if endpoint != "" {
-		var opts []builder.ClientOpt
-		if sszEnabled {
-			log.Info("Using APIs with SSZ enabled")
-			opts = append(opts, builder.WithSSZ())
-		}
 		var err error
-		client, err = builder.NewClient(endpoint, opts...)
+		client, err = builder.NewClient(endpoint)
 		if err != nil {
 			return nil, err
 		}
--- a/beacon-chain/builder/service.go
+++ b/beacon-chain/builder/service.go
@@ -17,6 +17,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
 	v1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
+	log "github.com/sirupsen/logrus"
 )

 // ErrNoBuilder is used when builder endpoint is not configured.
--- a/beacon-chain/cache/BUILD.bazel
+++ b/beacon-chain/cache/BUILD.bazel
@@ -84,7 +84,6 @@ go_test(
        "sync_committee_head_state_test.go",
        "sync_committee_test.go",
        "sync_subnet_ids_test.go",
-        "tracked_validators_test.go",
    ],
    embed = [":go_default_library"],
    deps = [
--- a/beacon-chain/cache/tracked_validators.go
+++ b/beacon-chain/cache/tracked_validators.go
@@ -1,139 +1,49 @@
 package cache

 import (
-	"strconv"
-	"time"
+	"sync"

-	"github.com/patrickmn/go-cache"
-	"github.com/pkg/errors"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/sirupsen/logrus"
 )

-const (
-	defaultExpiration = 1 * time.Hour
-	cleanupInterval   = 15 * time.Minute
-)
+type TrackedValidator struct {
+	Active       bool
+	FeeRecipient primitives.ExecutionAddress
+	Index        primitives.ValidatorIndex
+}

-type (
-	TrackedValidator struct {
-		Active       bool
-		FeeRecipient primitives.ExecutionAddress
-		Index        primitives.ValidatorIndex
-	}
+type TrackedValidatorsCache struct {
+	sync.Mutex
+	trackedValidators map[primitives.ValidatorIndex]TrackedValidator
+}

-	TrackedValidatorsCache struct {
-		trackedValidators *cache.Cache
-	}
-)
-
-var (
-	// Metrics.
-	trackedValidatorsCacheMiss = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "tracked_validators_cache_miss",
-		Help: "The number of tracked validators requests that are not present in the cache.",
-	})
-
-	trackedValidatorsCacheTotal = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "tracked_validators_cache_total",
-		Help: "The total number of tracked validators requests in the cache.",
-	})
-
-	trackedValidatorsCacheCount = promauto.NewGauge(prometheus.GaugeOpts{
-		Name: "tracked_validators_cache_count",
-		Help: "The number of tracked validators in the cache.",
-	})
-)
-
-// NewTrackedValidatorsCache creates a new cache for tracking validators.
 func NewTrackedValidatorsCache() *TrackedValidatorsCache {
 	return &TrackedValidatorsCache{
-		trackedValidators: cache.New(defaultExpiration, cleanupInterval),
+		trackedValidators: make(map[primitives.ValidatorIndex]TrackedValidator),
 	}
 }

-// Validator retrieves a tracked validator from the cache (if present).
 func (t *TrackedValidatorsCache) Validator(index primitives.ValidatorIndex) (TrackedValidator, bool) {
-	trackedValidatorsCacheTotal.Inc()
-
-	key := toCacheKey(index)
-	item, ok := t.trackedValidators.Get(key)
-	if !ok {
-		trackedValidatorsCacheMiss.Inc()
-		return TrackedValidator{}, false
-	}
-
-	val, ok := item.(TrackedValidator)
-	if !ok {
-		logrus.Errorf("Failed to cast tracked validator from cache, got unexpected item type %T", item)
-		return TrackedValidator{}, false
-	}
-
-	return val, true
+	t.Lock()
+	defer t.Unlock()
+	val, ok := t.trackedValidators[index]
+	return val, ok
 }

-// Set adds a tracked validator to the cache.
 func (t *TrackedValidatorsCache) Set(val TrackedValidator) {
-	key := toCacheKey(val.Index)
-	t.trackedValidators.Set(key, val, cache.DefaultExpiration)
+	t.Lock()
+	defer t.Unlock()
+	t.trackedValidators[val.Index] = val
 }

-// Delete removes a tracked validator from the cache.
 func (t *TrackedValidatorsCache) Prune() {
-	t.trackedValidators.Flush()
-	trackedValidatorsCacheCount.Set(0)
+	t.Lock()
+	defer t.Unlock()
+	t.trackedValidators = make(map[primitives.ValidatorIndex]TrackedValidator)
 }

-// Validating returns true if there are at least one tracked validators in the cache.
 func (t *TrackedValidatorsCache) Validating() bool {
-	count := t.trackedValidators.ItemCount()
-	trackedValidatorsCacheCount.Set(float64(count))
-
-	return count > 0
-}
-
-// ItemCount returns the number of tracked validators in the cache.
-func (t *TrackedValidatorsCache) ItemCount() int {
-	count := t.trackedValidators.ItemCount()
-	trackedValidatorsCacheCount.Set(float64(count))
-
-	return count
-}
-
-// Indices returns a map of validator indices that are being tracked.
-func (t *TrackedValidatorsCache) Indices() map[primitives.ValidatorIndex]bool {
-	items := t.trackedValidators.Items()
-	count := len(items)
-	trackedValidatorsCacheCount.Set(float64(count))
-
-	indices := make(map[primitives.ValidatorIndex]bool, count)
-
-	for cacheKey := range items {
-		index, err := fromCacheKey(cacheKey)
-		if err != nil {
-			logrus.WithError(err).Error("Failed to get validator index from cache key")
-			continue
-		}
-
-		indices[index] = true
-	}
-
-	return indices
-}
-
-// toCacheKey creates a cache key from the validator index.
-func toCacheKey(validatorIndex primitives.ValidatorIndex) string {
-	return strconv.FormatUint(uint64(validatorIndex), 10)
-}
-
-// fromCacheKey gets the validator index from the cache key.
-func fromCacheKey(key string) (primitives.ValidatorIndex, error) {
-	validatorIndex, err := strconv.ParseUint(key, 10, 64)
-	if err != nil {
-		return 0, errors.Wrapf(err, "parse Uint: %s", key)
-	}
-
-	return primitives.ValidatorIndex(validatorIndex), nil
+	t.Lock()
+	defer t.Unlock()
+	return len(t.trackedValidators) > 0
 }
--- a/beacon-chain/cache/tracked_validators_test.go
+++ b/beacon-chain/cache/tracked_validators_test.go
@@ -1,79 +0,0 @@
-package cache
-
-import (
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
-)
-
-func mapEqual(a, b map[primitives.ValidatorIndex]bool) bool {
-	if len(a) != len(b) {
-		return false
-	}
-
-	for k, v := range a {
-		if b[k] != v {
-			return false
-		}
-	}
-
-	return true
-}
-
-func TestTrackedValidatorsCache(t *testing.T) {
-	vc := NewTrackedValidatorsCache()
-
-	// No validators in cache.
-	require.Equal(t, 0, vc.ItemCount())
-	require.Equal(t, false, vc.Validating())
-	require.Equal(t, 0, len(vc.Indices()))
-
-	_, ok := vc.Validator(41)
-	require.Equal(t, false, ok)
-
-	// Add some validators (one twice).
-	v42Expected := TrackedValidator{Active: true, FeeRecipient: [20]byte{1}, Index: 42}
-	v43Expected := TrackedValidator{Active: false, FeeRecipient: [20]byte{2}, Index: 43}
-
-	vc.Set(v42Expected)
-	vc.Set(v43Expected)
-	vc.Set(v42Expected)
-
-	// Check if they are in the cache.
-	v42Actual, ok := vc.Validator(42)
-	require.Equal(t, true, ok)
-	require.Equal(t, v42Expected, v42Actual)
-
-	v43Actual, ok := vc.Validator(43)
-	require.Equal(t, true, ok)
-	require.Equal(t, v43Expected, v43Actual)
-
-	expected := map[primitives.ValidatorIndex]bool{42: true, 43: true}
-	actual := vc.Indices()
-	require.Equal(t, true, mapEqual(expected, actual))
-
-	// Check the item count and if the cache is validating.
-	require.Equal(t, 2, vc.ItemCount())
-	require.Equal(t, true, vc.Validating())
-
-	// Check if a non-existing validator is in the cache.
-	_, ok = vc.Validator(41)
-	require.Equal(t, false, ok)
-
-	// Prune the cache and test it.
-	vc.Prune()
-
-	_, ok = vc.Validator(41)
-	require.Equal(t, false, ok)
-
-	_, ok = vc.Validator(42)
-	require.Equal(t, false, ok)
-
-	_, ok = vc.Validator(43)
-	require.Equal(t, false, ok)
-
-	require.Equal(t, 0, vc.ItemCount())
-	require.Equal(t, false, vc.Validating())
-	require.Equal(t, 0, len(vc.Indices()))
-}
--- a/beacon-chain/core/altair/attestation.go
+++ b/beacon-chain/core/altair/attestation.go
@@ -66,7 +66,7 @@ func ProcessAttestationNoVerifySignature(
 	if err != nil {
 		return nil, err
 	}
-	committees, err := helpers.AttestationCommitteesFromState(ctx, beaconState, att)
+	committees, err := helpers.AttestationCommittees(ctx, beaconState, att)
 	if err != nil {
 		return nil, err
 	}
--- a/beacon-chain/core/blocks/signature.go
+++ b/beacon-chain/core/blocks/signature.go
@@ -192,7 +192,7 @@ func createAttestationSignatureBatch(
 	descs := make([]string, len(atts))
 	for i, a := range atts {
 		sigs[i] = a.GetSignature()
-		committees, err := helpers.AttestationCommitteesFromState(ctx, beaconState, a)
+		committees, err := helpers.AttestationCommittees(ctx, beaconState, a)
 		if err != nil {
 			return nil, err
 		}
--- a/beacon-chain/core/electra/BUILD.bazel
+++ b/beacon-chain/core/electra/BUILD.bazel
@@ -79,6 +79,7 @@ go_test(
        "//consensus-types/blocks:go_default_library",
        "//consensus-types/primitives:go_default_library",
        "//crypto/bls:go_default_library",
+        "//crypto/bls/common:go_default_library",
        "//encoding/bytesutil:go_default_library",
        "//proto/engine/v1:go_default_library",
        "//proto/prysm/v1alpha1:go_default_library",
--- a/beacon-chain/core/electra/deposits.go
+++ b/beacon-chain/core/electra/deposits.go
@@ -374,38 +374,47 @@ func ProcessPendingDeposits(ctx context.Context, st state.BeaconState, activeBal

 // batchProcessNewPendingDeposits should only be used to process new deposits that require validator registration
 func batchProcessNewPendingDeposits(ctx context.Context, state state.BeaconState, pendingDeposits []*ethpb.PendingDeposit) error {
+	// Return early if there are no deposits to process
 	if len(pendingDeposits) == 0 {
 		return nil
 	}

+	// Try batch verification of all deposit signatures
 	allSignaturesVerified, err := blocks.BatchVerifyPendingDepositsSignatures(ctx, pendingDeposits)
 	if err != nil {
 		return errors.Wrap(err, "batch signature verification failed")
 	}

-	for _, pd := range pendingDeposits {
-		validSig := allSignaturesVerified
+	// Process each deposit individually
+	for _, pendingDeposit := range pendingDeposits {
+		validSignature := allSignaturesVerified

+		// If batch verification failed, check the individual deposit signature
 		if !allSignaturesVerified {
-			validSig, err = blocks.IsValidDepositSignature(&ethpb.Deposit_Data{
-				PublicKey:             bytesutil.SafeCopyBytes(pd.PublicKey),
-				WithdrawalCredentials: bytesutil.SafeCopyBytes(pd.WithdrawalCredentials),
-				Amount:                pd.Amount,
-				Signature:             bytesutil.SafeCopyBytes(pd.Signature),
+			validSignature, err = blocks.IsValidDepositSignature(&ethpb.Deposit_Data{
+				PublicKey:             bytesutil.SafeCopyBytes(pendingDeposit.PublicKey),
+				WithdrawalCredentials: bytesutil.SafeCopyBytes(pendingDeposit.WithdrawalCredentials),
+				Amount:                pendingDeposit.Amount,
+				Signature:             bytesutil.SafeCopyBytes(pendingDeposit.Signature),
 			})
 			if err != nil {
 				return errors.Wrap(err, "individual deposit signature verification failed")
 			}
 		}

-		pubkey := bytesutil.ToBytes48(pd.PublicKey)
-		if index, exists := state.ValidatorIndexByPubkey(pubkey); exists {
-			if err := helpers.IncreaseBalance(state, index, pd.Amount); err != nil {
-				return errors.Wrap(err, "could not increase balance")
-			}
-		} else if validSig {
-			if err := AddValidatorToRegistry(state, pd.PublicKey, pd.WithdrawalCredentials, pd.Amount); err != nil {
-				return errors.Wrap(err, "failed to add validator to registry")
+		// Add validator to the registry if the signature is valid
+		if validSignature {
+			_, has := state.ValidatorIndexByPubkey(bytesutil.ToBytes48(pendingDeposit.PublicKey))
+			if has {
+				index, _ := state.ValidatorIndexByPubkey(bytesutil.ToBytes48(pendingDeposit.PublicKey))
+				if err := helpers.IncreaseBalance(state, index, pendingDeposit.Amount); err != nil {
+					return errors.Wrap(err, "could not increase balance")
+				}
+			} else {
+				err = AddValidatorToRegistry(state, pendingDeposit.PublicKey, pendingDeposit.WithdrawalCredentials, pendingDeposit.Amount)
+				if err != nil {
+					return errors.Wrap(err, "failed to add validator to registry")
+				}
 			}
 		}
 	}
--- a/beacon-chain/core/electra/deposits_test.go
+++ b/beacon-chain/core/electra/deposits_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/crypto/bls"
+	"github.com/prysmaticlabs/prysm/v5/crypto/bls/common"
 	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
 	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -195,7 +196,7 @@ func TestProcessPendingDeposits(t *testing.T) {
 			},
 		},
 		{
-			name: "process excess balance as a topup",
+			name: "process excess balance that uses a point to infinity signature, processed as a topup",
 			state: func() state.BeaconState {
 				excessBalance := uint64(100)
 				st := stateWithActiveBalanceETH(t, 32)
@@ -208,6 +209,7 @@ func TestProcessPendingDeposits(t *testing.T) {
 				validators[0].PublicKey = sk.PublicKey().Marshal()
 				validators[0].WithdrawalCredentials = wc
 				dep := stateTesting.GeneratePendingDeposit(t, sk, excessBalance, bytesutil.ToBytes32(wc), 0)
+				dep.Signature = common.InfiniteSignature[:]
 				require.NoError(t, st.SetValidators(validators))
 				require.NoError(t, st.SetPendingDeposits([]*eth.PendingDeposit{dep}))
 				return st
@@ -556,6 +558,7 @@ func TestApplyPendingDeposit_TopUp(t *testing.T) {
 	validators[0].PublicKey = sk.PublicKey().Marshal()
 	validators[0].WithdrawalCredentials = wc
 	dep := stateTesting.GeneratePendingDeposit(t, sk, excessBalance, bytesutil.ToBytes32(wc), 0)
+	dep.Signature = common.InfiniteSignature[:]
 	require.NoError(t, st.SetValidators(validators))

 	require.NoError(t, electra.ApplyPendingDeposit(context.Background(), st, dep))
--- a/beacon-chain/core/feed/operation/BUILD.bazel
+++ b/beacon-chain/core/feed/operation/BUILD.bazel
@@ -11,7 +11,6 @@ go_library(
    deps = [
        "//async/event:go_default_library",
        "//consensus-types/blocks:go_default_library",
-        "//consensus-types/interfaces:go_default_library",
        "//proto/prysm/v1alpha1:go_default_library",
    ],
 )
--- a/beacon-chain/core/feed/operation/events.go
+++ b/beacon-chain/core/feed/operation/events.go
@@ -3,7 +3,6 @@ package operation

 import (
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )

@@ -36,9 +35,6 @@ const (

 	// SingleAttReceived is sent after a single attestation object is received from gossip or rpc
 	SingleAttReceived = 9
-
-	// BlockGossipReceived is sent after a block has been received from gossip or API that passes validation rules.
-	BlockGossipReceived = 10
 )

 // UnAggregatedAttReceivedData is the data sent with UnaggregatedAttReceived events.
@@ -89,9 +85,3 @@ type AttesterSlashingReceivedData struct {
 type SingleAttReceivedData struct {
 	Attestation ethpb.Att
 }
-
-// BlockGossipReceivedData is the data sent with BlockGossipReceived events.
-type BlockGossipReceivedData struct {
-	// SignedBlock is the block that was received.
-	SignedBlock interfaces.ReadOnlySignedBeaconBlock
-}
--- a/beacon-chain/core/fulu/upgrade.go
+++ b/beacon-chain/core/fulu/upgrade.go
@@ -102,7 +102,7 @@ func UpgradeToFulu(beaconState state.BeaconState) (state.BeaconState, error) {
 		return nil, err
 	}

-	s := &ethpb.BeaconStateElectra{
+	s := &ethpb.BeaconStateFulu{
 		GenesisTime:           beaconState.GenesisTime(),
 		GenesisValidatorsRoot: beaconState.GenesisValidatorsRoot(),
 		Slot:                  beaconState.Slot(),
--- a/beacon-chain/core/helpers/beacon_committee.go
+++ b/beacon-chain/core/helpers/beacon_committee.go
@@ -30,13 +30,6 @@ var (
 	proposerIndicesCache = cache.NewProposerIndicesCache()
 )

-type beaconCommitteeFunc = func(
-	ctx context.Context,
-	state state.ReadOnlyBeaconState,
-	slot primitives.Slot,
-	committeeIndex primitives.CommitteeIndex,
-) ([]primitives.ValidatorIndex, error)
-
 // SlotCommitteeCount returns the number of beacon committees of a slot. The
 // active validator count is provided as an argument rather than an imported implementation
 // from the spec definition. Having the active validator count as an argument allows for
@@ -66,48 +59,21 @@ func SlotCommitteeCount(activeValidatorCount uint64) uint64 {
 	return committeesPerSlot
 }

-// AttestationCommitteesFromState returns beacon state committees that reflect attestation's committee indices.
-func AttestationCommitteesFromState(ctx context.Context, st state.ReadOnlyBeaconState, att ethpb.Att) ([][]primitives.ValidatorIndex, error) {
-	return attestationCommittees(ctx, st, att, BeaconCommitteeFromState)
-}
-
-// AttestationCommitteesFromCache has the same functionality as AttestationCommitteesFromState, but only returns a value
-// when all attestation committees are already cached.
-func AttestationCommitteesFromCache(ctx context.Context, st state.ReadOnlyBeaconState, att ethpb.Att) (bool, [][]primitives.ValidatorIndex, error) {
-	committees, err := attestationCommittees(ctx, st, att, BeaconCommitteeFromCache)
-	if err != nil {
-		return false, nil, err
-	}
-	if len(committees) == 0 {
-		return false, nil, nil
-	}
-	for _, c := range committees {
-		if len(c) == 0 {
-			return false, nil, nil
-		}
-	}
-	return true, committees, nil
-}
-
-func attestationCommittees(
-	ctx context.Context,
-	st state.ReadOnlyBeaconState,
-	att ethpb.Att,
-	committeeFunc beaconCommitteeFunc,
-) ([][]primitives.ValidatorIndex, error) {
+// AttestationCommittees returns beacon state committees that reflect attestation's committee indices.
+func AttestationCommittees(ctx context.Context, st state.ReadOnlyBeaconState, att ethpb.Att) ([][]primitives.ValidatorIndex, error) {
 	var committees [][]primitives.ValidatorIndex
 	if att.Version() >= version.Electra {
 		committeeIndices := att.CommitteeBitsVal().BitIndices()
 		committees = make([][]primitives.ValidatorIndex, len(committeeIndices))
 		for i, ci := range committeeIndices {
-			committee, err := committeeFunc(ctx, st, att.GetData().Slot, primitives.CommitteeIndex(ci))
+			committee, err := BeaconCommitteeFromState(ctx, st, att.GetData().Slot, primitives.CommitteeIndex(ci))
 			if err != nil {
 				return nil, err
 			}
 			committees[i] = committee
 		}
 	} else {
-		committee, err := committeeFunc(ctx, st, att.GetData().Slot, att.GetData().CommitteeIndex)
+		committee, err := BeaconCommitteeFromState(ctx, st, att.GetData().Slot, att.GetData().CommitteeIndex)
 		if err != nil {
 			return nil, err
 		}
@@ -198,27 +164,6 @@ func BeaconCommitteeFromState(ctx context.Context, state state.ReadOnlyBeaconSta
 	return BeaconCommittee(ctx, activeIndices, seed, slot, committeeIndex)
 }

-// BeaconCommitteeFromCache has the same functionality as BeaconCommitteeFromState, but only returns a value
-// when the committee is already cached.
-func BeaconCommitteeFromCache(
-	ctx context.Context,
-	state state.ReadOnlyBeaconState,
-	slot primitives.Slot,
-	committeeIndex primitives.CommitteeIndex,
-) ([]primitives.ValidatorIndex, error) {
-	epoch := slots.ToEpoch(slot)
-	seed, err := Seed(state, epoch, params.BeaconConfig().DomainBeaconAttester)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get seed")
-	}
-
-	committee, err := committeeCache.Committee(ctx, slot, seed, committeeIndex)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not interface with committee cache")
-	}
-	return committee, nil
-}
-
 // BeaconCommittee returns the beacon committee of a given slot and committee index. The
 // validator indices and seed are provided as an argument rather than an imported implementation
 // from the spec definition. Having them as an argument allows for cheaper computation run time.
--- a/beacon-chain/core/helpers/beacon_committee_test.go
+++ b/beacon-chain/core/helpers/beacon_committee_test.go
@@ -729,9 +729,7 @@ func TestCommitteeIndices(t *testing.T) {
 	assert.DeepEqual(t, []primitives.CommitteeIndex{0, 1, 3}, indices)
 }

-func TestAttestationCommitteesFromState(t *testing.T) {
-	ctx := context.Background()
-
+func TestAttestationCommittees(t *testing.T) {
 	validators := make([]*ethpb.Validator, params.BeaconConfig().SlotsPerEpoch.Mul(params.BeaconConfig().TargetCommitteeSize))
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &ethpb.Validator{
@@ -747,7 +745,7 @@ func TestAttestationCommitteesFromState(t *testing.T) {

 	t.Run("pre-Electra", func(t *testing.T) {
 		att := &ethpb.Attestation{Data: &ethpb.AttestationData{CommitteeIndex: 0}}
-		committees, err := helpers.AttestationCommitteesFromState(ctx, state, att)
+		committees, err := helpers.AttestationCommittees(context.Background(), state, att)
 		require.NoError(t, err)
 		require.Equal(t, 1, len(committees))
 		assert.Equal(t, params.BeaconConfig().TargetCommitteeSize, uint64(len(committees[0])))
@@ -757,7 +755,7 @@ func TestAttestationCommitteesFromState(t *testing.T) {
 		bits.SetBitAt(0, true)
 		bits.SetBitAt(1, true)
 		att := &ethpb.AttestationElectra{CommitteeBits: bits, Data: &ethpb.AttestationData{}}
-		committees, err := helpers.AttestationCommitteesFromState(ctx, state, att)
+		committees, err := helpers.AttestationCommittees(context.Background(), state, att)
 		require.NoError(t, err)
 		require.Equal(t, 2, len(committees))
 		assert.Equal(t, params.BeaconConfig().TargetCommitteeSize, uint64(len(committees[0])))
@@ -765,58 +763,9 @@ func TestAttestationCommitteesFromState(t *testing.T) {
 	})
 }

-func TestAttestationCommitteesFromCache(t *testing.T) {
-	ctx := context.Background()
-
-	validators := make([]*ethpb.Validator, params.BeaconConfig().SlotsPerEpoch.Mul(params.BeaconConfig().TargetCommitteeSize))
-	for i := 0; i < len(validators); i++ {
-		validators[i] = &ethpb.Validator{
-			ExitEpoch: params.BeaconConfig().FarFutureEpoch,
-		}
-	}
-
-	state, err := state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
-		Validators:  validators,
-		RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
-	})
-	require.NoError(t, err)
-
-	t.Run("pre-Electra", func(t *testing.T) {
-		helpers.ClearCache()
-		att := &ethpb.Attestation{Data: &ethpb.AttestationData{CommitteeIndex: 0}}
-		ok, _, err := helpers.AttestationCommitteesFromCache(ctx, state, att)
-		require.NoError(t, err)
-		require.Equal(t, false, ok)
-		require.NoError(t, helpers.UpdateCommitteeCache(ctx, state, 0))
-		ok, committees, err := helpers.AttestationCommitteesFromCache(ctx, state, att)
-		require.NoError(t, err)
-		require.Equal(t, true, ok)
-		require.Equal(t, 1, len(committees))
-		assert.Equal(t, params.BeaconConfig().TargetCommitteeSize, uint64(len(committees[0])))
-	})
-	t.Run("post-Electra", func(t *testing.T) {
-		helpers.ClearCache()
-		bits := primitives.NewAttestationCommitteeBits()
-		bits.SetBitAt(0, true)
-		bits.SetBitAt(1, true)
-		att := &ethpb.AttestationElectra{CommitteeBits: bits, Data: &ethpb.AttestationData{}}
-		ok, _, err := helpers.AttestationCommitteesFromCache(ctx, state, att)
-		require.NoError(t, err)
-		require.Equal(t, false, ok)
-		require.NoError(t, helpers.UpdateCommitteeCache(ctx, state, 0))
-		ok, committees, err := helpers.AttestationCommitteesFromCache(ctx, state, att)
-		require.NoError(t, err)
-		require.Equal(t, true, ok)
-		require.Equal(t, 2, len(committees))
-		assert.Equal(t, params.BeaconConfig().TargetCommitteeSize, uint64(len(committees[0])))
-		assert.Equal(t, params.BeaconConfig().TargetCommitteeSize, uint64(len(committees[1])))
-	})
-}
-
-func TestBeaconCommitteesFromState(t *testing.T) {
-	ctx := context.Background()
-
-	params.SetupTestConfigCleanup(t)
+func TestBeaconCommittees(t *testing.T) {
+	prevConfig := params.BeaconConfig().Copy()
+	defer params.OverrideBeaconConfig(prevConfig)
 	c := params.BeaconConfig().Copy()
 	c.MinGenesisActiveValidatorCount = 128
 	c.SlotsPerEpoch = 4
@@ -825,49 +774,15 @@ func TestBeaconCommitteesFromState(t *testing.T) {

 	state, _ := util.DeterministicGenesisState(t, 256)

-	activeCount, err := helpers.ActiveValidatorCount(ctx, state, 0)
+	activeCount, err := helpers.ActiveValidatorCount(context.Background(), state, 0)
 	require.NoError(t, err)
 	committeesPerSlot := helpers.SlotCommitteeCount(activeCount)
-	committees, err := helpers.BeaconCommittees(ctx, state, 0)
+	committees, err := helpers.BeaconCommittees(context.Background(), state, 0)
 	require.NoError(t, err)
 	require.Equal(t, committeesPerSlot, uint64(len(committees)))
 	for idx := primitives.CommitteeIndex(0); idx < primitives.CommitteeIndex(len(committees)); idx++ {
-		committee, err := helpers.BeaconCommitteeFromState(ctx, state, 0, idx)
+		committee, err := helpers.BeaconCommitteeFromState(context.Background(), state, 0, idx)
 		require.NoError(t, err)
-		assert.DeepEqual(t, committees[idx], committee)
-	}
-}
-
-func TestBeaconCommitteesFromCache(t *testing.T) {
-	ctx := context.Background()
-
-	params.SetupTestConfigCleanup(t)
-	c := params.BeaconConfig().Copy()
-	c.MinGenesisActiveValidatorCount = 128
-	c.SlotsPerEpoch = 4
-	c.TargetCommitteeSize = 16
-	params.OverrideBeaconConfig(c)
-
-	state, _ := util.DeterministicGenesisState(t, 256)
-
-	activeCount, err := helpers.ActiveValidatorCount(ctx, state, 0)
-	require.NoError(t, err)
-	committeesPerSlot := helpers.SlotCommitteeCount(activeCount)
-	committees, err := helpers.BeaconCommittees(ctx, state, 0)
-	require.NoError(t, err)
-	require.Equal(t, committeesPerSlot, uint64(len(committees)))
-
-	helpers.ClearCache()
-	for idx := primitives.CommitteeIndex(0); idx < primitives.CommitteeIndex(len(committees)); idx++ {
-		committee, err := helpers.BeaconCommitteeFromCache(ctx, state, 0, idx)
-		require.NoError(t, err)
-		assert.Equal(t, 0, len(committee))
-	}
-
-	require.NoError(t, helpers.UpdateCommitteeCache(ctx, state, 0))
-	for idx := primitives.CommitteeIndex(0); idx < primitives.CommitteeIndex(len(committees)); idx++ {
-		committee, err := helpers.BeaconCommitteeFromCache(ctx, state, 0, idx)
-		require.NoError(t, err)
-		assert.DeepEqual(t, committees[idx], committee)
+		require.DeepEqual(t, committees[idx], committee)
 	}
 }
--- a/beacon-chain/db/filesystem/iteration.go
+++ b/beacon-chain/db/filesystem/iteration.go
@@ -3,6 +3,7 @@ package filesystem
 import (
 	"fmt"
 	"io"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -192,7 +193,7 @@ func rootFromPath(p string) ([32]byte, error) {
 }

 func idxFromPath(p string) (uint64, error) {
-	p = filepath.Base(p)
+	p = path.Base(p)

 	if !isSszFile(p) {
 		return 0, errors.Wrap(errNotBlobSSZ, "does not have .ssz extension")
--- a/beacon-chain/db/iface/interface.go
+++ b/beacon-chain/db/iface/interface.go
@@ -101,7 +101,7 @@ type NoHeadAccessDatabase interface {
 	SaveLightClientBootstrap(ctx context.Context, blockRoot []byte, bootstrap interfaces.LightClientBootstrap) error

 	CleanUpDirtyStates(ctx context.Context, slotsPerArchivedPoint primitives.Slot) error
-	DeleteHistoricalDataBeforeSlot(ctx context.Context, slot primitives.Slot, batchSize int) (int, error)
+	DeleteHistoricalDataBeforeSlot(ctx context.Context, slot primitives.Slot) error
 }

 // HeadAccessDatabase defines a struct with access to reading chain head data.
@@ -110,7 +110,6 @@ type HeadAccessDatabase interface {

 	// Block related methods.
 	HeadBlock(ctx context.Context) (interfaces.ReadOnlySignedBeaconBlock, error)
-	HeadBlockRoot() ([32]byte, error)
 	SaveHeadBlockRoot(ctx context.Context, blockRoot [32]byte) error

 	// Genesis operations.
--- a/beacon-chain/db/kv/archived_point.go
+++ b/beacon-chain/db/kv/archived_point.go
@@ -35,7 +35,7 @@ func (s *Store) LastArchivedRoot(ctx context.Context) [32]byte {
 		_, blockRoot = bkt.Cursor().Last()
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}

 	return bytesutil.ToBytes32(blockRoot)
@@ -53,7 +53,7 @@ func (s *Store) ArchivedPointRoot(ctx context.Context, slot primitives.Slot) [32
 		blockRoot = bucket.Get(bytesutil.SlotToBytesBigEndian(slot))
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}

 	return bytesutil.ToBytes32(blockRoot)
@@ -69,7 +69,7 @@ func (s *Store) HasArchivedPoint(ctx context.Context, slot primitives.Slot) bool
 		exists = iBucket.Get(bytesutil.SlotToBytesBigEndian(slot)) != nil
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}
 	return exists
 }
--- a/beacon-chain/db/kv/blocks.go
+++ b/beacon-chain/db/kv/blocks.go
@@ -30,32 +30,22 @@ var errInvalidSlotRange = errors.New("invalid end slot and start slot provided")
 func (s *Store) Block(ctx context.Context, blockRoot [32]byte) (interfaces.ReadOnlySignedBeaconBlock, error) {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.Block")
 	defer span.End()
-	blk, err := s.getBlock(ctx, blockRoot, nil)
-	if errors.Is(err, ErrNotFound) {
-		return nil, nil
-	}
-	return blk, err
-}
-
-func (s *Store) getBlock(ctx context.Context, blockRoot [32]byte, tx *bolt.Tx) (interfaces.ReadOnlySignedBeaconBlock, error) {
+	// Return block from cache if it exists.
 	if v, ok := s.blockCache.Get(string(blockRoot[:])); v != nil && ok {
 		return v.(interfaces.ReadOnlySignedBeaconBlock), nil
 	}
-	// This method allows the caller to pass in its tx if one is already open.
-	// Or if a nil value is used, a transaction will be managed intenally.
-	if tx == nil {
-		var err error
-		tx, err = s.db.Begin(false)
-		if err != nil {
-			return nil, err
+	var blk interfaces.ReadOnlySignedBeaconBlock
+	err := s.db.View(func(tx *bolt.Tx) error {
+		bkt := tx.Bucket(blocksBucket)
+		enc := bkt.Get(blockRoot[:])
+		if enc == nil {
+			return nil
 		}
-		defer func() {
-			if err := tx.Rollback(); err != nil {
-				log.WithError(err).Error("could not rollback read-only getBlock transaction")
-			}
-		}()
-	}
-	return unmarshalBlock(ctx, tx.Bucket(blocksBucket).Get(blockRoot[:]))
+		var err error
+		blk, err = unmarshalBlock(ctx, enc)
+		return err
+	})
+	return blk, err
 }

 // OriginCheckpointBlockRoot returns the value written to the db in SaveOriginCheckpointBlockRoot
@@ -80,21 +70,6 @@ func (s *Store) OriginCheckpointBlockRoot(ctx context.Context) ([32]byte, error)
 	return root, err
 }

-// HeadBlockRoot returns the latest canonical block root in the Ethereum Beacon Chain.
-func (s *Store) HeadBlockRoot() ([32]byte, error) {
-	var root [32]byte
-	err := s.db.View(func(tx *bolt.Tx) error {
-		bkt := tx.Bucket(blocksBucket)
-		headRoot := bkt.Get(headBlockRootKey)
-		if len(headRoot) == 0 {
-			return errors.New("no head block root found")
-		}
-		copy(root[:], headRoot)
-		return nil
-	})
-	return root, err
-}
-
 // HeadBlock returns the latest canonical block in the Ethereum Beacon Chain.
 func (s *Store) HeadBlock(ctx context.Context) (interfaces.ReadOnlySignedBeaconBlock, error) {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.HeadBlock")
@@ -185,7 +160,7 @@ func (s *Store) HasBlock(ctx context.Context, blockRoot [32]byte) bool {
 		exists = bkt.Get(blockRoot[:]) != nil
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}
 	return exists
 }
@@ -252,21 +227,6 @@ func (s *Store) DeleteBlock(ctx context.Context, root [32]byte) error {
 			return ErrDeleteJustifiedAndFinalized
 		}

-		// Look up the block to find its slot; needed to remove the slot index entry.
-		blk, err := s.getBlock(ctx, root, tx)
-		if err != nil {
-			// getBlock can return ErrNotFound, in which case we won't even try to delete it.
-			if errors.Is(err, ErrNotFound) {
-				return nil
-			}
-			return err
-		}
-		if err := s.deleteSlotIndexEntry(tx, blk.Block().Slot(), root); err != nil {
-			return err
-		}
-		if err := s.deleteMatchingParentIndex(tx, blk.Block().ParentRoot(), root); err != nil {
-			return err
-		}
 		if err := s.deleteBlock(tx, root[:]); err != nil {
 			return err
 		}
@@ -285,82 +245,77 @@ func (s *Store) DeleteBlock(ctx context.Context, root [32]byte) error {
 // - blockRootValidatorHashesBucket
 // - blockSlotIndicesBucket
 // - stateSlotIndicesBucket
-func (s *Store) DeleteHistoricalDataBeforeSlot(ctx context.Context, cutoffSlot primitives.Slot, batchSize int) (int, error) {
+func (s *Store) DeleteHistoricalDataBeforeSlot(ctx context.Context, cutoffSlot primitives.Slot) error {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.DeleteHistoricalDataBeforeSlot")
 	defer span.End()

 	// Collect slot/root pairs to perform deletions in a separate read only transaction.
-	slotRoots, err := s.slotRootsInRange(ctx, primitives.Slot(0), cutoffSlot, batchSize)
+	var (
+		roots [][]byte
+		slts  []primitives.Slot
+	)
+	err := s.db.View(func(tx *bolt.Tx) error {
+		var err error
+		roots, slts, err = blockRootsBySlotRange(ctx, tx.Bucket(blockSlotIndicesBucket), primitives.Slot(0), cutoffSlot, nil, nil, nil)
+		if err != nil {
+			return errors.Wrap(err, "could not retrieve block roots")
+		}
+		return nil
+	})
 	if err != nil {
-		return 0, err
-	}
-
-	// Return early if there's nothing to delete.
-	if len(slotRoots) == 0 {
-		return 0, nil
+		return errors.Wrap(err, "could not retrieve block roots and slots")
 	}

 	// Perform all deletions in a single transaction for atomicity
-	var numSlotsDeleted int
-	err = s.db.Update(func(tx *bolt.Tx) error {
-		for _, sr := range slotRoots {
-			// Return if context is cancelled or deadline is exceeded.
-			if ctx.Err() != nil {
-				//nolint:nilerr
-				return nil
-			}
-
+	return s.db.Update(func(tx *bolt.Tx) error {
+		for _, root := range roots {
 			// Delete block
-			if err = s.deleteBlock(tx, sr.root[:]); err != nil {
+			if err = s.deleteBlock(tx, root); err != nil {
 				return err
 			}

 			// Delete finalized block roots index
-			if err = tx.Bucket(finalizedBlockRootsIndexBucket).Delete(sr.root[:]); err != nil {
+			if err = tx.Bucket(finalizedBlockRootsIndexBucket).Delete(root); err != nil {
 				return errors.Wrap(err, "could not delete finalized block root index")
 			}

 			// Delete state
-			if err = tx.Bucket(stateBucket).Delete(sr.root[:]); err != nil {
+			if err = tx.Bucket(stateBucket).Delete(root); err != nil {
 				return errors.Wrap(err, "could not delete state")
 			}

 			// Delete state summary
-			if err = tx.Bucket(stateSummaryBucket).Delete(sr.root[:]); err != nil {
+			if err = tx.Bucket(stateSummaryBucket).Delete(root); err != nil {
 				return errors.Wrap(err, "could not delete state summary")
 			}

 			// Delete validator entries
-			if err = s.deleteValidatorHashes(tx, sr.root[:]); err != nil {
+			if err = s.deleteValidatorHashes(tx, root); err != nil {
 				return errors.Wrap(err, "could not delete validators")
 			}
-
-			numSlotsDeleted++
 		}

-		for _, sr := range slotRoots {
+		for _, slot := range slts {
 			// Delete slot indices
-			if err = tx.Bucket(blockSlotIndicesBucket).Delete(bytesutil.SlotToBytesBigEndian(sr.slot)); err != nil {
+			if err = tx.Bucket(blockSlotIndicesBucket).Delete(bytesutil.SlotToBytesBigEndian(slot)); err != nil {
 				return errors.Wrap(err, "could not delete block slot index")
 			}
-			if err = tx.Bucket(stateSlotIndicesBucket).Delete(bytesutil.SlotToBytesBigEndian(sr.slot)); err != nil {
+			if err = tx.Bucket(stateSlotIndicesBucket).Delete(bytesutil.SlotToBytesBigEndian(slot)); err != nil {
 				return errors.Wrap(err, "could not delete state slot index")
 			}
 		}

 		// Delete all caches after we have deleted everything from buckets.
 		// This is done after the buckets are deleted to avoid any issues in case of transaction rollback.
-		for _, sr := range slotRoots {
+		for _, root := range roots {
 			// Delete block from cache
-			s.blockCache.Del(string(sr.root[:]))
+			s.blockCache.Del(string(root))
 			// Delete state summary from cache
-			s.stateSummaryCache.delete(sr.root)
+			s.stateSummaryCache.delete([32]byte(root))
 		}

 		return nil
 	})
-
-	return numSlotsDeleted, err
 }

 // SaveBlock to the db.
@@ -381,7 +336,7 @@ func (s *Store) SaveBlock(ctx context.Context, signed interfaces.ReadOnlySignedB
 // if a `saveBlindedBeaconBlocks` key exists in the database. Otherwise, we check if the last
 // blocked stored to check if it is blinded, and then write that `saveBlindedBeaconBlocks` key
 // to the DB for future checks.
-func (s *Store) shouldSaveBlinded() (bool, error) {
+func (s *Store) shouldSaveBlinded(ctx context.Context) (bool, error) {
 	var saveBlinded bool
 	if err := s.db.View(func(tx *bolt.Tx) error {
 		metadataBkt := tx.Bucket(chainMetadataBucket)
@@ -443,7 +398,7 @@ func prepareBlockBatch(blks []blocks.ROBlock, shouldBlind bool) ([]blockBatchEnt
 }

 func (s *Store) SaveROBlocks(ctx context.Context, blks []blocks.ROBlock, cache bool) error {
-	shouldBlind, err := s.shouldSaveBlinded()
+	shouldBlind, err := s.shouldSaveBlinded(ctx)
 	if err != nil {
 		return err
 	}
@@ -714,49 +669,6 @@ func (s *Store) SaveRegistrationsByValidatorIDs(ctx context.Context, ids []primi
 	})
 }

-type slotRoot struct {
-	slot primitives.Slot
-	root [32]byte
-}
-
-// slotRootsInRange returns slot and block root pairs of length min(batchSize, end-slot)
-func (s *Store) slotRootsInRange(ctx context.Context, start, end primitives.Slot, batchSize int) ([]slotRoot, error) {
-	_, span := trace.StartSpan(ctx, "BeaconDB.slotRootsInRange")
-	defer span.End()
-	if end < start {
-		return nil, errInvalidSlotRange
-	}
-
-	var pairs []slotRoot
-	key := bytesutil.SlotToBytesBigEndian(end)
-	err := s.db.View(func(tx *bolt.Tx) error {
-		bkt := tx.Bucket(blockSlotIndicesBucket)
-		c := bkt.Cursor()
-		for k, v := c.Seek(key); k != nil; k, v = c.Prev() {
-			slot := bytesutil.BytesToSlotBigEndian(k)
-			if slot > end {
-				continue // Seek will seek to the next key *after* the given one if not present
-			}
-			if slot < start {
-				return nil
-			}
-			roots, err := splitRoots(v)
-			if err != nil {
-				return errors.Wrapf(err, "corrupt value %v in block slot index for slot=%d", v, slot)
-			}
-			for _, r := range roots {
-				pairs = append(pairs, slotRoot{slot: slot, root: r})
-			}
-			if len(pairs) >= batchSize {
-				return nil // allows code to easily cap the number of items pruned
-			}
-		}
-		return nil
-	})
-
-	return pairs, err
-}
-
 // blockRootsByFilter retrieves the block roots given the filter criteria.
 func blockRootsByFilter(ctx context.Context, tx *bolt.Tx, f *filters.QueryFilter) ([][]byte, error) {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.blockRootsByFilter")
@@ -777,7 +689,7 @@ func blockRootsByFilter(ctx context.Context, tx *bolt.Tx, f *filters.QueryFilter

 	// We retrieve block roots that match a filter criteria of slot ranges, if specified.
 	filtersMap := f.Filters()
-	rootsBySlotRange, err := blockRootsBySlotRange(
+	rootsBySlotRange, _, err := blockRootsBySlotRange(
 		ctx,
 		tx.Bucket(blockSlotIndicesBucket),
 		filtersMap[filters.StartSlot],
@@ -822,13 +734,13 @@ func blockRootsBySlotRange(
 	ctx context.Context,
 	bkt *bolt.Bucket,
 	startSlotEncoded, endSlotEncoded, startEpochEncoded, endEpochEncoded, slotStepEncoded interface{},
-) ([][]byte, error) {
+) ([][]byte, []primitives.Slot, error) {
 	_, span := trace.StartSpan(ctx, "BeaconDB.blockRootsBySlotRange")
 	defer span.End()

 	// Return nothing when all slot parameters are missing
 	if startSlotEncoded == nil && endSlotEncoded == nil && startEpochEncoded == nil && endEpochEncoded == nil {
-		return [][]byte{}, nil
+		return [][]byte{}, nil, nil
 	}

 	var startSlot, endSlot primitives.Slot
@@ -849,11 +761,11 @@ func blockRootsBySlotRange(
 	if startEpochOk && endEpochOk {
 		startSlot, err = slots.EpochStart(startEpoch)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 		endSlot, err = slots.EpochStart(endEpoch)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 		endSlot = endSlot + params.BeaconConfig().SlotsPerEpoch - 1
 	}
@@ -864,10 +776,11 @@ func blockRootsBySlotRange(
 		return key != nil && bytes.Compare(key, max) <= 0
 	}
 	if endSlot < startSlot {
-		return nil, errInvalidSlotRange
+		return nil, nil, errInvalidSlotRange
 	}
 	rootsRange := endSlot.SubSlot(startSlot).Div(step)
 	roots := make([][]byte, 0, rootsRange)
+	var slts []primitives.Slot
 	c := bkt.Cursor()
 	for k, v := c.Seek(min); conditional(k, max); k, v = c.Next() {
 		slot := bytesutil.BytesToSlotBigEndian(k)
@@ -882,8 +795,9 @@ func blockRootsBySlotRange(
 			splitRoots = append(splitRoots, v[i:i+32])
 		}
 		roots = append(roots, splitRoots...)
+		slts = append(slts, slot)
 	}
-	return roots, nil
+	return roots, slts, nil
 }

 // blockRootsBySlot retrieves the block roots by slot
@@ -939,9 +853,6 @@ func createBlockIndicesFromFilters(ctx context.Context, f *filters.QueryFilter)

 // unmarshal block from marshaled proto beacon block bytes to versioned beacon block struct type.
 func unmarshalBlock(_ context.Context, enc []byte) (interfaces.ReadOnlySignedBeaconBlock, error) {
-	if len(enc) == 0 {
-		return nil, errors.Wrap(ErrNotFound, "empty block bytes in db")
-	}
 	var err error
 	enc, err = snappy.Decode(nil, enc)
 	if err != nil {
@@ -1093,47 +1004,6 @@ func (s *Store) deleteBlock(tx *bolt.Tx, root []byte) error {
 	return nil
 }

-func (s *Store) deleteMatchingParentIndex(tx *bolt.Tx, parent, child [32]byte) error {
-	bkt := tx.Bucket(blockParentRootIndicesBucket)
-	if err := deleteRootIndexEntry(bkt, parent[:], child); err != nil {
-		return errors.Wrap(err, "could not delete parent root index entry")
-	}
-	return nil
-}
-
-func (s *Store) deleteSlotIndexEntry(tx *bolt.Tx, slot primitives.Slot, root [32]byte) error {
-	key := bytesutil.SlotToBytesBigEndian(slot)
-	bkt := tx.Bucket(blockSlotIndicesBucket)
-	if err := deleteRootIndexEntry(bkt, key, root); err != nil {
-		return errors.Wrap(err, "could not delete slot index entry")
-	}
-	return nil
-}
-
-func deleteRootIndexEntry(bkt *bolt.Bucket, key []byte, root [32]byte) error {
-	packed := bkt.Get(key)
-	if len(packed) == 0 {
-		return nil
-	}
-	updated, err := removeRoot(packed, root)
-	if err != nil {
-		return err
-	}
-	// Don't update the value if the root was not found.
-	if bytes.Equal(updated, packed) {
-		return nil
-	}
-	// If there are no other roots in the key, just delete it.
-	if len(updated) == 0 {
-		if err := bkt.Delete(key); err != nil {
-			return err
-		}
-		return nil
-	}
-	// Update the key with the root removed.
-	return bkt.Put(key, updated)
-}
-
 func (s *Store) deleteValidatorHashes(tx *bolt.Tx, root []byte) error {
 	ok, err := s.isStateValidatorMigrationOver()
 	if err != nil {
--- a/beacon-chain/db/kv/blocks_test.go
+++ b/beacon-chain/db/kv/blocks_test.go
@@ -196,13 +196,9 @@ func TestStore_BlocksCRUD(t *testing.T) {
 			blockRoot, err := blk.Block().HashTreeRoot()
 			require.NoError(t, err)

-			_, err = db.getBlock(ctx, blockRoot, nil)
-			require.ErrorIs(t, err, ErrNotFound)
 			retrievedBlock, err := db.Block(ctx, blockRoot)
 			require.NoError(t, err)
 			assert.DeepEqual(t, nil, retrievedBlock, "Expected nil block")
-			_, err = db.getBlock(ctx, blockRoot, nil)
-			require.ErrorIs(t, err, ErrNotFound)

 			require.NoError(t, db.SaveBlock(ctx, blk))
 			assert.Equal(t, true, db.HasBlock(ctx, blockRoot), "Expected block to exist in the db")
@@ -218,34 +214,10 @@ func TestStore_BlocksCRUD(t *testing.T) {
 			retrievedPb, err := retrievedBlock.Proto()
 			require.NoError(t, err)
 			assert.Equal(t, true, proto.Equal(wantedPb, retrievedPb), "Wanted: %v, received: %v", wanted, retrievedBlock)
-			// Check that the block is in the slot->block index
-			found, roots, err := db.BlockRootsBySlot(ctx, blk.Block().Slot())
-			require.NoError(t, err)
-			require.Equal(t, true, found)
-			require.Equal(t, 1, len(roots))
-			require.Equal(t, blockRoot, roots[0])
-			// Delete the block, then check that it is no longer in the index.
-
-			parent := blk.Block().ParentRoot()
-			testCheckParentIndices(t, db.db, parent, true)
-			require.NoError(t, db.DeleteBlock(ctx, blockRoot))
-			require.NoError(t, err)
-			testCheckParentIndices(t, db.db, parent, false)
-			found, roots, err = db.BlockRootsBySlot(ctx, blk.Block().Slot())
-			require.NoError(t, err)
-			require.Equal(t, false, found)
-			require.Equal(t, 0, len(roots))
 		})
 	}
 }

-func testCheckParentIndices(t *testing.T, db *bolt.DB, parent [32]byte, expected bool) {
-	require.NoError(t, db.View(func(tx *bolt.Tx) error {
-		require.Equal(t, expected, tx.Bucket(blockParentRootIndicesBucket).Get(parent[:]) != nil)
-		return nil
-	}))
-}
-
 func TestStore_BlocksHandleZeroCase(t *testing.T) {
 	for _, tt := range blockTests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -387,221 +359,184 @@ func TestStore_DeleteFinalizedBlock(t *testing.T) {

 func TestStore_HistoricalDataBeforeSlot(t *testing.T) {
 	slotsPerEpoch := uint64(params.BeaconConfig().SlotsPerEpoch)
+	db := setupDB(t)
 	ctx := context.Background()

-	tests := []struct {
-		name             string
-		batchSize        int
-		numOfEpochs      uint64
-		deleteBeforeSlot uint64
-	}{
-		{
-			name:             "batchSize less than delete range",
-			batchSize:        10,
-			numOfEpochs:      4,
-			deleteBeforeSlot: 25,
-		},
-		{
-			name:             "batchSize greater than delete range",
-			batchSize:        30,
-			numOfEpochs:      4,
-			deleteBeforeSlot: 15,
-		},
-	}
+	// Save genesis block root
+	require.NoError(t, db.SaveGenesisBlockRoot(ctx, genesisBlockRoot))

-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			db := setupDB(t)
-			// Save genesis block root
-			require.NoError(t, db.SaveGenesisBlockRoot(ctx, genesisBlockRoot))
+	// Create and save blocks for 4 epochs
+	blks := makeBlocks(t, 0, slotsPerEpoch*4, genesisBlockRoot)
+	require.NoError(t, db.SaveBlocks(ctx, blks))

-			// Create and save blocks for given epochs
-			blks := makeBlocks(t, 0, slotsPerEpoch*tt.numOfEpochs, genesisBlockRoot)
-			require.NoError(t, db.SaveBlocks(ctx, blks))
+	// Mark state validator migration as complete
+	err := db.db.Update(func(tx *bolt.Tx) error {
+		return tx.Bucket(migrationsBucket).Put(migrationStateValidatorsKey, migrationCompleted)
+	})
+	require.NoError(t, err)

-			// Mark state validator migration as complete
-			err := db.db.Update(func(tx *bolt.Tx) error {
-				return tx.Bucket(migrationsBucket).Put(migrationStateValidatorsKey, migrationCompleted)
-			})
-			require.NoError(t, err)
+	migrated, err := db.isStateValidatorMigrationOver()
+	require.NoError(t, err)
+	require.Equal(t, true, migrated)

-			migrated, err := db.isStateValidatorMigrationOver()
-			require.NoError(t, err)
-			require.Equal(t, true, migrated)
+	// Create state summaries and states for each block
+	ss := make([]*ethpb.StateSummary, len(blks))
+	states := make([]state.BeaconState, len(blks))

-			// Create state summaries and states for each block
-			ss := make([]*ethpb.StateSummary, len(blks))
-			states := make([]state.BeaconState, len(blks))
+	for i, blk := range blks {
+		slot := blk.Block().Slot()
+		r, err := blk.Block().HashTreeRoot()
+		require.NoError(t, err)

-			for i, blk := range blks {
-				slot := blk.Block().Slot()
-				r, err := blk.Block().HashTreeRoot()
-				require.NoError(t, err)
+		// Create and save state summary
+		ss[i] = &ethpb.StateSummary{
+			Slot: slot,
+			Root: r[:],
+		}

-				// Create and save state summary
-				ss[i] = &ethpb.StateSummary{
-					Slot: slot,
-					Root: r[:],
-				}
-
-				// Create and save state with validator entries
-				vals := make([]*ethpb.Validator, 2)
-				for j := range vals {
-					vals[j] = &ethpb.Validator{
-						PublicKey:             bytesutil.PadTo([]byte{byte(i*j + 1)}, 48),
-						WithdrawalCredentials: bytesutil.PadTo([]byte{byte(i*j + 2)}, 32),
-					}
-				}
-
-				st, err := util.NewBeaconState(func(state *ethpb.BeaconState) error {
-					state.Validators = vals
-					state.Slot = slot
-					return nil
-				})
-				require.NoError(t, err)
-				require.NoError(t, db.SaveState(ctx, st, r))
-				states[i] = st
-
-				// Verify validator entries are saved to db
-				valsActual, err := db.validatorEntries(ctx, r)
-				require.NoError(t, err)
-				for j, val := range valsActual {
-					require.DeepEqual(t, vals[j], val)
-				}
+		// Create and save state with validator entries
+		vals := make([]*ethpb.Validator, 2)
+		for j := range vals {
+			vals[j] = &ethpb.Validator{
+				PublicKey:             bytesutil.PadTo([]byte{byte(i*j + 1)}, 48),
+				WithdrawalCredentials: bytesutil.PadTo([]byte{byte(i*j + 2)}, 32),
 			}
-			require.NoError(t, db.SaveStateSummaries(ctx, ss))
+		}

-			// Verify slot indices exist before deletion
-			err = db.db.View(func(tx *bolt.Tx) error {
-				blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
-				stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
-
-				for i := uint64(0); i < uint64(tt.deleteBeforeSlot); i++ {
-					slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
-					assert.NotNil(t, blockSlotBkt.Get(slot), "Expected block slot index to exist")
-					assert.NotNil(t, stateSlotBkt.Get(slot), "Expected state slot index to exist", i)
-				}
-				return nil
-			})
-			require.NoError(t, err)
-
-			// Delete data before slot
-			slotsDeleted, err := db.DeleteHistoricalDataBeforeSlot(ctx, primitives.Slot(tt.deleteBeforeSlot), tt.batchSize)
-			require.NoError(t, err)
-
-			var startSlotDeleted, endSlotDeleted uint64
-			if tt.batchSize >= int(tt.deleteBeforeSlot) {
-				startSlotDeleted = 1
-				endSlotDeleted = tt.deleteBeforeSlot
-			} else {
-				startSlotDeleted = tt.deleteBeforeSlot - uint64(tt.batchSize) + 1
-				endSlotDeleted = tt.deleteBeforeSlot
-			}
-
-			require.Equal(t, endSlotDeleted-startSlotDeleted+1, uint64(slotsDeleted))
-
-			// Verify blocks before given slot/batch are deleted
-			for i := startSlotDeleted; i < endSlotDeleted; i++ {
-				root, err := blks[i].Block().HashTreeRoot()
-				require.NoError(t, err)
-
-				// Check block is deleted
-				retrievedBlocks, err := db.BlocksBySlot(ctx, primitives.Slot(i))
-				require.NoError(t, err)
-				assert.Equal(t, 0, len(retrievedBlocks), fmt.Sprintf("Expected %d blocks, got %d for slot %d", 0, len(retrievedBlocks), i))
-
-				// Verify block does not exist
-				assert.Equal(t, false, db.HasBlock(ctx, root), fmt.Sprintf("Expected block index to not exist for slot %d", i))
-
-				// Verify block parent root does not exist
-				err = db.db.View(func(tx *bolt.Tx) error {
-					require.Equal(t, 0, len(tx.Bucket(blockParentRootIndicesBucket).Get(root[:])))
-					return nil
-				})
-				require.NoError(t, err)
-
-				// Verify state is deleted
-				hasState := db.HasState(ctx, root)
-				assert.Equal(t, false, hasState)
-
-				// Verify state summary is deleted
-				hasSummary := db.HasStateSummary(ctx, root)
-				assert.Equal(t, false, hasSummary)
-
-				// Verify validator hashes for block roots are deleted
-				err = db.db.View(func(tx *bolt.Tx) error {
-					assert.Equal(t, 0, len(tx.Bucket(blockRootValidatorHashesBucket).Get(root[:])))
-					return nil
-				})
-				require.NoError(t, err)
-			}
-
-			// Verify slot indices are deleted
-			err = db.db.View(func(tx *bolt.Tx) error {
-				blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
-				stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
-
-				for i := startSlotDeleted; i < endSlotDeleted; i++ {
-					slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
-					assert.Equal(t, 0, len(blockSlotBkt.Get(slot)), fmt.Sprintf("Expected block slot index to be deleted, slot: %d", slot))
-					assert.Equal(t, 0, len(stateSlotBkt.Get(slot)), fmt.Sprintf("Expected state slot index to be deleted, slot: %d", slot))
-				}
-				return nil
-			})
-			require.NoError(t, err)
-
-			// Verify blocks from expectedLastDeletedSlot till numEpochs still exist
-			for i := endSlotDeleted; i < slotsPerEpoch*tt.numOfEpochs; i++ {
-				root, err := blks[i].Block().HashTreeRoot()
-				require.NoError(t, err)
-
-				// Verify block exists
-				assert.Equal(t, true, db.HasBlock(ctx, root))
-
-				// Verify remaining block parent root exists, except last slot since we store parent roots of each block.
-				if i < slotsPerEpoch*tt.numOfEpochs-1 {
-					err = db.db.View(func(tx *bolt.Tx) error {
-						require.NotNil(t, tx.Bucket(blockParentRootIndicesBucket).Get(root[:]), fmt.Sprintf("Expected block parent index to be deleted, slot: %d", i))
-						return nil
-					})
-					require.NoError(t, err)
-				}
-
-				// Verify state exists
-				hasState := db.HasState(ctx, root)
-				assert.Equal(t, true, hasState)
-
-				// Verify state summary exists
-				hasSummary := db.HasStateSummary(ctx, root)
-				assert.Equal(t, true, hasSummary)
-
-				// Verify slot indices still exist
-				err = db.db.View(func(tx *bolt.Tx) error {
-					blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
-					stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
-
-					slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
-					assert.NotNil(t, blockSlotBkt.Get(slot), "Expected block slot index to exist")
-					assert.NotNil(t, stateSlotBkt.Get(slot), "Expected state slot index to exist")
-					return nil
-				})
-				require.NoError(t, err)
-
-				// Verify validator entries still exist
-				valsActual, err := db.validatorEntries(ctx, root)
-				require.NoError(t, err)
-				assert.NotNil(t, valsActual)
-
-				// Verify remaining validator hashes for block roots exists
-				err = db.db.View(func(tx *bolt.Tx) error {
-					assert.NotNil(t, tx.Bucket(blockRootValidatorHashesBucket).Get(root[:]))
-					return nil
-				})
-				require.NoError(t, err)
-			}
+		st, err := util.NewBeaconState(func(state *ethpb.BeaconState) error {
+			state.Validators = vals
+			state.Slot = slot
+			return nil
 		})
+		require.NoError(t, err)
+		require.NoError(t, db.SaveState(ctx, st, r))
+		states[i] = st
+
+		// Verify validator entries are saved to db
+		valsActual, err := db.validatorEntries(ctx, r)
+		require.NoError(t, err)
+		for j, val := range valsActual {
+			require.DeepEqual(t, vals[j], val)
+		}
+	}
+	require.NoError(t, db.SaveStateSummaries(ctx, ss))
+
+	// Verify slot indices exist before deletion
+	err = db.db.View(func(tx *bolt.Tx) error {
+		blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
+		stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
+
+		for i := uint64(0); i < slotsPerEpoch; i++ {
+			slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
+			assert.NotNil(t, blockSlotBkt.Get(slot), "Expected block slot index to exist")
+			assert.NotNil(t, stateSlotBkt.Get(slot), "Expected state slot index to exist", i)
+		}
+		return nil
+	})
+	require.NoError(t, err)
+
+	// Delete data before slot at epoch 1
+	require.NoError(t, db.DeleteHistoricalDataBeforeSlot(ctx, primitives.Slot(slotsPerEpoch)))
+
+	// Verify blocks from epoch 0 are deleted
+	for i := uint64(0); i < slotsPerEpoch; i++ {
+		root, err := blks[i].Block().HashTreeRoot()
+		require.NoError(t, err)
+
+		// Check block is deleted
+		retrievedBlocks, err := db.BlocksBySlot(ctx, primitives.Slot(i))
+		require.NoError(t, err)
+		assert.Equal(t, 0, len(retrievedBlocks))
+
+		// Verify block does not exist
+		assert.Equal(t, false, db.HasBlock(ctx, root))
+
+		// Verify block parent root does not exist
+		err = db.db.View(func(tx *bolt.Tx) error {
+			require.Equal(t, 0, len(tx.Bucket(blockParentRootIndicesBucket).Get(root[:])))
+			return nil
+		})
+		require.NoError(t, err)
+
+		// Verify state is deleted
+		hasState := db.HasState(ctx, root)
+		assert.Equal(t, false, hasState)
+
+		// Verify state summary is deleted
+		hasSummary := db.HasStateSummary(ctx, root)
+		assert.Equal(t, false, hasSummary)
+
+		// Verify validator hashes for block roots are deleted
+		err = db.db.View(func(tx *bolt.Tx) error {
+			assert.Equal(t, 0, len(tx.Bucket(blockRootValidatorHashesBucket).Get(root[:])))
+			return nil
+		})
+		require.NoError(t, err)
 	}

+	// Verify slot indices are deleted
+	err = db.db.View(func(tx *bolt.Tx) error {
+		blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
+		stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
+
+		for i := uint64(0); i < slotsPerEpoch; i++ {
+			slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
+			assert.Equal(t, 0, len(blockSlotBkt.Get(slot)), fmt.Sprintf("Expected block slot index to be deleted, slot: %d", slot))
+			assert.Equal(t, 0, len(stateSlotBkt.Get(slot)), fmt.Sprintf("Expected state slot index to be deleted, slot: %d", slot))
+		}
+		return nil
+	})
+	require.NoError(t, err)
+
+	// Verify blocks from epochs 1-3 still exist
+	for i := slotsPerEpoch; i < slotsPerEpoch*4; i++ {
+		root, err := blks[i].Block().HashTreeRoot()
+		require.NoError(t, err)
+
+		// Verify block exists
+		assert.Equal(t, true, db.HasBlock(ctx, root))
+
+		// Verify remaining block parent root exists, except last slot since we store parent roots of each block.
+		if i < slotsPerEpoch*4-1 {
+			err = db.db.View(func(tx *bolt.Tx) error {
+				require.NotNil(t, tx.Bucket(blockParentRootIndicesBucket).Get(root[:]), fmt.Sprintf("Expected block parent index to be deleted, slot: %d", i))
+				return nil
+			})
+			require.NoError(t, err)
+		}
+
+		// Verify state exists
+		hasState := db.HasState(ctx, root)
+		assert.Equal(t, true, hasState)
+
+		// Verify state summary exists
+		hasSummary := db.HasStateSummary(ctx, root)
+		assert.Equal(t, true, hasSummary)
+
+		// Verify slot indices still exist
+		err = db.db.View(func(tx *bolt.Tx) error {
+			blockSlotBkt := tx.Bucket(blockSlotIndicesBucket)
+			stateSlotBkt := tx.Bucket(stateSlotIndicesBucket)
+
+			slot := bytesutil.SlotToBytesBigEndian(primitives.Slot(i + 1))
+			assert.NotNil(t, blockSlotBkt.Get(slot), "Expected block slot index to exist")
+			assert.NotNil(t, stateSlotBkt.Get(slot), "Expected state slot index to exist")
+			return nil
+		})
+		require.NoError(t, err)
+
+		// Verify validator entries still exist
+		valsActual, err := db.validatorEntries(ctx, root)
+		require.NoError(t, err)
+		assert.NotNil(t, valsActual)
+
+		// Verify remaining validator hashes for block roots exists
+		err = db.db.View(func(tx *bolt.Tx) error {
+			assert.NotNil(t, tx.Bucket(blockRootValidatorHashesBucket).Get(root[:]))
+			return nil
+		})
+		require.NoError(t, err)
+	}
 }

 func TestStore_GenesisBlock(t *testing.T) {
--- a/beacon-chain/db/kv/deposit_contract.go
+++ b/beacon-chain/db/kv/deposit_contract.go
@@ -20,7 +20,7 @@ func (s *Store) DepositContractAddress(ctx context.Context) ([]byte, error) {
 		addr = chainInfo.Get(depositContractAddressKey)
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}
 	return addr, nil
 }
--- a/beacon-chain/db/kv/lightclient.go
+++ b/beacon-chain/db/kv/lightclient.go
@@ -215,7 +215,7 @@ func (s *Store) LightClientUpdates(ctx context.Context, startPeriod, endPeriod u
 	if err != nil {
 		return nil, err
 	}
-	return updates, nil
+	return updates, err
 }

 func (s *Store) LightClientUpdate(ctx context.Context, period uint64) (interfaces.LightClientUpdate, error) {
--- a/beacon-chain/db/kv/state.go
+++ b/beacon-chain/db/kv/state.go
@@ -407,7 +407,7 @@ func (s *Store) HasState(ctx context.Context, blockRoot [32]byte) bool {
 		return nil
 	})
 	if err != nil {
-		panic(err) // lint:nopanic -- View never returns an error.
+		panic(err)
 	}
 	return hasState
 }
@@ -518,9 +518,9 @@ func (s *Store) unmarshalState(_ context.Context, enc []byte, validatorEntries [

 	switch {
 	case hasFuluKey(enc):
-		protoState := &ethpb.BeaconStateElectra{}
+		protoState := &ethpb.BeaconStateFulu{}
 		if err := protoState.UnmarshalSSZ(enc[len(fuluKey):]); err != nil {
-			return nil, errors.Wrap(err, "failed to unmarshal encoding for Fulu")
+			return nil, errors.Wrap(err, "failed to unmarshal encoding for Electra")
 		}
 		ok, err := s.isStateValidatorMigrationOver()
 		if err != nil {
@@ -690,7 +690,7 @@ func marshalState(ctx context.Context, st state.ReadOnlyBeaconState) ([]byte, er
 		}
 		return snappy.Encode(nil, append(ElectraKey, rawObj...)), nil
 	case version.Fulu:
-		rState, ok := st.ToProtoUnsafe().(*ethpb.BeaconStateElectra)
+		rState, ok := st.ToProtoUnsafe().(*ethpb.BeaconStateFulu)
 		if !ok {
 			return nil, errors.New("non valid inner state")
 		}
@@ -820,25 +820,30 @@ func (s *Store) slotByBlockRoot(ctx context.Context, tx *bolt.Tx, blockRoot []by
 			// no need to construct the validator entries as it is not used here.
 			s, err := s.unmarshalState(ctx, enc, nil)
 			if err != nil {
-				return 0, errors.Wrap(err, "could not unmarshal state")
+				return 0, err
 			}
 			if s == nil || s.IsNil() {
 				return 0, errors.New("state can't be nil")
 			}
 			return s.Slot(), nil
 		}
-		b, err := unmarshalBlock(ctx, enc)
+		b := &ethpb.SignedBeaconBlock{}
+		err := decode(ctx, enc, b)
 		if err != nil {
-			return 0, errors.Wrap(err, "could not unmarshal block")
-		}
-		if err := blocks.BeaconBlockIsNil(b); err != nil {
 			return 0, err
 		}
-		return b.Block().Slot(), nil
+		wsb, err := blocks.NewSignedBeaconBlock(b)
+		if err != nil {
+			return 0, err
+		}
+		if err := blocks.BeaconBlockIsNil(wsb); err != nil {
+			return 0, err
+		}
+		return b.Block.Slot, nil
 	}
 	stateSummary := &ethpb.StateSummary{}
 	if err := decode(ctx, enc, stateSummary); err != nil {
-		return 0, errors.Wrap(err, "could not unmarshal state summary")
+		return 0, err
 	}
 	return stateSummary.Slot, nil
 }
--- a/beacon-chain/db/kv/state_test.go
+++ b/beacon-chain/db/kv/state_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	"encoding/binary"
 	mathRand "math/rand"
+
 	"strconv"
 	"testing"
 	"time"
@@ -1069,31 +1070,6 @@ func TestBellatrixState_CanDelete(t *testing.T) {
 	require.Equal(t, state.ReadOnlyBeaconState(nil), savedS, "Unsaved state should've been nil")
 }

-func TestBellatrixState_CanDeleteWithBlock(t *testing.T) {
-	db := setupDB(t)
-
-	b := util.NewBeaconBlockBellatrix()
-	b.Block.Slot = 100
-	r, err := b.Block.HashTreeRoot()
-	require.NoError(t, err)
-	wsb, err := blocks.NewSignedBeaconBlock(b)
-	require.NoError(t, err)
-	require.NoError(t, db.SaveBlock(context.Background(), wsb))
-
-	require.Equal(t, false, db.HasState(context.Background(), r))
-
-	st, _ := util.DeterministicGenesisStateBellatrix(t, 1)
-	require.NoError(t, st.SetSlot(100))
-
-	require.NoError(t, db.SaveState(context.Background(), st, r))
-	require.Equal(t, true, db.HasState(context.Background(), r))
-
-	require.NoError(t, db.DeleteState(context.Background(), r))
-	savedS, err := db.State(context.Background(), r)
-	require.NoError(t, err)
-	require.Equal(t, state.ReadOnlyBeaconState(nil), savedS, "Unsaved state should've been nil")
-}
-
 func TestDenebState_CanSaveRetrieve(t *testing.T) {
 	db := setupDB(t)

--- a/beacon-chain/db/kv/utils.go
+++ b/beacon-chain/db/kv/utils.go
@@ -114,27 +114,3 @@ func splitRoots(b []byte) ([][32]byte, error) {
 	}
 	return rl, nil
 }
-
-func removeRoot(roots []byte, root [32]byte) ([]byte, error) {
-	if len(roots) == 0 {
-		return []byte{}, nil
-	}
-	if len(roots) == 32 && bytes.Equal(roots, root[:]) {
-		return []byte{}, nil
-	}
-	if len(roots)%32 != 0 {
-		return nil, errors.Wrapf(errMisalignedRootList, "root list len=%d", len(roots))
-	}
-
-	search := root[:]
-	for i := 0; i <= len(roots)-32; i += 32 {
-		if bytes.Equal(roots[i:i+32], search) {
-			result := make([]byte, len(roots)-32)
-			copy(result, roots[:i])
-			copy(result[i:], roots[i+32:])
-			return result, nil
-		}
-	}
-
-	return roots, nil
-}
--- a/beacon-chain/db/kv/utils_test.go
+++ b/beacon-chain/db/kv/utils_test.go
@@ -1,7 +1,6 @@
 package kv

 import (
-	"bytes"
 	"context"
 	"crypto/rand"
 	"testing"
@@ -196,85 +195,3 @@ func TestSplitRoots(t *testing.T) {
 		})
 	}
 }
-
-func tPad(p ...[]byte) []byte {
-	r := make([]byte, 32*len(p))
-	for i, b := range p {
-		copy(r[i*32:], b)
-	}
-	return r
-}
-
-func TestRemoveRoot(t *testing.T) {
-	cases := []struct {
-		name   string
-		roots  []byte
-		root   [32]byte
-		expect []byte
-		err    error
-	}{
-		{
-			name:   "empty",
-			roots:  []byte{},
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xef},
-			expect: []byte{},
-		},
-		{
-			name:   "single",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xef},
-			expect: []byte{},
-		},
-		{
-			name:   "single, different",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xee},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, reordered",
-			roots:  tPad([]byte{0xac, 0x1d, 0xfa, 0xce}, []byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, 3",
-			roots:  tPad([]byte{0xac, 0x1d, 0xfa, 0xce}, []byte{0xbe, 0xef, 0xca, 0xb5}, []byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xbe, 0xef, 0xca, 0xb5}, []byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, different",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-			root:   [32]byte{0xac, 0x1d, 0xbe, 0xa7},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-		},
-		{
-			name:  "misaligned",
-			roots: make([]byte, 61),
-			root:  [32]byte{0xac, 0x1d, 0xbe, 0xa7},
-			err:   errMisalignedRootList,
-		},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			before := make([]byte, len(c.roots))
-			copy(before, c.roots)
-			r, err := removeRoot(c.roots, c.root)
-			if c.err != nil {
-				require.ErrorIs(t, err, c.err)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, len(c.expect), len(r))
-			require.Equal(t, true, bytes.Equal(c.expect, r))
-			require.Equal(t, true, bytes.Equal(before, c.roots))
-		})
-	}
-}
--- a/beacon-chain/db/kv/validated_checkpoint.go
+++ b/beacon-chain/db/kv/validated_checkpoint.go
@@ -1,10 +1,8 @@
 package kv

 import (
-	"bytes"
 	"context"

-	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	bolt "go.etcd.io/bbolt"
@@ -21,17 +19,7 @@ func (s *Store) LastValidatedCheckpoint(ctx context.Context) (*ethpb.Checkpoint,
 		if enc == nil {
 			var finErr error
 			checkpoint, finErr = s.FinalizedCheckpoint(ctx)
-			if finErr != nil {
-				return finErr
-			}
-			if bytes.Equal(checkpoint.Root, params.BeaconConfig().ZeroHash[:]) {
-				bkt = tx.Bucket(blocksBucket)
-				r := bkt.Get(genesisBlockRootKey)
-				if r != nil {
-					checkpoint.Root = r
-				}
-			}
-			return nil
+			return finErr
 		}
 		checkpoint = &ethpb.Checkpoint{}
 		return decode(ctx, enc, checkpoint)
--- a/beacon-chain/db/pruner/pruner.go
+++ b/beacon-chain/db/pruner/pruner.go
@@ -16,15 +16,6 @@ import (

 var log = logrus.WithField("prefix", "db-pruner")

-const (
-	// defaultPrunableBatchSize is the number of slots that can be pruned at once.
-	defaultPrunableBatchSize = 32
-	// defaultPruningWindow is the duration of one pruning window.
-	defaultPruningWindow = time.Second * 3
-	// defaultNumBatchesToPrune is the number of batches to prune in one pruning window.
-	defaultNumBatchesToPrune = 15
-)
-
 type ServiceOption func(*Service)

 // WithRetentionPeriod allows the user to specify a different data retention period than the spec default.
@@ -152,17 +143,14 @@ func (p *Service) prune(slot primitives.Slot) error {
 	}).Debug("Pruning chain data")

 	tt := time.Now()
-	numBatches, err := p.pruneBatches(pruneUpto)
-	if err != nil {
-		return errors.Wrap(err, "failed to prune batches")
+	if err := p.db.DeleteHistoricalDataBeforeSlot(p.ctx, pruneUpto); err != nil {
+		return errors.Wrapf(err, "could not delete upto slot %d", pruneUpto)
 	}

 	log.WithFields(logrus.Fields{
 		"prunedUpto":  pruneUpto,
 		"duration":    time.Since(tt),
 		"currentSlot": slot,
-		"batchSize":   defaultPrunableBatchSize,
-		"numBatches":  numBatches,
 	}).Debug("Successfully pruned chain data")

 	// Update pruning checkpoint.
@@ -171,33 +159,6 @@ func (p *Service) prune(slot primitives.Slot) error {
 	return nil
 }

-func (p *Service) pruneBatches(pruneUpto primitives.Slot) (int, error) {
-	ctx, cancel := context.WithTimeout(p.ctx, defaultPruningWindow)
-	defer cancel()
-
-	numBatches := 0
-	for {
-		select {
-		case <-ctx.Done():
-			return numBatches, nil
-		default:
-			for i := 0; i < defaultNumBatchesToPrune; i++ {
-				slotsDeleted, err := p.db.DeleteHistoricalDataBeforeSlot(ctx, pruneUpto, defaultPrunableBatchSize)
-				if err != nil {
-					return 0, errors.Wrapf(err, "could not delete upto slot %d", pruneUpto)
-				}
-
-				// Return if there's nothing to delete.
-				if slotsDeleted == 0 {
-					return numBatches, nil
-				}
-
-				numBatches++
-			}
-		}
-	}
-}
-
 // pruneStartSlotFunc returns the function to determine the start slot to start pruning.
 func pruneStartSlotFunc(retentionEpochs primitives.Epoch) func(primitives.Slot) primitives.Slot {
 	return func(current primitives.Slot) primitives.Slot {
--- a/beacon-chain/execution/block_cache.go
+++ b/beacon-chain/execution/block_cache.go
@@ -158,7 +158,7 @@ func trim(queue *cache.FIFO, maxSize uint64) {
 	for s := uint64(len(queue.ListKeys())); s > maxSize; s-- {
 		// #nosec G104 popProcessNoopFunc never returns an error
 		if _, err := queue.Pop(popProcessNoopFunc); err != nil { // This never returns an error, but we'll handle anyway for sanity.
-			panic(err) // lint:nopanic -- popProcessNoopFunc never returns an error.
+			panic(err)
 		}
 	}
 }
--- a/beacon-chain/execution/engine_client.go
+++ b/beacon-chain/execution/engine_client.go
@@ -36,19 +36,17 @@ var (
 		NewPayloadMethod,
 		NewPayloadMethodV2,
 		NewPayloadMethodV3,
+		NewPayloadMethodV4,
 		ForkchoiceUpdatedMethod,
 		ForkchoiceUpdatedMethodV2,
 		ForkchoiceUpdatedMethodV3,
 		GetPayloadMethod,
 		GetPayloadMethodV2,
 		GetPayloadMethodV3,
+		GetPayloadMethodV4,
 		GetPayloadBodiesByHashV1,
 		GetPayloadBodiesByRangeV1,
 	}
-	electraEngineEndpoints = []string{
-		NewPayloadMethodV4,
-		GetPayloadMethodV4,
-	}
 )

 const (
@@ -298,10 +296,6 @@ func (s *Service) ExchangeCapabilities(ctx context.Context) ([]string, error) {
 	ctx, span := trace.StartSpan(ctx, "powchain.engine-api-client.ExchangeCapabilities")
 	defer span.End()

-	// Only check for electra related engine methods if it has been activated.
-	if params.ElectraEnabled() {
-		supportedEngineEndpoints = append(supportedEngineEndpoints, electraEngineEndpoints...)
-	}
 	var result []string
 	err := s.rpcClient.CallContext(ctx, &result, ExchangeCapabilities, supportedEngineEndpoints)
 	if err != nil {
--- a/beacon-chain/execution/testing/mock_faulty_powchain.go
+++ b/beacon-chain/execution/testing/mock_faulty_powchain.go
@@ -57,7 +57,7 @@ func (*FaultyExecutionChain) ChainStartEth1Data() *ethpb.Eth1Data {
 func (*FaultyExecutionChain) PreGenesisState() state.BeaconState {
 	s, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	if err != nil {
-		panic("could not initialize state") // lint:nopanic -- test code.
+		panic("could not initialize state")
 	}
 	return s
 }
--- a/beacon-chain/forkchoice/doubly-linked-tree/node.go
+++ b/beacon-chain/forkchoice/doubly-linked-tree/node.go
@@ -156,10 +156,6 @@ func (n *Node) nodeTreeDump(ctx context.Context, nodes []*forkchoice2.Node) ([]*
 	if n.parent != nil {
 		parentRoot = n.parent.root
 	}
-	target := [32]byte{}
-	if n.target != nil {
-		target = n.target.root
-	}
 	thisNode := &forkchoice2.Node{
 		Slot:                     n.slot,
 		BlockRoot:                n.root[:],
@@ -173,7 +169,6 @@ func (n *Node) nodeTreeDump(ctx context.Context, nodes []*forkchoice2.Node) ([]*
 		ExecutionOptimistic:      n.optimistic,
 		ExecutionBlockHash:       n.payloadHash[:],
 		Timestamp:                n.timestamp,
-		Target:                   target[:],
 	}
 	if n.optimistic {
 		thisNode.Validity = forkchoice2.Optimistic
--- a/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go
+++ b/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go
@@ -1,6 +1,8 @@
 package doublylinkedtree

 import (
+	"fmt"
+
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 )
@@ -13,7 +15,7 @@ func (f *ForkChoice) applyProposerBoostScore() error {
 	if s.previousProposerBoostRoot != params.BeaconConfig().ZeroHash {
 		previousNode, ok := s.nodeByRoot[s.previousProposerBoostRoot]
 		if !ok || previousNode == nil {
-			log.WithError(errInvalidProposerBoostRoot).Errorf("invalid prev root %#x", s.previousProposerBoostRoot)
+			log.WithError(errInvalidProposerBoostRoot).Errorf(fmt.Sprintf("invalid prev root %#x", s.previousProposerBoostRoot))
 		} else {
 			previousNode.balance -= s.previousProposerBoostScore
 		}
@@ -22,7 +24,7 @@ func (f *ForkChoice) applyProposerBoostScore() error {
 	if s.proposerBoostRoot != params.BeaconConfig().ZeroHash {
 		currentNode, ok := s.nodeByRoot[s.proposerBoostRoot]
 		if !ok || currentNode == nil {
-			log.WithError(errInvalidProposerBoostRoot).Errorf("invalid current root %#x", s.proposerBoostRoot)
+			log.WithError(errInvalidProposerBoostRoot).Errorf(fmt.Sprintf("invalid current root %#x", s.proposerBoostRoot))
 		} else {
 			proposerScore = (s.committeeWeight * params.BeaconConfig().ProposerScoreBoost) / 100
 			currentNode.balance += proposerScore
--- a/beacon-chain/forkchoice/doubly-linked-tree/store.go
+++ b/beacon-chain/forkchoice/doubly-linked-tree/store.go
@@ -252,13 +252,6 @@ func (s *Store) tips() ([][32]byte, []primitives.Slot) {
 	return roots, slots
 }

-func (f *ForkChoice) HighestReceivedBlockRoot() [32]byte {
-	if f.store.highestReceivedNode == nil {
-		return [32]byte{}
-	}
-	return f.store.highestReceivedNode.root
-}
-
 // HighestReceivedBlockSlot returns the highest slot received by the forkchoice
 func (f *ForkChoice) HighestReceivedBlockSlot() primitives.Slot {
 	if f.store.highestReceivedNode == nil {
--- a/beacon-chain/forkchoice/interfaces.go
+++ b/beacon-chain/forkchoice/interfaces.go
@@ -65,7 +65,6 @@ type FastGetter interface {
 	FinalizedPayloadBlockHash() [32]byte
 	HasNode([32]byte) bool
 	HighestReceivedBlockSlot() primitives.Slot
-	HighestReceivedBlockRoot() [32]byte
 	HighestReceivedBlockDelay() primitives.Slot
 	IsCanonical(root [32]byte) bool
 	IsOptimistic(root [32]byte) (bool, error)
--- a/beacon-chain/forkchoice/ro.go
+++ b/beacon-chain/forkchoice/ro.go
@@ -114,13 +114,6 @@ func (ro *ROForkChoice) HighestReceivedBlockSlot() primitives.Slot {
 	return ro.getter.HighestReceivedBlockSlot()
 }

-// HighestReceivedBlockRoot delegates to the underlying forkchoice call, under a lock.
-func (ro *ROForkChoice) HighestReceivedBlockRoot() [32]byte {
-	ro.l.RLock()
-	defer ro.l.RUnlock()
-	return ro.getter.HighestReceivedBlockRoot()
-}
-
 // HighestReceivedBlockDelay delegates to the underlying forkchoice call, under a lock.
 func (ro *ROForkChoice) HighestReceivedBlockDelay() primitives.Slot {
 	ro.l.RLock()
--- a/beacon-chain/forkchoice/ro_test.go
+++ b/beacon-chain/forkchoice/ro_test.go
@@ -29,7 +29,6 @@ const (
 	unrealizedJustifiedPayloadBlockHashCalled
 	nodeCountCalled
 	highestReceivedBlockSlotCalled
-	highestReceivedBlockRootCalled
 	highestReceivedBlockDelayCalled
 	receivedBlocksLastEpochCalled
 	weightCalled
@@ -253,11 +252,6 @@ func (ro *mockROForkchoice) HighestReceivedBlockSlot() primitives.Slot {
 	return 0
 }

-func (ro *mockROForkchoice) HighestReceivedBlockRoot() [32]byte {
-	ro.calls = append(ro.calls, highestReceivedBlockRootCalled)
-	return [32]byte{}
-}
-
 func (ro *mockROForkchoice) HighestReceivedBlockDelay() primitives.Slot {
 	ro.calls = append(ro.calls, highestReceivedBlockDelayCalled)
 	return 0
--- a/beacon-chain/monitor/process_attestation.go
+++ b/beacon-chain/monitor/process_attestation.go
@@ -166,23 +166,6 @@ func (s *Service) processIncludedAttestation(ctx context.Context, state state.Be
 	}
 }

-// processSingleAttestation logs when the beacon node observes a single attestation from tracked validator.
-func (s *Service) processSingleAttestation(att ethpb.Att) {
-	s.RLock()
-	defer s.RUnlock()
-
-	single, ok := att.(*ethpb.SingleAttestation)
-	if !ok {
-		log.Errorf("Wrong attestation type (expected %T, got %T)", &ethpb.SingleAttestation{}, att)
-		return
-	}
-
-	if s.canUpdateAttestedValidator(single.AttesterIndex, single.GetData().Slot) {
-		logFields := logMessageTimelyFlagsForIndex(single.AttesterIndex, att.GetData())
-		log.WithFields(logFields).Info("Processed unaggregated attestation")
-	}
-}
-
 // processUnaggregatedAttestation logs when the beacon node observes an unaggregated attestation from tracked validator.
 func (s *Service) processUnaggregatedAttestation(ctx context.Context, att ethpb.Att) {
 	s.RLock()
--- a/beacon-chain/monitor/service.go
+++ b/beacon-chain/monitor/service.go
@@ -241,7 +241,7 @@ func (s *Service) monitorRoutine(stateChannel chan *feed.Event, stateSub event.S
 				if !ok {
 					log.Error("Event feed data is not of type *operation.SingleAttReceivedData")
 				} else {
-					s.processSingleAttestation(data.Attestation)
+					s.processUnaggregatedAttestation(s.ctx, data.Attestation)
 				}
 			case operation.ExitReceived:
 				data, ok := e.Data.(*operation.ExitReceivedData)
--- a/beacon-chain/node/config.go
+++ b/beacon-chain/node/config.go
@@ -14,7 +14,6 @@ import (

 func configureTracing(cliCtx *cli.Context) error {
 	return tracing.Setup(
-		cliCtx.Context,
 		"beacon-chain", // service name
 		cliCtx.String(cmd.TracingProcessNameFlag.Name),
 		cliCtx.String(cmd.TracingEndpointFlag.Name),
@@ -166,7 +165,7 @@ func configureExecutionSetting(cliCtx *cli.Context) error {
 	}

 	if !cliCtx.IsSet(flags.SuggestedFeeRecipient.Name) {
-		log.Warn("In order to receive transaction fees from proposing blocks, " +
+		log.Warnf("In order to receive transaction fees from proposing blocks, " +
 			"you must provide flag --" + flags.SuggestedFeeRecipient.Name + " with a valid ethereum address when starting your beacon node. " +
 			"Please see our documentation for more information on this requirement (https://docs.prylabs.network/docs/execution-node/fee-recipient).")
 		return nil
--- a/beacon-chain/node/node.go
+++ b/beacon-chain/node/node.go
@@ -122,7 +122,6 @@ type BeaconNode struct {
 	BlobStorageOptions      []filesystem.BlobStorageOption
 	verifyInitWaiter        *verification.InitializerWaiter
 	syncChecker             *initialsync.SyncChecker
-	slasherEnabled          bool
 }

 // New creates a new node instance, sets up configuration options, and registers
@@ -160,7 +159,6 @@ func New(cliCtx *cli.Context, cancel context.CancelFunc, opts ...Option) (*Beaco
 		serviceFlagOpts:         &serviceFlagOpts{},
 		initialSyncComplete:     make(chan struct{}),
 		syncChecker:             &initialsync.SyncChecker{},
-		slasherEnabled:          cliCtx.Bool(flags.SlasherFlag.Name),
 	}

 	for _, opt := range opts {
@@ -344,7 +342,7 @@ func registerServices(cliCtx *cli.Context, beacon *BeaconNode, synchronizer *sta
 		return errors.Wrap(err, "could not register slashing pool service")
 	}

-	log.WithField("enabled", beacon.slasherEnabled).Debugln("Registering Slasher Service")
+	log.Debugln("Registering Slasher Service")
 	if err := beacon.registerSlasherService(); err != nil {
 		return errors.Wrap(err, "could not register slasher service")
 	}
@@ -440,7 +438,7 @@ func (b *BeaconNode) Start() {
 				log.WithField("times", i-1).Info("Already shutting down, interrupt more to panic")
 			}
 		}
-		panic("Panic closing the beacon node") // lint:nopanic -- Panic is requested by user.
+		panic("Panic closing the beacon node")
 	}()

 	// Wait for stop channel to be closed.
@@ -589,7 +587,7 @@ func (b *BeaconNode) startDB(cliCtx *cli.Context, depositAddress string) error {
 }

 func (b *BeaconNode) startSlasherDB(cliCtx *cli.Context) error {
-	if !b.slasherEnabled {
+	if !features.Get().EnableSlasher {
 		return nil
 	}
 	baseDir := cliCtx.String(cmd.DataDirFlag.Name)
@@ -706,7 +704,7 @@ func (b *BeaconNode) registerP2P(cliCtx *cli.Context) error {
 func (b *BeaconNode) fetchP2P() p2p.P2P {
 	var p *p2p.Service
 	if err := b.services.FetchService(&p); err != nil {
-		panic(err) // lint:nopanic -- This could panic application start if the services are misconfigured.
+		panic(err)
 	}
 	return p
 }
@@ -714,7 +712,7 @@ func (b *BeaconNode) fetchP2P() p2p.P2P {
 func (b *BeaconNode) fetchBuilderService() *builder.Service {
 	var s *builder.Service
 	if err := b.services.FetchService(&s); err != nil {
-		panic(err) // lint:nopanic -- This could panic application start if the services are misconfigured.
+		panic(err)
 	}
 	return s
 }
@@ -777,7 +775,6 @@ func (b *BeaconNode) registerBlockchainService(fc forkchoice.ForkChoicer, gs *st
 		blockchain.WithTrackedValidatorsCache(b.trackedValidatorsCache),
 		blockchain.WithPayloadIDCache(b.payloadIDCache),
 		blockchain.WithSyncChecker(b.syncChecker),
-		blockchain.WithSlasherEnabled(b.slasherEnabled),
 	)

 	blockchainService, err := blockchain.NewService(b.ctx, opts...)
@@ -862,7 +859,6 @@ func (b *BeaconNode) registerSyncService(initialSyncComplete chan struct{}, bFil
 		regularsync.WithBlobStorage(b.BlobStorage),
 		regularsync.WithVerifierWaiter(b.verifyInitWaiter),
 		regularsync.WithAvailableBlocker(bFillStore),
-		regularsync.WithSlasherEnabled(b.slasherEnabled),
 	)
 	return b.services.RegisterService(rs)
 }
@@ -891,7 +887,7 @@ func (b *BeaconNode) registerInitialSyncService(complete chan struct{}) error {
 }

 func (b *BeaconNode) registerSlasherService() error {
-	if !b.slasherEnabled {
+	if !features.Get().EnableSlasher {
 		return nil
 	}
 	var chainService *blockchain.Service
@@ -938,7 +934,7 @@ func (b *BeaconNode) registerRPCService(router *http.ServeMux) error {
 	}

 	var slasherService *slasher.Service
-	if b.slasherEnabled {
+	if features.Get().EnableSlasher {
 		if err := b.services.FetchService(&slasherService); err != nil {
 			return err
 		}
@@ -1018,13 +1014,13 @@ func (b *BeaconNode) registerPrometheusService(_ *cli.Context) error {
 	var additionalHandlers []prometheus.Handler
 	var p *p2p.Service
 	if err := b.services.FetchService(&p); err != nil {
-		panic(err) // lint:nopanic -- This could panic application start if the services are misconfigured.
+		panic(err)
 	}
 	additionalHandlers = append(additionalHandlers, prometheus.Handler{Path: "/p2p", Handler: p.InfoHandler})

 	var c *blockchain.Service
 	if err := b.services.FetchService(&c); err != nil {
-		panic(err) // lint:nopanic -- This could panic application start if the services are misconfigured.
+		panic(err)
 	}

 	service := prometheus.NewService(
--- a/beacon-chain/operations/attestations/kv/aggregated.go
+++ b/beacon-chain/operations/attestations/kv/aggregated.go
@@ -23,7 +23,10 @@ import (
 func (c *AttCaches) AggregateUnaggregatedAttestations(ctx context.Context) error {
 	ctx, span := trace.StartSpan(ctx, "operations.attestations.kv.AggregateUnaggregatedAttestations")
 	defer span.End()
-	unaggregatedAtts := c.UnaggregatedAttestations()
+	unaggregatedAtts, err := c.UnaggregatedAttestations()
+	if err != nil {
+		return err
+	}
 	return c.aggregateUnaggregatedAtts(ctx, unaggregatedAtts)
 }

--- a/beacon-chain/operations/attestations/kv/unaggregated.go
+++ b/beacon-chain/operations/attestations/kv/unaggregated.go
@@ -9,7 +9,6 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1/attestation"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
-	log "github.com/sirupsen/logrus"
 )

 // SaveUnaggregatedAttestation saves an unaggregated attestation in cache.
@@ -53,7 +52,7 @@ func (c *AttCaches) SaveUnaggregatedAttestations(atts []ethpb.Att) error {
 }

 // UnaggregatedAttestations returns all the unaggregated attestations in cache.
-func (c *AttCaches) UnaggregatedAttestations() []ethpb.Att {
+func (c *AttCaches) UnaggregatedAttestations() ([]ethpb.Att, error) {
 	c.unAggregateAttLock.RLock()
 	defer c.unAggregateAttLock.RUnlock()
 	unAggregatedAtts := c.unAggregatedAtt
@@ -61,14 +60,13 @@ func (c *AttCaches) UnaggregatedAttestations() []ethpb.Att {
 	for _, att := range unAggregatedAtts {
 		seen, err := c.hasSeenBit(att)
 		if err != nil {
-			log.WithError(err).Debug("Could not check if unaggregated attestation's bit has been seen. Attestation will not be returned")
-			continue
+			return nil, err
 		}
 		if !seen {
 			atts = append(atts, att.Clone())
 		}
 	}
-	return atts
+	return atts, nil
 }

 // UnaggregatedAttestationsBySlotIndex returns the unaggregated attestations in cache,
@@ -139,7 +137,7 @@ func (c *AttCaches) DeleteUnaggregatedAttestation(att ethpb.Att) error {
 	}

 	if err := c.insertSeenBit(att); err != nil {
-		log.WithError(err).Debug("Could not insert seen bit of unaggregated attestation. Attestation will be deleted")
+		return err
 	}

 	id, err := attestation.NewId(att, attestation.Full)
@@ -165,12 +163,7 @@ func (c *AttCaches) DeleteSeenUnaggregatedAttestations() (int, error) {
 		if att == nil || att.IsNil() || att.IsAggregated() {
 			continue
 		}
-		seen, err := c.hasSeenBit(att)
-		if err != nil {
-			log.WithError(err).Debug("Could not check if unaggregated attestation's bit has been seen. Attestation will be deleted")
-			seen = true
-		}
-		if seen {
+		if seen, err := c.hasSeenBit(att); err == nil && seen {
 			delete(c.unAggregatedAtt, r)
 			count++
 		}
--- a/beacon-chain/operations/attestations/kv/unaggregated_test.go
+++ b/beacon-chain/operations/attestations/kv/unaggregated_test.go
@@ -17,23 +17,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/testing/util"
 )

-func TestKV_Unaggregated_UnaggregatedAttestations(t *testing.T) {
-	t.Run("not returned when hasSeenBit fails", func(t *testing.T) {
-		att := util.HydrateAttestation(&ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 1}, AggregationBits: bitfield.Bitlist{0b101}})
-		id, err := attestation.NewId(att, attestation.Data)
-		require.NoError(t, err)
-
-		cache := NewAttCaches()
-		require.NoError(t, cache.SaveUnaggregatedAttestation(att))
-		cache.seenAtt.Delete(id.String())
-		// cache a bitlist whose length is different from the attestation bitlist's length
-		cache.seenAtt.Set(id.String(), []bitfield.Bitlist{{0b1001}}, c.DefaultExpiration)
-
-		atts := cache.UnaggregatedAttestations()
-		assert.Equal(t, 0, len(atts))
-	})
-}
-
 func TestKV_Unaggregated_SaveUnaggregatedAttestation(t *testing.T) {
 	tests := []struct {
 		name          string
@@ -168,23 +151,9 @@ func TestKV_Unaggregated_DeleteUnaggregatedAttestation(t *testing.T) {
 		for _, att := range atts {
 			assert.NoError(t, cache.DeleteUnaggregatedAttestation(att))
 		}
-		returned := cache.UnaggregatedAttestations()
-		assert.DeepEqual(t, []ethpb.Att{}, returned)
-	})
-
-	t.Run("deleted when insertSeenBit fails", func(t *testing.T) {
-		att := util.HydrateAttestation(&ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 1}, AggregationBits: bitfield.Bitlist{0b101}})
-		id, err := attestation.NewId(att, attestation.Data)
+		returned, err := cache.UnaggregatedAttestations()
 		require.NoError(t, err)
-
-		cache := NewAttCaches()
-		require.NoError(t, cache.SaveUnaggregatedAttestation(att))
-		cache.seenAtt.Delete(id.String())
-		// cache a bitlist whose length is different from the attestation bitlist's length
-		cache.seenAtt.Set(id.String(), []bitfield.Bitlist{{0b1001}}, c.DefaultExpiration)
-
-		require.NoError(t, cache.DeleteUnaggregatedAttestation(att))
-		assert.Equal(t, 0, len(cache.unAggregatedAtt), "Attestation was not deleted")
+		assert.DeepEqual(t, []ethpb.Att{}, returned)
 	})
 }

@@ -232,10 +201,11 @@ func TestKV_Unaggregated_DeleteSeenUnaggregatedAttestations(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, 1, count)
 		assert.Equal(t, 2, cache.UnaggregatedAttestationCount())
-		returned := cache.UnaggregatedAttestations()
+		returned, err := cache.UnaggregatedAttestations()
 		sort.Slice(returned, func(i, j int) bool {
 			return bytes.Compare(returned[i].GetAggregationBits(), returned[j].GetAggregationBits()) < 0
 		})
+		require.NoError(t, err)
 		assert.DeepEqual(t, []ethpb.Att{atts[0], atts[2]}, returned)
 	})

@@ -258,26 +228,10 @@ func TestKV_Unaggregated_DeleteSeenUnaggregatedAttestations(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, 3, count)
 		assert.Equal(t, 0, cache.UnaggregatedAttestationCount())
-		returned := cache.UnaggregatedAttestations()
+		returned, err := cache.UnaggregatedAttestations()
+		require.NoError(t, err)
 		assert.DeepEqual(t, []ethpb.Att{}, returned)
 	})
-
-	t.Run("deleted when hasSeenBit fails", func(t *testing.T) {
-		att := util.HydrateAttestation(&ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 1}, AggregationBits: bitfield.Bitlist{0b101}})
-		id, err := attestation.NewId(att, attestation.Data)
-		require.NoError(t, err)
-
-		cache := NewAttCaches()
-		require.NoError(t, cache.SaveUnaggregatedAttestation(att))
-		cache.seenAtt.Delete(id.String())
-		// cache a bitlist whose length is different from the attestation bitlist's length
-		cache.seenAtt.Set(id.String(), []bitfield.Bitlist{{0b1001}}, c.DefaultExpiration)
-
-		count, err := cache.DeleteSeenUnaggregatedAttestations()
-		require.NoError(t, err)
-		assert.Equal(t, 1, count)
-		assert.Equal(t, 0, len(cache.unAggregatedAtt), "Attestation was not deleted")
-	})
 }

 func TestKV_Unaggregated_UnaggregatedAttestationsBySlotIndex(t *testing.T) {
--- a/beacon-chain/operations/attestations/mock/mock.go
+++ b/beacon-chain/operations/attestations/mock/mock.go
@@ -1,4 +1,3 @@
-// lint:nopanic -- Mock / test code, panic is allowed.
 package mock

 import (
@@ -80,8 +79,8 @@ func (m *PoolMock) SaveUnaggregatedAttestations(atts []ethpb.Att) error {
 }

 // UnaggregatedAttestations --
-func (m *PoolMock) UnaggregatedAttestations() []ethpb.Att {
-	return m.UnaggregatedAtts
+func (m *PoolMock) UnaggregatedAttestations() ([]ethpb.Att, error) {
+	return m.UnaggregatedAtts, nil
 }

 // UnaggregatedAttestationsBySlotIndex --
--- a/beacon-chain/operations/attestations/pool.go
+++ b/beacon-chain/operations/attestations/pool.go
@@ -26,7 +26,7 @@ type Pool interface {
 	// For unaggregated attestations.
 	SaveUnaggregatedAttestation(att ethpb.Att) error
 	SaveUnaggregatedAttestations(atts []ethpb.Att) error
-	UnaggregatedAttestations() []ethpb.Att
+	UnaggregatedAttestations() ([]ethpb.Att, error)
 	UnaggregatedAttestationsBySlotIndex(ctx context.Context, slot primitives.Slot, committeeIndex primitives.CommitteeIndex) []*ethpb.Attestation
 	UnaggregatedAttestationsBySlotIndexElectra(ctx context.Context, slot primitives.Slot, committeeIndex primitives.CommitteeIndex) []*ethpb.AttestationElectra
 	DeleteUnaggregatedAttestation(att ethpb.Att) error
--- a/beacon-chain/operations/attestations/prune_expired.go
+++ b/beacon-chain/operations/attestations/prune_expired.go
@@ -61,8 +61,12 @@ func (s *Service) pruneExpiredAtts() {
 	if _, err := s.cfg.Pool.DeleteSeenUnaggregatedAttestations(); err != nil {
 		log.WithError(err).Error("Cannot delete seen attestations")
 	}
-
-	for _, att := range s.cfg.Pool.UnaggregatedAttestations() {
+	unAggregatedAtts, err := s.cfg.Pool.UnaggregatedAttestations()
+	if err != nil {
+		log.WithError(err).Error("Could not get unaggregated attestations")
+		return
+	}
+	for _, att := range unAggregatedAtts {
 		if s.expired(att.GetData().Slot) {
 			if err := s.cfg.Pool.DeleteUnaggregatedAttestation(att); err != nil {
 				log.WithError(err).Error("Could not delete expired unaggregated attestation")
--- a/beacon-chain/operations/attestations/prune_expired_test.go
+++ b/beacon-chain/operations/attestations/prune_expired_test.go
@@ -54,7 +54,9 @@ func TestPruneExpired_Ticker(t *testing.T) {

 	done := make(chan struct{}, 1)
 	async.RunEvery(ctx, 500*time.Millisecond, func() {
-		for _, attestation := range s.cfg.Pool.UnaggregatedAttestations() {
+		atts, err := s.cfg.Pool.UnaggregatedAttestations()
+		require.NoError(t, err)
+		for _, attestation := range atts {
 			if attestation.GetData().Slot == 0 {
 				return
 			}
--- a/beacon-chain/operations/blstoexec/mock/mock.go
+++ b/beacon-chain/operations/blstoexec/mock/mock.go
@@ -28,10 +28,10 @@ func (m *PoolMock) InsertBLSToExecChange(change *eth.SignedBLSToExecutionChange)

 // MarkIncluded --
 func (*PoolMock) MarkIncluded(_ *eth.SignedBLSToExecutionChange) {
-	panic("implement me") // lint:nopanic -- mock / test code.
+	panic("implement me")
 }

 // ValidatorExists --
 func (*PoolMock) ValidatorExists(_ primitives.ValidatorIndex) bool {
-	panic("implement me") // lint:nopanic -- mock / test code.
+	panic("implement me")
 }
--- a/beacon-chain/operations/slashings/BUILD.bazel
+++ b/beacon-chain/operations/slashings/BUILD.bazel
@@ -6,8 +6,8 @@ go_library(
        "doc.go",
        "log.go",
        "metrics.go",
-        "pool.go",
        "service.go",
+        "service_new.go",
        "types.go",
    ],
    importpath = "github.com/prysmaticlabs/prysm/v5/beacon-chain/operations/slashings",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Preston Van Loon	ea3fbe48b4	Merge tag 'v5.3.0' of github.com:prysmaticlabs/prysm	2025-02-12 12:59:53 -06:00
Preston Van Loon	c00222009f	Merge tag 'v5.0.3' of github.com:prysmaticlabs/prysm	2024-04-04 19:28:49 -05:00
Preston Van Loon	d4e0ae6a87	Merge tag 'v4.2.1'	2024-01-31 07:05:10 -06:00
Preston Van Loon	b691cdad9d	Merge tag 'v4.2.0' of github.com:prysmaticlabs/prysm	2024-01-11 09:31:14 -06:00
Preston Van Loon	2674e204ca	Merge tag 'v4.0.3'	2023-04-20 13:51:55 -05:00
Preston Van Loon	16f9f7d2b5	Merge tag 'v4.0.2'	2023-04-19 09:16:03 -05:00
Potuz	e2fa7d40e3	Use Epoch boundary cache to retrieve balances (#12083 ) * Use Epoch boundary cache to retrieve balances * save boundary states before inserting to forkchoice * move up last block save * remove boundary checks on balances * fix ordering --------- Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>	2023-03-06 15:06:12 -08:00
Nishant Das	dfd8bcff84	Remove Feature Flag From Prater (#12082 )	2023-03-06 18:03:18 +08:00