Stop persisting peer addresses to disk and use the public gossip db

Its always been a bit strange that we persist the addresses of our
peers to disk when there's a public gossip db, its not really a
thing most LN nodes do. It might be useful for private channels but
there's not a lot of reason to have it in `ldk-sample`.

Author: TheBlueMatt

src/cli.rs

@@ -1,4 +1,4 @@
-use crate::disk::{self, INBOUND_PAYMENTS_FNAME, OUTBOUND_PAYMENTS_FNAME};
+use crate::disk::{INBOUND_PAYMENTS_FNAME, OUTBOUND_PAYMENTS_FNAME};
 use crate::hex_utils;
 use crate::{
 	ChainMonitor, ChannelManager, HTLCStatus, InboundPaymentInfoStorage, MillisatAmount,
@@ -29,7 +29,6 @@ use lightning_persister::fs_store::FilesystemStore;
 use std::env;
 use std::io::Write;
 use std::net::{SocketAddr, ToSocketAddrs};
-use std::path::Path;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
@@ -52,8 +51,7 @@ pub(crate) async fn poll_for_user_input(
 	peer_manager: Arc<PeerManager>, channel_manager: Arc<ChannelManager>,
 	chain_monitor: Arc<ChainMonitor>, keys_manager: Arc<KeysManager>,
 	network_graph: Arc<NetworkGraph>, inbound_payments: Arc<Mutex<InboundPaymentInfoStorage>>,
-	outbound_payments: Arc<Mutex<OutboundPaymentInfoStorage>>, ldk_data_dir: String,
-	fs_store: Arc<FilesystemStore>,
+	outbound_payments: Arc<Mutex<OutboundPaymentInfoStorage>>, fs_store: Arc<FilesystemStore>,
 ) {
 	println!(
 		"LDK startup successful. Enter \"help\" to view available commands. Press Ctrl-D to quit."
@@ -144,24 +142,13 @@ pub(crate) async fn poll_for_user_input(
 						}
 					}
 
-					if open_channel(
+					let _ = open_channel(
 						pubkey,
 						chan_amt_sat.unwrap(),
 						announce_channel,
 						with_anchors,
 						channel_manager.clone(),
-					)
-					.is_ok()
-					{
-						if peer_addr_str.is_some() {
-							let peer_data_path =
-								format!("{}/channel_peer_data", ldk_data_dir.clone());
-							let _ = disk::persist_channel_peer(
-								Path::new(&peer_data_path),
-								peer_pubkey_and_ip_addr,
-							);
-						}
-					}
+					);
 				},
 				"sendpayment" => {
 					let invoice_str = words.next();

src/disk.rs

@@ -1,15 +1,13 @@
-use crate::{cli, InboundPaymentInfoStorage, NetworkGraph, OutboundPaymentInfoStorage};
-use bitcoin::secp256k1::PublicKey;
+use crate::{InboundPaymentInfoStorage, NetworkGraph, OutboundPaymentInfoStorage};
 use bitcoin::Network;
 use chrono::Utc;
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters};
-use lightning::util::hash_tables::{new_hash_map, HashMap};
+use lightning::util::hash_tables::new_hash_map;
 use lightning::util::logger::{Level, Logger, Record};
 use lightning::util::ser::{Readable, ReadableArgs};
 use std::fs;
 use std::fs::File;
-use std::io::{BufRead, BufReader, Write};
-use std::net::SocketAddr;
+use std::io::{BufReader, Write};
 use std::path::Path;
 use std::sync::Arc;
 
@@ -54,30 +52,6 @@ impl Logger for FilesystemLogger {
 			.unwrap();
 	}
 }
-pub(crate) fn persist_channel_peer(path: &Path, peer_info: &str) -> std::io::Result<()> {
-	let mut file = fs::OpenOptions::new().create(true).append(true).open(path)?;
-	file.write_all(format!("{}\n", peer_info).as_bytes())
-}
-
-pub(crate) fn read_channel_peer_data(
-	path: &Path,
-) -> Result<HashMap<PublicKey, SocketAddr>, std::io::Error> {
-	let mut peer_data = new_hash_map();
-	if !Path::new(&path).exists() {
-		return Ok(new_hash_map());
-	}
-	let file = File::open(path)?;
-	let reader = BufReader::new(file);
-	for line in reader.lines() {
-		match cli::parse_peer_info(line.unwrap()) {
-			Ok((pubkey, socket_addr)) => {
-				peer_data.insert(pubkey, socket_addr);
-			},
-			Err(e) => return Err(e),
-		}
-	}
-	Ok(peer_data)
-}
 
 pub(crate) fn read_network(
 	path: &Path, network: Network, logger: Arc<FilesystemLogger>,

src/main.rs

@@ -1083,37 +1083,47 @@ async fn start_ldk() {
 	// Regularly reconnect to channel peers.
 	let connect_cm = Arc::clone(&channel_manager);
 	let connect_pm = Arc::clone(&peer_manager);
-	let peer_data_path = format!("{}/channel_peer_data", ldk_data_dir);
 	let stop_connect = Arc::clone(&stop_listen_connect);
+	let graph_connect = Arc::clone(&network_graph);
 	tokio::spawn(async move {
 		let mut interval = tokio::time::interval(Duration::from_secs(1));
 		interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
 		loop {
 			interval.tick().await;
-			match disk::read_channel_peer_data(Path::new(&peer_data_path)) {
-				Ok(info) => {
-					for node_id in connect_cm
-						.list_channels()
-						.iter()
-						.map(|chan| chan.counterparty.node_id)
-						.filter(|id| connect_pm.peer_by_node_id(id).is_none())
-					{
-						if stop_connect.load(Ordering::Acquire) {
-							return;
-						}
-						for (pubkey, peer_addr) in info.iter() {
-							if *pubkey == node_id {
-								let _ = cli::do_connect_peer(
-									*pubkey,
-									peer_addr.clone(),
-									Arc::clone(&connect_pm),
-								)
-								.await;
-							}
-						}
+			for node_id in connect_cm
+				.list_channels()
+				.iter()
+				.map(|chan| chan.counterparty.node_id)
+				.filter(|id| connect_pm.peer_by_node_id(id).is_none())
+			{
+				if stop_connect.load(Ordering::Acquire) {
+					return;
+				}
+				let id = NodeId::from_pubkey(&node_id);
+				let addrs = if let Some(node) = graph_connect.read_only().node(&id) {
+					if let Some(ann) = &node.announcement_info {
+						let non_onion = |addr| match addr {
+							&lightning::ln::msgs::SocketAddress::OnionV2(_) => None,
+							&lightning::ln::msgs::SocketAddress::OnionV3 { .. } => None,
+							_ => Some(addr.clone()),
+						};
+						ann.addresses().iter().filter_map(non_onion).collect::<Vec<_>>()
+					} else {
+						Vec::new()
 					}
-				},
-				Err(e) => println!("ERROR: errored reading channel peer info from disk: {:?}", e),
+				} else {
+					Vec::new()
+				};
+				for addr in addrs {
+					let sockaddrs = addr.to_socket_addrs();
+					if sockaddrs.is_err() {
+						continue;
+					}
+					for sockaddr in sockaddrs.unwrap() {
+						let _ =
+							cli::do_connect_peer(node_id, sockaddr, Arc::clone(&connect_pm)).await;
+					}
+				}
 			}
 		}
 	});
@@ -1165,7 +1175,6 @@ async fn start_ldk() {
 			network_graph,
 			inbound_payments,
 			outbound_payments,
-			ldk_data_dir,
 			cli_persister,
 		)
 	);