Bump rust-bitcoin, add addrv2

[dnsseed-rust] / src / datastore.rs

diff --git a/src/datastore.rs b/src/datastore.rs
index 6f4345883faca87005ab68984cb5a674827677e2..27987714d347f566ea79d662f6bc4343b9c314d8 100644 (file)
--- a/src/datastore.rs
+++ b/src/datastore.rs
@@ -1,11 +1,11 @@
-use std::{cmp, mem};
+use std::cmp;
 use std::collections::{HashSet, HashMap, hash_map};
 use std::sync::{Arc, RwLock};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::{Duration, Instant};
 use std::io::{BufRead, BufReader};
 
-use bitcoin::network::address::Address;
+use bitcoin::network::address::{Address, AddrV2Message};
 
 use rand::thread_rng;
 use rand::seq::{SliceRandom, IteratorRandom};
@@ -380,6 +380,14 @@ impl Store {
                        }
                }));
        }
+       pub fn add_fresh_nodes_v2(&self, addresses: &Vec<AddrV2Message>) {
+               self.add_fresh_addrs(addresses.iter().filter_map(|addr| {
+                       match addr.socket_addr() {
+                               Ok(socketaddr) => Some(socketaddr),
+                               Err(_) => None, // TODO: Handle onions
+                       }
+               }));
+       }
 
        pub fn set_node_state(&self, sockaddr: SocketAddr, state: AddressState, services: u64) -> AddressState {
                let addr: SockAddr = sockaddr.into();
@@ -608,9 +616,7 @@ impl Store {
                                let split_point = cmp::min(cmp::min(SECS_PER_SCAN_RESULTS * state_nodes.len() as u64 / rescan_interval,
                                                        SECS_PER_SCAN_RESULTS * MAX_CONNS_PER_SEC_PER_STATUS),
                                                state_nodes.len() as u64);
-                               let mut new_nodes = state_nodes.split_off(split_point as usize);
-                               mem::swap(&mut new_nodes, state_nodes);
-                               for node in new_nodes.drain(..) {
+                               for node in state_nodes.drain(..split_point as usize) {
                                        nodes.nodes_to_state.get_mut(&node).unwrap().queued = false;
                                        res.push((&node).into());
                                }