Skip to content

feat(network): rewire PMA consumers to use transport and connected_peers (8/n) #15576

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

Merged
shreyan-gupta merged 2 commits into from
Apr 28, 2026
Merged

feat(network): rewire PMA consumers to use transport and connected_peers (8/n) #15576

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0aff1c
feat(network): [8/n] rewire PMA consumers to use transport and connec…
shreyan-gupta Apr 15, 2026
62b76bf
fix: minimize connected_peers diff, rename s to peer_state in to_high…
shreyan-gupta Apr 16, 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
84 changes: 55 additions & 29 deletions chain/network/src/peer_manager/peer_manager_actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::network_protocol::{
};
use crate::network_protocol::{SyncSnapshotHosts, T1MessageBody};
use crate::peer::peer_actor::PeerActor;
use crate::peer_manager::connected_peers::ConnectedPeerState;
use crate::peer_manager::connection;
use crate::peer_manager::network_state::{
NetworkState, PENDING_TIER3_REQUEST_TIMEOUT, WhitelistNode,
Expand Down Expand Up @@ -285,6 +286,25 @@ impl messaging::Actor for PeerManagerActor {
}
}

/// Project a `ConnectedPeerState` to a `HighestHeightPeerInfo`, keyed by
/// the T2 peer's latest block. Returns `None` if the peer hasn't
/// reported a block yet (the height info is what makes the projection
/// interesting).
fn to_highest_height_peer_info(
peer_state: &ConnectedPeerState,
genesis_id: &GenesisId,
) -> Option<HighestHeightPeerInfo> {
let block = peer_state.block_info.as_ref()?;
Some(HighestHeightPeerInfo {
peer_info: peer_state.peer_info.clone(),
genesis_id: genesis_id.clone(),
highest_block_height: block.height,
highest_block_hash: block.hash,
tracked_shards: peer_state.tracked_shards.clone(),
archival: peer_state.archival,
})
}

impl PeerManagerActor {
pub fn spawn(
clock: time::Clock,
Expand Down Expand Up @@ -458,15 +478,15 @@ impl PeerManagerActor {
&& !self.state.config.outbound_disabled
}

/// Returns peers close to the highest height
/// Returns peers close to the highest height.
fn highest_height_peers(&self) -> Vec<HighestHeightPeerInfo> {
let genesis_id = self.state.genesis_id.clone();
let infos: Vec<HighestHeightPeerInfo> = self
.state
.tier2
.load()
.ready
.peers
.tier2()
.values()
.filter_map(|p| p.full_peer_info().into())
.filter_map(|peer_state| to_highest_height_peer_info(peer_state, &genesis_id))
.collect();

// This finds max height among peers, and returns one peer close to such height.
Expand Down Expand Up @@ -500,18 +520,16 @@ impl PeerManagerActor {
// Find all peers whose height is below `highest_peer_horizon` from max height peer(s).
// or the ones we don't have height information yet
self.state
.tier2
.load()
.ready
.values()
.filter(|p| {
p.last_block
.load()
.peers
.tier2()
.into_iter()
.filter(|(_, s)| {
s.block_info
.as_ref()
.map(|x| x.height.saturating_add(UNRELIABLE_PEER_HORIZON) < my_height)
.unwrap_or(false)
})
.map(|p| p.peer_info.id.clone())
.map(|(id, _)| id)
.collect()
}

Expand Down Expand Up @@ -823,7 +841,7 @@ impl PeerManagerActor {
metrics::REQUEST_COUNT_BY_TYPE_TOTAL.with_label_values(&[msg.as_ref()]).inc();
match msg {
NetworkRequests::Block { block } => {
self.state.tier2.broadcast_message(Arc::new(PeerMessage::Block(block)));
self.transport.broadcast_message(Arc::new(PeerMessage::Block(block)));
NetworkResponses::NoResponse
}
NetworkRequests::OptimisticBlock { chunk_producers, optimistic_block } => {
Expand All @@ -848,8 +866,11 @@ impl PeerManagerActor {
NetworkResponses::NoResponse
}
NetworkRequests::BlockRequest { hash, peer_id } => {
if self.state.tier2.send_message(peer_id, Arc::new(PeerMessage::BlockRequest(hash)))
{
if self.transport.send_message(
tcp::Tier::T2,
peer_id,
Arc::new(PeerMessage::BlockRequest(hash)),
) {
NetworkResponses::NoResponse
} else {
NetworkResponses::RouteNotFound
Expand Down Expand Up @@ -1057,7 +1078,7 @@ impl PeerManagerActor {
// Insert our info to our own cache.
self.state.snapshot_hosts.insert_skip_verify(snapshot_host_info.clone());

self.state.tier2.broadcast_message(Arc::new(PeerMessage::SyncSnapshotHosts(
self.transport.broadcast_message(Arc::new(PeerMessage::SyncSnapshotHosts(
SyncSnapshotHosts { hosts: vec![snapshot_host_info] },
)));
NetworkResponses::NoResponse
Expand Down Expand Up @@ -1096,17 +1117,18 @@ impl PeerManagerActor {
}
}
} else {
let mut matching_peers = vec![];
for (peer_id, peer) in &self.state.tier2.load().ready {
let last_block = peer.last_block.load();
if (peer.archival || !target.only_archival)
&& last_block.is_some()
&& last_block.as_ref().unwrap().height >= target.min_height
&& peer.tracked_shards.contains(&target.shard_id)
{
matching_peers.push(peer_id.clone());
}
}
let t2_peers = self.state.peers.tier2();
let matching_peers: Vec<PeerId> = t2_peers
.into_iter()
.filter(|(_, s)| {
(s.archival || !target.only_archival)
&& s.block_info
.as_ref()
.is_some_and(|b| b.height >= target.min_height)
&& s.tracked_shards.contains(&target.shard_id)
})
.map(|(id, _)| id)
.collect();

if let Some(matching_peer) = matching_peers.iter().choose(&mut thread_rng())
{
Expand Down Expand Up @@ -1276,7 +1298,11 @@ impl PeerManagerActor {
NetworkResponses::NoResponse
}
NetworkRequests::EpochSyncRequest { peer_id } => {
if self.state.tier2.send_message(peer_id, PeerMessage::EpochSyncRequest.into()) {
if self.transport.send_message(
tcp::Tier::T2,
peer_id,
PeerMessage::EpochSyncRequest.into(),
) {
NetworkResponses::NoResponse
} else {
NetworkResponses::RouteNotFound
Expand Down
Loading