X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_payment.rs;h=aa8ee0ce9be6bfe3a46301c4cb5d9c57610f49c5;hb=681106d23f9d801bd3a41d598e115dd477461d96;hp=00843d5e4e93d0ec11feb609e9d5009c98e85203;hpb=fbeb7ac9e1256f5d69b0cda580b56c5025ffa987;p=rust-lightning

diff --git a/lightning/src/ln/onion_payment.rs b/lightning/src/ln/onion_payment.rs
index 00843d5e..aa8ee0ce 100644
--- a/lightning/src/ln/onion_payment.rs
+++ b/lightning/src/ln/onion_payment.rs
@@ -20,7 +20,9 @@ use crate::ln::onion_utils::{HTLCFailReason, INVALID_ONION_BLINDING};
 use crate::sign::{NodeSigner, Recipient};
 use crate::util::logger::Logger;
 
+#[allow(unused_imports)]
 use crate::prelude::*;
+
 use core::ops::Deref;
 
 /// Invalid inbound onion payment.
@@ -139,7 +141,7 @@ pub(super) fn create_recv_pending_htlc_info(
 			 cltv_expiry_height, payment_metadata, false),
 		msgs::InboundOnionPayload::BlindedReceive {
 			sender_intended_htlc_amt_msat, total_msat, cltv_expiry_height, payment_secret,
-			intro_node_blinding_point, payment_constraints, ..
+			intro_node_blinding_point, payment_constraints, keysend_preimage, custom_tlvs
 		} => {
 			check_blinded_payment_constraints(
 				sender_intended_htlc_amt_msat, cltv_expiry, &payment_constraints
@@ -152,8 +154,9 @@ pub(super) fn create_recv_pending_htlc_info(
 					}
 				})?;
 			let payment_data = msgs::FinalOnionHopData { payment_secret, total_msat };
-			(Some(payment_data), None, Vec::new(), sender_intended_htlc_amt_msat, cltv_expiry_height,
-			 None, intro_node_blinding_point.is_none())
+			(Some(payment_data), keysend_preimage, custom_tlvs,
+			 sender_intended_htlc_amt_msat, cltv_expiry_height, None,
+			 intro_node_blinding_point.is_none())
 		}
 		msgs::InboundOnionPayload::Forward { .. } => {
 			return Err(InboundHTLCErr {
@@ -232,6 +235,7 @@ pub(super) fn create_recv_pending_htlc_info(
 			payment_metadata,
 			incoming_cltv_expiry: onion_cltv_expiry,
 			custom_tlvs,
+			requires_blinded_error,
 		}
 	} else if let Some(data) = payment_data {
 		PendingHTLCRouting::Receive {