X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=7495d17229e035563702b458eda097416770acfb;hb=18a1f7614129571ce67d63521e79a0fbf4d7de1b;hp=ae38a5bc3e6845fcf3a658812f49233339673873;hpb=57dd4b03b074c5a27f59e487f7171fcf7b39bfef;p=dnsseed-rust diff --git a/src/main.rs b/src/main.rs index ae38a5b..7495d17 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,15 +4,16 @@ mod peer; mod timeout_stream; mod datastore; -use std::env; +use std::{cmp, env}; use std::collections::HashMap; use std::sync::{Arc, Mutex}; use std::sync::atomic::{Ordering, AtomicBool}; use std::time::{Duration, Instant}; -use std::net::SocketAddr; +use std::net::{SocketAddr, ToSocketAddrs}; use bitcoin_hashes::sha256d; +use bitcoin::blockdata::block::Block; use bitcoin::blockdata::constants::genesis_block; use bitcoin::network::constants::Network; use bitcoin::network::message::NetworkMessage; @@ -27,15 +28,17 @@ use timeout_stream::TimeoutStream; use tokio::prelude::*; use tokio::timer::Delay; +static mut REQUEST_BLOCK: Option>>> = None; static mut HIGHEST_HEADER: Option>> = None; static mut HEADER_MAP: Option>>> = None; static mut HEIGHT_MAP: Option>>> = None; static mut DATA_STORE: Option> = None; static mut PRINTER: Option> = None; pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false); +static SCANNING: AtomicBool = AtomicBool::new(false); struct PeerState { - request: (u64, sha256d::Hash), + request: Arc<(u64, sha256d::Hash, Block)>, node_services: u64, msg: (String, bool), fail_reason: AddressState, @@ -58,7 +61,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) { node_services: 0, fail_reason: AddressState::Timeout, msg: (String::new(), false), - request: (0, Default::default()), + request: Arc::clone(&unsafe { REQUEST_BLOCK.as_ref().unwrap() }.lock().unwrap()), })); let final_peer_state = Arc::clone(&peer_state); @@ -68,10 +71,6 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) { Peer::new(node.clone(), Duration::from_secs(timeout), printer) }); tokio::spawn(peer.and_then(move |(mut write, read)| { - let requested_height = unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().1 - 1008; - let requested_block = unsafe { HEIGHT_MAP.as_ref().unwrap() }.lock().unwrap().get(&requested_height).unwrap().clone(); - peer_state.lock().unwrap().request = (requested_height, requested_block); - TimeoutStream::new_timeout(read, scan_time + Duration::from_secs(store.get_u64(U64Setting::RunTimeout))).map_err(|_| { () }).for_each(move |msg| { let mut state_lock = peer_state.lock().unwrap(); macro_rules! check_set_flag { @@ -151,8 +150,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) { unsafe { DATA_STORE.as_ref().unwrap() }.add_fresh_nodes(&addrs); }, NetworkMessage::Block(block) => { - if block.header.bitcoin_hash() != state_lock.request.1 || - !block.check_merkle_root() || !block.check_witness_commitment() { + if block != state_lock.request.2 { state_lock.fail_reason = AddressState::ProtocolViolation; state_lock.msg = ("ProtocolViolation due to bad block".to_string(), true); return future::err(()); @@ -182,24 +180,49 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) { let old_state = store.set_node_state(node, state_lock.fail_reason, 0); if old_state != state_lock.fail_reason && state_lock.msg.0 != "" && state_lock.msg.1 { printer.add_line(format!("Updating {} from {} to {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1); + } else if old_state != state_lock.fail_reason && state_lock.fail_reason == AddressState::TimeoutDuringRequest { + printer.add_line(format!("Updating {} from {} to Timeout During Request (ver: {}, vack: {}, addr: {}, block: {})", + node, old_state.to_str(), state_lock.recvd_version, state_lock.recvd_verack, state_lock.recvd_addrs, state_lock.recvd_block), true); } } future::ok(()) })); } +fn poll_dnsseeds() { + tokio::spawn(future::lazy(|| { + let printer = unsafe { PRINTER.as_ref().unwrap() }; + let store = unsafe { DATA_STORE.as_ref().unwrap() }; + + let mut new_addrs = 0; + for seed in ["seed.bitcoin.sipa.be", "dnsseed.bitcoin.dashjr.org", "seed.bitcoinstats.com", "seed.bitcoin.jonasschnelli.ch", "seed.btc.petertodd.org", "seed.bitcoin.sprovoost.nl", "dnsseed.emzy.de"].iter() { + new_addrs += store.add_fresh_addrs((*seed, 8333u16).to_socket_addrs().unwrap_or(Vec::new().into_iter())); + new_addrs += store.add_fresh_addrs((("x9.".to_string() + seed).as_str(), 8333u16).to_socket_addrs().unwrap_or(Vec::new().into_iter())); + } + printer.add_line(format!("Added {} new addresses from other DNS seeds", new_addrs), false); + Delay::new(Instant::now() + Duration::from_secs(60)).then(|_| { + if !START_SHUTDOWN.load(Ordering::Relaxed) { + poll_dnsseeds(); + } + future::ok(()) + }) + })); +} + fn scan_net() { tokio::spawn(future::lazy(|| { let store = unsafe { DATA_STORE.as_ref().unwrap() }; + let mut scan_nodes = store.get_next_scan_nodes(); let per_iter_time = Duration::from_millis(1000 / store.get_u64(U64Setting::ConnsPerSec)); - let mut iter_time = Instant::now(); + let start_time = Instant::now(); + let mut iter_time = start_time; for node in scan_nodes.drain(..) { scan_node(iter_time, node); iter_time += per_iter_time; } - Delay::new(iter_time).then(|_| { + Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(15))).then(|_| { let store = unsafe { DATA_STORE.as_ref().unwrap() }; store.save_data().then(|_| { if !START_SHUTDOWN.load(Ordering::Relaxed) { @@ -229,6 +252,9 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { starting_height = ver.start_height; }, NetworkMessage::Verack => { + if let Err(_) = trusted_write.try_send(NetworkMessage::SendHeaders) { + return future::err(()); + } if let Err(_) = trusted_write.try_send(NetworkMessage::GetHeaders(GetHeadersMessage { version: 70015, locator_hashes: vec![unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().0.clone()], @@ -249,6 +275,7 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { } let mut header_map = unsafe { HEADER_MAP.as_ref().unwrap() }.lock().unwrap(); let mut height_map = unsafe { HEIGHT_MAP.as_ref().unwrap() }.lock().unwrap(); + if let Some(height) = header_map.get(&headers[0].prev_blockhash).cloned() { for i in 0..headers.len() { let hash = headers[i].bitcoin_hash(); @@ -258,12 +285,19 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { header_map.insert(headers[i].bitcoin_hash(), height + 1 + (i as u64)); height_map.insert(height + 1 + (i as u64), headers[i].bitcoin_hash()); } + let top_height = height + headers.len() as u64; *unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap() = (headers.last().unwrap().bitcoin_hash(), top_height); printer.set_stat(printer::Stat::HeaderCount(top_height)); + if top_height >= starting_height as u64 { - scan_net(); + if let Err(_) = trusted_write.try_send(NetworkMessage::GetData(vec![Inventory { + inv_type: InvType::WitnessBlock, + hash: height_map.get(&(top_height - 1008)).unwrap().clone(), + }])) { + return future::err(()); + } } } else { // Wat? Lets start again... @@ -277,6 +311,18 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { return future::err(()) } }, + NetworkMessage::Block(block) => { + let hash = block.header.bitcoin_hash(); + let header_map = unsafe { HEADER_MAP.as_ref().unwrap() }.lock().unwrap(); + let height = *header_map.get(&hash).expect("Got loose block from trusted peer we coulnd't have requested"); + if height == unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().1 - 1008 { + *unsafe { REQUEST_BLOCK.as_ref().unwrap() }.lock().unwrap() = Arc::new((height, hash, block)); + if !SCANNING.swap(true, Ordering::SeqCst) { + scan_net(); + poll_dnsseeds(); + } + } + }, NetworkMessage::Ping(v) => { if let Err(_) = trusted_write.try_send(NetworkMessage::Pong(v)) { return future::err(()) @@ -303,13 +349,18 @@ fn main() { return; } - unsafe { HEADER_MAP = Some(Box::new(Mutex::new(HashMap::new()))) }; - unsafe { HEIGHT_MAP = Some(Box::new(Mutex::new(HashMap::new()))) }; + unsafe { HEADER_MAP = Some(Box::new(Mutex::new(HashMap::with_capacity(600000)))) }; + unsafe { HEIGHT_MAP = Some(Box::new(Mutex::new(HashMap::with_capacity(600000)))) }; unsafe { HEADER_MAP.as_ref().unwrap() }.lock().unwrap().insert(genesis_block(Network::Bitcoin).bitcoin_hash(), 0); unsafe { HEIGHT_MAP.as_ref().unwrap() }.lock().unwrap().insert(0, genesis_block(Network::Bitcoin).bitcoin_hash()); unsafe { HIGHEST_HEADER = Some(Box::new(Mutex::new((genesis_block(Network::Bitcoin).bitcoin_hash(), 0)))) }; + unsafe { REQUEST_BLOCK = Some(Box::new(Mutex::new(Arc::new((0, genesis_block(Network::Bitcoin).bitcoin_hash(), genesis_block(Network::Bitcoin)))))) }; - tokio::run(future::lazy(|| { + let trt = tokio::runtime::Builder::new() + .blocking_threads(2).core_threads(num_cpus::get().max(1) * 3) + .build().unwrap(); + + let _ = trt.block_on_all(future::lazy(|| { let mut args = env::args(); args.next(); let path = args.next().unwrap();