From f2b3c97629178ddf345636eca4d20e5f6c1bcde2 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Mon, 6 May 2024 12:25:51 -0400 Subject: [PATCH] Update to LDK 0.0.123-rc1. --- Cargo.lock | 29 ++++++++++++++--------------- Cargo.toml | 14 +++++++------- src/cli.rs | 23 ++++++++++++++--------- src/main.rs | 30 +++++++++++++++++++++--------- src/sweep.rs | 4 ++-- 5 files changed, 58 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 20f8866..6ab5786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,9 +306,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "lightning" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0c1f811ae288f86c6767055c55b5f7a721ca1e61bf1897a9ae2ec663e8aba1" +checksum = "ee93135fb5c8f8a6209de6d75b3427b42b1e420e368c2db66de430b00722b000" dependencies = [ "bitcoin", "hex-conservative", @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "lightning-background-processor" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d4711ad9cc33f30c2e8e876fcfd6255523fc250440abb8c374cd98e6c40e79" +checksum = "cd2de40d79ac56442b48837ec91be5106d6de03b3d5403b4e0a734e682485f4e" dependencies = [ "bitcoin", "lightning", @@ -327,9 +327,9 @@ dependencies = [ [[package]] name = "lightning-block-sync" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb75d3aca909b77ee21b2e26714c370bdc3246734fa3d4355afa503cb3c0feb" +checksum = "6cd54aa51ef33a4994fe2e4bb42fbcb9a5eadb1a45e3376139070c147761fa80" dependencies = [ "bitcoin", "chunked_transfer", @@ -341,22 +341,21 @@ dependencies = [ [[package]] name = "lightning-invoice" -version = "0.29.0" +version = "0.31.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b186aca4a605d4db3b85979922be287b9ebd5dedd8132963bb9dbeb8f7d2a04" +checksum = "ebae584a444099f1142fb26011c35f0c398e40e8e71954bac264df35af1007ec" dependencies = [ "bech32 0.9.1", "bitcoin", "lightning", - "num-traits", "secp256k1", ] [[package]] name = "lightning-net-tokio" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4813cca14ed984924a6975895e80cde8673a0a105a1c7ddf3b0fb3d1ce59e6bf" +checksum = "41ccafc9fe11e5cd50a37f87463a435b47f4c42f1752614d701a4f9007cc63b3" dependencies = [ "bitcoin", "lightning", @@ -365,9 +364,9 @@ dependencies = [ [[package]] name = "lightning-persister" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82a633e4d08b75e16dc131af2961254b7005c30ab29577e215080d2943c0511" +checksum = "f1acf6ab0b6f577d7bdf011cf6da22d7d12d25cb37b591f218131bd83c79fb2a" dependencies = [ "bitcoin", "lightning", @@ -376,9 +375,9 @@ dependencies = [ [[package]] name = "lightning-rapid-gossip-sync" -version = "0.0.121" +version = "0.0.123-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d6c450cb698b46ecacc6645ebeb2b57d6f9458482635ab523863fa8378314" +checksum = "45f40015050667dab87b48c96554890b6ebd386e1bc447f59682c37bfd8f8381" dependencies = [ "bitcoin", "lightning", diff --git a/Cargo.toml b/Cargo.toml index 99699eb..97e2ef5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lightning = { version = "0.0.121", features = ["max_level_trace"] } -lightning-block-sync = { version = "0.0.121", features = [ "rpc-client", "tokio" ] } -lightning-invoice = { version = "0.29.0" } -lightning-net-tokio = { version = "0.0.121" } -lightning-persister = { version = "0.0.121" } -lightning-background-processor = { version = "0.0.121", features = [ "futures" ] } -lightning-rapid-gossip-sync = { version = "0.0.121" } +lightning = { version = "0.0.123-rc1", features = ["max_level_trace"] } +lightning-block-sync = { version = "0.0.123-rc1", features = [ "rpc-client", "tokio" ] } +lightning-invoice = { version = "0.31.0-rc1" } +lightning-net-tokio = { version = "0.0.123-rc1" } +lightning-persister = { version = "0.0.123-rc1" } +lightning-background-processor = { version = "0.0.123-rc1", features = [ "futures" ] } +lightning-rapid-gossip-sync = { version = "0.0.123-rc1" } base64 = "0.13.0" bitcoin = "0.30.2" diff --git a/src/cli.rs b/src/cli.rs index fe1b286..0f4534d 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -286,7 +286,7 @@ pub(crate) fn poll_for_user_input( ); }, "getoffer" => { - let offer_builder = channel_manager.create_offer_builder(String::new()); + let offer_builder = channel_manager.create_offer_builder(); if let Err(e) = offer_builder { println!("ERROR: Failed to initiate offer building: {:?}", e); continue; @@ -603,14 +603,14 @@ fn node_info(channel_manager: &Arc, peer_manager: &Arc(); println!("\t\t local_balance_msat: {}", local_balance_msat); - println!("\t\t num_peers: {}", peer_manager.get_peer_node_ids().len()); + println!("\t\t num_peers: {}", peer_manager.list_peers().len()); println!("\t}},"); } fn list_peers(peer_manager: Arc) { println!("\t{{"); - for (pubkey, _) in peer_manager.get_peer_node_ids() { - println!("\t\t pubkey: {}", pubkey); + for peer_details in peer_manager.list_peers() { + println!("\t\t pubkey: {}", peer_details.counterparty_node_id); } println!("\t}},"); } @@ -701,8 +701,8 @@ fn list_payments( pub(crate) async fn connect_peer_if_necessary( pubkey: PublicKey, peer_addr: SocketAddr, peer_manager: Arc, ) -> Result<(), ()> { - for (node_pubkey, _) in peer_manager.get_peer_node_ids() { - if node_pubkey == pubkey { + for peer_details in peer_manager.list_peers() { + if peer_details.counterparty_node_id == pubkey { return Ok(()); } } @@ -725,7 +725,12 @@ pub(crate) async fn do_connect_peer( _ = &mut connection_closed_future => return Err(()), _ = tokio::time::sleep(Duration::from_millis(10)) => {}, }; - if peer_manager.get_peer_node_ids().iter().find(|(id, _)| *id == pubkey).is_some() { + if peer_manager + .list_peers() + .iter() + .find(|peer| peer.counterparty_node_id == pubkey) + .is_some() + { return Ok(()); } } @@ -747,8 +752,8 @@ fn do_disconnect_peer( } //check the pubkey matches a valid connected peer - let peers = peer_manager.get_peer_node_ids(); - if !peers.iter().any(|(pk, _)| &pubkey == pk) { + let peers = peer_manager.list_peers(); + if !peers.iter().any(|peer| peer.counterparty_node_id == pubkey) { println!("Error: Could not find peer {}", pubkey); return Err(()); } diff --git a/src/main.rs b/src/main.rs index add6990..d78b522 100644 --- a/src/main.rs +++ b/src/main.rs @@ -247,7 +247,9 @@ async fn handle_ldk_events( print!("> "); io::stdout().flush().unwrap(); let payment_preimage = match purpose { - PaymentPurpose::InvoicePayment { payment_preimage, .. } => payment_preimage, + PaymentPurpose::Bolt11InvoicePayment { payment_preimage, .. } => payment_preimage, + PaymentPurpose::Bolt12OfferPayment { payment_preimage, .. } => payment_preimage, + PaymentPurpose::Bolt12RefundPayment { payment_preimage, .. } => payment_preimage, PaymentPurpose::SpontaneousPayment(preimage) => Some(preimage), }; channel_manager.claim_funds(payment_preimage.unwrap()); @@ -267,9 +269,15 @@ async fn handle_ldk_events( print!("> "); io::stdout().flush().unwrap(); let (payment_preimage, payment_secret) = match purpose { - PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => { + PaymentPurpose::Bolt11InvoicePayment { + payment_preimage, payment_secret, .. + } => (payment_preimage, Some(payment_secret)), + PaymentPurpose::Bolt12OfferPayment { payment_preimage, payment_secret, .. } => { (payment_preimage, Some(payment_secret)) }, + PaymentPurpose::Bolt12RefundPayment { + payment_preimage, payment_secret, .. + } => (payment_preimage, Some(payment_secret)), PaymentPurpose::SpontaneousPayment(preimage) => (Some(preimage), None), }; let mut inbound = inbound_payments.lock().unwrap(); @@ -381,9 +389,12 @@ async fn handle_ldk_events( Event::PaymentForwarded { prev_channel_id, next_channel_id, - fee_earned_msat, + total_fee_earned_msat, claim_from_onchain_tx, outbound_amount_forwarded_msat, + skimmed_fee_msat: _, + prev_user_channel_id: _, + next_user_channel_id: _, } => { let read_only_network_graph = network_graph.read_only(); let nodes = read_only_network_graph.nodes(); @@ -426,7 +437,7 @@ async fn handle_ldk_events( } else { "?".to_string() }; - if let Some(fee_earned) = fee_earned_msat { + if let Some(fee_earned) = total_fee_earned_msat { println!( "\nEVENT: Forwarded payment for {} msat{}{}, earning {} msat {}", amt_args, from_prev_str, to_next_str, fee_earned, from_onchain_str @@ -677,7 +688,7 @@ async fn start_ldk() { let router = Arc::new(DefaultRouter::new( network_graph.clone(), logger.clone(), - keys_manager.get_secure_random_bytes(), + keys_manager.clone(), scorer.clone(), scoring_fee_params, )); @@ -712,7 +723,7 @@ async fn start_ldk() { restarting_node = false; let polled_best_block = polled_chain_tip.to_best_block(); - let polled_best_block_hash = polled_best_block.block_hash(); + let polled_best_block_hash = polled_best_block.block_hash; let chain_params = ChainParameters { network: args.network, best_block: polled_best_block }; let fresh_channel_manager = channelmanager::ChannelManager::new( @@ -789,7 +800,8 @@ async fn start_ldk() { Arc::clone(&keys_manager), Arc::clone(&keys_manager), Arc::clone(&logger), - Arc::new(DefaultMessageRouter::new(Arc::clone(&network_graph))), + Arc::clone(&channel_manager), + Arc::new(DefaultMessageRouter::new(Arc::clone(&network_graph), Arc::clone(&keys_manager))), Arc::clone(&channel_manager), IgnoringMessageHandler {}, )); @@ -969,12 +981,12 @@ async fn start_ldk() { interval.tick().await; match disk::read_channel_peer_data(Path::new(&peer_data_path)) { Ok(info) => { - let peers = connect_pm.get_peer_node_ids(); + let peers = connect_pm.list_peers(); for node_id in connect_cm .list_channels() .iter() .map(|chan| chan.counterparty.node_id) - .filter(|id| !peers.iter().any(|(pk, _)| id == pk)) + .filter(|id| !peers.iter().any(|peer| peer.counterparty_node_id == *id)) { if stop_connect.load(Ordering::Acquire) { return; diff --git a/src/sweep.rs b/src/sweep.rs index fbfa62c..a3d6f8f 100644 --- a/src/sweep.rs +++ b/src/sweep.rs @@ -5,7 +5,7 @@ use std::time::Duration; use std::{fs, io}; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; -use lightning::sign::{EntropySource, KeysManager, SpendableOutputDescriptor}; +use lightning::sign::{EntropySource, KeysManager, OutputSpender, SpendableOutputDescriptor}; use lightning::util::logger::Logger; use lightning::util::persist::KVStore; use lightning::util::ser::{Readable, WithoutLength, Writeable}; @@ -118,7 +118,7 @@ pub(crate) async fn periodic_sweep( // e.g. high-latency mix networks and some CoinJoin implementations, have // better privacy. // Logic copied from core: https://github.com/bitcoin/bitcoin/blob/1d4846a8443be901b8a5deb0e357481af22838d0/src/wallet/spend.cpp#L936 - let mut cur_height = channel_manager.current_best_block().height(); + let mut cur_height = channel_manager.current_best_block().height; // 10% of the time if thread_rng().gen_range(0, 10) == 0 {