Merge branch 'master' into onlynet

pbtc/commands/start.rs

@@ -27,7 +27,7 @@ pub fn start(cfg: config::Config) -> Result<(), String> {
 			relay: false,
 		},
 		peers: cfg.connect.map_or_else(|| vec![], |x| vec![x]),
-		seeds: cfg.seednode.map_or_else(|| vec![], |x| vec![x]),
+		seeds: cfg.seednodes,
 		node_table_path: nodes_path,
 		internet_protocol: cfg.internet_protocol,
 	};

pbtc/config.rs

@@ -2,13 +2,14 @@ use std::net;
 use clap;
 use network::Magic;
 use p2p::InternetProtocol;
+use seednodes::{mainnet_seednodes, testnet_seednodes};
 use {USER_AGENT, REGTEST_USER_AGENT};
 
 pub struct Config {
 	pub magic: Magic,
 	pub port: u16,
 	pub connect: Option<net::SocketAddr>,
-	pub seednode: Option<String>,
+	pub seednodes: Vec<String>,
 	pub print_to_console: bool,
 	pub inbound_connections: u32,
 	pub outbound_connections: u32,
@@ -61,9 +62,13 @@ pub fn parse(matches: &clap::ArgMatches) -> Result<Config, String> {
 		None => None,
 	};
 
-	let seednode = match matches.value_of("seednode") {
+	let seednodes = match matches.value_of("seednode") {
-		Some(s) => Some(try!(s.parse().map_err(|_| "Invalid seednode".to_owned()))),
+		Some(s) => vec![try!(s.parse().map_err(|_| "Invalid seednode".to_owned()))],
-		None => None,
+		None => match magic {
+			Magic::Mainnet => mainnet_seednodes().into_iter().map(Into::into).collect(),
+			Magic::Testnet => testnet_seednodes().into_iter().map(Into::into).collect(),
+			Magic::Other(_) | Magic::Regtest => Vec::new(),
+		},
 	};
 
 	let db_cache = match matches.value_of("db-cache") {
@@ -86,7 +91,7 @@ pub fn parse(matches: &clap::ArgMatches) -> Result<Config, String> {
 		magic: magic,
 		port: port,
 		connect: connect,
-		seednode: seednode,
+		seednodes: seednodes,
 		inbound_connections: in_connections,
 		outbound_connections: out_connections,
 		p2p_threads: p2p_threads,

pbtc/main.rs

@@ -19,6 +19,7 @@ extern crate import;
 
 mod commands;
 mod config;
+mod seednodes;
 mod util;
 
 use app_dirs::AppInfo;

pbtc/seednodes.rs

@@ -0,0 +1,26 @@
+
+pub fn mainnet_seednodes() -> Vec<&'static str> {
+	vec![
+		// Pieter Wuille
+		"seed.bitcoin.sipa.be:8333",
+		// Matt Corallo
+		"dnsseed.bluematt.me:8333",
+		// Luke Dashjr
+		"dnsseed.bitcoin.dashjr.org:8333",
+		// Christian Decker
+		"seed.bitcoinstats.com:8333",
+		// Jeff Garzik
+		"bitseed.xf2.org:8333",
+		// Jonas Schnelli
+		"seed.bitcoin.jonasschnelli.ch:8333"
+	]
+}
+
+pub fn testnet_seednodes() -> Vec<&'static str> {
+	vec![
+		"testnet-seed.bitcoin.jonasschnelli.ch:18333",
+		"seed.tbtc.petertodd.org:18333",
+		"testnet-seed.bluematt.me:18333",
+		"testnet-seed.bitcoin.schildbach.de:18333"
+	]
+}