Removed withdrawals feature flag

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",

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",

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!(

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.
     //

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]

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())

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,
         })
     }

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,
             }),
         }
     }

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,
                 })
             }

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.

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"]

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)
     }