X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_payment.rs;h=c552bf13b8efd0fa80cd396d23e2f96da5c85eba;hb=3b6d039f89b75758dda7c5aeedce5e79bbc0d5fa;hp=b04b78f6554da564fac04f13b602195635d5f7a1;hpb=cadea5dae5ee4cbb8e98675ba6e686143764e754;p=rust-lightning

diff --git a/lightning/src/ln/onion_payment.rs b/lightning/src/ln/onion_payment.rs
index b04b78f6..c552bf13 100644
--- a/lightning/src/ln/onion_payment.rs
+++ b/lightning/src/ln/onion_payment.rs
@@ -126,15 +126,18 @@ pub(super) fn create_recv_pending_htlc_info(
 		payment_metadata, requires_blinded_error
 	) = match hop_data {
 		msgs::InboundOnionPayload::Receive {
-			payment_data, keysend_preimage, custom_tlvs, amt_msat, outgoing_cltv_value, payment_metadata, ..
+			payment_data, keysend_preimage, custom_tlvs, sender_intended_htlc_amt_msat,
+			cltv_expiry_height, payment_metadata, ..
 		} =>
-			(payment_data, keysend_preimage, custom_tlvs, amt_msat, outgoing_cltv_value, payment_metadata,
-			 false),
+			(payment_data, keysend_preimage, custom_tlvs, sender_intended_htlc_amt_msat,
+			 cltv_expiry_height, payment_metadata, false),
 		msgs::InboundOnionPayload::BlindedReceive {
-			amt_msat, total_msat, outgoing_cltv_value, payment_secret, intro_node_blinding_point,
-			payment_constraints, ..
+			sender_intended_htlc_amt_msat, total_msat, cltv_expiry_height, payment_secret,
+			intro_node_blinding_point, payment_constraints, ..
 		} => {
-			check_blinded_payment_constraints(amt_msat, cltv_expiry, &payment_constraints)
+			check_blinded_payment_constraints(
+				sender_intended_htlc_amt_msat, cltv_expiry, &payment_constraints
+			)
 				.map_err(|()| {
 					InboundHTLCErr {
 						err_code: INVALID_ONION_BLINDING,
@@ -143,8 +146,8 @@ pub(super) fn create_recv_pending_htlc_info(
 					}
 				})?;
 			let payment_data = msgs::FinalOnionHopData { payment_secret, total_msat };
-			(Some(payment_data), None, Vec::new(), amt_msat, outgoing_cltv_value, None,
-			 intro_node_blinding_point.is_none())
+			(Some(payment_data), None, Vec::new(), sender_intended_htlc_amt_msat, cltv_expiry_height,
+			 None, intro_node_blinding_point.is_none())
 		}
 		msgs::InboundOnionPayload::Forward { .. } => {
 			return Err(InboundHTLCErr {