Launch beacon portal network (#725)

Author: ogenev

Cargo.toml

@@ -35,6 +35,7 @@ tempfile = "3.3.0"
 tokio = { version = "1.14.0", features = ["full"] }
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
+trin-beacon = { path = "trin-beacon" }
 trin-bridge = { path = "trin-bridge" }
 trin-history = { path = "trin-history" }
 trin-state = { path = "trin-state" }

newsfragments/725.added.md

@@ -0,0 +1 @@
+Launch beacon portal network without RPC support

portalnet/src/events.rs

@@ -15,6 +15,8 @@ pub struct PortalnetEvents {
     pub history_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
     /// Send overlay `TalkReq` to state network
     pub state_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
+    /// Send overlay `TalkReq` to beacon network
+    pub beacon_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
     /// Send TalkReq events with "utp" protocol id to `UtpListener`
     pub utp_talk_reqs: mpsc::UnboundedSender<TalkRequest>,
 }
@@ -24,12 +26,14 @@ impl PortalnetEvents {
         talk_req_receiver: mpsc::Receiver<TalkRequest>,
         history_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
         state_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
+        beacon_overlay_sender: Option<mpsc::UnboundedSender<TalkRequest>>,
         utp_talk_reqs: mpsc::UnboundedSender<TalkRequest>,
     ) -> Self {
         Self {
             talk_req_receiver,
             history_overlay_sender,
             state_overlay_sender,
+            beacon_overlay_sender,
             utp_talk_reqs,
         }
     }
@@ -56,7 +60,19 @@ impl PortalnetEvents {
                                 );
                             }
                         }
-                        None => warn!("History event handler not initialized!"),
+                        None => error!("History event handler not initialized!"),
+                    };
+                }
+                ProtocolId::Beacon => {
+                    match &self.beacon_overlay_sender {
+                        Some(tx) => {
+                            if let Err(err) = tx.send(request) {
+                                error!(
+                                    "Error sending discv5 talk request to beacon network: {err}"
+                                );
+                            }
+                        }
+                        None => error!("Beacon event handler not initialized!"),
                     };
                 }
                 ProtocolId::State => {
@@ -66,12 +82,12 @@ impl PortalnetEvents {
                                 error!("Error sending discv5 talk request to state network: {err}");
                             }
                         }
-                        None => warn!("State event handler not initialized!"),
+                        None => error!("State event handler not initialized!"),
                     };
                 }
                 ProtocolId::Utp => {
                     if let Err(err) = self.utp_talk_reqs.send(request) {
-                        warn!(%err, "Error forwarding talk request to uTP socket");
+                        error!(%err, "Error forwarding talk request to uTP socket");
                     }
                 }
                 _ => {

src/lib.rs

@@ -16,9 +16,12 @@ use portalnet::{
     types::messages::PortalnetConfig,
     utils::db::{configure_node_data_dir, configure_trin_data_dir},
 };
+use trin_beacon::initialize_beacon_network;
 use trin_history::initialize_history_network;
 use trin_state::initialize_state_network;
-use trin_types::cli::{TrinConfig, Web3TransportType, HISTORY_NETWORK, STATE_NETWORK};
+use trin_types::cli::{
+    TrinConfig, Web3TransportType, BEACON_NETWORK, HISTORY_NETWORK, STATE_NETWORK,
+};
 use trin_types::jsonrpc::request::HistoryJsonRpcRequest;
 use trin_types::provider::TrustedProvider;
 use trin_utils::version::get_trin_version;
@@ -94,6 +97,21 @@ pub async fn run_trin(
             (None, None, None, None)
         };
 
+    // Initialize trin-beacon sub-network service and event handlers, if selected
+    let (beacon_handler, beacon_network_task, beacon_event_tx, _beacon_jsonrpc_tx) =
+        if trin_config.networks.iter().any(|val| val == BEACON_NETWORK) {
+            initialize_beacon_network(
+                &discovery,
+                Arc::clone(&utp_socket),
+                portalnet_config.clone(),
+                storage_config.clone(),
+                header_oracle.clone(),
+            )
+            .await?
+        } else {
+            (None, None, None, None)
+        };
+
     // Initialize chain history sub-network service and event handlers, if selected
     let (history_handler, history_network_task, history_event_tx, history_jsonrpc_tx) =
         if trin_config
@@ -125,13 +143,17 @@ pub async fn run_trin(
     if let Some(handler) = history_handler {
         tokio::spawn(async move { handler.handle_client_queries().await });
     }
+    if let Some(handler) = beacon_handler {
+        tokio::spawn(async move { handler.handle_client_queries().await });
+    }
 
     // Spawn main portal events handler
     tokio::spawn(async move {
         let events = PortalnetEvents::new(
             talk_req_rx,
             history_event_tx,
             state_event_tx,
+            beacon_event_tx,
             utp_talk_reqs_tx,
         )
         .await;
@@ -144,6 +166,9 @@ pub async fn run_trin(
     if let Some(network) = state_network_task {
         tokio::spawn(async { network.await });
     }
+    if let Some(network) = beacon_network_task {
+        tokio::spawn(async { network.await });
+    }
 
     Ok(rpc_handle?)
 }

trin-types/src/cli.rs

@@ -11,6 +11,7 @@ pub const DEFAULT_MASTER_ACC_PATH: &str = "validation_assets/merge_macc.bin";
 pub const DEFAULT_WEB3_IPC_PATH: &str = "/tmp/trin-jsonrpc.ipc";
 pub const DEFAULT_WEB3_HTTP_ADDRESS: &str = "http://127.0.0.1:8545/";
 const DEFAULT_DISCOVERY_PORT: &str = "9000";
+pub const BEACON_NETWORK: &str = "beacon";
 pub const HISTORY_NETWORK: &str = "history";
 pub const STATE_NETWORK: &str = "state";
 const DEFAULT_SUBNETWORKS: &str = "history";