Update to latest upstream RL
[ldk-sample] / src / main.rs
index 8c5793ac34945cf09b548b35f9055b777496bc27..5f213fca40b2dffac9a72c3ed0897c58b84e4bf3 100644 (file)
@@ -19,7 +19,6 @@ 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;
@@ -102,13 +101,11 @@ pub(crate) type ChannelManager =
        SimpleArcChannelManager<ChainMonitor, BitcoindClient, BitcoindClient, FilesystemLogger>;
 
 async fn handle_ldk_events(
-       peer_manager: Arc<PeerManager>, channel_manager: Arc<ChannelManager>,
-       chain_monitor: Arc<ChainMonitor>, bitcoind_client: Arc<BitcoindClient>,
-       keys_manager: Arc<KeysManager>, payment_storage: PaymentInfoStorage, network: Network,
+       channel_manager: Arc<ChannelManager>, chain_monitor: Arc<ChainMonitor>,
+       bitcoind_client: Arc<BitcoindClient>, keys_manager: Arc<KeysManager>,
+       payment_storage: PaymentInfoStorage, network: Network,
 ) {
-       let mut pending_txs: HashMap<OutPoint, Transaction> = HashMap::new();
        loop {
-               peer_manager.process_events();
                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,22 +146,12 @@ 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);
+                                               .funding_transaction_generated(&temporary_channel_id, final_tx)
+                                               .unwrap();
                                }
                                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();
-                               }
                                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) {
@@ -235,10 +222,9 @@ async fn handle_ldk_events(
                                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 +243,6 @@ async fn handle_ldk_events(
                                                )
                                                .unwrap();
                                        bitcoind_client.broadcast_transaction(&spending_tx);
-                                       // XXX maybe need to rescan and blah?
                                }
                        }
                }
@@ -265,8 +250,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 +261,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 +275,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,9 +332,7 @@ 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
        let user_config = UserConfig::default();
@@ -359,8 +340,8 @@ pub async fn main() {
        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(),
@@ -403,9 +384,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 +401,6 @@ pub async fn main() {
                }
                chain_tip = Some(
                        init::synchronize_listeners(
-                               // &mut bitcoind_rpc_client,
                                &mut bitcoind_client.deref(),
                                args.network,
                                &mut cache,
@@ -482,21 +461,16 @@ pub async fn main() {
 
        // Step 17: 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);
@@ -514,6 +488,7 @@ pub async fn main() {
        BackgroundProcessor::start(
                persist_channel_manager_callback,
                channel_manager.clone(),
+               peer_manager.clone(),
                logger.clone(),
        );
 
@@ -526,28 +501,18 @@ pub async fn main() {
        });
 
        // 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 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,
                        network,
@@ -589,3 +554,8 @@ pub async fn main() {
        )
        .await;
 }
+
+#[tokio::main]
+pub async fn main() {
+       start_ldk().await;
+}