Complete merging of network addition branch

beacon_node/Cargo.toml

@@ -22,5 +22,4 @@ tokio-timer = "0.2.10"
 futures = "0.1.25"
 exit-future = "0.1.3"
 state_processing = { path = "../eth2/state_processing" }
-slog = "^2.2.3" 
 env_logger = "0.6.1"

beacon_node/client/src/client_config.rs

@@ -3,7 +3,6 @@ use eth2_libp2p::multiaddr::Protocol;
 use eth2_libp2p::Multiaddr;
 use fork_choice::ForkChoiceAlgorithm;
 use http_server::HttpServerConfig;
-use network::NetworkConfig;
 use network::{ChainType, NetworkConfig};
 use serde_derive::{Deserialize, Serialize};
 use slog::{error, o, Drain, Level};
@@ -29,7 +28,7 @@ impl Default for ClientConfig {
             db_name: "chain_db".to_string(),
             // Note: there are no default bootnodes specified.
             // Once bootnodes are established, add them here.
-            network: NetworkConfig::new(vec![]),
+            network: NetworkConfig::new(),
             rpc: rpc::RPCConfig::default(),
             http: HttpServerConfig::default(),
         }

beacon_node/eth2-libp2p/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 beacon_chain =  { path = "../beacon_chain" }
 clap = "2.32.0"
 # SigP repository 
-libp2p =  { git = "https://github.com/SigP/rust-libp2p", rev = "8d5e5bbbe32d07ad271d6a2e15fde0347894061a" }
+libp2p =  { git = "https://github.com/SigP/rust-libp2p", rev = "71744d4090ebd93a993d1b390787919add4098fd" }
 types = { path =  "../../eth2/types" }
 serde = "1.0"
 serde_derive = "1.0"

beacon_node/eth2-libp2p/src/behaviour.rs

@@ -111,14 +111,16 @@ impl<TSubstream: AsyncRead + AsyncWrite> NetworkBehaviourEventProcess<IdentifyEv
                     );
                     info.listen_addrs.truncate(20);
                 }
-                self.events
-                    .push(BehaviourEvent::Identified(peer_id, Box::new(info)));
                 trace!(self.log, "Found addresses"; "Peer Id" => format!("{:?}", peer_id), "Addresses" => format!("{:?}", info.listen_addrs));
                 // inject the found addresses into our discovery behaviour
+
                 for address in &info.listen_addrs {
                     self.discovery
                         .add_connected_address(&peer_id, address.clone());
                 }
+
+                self.events
+                    .push(BehaviourEvent::Identified(peer_id, Box::new(info)));
             }
             IdentifyEvent::Error { .. } => {}
             IdentifyEvent::SendBack { .. } => {}

beacon_node/eth2-libp2p/src/config.rs

@@ -1,8 +1,8 @@
 use clap::ArgMatches;
 use libp2p::gossipsub::{GossipsubConfig, GossipsubConfigBuilder};
+use libp2p::multiaddr::{Error as MultiaddrError, Multiaddr};
 use serde_derive::{Deserialize, Serialize};
 use std::time::Duration;
-use types::multiaddr::{Error as MultiaddrError, Multiaddr};
 
 /// The beacon node topic string to subscribe to.
 pub const BEACON_PUBSUB_TOPIC: &str = "beacon_node";

beacon_node/eth2-libp2p/src/discovery.rs

@@ -55,7 +55,7 @@ impl<TSubstream> Discovery<TSubstream> {
     /// We have discovered an address for a peer, add it to known peers.
     pub fn add_connected_address(&mut self, peer_id: &PeerId, address: Multiaddr) {
         // pass the address on to kademlia
-        self.discovery.add_connected_address(peer_id, address);
+        self.discovery.add_address(peer_id, address);
     }
 }
 

beacon_node/network/src/sync/simple_sync.rs

@@ -5,7 +5,6 @@ use eth2_libp2p::rpc::methods::*;
 use eth2_libp2p::rpc::{RPCRequest, RPCResponse, RequestId};
 use eth2_libp2p::PeerId;
 use slog::{debug, error, info, o, trace, warn};
-use ssz::TreeHash;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;

beacon_node/rpc/src/lib.rs

@@ -62,7 +62,6 @@ pub fn start_server<T: BeaconChainTypes + Clone + 'static>(
         let instance = AttestationServiceInstance {
             network_chan,
             chain: beacon_chain.clone(),
-            network_chan,
             log: log.clone(),
         };
         create_attestation_service(instance)

beacon_node/src/main.rs

@@ -4,7 +4,7 @@ use clap::{App, Arg};
 use client::{ClientConfig, Eth2Config};
 use env_logger::{Builder, Env};
 use eth2_config::{get_data_dir, read_from_file, write_to_file};
-use slog::{crit, o, Drain};
+use slog::{crit, o, Drain, Level};
 use std::path::PathBuf;
 
 pub const DEFAULT_DATA_DIR: &str = ".lighthouse";