X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=21dfb284a81eeae3e9b1366a41e55fc4cd891378;hb=f6eba96691e0438b700a6f7ce0608bd29b3c83d9;hp=8c5793ac34945cf09b548b35f9055b777496bc27;hpb=b630ab9aecd9cae3ca264aaafb1af70ce81de0d7;p=ldk-sample diff --git a/src/main.rs b/src/main.rs index 8c5793a..21dfb28 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,14 +19,14 @@ use lightning::chain; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; use lightning::chain::chainmonitor; use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager}; -use lightning::chain::transaction::OutPoint; use lightning::chain::Filter; use lightning::chain::Watch; use lightning::ln::channelmanager; use lightning::ln::channelmanager::{ - ChainParameters, ChannelManagerReadArgs, PaymentHash, PaymentPreimage, SimpleArcChannelManager, + BestBlock, 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}; @@ -39,6 +39,7 @@ use lightning_block_sync::UnboundedCache; use lightning_net_tokio::SocketDescriptor; use lightning_persister::FilesystemPersister; use rand::{thread_rng, Rng}; +use std::collections::hash_map::Entry; use std::collections::HashMap; use std::fmt; use std::fs; @@ -50,12 +51,7 @@ use std::path::Path; use std::sync::{Arc, Mutex}; use std::time::{Duration, SystemTime}; use tokio::sync::mpsc; - -#[derive(PartialEq)] -pub(crate) enum HTLCDirection { - Inbound, - Outbound, -} +use tokio::sync::mpsc::Receiver; pub(crate) enum HTLCStatus { Pending, @@ -63,9 +59,9 @@ pub(crate) enum HTLCStatus { Failed, } -pub(crate) struct SatoshiAmount(Option); +pub(crate) struct MillisatAmount(Option); -impl fmt::Display for SatoshiAmount { +impl fmt::Display for MillisatAmount { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self.0 { Some(amt) => write!(f, "{}", amt), @@ -74,15 +70,18 @@ impl fmt::Display for SatoshiAmount { } } -pub(crate) type PaymentInfoStorage = Arc< - Mutex< - HashMap, HTLCDirection, HTLCStatus, SatoshiAmount)>, - >, ->; +pub(crate) struct PaymentInfo { + preimage: Option, + secret: Option, + status: HTLCStatus, + amt_msat: MillisatAmount, +} + +pub(crate) type PaymentInfoStorage = Arc>>; type ChainMonitor = chainmonitor::ChainMonitor< InMemorySigner, - Arc, + Arc, Arc, Arc, Arc, @@ -94,7 +93,7 @@ pub(crate) type PeerManager = SimpleArcPeerManager< ChainMonitor, BitcoindClient, BitcoindClient, - dyn chain::Access, + dyn chain::Access + Send + Sync, FilesystemLogger, >; @@ -102,13 +101,17 @@ pub(crate) type ChannelManager = SimpleArcChannelManager; async fn handle_ldk_events( - peer_manager: Arc, channel_manager: Arc, - chain_monitor: Arc, bitcoind_client: Arc, - keys_manager: Arc, payment_storage: PaymentInfoStorage, network: Network, + channel_manager: Arc, chain_monitor: Arc, + bitcoind_client: Arc, keys_manager: Arc, + inbound_payments: PaymentInfoStorage, outbound_payments: PaymentInfoStorage, network: Network, + mut event_receiver: Receiver<()>, ) { - let mut pending_txs: HashMap = HashMap::new(); loop { - peer_manager.process_events(); + let received = event_receiver.recv(); + if received.await.is_none() { + println!("LDK Event channel closed!"); + return; + } let loop_channel_manager = channel_manager.clone(); let mut events = channel_manager.get_and_clear_pending_events(); events.append(&mut chain_monitor.get_and_clear_pending_events()); @@ -149,62 +152,60 @@ async fn handle_ldk_events( 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 }, - }; // Give the funding transaction back to LDK for opening the channel. loop_channel_manager - .funding_transaction_generated(&temporary_channel_id, outpoint); - pending_txs.insert(outpoint, final_tx); - } - Event::FundingBroadcastSafe { funding_txo, .. } => { - let funding_tx = pending_txs.remove(&funding_txo).unwrap(); - bitcoind_client.broadcast_transaction(&funding_tx); - println!("\nEVENT: broadcasted funding transaction"); - print!("> "); - io::stdout().flush().unwrap(); + .funding_transaction_generated(&temporary_channel_id, final_tx) + .unwrap(); } - Event::PaymentReceived { payment_hash, payment_secret, amt: 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, SatoshiAmount(None)), - ); + Event::PaymentReceived { + payment_hash, + payment_preimage, + payment_secret, + amt, + .. + } => { + let mut payments = inbound_payments.lock().unwrap(); + let status = match loop_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 = Some(payment_preimage.unwrap()); + payment.secret = Some(payment_secret); + } + Entry::Vacant(e) => { + e.insert(PaymentInfo { + preimage: Some(payment_preimage.unwrap()), + secret: Some(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 = payment_storage.lock().unwrap(); - for (payment_hash, (preimage_option, _, status, amt_sat)) in payments.iter_mut() - { + let mut payments = outbound_payments.lock().unwrap(); + for (payment_hash, payment) in payments.iter_mut() { if *payment_hash == hashed { - *preimage_option = Some(payment_preimage); - *status = HTLCStatus::Succeeded; + payment.preimage = Some(payment_preimage); + payment.status = HTLCStatus::Succeeded; println!( - "\nEVENT: successfully sent payment of {} satoshis from \ + "\nEVENT: successfully sent payment of {} millisatoshis from \ payment hash {:?} with preimage {:?}", - amt_sat, + payment.amt_msat, hex_utils::hex_str(&payment_hash.0), hex_utils::hex_str(&payment_preimage.0) ); @@ -226,19 +227,18 @@ async fn handle_ldk_events( print!("> "); io::stdout().flush().unwrap(); - let mut payments = payment_storage.lock().unwrap(); + let mut payments = outbound_payments.lock().unwrap(); if payments.contains_key(&payment_hash) { - let (_, _, ref mut status, _) = payments.get_mut(&payment_hash).unwrap(); - *status = HTLCStatus::Failed; + let payment = payments.get_mut(&payment_hash).unwrap(); + payment.status = HTLCStatus::Failed; } } Event::PendingHTLCsForwardable { time_forwardable } => { let forwarding_channel_manager = loop_channel_manager.clone(); tokio::spawn(async move { - let min = time_forwardable.as_secs(); - let seconds_to_sleep = thread_rng().gen_range(min, min * 5); - // thread::sleep(Duration::new(seconds_to_sleep, 0)); - tokio::time::sleep(Duration::from_secs(seconds_to_sleep)).await; + 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(); }); } @@ -257,7 +257,6 @@ async fn handle_ldk_events( ) .unwrap(); bitcoind_client.broadcast_transaction(&spending_tx); - // XXX maybe need to rescan and blah? } } } @@ -265,8 +264,7 @@ async fn handle_ldk_events( } } -#[tokio::main] -pub async fn main() { +async fn start_ldk() { let args = match cli::parse_startup_args() { Ok(user_args) => user_args, Err(()) => return, @@ -277,7 +275,7 @@ pub async fn main() { fs::create_dir_all(ldk_data_dir.clone()).unwrap(); // Initialize our bitcoind client. - let mut bitcoind_client = match BitcoindClient::new( + let bitcoind_client = match BitcoindClient::new( args.bitcoind_rpc_host.clone(), args.bitcoind_rpc_port, args.bitcoind_rpc_username.clone(), @@ -291,7 +289,6 @@ pub async fn main() { return; } }; - // let mut bitcoind_rpc_client = bitcoind_client.get_new_rpc_client().unwrap(); // ## Setup // Step 1: Initialize the FeeEstimator @@ -349,18 +346,16 @@ pub async fn main() { let keys_manager = Arc::new(KeysManager::new(&keys_seed, cur.as_secs(), cur.subsec_nanos())); // Step 7: Read ChannelMonitor state from disk - let monitors_path = format!("{}/monitors", ldk_data_dir.clone()); - let mut outpoint_to_channelmonitor = - disk::read_channelmonitors(monitors_path.to_string(), keys_manager.clone()).unwrap(); + let mut channelmonitors = persister.read_channelmonitors(keys_manager.clone()).unwrap(); - // Step 9: Initialize the ChannelManager + // Step 8: Initialize the ChannelManager let user_config = UserConfig::default(); 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); + for (_, channel_monitor) in channelmonitors.iter_mut() { + channel_monitor_mut_references.push(channel_monitor); } let read_args = ChannelManagerReadArgs::new( keys_manager.clone(), @@ -379,8 +374,10 @@ pub async fn main() { let chain_params = ChainParameters { network: args.network, - latest_hash: getinfo_resp.latest_blockhash, - latest_height: getinfo_resp.latest_height, + best_block: BestBlock::new( + getinfo_resp.latest_blockhash, + getinfo_resp.latest_height as u32, + ), }; let fresh_channel_manager = channelmanager::ChannelManager::new( fee_estimator.clone(), @@ -395,7 +392,7 @@ pub async fn main() { } }; - // Step 10: Sync ChannelMonitors and ChannelManager to chain tip + // 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 = None; @@ -403,9 +400,8 @@ pub async fn main() { 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; + 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()), @@ -421,7 +417,6 @@ pub async fn main() { } chain_tip = Some( init::synchronize_listeners( - // &mut bitcoind_rpc_client, &mut bitcoind_client.deref(), args.network, &mut cache, @@ -432,20 +427,23 @@ pub async fn main() { ); } - // Step 11: Give ChannelMonitors to ChainMonitor + // 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 13: Optional: Initialize the NetGraphMsgHandler + // Step 11: Optional: Initialize the NetGraphMsgHandler // XXX persist routing data let genesis = genesis_block(args.network).header.block_hash(); - let router = - Arc::new(NetGraphMsgHandler::new(genesis, None::>, logger.clone())); + let router = Arc::new(NetGraphMsgHandler::new( + genesis, + None::>, + logger.clone(), + )); - // Step 14: Initialize the PeerManager + // Step 12: Initialize the PeerManager let channel_manager: Arc = Arc::new(channel_manager); let mut ephemeral_bytes = [0; 32]; rand::thread_rng().fill_bytes(&mut ephemeral_bytes); @@ -459,44 +457,39 @@ pub async fn main() { )); // ## Running LDK - // Step 16: Initialize Peer Connection Handling + // Step 13: Initialize networking // 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, _event_ntfn_receiver) = mpsc::channel(2); + let (event_ntfn_sender, event_ntfn_receiver) = mpsc::channel(2); let peer_manager_connection_handler = peer_manager.clone(); let event_notifier = event_ntfn_sender.clone(); let listening_port = args.ldk_peer_listening_port; tokio::spawn(async move { let listener = std::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port)).unwrap(); loop { + let peer_mgr = peer_manager_connection_handler.clone(); + let notifier = event_notifier.clone(); let tcp_stream = listener.accept().unwrap().0; - lightning_net_tokio::setup_inbound( - peer_manager_connection_handler.clone(), - event_notifier.clone(), - tcp_stream, - ) - .await; + tokio::spawn(async move { + lightning_net_tokio::setup_inbound(peer_mgr.clone(), notifier.clone(), tcp_stream) + .await; + }); } }); - // Step 17: Connect and Disconnect Blocks + // Step 14: Connect and Disconnect Blocks if chain_tip.is_none() { - // chain_tip = Some(init::validate_best_block_header(&mut bitcoind_client).await.unwrap()); chain_tip = Some(init::validate_best_block_header(&mut bitcoind_client.deref()).await.unwrap()); - // chain_tip = Some(init::validate_best_block_header(&mut bitcoind_rpc_client).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 chain_poller = poll::ChainPoller::new(&mut bitcoind_client, network); let mut derefed = bitcoind_block_source.deref(); - // let chain_poller = poll::ChainPoller::new(&mut bitcoind_block_source.deref(), network); let chain_poller = poll::ChainPoller::new(&mut derefed, network); - // 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); @@ -506,55 +499,42 @@ pub async fn main() { } }); - // Step 17 & 18: Initialize ChannelManager persistence & Once Per Minute: ChannelManager's - // timer_chan_freshness_every_min() and PeerManager's timer_tick_occurred - let data_dir = ldk_data_dir.clone(); - let persist_channel_manager_callback = - move |node: &ChannelManager| FilesystemPersister::persist_manager(data_dir.clone(), &*node); - BackgroundProcessor::start( - persist_channel_manager_callback, - channel_manager.clone(), - logger.clone(), - ); - - let peer_manager_processor = peer_manager.clone(); - tokio::spawn(async move { - loop { - peer_manager_processor.timer_tick_occurred(); - tokio::time::sleep(Duration::from_secs(60)).await; - } - }); - // 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(); + // 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 = BitcoindClient::new( - // args.bitcoind_rpc_host.clone(), - // args.bitcoind_rpc_port, - // args.bitcoind_rpc_username.clone(), - // args.bitcoind_rpc_password.clone(), - // ).await.unwrap(); let bitcoind_rpc = bitcoind_client.clone(); tokio::spawn(async move { handle_ldk_events( - peer_manager_event_listener, channel_manager_event_listener, chain_monitor_event_listener, - // bitcoind_client.clone(), bitcoind_rpc, - // bitcoind, keys_manager_listener, - payment_info_for_events, + inbound_pmts_for_events, + outbound_pmts_for_events, network, + event_ntfn_receiver, ) .await; }); + // Step 16 & 17: Persist ChannelManager & Background Processing + let data_dir = ldk_data_dir.clone(); + let persist_channel_manager_callback = + move |node: &ChannelManager| FilesystemPersister::persist_manager(data_dir.clone(), &*node); + BackgroundProcessor::start( + persist_channel_manager_callback, + 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)) { @@ -579,9 +559,10 @@ pub async fn main() { cli::poll_for_user_input( peer_manager.clone(), channel_manager.clone(), + keys_manager.clone(), router.clone(), - payment_info, - keys_manager.get_node_secret(), + inbound_payments, + outbound_payments, event_ntfn_sender, ldk_data_dir.clone(), logger.clone(), @@ -589,3 +570,8 @@ pub async fn main() { ) .await; } + +#[tokio::main] +pub async fn main() { + start_ldk().await; +}