From ad1b9a4ef09fb4966462457dfa69504f20cc9da5 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 17 Oct 2021 00:30:23 +0000
Subject: [PATCH] Update dependencies to LDK 0.0.102

---
 Cargo.toml  | 12 ++++++------
 src/cli.rs  |  7 +++++--
 src/main.rs | 25 +++++++++++++++----------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b027721..fb9dd5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lightning = { version = "0.0.101" }
-lightning-block-sync = { version = "0.0.101", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.9.0" }
-lightning-net-tokio = { version = "0.0.101" }
-lightning-persister = { version = "0.0.101" }
-lightning-background-processor = { version = "0.0.101" }
+lightning = { version = "0.0.102" }
+lightning-block-sync = { version = "0.0.102", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.10.0" }
+lightning-net-tokio = { version = "0.0.102" }
+lightning-persister = { version = "0.0.102" }
+lightning-background-processor = { version = "0.0.102" }
 
 base64 = "0.13.0"
 bitcoin = "0.27"
diff --git a/src/cli.rs b/src/cli.rs
index 50d02df..00d805b 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -15,6 +15,7 @@ use lightning::ln::{PaymentHash, PaymentSecret};
 use lightning::routing::network_graph::NetGraphMsgHandler;
 use lightning::routing::router;
 use lightning::routing::router::RouteHint;
+use lightning::routing::scorer::Scorer;
 use lightning::util::config::{ChannelConfig, ChannelHandshakeLimits, UserConfig};
 use lightning_invoice::{utils, Currency, Invoice};
 use std::env;
@@ -608,6 +609,7 @@ fn send_payment(
 		amt_msat,
 		final_cltv,
 		logger,
+		&Scorer::default(),
 	);
 	if let Err(e) = route {
 		println!("ERROR: failed to find route: {}", e.err);
@@ -615,7 +617,7 @@ fn send_payment(
 	}
 	let status = match channel_manager.send_payment(&route.unwrap(), payment_hash, &payment_secret)
 	{
-		Ok(()) => {
+		Ok(_payment_id) => {
 			println!("EVENT: initiated sending {} msats to {}", amt_msat, payee);
 			HTLCStatus::Pending
 		}
@@ -655,6 +657,7 @@ fn keysend(
 		amt_msat,
 		40,
 		logger,
+		&Scorer::default(),
 	) {
 		Ok(r) => r,
 		Err(e) => {
@@ -664,7 +667,7 @@ fn keysend(
 	};
 
 	let mut payments = payment_storage.lock().unwrap();
-	let payment_hash = channel_manager.send_spontaneous_payment(&route, None).unwrap();
+	let payment_hash = channel_manager.send_spontaneous_payment(&route, None).unwrap().0;
 	payments.insert(
 		payment_hash,
 		PaymentInfo {
diff --git a/src/main.rs b/src/main.rs
index 6f35975..f66d4ed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,8 +9,6 @@ use crate::disk::FilesystemLogger;
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
-use bitcoin::hashes::sha256::Hash as Sha256;
-use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::BlockHash;
@@ -184,11 +182,10 @@ async fn handle_ldk_events(
 				}
 			}
 		}
-		Event::PaymentSent { payment_preimage } => {
-			let hashed = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner());
+		Event::PaymentSent { payment_preimage, payment_hash } => {
 			let mut payments = outbound_payments.lock().unwrap();
-			for (payment_hash, payment) in payments.iter_mut() {
-				if *payment_hash == hashed {
+			for (hash, payment) in payments.iter_mut() {
+				if *hash == *payment_hash {
 					payment.preimage = Some(*payment_preimage);
 					payment.status = HTLCStatus::Succeeded;
 					println!(
@@ -209,16 +206,20 @@ async fn handle_ldk_events(
 			network_update: _,
 			all_paths_failed,
 			path: _,
+			short_channel_id,
 		} => {
 			print!(
-				"\nEVENT: Failed to send payment{} to payment hash {:?}: ",
+				"\nEVENT: Failed to send payment{} to payment hash {:?}",
 				if *all_paths_failed { "" } else { " along MPP path" },
 				hex_utils::hex_str(&payment_hash.0)
 			);
+			if let Some(scid) = short_channel_id {
+				print!(" because of failure at channel {}", scid);
+			}
 			if *rejected_by_dest {
-				println!("re-attempting the payment will not succeed");
+				println!(": re-attempting the payment will not succeed");
 			} else {
-				println!("payment may be retried");
+				println!(": payment may be retried");
 			}
 			print!("> ");
 			io::stdout().flush().unwrap();
@@ -271,7 +272,7 @@ async fn handle_ldk_events(
 				.unwrap();
 			bitcoind_client.broadcast_transaction(&spending_tx);
 		}
-		Event::ChannelClosed { channel_id, reason } => {
+		Event::ChannelClosed { channel_id, reason, user_channel_id: _ } => {
 			println!(
 				"\nEVENT: Channel {} closed due to: {:?}",
 				hex_utils::hex_str(channel_id),
@@ -280,6 +281,10 @@ async fn handle_ldk_events(
 			print!("> ");
 			io::stdout().flush().unwrap();
 		}
+		Event::DiscardFunding { .. } => {
+			// A "real" node should probably "lock" the UTXOs spent in funding transactions until
+			// the funding transaction either confirms, or this event is generated.
+		}
 	}
 }
 
-- 
2.30.2