From 023674ab3b49a4736431c9d3224b66102798ca19 Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Wed, 14 Dec 2022 01:20:02 +0000
Subject: [PATCH 1/8] Update Gnosis chain bootnodes (#3793)

## Proposed Changes

Update the Gnosis chain bootnodes. The current list of Gnosis bootnodes were abandoned at some point before the Gnosis merge and are now failing to bootstrap peers. There's a workaround list of bootnodes here: https://docs.gnosischain.com/updates/20221208-temporary-bootnodes

The list from this PR represents the long-term bootnodes run by the Gnosis team. We will also try to set up SigP bootnodes for Gnosis chain at some point.
---
 .../built_in_network_configs/gnosis/boot_enr.yaml         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/eth2_network_config/built_in_network_configs/gnosis/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/gnosis/boot_enr.yaml
index 4b232d8b32..130c1fa1c3 100644
--- a/common/eth2_network_config/built_in_network_configs/gnosis/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/gnosis/boot_enr.yaml
@@ -1,5 +1,5 @@
 # Gnosis Chain Team
-- enr:-IS4QGmLwm7gFd0L0CEisllrb1op3v-wAGSc7_pwSMGgN3bOS9Fz7m1dWbwuuPHKqeETz9MbhjVuoWk0ohkyRv98kVoBgmlkgnY0gmlwhGjtlgaJc2VjcDI1NmsxoQLMdh0It9fJbuiLydZ9fpF6MRzgNle0vODaDiMqhbC7WIN1ZHCCIyg
-- enr:-IS4QFUVG3dvLPCUEI7ycRvFm0Ieg_ITa5tALmJ9LI7dJ6ieT3J4fF9xLRjOoB4ApV-Rjp7HeLKzyTWG1xRdbFBNZPQBgmlkgnY0gmlwhErP5weJc2VjcDI1NmsxoQOBbaJBvx0-w_pyZUhQl9A510Ho2T0grE0K8JevzES99IN1ZHCCIyg
-- enr:-Ku4QOQk8V-Hu2gxFzRXmLYIO4AvWDZhoMFwTf3n3DYm_mbsWv0ZitoqiN6JZUUj6Li6e1Jk1w2zFSVHKPMUP1g5tsgBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD5Jd3FAAAAZP__________gmlkgnY0gmlwhC1PTpmJc2VjcDI1NmsxoQL1Ynt5PoA0UOcHa1Rfn98rmnRlLzNuWTePPP4m4qHVroN1ZHCCKvg
-- enr:-Ku4QFaTwgoms-EiiRIfHUH3FXprWUFgjHg4UuWvilqoUQtDbmTszVIxUEOwQUmA2qkiP-T9wXjc_rVUuh9cU7WgwbgBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD5Jd3FAAAAZP__________gmlkgnY0gmlwhC0hBmCJc2VjcDI1NmsxoQOpsg1XCrXmCwZKcSTcycLwldoKUMHPUpMEVGeg_EEhuYN1ZHCCKvg
+- enr:-Ly4QMU1y81COwm1VZgxGF4_eZ21ub9-GHF6dXZ29aEJ0oZpcV2Rysw-viaEKfpcpu9ZarILJLxFZjcKOjE0Sybs3MQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhANLnx-Jc2VjcDI1NmsxoQKoaYT8I-wf2I_f_ii6EgoSSXj5T3bhiDyW-7ZLsY3T64hzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA
+- enr:-Ly4QBf76jLiCA_pDXoZjhyRbuwzFOscFY-MIKkPnmHPQbvaKhIDZutfe38G9ibzgQP0RKrTo3vcWOy4hf_8wOZ-U5MBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhBLGgjaJc2VjcDI1NmsxoQLGeo0Q4lDvxIjHjnkAqEuETTaFIjsNrEcSpdDhcHXWFYhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA
+- enr:-Ly4QLjZUWdqUO_RwyDqCAccIK5-MbLRD6A2c7oBuVbBgBnWDkEf0UKJVAaJqi2pO101WVQQLYSnYgz1Q3pRhYdrlFoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhANA8sSJc2VjcDI1NmsxoQK4TC_EK1jSs0VVPUpOjIo1rhJmff2SLBPFOWSXMwdLVYhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA
+- enr:-Ly4QKwX2rTFtKWKQHSGQFhquxsxL1jewO8JB1MG-jgHqAZVFWxnb3yMoQqnYSV1bk25-_jiLuhIulxar3RBWXEDm6EBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhAN-qZeJc2VjcDI1NmsxoQI7EPGMpecl0QofLp4Wy_lYNCCChUFEH6kY7k-oBGkPFIhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA

From 63c74b37f4805aee853f8be8d9e2e27886ba898f Mon Sep 17 00:00:00 2001
From: Divma <divma@protonmail.com>
Date: Thu, 15 Dec 2022 00:16:38 +0000
Subject: [PATCH 2/8] send error answering bbrange requests when an error
 occurrs (#3800)

## Issue Addressed

While testing withdrawals with @ethDreamer we noticed lighthouse is sending empty batches when an error occurs. As LH peer receiving this, we would consider this a low tolerance action because the peer is claiming the batch is right and is empty.

## Proposed Changes
If any kind of error occurs, send a error response instead

## Additional Info
Right now we don't handle such thing as a partial batch with an error. If an error is received, the whole batch is discarded. Because of this it makes little sense to send partial batches that end with an error, so it's better to do the proposed solution instead of sending empty batches.
---
 .../network/src/beacon_processor/worker/rpc_methods.rs   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
index 3e354a70d2..bfa0ea516f 100644
--- a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
+++ b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
@@ -398,6 +398,15 @@ impl<T: BeaconChainTypes> Worker<T> {
                                 "block_root" => ?root,
                                 "error" => ?e
                             );
+
+                            // send the stream terminator
+                            self.send_error_response(
+                                peer_id,
+                                RPCResponseErrorCode::ServerError,
+                                "Failed fetching blocks".into(),
+                                request_id,
+                            );
+                            send_response = false;
                             break;
                         }
                     }

From 558367ab8c5c2b99c9c5aaca1b4561bbddc9b017 Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Fri, 16 Dec 2022 09:20:45 +1100
Subject: [PATCH 3/8] Bounded withdrawals and spec v1.3.0-alpha.2 (#3802)

---
 .../src/per_block_processing.rs               | 33 +++++++++++++----
 consensus/types/presets/gnosis/capella.yaml   | 17 +++++++++
 consensus/types/presets/mainnet/capella.yaml  |  7 +++-
 consensus/types/presets/minimal/capella.yaml  |  7 +++-
 consensus/types/src/chain_spec.rs             |  6 +++-
 consensus/types/src/config_and_preset.rs      | 35 +++++++++++--------
 consensus/types/src/lib.rs                    |  4 +--
 consensus/types/src/preset.rs                 | 24 +++++++++++++
 testing/ef_tests/Makefile                     |  2 +-
 9 files changed, 108 insertions(+), 27 deletions(-)
 create mode 100644 consensus/types/presets/gnosis/capella.yaml

diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs
index 5269922260..7af74428b5 100644
--- a/consensus/state_processing/src/per_block_processing.rs
+++ b/consensus/state_processing/src/per_block_processing.rs
@@ -466,7 +466,9 @@ pub fn compute_timestamp_at_slot<T: EthSpec>(
         .and_then(|since_genesis| state.genesis_time().safe_add(since_genesis))
 }
 
-/// FIXME: add link to this function once the spec is stable
+/// Compute the next batch of withdrawals which should be included in a block.
+///
+/// https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/beacon-chain.md#new-get_expected_withdrawals
 #[cfg(feature = "withdrawals")]
 pub fn get_expected_withdrawals<T: EthSpec>(
     state: &BeaconState<T>,
@@ -481,7 +483,11 @@ pub fn get_expected_withdrawals<T: EthSpec>(
         return Ok(withdrawals.into());
     }
 
-    for _ in 0..state.validators().len() {
+    let bound = std::cmp::min(
+        state.validators().len() as u64,
+        spec.max_validators_per_withdrawals_sweep,
+    );
+    for _ in 0..bound {
         let validator = state.get_validator(validator_index as usize)?;
         let balance = *state.balances().get(validator_index as usize).ok_or(
             BeaconStateError::BalancesOutOfBounds(validator_index as usize),
@@ -518,7 +524,7 @@ pub fn get_expected_withdrawals<T: EthSpec>(
     Ok(withdrawals.into())
 }
 
-/// FIXME: add link to this function once the spec is stable
+/// Apply withdrawals to the state.
 #[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
 pub fn process_withdrawals<'payload, T: EthSpec, Payload: AbstractExecPayload<T>>(
     state: &mut BeaconState<T>,
@@ -547,11 +553,26 @@ pub fn process_withdrawals<'payload, T: EthSpec, Payload: AbstractExecPayload<T>
                 )?;
             }
 
+            // Update the next withdrawal index if this block contained withdrawals
             if let Some(latest_withdrawal) = expected_withdrawals.last() {
                 *state.next_withdrawal_index_mut()? = latest_withdrawal.index.safe_add(1)?;
-                let next_validator_index = latest_withdrawal
-                    .validator_index
-                    .safe_add(1)?
+
+                // Update the next validator index to start the next withdrawal sweep
+                if expected_withdrawals.len() == T::max_withdrawals_per_payload() {
+                    // Next sweep starts after the latest withdrawal's validator index
+                    let next_validator_index = latest_withdrawal
+                        .validator_index
+                        .safe_add(1)?
+                        .safe_rem(state.validators().len() as u64)?;
+                    *state.next_withdrawal_validator_index_mut()? = next_validator_index;
+                }
+            }
+
+            // Advance sweep by the max length of the sweep if there was not a full set of withdrawals
+            if expected_withdrawals.len() != T::max_withdrawals_per_payload() {
+                let next_validator_index = state
+                    .next_withdrawal_validator_index()?
+                    .safe_add(spec.max_validators_per_withdrawals_sweep)?
                     .safe_rem(state.validators().len() as u64)?;
                 *state.next_withdrawal_validator_index_mut()? = next_validator_index;
             }
diff --git a/consensus/types/presets/gnosis/capella.yaml b/consensus/types/presets/gnosis/capella.yaml
new file mode 100644
index 0000000000..913c2956ba
--- /dev/null
+++ b/consensus/types/presets/gnosis/capella.yaml
@@ -0,0 +1,17 @@
+# Mainnet preset - Capella
+
+# Misc
+# Max operations per block
+# ---------------------------------------------------------------
+# 2**4 (= 16)
+MAX_BLS_TO_EXECUTION_CHANGES: 16
+
+# Execution
+# ---------------------------------------------------------------
+# 2**4 (= 16) withdrawals
+MAX_WITHDRAWALS_PER_PAYLOAD: 16
+
+# Withdrawals processing
+# ---------------------------------------------------------------
+# 2**14 (= 16384) validators
+MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP: 16384
diff --git a/consensus/types/presets/mainnet/capella.yaml b/consensus/types/presets/mainnet/capella.yaml
index 0c087255bf..913c2956ba 100644
--- a/consensus/types/presets/mainnet/capella.yaml
+++ b/consensus/types/presets/mainnet/capella.yaml
@@ -9,4 +9,9 @@ MAX_BLS_TO_EXECUTION_CHANGES: 16
 # Execution
 # ---------------------------------------------------------------
 # 2**4 (= 16) withdrawals
-MAX_WITHDRAWALS_PER_PAYLOAD: 16
\ No newline at end of file
+MAX_WITHDRAWALS_PER_PAYLOAD: 16
+
+# Withdrawals processing
+# ---------------------------------------------------------------
+# 2**14 (= 16384) validators
+MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP: 16384
diff --git a/consensus/types/presets/minimal/capella.yaml b/consensus/types/presets/minimal/capella.yaml
index eacd6c7cbc..d27253de87 100644
--- a/consensus/types/presets/minimal/capella.yaml
+++ b/consensus/types/presets/minimal/capella.yaml
@@ -9,4 +9,9 @@ MAX_BLS_TO_EXECUTION_CHANGES: 16
 # Execution
 # ---------------------------------------------------------------
 # [customized] 2**2 (= 4)
-MAX_WITHDRAWALS_PER_PAYLOAD: 4
\ No newline at end of file
+MAX_WITHDRAWALS_PER_PAYLOAD: 4
+
+# Withdrawals processing
+# ---------------------------------------------------------------
+# [customized] 2**4 (= 16) validators
+MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP: 16
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
index d16c9b8091..bf9a7ed34d 100644
--- a/consensus/types/src/chain_spec.rs
+++ b/consensus/types/src/chain_spec.rs
@@ -158,8 +158,9 @@ pub struct ChainSpec {
      * Capella hard fork params
      */
     pub capella_fork_version: [u8; 4],
-    /// The Capella fork epoch is optional, with `None` representing "Merge never happens".
+    /// The Capella fork epoch is optional, with `None` representing "Capella never happens".
     pub capella_fork_epoch: Option<Epoch>,
+    pub max_validators_per_withdrawals_sweep: u64,
 
     /*
      * Eip4844 hard fork params
@@ -634,6 +635,7 @@ impl ChainSpec {
              */
             capella_fork_version: [0x03, 00, 00, 00],
             capella_fork_epoch: None,
+            max_validators_per_withdrawals_sweep: 16384,
 
             /*
              * Eip4844 hard fork params
@@ -707,6 +709,7 @@ impl ChainSpec {
             // Capella
             capella_fork_version: [0x03, 0x00, 0x00, 0x01],
             capella_fork_epoch: None,
+            max_validators_per_withdrawals_sweep: 16,
             // Eip4844
             eip4844_fork_version: [0x04, 0x00, 0x00, 0x01],
             eip4844_fork_epoch: None,
@@ -869,6 +872,7 @@ impl ChainSpec {
              */
             capella_fork_version: [0x03, 0x00, 0x00, 0x64],
             capella_fork_epoch: None,
+            max_validators_per_withdrawals_sweep: 16384,
 
             /*
              * Eip4844 hard fork params
diff --git a/consensus/types/src/config_and_preset.rs b/consensus/types/src/config_and_preset.rs
index f72b1710de..9a618f7cc3 100644
--- a/consensus/types/src/config_and_preset.rs
+++ b/consensus/types/src/config_and_preset.rs
@@ -1,5 +1,6 @@
 use crate::{
-    consts::altair, AltairPreset, BasePreset, BellatrixPreset, ChainSpec, Config, EthSpec, ForkName,
+    consts::altair, AltairPreset, BasePreset, BellatrixPreset, CapellaPreset, ChainSpec, Config,
+    EthSpec, ForkName,
 };
 use maplit::hashmap;
 use serde_derive::{Deserialize, Serialize};
@@ -11,7 +12,7 @@ use superstruct::superstruct;
 ///
 /// Mostly useful for the API.
 #[superstruct(
-    variants(Altair, Bellatrix),
+    variants(Bellatrix, Capella),
     variant_attributes(derive(Serialize, Deserialize, Debug, PartialEq, Clone))
 )]
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
@@ -24,9 +25,10 @@ pub struct ConfigAndPreset {
     pub base_preset: BasePreset,
     #[serde(flatten)]
     pub altair_preset: AltairPreset,
-    #[superstruct(only(Bellatrix))]
     #[serde(flatten)]
     pub bellatrix_preset: BellatrixPreset,
+    #[superstruct(only(Capella))]
+    pub capella_preset: CapellaPreset,
     /// The `extra_fields` map allows us to gracefully decode fields intended for future hard forks.
     #[serde(flatten)]
     pub extra_fields: HashMap<String, Value>,
@@ -37,14 +39,24 @@ impl ConfigAndPreset {
         let config = Config::from_chain_spec::<T>(spec);
         let base_preset = BasePreset::from_chain_spec::<T>(spec);
         let altair_preset = AltairPreset::from_chain_spec::<T>(spec);
+        let bellatrix_preset = BellatrixPreset::from_chain_spec::<T>(spec);
         let extra_fields = get_extra_fields(spec);
 
-        if spec.bellatrix_fork_epoch.is_some()
+        if spec.capella_fork_epoch.is_some()
             || fork_name.is_none()
-            || fork_name == Some(ForkName::Merge)
+            || fork_name == Some(ForkName::Capella)
         {
-            let bellatrix_preset = BellatrixPreset::from_chain_spec::<T>(spec);
+            let capella_preset = CapellaPreset::from_chain_spec::<T>(spec);
 
+            ConfigAndPreset::Capella(ConfigAndPresetCapella {
+                config,
+                base_preset,
+                altair_preset,
+                bellatrix_preset,
+                capella_preset,
+                extra_fields,
+            })
+        } else {
             ConfigAndPreset::Bellatrix(ConfigAndPresetBellatrix {
                 config,
                 base_preset,
@@ -52,13 +64,6 @@ impl ConfigAndPreset {
                 bellatrix_preset,
                 extra_fields,
             })
-        } else {
-            ConfigAndPreset::Altair(ConfigAndPresetAltair {
-                config,
-                base_preset,
-                altair_preset,
-                extra_fields,
-            })
         }
     }
 }
@@ -131,8 +136,8 @@ mod test {
             .write(false)
             .open(tmp_file.as_ref())
             .expect("error while opening the file");
-        let from: ConfigAndPresetBellatrix =
+        let from: ConfigAndPresetCapella =
             serde_yaml::from_reader(reader).expect("error while deserializing");
-        assert_eq!(ConfigAndPreset::Bellatrix(from), yamlconfig);
+        assert_eq!(ConfigAndPreset::Capella(from), yamlconfig);
     }
 }
diff --git a/consensus/types/src/lib.rs b/consensus/types/src/lib.rs
index 92f87f01dd..6cbb9568da 100644
--- a/consensus/types/src/lib.rs
+++ b/consensus/types/src/lib.rs
@@ -124,7 +124,7 @@ pub use crate::bls_to_execution_change::BlsToExecutionChange;
 pub use crate::chain_spec::{ChainSpec, Config, Domain};
 pub use crate::checkpoint::Checkpoint;
 pub use crate::config_and_preset::{
-    ConfigAndPreset, ConfigAndPresetAltair, ConfigAndPresetBellatrix,
+    ConfigAndPreset, ConfigAndPresetBellatrix, ConfigAndPresetCapella,
 };
 pub use crate::contribution_and_proof::ContributionAndProof;
 pub use crate::deposit::{Deposit, DEPOSIT_TREE_DEPTH};
@@ -163,7 +163,7 @@ pub use crate::payload::{
     FullPayloadCapella, FullPayloadEip4844, FullPayloadMerge, FullPayloadRef, OwnedExecPayload,
 };
 pub use crate::pending_attestation::PendingAttestation;
-pub use crate::preset::{AltairPreset, BasePreset, BellatrixPreset};
+pub use crate::preset::{AltairPreset, BasePreset, BellatrixPreset, CapellaPreset};
 pub use crate::proposer_preparation_data::ProposerPreparationData;
 pub use crate::proposer_slashing::ProposerSlashing;
 pub use crate::relative_epoch::{Error as RelativeEpochError, RelativeEpoch};
diff --git a/consensus/types/src/preset.rs b/consensus/types/src/preset.rs
index 8ee38e46a6..7d7db228ce 100644
--- a/consensus/types/src/preset.rs
+++ b/consensus/types/src/preset.rs
@@ -184,6 +184,27 @@ impl BellatrixPreset {
     }
 }
 
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "UPPERCASE")]
+pub struct CapellaPreset {
+    #[serde(with = "eth2_serde_utils::quoted_u64")]
+    pub max_bls_to_execution_changes: u64,
+    #[serde(with = "eth2_serde_utils::quoted_u64")]
+    pub max_withdrawals_per_payload: u64,
+    #[serde(with = "eth2_serde_utils::quoted_u64")]
+    pub max_validators_per_withdrawals_sweep: u64,
+}
+
+impl CapellaPreset {
+    pub fn from_chain_spec<T: EthSpec>(spec: &ChainSpec) -> Self {
+        Self {
+            max_bls_to_execution_changes: T::max_bls_to_execution_changes() as u64,
+            max_withdrawals_per_payload: T::max_withdrawals_per_payload() as u64,
+            max_validators_per_withdrawals_sweep: spec.max_validators_per_withdrawals_sweep,
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -219,6 +240,9 @@ mod test {
 
         let bellatrix: BellatrixPreset = preset_from_file(&preset_name, "bellatrix.yaml");
         assert_eq!(bellatrix, BellatrixPreset::from_chain_spec::<E>(&spec));
+
+        let capella: CapellaPreset = preset_from_file(&preset_name, "capella.yaml");
+        assert_eq!(capella, CapellaPreset::from_chain_spec::<E>(&spec));
     }
 
     #[test]
diff --git a/testing/ef_tests/Makefile b/testing/ef_tests/Makefile
index 717ff13c97..d52f546dc2 100644
--- a/testing/ef_tests/Makefile
+++ b/testing/ef_tests/Makefile
@@ -1,4 +1,4 @@
-TESTS_TAG := v1.3.0-alpha.1
+TESTS_TAG := v1.3.0-alpha.2
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 

From 3a08c7634e68875b40cdee34ba58c6566d397c9f Mon Sep 17 00:00:00 2001
From: Mark Mackey <mark@sigmaprime.io>
Date: Fri, 16 Dec 2022 14:56:07 -0600
Subject: [PATCH 4/8] Make engine_getPayloadV2 accept local block value

---
 beacon_node/execution_layer/src/engine_api/http.rs       | 4 ++--
 .../execution_layer/src/engine_api/json_structures.rs    | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/beacon_node/execution_layer/src/engine_api/http.rs b/beacon_node/execution_layer/src/engine_api/http.rs
index c71cfa0c04..1616b21634 100644
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -760,7 +760,7 @@ impl HttpJsonRpc {
     ) -> Result<ExecutionPayload<T>, Error> {
         let params = json!([JsonPayloadIdRequest::from(payload_id)]);
 
-        let payload_v2: JsonExecutionPayloadV2<T> = self
+        let response: JsonGetPayloadResponse<T> = self
             .rpc_request(
                 ENGINE_GET_PAYLOAD_V2,
                 params,
@@ -768,7 +768,7 @@ impl HttpJsonRpc {
             )
             .await?;
 
-        JsonExecutionPayload::V2(payload_v2).try_into_execution_payload(fork_name)
+        JsonExecutionPayload::V2(response.execution_payload).try_into_execution_payload(fork_name)
     }
 
     pub async fn get_blobs_bundle_v1<T: EthSpec>(
diff --git a/beacon_node/execution_layer/src/engine_api/json_structures.rs b/beacon_node/execution_layer/src/engine_api/json_structures.rs
index feed621589..18e52eb06f 100644
--- a/beacon_node/execution_layer/src/engine_api/json_structures.rs
+++ b/beacon_node/execution_layer/src/engine_api/json_structures.rs
@@ -324,6 +324,15 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for JsonExecutionPayloadV2<T> {
     }
 }
 
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(bound = "T: EthSpec", rename_all = "camelCase")]
+pub struct JsonGetPayloadResponse<T: EthSpec> {
+    pub execution_payload: JsonExecutionPayloadV2<T>,
+    // uncomment this when geth fixes its serialization
+    //#[serde(with = "eth2_serde_utils::u256_hex_be")]
+    //pub block_value: Uint256,
+}
+
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JsonWithdrawal {

From b75ca74222ac1b8dda5efd6a48b1388cd622f372 Mon Sep 17 00:00:00 2001
From: Mark Mackey <mark@sigmaprime.io>
Date: Mon, 19 Dec 2022 15:10:50 -0600
Subject: [PATCH 5/8] Removed `withdrawals` feature flag

---
 .github/workflows/docker.yml                  |  2 +-
 Makefile                                      |  2 +-
 beacon_node/Cargo.toml                        |  1 -
 beacon_node/beacon_chain/Cargo.toml           |  1 -
 beacon_node/beacon_chain/src/beacon_chain.rs  | 16 +----
 .../beacon_chain/src/execution_payload.rs     | 21 ++----
 beacon_node/execution_layer/Cargo.toml        |  1 -
 beacon_node/execution_layer/src/engine_api.rs |  3 -
 .../execution_layer/src/engine_api/http.rs    |  6 +-
 .../src/engine_api/json_structures.rs         |  8 ---
 beacon_node/execution_layer/src/lib.rs        |  6 --
 .../src/test_utils/mock_execution_layer.rs    |  3 -
 beacon_node/store/Cargo.toml                  |  1 -
 beacon_node/store/src/partial_beacon_state.rs | 64 -------------------
 common/eth2/Cargo.toml                        |  1 -
 consensus/state_processing/Cargo.toml         |  1 -
 .../src/per_block_processing.rs               |  9 ++-
 .../block_signature_verifier.rs               |  2 -
 .../process_operations.rs                     |  4 +-
 .../state_processing/src/upgrade/capella.rs   |  2 -
 .../state_processing/src/upgrade/eip4844.rs   | 10 +--
 consensus/types/Cargo.toml                    |  1 -
 consensus/types/src/beacon_block.rs           |  2 -
 consensus/types/src/beacon_block_body.rs      |  9 ---
 consensus/types/src/beacon_state.rs           |  2 -
 .../types/src/beacon_state/tree_hash_cache.rs |  2 -
 consensus/types/src/execution_payload.rs      |  1 -
 .../types/src/execution_payload_header.rs     |  5 --
 consensus/types/src/payload.rs                |  6 --
 consensus/types/src/signed_beacon_block.rs    |  4 --
 lighthouse/Cargo.toml                         |  2 -
 testing/ef_tests/src/cases/operations.rs      | 10 +--
 testing/ef_tests/src/lib.rs                   |  2 +-
 testing/ef_tests/tests/tests.rs               |  4 +-
 .../execution_engine_integration/Cargo.toml   |  3 +-
 35 files changed, 29 insertions(+), 188 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 25d2cdab30..c0a02adf4e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -66,7 +66,7 @@ jobs:
             DOCKER_CLI_EXPERIMENTAL: enabled
             VERSION: ${{ needs.extract-version.outputs.VERSION }}
             VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
-            CROSS_FEATURES: withdrawals,withdrawals-processing
+            CROSS_FEATURES: withdrawals-processing
         steps:
             - uses: actions/checkout@v3
             - name: Update Rust
diff --git a/Makefile b/Makefile
index 56e05fffcb..15d09c5867 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ CROSS_FEATURES ?= gnosis,slasher-lmdb,slasher-mdbx
 CROSS_PROFILE ?= release
 
 # List of features to use when running EF tests.
-EF_TEST_FEATURES ?= beacon_chain/withdrawals,beacon_chain/withdrawals-processing
+EF_TEST_FEATURES ?= beacon_chain/withdrawals-processing
 
 # Cargo profile for regular builds.
 PROFILE ?= release
diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml
index 309d7a83f7..bed32011f1 100644
--- a/beacon_node/Cargo.toml
+++ b/beacon_node/Cargo.toml
@@ -13,7 +13,6 @@ node_test_rig = { path = "../testing/node_test_rig" }
 
 [features]
 write_ssz_files = ["beacon_chain/write_ssz_files"]  # Writes debugging .ssz files to /tmp during block processing.
-withdrawals = ["beacon_chain/withdrawals", "types/withdrawals", "store/withdrawals", "execution_layer/withdrawals"]
 withdrawals-processing = [
     "beacon_chain/withdrawals-processing",
     "store/withdrawals-processing",
diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml
index 6d768476e6..a6ac660379 100644
--- a/beacon_node/beacon_chain/Cargo.toml
+++ b/beacon_node/beacon_chain/Cargo.toml
@@ -10,7 +10,6 @@ default = ["participation_metrics"]
 write_ssz_files = []  # Writes debugging .ssz files to /tmp during block processing.
 participation_metrics = []  # Exposes validator participation metrics to Prometheus.
 fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable
-withdrawals = ["state_processing/withdrawals", "types/withdrawals", "store/withdrawals", "execution_layer/withdrawals"]
 withdrawals-processing = [
     "state_processing/withdrawals-processing",
     "store/withdrawals-processing",
diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index 17e0a6f121..5c0311736c 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -79,14 +79,12 @@ use slasher::Slasher;
 use slog::{crit, debug, error, info, trace, warn, Logger};
 use slot_clock::SlotClock;
 use ssz::Encode;
-#[cfg(feature = "withdrawals")]
-use state_processing::per_block_processing::get_expected_withdrawals;
 use state_processing::{
     common::get_attesting_indices_from_state,
     per_block_processing,
     per_block_processing::{
-        errors::AttestationValidationError, verify_attestation_for_block_inclusion,
-        VerifySignatures,
+        errors::AttestationValidationError, get_expected_withdrawals,
+        verify_attestation_for_block_inclusion, VerifySignatures,
     },
     per_slot_processing,
     state_advance::{complete_state_advance, partial_state_advance},
@@ -287,7 +285,6 @@ struct PartialBeaconBlock<E: EthSpec, Payload: AbstractExecPayload<E>> {
     voluntary_exits: Vec<SignedVoluntaryExit>,
     sync_aggregate: Option<SyncAggregate<E>>,
     prepare_payload_handle: Option<PreparePayloadHandle<E, Payload>>,
-    #[cfg(feature = "withdrawals")]
     bls_to_execution_changes: Vec<SignedBlsToExecutionChange>,
 }
 
@@ -4182,7 +4179,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         let eth1_data = eth1_chain.eth1_data_for_block_production(&state, &self.spec)?;
         let deposits = eth1_chain.deposits_for_block_inclusion(&state, &eth1_data, &self.spec)?;
 
-        #[cfg(feature = "withdrawals")]
         let bls_to_execution_changes = self
             .op_pool
             .get_bls_to_execution_changes(&state, &self.spec);
@@ -4345,7 +4341,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             voluntary_exits,
             sync_aggregate,
             prepare_payload_handle,
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
         })
     }
@@ -4375,7 +4370,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             // this function. We can assume that the handle has already been consumed in order to
             // produce said `execution_payload`.
             prepare_payload_handle: _,
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
         } = partial_beacon_block;
 
@@ -4460,7 +4454,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                         .to_payload()
                         .try_into()
                         .map_err(|_| BlockProductionError::InvalidPayloadFork)?,
-                    #[cfg(feature = "withdrawals")]
                     bls_to_execution_changes: bls_to_execution_changes.into(),
                 },
             }),
@@ -4485,7 +4478,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                         .to_payload()
                         .try_into()
                         .map_err(|_| BlockProductionError::InvalidPayloadFork)?,
-                    #[cfg(feature = "withdrawals")]
                     bls_to_execution_changes: bls_to_execution_changes.into(),
                     //FIXME(sean) get blobs
                     blob_kzg_commitments: VariableList::from(kzg_commitments),
@@ -4743,7 +4735,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             return Ok(());
         }
 
-        #[cfg(feature = "withdrawals")]
         let withdrawals = match self.spec.fork_name_at_slot::<T::EthSpec>(prepare_slot) {
             ForkName::Base | ForkName::Altair | ForkName::Merge => None,
             ForkName::Capella | ForkName::Eip4844 => {
@@ -4778,10 +4769,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             execution_layer
                 .get_suggested_fee_recipient(proposer as u64)
                 .await,
-            #[cfg(feature = "withdrawals")]
             withdrawals,
-            #[cfg(not(feature = "withdrawals"))]
-            None,
         );
 
         debug!(
diff --git a/beacon_node/beacon_chain/src/execution_payload.rs b/beacon_node/beacon_chain/src/execution_payload.rs
index 1982bdbf02..d52df4853d 100644
--- a/beacon_node/beacon_chain/src/execution_payload.rs
+++ b/beacon_node/beacon_chain/src/execution_payload.rs
@@ -17,11 +17,9 @@ use fork_choice::{InvalidationOperation, PayloadVerificationStatus};
 use proto_array::{Block as ProtoBlock, ExecutionStatus};
 use slog::debug;
 use slot_clock::SlotClock;
-#[cfg(feature = "withdrawals")]
-use state_processing::per_block_processing::get_expected_withdrawals;
 use state_processing::per_block_processing::{
-    compute_timestamp_at_slot, is_execution_enabled, is_merge_transition_complete,
-    partially_verify_execution_payload,
+    compute_timestamp_at_slot, get_expected_withdrawals, is_execution_enabled,
+    is_merge_transition_complete, partially_verify_execution_payload,
 };
 use std::sync::Arc;
 use tokio::task::JoinHandle;
@@ -382,7 +380,6 @@ pub fn get_execution_payload<
     let random = *state.get_randao_mix(current_epoch)?;
     let latest_execution_payload_header_block_hash =
         state.latest_execution_payload_header()?.block_hash();
-    #[cfg(feature = "withdrawals")]
     let withdrawals = match state {
         &BeaconState::Capella(_) | &BeaconState::Eip4844(_) => {
             Some(get_expected_withdrawals(state, spec)?.into())
@@ -407,7 +404,6 @@ pub fn get_execution_payload<
                     proposer_index,
                     latest_execution_payload_header_block_hash,
                     builder_params,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals,
                 )
                 .await
@@ -442,7 +438,7 @@ pub async fn prepare_execution_payload<T, Payload>(
     proposer_index: u64,
     latest_execution_payload_header_block_hash: ExecutionBlockHash,
     builder_params: BuilderParams,
-    #[cfg(feature = "withdrawals")] withdrawals: Option<Vec<Withdrawal>>,
+    withdrawals: Option<Vec<Withdrawal>>,
 ) -> Result<BlockProposalContents<T::EthSpec, Payload>, BlockProductionError>
 where
     T: BeaconChainTypes,
@@ -504,15 +500,8 @@ where
     let suggested_fee_recipient = execution_layer
         .get_suggested_fee_recipient(proposer_index)
         .await;
-    let payload_attributes = PayloadAttributes::new(
-        timestamp,
-        random,
-        suggested_fee_recipient,
-        #[cfg(feature = "withdrawals")]
-        withdrawals,
-        #[cfg(not(feature = "withdrawals"))]
-        None,
-    );
+    let payload_attributes =
+        PayloadAttributes::new(timestamp, random, suggested_fee_recipient, withdrawals);
 
     // Note: the suggested_fee_recipient is stored in the `execution_layer`, it will add this parameter.
     //
diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml
index b3bdc54d02..47c1e0341b 100644
--- a/beacon_node/execution_layer/Cargo.toml
+++ b/beacon_node/execution_layer/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-withdrawals = ["state_processing/withdrawals", "types/withdrawals", "eth2/withdrawals"]
 withdrawals-processing = ["state_processing/withdrawals-processing", "eth2/withdrawals-processing"]
 
 [dependencies]
diff --git a/beacon_node/execution_layer/src/engine_api.rs b/beacon_node/execution_layer/src/engine_api.rs
index 424ca30d13..80cdeacb34 100644
--- a/beacon_node/execution_layer/src/engine_api.rs
+++ b/beacon_node/execution_layer/src/engine_api.rs
@@ -165,7 +165,6 @@ pub struct ExecutionBlockWithTransactions<T: EthSpec> {
     #[serde(rename = "hash")]
     pub block_hash: ExecutionBlockHash,
     pub transactions: Vec<Transaction>,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     pub withdrawals: Vec<JsonWithdrawal>,
 }
@@ -215,7 +214,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for ExecutionBlockWithTransactions
                         .iter()
                         .map(|tx| Transaction::decode(&Rlp::new(tx)))
                         .collect::<Result<Vec<_>, _>>()?,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals: Vec::from(block.withdrawals)
                         .into_iter()
                         .map(|withdrawal| withdrawal.into())
@@ -243,7 +241,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for ExecutionBlockWithTransactions
                         .iter()
                         .map(|tx| Transaction::decode(&Rlp::new(tx)))
                         .collect::<Result<Vec<_>, _>>()?,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals: Vec::from(block.withdrawals)
                         .into_iter()
                         .map(|withdrawal| withdrawal.into())
diff --git a/beacon_node/execution_layer/src/engine_api/http.rs b/beacon_node/execution_layer/src/engine_api/http.rs
index 1616b21634..29f66393e5 100644
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -852,11 +852,11 @@ impl HttpJsonRpc {
     pub async fn supported_apis_v1(&self) -> Result<SupportedApis, Error> {
         Ok(SupportedApis {
             new_payload_v1: true,
-            new_payload_v2: cfg!(all(feature = "withdrawals", not(test))),
+            new_payload_v2: cfg!(not(test)),
             forkchoice_updated_v1: true,
-            forkchoice_updated_v2: cfg!(all(feature = "withdrawals", not(test))),
+            forkchoice_updated_v2: cfg!(not(test)),
             get_payload_v1: true,
-            get_payload_v2: cfg!(all(feature = "withdrawals", not(test))),
+            get_payload_v2: cfg!(not(test)),
             exchange_transition_configuration_v1: true,
         })
     }
diff --git a/beacon_node/execution_layer/src/engine_api/json_structures.rs b/beacon_node/execution_layer/src/engine_api/json_structures.rs
index 18e52eb06f..13948affb5 100644
--- a/beacon_node/execution_layer/src/engine_api/json_structures.rs
+++ b/beacon_node/execution_layer/src/engine_api/json_structures.rs
@@ -166,7 +166,6 @@ impl<T: EthSpec> JsonExecutionPayload<T> {
                     base_fee_per_gas: v2.base_fee_per_gas,
                     block_hash: v2.block_hash,
                     transactions: v2.transactions,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals: v2
                         .withdrawals
                         .map(|v| {
@@ -194,7 +193,6 @@ impl<T: EthSpec> JsonExecutionPayload<T> {
                     excess_data_gas: v2.excess_data_gas.ok_or_else(|| Error::BadConversion("Null `excess_data_gas` field converting JsonExecutionPayloadV2 -> ExecutionPayloadEip4844".to_string()))?,
                     block_hash: v2.block_hash,
                     transactions: v2.transactions,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals: v2
                         .withdrawals
                         .map(|v| {
@@ -282,7 +280,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for JsonExecutionPayloadV2<T> {
                 excess_data_gas: None,
                 block_hash: capella.block_hash,
                 transactions: capella.transactions,
-                #[cfg(feature = "withdrawals")]
                 withdrawals: Some(
                     Vec::from(capella.withdrawals)
                         .into_iter()
@@ -290,8 +287,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for JsonExecutionPayloadV2<T> {
                         .collect::<Vec<_>>()
                         .into(),
                 ),
-                #[cfg(not(feature = "withdrawals"))]
-                withdrawals: None,
             }),
             ExecutionPayload::Eip4844(eip4844) => Ok(JsonExecutionPayloadV2 {
                 parent_hash: eip4844.parent_hash,
@@ -309,7 +304,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for JsonExecutionPayloadV2<T> {
                 excess_data_gas: Some(eip4844.excess_data_gas),
                 block_hash: eip4844.block_hash,
                 transactions: eip4844.transactions,
-                #[cfg(feature = "withdrawals")]
                 withdrawals: Some(
                     Vec::from(eip4844.withdrawals)
                         .into_iter()
@@ -317,8 +311,6 @@ impl<T: EthSpec> TryFrom<ExecutionPayload<T>> for JsonExecutionPayloadV2<T> {
                         .collect::<Vec<_>>()
                         .into(),
                 ),
-                #[cfg(not(feature = "withdrawals"))]
-                withdrawals: None,
             }),
         }
     }
diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
index 1761af09e8..e22da42a72 100644
--- a/beacon_node/execution_layer/src/lib.rs
+++ b/beacon_node/execution_layer/src/lib.rs
@@ -1633,7 +1633,6 @@ impl<T: EthSpec> ExecutionLayer<T> {
                 })
             }
             ExecutionBlockWithTransactions::Capella(capella_block) => {
-                #[cfg(feature = "withdrawals")]
                 let withdrawals = VariableList::new(
                     capella_block
                         .withdrawals
@@ -1642,7 +1641,6 @@ impl<T: EthSpec> ExecutionLayer<T> {
                         .collect(),
                 )
                 .map_err(ApiError::DeserializeWithdrawals)?;
-
                 ExecutionPayload::Capella(ExecutionPayloadCapella {
                     parent_hash: capella_block.parent_hash,
                     fee_recipient: capella_block.fee_recipient,
@@ -1658,12 +1656,10 @@ impl<T: EthSpec> ExecutionLayer<T> {
                     base_fee_per_gas: capella_block.base_fee_per_gas,
                     block_hash: capella_block.block_hash,
                     transactions,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals,
                 })
             }
             ExecutionBlockWithTransactions::Eip4844(eip4844_block) => {
-                #[cfg(feature = "withdrawals")]
                 let withdrawals = VariableList::new(
                     eip4844_block
                         .withdrawals
@@ -1672,7 +1668,6 @@ impl<T: EthSpec> ExecutionLayer<T> {
                         .collect(),
                 )
                 .map_err(ApiError::DeserializeWithdrawals)?;
-
                 ExecutionPayload::Eip4844(ExecutionPayloadEip4844 {
                     parent_hash: eip4844_block.parent_hash,
                     fee_recipient: eip4844_block.fee_recipient,
@@ -1689,7 +1684,6 @@ impl<T: EthSpec> ExecutionLayer<T> {
                     excess_data_gas: eip4844_block.excess_data_gas,
                     block_hash: eip4844_block.block_hash,
                     transactions,
-                    #[cfg(feature = "withdrawals")]
                     withdrawals,
                 })
             }
diff --git a/beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs b/beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs
index f0f8449125..e552b7ca7a 100644
--- a/beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs
+++ b/beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs
@@ -103,10 +103,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
             prev_randao,
             Address::repeat_byte(42),
             // FIXME: think about how to handle different forks / withdrawals here..
-            #[cfg(feature = "withdrawals")]
             Some(vec![]),
-            #[cfg(not(feature = "withdrawals"))]
-            None,
         );
 
         // Insert a proposer to ensure the fork choice updated command works.
diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml
index b3e8e1fc6b..897f6b020c 100644
--- a/beacon_node/store/Cargo.toml
+++ b/beacon_node/store/Cargo.toml
@@ -28,5 +28,4 @@ directory = { path = "../../common/directory" }
 strum = { version = "0.24.0", features = ["derive"] }
 
 [features]
-withdrawals = ["state_processing/withdrawals", "types/withdrawals"]
 withdrawals-processing = ["state_processing/withdrawals-processing"]
\ No newline at end of file
diff --git a/beacon_node/store/src/partial_beacon_state.rs b/beacon_node/store/src/partial_beacon_state.rs
index 12c5628496..ca35bc0b22 100644
--- a/beacon_node/store/src/partial_beacon_state.rs
+++ b/beacon_node/store/src/partial_beacon_state.rs
@@ -105,10 +105,8 @@ where
     pub latest_execution_payload_header: ExecutionPayloadHeaderEip4844<T>,
 
     // Withdrawals
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     pub next_withdrawal_index: u64,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     pub next_withdrawal_validator_index: u64,
 }
@@ -199,7 +197,6 @@ impl<T: EthSpec> PartialBeaconState<T> {
                     latest_execution_payload_header
                 ]
             ),
-            #[cfg(feature = "withdrawals")]
             BeaconState::Capella(s) => impl_from_state_forgetful!(
                 s,
                 outer,
@@ -216,22 +213,6 @@ impl<T: EthSpec> PartialBeaconState<T> {
                     next_withdrawal_validator_index
                 ]
             ),
-            #[cfg(not(feature = "withdrawals"))]
-            BeaconState::Capella(s) => impl_from_state_forgetful!(
-                s,
-                outer,
-                Capella,
-                PartialBeaconStateCapella,
-                [
-                    previous_epoch_participation,
-                    current_epoch_participation,
-                    current_sync_committee,
-                    next_sync_committee,
-                    inactivity_scores,
-                    latest_execution_payload_header
-                ]
-            ),
-            #[cfg(feature = "withdrawals")]
             BeaconState::Eip4844(s) => impl_from_state_forgetful!(
                 s,
                 outer,
@@ -248,21 +229,6 @@ impl<T: EthSpec> PartialBeaconState<T> {
                     next_withdrawal_validator_index
                 ]
             ),
-            #[cfg(not(feature = "withdrawals"))]
-            BeaconState::Eip4844(s) => impl_from_state_forgetful!(
-                s,
-                outer,
-                Eip4844,
-                PartialBeaconStateEip4844,
-                [
-                    previous_epoch_participation,
-                    current_epoch_participation,
-                    current_sync_committee,
-                    next_sync_committee,
-                    inactivity_scores,
-                    latest_execution_payload_header
-                ]
-            ),
         }
     }
 
@@ -450,7 +416,6 @@ impl<E: EthSpec> TryInto<BeaconState<E>> for PartialBeaconState<E> {
                     latest_execution_payload_header
                 ]
             ),
-            #[cfg(feature = "withdrawals")]
             PartialBeaconState::Capella(inner) => impl_try_into_beacon_state!(
                 inner,
                 Capella,
@@ -466,21 +431,6 @@ impl<E: EthSpec> TryInto<BeaconState<E>> for PartialBeaconState<E> {
                     next_withdrawal_validator_index
                 ]
             ),
-            #[cfg(not(feature = "withdrawals"))]
-            PartialBeaconState::Capella(inner) => impl_try_into_beacon_state!(
-                inner,
-                Capella,
-                BeaconStateCapella,
-                [
-                    previous_epoch_participation,
-                    current_epoch_participation,
-                    current_sync_committee,
-                    next_sync_committee,
-                    inactivity_scores,
-                    latest_execution_payload_header
-                ]
-            ),
-            #[cfg(feature = "withdrawals")]
             PartialBeaconState::Eip4844(inner) => impl_try_into_beacon_state!(
                 inner,
                 Eip4844,
@@ -496,20 +446,6 @@ impl<E: EthSpec> TryInto<BeaconState<E>> for PartialBeaconState<E> {
                     next_withdrawal_validator_index
                 ]
             ),
-            #[cfg(not(feature = "withdrawals"))]
-            PartialBeaconState::Eip4844(inner) => impl_try_into_beacon_state!(
-                inner,
-                Eip4844,
-                BeaconStateEip4844,
-                [
-                    previous_epoch_participation,
-                    current_epoch_participation,
-                    current_sync_committee,
-                    next_sync_committee,
-                    inactivity_scores,
-                    latest_execution_payload_header
-                ]
-            ),
         };
         Ok(state)
     }
diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml
index 6ee02b71ba..fc5eba98e2 100644
--- a/common/eth2/Cargo.toml
+++ b/common/eth2/Cargo.toml
@@ -35,5 +35,4 @@ procinfo = { version = "0.4.2", optional = true }
 [features]
 default = ["lighthouse"]
 lighthouse = ["proto_array", "psutil", "procinfo", "store", "slashing_protection"]
-withdrawals = ["store/withdrawals"]
 withdrawals-processing = ["store/withdrawals-processing"]
\ No newline at end of file
diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml
index 39a0be3d9f..0b79539877 100644
--- a/consensus/state_processing/Cargo.toml
+++ b/consensus/state_processing/Cargo.toml
@@ -43,5 +43,4 @@ arbitrary-fuzz = [
   "eth2_ssz_types/arbitrary",
   "tree_hash/arbitrary",
 ]
-withdrawals = ["types/withdrawals"]
 withdrawals-processing = []
diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs
index 7af74428b5..f1a544099f 100644
--- a/consensus/state_processing/src/per_block_processing.rs
+++ b/consensus/state_processing/src/per_block_processing.rs
@@ -19,7 +19,7 @@ pub use process_operations::process_operations;
 pub use verify_attestation::{
     verify_attestation_for_block_inclusion, verify_attestation_for_state,
 };
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 pub use verify_bls_to_execution_change::verify_bls_to_execution_change;
 pub use verify_deposit::{
     get_existing_validator_index, verify_deposit_merkle_proof, verify_deposit_signature,
@@ -36,7 +36,7 @@ pub mod signature_sets;
 pub mod tests;
 mod verify_attestation;
 mod verify_attester_slashing;
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 mod verify_bls_to_execution_change;
 mod verify_deposit;
 mod verify_exit;
@@ -165,7 +165,7 @@ pub fn per_block_processing<T: EthSpec, Payload: AbstractExecPayload<T>>(
     // previous block.
     if is_execution_enabled(state, block.body()) {
         let payload = block.body().execution_payload()?;
-        #[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+        #[cfg(feature = "withdrawals-processing")]
         process_withdrawals::<T, Payload>(state, payload, spec)?;
         process_execution_payload::<T, Payload>(state, payload, spec)?;
     }
@@ -469,7 +469,6 @@ pub fn compute_timestamp_at_slot<T: EthSpec>(
 /// Compute the next batch of withdrawals which should be included in a block.
 ///
 /// https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/beacon-chain.md#new-get_expected_withdrawals
-#[cfg(feature = "withdrawals")]
 pub fn get_expected_withdrawals<T: EthSpec>(
     state: &BeaconState<T>,
     spec: &ChainSpec,
@@ -525,7 +524,7 @@ pub fn get_expected_withdrawals<T: EthSpec>(
 }
 
 /// Apply withdrawals to the state.
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 pub fn process_withdrawals<'payload, T: EthSpec, Payload: AbstractExecPayload<T>>(
     state: &mut BeaconState<T>,
     payload: Payload::Ref<'payload>,
diff --git a/consensus/state_processing/src/per_block_processing/block_signature_verifier.rs b/consensus/state_processing/src/per_block_processing/block_signature_verifier.rs
index 50bfbfdc45..bbf2c1caa5 100644
--- a/consensus/state_processing/src/per_block_processing/block_signature_verifier.rs
+++ b/consensus/state_processing/src/per_block_processing/block_signature_verifier.rs
@@ -170,7 +170,6 @@ where
         // Deposits are not included because they can legally have invalid signatures.
         self.include_exits(block)?;
         self.include_sync_aggregate(block)?;
-        #[cfg(feature = "withdrawals")]
         self.include_bls_to_execution_changes(block)?;
 
         Ok(())
@@ -345,7 +344,6 @@ where
     }
 
     /// Include the signature of the block's BLS to execution changes for verification.
-    #[cfg(feature = "withdrawals")]
     pub fn include_bls_to_execution_changes<Payload: AbstractExecPayload<T>>(
         &mut self,
         block: &'a SignedBeaconBlock<T, Payload>,
diff --git a/consensus/state_processing/src/per_block_processing/process_operations.rs b/consensus/state_processing/src/per_block_processing/process_operations.rs
index 105faba83b..f27fd48b4f 100644
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -34,7 +34,7 @@ pub fn process_operations<'a, T: EthSpec, Payload: AbstractExecPayload<T>>(
     process_deposits(state, block_body.deposits(), spec)?;
     process_exits(state, block_body.voluntary_exits(), verify_signatures, spec)?;
 
-    #[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+    #[cfg(feature = "withdrawals-processing")]
     if let Ok(bls_to_execution_changes) = block_body.bls_to_execution_changes() {
         process_bls_to_execution_changes(state, bls_to_execution_changes, verify_signatures, spec)?;
     }
@@ -295,7 +295,7 @@ pub fn process_exits<T: EthSpec>(
 ///
 /// Returns `Ok(())` if the validation and state updates completed successfully. Otherwise returns
 /// an `Err` describing the invalid object or cause of failure.
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 pub fn process_bls_to_execution_changes<T: EthSpec>(
     state: &mut BeaconState<T>,
     bls_to_execution_changes: &[SignedBlsToExecutionChange],
diff --git a/consensus/state_processing/src/upgrade/capella.rs b/consensus/state_processing/src/upgrade/capella.rs
index 9a88369883..dc759b384d 100644
--- a/consensus/state_processing/src/upgrade/capella.rs
+++ b/consensus/state_processing/src/upgrade/capella.rs
@@ -56,9 +56,7 @@ pub fn upgrade_to_capella<E: EthSpec>(
         // Execution
         latest_execution_payload_header: pre.latest_execution_payload_header.upgrade_to_capella(),
         // Withdrawals
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_index: 0,
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_validator_index: 0,
         // Caches
         total_active_balance: pre.total_active_balance,
diff --git a/consensus/state_processing/src/upgrade/eip4844.rs b/consensus/state_processing/src/upgrade/eip4844.rs
index 6d66fd8412..131100bb38 100644
--- a/consensus/state_processing/src/upgrade/eip4844.rs
+++ b/consensus/state_processing/src/upgrade/eip4844.rs
@@ -10,12 +10,8 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
     let pre = pre_state.as_capella_mut()?;
 
     // FIXME(sean) This is a hack to let us participate in testnets where capella doesn't exist.
-    // if we are disabling withdrawals, assume we should fork off of bellatrix.
-    let previous_fork_version = if cfg!(feature = "withdrawals") {
-        pre.fork.current_version
-    } else {
-        spec.bellatrix_fork_version
-    };
+    // let previous_fork_version = spec.bellatrix_fork_version;
+    let previous_fork_version = pre.fork.current_version;
 
     // Where possible, use something like `mem::take` to move fields from behind the &mut
     // reference. For other fields that don't have a good default value, use `clone`.
@@ -64,9 +60,7 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
         // Execution
         latest_execution_payload_header: pre.latest_execution_payload_header.upgrade_to_eip4844(),
         // Withdrawals
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_index: pre.next_withdrawal_index,
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_validator_index: pre.next_withdrawal_validator_index,
         // Caches
         total_active_balance: pre.total_active_balance,
diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
index b3ef3ae382..671cacfa2e 100644
--- a/consensus/types/Cargo.toml
+++ b/consensus/types/Cargo.toml
@@ -72,4 +72,3 @@ arbitrary-fuzz = [
   "swap_or_not_shuffle/arbitrary",
   "tree_hash/arbitrary",
 ]
-withdrawals = []
diff --git a/consensus/types/src/beacon_block.rs b/consensus/types/src/beacon_block.rs
index 124cb08bcc..fd38e9faf2 100644
--- a/consensus/types/src/beacon_block.rs
+++ b/consensus/types/src/beacon_block.rs
@@ -502,7 +502,6 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> EmptyBlock for BeaconBlockCape
                 voluntary_exits: VariableList::empty(),
                 sync_aggregate: SyncAggregate::empty(),
                 execution_payload: Payload::Capella::default(),
-                #[cfg(feature = "withdrawals")]
                 bls_to_execution_changes: VariableList::empty(),
             },
         }
@@ -532,7 +531,6 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> EmptyBlock for BeaconBlockEip4
                 voluntary_exits: VariableList::empty(),
                 sync_aggregate: SyncAggregate::empty(),
                 execution_payload: Payload::Eip4844::default(),
-                #[cfg(feature = "withdrawals")]
                 bls_to_execution_changes: VariableList::empty(),
                 blob_kzg_commitments: VariableList::empty(),
             },
diff --git a/consensus/types/src/beacon_block_body.rs b/consensus/types/src/beacon_block_body.rs
index 1dd938ac46..dbdbcddb1b 100644
--- a/consensus/types/src/beacon_block_body.rs
+++ b/consensus/types/src/beacon_block_body.rs
@@ -62,7 +62,6 @@ pub struct BeaconBlockBody<T: EthSpec, Payload: AbstractExecPayload<T> = FullPay
     #[superstruct(only(Eip4844), partial_getter(rename = "execution_payload_eip4844"))]
     #[serde(flatten)]
     pub execution_payload: Payload::Eip4844,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     pub bls_to_execution_changes:
         VariableList<SignedBlsToExecutionChange, T::MaxBlsToExecutionChanges>,
@@ -301,7 +300,6 @@ impl<E: EthSpec> From<BeaconBlockBodyCapella<E, FullPayload<E>>>
             voluntary_exits,
             sync_aggregate,
             execution_payload: FullPayloadCapella { execution_payload },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
         } = body;
 
@@ -319,7 +317,6 @@ impl<E: EthSpec> From<BeaconBlockBodyCapella<E, FullPayload<E>>>
                 execution_payload: BlindedPayloadCapella {
                     execution_payload_header: From::from(execution_payload.clone()),
                 },
-                #[cfg(feature = "withdrawals")]
                 bls_to_execution_changes,
             },
             Some(execution_payload),
@@ -345,7 +342,6 @@ impl<E: EthSpec> From<BeaconBlockBodyEip4844<E, FullPayload<E>>>
             voluntary_exits,
             sync_aggregate,
             execution_payload: FullPayloadEip4844 { execution_payload },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
             blob_kzg_commitments,
         } = body;
@@ -364,7 +360,6 @@ impl<E: EthSpec> From<BeaconBlockBodyEip4844<E, FullPayload<E>>>
                 execution_payload: BlindedPayloadEip4844 {
                     execution_payload_header: From::from(execution_payload.clone()),
                 },
-                #[cfg(feature = "withdrawals")]
                 bls_to_execution_changes,
                 blob_kzg_commitments,
             },
@@ -433,7 +428,6 @@ impl<E: EthSpec> BeaconBlockBodyCapella<E, FullPayload<E>> {
             voluntary_exits,
             sync_aggregate,
             execution_payload: FullPayloadCapella { execution_payload },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
         } = self;
 
@@ -450,7 +444,6 @@ impl<E: EthSpec> BeaconBlockBodyCapella<E, FullPayload<E>> {
             execution_payload: BlindedPayloadCapella {
                 execution_payload_header: From::from(execution_payload.clone()),
             },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes: bls_to_execution_changes.clone(),
         }
     }
@@ -469,7 +462,6 @@ impl<E: EthSpec> BeaconBlockBodyEip4844<E, FullPayload<E>> {
             voluntary_exits,
             sync_aggregate,
             execution_payload: FullPayloadEip4844 { execution_payload },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes,
             blob_kzg_commitments,
         } = self;
@@ -487,7 +479,6 @@ impl<E: EthSpec> BeaconBlockBodyEip4844<E, FullPayload<E>> {
             execution_payload: BlindedPayloadEip4844 {
                 execution_payload_header: From::from(execution_payload.clone()),
             },
-            #[cfg(feature = "withdrawals")]
             bls_to_execution_changes: bls_to_execution_changes.clone(),
             blob_kzg_commitments: blob_kzg_commitments.clone(),
         }
diff --git a/consensus/types/src/beacon_state.rs b/consensus/types/src/beacon_state.rs
index 48a83f94f4..b3eff7374b 100644
--- a/consensus/types/src/beacon_state.rs
+++ b/consensus/types/src/beacon_state.rs
@@ -297,10 +297,8 @@ where
     pub latest_execution_payload_header: ExecutionPayloadHeaderEip4844<T>,
 
     // Withdrawals
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844), partial_getter(copy))]
     pub next_withdrawal_index: u64,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844), partial_getter(copy))]
     pub next_withdrawal_validator_index: u64,
 
diff --git a/consensus/types/src/beacon_state/tree_hash_cache.rs b/consensus/types/src/beacon_state/tree_hash_cache.rs
index 30dd9f8d6b..4cfc684f4d 100644
--- a/consensus/types/src/beacon_state/tree_hash_cache.rs
+++ b/consensus/types/src/beacon_state/tree_hash_cache.rs
@@ -336,11 +336,9 @@ impl<T: EthSpec> BeaconTreeHashCacheInner<T> {
         }
 
         // Withdrawal indices (Capella and later).
-        #[cfg(feature = "withdrawals")]
         if let Ok(next_withdrawal_index) = state.next_withdrawal_index() {
             hasher.write(next_withdrawal_index.tree_hash_root().as_bytes())?;
         }
-        #[cfg(feature = "withdrawals")]
         if let Ok(next_withdrawal_validator_index) = state.next_withdrawal_validator_index() {
             hasher.write(next_withdrawal_validator_index.tree_hash_root().as_bytes())?;
         }
diff --git a/consensus/types/src/execution_payload.rs b/consensus/types/src/execution_payload.rs
index 18005094e4..45f52fb65a 100644
--- a/consensus/types/src/execution_payload.rs
+++ b/consensus/types/src/execution_payload.rs
@@ -80,7 +80,6 @@ pub struct ExecutionPayload<T: EthSpec> {
     pub block_hash: ExecutionBlockHash,
     #[serde(with = "ssz_types::serde_utils::list_of_hex_var_list")]
     pub transactions: Transactions<T>,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     pub withdrawals: Withdrawals<T>,
 }
diff --git a/consensus/types/src/execution_payload_header.rs b/consensus/types/src/execution_payload_header.rs
index a98a68e3e5..e2c23389a1 100644
--- a/consensus/types/src/execution_payload_header.rs
+++ b/consensus/types/src/execution_payload_header.rs
@@ -75,7 +75,6 @@ pub struct ExecutionPayloadHeader<T: EthSpec> {
     pub block_hash: ExecutionBlockHash,
     #[superstruct(getter(copy))]
     pub transactions_root: Hash256,
-    #[cfg(feature = "withdrawals")]
     #[superstruct(only(Capella, Eip4844))]
     #[superstruct(getter(copy))]
     pub withdrawals_root: Hash256,
@@ -128,7 +127,6 @@ impl<T: EthSpec> ExecutionPayloadHeaderMerge<T> {
             base_fee_per_gas: self.base_fee_per_gas,
             block_hash: self.block_hash,
             transactions_root: self.transactions_root,
-            #[cfg(feature = "withdrawals")]
             withdrawals_root: Hash256::zero(),
         }
     }
@@ -153,7 +151,6 @@ impl<T: EthSpec> ExecutionPayloadHeaderCapella<T> {
             excess_data_gas: Uint256::zero(),
             block_hash: self.block_hash,
             transactions_root: self.transactions_root,
-            #[cfg(feature = "withdrawals")]
             withdrawals_root: self.withdrawals_root,
         }
     }
@@ -196,7 +193,6 @@ impl<T: EthSpec> From<ExecutionPayloadCapella<T>> for ExecutionPayloadHeaderCape
             base_fee_per_gas: payload.base_fee_per_gas,
             block_hash: payload.block_hash,
             transactions_root: payload.transactions.tree_hash_root(),
-            #[cfg(feature = "withdrawals")]
             withdrawals_root: payload.withdrawals.tree_hash_root(),
         }
     }
@@ -219,7 +215,6 @@ impl<T: EthSpec> From<ExecutionPayloadEip4844<T>> for ExecutionPayloadHeaderEip4
             excess_data_gas: payload.excess_data_gas,
             block_hash: payload.block_hash,
             transactions_root: payload.transactions.tree_hash_root(),
-            #[cfg(feature = "withdrawals")]
             withdrawals_root: payload.withdrawals.tree_hash_root(),
         }
     }
diff --git a/consensus/types/src/payload.rs b/consensus/types/src/payload.rs
index 2d9e37b81a..8bba00b46d 100644
--- a/consensus/types/src/payload.rs
+++ b/consensus/types/src/payload.rs
@@ -37,7 +37,6 @@ pub trait ExecPayload<T: EthSpec>: Debug + Clone + PartialEq + Hash + TreeHash +
     fn gas_limit(&self) -> u64;
     fn transactions(&self) -> Option<&Transactions<T>>;
     /// fork-specific fields
-    #[cfg(feature = "withdrawals")]
     fn withdrawals_root(&self) -> Result<Hash256, Error>;
 
     /// Is this a default payload with 0x0 roots for transactions and withdrawals?
@@ -241,7 +240,6 @@ impl<T: EthSpec> ExecPayload<T> for FullPayload<T> {
         })
     }
 
-    #[cfg(feature = "withdrawals")]
     fn withdrawals_root(&self) -> Result<Hash256, Error> {
         match self {
             FullPayload::Merge(_) => Err(Error::IncorrectStateVariant),
@@ -343,7 +341,6 @@ impl<'b, T: EthSpec> ExecPayload<T> for FullPayloadRef<'b, T> {
         })
     }
 
-    #[cfg(feature = "withdrawals")]
     fn withdrawals_root(&self) -> Result<Hash256, Error> {
         match self {
             FullPayloadRef::Merge(_) => Err(Error::IncorrectStateVariant),
@@ -523,7 +520,6 @@ impl<T: EthSpec> ExecPayload<T> for BlindedPayload<T> {
         None
     }
 
-    #[cfg(feature = "withdrawals")]
     fn withdrawals_root(&self) -> Result<Hash256, Error> {
         match self {
             BlindedPayload::Merge(_) => Err(Error::IncorrectStateVariant),
@@ -614,7 +610,6 @@ impl<'b, T: EthSpec> ExecPayload<T> for BlindedPayloadRef<'b, T> {
         None
     }
 
-    #[cfg(feature = "withdrawals")]
     fn withdrawals_root(&self) -> Result<Hash256, Error> {
         match self {
             BlindedPayloadRef::Merge(_) => Err(Error::IncorrectStateVariant),
@@ -712,7 +707,6 @@ macro_rules! impl_exec_payload_common {
                 f(self)
             }
 
-            #[cfg(feature = "withdrawals")]
             fn withdrawals_root(&self) -> Result<Hash256, Error> {
                 let g = $g;
                 g(self)
diff --git a/consensus/types/src/signed_beacon_block.rs b/consensus/types/src/signed_beacon_block.rs
index 2a8398f83f..14f9358f61 100644
--- a/consensus/types/src/signed_beacon_block.rs
+++ b/consensus/types/src/signed_beacon_block.rs
@@ -341,7 +341,6 @@ impl<E: EthSpec> SignedBeaconBlockCapella<E, BlindedPayload<E>> {
                             voluntary_exits,
                             sync_aggregate,
                             execution_payload: BlindedPayloadCapella { .. },
-                            #[cfg(feature = "withdrawals")]
                             bls_to_execution_changes,
                         },
                 },
@@ -364,7 +363,6 @@ impl<E: EthSpec> SignedBeaconBlockCapella<E, BlindedPayload<E>> {
                     voluntary_exits,
                     sync_aggregate,
                     execution_payload: FullPayloadCapella { execution_payload },
-                    #[cfg(feature = "withdrawals")]
                     bls_to_execution_changes,
                 },
             },
@@ -397,7 +395,6 @@ impl<E: EthSpec> SignedBeaconBlockEip4844<E, BlindedPayload<E>> {
                             voluntary_exits,
                             sync_aggregate,
                             execution_payload: BlindedPayloadEip4844 { .. },
-                            #[cfg(feature = "withdrawals")]
                             bls_to_execution_changes,
                             blob_kzg_commitments,
                         },
@@ -421,7 +418,6 @@ impl<E: EthSpec> SignedBeaconBlockEip4844<E, BlindedPayload<E>> {
                     voluntary_exits,
                     sync_aggregate,
                     execution_payload: FullPayloadEip4844 { execution_payload },
-                    #[cfg(feature = "withdrawals")]
                     bls_to_execution_changes,
                     blob_kzg_commitments,
                 },
diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml
index 3b4dd57533..2db42d6ec3 100644
--- a/lighthouse/Cargo.toml
+++ b/lighthouse/Cargo.toml
@@ -24,8 +24,6 @@ gnosis = []
 slasher-mdbx = ["slasher/mdbx"]
 # Support slasher LMDB backend.
 slasher-lmdb = ["slasher/lmdb"]
-# Support for inclusion of withdrawals fields in all capella consensus types in all APIs.
-withdrawals = ["types/withdrawals", "beacon_node/withdrawals"]
 # Support for withdrawals consensus processing logic.
 withdrawals-processing = ["beacon_node/withdrawals-processing"]
 
diff --git a/testing/ef_tests/src/cases/operations.rs b/testing/ef_tests/src/cases/operations.rs
index f5487a6940..a08ee1996a 100644
--- a/testing/ef_tests/src/cases/operations.rs
+++ b/testing/ef_tests/src/cases/operations.rs
@@ -4,7 +4,7 @@ use crate::case_result::compare_beacon_state_results_without_caches;
 use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yaml_decode_file};
 use crate::testing_spec;
 use serde_derive::Deserialize;
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 use state_processing::per_block_processing::process_operations::{
     process_bls_to_execution_changes, process_bls_to_execution_changes,
 };
@@ -22,7 +22,7 @@ use state_processing::{
 };
 use std::fmt::Debug;
 use std::path::Path;
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 use types::SignedBlsToExecutionChange;
 use types::{
     Attestation, AttesterSlashing, BeaconBlock, BeaconState, BlindedPayload, ChainSpec, Deposit,
@@ -42,7 +42,7 @@ struct ExecutionMetadata {
 }
 
 /// Newtype for testing withdrawals.
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 #[derive(Debug, Clone, Deserialize)]
 pub struct WithdrawalsPayload<T: EthSpec> {
     payload: FullPayload<T>,
@@ -341,7 +341,7 @@ impl<E: EthSpec> Operation<E> for BlindedPayload<E> {
     }
 }
 
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
     fn handler_name() -> String {
         "withdrawals".into()
@@ -374,7 +374,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
     }
 }
 
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {
     fn handler_name() -> String {
         "bls_to_execution_change".into()
diff --git a/testing/ef_tests/src/lib.rs b/testing/ef_tests/src/lib.rs
index fd3bf2bd1b..a4d4f2d52d 100644
--- a/testing/ef_tests/src/lib.rs
+++ b/testing/ef_tests/src/lib.rs
@@ -1,5 +1,5 @@
 pub use case_result::CaseResult;
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 pub use cases::WithdrawalsPayload;
 pub use cases::{
     Case, EffectiveBalanceUpdates, Eth1DataReset, HistoricalRootsUpdate, InactivityUpdates,
diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs
index 0227b92ec8..66c4f83ece 100644
--- a/testing/ef_tests/tests/tests.rs
+++ b/testing/ef_tests/tests/tests.rs
@@ -82,14 +82,14 @@ fn operations_execution_payload_blinded() {
     OperationsHandler::<MainnetEthSpec, BlindedPayload<_>>::default().run();
 }
 
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 #[test]
 fn operations_withdrawals() {
     OperationsHandler::<MinimalEthSpec, WithdrawalsPayload<_>>::default().run();
     OperationsHandler::<MainnetEthSpec, WithdrawalsPayload<_>>::default().run();
 }
 
-#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+#[cfg(feature = "withdrawals-processing")]
 #[test]
 fn operations_bls_to_execution_change() {
     OperationsHandler::<MinimalEthSpec, SignedBlsToExecutionChange>::default().run();
diff --git a/testing/execution_engine_integration/Cargo.toml b/testing/execution_engine_integration/Cargo.toml
index b5923aafe5..e058d58afb 100644
--- a/testing/execution_engine_integration/Cargo.toml
+++ b/testing/execution_engine_integration/Cargo.toml
@@ -23,5 +23,4 @@ hex = "0.4.2"
 fork_choice = { path = "../../consensus/fork_choice" }
 
 [features]
-default = []
-withdrawals = []
\ No newline at end of file
+default = []
\ No newline at end of file

From 0c22d69e1546bbc35193c602dc55348e343c2a79 Mon Sep 17 00:00:00 2001
From: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
Date: Mon, 19 Dec 2022 19:35:08 -0600
Subject: [PATCH 6/8] Update consensus/state_processing/src/upgrade/eip4844.rs

Co-authored-by: realbigsean <seananderson33@GMAIL.com>
---
 consensus/state_processing/src/upgrade/eip4844.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/consensus/state_processing/src/upgrade/eip4844.rs b/consensus/state_processing/src/upgrade/eip4844.rs
index 131100bb38..92a102ce96 100644
--- a/consensus/state_processing/src/upgrade/eip4844.rs
+++ b/consensus/state_processing/src/upgrade/eip4844.rs
@@ -10,7 +10,6 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
     let pre = pre_state.as_capella_mut()?;
 
     // FIXME(sean) This is a hack to let us participate in testnets where capella doesn't exist.
-    // let previous_fork_version = spec.bellatrix_fork_version;
     let previous_fork_version = pre.fork.current_version;
 
     // Where possible, use something like `mem::take` to move fields from behind the &mut

From b224ed81515167c8632ea6f6c66ef94ead4fdd81 Mon Sep 17 00:00:00 2001
From: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
Date: Mon, 19 Dec 2022 19:35:17 -0600
Subject: [PATCH 7/8] Update consensus/state_processing/src/upgrade/eip4844.rs

Co-authored-by: realbigsean <seananderson33@GMAIL.com>
---
 consensus/state_processing/src/upgrade/eip4844.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/consensus/state_processing/src/upgrade/eip4844.rs b/consensus/state_processing/src/upgrade/eip4844.rs
index 92a102ce96..e829c01e7e 100644
--- a/consensus/state_processing/src/upgrade/eip4844.rs
+++ b/consensus/state_processing/src/upgrade/eip4844.rs
@@ -9,7 +9,6 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
     let epoch = pre_state.current_epoch();
     let pre = pre_state.as_capella_mut()?;
 
-    // FIXME(sean) This is a hack to let us participate in testnets where capella doesn't exist.
     let previous_fork_version = pre.fork.current_version;
 
     // Where possible, use something like `mem::take` to move fields from behind the &mut

From 3d253abadcb9381e95ca6d517ceef80cf707be0b Mon Sep 17 00:00:00 2001
From: Mark Mackey <mark@sigmaprime.io>
Date: Wed, 21 Dec 2022 11:40:21 -0600
Subject: [PATCH 8/8] Fixed spec serialization bug

---
 consensus/types/src/config_and_preset.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/consensus/types/src/config_and_preset.rs b/consensus/types/src/config_and_preset.rs
index 9a618f7cc3..ac93818b9c 100644
--- a/consensus/types/src/config_and_preset.rs
+++ b/consensus/types/src/config_and_preset.rs
@@ -28,6 +28,7 @@ pub struct ConfigAndPreset {
     #[serde(flatten)]
     pub bellatrix_preset: BellatrixPreset,
     #[superstruct(only(Capella))]
+    #[serde(flatten)]
     pub capella_preset: CapellaPreset,
     /// The `extra_fields` map allows us to gracefully decode fields intended for future hard forks.
     #[serde(flatten)]