Merge branch 'master' into onlynet
This commit is contained in:
commit
67635a9336
|
@ -27,7 +27,7 @@ pub fn start(cfg: config::Config) -> Result<(), String> {
|
||||||
relay: false,
|
relay: false,
|
||||||
},
|
},
|
||||||
peers: cfg.connect.map_or_else(|| vec![], |x| vec![x]),
|
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,
|
node_table_path: nodes_path,
|
||||||
internet_protocol: cfg.internet_protocol,
|
internet_protocol: cfg.internet_protocol,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,13 +2,14 @@ use std::net;
|
||||||
use clap;
|
use clap;
|
||||||
use network::Magic;
|
use network::Magic;
|
||||||
use p2p::InternetProtocol;
|
use p2p::InternetProtocol;
|
||||||
|
use seednodes::{mainnet_seednodes, testnet_seednodes};
|
||||||
use {USER_AGENT, REGTEST_USER_AGENT};
|
use {USER_AGENT, REGTEST_USER_AGENT};
|
||||||
|
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
pub magic: Magic,
|
pub magic: Magic,
|
||||||
pub port: u16,
|
pub port: u16,
|
||||||
pub connect: Option<net::SocketAddr>,
|
pub connect: Option<net::SocketAddr>,
|
||||||
pub seednode: Option<String>,
|
pub seednodes: Vec<String>,
|
||||||
pub print_to_console: bool,
|
pub print_to_console: bool,
|
||||||
pub inbound_connections: u32,
|
pub inbound_connections: u32,
|
||||||
pub outbound_connections: u32,
|
pub outbound_connections: u32,
|
||||||
|
@ -61,9 +62,13 @@ pub fn parse(matches: &clap::ArgMatches) -> Result<Config, String> {
|
||||||
None => None,
|
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") {
|
let db_cache = match matches.value_of("db-cache") {
|
||||||
|
@ -86,7 +91,7 @@ pub fn parse(matches: &clap::ArgMatches) -> Result<Config, String> {
|
||||||
magic: magic,
|
magic: magic,
|
||||||
port: port,
|
port: port,
|
||||||
connect: connect,
|
connect: connect,
|
||||||
seednode: seednode,
|
seednodes: seednodes,
|
||||||
inbound_connections: in_connections,
|
inbound_connections: in_connections,
|
||||||
outbound_connections: out_connections,
|
outbound_connections: out_connections,
|
||||||
p2p_threads: p2p_threads,
|
p2p_threads: p2p_threads,
|
||||||
|
|
|
@ -19,6 +19,7 @@ extern crate import;
|
||||||
|
|
||||||
mod commands;
|
mod commands;
|
||||||
mod config;
|
mod config;
|
||||||
|
mod seednodes;
|
||||||
mod util;
|
mod util;
|
||||||
|
|
||||||
use app_dirs::AppInfo;
|
use app_dirs::AppInfo;
|
||||||
|
|
|
@ -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"
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in New Issue