Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
26 changes: 20 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions anchor/network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ dirs = { workspace = true }
discv5 = { workspace = true }
ethereum_serde_utils = "1.0.0-beta.0"
ethereum_ssz = "0.8.1"
ethereum_ssz_derive = "0.8.1"
futures = { workspace = true }
hex = "0.4.3"
libp2p = { version = "0.54", default-features = false, features = [
"identify",
"yamux",
Expand Down
47 changes: 43 additions & 4 deletions anchor/network/src/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ use std::time::Duration;
use futures::StreamExt;
use libp2p::core::muxing::StreamMuxerBox;
use libp2p::core::transport::Boxed;
use libp2p::gossipsub::{MessageAuthenticity, ValidationMode};
use libp2p::gossipsub::{IdentTopic, MessageAuthenticity, ValidationMode};
use libp2p::identity::Keypair;
use libp2p::multiaddr::Protocol;
use libp2p::swarm::SwarmEvent;
use libp2p::{futures, gossipsub, identify, ping, PeerId, Swarm, SwarmBuilder};
use lighthouse_network::discovery::DiscoveredPeers;
use lighthouse_network::discv5::enr::k256::sha2::{Digest, Sha256};
use task_executor::TaskExecutor;
use tracing::{info, log};
use tracing::{debug, info, log, warn};

use crate::behaviour::AnchorBehaviour;
use crate::behaviour::AnchorBehaviourEvent;
Expand All @@ -22,7 +22,9 @@ use crate::keypair_utils::load_private_key;
use crate::transport::build_transport;
use crate::Config;

use crate::types::ssv_message::SignedSSVMessage;
use lighthouse_network::EnrExt;
use ssz::Decode;

pub struct Network {
swarm: Swarm<AnchorBehaviour>,
Expand Down Expand Up @@ -83,12 +85,49 @@ impl Network {

/// Main loop for polling and handling swarm and channels.
pub async fn run(mut self) {
let topic = IdentTopic::new("ssv.v2.9");

match self.swarm.behaviour_mut().gossipsub.subscribe(&topic) {
Err(e) => {
warn!(topic = %topic, "error" = ?e, "Failed to subscribe to topic");
}
Ok(_) => {
debug!(topic = %topic, "Subscribed to topic");
}
}

loop {
tokio::select! {
swarm_message = self.swarm.select_next_some() => {
match swarm_message {
SwarmEvent::Behaviour(behaviour_event) => match behaviour_event {
AnchorBehaviourEvent::Gossipsub(_ge) => {
AnchorBehaviourEvent::Gossipsub(ge) => {
match ge {
gossipsub::Event::Message {
propagation_source,
message_id,
message,
} => {
log::debug!(
"Received message from {:?} with id {:?}: {:?}",
propagation_source,
message_id,
&message
);
match SignedSSVMessage::from_ssz_bytes(&message.data) {
Ok(deserialized_message) => {
log::debug!("SSVMessage: {:?}", deserialized_message);
}
Err(e) => {
log::error!("Error deserializing SSVMessage: {:?}", e);
}
}
}
// TODO handle gossipsub events
_ => {
log::debug!("Unhandled gossipsub event: {:?}", ge);
}
}
// TODO handle gossipsub events
},
// Inform the peer manager about discovered peers.
Expand Down Expand Up @@ -151,7 +190,7 @@ async fn build_anchor_behaviour(
.duplicate_cache_time(duplicate_cache_time)
.message_id_fn(gossip_message_id)
.flood_publish(false)
.validation_mode(ValidationMode::Strict)
.validation_mode(ValidationMode::Permissive)
.mesh_n(8) //D
.mesh_n_low(6) // Dlo
.mesh_n_high(12) // Dhi
Expand Down
1 change: 1 addition & 0 deletions anchor/network/src/types.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
mod gossip_kind;
pub mod ssv_message;
Loading
Loading