Updated to ldk main

Cargo.toml

@@ -8,14 +8,16 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lightning = { version = "0.1.0", features = ["dnssec"] }
-lightning-block-sync = { version = "0.1.0", features = [ "rpc-client", "tokio" ] }
-lightning-dns-resolver = { version = "0.2.0" }
-lightning-invoice = { version = "0.33.0" }
-lightning-net-tokio = { version = "0.1.0" }
-lightning-persister = { version = "0.1.0" }
-lightning-background-processor = { version = "0.1.0", features = [ "futures" ] }
-lightning-rapid-gossip-sync = { version = "0.1.0" }
+
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev ="f9b8d630c579d76ec85e283bdd0fd0c9408a7474", features = ["dnssec"] }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev ="f9b8d630c579d76ec85e283bdd0fd0c9408a7474", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev ="f9b8d630c579d76ec85e283bdd0fd0c9408a7474" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev ="f9b8d630c579d76ec85e283bdd0fd0c9408a7474" }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev ="f9b8d630c579d76ec85e283bdd0fd0c9408a7474", features = ["futures"] }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "f9b8d630c579d76ec85e283bdd0fd0c9408a7474" }
+lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "f9b8d630c579d76ec85e283bdd0fd0c9408a7474", features = ["rpc-client", "tokio"] }
+lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "f9b8d630c579d76ec85e283bdd0fd0c9408a7474" }
+lightning-dns-resolver = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "f9b8d630c579d76ec85e283bdd0fd0c9408a7474" }
 
 base64 = "0.13.0"
 bitcoin = "0.32"

src/cli.rs

@@ -9,8 +9,6 @@ use bitcoin::hashes::Hash;
 use bitcoin::network::Network;
 use bitcoin::secp256k1::PublicKey;
 use lightning::chain::channelmonitor::Balance;
-use lightning::ln::bolt11_payment::payment_parameters_from_invoice;
-use lightning::ln::bolt11_payment::payment_parameters_from_variable_amount_invoice;
 use lightning::ln::channelmanager::{
 	Bolt11InvoiceParameters, PaymentId, RecipientOnionFields, Retry,
 };
@@ -20,7 +18,7 @@ use lightning::offers::offer::{self, Offer};
 use lightning::onion_message::dns_resolution::HumanReadableName;
 use lightning::onion_message::messenger::Destination;
 use lightning::routing::gossip::NodeId;
-use lightning::routing::router::{PaymentParameters, RouteParameters};
+use lightning::routing::router::{PaymentParameters, RouteParameters, RouteParametersConfig};
 use lightning::sign::{EntropySource, KeysManager};
 use lightning::types::payment::{PaymentHash, PaymentPreimage};
 use lightning::util::config::{ChannelHandshakeConfig, ChannelHandshakeLimits, UserConfig};
@@ -235,7 +233,7 @@ pub(crate) fn poll_for_user_input(
 						let retry = Retry::Timeout(Duration::from_secs(10));
 						let amt = Some(amt_msat);
 						let pay = channel_manager
-							.pay_for_offer(&offer, None, amt, None, payment_id, retry, None);
+							.pay_for_offer(&offer, None, amt, None, payment_id, retry, RouteParametersConfig::default());
 						if pay.is_ok() {
 							println!("Payment in flight");
 						} else {
@@ -299,7 +297,7 @@ pub(crate) fn poll_for_user_input(
 						let pay = |a, b, c, d, e, f| {
 							channel_manager.pay_for_offer_from_human_readable_name(a, b, c, d, e, f)
 						};
-						let pay = pay(hrn, amt_msat, payment_id, retry, None, dns_resolvers);
+						let pay = pay(hrn, amt_msat, payment_id, retry, RouteParametersConfig::default(), dns_resolvers);
 						if pay.is_ok() {
 							println!("Payment in flight");
 						} else {
@@ -831,14 +829,13 @@ fn send_payment(
 	let payment_secret = Some(*invoice.payment_secret());
 	let zero_amt_invoice =
 		invoice.amount_milli_satoshis().is_none() || invoice.amount_milli_satoshis() == Some(0);
-	let pay_params_opt = if zero_amt_invoice {
-		if let Some(amt_msat) = required_amount_msat {
-			payment_parameters_from_variable_amount_invoice(invoice, amt_msat)
-		} else {
+	let amount_msats = if zero_amt_invoice {
+		if required_amount_msat.is_none() {
 			println!("Need an amount for the given 0-value invoice");
 			print!("> ");
 			return;
 		}
+		required_amount_msat
 	} else {
 		if required_amount_msat.is_some() && invoice.amount_milli_satoshis() != required_amount_msat
 		{
@@ -849,15 +846,7 @@ fn send_payment(
 			print!("> ");
 			return;
 		}
-		payment_parameters_from_invoice(invoice)
-	};
-	let (payment_hash, recipient_onion, route_params) = match pay_params_opt {
-		Ok(res) => res,
-		Err(e) => {
-			println!("Failed to parse invoice: {:?}", e);
-			print!("> ");
-			return;
-		},
+		None
 	};
 	outbound_payments.payments.insert(
 		payment_id,
@@ -870,11 +859,12 @@ fn send_payment(
 	);
 	fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
 
-	match channel_manager.send_payment(
-		payment_hash,
-		recipient_onion,
+	let route_params_config = RouteParametersConfig::default();
+	match channel_manager.pay_for_bolt11_invoice(
+		invoice,
 		payment_id,
-		route_params,
+		amount_msats,
+		route_params_config,
 		Retry::Timeout(Duration::from_secs(10)),
 	) {
 		Ok(_) => {

src/main.rs

@@ -355,6 +355,7 @@ async fn handle_ldk_events(
 				temporary_channel_id,
 				counterparty_node_id,
 				user_channel_id,
+				None,
 			);
 
 			if let Err(e) = res {
@@ -800,7 +801,7 @@ async fn start_ldk() {
 		];
 
 		for (blockhash, channel_monitor) in channelmonitors.drain(..) {
-			let outpoint = channel_monitor.get_funding_txo().0;
+			let outpoint = channel_monitor.get_funding_txo();
 			chain_listener_channel_monitors.push((
 				blockhash,
 				(channel_monitor, broadcaster.clone(), fee_estimator.clone(), logger.clone()),
@@ -830,9 +831,9 @@ async fn start_ldk() {
 	// Step 14: Give ChannelMonitors to ChainMonitor
 	for item in chain_listener_channel_monitors.drain(..) {
 		let channel_monitor = item.1 .0;
-		let funding_outpoint = item.2;
+		let channel_id = channel_monitor.channel_id();
 		assert_eq!(
-			chain_monitor.watch_channel(funding_outpoint, channel_monitor),
+			chain_monitor.watch_channel(channel_id, channel_monitor),
 			Ok(ChannelMonitorUpdateStatus::Completed)
 		);
 	}