Skip to content

Add Forkchoice changes for ePBS #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Subhasish-Behera wants to merge 2 commits into
base: epbs
Choose a base branch
from
Open

Add Forkchoice changes for ePBS #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
686ff22
Add forkchoice changes for gloas
Subhasish-Behera Dec 4, 2025
86bcd2f
format
Subhasish-Behera Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 60 additions & 43 deletions block_producer/src/block_producer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,13 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
&self,
randao_reveal: SignatureBytes,
local_execution_payload_handle: Option<LocalExecutionPayloadJoinHandle<P>>,
) -> Result<Option<(WithBlobsAndMev<BeaconBlock<P>, P>, Option<BlockRewards>)>> {
) -> Result<
Option<(
WithBlobsAndMev<BeaconBlock<P>, P>,
Option<BlockRewards>,
Arc<BeaconState<P>>,
)>,
> {
let _block_timer = self
.producer_context
.metrics
Expand Down Expand Up @@ -700,6 +706,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
Option<(
WithBlobsAndMev<ValidatorBlindedBlock<P>, P>,
Option<BlockRewards>,
Option<Arc<BeaconState<P>>>,
)>,
> {
let block_without_state_root =
Expand Down Expand Up @@ -729,7 +736,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {

match (beacon_block_opt, blinded_block_opt) {
(
Some((beacon_block, beacon_block_rewards)),
Some((beacon_block, beacon_block_rewards, post_state)),
Some((blinded_block, blinded_block_rewards, builder_mev)),
) => {
if let Some(local_mev) = beacon_block.mev {
Expand All @@ -749,6 +756,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
return Ok(Some((
beacon_block.map(ValidatorBlindedBlock::BeaconBlock),
beacon_block_rewards,
Some(post_state),
)));
}
}
Expand All @@ -758,11 +766,13 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
Ok(Some((
WithBlobsAndMev::new(block, None, None, None, Some(builder_mev), None),
blinded_block_rewards,
None, // no post-state for builder produced blinded block
)))
}
(Some((beacon_block, beacon_block_rewards)), None) => Ok(Some((
(Some((beacon_block, beacon_block_rewards, post_state)), None) => Ok(Some((
beacon_block.map(ValidatorBlindedBlock::BeaconBlock),
beacon_block_rewards,
Some(post_state),
))),
_ => Ok(None),
}
Expand Down Expand Up @@ -897,34 +907,28 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
Vec<ElectraAttestation<P>>,
)> = Vec::new();

for (electra_attestation, committee_index) in
attestations.into_iter().filter_map(|attestation| {
let committee_index = attestation.data.index;

match operation_pools::convert_to_electra_attestation(attestation) {
Ok(electra_attestation) => Some((electra_attestation, committee_index)),
Err(error) => {
warn_with_peers!(
"unable to convert to electra attestation: {error:?}"
);
None
}
}
})
{
if let Some((_, indices, attestations)) =
results.iter_mut().find(|(data, indices, _)| {
*data == electra_attestation.data && !indices.contains(&committee_index)
})
for attestation in attestations {
if let Some((electra_attestation, committee_index)) = self
.producer_context
.attestation_agg_pool
.electra_attestation_with_committee_for_block(attestation, phase)
.await
{
indices.insert(committee_index);
attestations.push(electra_attestation);
} else {
results.push((
electra_attestation.data,
HashSet::from([committee_index]),
vec![electra_attestation],
))
if let Some((_, indices, attestations)) =
results.iter_mut().find(|(data, indices, _)| {
*data == electra_attestation.data
&& !indices.contains(&committee_index)
})
{
indices.insert(committee_index);
attestations.push(electra_attestation);
} else {
results.push((
electra_attestation.data,
HashSet::from([committee_index]),
vec![electra_attestation],
))
}
}
}

Expand Down Expand Up @@ -1116,7 +1120,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
fn process_beacon_block(
&self,
without_state_root: BeaconBlock<P>,
) -> Option<(BeaconBlock<P>, Option<BlockRewards>)> {
) -> Option<(BeaconBlock<P>, Option<BlockRewards>, Arc<BeaconState<P>>)> {
let block_processor = self.producer_context.controller.block_processor();
let pre_state = self.beacon_state.clone_arc();

Expand Down Expand Up @@ -1146,14 +1150,20 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
// the real RANDAO reveal and recompute the state root to make it valid.
let beacon_block = without_state_root.with_state_root(post_state.hash_tree_root());

Some((beacon_block, block_rewards))
Some((beacon_block, block_rewards, post_state))
}

async fn produce_beacon_block(
&self,
block_without_state_root: BeaconBlock<P>,
local_execution_payload_handle: Option<LocalExecutionPayloadJoinHandle<P>>,
) -> Result<Option<(WithBlobsAndMev<BeaconBlock<P>, P>, Option<BlockRewards>)>> {
) -> Result<
Option<(
WithBlobsAndMev<BeaconBlock<P>, P>,
Option<BlockRewards>,
Arc<BeaconState<P>>,
)>,
> {
// Start from Gloas, proposer no longer required to build execution payload data
// unless they choose to self-build
let mut payload_with_data = None;
Expand Down Expand Up @@ -1238,7 +1248,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
}

self.process_beacon_block(without_state_root_with_payload)
.map(|(beacon_block, block_rewards)| {
.map(|(beacon_block, block_rewards, post_state)| {
(
WithBlobsAndMev::new(
beacon_block,
Expand All @@ -1251,6 +1261,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
None,
),
block_rewards,
post_state,
)
})
.pipe(Ok)
Expand Down Expand Up @@ -1793,7 +1804,9 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
// > [Modified in Capella] Removed `is_merge_transition_complete` check in Capella
//
// See <https://github.com/ethereum/consensus-specs/pull/3350>.
let parent_hash = if let Some(state) = state.post_capella() {
let parent_hash = if let Some(state) = state.post_gloas() {
state.latest_block_hash()
} else if let Some(state) = state.post_capella() {
state.latest_execution_payload_header().block_hash()
} else if let Some(state) = post_merge_state(state) {
state.latest_execution_payload_header().block_hash()
Expand Down Expand Up @@ -2047,30 +2060,35 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
pub async fn compute_execution_payload_envelope(
&self,
beacon_block_root: H256,
post_state: Arc<BeaconState<P>>,
) -> Result<Option<ExecutionPayloadEnvelope<P>>> {
let Some((payload, execution_requests, blob_kzg_commitments)) =
self.get_gloas_envelope_data().await
else {
return Ok(None);
};

// Build envelope with placeholder state_root (will be set after processing)
// Build envelope with placeholder state_root (set after process_execution_payload)
let mut envelope = ExecutionPayloadEnvelope {
payload,
execution_requests,
builder_index: BUILDER_INDEX_SELF_BUILD,
beacon_block_root,
slot: self.beacon_state.slot(),
blob_kzg_commitments,
state_root: H256::zero(), // Placeholder
state_root: H256::zero(),
};

let signed_envelope = SignedExecutionPayloadEnvelope {
message: envelope.clone(),
signature: SignatureBytes::default(),
};

match &*self.beacon_state {
// Use the post-block state produced by process_beacon_block.
// Using BlockBuildContext's beacon_state would be pre-block.
let mut execution_state = post_state;

match execution_state.make_mut() {
BeaconState::Phase0(_)
| BeaconState::Altair(_)
| BeaconState::Bellatrix(_)
Expand All @@ -2083,21 +2101,20 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
));
}
BeaconState::Gloas(gloas_state) => {
let mut post_execution_state = gloas_state.clone();

gloas::process_execution_payload(
&self.producer_context.chain_config,
&self.producer_context.pubkey_cache,
&mut post_execution_state,
gloas_state,
&signed_envelope,
&self.producer_context.execution_engine,
NullVerifier,
)?;

envelope.state_root = post_execution_state.hash_tree_root();
}
}

// Set the state root after execution payload processing
envelope.state_root = execution_state.hash_tree_root();

Ok(Some(envelope))
}

Expand Down
30 changes: 30 additions & 0 deletions eth1_api/src/eth1_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pub const ENGINE_NEW_PAYLOAD_V1: &str = "engine_newPayloadV1";
pub const ENGINE_NEW_PAYLOAD_V2: &str = "engine_newPayloadV2";
pub const ENGINE_NEW_PAYLOAD_V3: &str = "engine_newPayloadV3";
pub const ENGINE_NEW_PAYLOAD_V4: &str = "engine_newPayloadV4";
pub const ENGINE_NEW_PAYLOAD_V5: &str = "engine_newPayloadV5";

pub const CAPABILITIES: &[&str] = &[
ENGINE_FORKCHOICE_UPDATED_V1,
Expand All @@ -83,6 +84,7 @@ pub const CAPABILITIES: &[&str] = &[
ENGINE_NEW_PAYLOAD_V2,
ENGINE_NEW_PAYLOAD_V3,
ENGINE_NEW_PAYLOAD_V4,
ENGINE_NEW_PAYLOAD_V5,
];

#[expect(clippy::struct_field_names)]
Expand Down Expand Up @@ -353,6 +355,34 @@ impl Eth1Api {
.await
.map(WithClientVersions::result)
}
(
// execute using ENGINE_NEW_PAYLOAD_V5 for gloas
ExecutionPayload::Deneb(payload),
Some(ExecutionPayloadParams::Gloas {
versioned_hashes,
parent_beacon_block_root,
execution_requests,
}),
) => {
let payload_v3 = ExecutionPayloadV3::from(payload);
let raw_execution_requests = RawExecutionRequests::from(execution_requests);

let params = vec![
serde_json::to_value(payload_v3)?,
serde_json::to_value(versioned_hashes)?,
serde_json::to_value(parent_beacon_block_root)?,
serde_json::to_value(raw_execution_requests)?,
];

self.execute(
ENGINE_NEW_PAYLOAD_V5,
params,
Some(ENGINE_NEW_PAYLOAD_TIMEOUT),
None,
)
.await
.map(WithClientVersions::result)
}
_ => bail!(Error::InvalidParameters),
}
}
Expand Down
2 changes: 1 addition & 1 deletion eth2_libp2p
Open in desktop
Submodule eth2_libp2p updated 2 files
+3 −0 src/service/utils.rs
+6 −0 src/types/topics.rs
32 changes: 23 additions & 9 deletions fork_choice_control/src/block_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,30 @@ impl<P: Preset> BlockProcessor<P> {
block,
data_availability_policy,
|block_root, parent| {
// For Gloas, choose state based on parent variant (full vs empty).
// spec(gloas): https://github.com/ethereum/consensus-specs/blob/master/specs/gloas/fork-choice.md#modified-on_block
let use_execution_state = block.phase() >= Phase::Gloas
&& parent.block.phase() >= Phase::Gloas
&& store.is_parent_node_full_for_block(block)
&& parent.execution_payload_state.is_some();

// > Make a copy of the state to avoid mutability issues
let state = self
.state_cache
.try_state_at_slot_for_block_sync(
&self.pubkey_cache,
store,
parent.block_root,
block.message().slot(),
)?
.unwrap_or_else(|| parent.state(store));
let state = if use_execution_state {
// For ePBS full parent, use execution_payload_states which has latest_block_hash set
// TBD: try_execution_state_at_slot_for_block_sync. currently uses ProcessSlots::ifNeeded
parent
.execution_state(store)
.expect("parent is full variant but has no execution_payload_state")
} else {
self.state_cache
.try_state_at_slot_for_block_sync(
&self.pubkey_cache,
store,
parent.block_root,
block.message().slot(),
)?
.unwrap_or_else(|| parent.state(store))
};

// This validation was removed from Capella in `consensus-specs` v1.4.0-alpha.0.
// See <https://github.com/ethereum/consensus-specs/pull/3232>.
Expand Down
Loading