Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-12-23 12:09:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

P2P task per Tributary, not per message

Browse source
This commit is contained in:
Luke Parker 2023-09-25 22:58:40 -04:00
parent e1801b57c9
commit 7312428a44
No known key found for this signature in database
1 changed files with 119 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
coordinator/src/main.rs
View file

@ -346,41 +346,27 @@ pub async fn handle_p2p<D: Db, P: P2p>(
p2p: P, p2p: P,
mut new_tributary: broadcast::Receiver<ActiveTributary<D, P>>, mut new_tributary: broadcast::Receiver<ActiveTributary<D, P>>,
) { ) {
let tributaries = Arc::new(RwLock::new(HashMap::new())); let channels = Arc::new(RwLock::new(HashMap::new()));
loop {
while let Ok(tributary) = {
match new_tributary.try_recv() {
Ok(tributary) => Ok(tributary),
Err(broadcast::error::TryRecvError::Empty) => Err(()),
Err(broadcast::error::TryRecvError::Lagged(_)) => {
panic!("handle_p2p lagged to handle new_tributary")
}
Err(broadcast::error::TryRecvError::Closed) => panic!("new_tributary sender closed"),
}
} {
// TODO: Because the below maintains a read lock, this will never process until all prior P2P
// messages were handled. That's a notable latency spike
tributaries.write().await.insert(tributary.spec.genesis(), tributary);
}
let mut msg = p2p.receive().await;
// Spawn a dedicated task to handle this message, ensuring any singularly latent message
// doesn't hold everything up
// TODO: Move to one task per tributary (or two. One for Tendermint, one for Tributary)
tokio::spawn({ tokio::spawn({
let p2p = p2p.clone(); let p2p = p2p.clone();
let tributaries = tributaries.clone(); let channels = channels.clone();
async move { async move {
loop {
let tributary = new_tributary.recv().await.unwrap();
let genesis = tributary.spec.genesis();
let (send, mut recv) = mpsc::unbounded_channel();
channels.write().await.insert(genesis, send);
tokio::spawn({
let p2p = p2p.clone();
async move {
let mut msg: Message<P> = recv.recv().await.unwrap();
match msg.kind { match msg.kind {
P2pMessageKind::KeepAlive => {} P2pMessageKind::KeepAlive => {}
P2pMessageKind::Tributary(genesis) => { P2pMessageKind::Tributary(msg_genesis) => {
let tributaries = tributaries.read().await; assert_eq!(msg_genesis, genesis);
let Some(tributary) = tributaries.get(&genesis) else {
log::debug!("received p2p message for unknown network");
return;
};
log::trace!("handling message for tributary {:?}", tributary.spec.set()); log::trace!("handling message for tributary {:?}", tributary.spec.set());
if tributary.tributary.handle_message(&msg.msg).await { if tributary.tributary.handle_message(&msg.msg).await {
P2p::broadcast(&p2p, msg.kind, msg.msg).await; P2p::broadcast(&p2p, msg.kind, msg.msg).await;
@ -390,17 +376,14 @@ pub async fn handle_p2p<D: Db, P: P2p>(
// TODO2: Rate limit this per timestamp // TODO2: Rate limit this per timestamp
// And/or slash on Heartbeat which justifies a response, since the node obviously was // And/or slash on Heartbeat which justifies a response, since the node obviously was
// offline and we must now use our bandwidth to compensate for them? // offline and we must now use our bandwidth to compensate for them?
P2pMessageKind::Heartbeat(genesis) => { // TODO: Dedicated task for heartbeats
P2pMessageKind::Heartbeat(msg_genesis) => {
assert_eq!(msg_genesis, genesis);
if msg.msg.len() != 40 { if msg.msg.len() != 40 {
log::error!("validator sent invalid heartbeat"); log::error!("validator sent invalid heartbeat");
return; return;
} }
let tributaries = tributaries.read().await;
let Some(tributary) = tributaries.get(&genesis) else {
log::debug!("received heartbeat message for unknown network");
return;
};
let tributary_read = &tributary.tributary; let tributary_read = &tributary.tributary;
/* /*
@ -418,14 +401,17 @@ pub async fn handle_p2p<D: Db, P: P2p>(
// Decide which nodes will respond by using the latest block's hash as a mutually // Decide which nodes will respond by using the latest block's hash as a mutually
// agreed upon entropy source // agreed upon entropy source
// This isn't a secure source of entropy, yet it's fine for this // This isn't a secure source of entropy, yet it's fine for this
let entropy = u64::from_le_bytes(tributary_read.tip().await[.. 8].try_into().unwrap()); let entropy =
// If n = 10, responders = 3, we want start to be 0 ..= 7 (so the highest is 7, 8, 9) u64::from_le_bytes(tributary_read.tip().await[.. 8].try_into().unwrap());
// If n = 10, responders = 3, we want `start` to be 0 ..= 7
// (so the highest is 7, 8, 9)
// entropy % (10 + 1) - 3 = entropy % 8 = 0 ..= 7 // entropy % (10 + 1) - 3 = entropy % 8 = 0 ..= 7
let start = let start =
usize::try_from(entropy % (u64::from(tributary.spec.n() + 1) - responders)).unwrap(); usize::try_from(entropy % (u64::from(tributary.spec.n() + 1) - responders))
.unwrap();
let mut selected = false; let mut selected = false;
for validator in for validator in &tributary.spec.validators()
&tributary.spec.validators()[start .. (start + usize::try_from(responders).unwrap())] [start .. (start + usize::try_from(responders).unwrap())]
{ {
if our_key == validator.0 { if our_key == validator.0 {
selected = true; selected = true;
@ -452,7 +438,8 @@ pub async fn handle_p2p<D: Db, P: P2p>(
} }
} }
P2pMessageKind::Block(genesis) => { P2pMessageKind::Block(msg_genesis) => {
assert_eq!(msg_genesis, genesis);
let mut msg_ref: &[u8] = msg.msg.as_ref(); let mut msg_ref: &[u8] = msg.msg.as_ref();
let Ok(block) = Block::<Transaction>::read(&mut msg_ref) else { let Ok(block) = Block::<Transaction>::read(&mut msg_ref) else {
log::error!("received block message with an invalidly serialized block"); log::error!("received block message with an invalidly serialized block");
@ -462,12 +449,6 @@ pub async fn handle_p2p<D: Db, P: P2p>(
msg.msg.drain(.. (msg.msg.len() - msg_ref.len())); msg.msg.drain(.. (msg.msg.len() - msg_ref.len()));
msg.msg.drain((msg.msg.len() - 8) ..); msg.msg.drain((msg.msg.len() - 8) ..);
let tributaries = tributaries.read().await;
let Some(tributary) = tributaries.get(&genesis) else {
log::debug!("received block message for unknown network");
return;
};
let res = tributary.tributary.sync_block(block, msg.msg).await; let res = tributary.tributary.sync_block(block, msg.msg).await;
log::debug!("received block from {:?}, sync_block returned {}", msg.sender, res); log::debug!("received block from {:?}, sync_block returned {}", msg.sender, res);
} }
@ -476,6 +457,30 @@ pub async fn handle_p2p<D: Db, P: P2p>(
}); });
} }
} }
});
loop {
let msg = p2p.receive().await;
match msg.kind {
P2pMessageKind::KeepAlive => {}
P2pMessageKind::Tributary(genesis) => {
if let Some(channel) = channels.read().await.get(&genesis) {
channel.send(msg).unwrap();
}
}
P2pMessageKind::Heartbeat(genesis) => {
if let Some(channel) = channels.read().await.get(&genesis) {
channel.send(msg).unwrap();
}
}
P2pMessageKind::Block(genesis) => {
if let Some(channel) = channels.read().await.get(&genesis) {
channel.send(msg).unwrap();
}
}
}
}
}
pub async fn publish_signed_transaction<D: Db, P: P2p>( pub async fn publish_signed_transaction<D: Db, P: P2p>(
tributary: &Tributary<D, Transaction, P>, tributary: &Tributary<D, Transaction, P>,