X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=9e82f8aa76f079235c8ca4ac87700bab4f77798f;hb=16acfaf7655a9ad2eeddacde0675126ec6795303;hp=bfb586adfbe630c3df9ff7fc31b51c67d493ff9c;hpb=34c30f056c150e8b5bc25ef381bef4e05fbf2af6;p=ldk-sample

diff --git a/src/main.rs b/src/main.rs
index bfb586a..9e82f8a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -129,8 +129,6 @@ async fn handle_ldk_events(
 			// Have your wallet put the inputs into the transaction such that the output is
 			// satisfied.
 			let funded_tx = bitcoind_client.fund_raw_transaction(raw_tx).await;
-			let change_output_position = funded_tx.changepos;
-			assert!(change_output_position == 0 || change_output_position == 1);
 
 			// Sign the final funding transaction and broadcast it.
 			let signed_tx = bitcoind_client.sign_raw_transaction_with_wallet(funded_tx.hex).await;
@@ -224,6 +222,23 @@ async fn handle_ldk_events(
 				payment.status = HTLCStatus::Failed;
 			}
 		}
+		Event::PaymentForwarded { fee_earned_msat, claim_from_onchain_tx } => {
+			let from_onchain_str = if claim_from_onchain_tx {
+				"from onchain downstream claim"
+			} else {
+				"from HTLC fulfill message"
+			};
+			if let Some(fee_earned) = fee_earned_msat {
+				println!(
+					"\nEVENT: Forwarded payment, earning {} msat {}",
+					fee_earned, from_onchain_str
+				);
+			} else {
+				println!("\nEVENT: Forwarded payment, claiming onchain {}", from_onchain_str);
+			}
+			print!("> ");
+			io::stdout().flush().unwrap();
+		}
 		Event::PendingHTLCsForwardable { time_forwardable } => {
 			let forwarding_channel_manager = channel_manager.clone();
 			tokio::spawn(async move {
@@ -551,7 +566,7 @@ async fn start_ldk() {
 	let persist_channel_manager_callback =
 		move |node: &ChannelManager| FilesystemPersister::persist_manager(data_dir.clone(), &*node);
 	// Step 17: Background Processing
-	BackgroundProcessor::start(
+	let background_processor = BackgroundProcessor::start(
 		persist_channel_manager_callback,
 		event_handler,
 		chain_monitor.clone(),
@@ -610,6 +625,9 @@ async fn start_ldk() {
 		network,
 	)
 	.await;
+
+	// Stop the background processor.
+	background_processor.stop().unwrap();
 }
 
 #[tokio::main]