rpc check re-enabled, better logs

Author: erhant

src/node.rs

@@ -136,31 +136,30 @@ impl DriaComputeNode {
                         // handle message w.r.t topic
                         if std::matches!(topic_str, PINGPONG_LISTEN_TOPIC | WORKFLOW_LISTEN_TOPIC) {
                             // ensure that the message is from a valid source (origin)
-                            let source_peer_id = message.source;
-                            // let source_peer_id = match message.source.clone() {
-                            //     Some(peer) => peer,
-                            //     None => {
-                            //         log::warn!("Received {} message from {} without source.", topic_str, peer_id);
-                            //         log::debug!("Allowed sources: {:#?}", self.available_nodes.rpc_nodes);
-                            //         self.p2p.validate_message(&message_id, &peer_id, gossipsub::MessageAcceptance::Ignore)?;
-                            //         continue;
-                            //     }
-                            // };
+                            let source_peer_id = match message.source.clone() {
+                                Some(peer) => peer,
+                                None => {
+                                    log::warn!("Received {} message from {} without source.", topic_str, peer_id);
+                                    self.p2p.validate_message(&message_id, &peer_id, gossipsub::MessageAcceptance::Ignore)?;
+                                    continue;
+                                }
+                            };
 
                             log::info!(
-                                "Received {} message ({})\nFrom:   {}\nOrigin: {}",
+                                "Received {} message ({})\nFrom:   {}\nSource: {}",
                                 topic_str,
                                 message_id,
                                 peer_id,
-                                source_peer_id.map(|p| p.to_string()).unwrap_or("None".to_string())
+                                source_peer_id
                             );
 
                             // ensure that message is from the static RPCs
-                            // if !self.available_nodes.rpc_nodes.contains(&source_peer_id) {
-                            //     log::warn!("Received message from unauthorized origin: {}", source_peer_id);
-                            //     self.p2p.validate_message(&message_id, &peer_id, gossipsub::MessageAcceptance::Ignore)?;
-                            //     continue;
-                            // }
+                            if !self.available_nodes.rpc_nodes.contains(&source_peer_id) {
+                                log::warn!("Received message from unauthorized source: {}", source_peer_id);
+                                log::debug!("Allowed sources: {:#?}", self.available_nodes.rpc_nodes);
+                                self.p2p.validate_message(&message_id, &peer_id, gossipsub::MessageAcceptance::Ignore)?;
+                                continue;
+                            }
 
                             // first, parse the raw gossipsub message to a prepared message
                             // if unparseable,

src/p2p/behaviour.rs

@@ -56,6 +56,7 @@ fn create_kademlia_behavior(local_peer_id: PeerId) -> kad::Behaviour<MemoryStore
 fn create_identify_behavior(local_public_key: PublicKey) -> identify::Behaviour {
     use identify::{Behaviour, Config};
 
+    // TODO: can we use a different protocol version, e.g. `dria/CRATE_VERSION`
     let cfg = Config::new(DRIA_PROTO_NAME.to_string(), local_public_key);
 
     Behaviour::new(cfg)

src/p2p/client.rs

@@ -237,7 +237,7 @@ impl P2PClient {
         for addr in info.listen_addrs {
             if protocol_match {
                 // if it matches our protocol, add it to the Kademlia routing table
-                log::info!("Identify: Received address {}. PeerID is {}", addr, peer_id);
+                log::info!("Identify: Peer {} identified at {}", peer_id, addr);
 
                 self.swarm
                     .behaviour_mut()

start.sh

@@ -297,7 +297,8 @@ COMPOSE_DOWN="${COMPOSE_PROFILES} ${COMPUTE_ENVS} ${OLLAMA_ENVS} ${COMPOSE_COMMA
 echo ""
 echo "Starting in ${START_MODE} mode..."
 echo "Log level: ${RUST_LOG}"
-echo "Using models: ${DKN_MODELS}"
+echo "Models: ${DKN_MODELS}"
+echo "${COMPOSE_PROFILES}"
 echo ""
 eval "${COMPOSE_UP}"