X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=927284aaf7dadb8cf1046772bbbdf8a70808e84b;hb=85e890be4909361b7163fa09fa4bb271463af271;hp=87ad4e9a718997f48c58af19aa32688c1944791d;hpb=5ec1c3f55f5c6794972846ccbe6dc67440313dab;p=ldk-sample

diff --git a/src/main.rs b/src/main.rs
index 87ad4e9..927284a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,12 +51,6 @@ use std::sync::{Arc, Mutex};
 use std::time::{Duration, SystemTime};
 use tokio::sync::mpsc;
 
-#[derive(PartialEq)]
-pub(crate) enum HTLCDirection {
-	Inbound,
-	Outbound,
-}
-
 pub(crate) enum HTLCStatus {
 	Pending,
 	Succeeded,
@@ -77,7 +71,6 @@ impl fmt::Display for MillisatAmount {
 pub(crate) struct PaymentInfo {
 	preimage: Option<PaymentPreimage>,
 	secret: Option<PaymentSecret>,
-	direction: HTLCDirection,
 	status: HTLCStatus,
 	amt_msat: MillisatAmount,
 }
@@ -108,7 +101,7 @@ pub(crate) type ChannelManager =
 async fn handle_ldk_events(
 	channel_manager: Arc<ChannelManager>, chain_monitor: Arc<ChainMonitor>,
 	bitcoind_client: Arc<BitcoindClient>, keys_manager: Arc<KeysManager>,
-	payment_storage: PaymentInfoStorage, network: Network,
+	inbound_payments: PaymentInfoStorage, outbound_payments: PaymentInfoStorage, network: Network,
 ) {
 	loop {
 		let loop_channel_manager = channel_manager.clone();
@@ -156,42 +149,50 @@ async fn handle_ldk_events(
 						.funding_transaction_generated(&temporary_channel_id, final_tx)
 						.unwrap();
 				}
-				Event::PaymentReceived { payment_hash, .. } => {
-					let mut payments = payment_storage.lock().unwrap();
+				Event::PaymentReceived { payment_hash, payment_secret, amt } => {
+					let mut payments = inbound_payments.lock().unwrap();
 					if let Some(payment) = payments.get_mut(&payment_hash) {
-						assert!(loop_channel_manager.claim_funds(
-							payment.preimage.unwrap().clone(),
-							&payment.secret,
-							payment.amt_msat.0.unwrap(),
-						));
-						println!(
-							"\nEVENT: received payment from payment_hash {} of {} millisatoshis",
-							hex_utils::hex_str(&payment_hash.0),
-							payment.amt_msat
-						);
-						print!("> ");
-						io::stdout().flush().unwrap();
-						payment.status = HTLCStatus::Succeeded;
+						if payment.secret == payment_secret {
+							assert!(loop_channel_manager.claim_funds(
+								payment.preimage.unwrap().clone(),
+								&payment.secret,
+								payment.amt_msat.0.unwrap(),
+							));
+							println!(
+							        "\nEVENT: received payment from payment hash {} of {} millisatoshis",
+							        hex_utils::hex_str(&payment_hash.0),
+							        payment.amt_msat
+						      );
+							print!("> ");
+							io::stdout().flush().unwrap();
+							payment.status = HTLCStatus::Succeeded;
+						} else {
+							loop_channel_manager
+								.fail_htlc_backwards(&payment_hash, &payment.secret);
+							println!("\nERROR: we received a payment from payment hash {} but the payment secret didn't match", hex_utils::hex_str(&payment_hash.0));
+							print!("> ");
+							io::stdout().flush().unwrap();
+							payment.status = HTLCStatus::Failed;
+						}
 					} else {
-						println!("\nERROR: we received a payment but didn't know the preimage");
+						loop_channel_manager.fail_htlc_backwards(&payment_hash, &payment_secret);
+						println!("\nERROR: we received a payment for payment hash {} but didn't know the preimage", hex_utils::hex_str(&payment_hash.0));
 						print!("> ");
 						io::stdout().flush().unwrap();
-						loop_channel_manager.fail_htlc_backwards(&payment_hash, &None);
 						payments.insert(
 							payment_hash,
 							PaymentInfo {
 								preimage: None,
-								secret: None,
-								direction: HTLCDirection::Inbound,
+								secret: payment_secret,
 								status: HTLCStatus::Failed,
-								amt_msat: MillisatAmount(None),
+								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();
+					let mut payments = outbound_payments.lock().unwrap();
 					for (payment_hash, payment) in payments.iter_mut() {
 						if *payment_hash == hashed {
 							payment.preimage = Some(payment_preimage);
@@ -221,7 +222,7 @@ 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 payment = payments.get_mut(&payment_hash).unwrap();
 						payment.status = HTLCStatus::Failed;
@@ -505,8 +506,10 @@ async fn start_ldk() {
 	let chain_monitor_event_listener = chain_monitor.clone();
 	let keys_manager_listener = keys_manager.clone();
 	// TODO: persist payment info to disk
-	let payment_info: PaymentInfoStorage = Arc::new(Mutex::new(HashMap::new()));
-	let payment_info_for_events = payment_info.clone();
+	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_rpc = bitcoind_client.clone();
 	tokio::spawn(async move {
@@ -515,7 +518,8 @@ async fn start_ldk() {
 			chain_monitor_event_listener,
 			bitcoind_rpc,
 			keys_manager_listener,
-			payment_info_for_events,
+			inbound_pmts_for_events,
+			outbound_pmts_for_events,
 			network,
 		)
 		.await;
@@ -546,7 +550,8 @@ async fn start_ldk() {
 		peer_manager.clone(),
 		channel_manager.clone(),
 		router.clone(),
-		payment_info,
+		inbound_payments,
+		outbound_payments,
 		keys_manager.get_node_secret(),
 		event_ntfn_sender,
 		ldk_data_dir.clone(),