gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-30 03:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

peerdas-devnet-7: update DataColumnSidecarsByRoot request to use DataColumnsByRootIdentifier (#7399)

Browse Source 
Update DataColumnSidecarsByRoot request to use DataColumnsByRootIdentifier #7377


  As described in https://github.com/ethereum/consensus-specs/pull/4284
This commit is contained in:
SunnysidedJ
2025-05-12 09:20:55 +09:00
committed by GitHub
parent 92391cdac6
commit 593390162f
19 changed files with 262 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/network_beacon_processor/gossip_methods.rs
View File

@@ -1130,7 +1130,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
let processing_start_time = Instant::now();
let block_root = verified_data_column.block_root();
let data_column_slot = verified_data_column.slot();
let data_column_index = verified_data_column.id().index;
let data_column_index = verified_data_column.index();
let result = self
.chain

29
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
View File

@@ -360,24 +360,25 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
) -> Result<(), (RpcErrorResponse, &'static str)> {
let mut send_data_column_count = 0;
for data_column_id in request.data_column_ids.as_slice() {
match self.chain.get_data_column_checking_all_caches(
data_column_id.block_root,
data_column_id.index,
for data_column_ids_by_root in request.data_column_ids.as_slice() {
match self.chain.get_data_columns_checking_all_caches(
data_column_ids_by_root.block_root,
data_column_ids_by_root.columns.as_slice(),
) {
Ok(Some(data_column)) => {
send_data_column_count += 1;
self.send_response(
peer_id,
inbound_request_id,
Response::DataColumnsByRoot(Some(data_column)),
);
Ok(data_columns) => {
send_data_column_count += data_columns.len();
for data_column in data_columns {
self.send_response(
peer_id,
inbound_request_id,
Response::DataColumnsByRoot(Some(data_column)),
);
}
}
Ok(None) => {} // no-op
Err(e) => {
// TODO(das): lower log level when feature is stabilized
error!(
block_root = ?data_column_id.block_root,
block_root = ?data_column_ids_by_root.block_root,
%peer_id,
error = ?e,
"Error getting data column"
@@ -389,7 +390,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
debug!(
%peer_id,
request = ?request.group_by_ordered_block_root(),
request = ?request.data_column_ids,
returned = send_data_column_count,
"Received DataColumnsByRoot Request"
);

6
beacon_node/network/src/sync/network_context.rs
View File

@@ -875,7 +875,11 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
self.send_network_msg(NetworkMessage::SendRequest {
peer_id,
request: RequestType::DataColumnsByRoot(request.clone().into_request(&self.chain.spec)),
request: RequestType::DataColumnsByRoot(
request
.clone()
.try_into_request(self.fork_context.current_fork(), &self.chain.spec)?,
),
app_request_id: AppRequestId::Sync(SyncRequestId::DataColumnsByRoot(id)),
})?;

31
beacon_node/network/src/sync/network_context/requests/data_columns_by_root.rs
View File

@@ -1,6 +1,9 @@
use lighthouse_network::rpc::methods::DataColumnsByRootRequest;
use std::sync::Arc;
use types::{ChainSpec, DataColumnIdentifier, DataColumnSidecar, EthSpec, Hash256};
use types::{
ChainSpec, DataColumnSidecar, DataColumnsByRootIdentifier, EthSpec, ForkName, Hash256,
RuntimeVariableList,
};
use super::{ActiveRequestItems, LookupVerifyError};
@@ -11,17 +14,21 @@ pub struct DataColumnsByRootSingleBlockRequest {
}
impl DataColumnsByRootSingleBlockRequest {
pub fn into_request(self, spec: &ChainSpec) -> DataColumnsByRootRequest {
DataColumnsByRootRequest::new(
self.indices
.into_iter()
.map(|index| DataColumnIdentifier {
block_root: self.block_root,
index,
})
.collect(),
spec,
)
pub fn try_into_request(
self,
fork_name: ForkName,
spec: &ChainSpec,
) -> Result<DataColumnsByRootRequest, &'static str> {
let number_of_columns = spec.number_of_columns as usize;
let columns = RuntimeVariableList::new(self.indices, number_of_columns)
.map_err(|_| "Number of indices exceeds total number of columns")?;
Ok(DataColumnsByRootRequest::new(
vec![DataColumnsByRootIdentifier {
block_root: self.block_root,
columns,
}],
spec.max_request_blocks(fork_name),
))
}
}

15
beacon_node/network/src/sync/tests/lookups.rs
View File

@@ -979,18 +979,13 @@ impl TestRig {
request: RequestType::DataColumnsByRoot(request),
app_request_id:
AppRequestId::Sync(id @ SyncRequestId::DataColumnsByRoot { .. }),
} if request
.data_column_ids
.to_vec()
.iter()
.any(|r| r.block_root == block_root) =>
{
let indices = request
} => {
let matching = request
.data_column_ids
.to_vec()
.iter()
.map(|cid| cid.index)
.collect::<Vec<_>>();
.find(|id| id.block_root == block_root)?;
let indices = matching.columns.iter().copied().collect();
Some((*id, indices))
}
_ => None,