X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_utils.rs;h=ac0bb6189c6d750e92b4fdf5f6d061cca46d2cb2;hb=62d52c6020830385844943de094d85a330c456df;hp=ea906c9e32af86b2b1d21e3322eba082a4c195ea;hpb=68e25c6c851b76115613dfd770e27b182404cc56;p=rust-lightning

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index ea906c9e..ac0bb618 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -190,9 +190,9 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 						cur_value_msat += final_value_msat;
 						cur_cltv += excess_final_cltv_expiry_delta;
 						res.push(msgs::OutboundOnionPayload::BlindedReceive {
-							amt_msat: *final_value_msat,
+							sender_intended_htlc_amt_msat: *final_value_msat,
 							total_msat,
-							outgoing_cltv_value: cltv,
+							cltv_expiry_height: cltv,
 							encrypted_tlvs: blinded_hop.encrypted_payload.clone(),
 							intro_node_blinding_point: blinding_point.take(),
 						});
@@ -214,8 +214,8 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 					payment_metadata: recipient_onion.payment_metadata.take(),
 					keysend_preimage: *keysend_preimage,
 					custom_tlvs: recipient_onion.custom_tlvs.clone(),
-					amt_msat: value_msat,
-					outgoing_cltv_value: cltv,
+					sender_intended_htlc_amt_msat: value_msat,
+					cltv_expiry_height: cltv,
 				});
 			}
 		} else {
@@ -940,9 +940,11 @@ pub(crate) enum OnionDecodeErr {
 
 pub(crate) fn decode_next_payment_hop<NS: Deref>(
 	shared_secret: [u8; 32], hop_data: &[u8], hmac_bytes: [u8; 32], payment_hash: PaymentHash,
-	node_signer: &NS,
+	blinding_point: Option<PublicKey>, node_signer: &NS,
 ) -> Result<Hop, OnionDecodeErr> where NS::Target: NodeSigner {
-	match decode_next_hop(shared_secret, hop_data, hmac_bytes, Some(payment_hash), node_signer) {
+	match decode_next_hop(
+		shared_secret, hop_data, hmac_bytes, Some(payment_hash), (blinding_point, node_signer)
+	) {
 		Ok((next_hop_data, None)) => Ok(Hop::Receive(next_hop_data)),
 		Ok((next_hop_data, Some((next_hop_hmac, FixedSizeOnionPacket(new_packet_bytes))))) => {
 			Ok(Hop::Forward {