X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Fln%2Fonion_utils.rs;h=4b39276c066c77ec5975be569c274081158750ed;hb=e142e4a4e6c856f533ec350ae61c1bbe2a3f20e9;hp=be984858b01f7be0fcbe2b3f1d8463bf6c42dca8;hpb=ae1288d8cc3840b84f9e28ec0be2316c94cfb010;p=rust-lightning

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index be984858..4b39276c 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -14,7 +14,8 @@ use crate::ln::wire::Encode;
 use crate::routing::gossip::NetworkUpdate;
 use crate::routing::router::{BlindedTail, Path, RouteHop};
 use crate::sign::NodeSigner;
-use crate::util::chacha20::{ChaCha20, ChaChaReader};
+use crate::crypto::chacha20::ChaCha20;
+use crate::crypto::streams::ChaChaReader;
 use crate::util::errors::{self, APIError};
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer, LengthCalculatingWriter};
 use crate::util::logger::Logger;
@@ -188,11 +189,10 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 				for (i, blinded_hop) in hops.iter().enumerate() {
 					if i == hops.len() - 1 {
 						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: cur_cltv + excess_final_cltv_expiry_delta,
 							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 {
@@ -429,6 +429,7 @@ pub(crate) struct DecodedOnionFailure {
 	pub(crate) network_update: Option<NetworkUpdate>,
 	pub(crate) short_channel_id: Option<u64>,
 	pub(crate) payment_failed_permanently: bool,
+	pub(crate) failed_within_blinded_path: bool,
 	#[cfg(test)]
 	pub(crate) onion_error_code: Option<u16>,
 	#[cfg(test)]
@@ -725,7 +726,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		network_update, short_channel_id, payment_failed_permanently, failed_within_blinded_path
 	}) = res {
 		DecodedOnionFailure {
-			network_update, short_channel_id, payment_failed_permanently,
+			network_update, short_channel_id, payment_failed_permanently, failed_within_blinded_path,
 			#[cfg(test)]
 			onion_error_code: error_code_ret,
 			#[cfg(test)]
@@ -736,6 +737,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		// payment not retryable only when garbage is from the final node
 		DecodedOnionFailure {
 			network_update: None, short_channel_id: None, payment_failed_permanently: is_from_final_node,
+			failed_within_blinded_path: false,
 			#[cfg(test)]
 			onion_error_code: None,
 			#[cfg(test)]
@@ -883,6 +885,7 @@ impl HTLCFailReason {
 						network_update: None,
 						payment_failed_permanently: false,
 						short_channel_id: Some(path.hops[0].short_channel_id),
+						failed_within_blinded_path: false,
 						#[cfg(test)]
 						onion_error_code: Some(*failure_code),
 						#[cfg(test)]