From: Valentine Wallace Date: Wed, 3 Mar 2021 23:44:05 +0000 (-0500) Subject: Next draft. Features: connectpeer, listchannels, sendpayment, autoreconnect to chan... X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=224d32a53718a00f01456711d2ee524e59c5ff46;p=ldk-sample Next draft. Features: connectpeer, listchannels, sendpayment, autoreconnect to chan peers on startup --- diff --git a/.gitignore b/.gitignore index 088ba6b..bf68587 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk +.ldk diff --git a/Cargo.lock b/Cargo.lock index cdd9335..6204cdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,13 +41,13 @@ checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c" [[package]] name = "bitcoin" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6558aeb12c290cce541a222cba280387161f2bd180a7feb85f8f172cd8ba80e8" +checksum = "1ec5f88a446d66e7474a3b8fa2e348320b574463fb78d799d90ba68f79f48e0e" dependencies = [ "bech32 0.7.2", - "bitcoin_hashes 0.8.0", - "secp256k1 0.18.0", + "bitcoin_hashes", + "secp256k1", ] [[package]] @@ -59,12 +59,6 @@ dependencies = [ "bech32 0.4.1", ] -[[package]] -name = "bitcoin_hashes" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0ab784be052cc1e915a78b8aaf5101eebbc2d0ab2b6f5124985f3677ae2bea" - [[package]] name = "bitcoin_hashes" version = "0.9.4" @@ -247,6 +241,7 @@ version = "0.1.0" dependencies = [ "background-processor", "base64", + "bech32 0.7.2", "bitcoin", "bitcoin-bech32", "hex", @@ -284,18 +279,16 @@ dependencies = [ "lightning", "serde", "serde_json", - "tokio", ] [[package]] name = "lightning-invoice" version = "0.4.0" -source = "git+https://github.com/rust-bitcoin/rust-lightning-invoice?rev=ea25dc7e46a6339493032c500db4fe3a8fdb1acd#ea25dc7e46a6339493032c500db4fe3a8fdb1acd" dependencies = [ "bech32 0.7.2", - "bitcoin_hashes 0.9.4", + "bitcoin_hashes", "num-traits", - "secp256k1 0.20.1", + "secp256k1", ] [[package]] @@ -483,31 +476,13 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -[[package]] -name = "secp256k1" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3f534ef4e9dfa6c4b2ccca131f791daddf9cc2123b4124615cb144ea91611a" -dependencies = [ - "secp256k1-sys 0.2.0", -] - [[package]] name = "secp256k1" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "733b114f058f260c0af7591434eef4272ae1a8ec2751766d3cb89c6df8d5e450" dependencies = [ - "secp256k1-sys 0.4.0", -] - -[[package]] -name = "secp256k1-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71453d9b088b19ae43a803d88ecaa876b11ed8999df024cca4becb6be9aee351" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b09f09c..7c097ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,13 +10,15 @@ edition = "2018" # background-processor = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "d6f41d3c0b38b9ec9e06a3acfdd9f4b1d007a27d" } background-processor = { path = "../rust-lightning/background-processor" } base64 = "0.13.0" -bitcoin = "0.24" +bitcoin = "0.26" bitcoin-bech32 = "0.7" +bech32 = "0.7" hex = "0.3" # lightning = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "c35002fa9c16042badfa5e7bf819df5f1d2ae60a" } lightning = { path = "../rust-lightning/lightning" } -lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rpc-client", "generic-rpc-client" ] } -lightning-invoice = { git = "https://github.com/rust-bitcoin/rust-lightning-invoice", rev = "ea25dc7e46a6339493032c500db4fe3a8fdb1acd" } +lightning-block-sync = { path = "../rust-lightning/lightning-block-sync", features = ["rpc-client"] } +# lightning-invoice = { git = "https://github.com/rust-bitcoin/rust-lightning-invoice", rev = "ea25dc7e46a6339493032c500db4fe3a8fdb1acd" } +lightning-invoice = { path = "../rust-lightning-invoice" } # lightning-net-tokio = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "ff00f6f8861419b73269e6c51d75ac9de75f1d1f" } lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" } # lightning-persister = { git = "https://github.com/rust-bitcoin/rust-lightning", rev = "aa127f55edc4439b03426644d178e402397329e8" } diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs index 97e5556..de9f870 100644 --- a/src/bitcoind_client.rs +++ b/src/bitcoind_client.rs @@ -1,76 +1,148 @@ use base64; -use serde_json; - use bitcoin::blockdata::transaction::Transaction; use bitcoin::consensus::encode; +use bitcoin::util::address::Address; +use crate::convert::{BlockchainInfo, FeeResponse, FundedTx, NewAddress, RawTx, SignedTx}; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; use lightning_block_sync::http::HttpEndpoint; use lightning_block_sync::rpc::RpcClient; - +use serde_json; +use std::collections::HashMap; +use std::str::FromStr; use std::sync::Mutex; +use tokio::runtime::{Handle, Runtime}; pub struct BitcoindClient { - pub bitcoind_rpc_client: Mutex, + bitcoind_rpc_client: Mutex, + host: String, + port: u16, + rpc_user: String, + rpc_password: String, + runtime: Mutex, } impl BitcoindClient { - pub fn new(host: String, port: u16, path: Option, rpc_user: String, rpc_password: String) -> + pub fn new(host: String, port: u16, rpc_user: String, rpc_password: String) -> std::io::Result { - let mut http_endpoint = HttpEndpoint::for_host(host).with_port(port); - if let Some(p) = path { - http_endpoint = http_endpoint.with_path(p); - } - let rpc_credentials = base64::encode(format!("{}:{}", rpc_user, rpc_password)); + let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port); + let rpc_credentials = base64::encode(format!("{}:{}", rpc_user.clone(), + rpc_password.clone())); let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?; - Ok(Self { - bitcoind_rpc_client: Mutex::new(bitcoind_rpc_client) - }) + let client = Self { + bitcoind_rpc_client: Mutex::new(bitcoind_rpc_client), + host, + port, + rpc_user, + rpc_password, + runtime: Mutex::new(Runtime::new().unwrap()), + // runtime: Mutex::new(runtime), + }; + Ok(client) + } + + pub fn get_new_rpc_client(&self) -> std::io::Result { + let http_endpoint = HttpEndpoint::for_host(self.host.clone()).with_port(self.port); + let rpc_credentials = base64::encode(format!("{}:{}", + self.rpc_user.clone(), + self.rpc_password.clone())); + RpcClient::new(&rpc_credentials, http_endpoint) + } + + pub fn create_raw_transaction(&self, outputs: Vec>) -> RawTx { + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + let outputs_json = serde_json::json!(outputs); + runtime.block_on(rpc.call_method::("createrawtransaction", &vec![serde_json::json!([]), outputs_json])).unwrap() + } + + pub fn fund_raw_transaction(&self, raw_tx: RawTx) -> FundedTx { + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + let raw_tx_json = serde_json::json!(raw_tx.0); + runtime.block_on(rpc.call_method("fundrawtransaction", &[raw_tx_json])).unwrap() + } + + pub fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx { + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + let tx_hex_json = serde_json::json!(tx_hex); + runtime.block_on(rpc.call_method("signrawtransactionwithwallet", + &vec![tx_hex_json])).unwrap() + } + + pub fn get_new_address(&self) -> Address { + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + let addr_args = vec![serde_json::json!("LDK output address")]; + let addr = runtime.block_on(rpc.call_method::("getnewaddress", &addr_args)).unwrap(); + Address::from_str(addr.0.as_str()).unwrap() + } + + pub fn get_blockchain_info(&self) -> BlockchainInfo { + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + runtime.block_on(rpc.call_method::("getblockchaininfo", + &vec![])).unwrap() } } impl FeeEstimator for BitcoindClient { fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 { - let mut rpc_client_guard = self.bitcoind_rpc_client.lock().unwrap(); - match confirmation_target { - ConfirmationTarget::Background => { - let conf_target = serde_json::json!(144); - let estimate_mode = serde_json::json!("ECONOMICAL"); - let resp = rpc_client_guard.call_method("estimatesmartfee", - &vec![conf_target, estimate_mode]).unwrap(); - if !resp["errors"].is_null() && resp["errors"].as_array().unwrap().len() > 0 { - return 253 - } - resp["feerate"].as_u64().unwrap() as u32 - }, - ConfirmationTarget::Normal => { - let conf_target = serde_json::json!(18); - let estimate_mode = serde_json::json!("ECONOMICAL"); - let resp = rpc_client_guard.call_method("estimatesmartfee", - &vec![conf_target, estimate_mode]).unwrap(); - if !resp["errors"].is_null() && resp["errors"].as_array().unwrap().len() > 0 { - return 253 - } - resp["feerate"].as_u64().unwrap() as u32 - }, - ConfirmationTarget::HighPriority => { - let conf_target = serde_json::json!(6); - let estimate_mode = serde_json::json!("CONSERVATIVE"); - let resp = rpc_client_guard.call_method("estimatesmartfee", - &vec![conf_target, estimate_mode]).unwrap(); - if !resp["errors"].is_null() && resp["errors"].as_array().unwrap().len() > 0 { - return 253 - } - resp["feerate"].as_u64().unwrap() as u32 + let runtime = self.runtime.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + + let (conf_target, estimate_mode, default) = match confirmation_target { + ConfirmationTarget::Background => (144, "ECONOMICAL", 253), + ConfirmationTarget::Normal => (18, "ECONOMICAL", 20000), + ConfirmationTarget::HighPriority => (6, "ECONOMICAL", 50000), + }; + + // If we're already in a tokio runtime, then we need to get out of it before we can broadcast. + let conf_target_json = serde_json::json!(conf_target); + let estimate_mode_json = serde_json::json!(estimate_mode); + let resp = match Handle::try_current() { + Ok(_) => { + tokio::task::block_in_place(|| { + runtime.block_on(rpc.call_method::("estimatesmartfee", + &vec![conf_target_json, + estimate_mode_json])).unwrap() + }) }, + _ => runtime.block_on(rpc.call_method::("estimatesmartfee", + &vec![conf_target_json, + estimate_mode_json])).unwrap() + }; + if resp.errored { + return default } + resp.feerate.unwrap() } } impl BroadcasterInterface for BitcoindClient { fn broadcast_transaction(&self, tx: &Transaction) { - let mut rpc_client_guard = self.bitcoind_rpc_client.lock().unwrap(); + let mut rpc = self.bitcoind_rpc_client.lock().unwrap(); + let runtime = self.runtime.lock().unwrap(); + let tx_serialized = serde_json::json!(encode::serialize_hex(tx)); - rpc_client_guard.call_method("sendrawtransaction", &vec![tx_serialized]).unwrap(); + // If we're already in a tokio runtime, then we need to get out of it before we can broadcast. + match Handle::try_current() { + Ok(_) => { + tokio::task::block_in_place(|| { + runtime.block_on(rpc.call_method::("sendrawtransaction", + &vec![tx_serialized])).unwrap(); + }); + }, + _ => { + runtime.block_on(rpc.call_method::("sendrawtransaction", + &vec![tx_serialized])).unwrap(); + } + } } } diff --git a/src/cli.rs b/src/cli.rs index c046d0c..20c4314 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,65 +1,274 @@ -use bitcoin::secp256k1::key::PublicKey; -use crate::{FilesystemLogger, PeerManager, ChannelManager}; -use crate::utils; +use bitcoin::network::constants::Network; +use bitcoin::hashes::Hash; +use bitcoin::hashes::sha256::Hash as Sha256Hash; +use bitcoin::secp256k1::Secp256k1; +use bitcoin::secp256k1::key::{PublicKey, SecretKey}; +use crate::{ChannelManager, FilesystemLogger, HTLCDirection, HTLCStatus, NETWORK, + PaymentInfoStorage, PeerManager}; +use crate::disk; +use crate::hex_utils; +use lightning::chain; +use lightning::ln::channelmanager::{PaymentHash, PaymentPreimage, PaymentSecret}; +use lightning::ln::features::InvoiceFeatures; +use lightning::routing::network_graph::NetGraphMsgHandler; +use lightning::routing::router; +use lightning::util::config::UserConfig; +use rand; +use rand::Rng; +use std::env; use std::io; use std::io::{BufRead, Write}; use std::net::{SocketAddr, TcpStream}; +use std::ops::Deref; +use std::path::Path; +use std::str::FromStr; use std::sync::Arc; -use std::thread; use std::time::Duration; -// use tokio::runtime::Runtime; -use tokio::runtime::{Builder, Runtime}; +use tokio::runtime::Handle; use tokio::sync::mpsc; -pub fn poll_for_user_input(peer_manager: Arc, channel_manager: Arc, event_notifier: mpsc::Sender<()>) { - println!("LDK startup successful. To view available commands: \"help\".\nLDK logs are available in the `logs` folder of the current directory."); - print!("> "); io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print +pub(crate) struct LdkUserInfo { + pub(crate) bitcoind_rpc_username: String, + pub(crate) bitcoind_rpc_password: String, + pub(crate) bitcoind_rpc_port: u16, + pub(crate) bitcoind_rpc_host: String, + pub(crate) ldk_storage_dir_path: String, + pub(crate) ldk_peer_listening_port: u16, +} + +pub(crate) fn parse_startup_args() -> Result { + if env::args().len() < 4 { + println!("ldk-tutorial-node requires 3 arguments: `cargo run :@: ldk_storage_directory_path [optional: ]`"); + return Err(()) + } + let bitcoind_rpc_info = env::args().skip(1).next().unwrap(); + let bitcoind_rpc_info_parts: Vec<&str> = bitcoind_rpc_info.split("@").collect(); + if bitcoind_rpc_info_parts.len() != 2 { + println!("ERROR: bad bitcoind RPC URL provided"); + return Err(()) + } + let rpc_user_and_password: Vec<&str> = bitcoind_rpc_info_parts[0].split(":").collect(); + if rpc_user_and_password.len() != 2 { + println!("ERROR: bad bitcoind RPC username/password combo provided"); + return Err(()) + } + let bitcoind_rpc_username = rpc_user_and_password[0].to_string(); + let bitcoind_rpc_password = rpc_user_and_password[1].to_string(); + let bitcoind_rpc_path: Vec<&str> = bitcoind_rpc_info_parts[1].split(":").collect(); + if bitcoind_rpc_path.len() != 2 { + println!("ERROR: bad bitcoind RPC path provided"); + return Err(()) + } + let bitcoind_rpc_host = bitcoind_rpc_path[0].to_string(); + let bitcoind_rpc_port = bitcoind_rpc_path[1].parse::().unwrap(); + + let ldk_storage_dir_path = env::args().skip(2).next().unwrap(); + + let ldk_peer_listening_port: u16 = match env::args().skip(3).next().map(|p| p.parse()) { + Some(Ok(p)) => p, + Some(Err(e)) => panic!(e), + None => 9735, + }; + Ok(LdkUserInfo { + bitcoind_rpc_username, + bitcoind_rpc_password, + bitcoind_rpc_host, + bitcoind_rpc_port, + ldk_storage_dir_path, + ldk_peer_listening_port, + }) +} + +pub(crate) fn poll_for_user_input(peer_manager: Arc, channel_manager: + Arc, router: Arc, Arc>>, payment_storage: + PaymentInfoStorage, node_privkey: SecretKey, event_notifier: + mpsc::Sender<()>, ldk_data_dir: String, logger: Arc, + runtime_handle: Handle) { + println!("LDK startup successful. To view available commands: \"help\".\nLDK logs are available in the `logs` folder of /.ldk/logs"); let stdin = io::stdin(); + print!("> "); io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print for line in stdin.lock().lines() { + let _ = event_notifier.try_send(()); let line = line.unwrap(); let mut words = line.split_whitespace(); if let Some(word) = words.next() { match word { - "help" => handle_help(), + "help" => help(), "openchannel" => { let peer_pubkey_and_ip_addr = words.next(); let channel_value_sat = words.next(); if peer_pubkey_and_ip_addr.is_none() || channel_value_sat.is_none() { - println!("ERROR: openchannel takes 2 arguments: `openchannel pubkey@host:port channel_amt_satoshis`") - } else { - let peer_pubkey_and_ip_addr = peer_pubkey_and_ip_addr.unwrap(); - let channel_value_sat = channel_value_sat.unwrap(); - let mut pubkey_and_addr = peer_pubkey_and_ip_addr.split("@"); - let pubkey = pubkey_and_addr.next(); - let peer_addr_str = pubkey_and_addr.next(); - if peer_addr_str.is_none() || peer_addr_str.is_none() { - println!("ERROR: incorrectly formatted peer info. Should be formatted as: `pubkey@host:port`"); - } else { - let pubkey = pubkey.unwrap(); - let peer_addr_str = peer_addr_str.unwrap(); - let peer_addr_res: Result = peer_addr_str.parse(); - let chan_amt: Result = channel_value_sat.parse(); - if let Some(pk) = utils::hex_to_compressed_pubkey(pubkey) { - if let Ok(addr) = peer_addr_res { - if let Ok(amt) = chan_amt { - handle_open_channel(pk, addr, amt, - peer_manager.clone(), - channel_manager.clone(), - event_notifier.clone()); - } else { - println!("ERROR: channel amount must be a number"); + println!("ERROR: openchannel takes 2 arguments: `openchannel pubkey@host:port channel_amt_satoshis`"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let peer_pubkey_and_ip_addr = peer_pubkey_and_ip_addr.unwrap(); + let (pubkey, peer_addr) = match parse_peer_info(peer_pubkey_and_ip_addr.to_string()) { + Ok(info) => info, + Err(e) => { + println!("{:?}", e.into_inner().unwrap()); + print!("> "); io::stdout().flush().unwrap(); continue; + } + }; + + let chan_amt_sat: Result = channel_value_sat.unwrap().parse(); + if chan_amt_sat.is_err() { + println!("ERROR: channel amount must be a number"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + + if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone(), + event_notifier.clone(), + runtime_handle.clone()).is_err() { + print!("> "); io::stdout().flush().unwrap(); continue; + }; + + if open_channel(pubkey, chan_amt_sat.unwrap(), channel_manager.clone()).is_ok() { + 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(); + if invoice_str.is_none() { + println!("ERROR: sendpayment requires an invoice: `sendpayment `"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + + let invoice_res = lightning_invoice::Invoice::from_str(invoice_str.unwrap()); + if invoice_res.is_err() { + println!("ERROR: invalid invoice: {:?}", invoice_res.unwrap_err()); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let invoice = invoice_res.unwrap(); + + let amt_pico_btc = invoice.amount_pico_btc(); + if amt_pico_btc.is_none () { + println!("ERROR: invalid invoice: must contain amount to pay"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let amt_msat = amt_pico_btc.unwrap() / 10; + + let payee_pubkey = invoice.recover_payee_pub_key(); + let final_cltv = *invoice.min_final_cltv_expiry().unwrap_or(&9) as u32; + + let mut payment_hash = PaymentHash([0; 32]); + payment_hash.0.copy_from_slice(&invoice.payment_hash().as_ref()[0..32]); + + + let payment_secret = match invoice.payment_secret() { + Some(secret) => { + let mut payment_secret = PaymentSecret([0; 32]); + payment_secret.0.copy_from_slice(&secret.0); + Some(payment_secret) + }, + None => None + }; + + let mut invoice_features = InvoiceFeatures::empty(); + for field in &invoice.into_signed_raw().raw_invoice().data.tagged_fields { + match field { + lightning_invoice::RawTaggedField::UnknownSemantics(vec) => { + if vec[0] == bech32::u5::try_from_u8(5).unwrap() { + if vec.len() >= 6 && vec[5].to_u8() & 0b10000 != 0 { + invoice_features.set_supports_var_onion_optin(); + } + if vec.len() >= 6 && vec[5].to_u8() & 0b01000 != 0 { + invoice_features.set_requires_var_onion_optin(); + } + if vec.len() >= 4 && vec[3].to_u8() & 0b00001 != 0 { + invoice_features.set_supports_payment_secret(); + } + if vec.len() >= 5 && vec[4].to_u8() & 0b10000 != 0 { + invoice_features.set_requires_payment_secret(); + } + if vec.len() >= 4 && vec[3].to_u8() & 0b00100 != 0 { + invoice_features.set_supports_basic_mpp(); + } + if vec.len() >= 4 && vec[3].to_u8() & 0b00010 != 0 { + invoice_features.set_requires_basic_mpp(); } - } else { - println!("ERROR: couldn't parse - pubkey@host:port into a socket address"); } - } else { - println!("ERROR: unable to parse given pubkey for node"); - } + }, + _ => {} } } + let invoice_features_opt = match invoice_features == InvoiceFeatures::empty() { + true => None, + false => Some(invoice_features) + }; + send_payment(payee_pubkey, amt_msat, final_cltv, payment_hash, + payment_secret, invoice_features_opt, router.clone(), + channel_manager.clone(), payment_storage.clone(), + logger.clone()); }, - _ => println!("hello") + "getinvoice" => { + let amt_str = words.next(); + if amt_str.is_none() { + println!("ERROR: getinvoice requires an amount in satoshis"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + + let amt_sat: Result = amt_str.unwrap().parse(); + if amt_sat.is_err() { + println!("ERROR: getinvoice provided payment amount was not a number"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + get_invoice(amt_sat.unwrap(), payment_storage.clone(), node_privkey.clone(), + channel_manager.clone(), router.clone()); + }, + "connectpeer" => { + let peer_pubkey_and_ip_addr = words.next(); + if peer_pubkey_and_ip_addr.is_none() { + println!("ERROR: connectpeer requires peer connection info: `connectpeer pubkey@host:port`"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let (pubkey, peer_addr) = match parse_peer_info(peer_pubkey_and_ip_addr.unwrap().to_string()) { + Ok(info) => info, + Err(e) => { + println!("{:?}", e.into_inner().unwrap()); + print!("> "); io::stdout().flush().unwrap(); continue; + } + }; + if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone(), + event_notifier.clone(), runtime_handle.clone()).is_ok() { + println!("SUCCESS: connected to peer {}", pubkey); + } + + }, + "listchannels" => list_channels(channel_manager.clone()), + "listpayments" => list_payments(payment_storage.clone()), + "closechannel" => { + let channel_id_str = words.next(); + if channel_id_str.is_none() { + println!("ERROR: closechannel requires a channel ID: `closechannel `"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let channel_id_vec = hex_utils::to_vec(channel_id_str.unwrap()); + if channel_id_vec.is_none() { + println!("ERROR: couldn't parse channel_id as hex"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let mut channel_id = [0; 32]; + channel_id.copy_from_slice(&channel_id_vec.unwrap()); + close_channel(channel_id, channel_manager.clone()); + }, + "forceclosechannel" => { + let channel_id_str = words.next(); + if channel_id_str.is_none() { + println!("ERROR: forceclosechannel requires a channel ID: `forceclosechannel `"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let channel_id_vec = hex_utils::to_vec(channel_id_str.unwrap()); + if channel_id_vec.is_none() { + println!("ERROR: couldn't parse channel_id as hex"); + print!("> "); io::stdout().flush().unwrap(); continue; + } + let mut channel_id = [0; 32]; + channel_id.copy_from_slice(&channel_id_vec.unwrap()); + force_close_channel(channel_id, channel_manager.clone()); + } + _ => println!("Unknown command. See `\"help\" for available commands.") } } print!("> "); io::stdout().flush().unwrap(); @@ -67,34 +276,244 @@ pub fn poll_for_user_input(peer_manager: Arc, channel_manager: Arc< } } -fn handle_help() { - println!("") +fn help() { + println!("openchannel pubkey@host:port channel_amt_satoshis"); + println!("sendpayment "); + println!("getinvoice "); + println!("connectpeer pubkey@host:port"); + println!("listchannels"); + println!("listpayments"); + println!("closechannel "); + println!("forceclosechannel "); } -fn handle_open_channel(peer_pubkey: PublicKey, peer_socket: SocketAddr, - channel_amt_sat: u64, peer_manager: Arc, - channel_manager: Arc, event_notifier: - mpsc::Sender<()>) -{ - // let runtime = Runtime::new().expect("Unable to create a runtime").enable_all(); - let runtime = Builder::new_multi_thread() - .worker_threads(3) - .enable_all() - .build() - .unwrap(); - match TcpStream::connect_timeout(&peer_socket, Duration::from_secs(10)) { +fn list_channels(channel_manager: Arc) { + print!("["); + for chan_info in channel_manager.list_channels() { + println!(""); + println!("\t{{"); + println!("\t\tchannel_id: {},", hex_utils::hex_str(&chan_info.channel_id[..])); + println!("\t\tpeer_pubkey: {},", hex_utils::hex_str(&chan_info.remote_network_id.serialize())); + let mut pending_channel = false; + match chan_info.short_channel_id { + Some(id) => println!("\t\tshort_channel_id: {},", id), + None => { + pending_channel = true; + } + } + println!("\t\tpending_open: {},", pending_channel); + println!("\t\tchannel_value_satoshis: {},", chan_info.channel_value_satoshis); + println!("\t\tchannel_can_send_payments: {},", chan_info.is_live); + println!("\t}},"); + } + println!("]"); +} + +fn list_payments(payment_storage: PaymentInfoStorage) { + let payments = payment_storage.lock().unwrap(); + print!("["); + for (payment_hash, payment_info) in payments.deref() { + println!(""); + println!("\t{{"); + println!("\t\tpayment_hash: {},", hex_utils::hex_str(&payment_hash.0)); + println!("\t\thtlc_direction: {},", if payment_info.1 == HTLCDirection::Inbound { "inbound" } else { "outbound" }); + println!("\t\thtlc_status: {},", match payment_info.2 { + HTLCStatus::Pending => "pending", + HTLCStatus::Succeeded => "succeeded", + HTLCStatus::Failed => "failed" + }); + + + println!("\t}},"); + } + println!("]"); +} + +pub(crate) fn connect_peer_if_necessary(pubkey: PublicKey, peer_addr: SocketAddr, peer_manager: + Arc, event_notifier: mpsc::Sender<()>, runtime: Handle) -> + Result<(), ()> { + for node_pubkey in peer_manager.get_peer_node_ids() { + if node_pubkey == pubkey { + return Ok(()) + } + } + match TcpStream::connect_timeout(&peer_addr, Duration::from_secs(10)) { Ok(stream) => { - runtime.block_on(|| { - lightning_net_tokio::setup_outbound(peer_manager, - event_notifier, - peer_pubkey, - stream); + let peer_mgr = peer_manager.clone(); + let event_ntfns = event_notifier.clone(); + runtime.spawn(async move { + lightning_net_tokio::setup_outbound(peer_mgr, event_ntfns, pubkey, stream).await; }); - match channel_manager.create_channel(peer_pubkey, channel_amt_sat, 0, 0, None) { - Ok(_) => println!("SUCCESS: channel created! Mine some blocks to open it."), - Err(e) => println!("ERROR: failed to open channel: {:?}", e) + let mut peer_connected = false; + while !peer_connected { + for node_pubkey in peer_manager.get_peer_node_ids() { + if node_pubkey == pubkey { peer_connected = true; } + } } }, - Err(e) => println!("ERROR: failed to connect to peer: {:?}", e) + Err(e) => {println!("ERROR: failed to connect to peer: {:?}", e); + return Err(()) + } + } + Ok(()) +} + +fn open_channel(peer_pubkey: PublicKey, channel_amt_sat: u64, channel_manager: Arc) + -> Result<(), ()> { + let mut config = UserConfig::default(); + // lnd's max to_self_delay is 2016, so we want to be compatible. + config.peer_channel_config_limits.their_to_self_delay = 2016; + match channel_manager.create_channel(peer_pubkey, channel_amt_sat, 0, 0, None) { + Ok(_) => { + println!("EVENT: initiated channel with peer {}. ", peer_pubkey); + return Ok(()) + }, + Err(e) => { + println!("ERROR: failed to open channel: {:?}", e); + return Err(()) + } + } +} + +fn send_payment(payee: PublicKey, amt_msat: u64, final_cltv: u32, payment_hash: PaymentHash, + payment_secret: Option, payee_features: + Option, router: Arc, Arc>>, channel_manager: + Arc, payment_storage: PaymentInfoStorage, logger: + Arc) { + let network_graph = router.network_graph.read().unwrap(); + let first_hops = channel_manager.list_usable_channels(); + let payer_pubkey = channel_manager.get_our_node_id(); + + let route = router::get_route(&payer_pubkey, &network_graph, &payee, payee_features, + Some(&first_hops.iter().collect::>()), &vec![], amt_msat, + final_cltv, logger); + if let Err(e) = route { + println!("ERROR: failed to find route: {}", e.err); + return + } + let status = match channel_manager.send_payment(&route.unwrap(), payment_hash, &payment_secret) { + Ok(()) => { + println!("EVENT: initiated sending {} msats to {}", amt_msat, payee); + HTLCStatus::Pending + }, + Err(e) => { + println!("ERROR: failed to send payment: {:?}", e); + HTLCStatus::Failed + } + }; + let mut payments = payment_storage.lock().unwrap(); + payments.insert(payment_hash, (None, HTLCDirection::Outbound, status)); +} + +fn get_invoice(amt_sat: u64, payment_storage: PaymentInfoStorage, our_node_privkey: SecretKey, + channel_manager: Arc, router: Arc, Arc>>) { + let mut payments = payment_storage.lock().unwrap(); + let secp_ctx = Secp256k1::new(); + + let mut preimage = [0; 32]; + rand::thread_rng().fill_bytes(&mut preimage); + let payment_hash = Sha256Hash::hash(&preimage); + + + let our_node_pubkey = channel_manager.get_our_node_id(); + let invoice = lightning_invoice::InvoiceBuilder::new(match NETWORK { + Network::Bitcoin => lightning_invoice::Currency::Bitcoin, + Network::Testnet => lightning_invoice::Currency::BitcoinTestnet, + Network::Regtest => lightning_invoice::Currency::Regtest, + Network::Signet => panic!("Signet invoices not supported") + }).payment_hash(payment_hash).description("rust-lightning-bitcoinrpc invoice".to_string()) + .amount_pico_btc(amt_sat * 10) + .current_timestamp() + .payee_pub_key(our_node_pubkey); + + // Add route hints to the invoice. + // let our_channels = channel_manager.list_usable_channels(); + // let network_graph = router.network_graph.read().unwrap(); + // let network_channels = network_graph.get_channels(); + // for channel in our_channels { + // let short_channel_id_opt = channel.short_channel_id; + // if short_channel_id_opt.is_none() { + // continue + // } + + // let short_channel_id = short_channel_id_opt.unwrap(); + // let channel_routing_info_opt = network_channels.get(&short_channel_id); + // if channel_routing_info_opt.is_none() { + // continue + // } + + // let channel_routing_info = channel_routing_info_opt.unwrap(); + // let mut counterparty = channel_routing_info.node_two; + // let mut counterparty_chan_fees_opt = channel_routing_info.one_to_two.as_ref(); + // if channel_routing_info.node_two != our_node_pubkey { // e.g. if our counterparty is node_one + // counterparty = channel_routing_info.node_one; + // counterparty_chan_fees_opt = channel_routing_info.two_to_one.as_ref(); + // } + // if counterparty_chan_fees_opt.is_none() { + // continue + // } + + // let counterparty_chan_fees = counterparty_chan_fees_opt.unwrap(); + // invoice = invoice.route(vec![ + // lightning_invoice::RouteHop { + // short_channel_id: short_channel_id.to_be_bytes(), + // cltv_expiry_delta: counterparty_chan_fees.cltv_expiry_delta, + // fee_base_msat: counterparty_chan_fees.fees.base_msat, + // fee_proportional_millionths: counterparty_chan_fees.fees.proportional_millionths, + // pubkey: counterparty, + // } + // ]); + // } + + // Sign the invoice. + let invoice = invoice.build_signed(|msg_hash| { + secp_ctx.sign_recoverable(msg_hash, &our_node_privkey) + }); + + match invoice { + Ok(invoice) => println!("SUCCESS: generated invoice: {}", invoice), + Err(e) => println!("ERROR: failed to create invoice: {:?}", e), + } + + payments.insert(PaymentHash(payment_hash.into_inner()), (Some(PaymentPreimage(preimage)), + HTLCDirection::Inbound, + HTLCStatus::Pending)); +} + +fn close_channel(channel_id: [u8; 32], channel_manager: Arc) { + match channel_manager.close_channel(&channel_id) { + Ok(()) => println!("EVENT: initiating channel close"), + Err(e) => println!("ERROR: failed to close channel: {:?}", e) + } +} + +fn force_close_channel(channel_id: [u8; 32], channel_manager: Arc) { + match channel_manager.force_close_channel(&channel_id) { + Ok(()) => println!("EVENT: initiating channel force-close"), + Err(e) => println!("ERROR: failed to force-close channel: {:?}", e) + } +} + +pub(crate) fn parse_peer_info(peer_pubkey_and_ip_addr: String) -> Result<(PublicKey, SocketAddr), std::io::Error> { + let mut pubkey_and_addr = peer_pubkey_and_ip_addr.split("@"); + let pubkey = pubkey_and_addr.next(); + let peer_addr_str = pubkey_and_addr.next(); + if peer_addr_str.is_none() || peer_addr_str.is_none() { + return Err(std::io::Error::new(std::io::ErrorKind::Other, "ERROR: incorrectly formatted peer + info. Should be formatted as: `pubkey@host:port`")); + } + + let peer_addr: Result = peer_addr_str.unwrap().parse(); + if peer_addr.is_err() { + return Err(std::io::Error::new(std::io::ErrorKind::Other, "ERROR: couldn't parse pubkey@host:port into a socket address")); } + + let pubkey = hex_utils::to_compressed_pubkey(pubkey.unwrap()); + if pubkey.is_none() { + return Err(std::io::Error::new(std::io::ErrorKind::Other, "ERROR: unable to parse given pubkey for node")); + } + + Ok((pubkey.unwrap(), peer_addr.unwrap())) } diff --git a/src/convert.rs b/src/convert.rs new file mode 100644 index 0000000..c92a926 --- /dev/null +++ b/src/convert.rs @@ -0,0 +1,86 @@ +use bitcoin::BlockHash; +use bitcoin::hashes::hex::FromHex; +use lightning_block_sync::http::JsonResponse; +use std::convert::TryInto; + +pub struct FundedTx { + pub changepos: i64, + pub hex: String, +} + +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + Ok(FundedTx { + changepos: self.0["changepos"].as_i64().unwrap(), + hex: self.0["hex"].as_str().unwrap().to_string(), + }) + } +} + +pub struct RawTx(pub String); + +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + Ok(RawTx(self.0.as_str().unwrap().to_string())) + } +} + +pub struct SignedTx { + pub complete: bool, + pub hex: String, +} + +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + Ok(SignedTx { + hex: self.0["hex"].as_str().unwrap().to_string(), + complete: self.0["complete"].as_bool().unwrap(), + }) + } +} + +pub struct NewAddress(pub String); +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + Ok(NewAddress(self.0.as_str().unwrap().to_string())) + } +} + +pub struct FeeResponse { + pub feerate: Option, + pub errored: bool, +} + +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + let errored = !self.0["errors"].is_null(); + Ok(FeeResponse { + errored, + feerate: match errored { + true => None, + // The feerate from bitcoind is in BTC/kb, and we want satoshis/kb. + false => Some((self.0["feerate"].as_f64().unwrap() * 100_000_000.0).round() as u32) + } + }) + } +} + +pub struct BlockchainInfo { + pub latest_height: usize, + pub latest_blockhash: BlockHash, +} + +impl TryInto for JsonResponse { + type Error = std::io::Error; + fn try_into(self) -> std::io::Result { + Ok(BlockchainInfo { + latest_height: self.0["blocks"].as_u64().unwrap() as usize, + latest_blockhash: BlockHash::from_hex(self.0["bestblockhash"].as_str().unwrap()).unwrap(), + }) + } +} diff --git a/src/disk.rs b/src/disk.rs new file mode 100644 index 0000000..81e2e95 --- /dev/null +++ b/src/disk.rs @@ -0,0 +1,105 @@ +use bitcoin::{BlockHash, Txid}; +use bitcoin::hashes::hex::FromHex; +use bitcoin::secp256k1::key::PublicKey; +use crate::cli; +use lightning::chain::channelmonitor::ChannelMonitor; +use lightning::chain::keysinterface::{InMemorySigner, KeysManager}; +use lightning::chain::transaction::OutPoint; +use lightning::util::logger::{Logger, Record}; +use lightning::util::ser::{ReadableArgs, Writer}; +use std::collections::HashMap; +use std::fs; +use std::fs::File; +// use std::io::{BufRead, BufReader, Cursor, Write}; +use std::io::{BufRead, BufReader, Cursor}; +use std::net::SocketAddr; +use std::path::Path; +use std::sync::Arc; +use time::OffsetDateTime; + +pub(crate) struct FilesystemLogger{ + data_dir: String +} +impl FilesystemLogger { + pub(crate) fn new(data_dir: String) -> Self { + let logs_path = format!("{}/logs", data_dir); + fs::create_dir_all(logs_path.clone()).unwrap(); + Self { + data_dir: logs_path + } + } +} +impl Logger for FilesystemLogger { + fn log(&self, record: &Record) { + let raw_log = record.args.to_string(); + let log = format!("{} {:<5} [{}:{}] {}\n", OffsetDateTime::now_utc().format("%F %T"), + record.level.to_string(), record.module_path, record.line, raw_log); + let logs_file_path = format!("{}/logs.txt", self.data_dir.clone()); + fs::OpenOptions::new().create(true).append(true).open(logs_file_path).unwrap() + .write_all(log.as_bytes()).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, std::io::Error> { + let mut peer_data = HashMap::new(); + if !Path::new(&path).exists() { + return Ok(HashMap::new()) + } + 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_channelmonitors_from_disk(path: String, keys_manager: Arc) -> + Result)>, 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)>::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) +} diff --git a/src/hex_utils.rs b/src/hex_utils.rs new file mode 100644 index 0000000..c9c55b9 --- /dev/null +++ b/src/hex_utils.rs @@ -0,0 +1,42 @@ +use bitcoin::secp256k1::key::PublicKey; + +pub fn to_vec(hex: &str) -> Option> { + let mut out = Vec::with_capacity(hex.len() / 2); + + let mut b = 0; + for (idx, c) in hex.as_bytes().iter().enumerate() { + b <<= 4; + match *c { + b'A'..=b'F' => b |= c - b'A' + 10, + b'a'..=b'f' => b |= c - b'a' + 10, + b'0'..=b'9' => b |= c - b'0', + _ => return None, + } + if (idx & 1) == 1 { + out.push(b); + b = 0; + } + } + + Some(out) +} + +#[inline] +pub fn hex_str(value: &[u8]) -> String { + let mut res = String::with_capacity(64); + for v in value { + res += &format!("{:02x}", v); + } + res +} + +pub fn to_compressed_pubkey(hex: &str) -> Option { + let data = match to_vec(&hex[0..33*2]) { + Some(bytes) => bytes, + None => return None + }; + match PublicKey::from_slice(&data) { + Ok(pk) => Some(pk), + Err(_) => None, + } +} diff --git a/src/main.rs b/src/main.rs index f740cd1..3c417ef 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,122 +1,71 @@ mod bitcoind_client; mod cli; -mod utils; +mod convert; +mod disk; +mod hex_utils; use background_processor::BackgroundProcessor; -use bitcoin::{BlockHash, Txid}; +use bitcoin::BlockHash; use bitcoin::blockdata::constants::genesis_block; use bitcoin::blockdata::transaction::Transaction; use bitcoin::consensus::encode; -use bitcoin::hashes::hex::FromHex; +use bitcoin::hashes::Hash; +use bitcoin::hashes::sha256::Hash as Sha256; use bitcoin::network::constants::Network; use bitcoin::secp256k1::Secp256k1; -use bitcoin::util::address::Address; use bitcoin_bech32::WitnessProgram; use crate::bitcoind_client::BitcoindClient; +use crate::disk::FilesystemLogger; 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::keysinterface::{InMemorySigner, KeysInterface, KeysManager}; use lightning::chain::transaction::OutPoint; use lightning::chain::Watch; use lightning::ln::channelmanager; -use lightning::ln::channelmanager::{ChannelManagerReadArgs, PaymentHash, PaymentPreimage, +use lightning::ln::channelmanager::{ChainParameters, ChannelManagerReadArgs, PaymentHash, PaymentPreimage, SimpleArcChannelManager}; use lightning::ln::peer_handler::{MessageHandler, SimpleArcPeerManager}; 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::util::ser::ReadableArgs; use lightning_block_sync::UnboundedCache; use lightning_block_sync::SpvClient; -use lightning_block_sync::http::HttpEndpoint; 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_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::HashMap; use std::fs; use std::fs::File; -use std::io::Cursor; +use std::io; +use std::io:: Write; 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(); - } -} - -fn read_channelmonitors_from_disk(path: String, keys_manager: Arc) -> - Result)>, 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")); - } +pub(crate) const NETWORK: Network = Network::Regtest; - let contents = fs::read(&file.path())?; - - if let Ok((blockhash, channel_monitor)) = - <(BlockHash, ChannelMonitor)>::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) -} - -type Invoice = String; - -enum HTLCDirection { +#[derive(PartialEq)] +pub(crate) enum HTLCDirection { Inbound, Outbound } -type PaymentInfoStorage = Arc, HTLCDirection)>>>; +pub(crate) enum HTLCStatus { + Pending, + Succeeded, + Failed, +} + +pub(crate) type PaymentInfoStorage = Arc, + HTLCDirection, HTLCStatus)>>>; type ArcChainMonitor = ChainMonitor, Arc, Arc, Arc, Arc>; @@ -127,128 +76,159 @@ BitcoindClient, dyn chain::Access, FilesystemLogger>; pub(crate) type ChannelManager = SimpleArcChannelManager; - fn handle_ldk_events(peer_manager: Arc, channel_manager: Arc, - chain_monitor: Arc, bitcoind_rpc_client: Arc, - keys_manager: Arc, mut pending_txs: HashMap, - htlcs: PaymentInfoStorage) -> HashMap + chain_monitor: Arc, bitcoind_client: Arc, + keys_manager: Arc, payment_storage: PaymentInfoStorage) { - peer_manager.process_events(); - let mut check_for_more_events = true; - while check_for_more_events { + let mut pending_txs: HashMap = HashMap::new(); + loop { + peer_manager.process_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, .. } => { + // 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 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(); + 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); + + // 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); + let change_output_position = funded_tx.changepos; 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(); + + // Sign the final funding transaction and broadcast it. + let signed_tx = bitcoind_client.sign_raw_transaction_with_wallet(funded_tx.hex); + assert_eq!(signed_tx.complete, true); + let final_tx: Transaction = encode::deserialize(&hex_utils::to_vec(&signed_tx.hex).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); + 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); + bitcoind_client.broadcast_transaction(&funding_tx); + println!("\nEVENT: broadcasted funding transaction"); + print!("> "); io::stdout().flush().unwrap(); }, 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)); + let mut payments = payment_storage.lock().unwrap(); + if let Some((Some(preimage), _, _)) = payments.get(&payment_hash) { + assert!(loop_channel_manager.claim_funds(preimage.clone(), &payment_secret, + amt_msat)); + println!("\nEVENT: received payment from payment_hash {} of {} satoshis", + hex_utils::hex_str(&payment_hash.0), amt_msat / 1000); + print!("> "); io::stdout().flush().unwrap(); + let (_, _, ref mut status) = payments.get_mut(&payment_hash).unwrap(); + *status = HTLCStatus::Succeeded; } else { + println!("\nERROR: we received a payment but didn't know the preimage"); + print!("> "); io::stdout().flush().unwrap(); loop_channel_manager.fail_htlc_backwards(&payment_hash, &payment_secret); + payments.insert(payment_hash, (None, HTLCDirection::Inbound, HTLCStatus::Failed)); } - 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)); - } + let hashed = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner()); + let mut payments = payment_storage.lock().unwrap(); + for (payment_hash, (preimage_option, _, status)) in payments.iter_mut() { + if *payment_hash == hashed { + *preimage_option = Some(payment_preimage); + *status = HTLCStatus::Succeeded; + println!("\nNEW EVENT: successfully sent payment from payment hash \ + {:?} with preimage {:?}", 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 } => { - 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); + Event::PaymentFailed { payment_hash, rejected_by_dest, .. } => { + print!("\nNEW EVENT: Failed to send payment to payment hash {:?}: ", + hex_utils::hex_str(&payment_hash.0)); if rejected_by_dest { println!("rejected by destination node"); } else { println!("route failed"); + } + print!("> "); io::stdout().flush().unwrap(); + + let mut payments = payment_storage.lock().unwrap(); + if payments.contains_key(&payment_hash) { + let (_, _, ref mut status) = payments.get_mut(&payment_hash).unwrap(); + *status = HTLCStatus::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 destination_address = bitcoind_client.get_new_address(); let output_descriptors = &outputs.iter().map(|a| a).collect::>(); - let tx_feerate = bitcoind_rpc_client.get_est_sat_per_1000_weight(ConfirmationTarget::Normal); + 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_rpc_client.broadcast_transaction(&spending_tx); + bitcoind_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 } } } + thread::sleep(Duration::new(1, 0)); } - pending_txs } 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()); + 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 = Arc::new(BitcoindClient::new(args.bitcoind_rpc_host.clone(), + args.bitcoind_rpc_port, + args.bitcoind_rpc_username.clone(), + args.bitcoind_rpc_password.clone()).unwrap()); + let mut bitcoind_rpc_client = bitcoind_client.get_new_rpc_client().unwrap(); // ## 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{}); + 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(".".to_string())); + let persister = Arc::new(FilesystemPersister::new(ldk_data_dir.clone())); // Step 5: Initialize the ChainMonitor let chain_monitor: Arc = Arc::new(ChainMonitor::new(None, broadcaster.clone(), @@ -256,32 +236,37 @@ fn main() { 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 + + // 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); - 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"); + let mut f = File::create(keys_seed_path).unwrap(); + 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"); 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())); + let keys_manager = Arc::new(KeysManager::new(&keys_seed, 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(); + let monitors_path = format!("{}/monitors", ldk_data_dir.clone()); + let mut outpoint_to_channelmonitor = disk::read_channelmonitors_from_disk(monitors_path.to_string(), + keys_manager.clone()).unwrap(); - // Step 9: Read ChannelManager state from disk + // Step 9: Initialize the ChannelManager let user_config = UserConfig::default(); - let mut channel_manager: ChannelManager; - let mut channel_manager_last_blockhash: Option = None; - if let Ok(mut f) = fs::File::open("./manager") { - let (last_block_hash_option, channel_manager_from_disk) = { + let runtime = Runtime::new().unwrap(); + 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 outpoint_to_channelmonitor.iter_mut() { channel_monitor_mut_references.push(&mut channel_monitor.1); @@ -290,72 +275,63 @@ fn main() { chain_monitor.clone(), broadcaster.clone(), logger.clone(), user_config, channel_monitor_mut_references); - <(Option, 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); - } + <(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(); + let chain_params = ChainParameters { + network: NETWORK, + latest_hash: getinfo_resp.latest_blockhash, + latest_height: getinfo_resp.latest_height, + }; + 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 10: Sync ChannelMonitors to chain tip if restarting - let mut chain_tip = None; + // Step 10: Sync ChannelMonitors and ChannelManager to chain tip 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 { + let mut chain_tip: Option = None; + if restarting_node { + let mut chain_listeners = vec![ + (channel_manager_blockhash, &mut channel_manager as &mut dyn chain::Listen)]; + 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), + chain_listener_channel_monitors.push((blockhash, (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()); + chain_tip = Some(runtime.block_on(init::synchronize_listeners(&mut bitcoind_rpc_client, NETWORK, + &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()); + 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 13: Optional: Initialize the NetGraphMsgHandler // XXX persist routing data - let genesis = genesis_block(Network::Regtest).header.block_hash(); + let genesis = genesis_block(NETWORK).header.block_hash(); let router = Arc::new(NetGraphMsgHandler::new(genesis, None::>, logger.clone())); // Step 14: Initialize the PeerManager - let channel_manager = Arc::new(channel_manager); + let channel_manager: Arc = 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(), @@ -365,30 +341,16 @@ fn main() { &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 + + // We poll for events in handle_ldk_events(..) rather than waiting for them over the + // mpsc::channel, so we can leave the event receiver as unused. + let (event_ntfn_sender, mut _event_ntfn_receiver) = mpsc::channel(2); 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(); + let listening_port = args.ldk_peer_listening_port; + runtime.spawn(async move { + let listener = std::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port)).unwrap(); loop { let tcp_stream = listener.accept().unwrap().0; lightning_net_tokio::setup_inbound(peer_manager_connection_handler.clone(), @@ -397,28 +359,68 @@ fn main() { }); // 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") - } + chain_tip = Some(runtime.block_on(init::validate_best_block_header(&mut bitcoind_rpc_client)).unwrap()); } - let chain_listener = (chain_monitor.clone(), channel_manager.clone()); - let _spv_client = SpvClient::new(chain_tip.unwrap(), chain_poller, &mut cache, &chain_listener); + let channel_manager_listener = channel_manager.clone(); + let chain_monitor_listener = chain_monitor.clone(); + runtime.spawn(async move { + let chain_poller = poll::ChainPoller::new(&mut bitcoind_rpc_client, 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(); + thread::sleep(Duration::new(1, 0)); + } + }); // Step 17 & 18: Initialize ChannelManager persistence & Once Per Minute: ChannelManager's // timer_chan_freshness_every_min() and PeerManager's timer_tick_occurred + let runtime_handle = runtime.handle(); + let data_dir = ldk_data_dir.clone(); let persist_channel_manager_callback = move |node: &ChannelManager| { - FilesystemPersister::persist_manager("./".to_string(), &*node) + FilesystemPersister::persist_manager(data_dir.clone(), &*node) }; - BackgroundProcessor::start(persist_channel_manager_callback, channel_manager.clone(), logger.clone()); + BackgroundProcessor::start(persist_channel_manager_callback, channel_manager.clone(), + logger.clone()); + let peer_manager_processor = peer_manager.clone(); - thread::spawn(move || { + runtime_handle.spawn(async move { loop { - peer_manager_processor.timer_tick_occured(); + peer_manager_processor.timer_tick_occurred(); thread::sleep(Duration::new(60, 0)); } }); - cli::poll_for_user_input(peer_manager.clone(), channel_manager.clone(), event_ntfn_sender.clone()); + + // Step 15: Initialize LDK Event Handling + 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 keys_manager_listener = keys_manager.clone(); + let payment_info: PaymentInfoStorage = Arc::new(Mutex::new(HashMap::new())); + let payment_info_for_events = payment_info.clone(); + let handle = runtime_handle.clone(); + thread::spawn(move || { + handle_ldk_events(peer_manager_event_listener, channel_manager_event_listener, + chain_monitor_event_listener, bitcoind_client.clone(), + keys_manager_listener, payment_info_for_events); + }); + + // 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() { + let _ = cli::connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone(), + event_ntfn_sender.clone(), handle.clone()); + } + }, + Err(e) => println!("ERROR: errored reading channel peer info from disk: {:?}", e), + } + + // Start the CLI. + cli::poll_for_user_input(peer_manager.clone(), channel_manager.clone(), router.clone(), + payment_info, keys_manager.get_node_secret(), event_ntfn_sender, + ldk_data_dir.clone(), logger.clone(), handle); } diff --git a/src/utils.rs b/src/utils.rs deleted file mode 100644 index 5ca6a4d..0000000 --- a/src/utils.rs +++ /dev/null @@ -1,42 +0,0 @@ -use bitcoin::secp256k1::key::PublicKey; - -pub fn hex_to_vec(hex: &str) -> Option> { - let mut out = Vec::with_capacity(hex.len() / 2); - - let mut b = 0; - for (idx, c) in hex.as_bytes().iter().enumerate() { - b <<= 4; - match *c { - b'A'..=b'F' => b |= c - b'A' + 10, - b'a'..=b'f' => b |= c - b'a' + 10, - b'0'..=b'9' => b |= c - b'0', - _ => return None, - } - if (idx & 1) == 1 { - out.push(b); - b = 0; - } - } - - Some(out) -} - -#[inline] -pub fn hex_str(value: &[u8]) -> String { - let mut res = String::with_capacity(64); - for v in value { - res += &format!("{:02x}", v); - } - res -} - -pub fn hex_to_compressed_pubkey(hex: &str) -> Option { - let data = match hex_to_vec(&hex[0..33*2]) { - Some(bytes) => bytes, - None => return None - }; - match PublicKey::from_slice(&data) { - Ok(pk) => Some(pk), - Err(_) => None, - } -}