From e9181e120c8d4cdf0e1831e2458d9378f0028a1b Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Wed, 3 Apr 2019 12:25:05 +1100
Subject: [PATCH] Add topics to chain id

---
 beacon_node/client/src/client_config.rs | 15 +++++++++++++++
 beacon_node/eth2-libp2p/src/config.rs   |  7 +++++--
 eth2/types/src/chain_spec.rs            |  9 ++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/beacon_node/client/src/client_config.rs b/beacon_node/client/src/client_config.rs
index 166725b61..9ed2a7c6e 100644
--- a/beacon_node/client/src/client_config.rs
+++ b/beacon_node/client/src/client_config.rs
@@ -18,6 +18,21 @@ pub struct ClientConfig {
 
 impl Default for ClientConfig {
     fn default() -> Self {
+        let data_dir = {
+            let home = dirs::home_dir().expect("Unable to determine home dir.");
+            home.join(".lighthouse/")
+        };
+        fs::create_dir_all(&data_dir)
+            .unwrap_or_else(|_| panic!("Unable to create {:?}", &data_dir));
+
+        let default_spec = ChainSpec::lighthouse_testnet();
+        let default_pubsub_topics = vec![
+            default_spec.beacon_chain_topic.clone(),
+            default_spec.shard_topic_prefix.clone(),
+        ]; // simple singular attestation topic for now.
+        let default_net_conf =
+            NetworkConfig::new(default_spec.boot_nodes.clone(), default_pubsub_topics);
+
         Self {
             data_dir: PathBuf::from(".lighthouse"),
             db_type: "disk".to_string(),
diff --git a/beacon_node/eth2-libp2p/src/config.rs b/beacon_node/eth2-libp2p/src/config.rs
index ee2add75e..97559343a 100644
--- a/beacon_node/eth2-libp2p/src/config.rs
+++ b/beacon_node/eth2-libp2p/src/config.rs
@@ -2,6 +2,7 @@ use clap::ArgMatches;
 use libp2p::gossipsub::{GossipsubConfig, GossipsubConfigBuilder};
 use serde_derive::{Deserialize, Serialize};
 use types::multiaddr::{Error as MultiaddrError, Multiaddr};
+//use std::time::Duration;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
@@ -30,19 +31,21 @@ impl Default for Config {
             listen_addresses: vec!["/ip4/127.0.0.1/tcp/9000".to_string()],
             gs_config: GossipsubConfigBuilder::new()
                 .max_gossip_size(4_000_000)
+                //                .inactivity_timeout(Duration::from_secs(90))
                 .build(),
             identify_config: IdentifyConfig::default(),
             boot_nodes: vec![],
             client_version: version::version(),
-            topics: vec![String::from("beacon_chain")],
+            topics: Vec::new(),
         }
     }
 }
 
 impl Config {
-    pub fn new(boot_nodes: Vec<String>) -> Self {
+    pub fn new(boot_nodes: Vec<Multiaddr>, topics: Vec<String>) -> Self {
         let mut conf = Config::default();
         conf.boot_nodes = boot_nodes;
+        conf.topics = topics;
 
         conf
     }
diff --git a/eth2/types/src/chain_spec.rs b/eth2/types/src/chain_spec.rs
index 74ce40671..4fa79adcd 100644
--- a/eth2/types/src/chain_spec.rs
+++ b/eth2/types/src/chain_spec.rs
@@ -106,10 +106,11 @@ pub struct ChainSpec {
 
     /*
      * Network specific parameters
-     *
      */
     pub boot_nodes: Vec<Multiaddr>,
     pub chain_id: u8,
+    pub beacon_chain_topic: String,
+    pub shard_topic_prefix: String,
 }
 
 impl ChainSpec {
@@ -216,10 +217,12 @@ impl ChainSpec {
             domain_transfer: 5,
 
             /*
-             * Boot nodes
+             * Network specific
              */
             boot_nodes: vec![],
-            chain_id: 1, // mainnet chain id
+            chain_id: 1, // foundation chain id
+            beacon_chain_topic: String::from("beacon_chain"),
+            shard_topic_prefix: String::from("attestations"), // simple single attestation topic for now
         }
     }