diff --git a/consensus/state_processing/src/envelope_processing.rs b/consensus/state_processing/src/envelope_processing.rs index 0c48b7efd0..1421e57098 100644 --- a/consensus/state_processing/src/envelope_processing.rs +++ b/consensus/state_processing/src/envelope_processing.rs @@ -237,8 +237,6 @@ pub fn envelope_processing( let amount = payment.withdrawal.amount; if amount > 0 { let exit_queue_epoch = state.compute_exit_epoch_and_update_churn(amount, spec)?; - payment.withdrawal.withdrawable_epoch = - exit_queue_epoch.safe_add(spec.min_validator_withdrawability_delay)?; state .builder_pending_withdrawals_mut()? .push(payment.withdrawal) diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs index d6872a14f1..e1a79ad972 100644 --- a/consensus/state_processing/src/per_block_processing.rs +++ b/consensus/state_processing/src/per_block_processing.rs @@ -832,7 +832,6 @@ pub fn process_execution_payload_bid fee_recipient: bid.fee_recipient, amount, builder_index, - withdrawable_epoch: spec.far_future_epoch, }, }; diff --git a/consensus/state_processing/src/per_epoch_processing/single_pass.rs b/consensus/state_processing/src/per_epoch_processing/single_pass.rs index 57912234a2..c661d6b210 100644 --- a/consensus/state_processing/src/per_epoch_processing/single_pass.rs +++ b/consensus/state_processing/src/per_epoch_processing/single_pass.rs @@ -555,7 +555,6 @@ fn process_builder_pending_payments( exit_queue_epoch.safe_add(spec.min_validator_withdrawability_delay)?; let mut withdrawal = payment.withdrawal.clone(); - withdrawal.withdrawable_epoch = withdrawable_epoch; state.builder_pending_withdrawals_mut()?.push(withdrawal)?; Ok(()) })?; diff --git a/consensus/types/src/builder/builder_pending_withdrawal.rs b/consensus/types/src/builder/builder_pending_withdrawal.rs index 436d331c00..dbbb029a5d 100644 --- a/consensus/types/src/builder/builder_pending_withdrawal.rs +++ b/consensus/types/src/builder/builder_pending_withdrawal.rs @@ -1,5 +1,5 @@ use crate::test_utils::TestRandom; -use crate::{Address, Epoch, ForkName}; +use crate::{Address, ForkName}; use context_deserialize::context_deserialize; use serde::{Deserialize, Serialize}; use ssz_derive::{Decode, Encode}; @@ -29,7 +29,6 @@ pub struct BuilderPendingWithdrawal { pub amount: u64, #[serde(with = "serde_utils::quoted_u64")] pub builder_index: u64, - pub withdrawable_epoch: Epoch, } #[cfg(test)] diff --git a/testing/ef_tests/Makefile b/testing/ef_tests/Makefile index 0ead9d0047..0c6371f825 100644 --- a/testing/ef_tests/Makefile +++ b/testing/ef_tests/Makefile @@ -1,6 +1,6 @@ # To download/extract nightly tests, run: # CONSENSUS_SPECS_TEST_VERSION=nightly make -CONSENSUS_SPECS_TEST_VERSION ?= v1.6.0-beta.1 +CONSENSUS_SPECS_TEST_VERSION ?= v1.7.0-alpha.1 REPO_NAME := consensus-spec-tests OUTPUT_DIR := ./$(REPO_NAME) diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs index a5b2ffada3..3fa0ef09d5 100644 --- a/testing/ef_tests/src/handler.rs +++ b/testing/ef_tests/src/handler.rs @@ -22,7 +22,7 @@ pub trait Handler { // Add forks here to exclude them from EF spec testing. Helpful for adding future or // unspecified forks. fn disabled_forks(&self) -> Vec { - vec![ForkName::Gloas] + vec![] } fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {