Add network routes to API

beacon_node/client/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 [dependencies]
 beacon_chain = { path = "../beacon_chain" }
 network = { path = "../network" }
+eth2-libp2p = { path = "../eth2-libp2p" }
 rpc = { path = "../rpc" }
 rest_api = { path = "../rest_api" }
 prometheus = "^0.6"

beacon_node/client/src/lib.rs

@@ -48,7 +48,7 @@ pub struct Client<T: BeaconChainTypes> {
 
 impl<T> Client<T>
 where
-    T: BeaconChainTypes + InitialiseBeaconChain<T> + Clone + 'static,
+    T: BeaconChainTypes + InitialiseBeaconChain<T> + Clone + Send + Sync + 'static,
 {
     /// Generate an instance of the client. Spawn and link all internal sub-processes.
     pub fn new(
@@ -122,6 +122,7 @@ where
                 &client_config.rest_api,
                 executor,
                 beacon_chain.clone(),
+                network.clone(),
                 client_config.db_path().expect("unable to read datadir"),
                 &log,
             ) {

beacon_node/client/src/local_bootstrap.rs

@@ -1,3 +1,4 @@
+use eth2_libp2p::Enr;
 use reqwest::{Error as HttpError, Url};
 use types::{BeaconBlock, BeaconState, Checkpoint, EthSpec, Slot};
 
@@ -18,6 +19,7 @@ pub struct BootstrapParams<T: EthSpec> {
     pub finalized_state: BeaconState<T>,
     pub genesis_block: BeaconBlock<T>,
     pub genesis_state: BeaconState<T>,
+    pub enr: Enr,
 }
 
 impl<T: EthSpec> BootstrapParams<T> {
@@ -37,6 +39,7 @@ impl<T: EthSpec> BootstrapParams<T> {
                 .map_err(|e| format!("Unable to get genesis block: {:?}", e))?,
             genesis_state: get_state(url.clone(), genesis_slot)
                 .map_err(|e| format!("Unable to get genesis state: {:?}", e))?,
+            enr: get_enr(url.clone()).map_err(|e| format!("Unable to get ENR: {:?}", e))?,
         })
     }
 }
@@ -97,3 +100,16 @@ fn get_block<T: EthSpec>(mut url: Url, slot: Slot) -> Result<BeaconBlock<T>, Err
         .json()
         .map_err(Into::into)
 }
+
+fn get_enr(mut url: Url) -> Result<Enr, Error> {
+    url.path_segments_mut()
+        .map(|mut url| {
+            url.push("node").push("network").push("enr");
+        })
+        .map_err(|_| Error::UrlCannotBeBase)?;
+
+    reqwest::get(url)?
+        .error_for_status()?
+        .json()
+        .map_err(Into::into)
+}