gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-10 01:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'glamsterdam-devnet-0' of https://github.com/sigp/lighthouse into glamsterdam-devnet-0

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-28 16:11:09 +02:00
parent 11dce65a99 c457d2932f
commit d5d415b8b8
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/http_api/src/beacon/execution_payload_envelope.rs
View File

@@ -7,8 +7,8 @@ use crate::version::{
execution_optimistic_finalized_beacon_response, execution_optimistic_finalized_beacon_response,
}; };
use beacon_chain::data_column_verification::{GossipDataColumnError, GossipVerifiedDataColumn}; use beacon_chain::data_column_verification::{GossipDataColumnError, GossipVerifiedDataColumn};
use beacon_chain::payload_envelope_verification::gossip_verified_envelope::GossipVerifiedEnvelope;
use beacon_chain::payload_envelope_verification::EnvelopeError; use beacon_chain::payload_envelope_verification::EnvelopeError;
use beacon_chain::payload_envelope_verification::gossip_verified_envelope::GossipVerifiedEnvelope;
use beacon_chain::{BeaconChain, BeaconChainTypes, NotifyExecutionLayer}; use beacon_chain::{BeaconChain, BeaconChainTypes, NotifyExecutionLayer};
use bytes::Bytes; use bytes::Bytes;
use eth2::types as api_types; use eth2::types as api_types;
@@ -21,7 +21,7 @@ use std::future::Future;
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
use tracing::{debug, error, info, warn}; use tracing::{debug, error, info, warn};
use types::{BlockImportSource, EthSpec, SignedExecutionPayloadEnvelope}; use types::{BlockImportSource, EthSpec, SignedBeaconBlock, SignedExecutionPayloadEnvelope};
use warp::{ use warp::{
Filter, Rejection, Reply, Filter, Rejection, Reply,
hyper::{Body, Response}, hyper::{Body, Response},
@@ -144,6 +144,7 @@ pub async fn publish_execution_payload_envelope<T: BeaconChainTypes>(
))); )));
} }
}; };
let block = gossip_verified_envelope.block.clone();
// Import the envelope locally (runs state transition and notifies the EL). // Import the envelope locally (runs state transition and notifies the EL).
chain chain
@@ -166,9 +167,14 @@ pub async fn publish_execution_payload_envelope<T: BeaconChainTypes>(
if let Some((blobs, _kzg_proofs)) = blobs_and_proofs if let Some((blobs, _kzg_proofs)) = blobs_and_proofs
&& !blobs.is_empty() && !blobs.is_empty()
{ {
let gossip_verified_columns = let gossip_verified_columns = spawn_build_gloas_data_columns_task(
spawn_build_gloas_data_columns_task(chain.clone(), beacon_block_root, slot, blobs)? chain.clone(),
.await?; beacon_block_root,
block,
slot,
blobs,
)?
.await?;
if !gossip_verified_columns.is_empty() { if !gossip_verified_columns.is_empty() {
publish_column_sidecars(network_tx, &gossip_verified_columns, &chain).map_err( publish_column_sidecars(network_tx, &gossip_verified_columns, &chain).map_err(
@@ -205,6 +211,7 @@ pub async fn publish_execution_payload_envelope<T: BeaconChainTypes>(
fn spawn_build_gloas_data_columns_task<T: BeaconChainTypes>( fn spawn_build_gloas_data_columns_task<T: BeaconChainTypes>(
chain: Arc<BeaconChain<T>>, chain: Arc<BeaconChain<T>>,
beacon_block_root: types::Hash256, beacon_block_root: types::Hash256,
block: Arc<SignedBeaconBlock<T::EthSpec>>,
slot: types::Slot, slot: types::Slot,
blobs: types::BlobsList<T::EthSpec>, blobs: types::BlobsList<T::EthSpec>,
) -> Result<impl Future<Output = Result<Vec<GossipVerifiedDataColumn<T>>, Rejection>>, Rejection> { ) -> Result<impl Future<Output = Result<Vec<GossipVerifiedDataColumn<T>>, Rejection>>, Rejection> {
@@ -212,7 +219,7 @@ fn spawn_build_gloas_data_columns_task<T: BeaconChainTypes>(
.clone() .clone()
.task_executor .task_executor
.spawn_blocking_handle( .spawn_blocking_handle(
move || build_gloas_data_columns(&chain, beacon_block_root, slot, &blobs), move || build_gloas_data_columns(&chain, beacon_block_root, block, slot, &blobs),
"build_gloas_data_columns", "build_gloas_data_columns",
) )
.ok_or_else(|| warp_utils::reject::custom_server_error("runtime shutdown".to_string())) .ok_or_else(|| warp_utils::reject::custom_server_error("runtime shutdown".to_string()))
@@ -225,6 +232,7 @@ fn spawn_build_gloas_data_columns_task<T: BeaconChainTypes>(
fn build_gloas_data_columns<T: BeaconChainTypes>( fn build_gloas_data_columns<T: BeaconChainTypes>(
chain: &BeaconChain<T>, chain: &BeaconChain<T>,
beacon_block_root: types::Hash256, beacon_block_root: types::Hash256,
block: Arc<SignedBeaconBlock<T::EthSpec>>,
slot: types::Slot, slot: types::Slot,
blobs: &types::BlobsList<T::EthSpec>, blobs: &types::BlobsList<T::EthSpec>,
) -> Result<Vec<GossipVerifiedDataColumn<T>>, Rejection> { ) -> Result<Vec<GossipVerifiedDataColumn<T>>, Rejection> {
@@ -249,7 +257,7 @@ fn build_gloas_data_columns<T: BeaconChainTypes>(
.into_iter() .into_iter()
.filter_map(|col| { .filter_map(|col| {
let index = *col.index(); let index = *col.index();
match GossipVerifiedDataColumn::new_for_block_publishing(col, chain) { match GossipVerifiedDataColumn::new_for_block_publishing(col, &block, chain) {
Ok(verified) => Some(verified), Ok(verified) => Some(verified),
Err(GossipDataColumnError::PriorKnownUnpublished) => None, Err(GossipDataColumnError::PriorKnownUnpublished) => None,
Err(e) => { Err(e) => {