X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=bfb586adfbe630c3df9ff7fc31b51c67d493ff9c;hb=ed39ac6dd5f0b297fe4bf1468b2c0e6e20ce9f9d;hp=f740cd1d604c32e1c379ebcc2a53106b99dc4533;hpb=1b034d63a4cb4e0b249ae6240166513b6be76737;p=ldk-sample

diff --git a/src/main.rs b/src/main.rs
index f740cd1..bfb586a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,424 +1,618 @@
-mod bitcoind_client;
+pub mod bitcoind_client;
 mod cli;
-mod utils;
+mod convert;
+mod disk;
+mod hex_utils;
 
-use background_processor::BackgroundProcessor;
-use bitcoin::{BlockHash, Txid};
+use crate::bitcoind_client::BitcoindClient;
+use crate::disk::FilesystemLogger;
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hashes::sha256::Hash as Sha256;
+use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
 use bitcoin::secp256k1::Secp256k1;
-use bitcoin::util::address::Address;
+use bitcoin::BlockHash;
 use bitcoin_bech32::WitnessProgram;
-use crate::bitcoind_client::BitcoindClient;
 use lightning::chain;
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
-use lightning::chain::chainmonitor::ChainMonitor;
-use lightning::chain::channelmonitor::ChannelMonitor;
-use lightning::chain::Filter;
+use lightning::chain::chainmonitor;
 use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager};
-use lightning::chain::transaction::OutPoint;
-use lightning::chain::Watch;
+use lightning::chain::{BestBlock, Filter, Watch};
 use lightning::ln::channelmanager;
-use lightning::ln::channelmanager::{ChannelManagerReadArgs, PaymentHash, PaymentPreimage,
-                                    SimpleArcChannelManager};
+use lightning::ln::channelmanager::{
+	ChainParameters, ChannelManagerReadArgs, SimpleArcChannelManager,
+};
 use lightning::ln::peer_handler::{MessageHandler, SimpleArcPeerManager};
+use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::routing::network_graph::NetGraphMsgHandler;
 use lightning::util::config::UserConfig;
-use lightning::util::events::{Event, EventsProvider};
-use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{ReadableArgs, Writer};
-use lightning_block_sync::UnboundedCache;
-use lightning_block_sync::SpvClient;
-use lightning_block_sync::http::HttpEndpoint;
+use lightning::util::events::{Event, PaymentPurpose};
+use lightning::util::ser::ReadableArgs;
+use lightning_background_processor::BackgroundProcessor;
 use lightning_block_sync::init;
 use lightning_block_sync::poll;
-use lightning_block_sync::poll::{ChainTip, Poll};
-use lightning_block_sync::rpc::RpcClient;
+use lightning_block_sync::SpvClient;
+use lightning_block_sync::UnboundedCache;
 use lightning_net_tokio::SocketDescriptor;
 use lightning_persister::FilesystemPersister;
 use rand::{thread_rng, Rng};
-use lightning::routing::network_graph::NetGraphMsgHandler;
-use std::cell::RefCell;
+use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::fmt;
 use std::fs;
 use std::fs::File;
-use std::io::Cursor;
+use std::io;
+use std::io::Write;
+use std::ops::Deref;
 use std::path::Path;
-use std::str::FromStr;
 use std::sync::{Arc, Mutex};
-use std::thread;
 use std::time::{Duration, SystemTime};
-use time::OffsetDateTime;
-use tokio::runtime::Runtime;
-use tokio::sync::mpsc;
-
-const NETWORK: Network = Network::Regtest;
-
-pub struct FilesystemLogger{}
-impl Logger for FilesystemLogger {
-	  fn log(&self, record: &Record) {
-		    let raw_log = record.args.to_string();
-			  let log = format!("{} {:<5} [{}:{}] {}", OffsetDateTime::now_utc().format("%F %T"),
-                  record.level.to_string(), record.module_path, record.line, raw_log);
-        fs::create_dir_all("logs").unwrap();
-        fs::OpenOptions::new().create(true).append(true).open("./logs/logs.txt").unwrap()
-            .write_all(log.as_bytes()).unwrap();
-	  }
+
+pub(crate) enum HTLCStatus {
+	Pending,
+	Succeeded,
+	Failed,
 }
 
-fn read_channelmonitors_from_disk(path: String, keys_manager: Arc<KeysManager>) ->
-    Result<HashMap<OutPoint, (BlockHash, ChannelMonitor<InMemorySigner>)>, std::io::Error>
-{
-    if !Path::new(&path).exists() {
-        return Ok(HashMap::new())
-    }
-    let mut outpoint_to_channelmonitor = HashMap::new();
-    for file_option in fs::read_dir(path).unwrap() {
-        let file = file_option.unwrap();
-        let owned_file_name = file.file_name();
-        let filename = owned_file_name.to_str();
-        if !filename.is_some() || !filename.unwrap().is_ascii() || filename.unwrap().len() < 65 {
-            return Err(std::io::Error::new(std::io::ErrorKind::Other, "Invalid ChannelMonitor file name"));
-        }
-
-        let txid = Txid::from_hex(filename.unwrap().split_at(64).0);
-        if txid.is_err() {
-            return Err(std::io::Error::new(std::io::ErrorKind::Other, "Invalid tx ID in filename"));
-        }
-
-        let index = filename.unwrap().split_at(65).1.split('.').next().unwrap().parse();
-        if index.is_err() {
-            return Err(std::io::Error::new(std::io::ErrorKind::Other, "Invalid tx index in filename"));
-        }
-
-        let contents = fs::read(&file.path())?;
-
-        if let Ok((blockhash, channel_monitor)) =
-            <(BlockHash, ChannelMonitor<InMemorySigner>)>::read(&mut Cursor::new(&contents),
-                                                        &*keys_manager)
-        {
-                outpoint_to_channelmonitor.insert(OutPoint { txid: txid.unwrap(), index: index.unwrap() },
-                                                  (blockhash, channel_monitor));
-            } else {
-                return Err(std::io::Error::new(std::io::ErrorKind::Other,
-                                           "Failed to deserialize ChannelMonitor"));
-            }
-    }
-    Ok(outpoint_to_channelmonitor)
+pub(crate) struct MillisatAmount(Option<u64>);
+
+impl fmt::Display for MillisatAmount {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self.0 {
+			Some(amt) => write!(f, "{}", amt),
+			None => write!(f, "unknown"),
+		}
+	}
 }
 
-type Invoice = String;
+pub(crate) struct PaymentInfo {
+	preimage: Option<PaymentPreimage>,
+	secret: Option<PaymentSecret>,
+	status: HTLCStatus,
+	amt_msat: MillisatAmount,
+}
 
-enum HTLCDirection {
-    Inbound,
-    Outbound
+pub(crate) type PaymentInfoStorage = Arc<Mutex<HashMap<PaymentHash, PaymentInfo>>>;
+
+type ChainMonitor = chainmonitor::ChainMonitor<
+	InMemorySigner,
+	Arc<dyn Filter + Send + Sync>,
+	Arc<BitcoindClient>,
+	Arc<BitcoindClient>,
+	Arc<FilesystemLogger>,
+	Arc<FilesystemPersister>,
+>;
+
+pub(crate) type PeerManager = SimpleArcPeerManager<
+	SocketDescriptor,
+	ChainMonitor,
+	BitcoindClient,
+	BitcoindClient,
+	dyn chain::Access + Send + Sync,
+	FilesystemLogger,
+>;
+
+pub(crate) type ChannelManager =
+	SimpleArcChannelManager<ChainMonitor, BitcoindClient, BitcoindClient, FilesystemLogger>;
+
+async fn handle_ldk_events(
+	channel_manager: Arc<ChannelManager>, bitcoind_client: Arc<BitcoindClient>,
+	keys_manager: Arc<KeysManager>, inbound_payments: PaymentInfoStorage,
+	outbound_payments: PaymentInfoStorage, network: Network, event: Event,
+) {
+	match event {
+		Event::FundingGenerationReady {
+			temporary_channel_id,
+			channel_value_satoshis,
+			output_script,
+			..
+		} => {
+			// Construct the raw transaction with one output, that is paid the amount of the
+			// channel.
+			let addr = WitnessProgram::from_scriptpubkey(
+				&output_script[..],
+				match network {
+					Network::Bitcoin => bitcoin_bech32::constants::Network::Bitcoin,
+					Network::Testnet => bitcoin_bech32::constants::Network::Testnet,
+					Network::Regtest => bitcoin_bech32::constants::Network::Regtest,
+					Network::Signet => panic!("Signet unsupported"),
+				},
+			)
+			.expect("Lightning funding tx should always be to a SegWit output")
+			.to_address();
+			let mut outputs = vec![HashMap::with_capacity(1)];
+			outputs[0].insert(addr, channel_value_satoshis as f64 / 100_000_000.0);
+			let raw_tx = bitcoind_client.create_raw_transaction(outputs).await;
+
+			// Have your wallet put the inputs into the transaction such that the output is
+			// satisfied.
+			let funded_tx = bitcoind_client.fund_raw_transaction(raw_tx).await;
+			let change_output_position = funded_tx.changepos;
+			assert!(change_output_position == 0 || change_output_position == 1);
+
+			// Sign the final funding transaction and broadcast it.
+			let signed_tx = bitcoind_client.sign_raw_transaction_with_wallet(funded_tx.hex).await;
+			assert_eq!(signed_tx.complete, true);
+			let final_tx: Transaction =
+				encode::deserialize(&hex_utils::to_vec(&signed_tx.hex).unwrap()).unwrap();
+			// Give the funding transaction back to LDK for opening the channel.
+			if channel_manager
+				.funding_transaction_generated(&temporary_channel_id, final_tx)
+				.is_err()
+			{
+				println!(
+					"\nERROR: Channel went away before we could fund it. The peer disconnected or refused the channel.");
+				print!("> ");
+				io::stdout().flush().unwrap();
+			}
+		}
+		Event::PaymentReceived { payment_hash, purpose, amt, .. } => {
+			let mut payments = inbound_payments.lock().unwrap();
+			let (payment_preimage, payment_secret) = match purpose {
+				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
+					(payment_preimage, Some(payment_secret))
+				}
+				PaymentPurpose::SpontaneousPayment(preimage) => (Some(preimage), None),
+			};
+			let status = match channel_manager.claim_funds(payment_preimage.unwrap()) {
+				true => {
+					println!(
+						"\nEVENT: received payment from payment hash {} of {} millisatoshis",
+						hex_utils::hex_str(&payment_hash.0),
+						amt
+					);
+					print!("> ");
+					io::stdout().flush().unwrap();
+					HTLCStatus::Succeeded
+				}
+				_ => HTLCStatus::Failed,
+			};
+			match payments.entry(payment_hash) {
+				Entry::Occupied(mut e) => {
+					let payment = e.get_mut();
+					payment.status = status;
+					payment.preimage = payment_preimage;
+					payment.secret = payment_secret;
+				}
+				Entry::Vacant(e) => {
+					e.insert(PaymentInfo {
+						preimage: payment_preimage,
+						secret: payment_secret,
+						status,
+						amt_msat: MillisatAmount(Some(amt)),
+					});
+				}
+			}
+		}
+		Event::PaymentSent { payment_preimage } => {
+			let hashed = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner());
+			let mut payments = outbound_payments.lock().unwrap();
+			for (payment_hash, payment) in payments.iter_mut() {
+				if *payment_hash == hashed {
+					payment.preimage = Some(payment_preimage);
+					payment.status = HTLCStatus::Succeeded;
+					println!(
+						"\nEVENT: successfully sent payment of {} millisatoshis from \
+								 payment hash {:?} with preimage {:?}",
+						payment.amt_msat,
+						hex_utils::hex_str(&payment_hash.0),
+						hex_utils::hex_str(&payment_preimage.0)
+					);
+					print!("> ");
+					io::stdout().flush().unwrap();
+				}
+			}
+		}
+		Event::PaymentFailed { payment_hash, rejected_by_dest } => {
+			print!(
+				"\nEVENT: Failed to send payment to payment hash {:?}: ",
+				hex_utils::hex_str(&payment_hash.0)
+			);
+			if rejected_by_dest {
+				println!("re-attempting the payment will not succeed");
+			} else {
+				println!("payment may be retried");
+			}
+			print!("> ");
+			io::stdout().flush().unwrap();
+
+			let mut payments = outbound_payments.lock().unwrap();
+			if payments.contains_key(&payment_hash) {
+				let payment = payments.get_mut(&payment_hash).unwrap();
+				payment.status = HTLCStatus::Failed;
+			}
+		}
+		Event::PendingHTLCsForwardable { time_forwardable } => {
+			let forwarding_channel_manager = channel_manager.clone();
+			tokio::spawn(async move {
+				let min = time_forwardable.as_millis() as u64;
+				let millis_to_sleep = thread_rng().gen_range(min, min * 5) as u64;
+				tokio::time::sleep(Duration::from_millis(millis_to_sleep)).await;
+				forwarding_channel_manager.process_pending_htlc_forwards();
+			});
+		}
+		Event::SpendableOutputs { outputs } => {
+			let destination_address = bitcoind_client.get_new_address().await;
+			let output_descriptors = &outputs.iter().map(|a| a).collect::<Vec<_>>();
+			let tx_feerate =
+				bitcoind_client.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
+			let spending_tx = keys_manager
+				.spend_spendable_outputs(
+					output_descriptors,
+					Vec::new(),
+					destination_address.script_pubkey(),
+					tx_feerate,
+					&Secp256k1::new(),
+				)
+				.unwrap();
+			bitcoind_client.broadcast_transaction(&spending_tx);
+		}
+	}
 }
 
-type PaymentInfoStorage = Arc<Mutex<HashMap<PaymentHash, (Invoice, Option<PaymentPreimage>, HTLCDirection)>>>;
-
-type ArcChainMonitor = ChainMonitor<InMemorySigner, Arc<dyn Filter>, Arc<BitcoindClient>,
-Arc<BitcoindClient>, Arc<FilesystemLogger>, Arc<FilesystemPersister>>;
-
-pub(crate) type PeerManager = SimpleArcPeerManager<SocketDescriptor, ArcChainMonitor, BitcoindClient,
-BitcoindClient, dyn chain::Access, FilesystemLogger>;
-
-pub(crate) type ChannelManager = SimpleArcChannelManager<ArcChainMonitor, BitcoindClient, BitcoindClient,
-FilesystemLogger>;
-
-
-fn handle_ldk_events(peer_manager: Arc<PeerManager>, channel_manager: Arc<ChannelManager>,
-                     chain_monitor: Arc<ArcChainMonitor>, bitcoind_rpc_client: Arc<BitcoindClient>,
-                     keys_manager: Arc<KeysManager>, mut pending_txs: HashMap<OutPoint, Transaction>,
-                     htlcs: PaymentInfoStorage) -> HashMap<OutPoint, Transaction>
-{
-    peer_manager.process_events();
-    let mut check_for_more_events = true;
-    while check_for_more_events {
-        let loop_channel_manager = channel_manager.clone();
-        check_for_more_events = false;
-        let mut events = channel_manager.get_and_clear_pending_events();
-		    events.append(&mut chain_monitor.get_and_clear_pending_events());
-        let mut rpc = bitcoind_rpc_client.bitcoind_rpc_client.lock().unwrap();
-        for event in events {
-			      match event {
-				        Event::FundingGenerationReady { temporary_channel_id, channel_value_satoshis,
-                                                output_script, .. } => {
-					          let addr = WitnessProgram::from_scriptpubkey(&output_script[..], match NETWORK {
-							          Network::Bitcoin => bitcoin_bech32::constants::Network::Bitcoin,
-							          Network::Testnet => bitcoin_bech32::constants::Network::Testnet,
-							          Network::Regtest => bitcoin_bech32::constants::Network::Regtest,
-						        }
-					          ).expect("Lightning funding tx should always be to a SegWit output").to_address();
-					          let outputs = format!("{{\"{}\": {}}}", addr, channel_value_satoshis as f64 / 1_000_000_00.0).to_string();
-                    let tx_hex = rpc.call_method("createrawtransaction", &vec![serde_json::json!(outputs)]).unwrap();
-                    let raw_tx = format!("\"{}\"", tx_hex.as_str().unwrap()).to_string();
-                    let funded_tx = rpc.call_method("fundrawtransaction", &vec![serde_json::json!(raw_tx)]).unwrap();
-                    let change_output_position = funded_tx["changepos"].as_i64().unwrap();
-							      assert!(change_output_position == 0 || change_output_position == 1);
-							      let funded_tx = format!("\"{}\"", funded_tx["hex"].as_str().unwrap()).to_string();
-                    let signed_tx = rpc.call_method("signrawtransactionwithwallet",
-                                                    &vec![serde_json::json!(funded_tx)]).unwrap();
-								    assert_eq!(signed_tx["complete"].as_bool().unwrap(), true);
-                    let final_tx: Transaction = encode::deserialize(&utils::hex_to_vec(&signed_tx["hex"].as_str().unwrap()).unwrap()).unwrap();
-								    let outpoint = OutPoint {
-                        txid: final_tx.txid(),
-                        index: if change_output_position == 0 { 1 } else { 0 }
-                    };
-                    loop_channel_manager.funding_transaction_generated(&temporary_channel_id, outpoint);
-                    pending_txs.insert(outpoint, final_tx);
-                    check_for_more_events = true;
-				        },
-				        Event::FundingBroadcastSafe { funding_txo, .. } => {
-                    let funding_tx = pending_txs.remove(&funding_txo).unwrap();
-                    bitcoind_rpc_client.broadcast_transaction(&funding_tx);
-				        },
-				        Event::PaymentReceived { payment_hash, payment_secret, amt: amt_msat } => {
-                    let payment_info = htlcs.lock().unwrap();
-                    if let Some(htlc_info) = payment_info.get(&payment_hash) {
-						            assert!(loop_channel_manager.claim_funds(htlc_info.1.unwrap().clone(),
-                                                                 &payment_secret, amt_msat));
-                    } else {
-                        loop_channel_manager.fail_htlc_backwards(&payment_hash, &payment_secret);
-                    }
-                    check_for_more_events = true;
-				        },
-				        Event::PaymentSent { payment_preimage } => {
-                    let payment_info = htlcs.lock().unwrap();
-                    for (invoice, preimage_option, _) in payment_info.values() {
-                        if let Some(preimage) = preimage_option {
-                            if payment_preimage == *preimage {
-                                println!("NEW EVENT: successfully sent payment from invoice {} with preimage {}",
-                                         invoice, utils::hex_str(&payment_preimage.0));
-                            }
-                        }
-                    }
-				        },
-				        Event::PaymentFailed { payment_hash, rejected_by_dest } => {
-                    let payment_info = htlcs.lock().unwrap();
-                    let htlc_info = payment_info.get(&payment_hash).unwrap();
-                    print!("NEW EVENT: Failed to send payment to invoice {}:", htlc_info.0);
-                    if rejected_by_dest {
-                        println!("rejected by destination node");
-                    } else {
-                        println!("route failed");
-                    }
-				        },
-				        Event::PendingHTLCsForwardable { .. } => {
-                    loop_channel_manager.process_pending_htlc_forwards();
-                    check_for_more_events = true;
-				        },
-                Event::SpendableOutputs { outputs } => {
-                    let addr_args = vec![serde_json::json!("LDK output address")];
-                    let destination_address_str = rpc.call_method("getnewaddress", &addr_args).unwrap();
-                    let destination_address = Address::from_str(destination_address_str.as_str().unwrap()).unwrap();
-                    let output_descriptors = &outputs.iter().map(|a| a).collect::<Vec<_>>();
-                    let tx_feerate = bitcoind_rpc_client.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
-                    let spending_tx = keys_manager.spend_spendable_outputs(output_descriptors,
-                                                                           Vec::new(),
-                                                                           destination_address.script_pubkey(),
-                                                                           tx_feerate, &Secp256k1::new()).unwrap();
-                    bitcoind_rpc_client.broadcast_transaction(&spending_tx);
-                    // XXX maybe need to rescan and blah? but contrary to what matt's saying, it
-                    // looks like spend_spendable's got us covered
-                }
-            }
-        }
-    }
-    pending_txs
+async fn start_ldk() {
+	let args = match cli::parse_startup_args() {
+		Ok(user_args) => user_args,
+		Err(()) => return,
+	};
+
+	// Initialize the LDK data directory if necessary.
+	let ldk_data_dir = format!("{}/.ldk", args.ldk_storage_dir_path);
+	fs::create_dir_all(ldk_data_dir.clone()).unwrap();
+
+	// Initialize our bitcoind client.
+	let bitcoind_client = match BitcoindClient::new(
+		args.bitcoind_rpc_host.clone(),
+		args.bitcoind_rpc_port,
+		args.bitcoind_rpc_username.clone(),
+		args.bitcoind_rpc_password.clone(),
+	)
+	.await
+	{
+		Ok(client) => Arc::new(client),
+		Err(e) => {
+			println!("Failed to connect to bitcoind client: {}", e);
+			return;
+		}
+	};
+
+	// Check that the bitcoind we've connected to is running the network we expect
+	let bitcoind_chain = bitcoind_client.get_blockchain_info().await.chain;
+	if bitcoind_chain
+		!= match args.network {
+			bitcoin::Network::Bitcoin => "main",
+			bitcoin::Network::Testnet => "test",
+			bitcoin::Network::Regtest => "regtest",
+			bitcoin::Network::Signet => "signet",
+		} {
+		println!(
+			"Chain argument ({}) didn't match bitcoind chain ({})",
+			args.network, bitcoind_chain
+		);
+		return;
+	}
+
+	// ## Setup
+	// Step 1: Initialize the FeeEstimator
+
+	// BitcoindClient implements the FeeEstimator trait, so it'll act as our fee estimator.
+	let fee_estimator = bitcoind_client.clone();
+
+	// Step 2: Initialize the Logger
+	let logger = Arc::new(FilesystemLogger::new(ldk_data_dir.clone()));
+
+	// Step 3: Initialize the BroadcasterInterface
+
+	// BitcoindClient implements the BroadcasterInterface trait, so it'll act as our transaction
+	// broadcaster.
+	let broadcaster = bitcoind_client.clone();
+
+	// Step 4: Initialize Persist
+	let persister = Arc::new(FilesystemPersister::new(ldk_data_dir.clone()));
+
+	// Step 5: Initialize the ChainMonitor
+	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
+		None,
+		broadcaster.clone(),
+		logger.clone(),
+		fee_estimator.clone(),
+		persister.clone(),
+	));
+
+	// Step 6: Initialize the KeysManager
+
+	// The key seed that we use to derive the node privkey (that corresponds to the node pubkey) and
+	// other secret key material.
+	let keys_seed_path = format!("{}/keys_seed", ldk_data_dir.clone());
+	let keys_seed = if let Ok(seed) = fs::read(keys_seed_path.clone()) {
+		assert_eq!(seed.len(), 32);
+		let mut key = [0; 32];
+		key.copy_from_slice(&seed);
+		key
+	} else {
+		let mut key = [0; 32];
+		thread_rng().fill_bytes(&mut key);
+		match File::create(keys_seed_path.clone()) {
+			Ok(mut f) => {
+				f.write_all(&key).expect("Failed to write node keys seed to disk");
+				f.sync_all().expect("Failed to sync node keys seed to disk");
+			}
+			Err(e) => {
+				println!("ERROR: Unable to create keys seed file {}: {}", keys_seed_path, e);
+				return;
+			}
+		}
+		key
+	};
+	let cur = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
+	let keys_manager = Arc::new(KeysManager::new(&keys_seed, cur.as_secs(), cur.subsec_nanos()));
+
+	// Step 7: Read ChannelMonitor state from disk
+	let mut channelmonitors = persister.read_channelmonitors(keys_manager.clone()).unwrap();
+
+	// Step 8: Initialize the ChannelManager
+	let mut user_config = UserConfig::default();
+	user_config.peer_channel_config_limits.force_announced_channel_preference = false;
+	let mut restarting_node = true;
+	let (channel_manager_blockhash, mut channel_manager) = {
+		if let Ok(mut f) = fs::File::open(format!("{}/manager", ldk_data_dir.clone())) {
+			let mut channel_monitor_mut_references = Vec::new();
+			for (_, channel_monitor) in channelmonitors.iter_mut() {
+				channel_monitor_mut_references.push(channel_monitor);
+			}
+			let read_args = ChannelManagerReadArgs::new(
+				keys_manager.clone(),
+				fee_estimator.clone(),
+				chain_monitor.clone(),
+				broadcaster.clone(),
+				logger.clone(),
+				user_config,
+				channel_monitor_mut_references,
+			);
+			<(BlockHash, ChannelManager)>::read(&mut f, read_args).unwrap()
+		} else {
+			// We're starting a fresh node.
+			restarting_node = false;
+			let getinfo_resp = bitcoind_client.get_blockchain_info().await;
+
+			let chain_params = ChainParameters {
+				network: args.network,
+				best_block: BestBlock::new(
+					getinfo_resp.latest_blockhash,
+					getinfo_resp.latest_height as u32,
+				),
+			};
+			let fresh_channel_manager = channelmanager::ChannelManager::new(
+				fee_estimator.clone(),
+				chain_monitor.clone(),
+				broadcaster.clone(),
+				logger.clone(),
+				keys_manager.clone(),
+				user_config,
+				chain_params,
+			);
+			(getinfo_resp.latest_blockhash, fresh_channel_manager)
+		}
+	};
+
+	// Step 9: Sync ChannelMonitors and ChannelManager to chain tip
+	let mut chain_listener_channel_monitors = Vec::new();
+	let mut cache = UnboundedCache::new();
+	let mut chain_tip: Option<poll::ValidatedBlockHeader> = None;
+	if restarting_node {
+		let mut chain_listeners =
+			vec![(channel_manager_blockhash, &mut channel_manager as &mut dyn chain::Listen)];
+
+		for (blockhash, channel_monitor) in channelmonitors.drain(..) {
+			let outpoint = channel_monitor.get_funding_txo().0;
+			chain_listener_channel_monitors.push((
+				blockhash,
+				(channel_monitor, broadcaster.clone(), fee_estimator.clone(), logger.clone()),
+				outpoint,
+			));
+		}
+
+		for monitor_listener_info in chain_listener_channel_monitors.iter_mut() {
+			chain_listeners.push((
+				monitor_listener_info.0,
+				&mut monitor_listener_info.1 as &mut dyn chain::Listen,
+			));
+		}
+		chain_tip = Some(
+			init::synchronize_listeners(
+				&mut bitcoind_client.deref(),
+				args.network,
+				&mut cache,
+				chain_listeners,
+			)
+			.await
+			.unwrap(),
+		);
+	}
+
+	// Step 10: Give ChannelMonitors to ChainMonitor
+	for item in chain_listener_channel_monitors.drain(..) {
+		let channel_monitor = item.1 .0;
+		let funding_outpoint = item.2;
+		chain_monitor.watch_channel(funding_outpoint, channel_monitor).unwrap();
+	}
+
+	// Step 11: Optional: Initialize the NetGraphMsgHandler
+	let genesis = genesis_block(args.network).header.block_hash();
+	let network_graph_path = format!("{}/network_graph", ldk_data_dir.clone());
+	let network_graph = disk::read_network(Path::new(&network_graph_path), genesis);
+	let router = Arc::new(NetGraphMsgHandler::from_net_graph(
+		None::<Arc<dyn chain::Access + Send + Sync>>,
+		logger.clone(),
+		network_graph,
+	));
+	let router_persist = Arc::clone(&router);
+	tokio::spawn(async move {
+		let mut interval = tokio::time::interval(Duration::from_secs(600));
+		loop {
+			interval.tick().await;
+			if disk::persist_network(
+				Path::new(&network_graph_path),
+				&*router_persist.network_graph.read().unwrap(),
+			)
+			.is_err()
+			{
+				// Persistence errors here are non-fatal as we can just fetch the routing graph
+				// again later, but they may indicate a disk error which could be fatal elsewhere.
+				eprintln!(
+					"Warning: Failed to persist network graph, check your disk and permissions"
+				);
+			}
+		}
+	});
+
+	// Step 12: Initialize the PeerManager
+	let channel_manager: Arc<ChannelManager> = Arc::new(channel_manager);
+	let mut ephemeral_bytes = [0; 32];
+	rand::thread_rng().fill_bytes(&mut ephemeral_bytes);
+	let lightning_msg_handler =
+		MessageHandler { chan_handler: channel_manager.clone(), route_handler: router.clone() };
+	let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(
+		lightning_msg_handler,
+		keys_manager.get_node_secret(),
+		&ephemeral_bytes,
+		logger.clone(),
+	));
+
+	// ## Running LDK
+	// Step 13: Initialize networking
+
+	let peer_manager_connection_handler = peer_manager.clone();
+	let listening_port = args.ldk_peer_listening_port;
+	tokio::spawn(async move {
+		let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port))
+			.await
+			.expect("Failed to bind to listen port - is something else already listening on it?");
+		loop {
+			let peer_mgr = peer_manager_connection_handler.clone();
+			let tcp_stream = listener.accept().await.unwrap().0;
+			tokio::spawn(async move {
+				lightning_net_tokio::setup_inbound(
+					peer_mgr.clone(),
+					tcp_stream.into_std().unwrap(),
+				)
+				.await;
+			});
+		}
+	});
+
+	// Step 14: Connect and Disconnect Blocks
+	if chain_tip.is_none() {
+		chain_tip =
+			Some(init::validate_best_block_header(&mut bitcoind_client.deref()).await.unwrap());
+	}
+	let channel_manager_listener = channel_manager.clone();
+	let chain_monitor_listener = chain_monitor.clone();
+	let bitcoind_block_source = bitcoind_client.clone();
+	let network = args.network;
+	tokio::spawn(async move {
+		let mut derefed = bitcoind_block_source.deref();
+		let chain_poller = poll::ChainPoller::new(&mut derefed, network);
+		let chain_listener = (chain_monitor_listener, channel_manager_listener);
+		let mut spv_client =
+			SpvClient::new(chain_tip.unwrap(), chain_poller, &mut cache, &chain_listener);
+		loop {
+			spv_client.poll_best_tip().await.unwrap();
+			tokio::time::sleep(Duration::from_secs(1)).await;
+		}
+	});
+
+	// Step 15: Handle LDK Events
+	let channel_manager_event_listener = channel_manager.clone();
+	let keys_manager_listener = keys_manager.clone();
+	// TODO: persist payment info to disk
+	let inbound_payments: PaymentInfoStorage = Arc::new(Mutex::new(HashMap::new()));
+	let outbound_payments: PaymentInfoStorage = Arc::new(Mutex::new(HashMap::new()));
+	let inbound_pmts_for_events = inbound_payments.clone();
+	let outbound_pmts_for_events = outbound_payments.clone();
+	let network = args.network;
+	let bitcoind_rpc = bitcoind_client.clone();
+	let handle = tokio::runtime::Handle::current();
+	let event_handler = move |event| {
+		handle.block_on(handle_ldk_events(
+			channel_manager_event_listener.clone(),
+			bitcoind_rpc.clone(),
+			keys_manager_listener.clone(),
+			inbound_pmts_for_events.clone(),
+			outbound_pmts_for_events.clone(),
+			network,
+			event,
+		))
+	};
+	// Step 16: Persist ChannelManager
+	let data_dir = ldk_data_dir.clone();
+	let persist_channel_manager_callback =
+		move |node: &ChannelManager| FilesystemPersister::persist_manager(data_dir.clone(), &*node);
+	// Step 17: Background Processing
+	BackgroundProcessor::start(
+		persist_channel_manager_callback,
+		event_handler,
+		chain_monitor.clone(),
+		channel_manager.clone(),
+		peer_manager.clone(),
+		logger.clone(),
+	);
+
+	// Reconnect to channel peers if possible.
+	let peer_data_path = format!("{}/channel_peer_data", ldk_data_dir.clone());
+	match disk::read_channel_peer_data(Path::new(&peer_data_path)) {
+		Ok(mut info) => {
+			for (pubkey, peer_addr) in info.drain() {
+				for chan_info in channel_manager.list_channels() {
+					if pubkey == chan_info.counterparty.node_id {
+						let _ =
+							cli::connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
+								.await;
+					}
+				}
+			}
+		}
+		Err(e) => println!("ERROR: errored reading channel peer info from disk: {:?}", e),
+	}
+
+	// Regularly broadcast our node_announcement. This is only required (or possible) if we have
+	// some public channels, and is only useful if we have public listen address(es) to announce.
+	// In a production environment, this should occur only after the announcement of new channels
+	// to avoid churn in the global network graph.
+	let chan_manager = Arc::clone(&channel_manager);
+	let network = args.network;
+	if !args.ldk_announced_listen_addr.is_empty() {
+		tokio::spawn(async move {
+			let mut interval = tokio::time::interval(Duration::from_secs(60));
+			loop {
+				interval.tick().await;
+				chan_manager.broadcast_node_announcement(
+					[0; 3],
+					args.ldk_announced_node_name,
+					args.ldk_announced_listen_addr.clone(),
+				);
+			}
+		});
+	}
+
+	// Start the CLI.
+	cli::poll_for_user_input(
+		peer_manager.clone(),
+		channel_manager.clone(),
+		keys_manager.clone(),
+		router.clone(),
+		inbound_payments,
+		outbound_payments,
+		ldk_data_dir.clone(),
+		logger.clone(),
+		network,
+	)
+	.await;
 }
 
-fn main() {
-    let bitcoind_host = "127.0.0.1".to_string();
-    let bitcoind_port = 18443;
-    let rpc_user = "polaruser".to_string();
-    let rpc_password = "polarpass".to_string();
-    let bitcoind_client = Arc::new(BitcoindClient::new(bitcoind_host.clone(), bitcoind_port, None,
-                                                       rpc_user.clone(), rpc_password.clone()).unwrap());
-
-    // ## Setup
-    // Step 1: Initialize the FeeEstimator
-    let fee_estimator = bitcoind_client.clone();
-
-    // Step 2: Initialize the Logger
-    let logger = Arc::new(FilesystemLogger{});
-
-    // Step 3: Initialize the BroadcasterInterface
-    let broadcaster = bitcoind_client.clone();
-
-    // Step 4: Initialize Persist
-    let persister = Arc::new(FilesystemPersister::new(".".to_string()));
-
-    // Step 5: Initialize the ChainMonitor
-    let chain_monitor: Arc<ArcChainMonitor> = Arc::new(ChainMonitor::new(None, broadcaster.clone(),
-                                                           logger.clone(), fee_estimator.clone(),
-                                                           persister.clone()));
-
-    // Step 6: Initialize the KeysManager
-	  let node_privkey = if let Ok(seed) = fs::read("./key_seed") { // the private key that corresponds
-		    assert_eq!(seed.len(), 32);                               // to our lightning node's pubkey
-		    let mut key = [0; 32];
-		    key.copy_from_slice(&seed);
-		    key
-	  } else {
-		    let mut key = [0; 32];
-		    thread_rng().fill_bytes(&mut key);
-		    let mut f = File::create("./key_seed").unwrap();
-		    f.write_all(&key).expect("Failed to write seed to disk");
-		    f.sync_all().expect("Failed to sync seed to disk");
-		    key
-	  };
-	  let cur = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
-    let keys_manager = Arc::new(KeysManager::new(&node_privkey, cur.as_secs(), cur.subsec_nanos()));
-
-    // Step 7: Read ChannelMonitor state from disk
-    let mut outpoint_to_channelmonitor = read_channelmonitors_from_disk("./monitors".to_string(),
-                                                                    keys_manager.clone()).unwrap();
-
-    // Step 9: Read ChannelManager state from disk
-    let user_config = UserConfig::default();
-    let mut channel_manager: ChannelManager;
-    let mut channel_manager_last_blockhash: Option<BlockHash> = None;
-    if let Ok(mut f) = fs::File::open("./manager") {
-        let (last_block_hash_option, channel_manager_from_disk) = {
-            let mut channel_monitor_mut_references = Vec::new();
-            for (_, channel_monitor) in outpoint_to_channelmonitor.iter_mut() {
-                channel_monitor_mut_references.push(&mut channel_monitor.1);
-            }
-            let read_args = ChannelManagerReadArgs::new(keys_manager.clone(), fee_estimator.clone(),
-                                                        chain_monitor.clone(), broadcaster.clone(),
-                                                        logger.clone(), user_config,
-                                                        channel_monitor_mut_references);
-            <(Option<BlockHash>, ChannelManager)>::read(&mut f, read_args).unwrap()
-        };
-        channel_manager = channel_manager_from_disk;
-        channel_manager_last_blockhash = last_block_hash_option;
-    } else {
-        let mut bitcoind_rpc_client = bitcoind_client.bitcoind_rpc_client.lock().unwrap();
-        let current_chain_height: usize = bitcoind_rpc_client
-            .call_method("getblockchaininfo", &vec![]).unwrap()["blocks"].as_u64().unwrap() as usize;
-        channel_manager = channelmanager::ChannelManager::new(Network::Regtest, fee_estimator.clone(),
-                                                       chain_monitor.clone(), broadcaster.clone(),
-                                                       logger.clone(), keys_manager.clone(),
-                                                       user_config, current_chain_height);
-    }
-
-    // Step 10: Sync ChannelMonitors to chain tip if restarting
-    let mut chain_tip = None;
-    let mut chain_listener_channel_monitors = Vec::new();
-    let mut cache = UnboundedCache::new();
-    let rpc_credentials = base64::encode(format!("{}:{}", rpc_user, rpc_password));
-    let mut block_source = RpcClient::new(&rpc_credentials, HttpEndpoint::for_host(bitcoind_host)
-                                          .with_port(bitcoind_port)).unwrap();
-		let runtime = Runtime::new().expect("Unable to create a runtime");
-    if outpoint_to_channelmonitor.len() > 0 {
-        for (outpoint, blockhash_and_monitor) in outpoint_to_channelmonitor.drain() {
-            let blockhash = blockhash_and_monitor.0;
-            let channel_monitor = blockhash_and_monitor.1;
-            chain_listener_channel_monitors.push((blockhash, (RefCell::new(channel_monitor),
-                                                              broadcaster.clone(), fee_estimator.clone(),
-                                                              logger.clone()), outpoint));
-        }
-
-        let mut chain_listeners = Vec::new();
-        for monitor_listener_info in chain_listener_channel_monitors.iter_mut() {
-            chain_listeners.push((monitor_listener_info.0,
-                                  &mut monitor_listener_info.1 as &mut dyn chain::Listen));
-        }
-        // Because `sync_listeners` is an async function and we want to run it synchronously,
-        // we run it in a tokio Runtime.
-        chain_tip = Some(runtime.block_on(init::sync_listeners(&mut block_source, Network::Regtest,
-                                                               &mut cache, chain_listeners)).unwrap());
-    }
-
-    // Step 11: Give ChannelMonitors to ChainMonitor
-    if chain_listener_channel_monitors.len() > 0 {
-        for item in chain_listener_channel_monitors.drain(..) {
-            let channel_monitor = item.1.0.into_inner();
-            let funding_outpoint = item.2;
-            chain_monitor.watch_channel(funding_outpoint, channel_monitor).unwrap();
-        }
-    }
-
-    // Step 12: Sync ChannelManager to chain tip if restarting
-    if let Some(channel_manager_blockhash) = channel_manager_last_blockhash {
-        let chain_listener = vec![
-            (channel_manager_blockhash, &mut channel_manager as &mut dyn chain::Listen)];
-        chain_tip = Some(runtime.block_on(init::sync_listeners(&mut block_source, Network::Regtest,
-                                                               &mut cache, chain_listener)).unwrap());
-    }
-
-    // Step 13: Optional: Initialize the NetGraphMsgHandler
-    // XXX persist routing data
-    let genesis = genesis_block(Network::Regtest).header.block_hash();
-    let router = Arc::new(NetGraphMsgHandler::new(genesis, None::<Arc<dyn chain::Access>>, logger.clone()));
-
-    // Step 14: Initialize the PeerManager
-    let channel_manager = Arc::new(channel_manager);
-	  let mut ephemeral_bytes = [0; 32];
-	  rand::thread_rng().fill_bytes(&mut ephemeral_bytes);
-    let lightning_msg_handler = MessageHandler { chan_handler: channel_manager.clone(),
-                                                 route_handler: router.clone() };
-    let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(lightning_msg_handler,
-                                                        keys_manager.get_node_secret(),
-                                                        &ephemeral_bytes, logger.clone()));
-
-    // ## Running LDK
-    // Step 15: Initialize LDK Event Handling
-    let (event_ntfn_sender, mut event_ntfn_receiver) = mpsc::channel(2);
-    let peer_manager_event_listener = peer_manager.clone();
-    let channel_manager_event_listener = channel_manager.clone();
-    let chain_monitor_event_listener = chain_monitor.clone();
-    let payment_info: PaymentInfoStorage = Arc::new(Mutex::new(HashMap::new()));
-    let payment_info_for_events = payment_info.clone();
-    thread::spawn(move || async move {
-        let mut pending_txs = HashMap::new();
-        loop {
-            event_ntfn_receiver.recv().await.unwrap();
-            pending_txs = handle_ldk_events(peer_manager_event_listener.clone(),
-                                            channel_manager_event_listener.clone(),
-                                            chain_monitor_event_listener.clone(),
-                                            bitcoind_client.clone(), keys_manager.clone(),
-                                            pending_txs, payment_info_for_events.clone());
-        }
-    });
-
-    // Step 16: Initialize Peer Connection Handling
-    let peer_manager_connection_handler = peer_manager.clone();
-    let event_notifier = event_ntfn_sender.clone();
-    thread::spawn(move || async move {
-	      let listener = std::net::TcpListener::bind("0.0.0.0:9735").unwrap();
-        loop {
-            let tcp_stream = listener.accept().unwrap().0;
-            lightning_net_tokio::setup_inbound(peer_manager_connection_handler.clone(),
-                                               event_notifier.clone(), tcp_stream).await;
-        }
-    });
-
-    // Step 17: Connect and Disconnect Blocks
-    let mut chain_poller = poll::ChainPoller::new(&mut block_source, Network::Regtest);
-    if chain_tip.is_none() {
-        match runtime.block_on(chain_poller.poll_chain_tip(None)).unwrap() {
-            ChainTip::Better(header) => chain_tip = Some(header),
-            _ => panic!("Unexpected chain tip")
-        }
-    }
-    let chain_listener = (chain_monitor.clone(), channel_manager.clone());
-    let _spv_client = SpvClient::new(chain_tip.unwrap(), chain_poller, &mut cache, &chain_listener);
-
-    // Step 17 & 18: Initialize ChannelManager persistence & Once Per Minute: ChannelManager's
-    // timer_chan_freshness_every_min() and PeerManager's timer_tick_occurred
-    let persist_channel_manager_callback = move |node: &ChannelManager| {
-        FilesystemPersister::persist_manager("./".to_string(), &*node)
-    };
-    BackgroundProcessor::start(persist_channel_manager_callback, channel_manager.clone(), logger.clone());
-    let peer_manager_processor = peer_manager.clone();
-    thread::spawn(move || {
-        loop {
-            peer_manager_processor.timer_tick_occured();
-            thread::sleep(Duration::new(60, 0));
-        }
-    });
-    cli::poll_for_user_input(peer_manager.clone(), channel_manager.clone(), event_ntfn_sender.clone());
+#[tokio::main]
+pub async fn main() {
+	start_ldk().await;
 }