X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_utils.rs;h=0abcb7de26df55468001afff373a0d5281e81e59;hb=da7a916682a01daf399b5afb0ed291b8767c6dc5;hp=74de4a923577269bedce2a4dccb1821d307f76b6;hpb=6159325ee7022508ddd3c4178ba0fe3fe630fc8e;p=rust-lightning

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index 74de4a92..0abcb7de 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -11,8 +11,8 @@ use crate::crypto::chacha20::ChaCha20;
 use crate::crypto::streams::ChaChaReader;
 use crate::ln::channelmanager::{HTLCSource, RecipientOnionFields};
 use crate::ln::msgs;
+use crate::ln::types::{PaymentHash, PaymentPreimage};
 use crate::ln::wire::Encode;
-use crate::ln::{PaymentHash, PaymentPreimage};
 use crate::routing::gossip::NetworkUpdate;
 use crate::routing::router::{BlindedTail, Path, RouteHop};
 use crate::sign::NodeSigner;
@@ -30,10 +30,11 @@ use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
 
 use crate::io::{Cursor, Read};
-use crate::prelude::*;
-use core::convert::{AsMut, TryInto};
 use core::ops::Deref;
 
+#[allow(unused_imports)]
+use crate::prelude::*;
+
 pub(crate) struct OnionKeys {
 	#[cfg(test)]
 	pub(crate) shared_secret: SharedSecret,
@@ -214,6 +215,7 @@ pub(super) fn build_onion_payloads(
 							encrypted_tlvs: blinded_hop.encrypted_payload.clone(),
 							intro_node_blinding_point: blinding_point.take(),
 							keysend_preimage: *keysend_preimage,
+							custom_tlvs: recipient_onion.custom_tlvs.clone(),
 						});
 					} else {
 						res.push(msgs::OutboundOnionPayload::BlindedForward {
@@ -1072,6 +1074,21 @@ pub(crate) enum Hop {
 	},
 }
 
+impl Hop {
+	pub(crate) fn is_intro_node_blinded_forward(&self) -> bool {
+		match self {
+			Self::Forward {
+				next_hop_data:
+					msgs::InboundOnionPayload::BlindedForward {
+						intro_node_blinding_point: Some(_), ..
+					},
+				..
+			} => true,
+			_ => false,
+		}
+	}
+}
+
 /// Error returned when we fail to decode the onion packet.
 #[derive(Debug)]
 pub(crate) enum OnionDecodeErr {
@@ -1223,11 +1240,13 @@ mod tests {
 	use crate::io;
 	use crate::ln::features::{ChannelFeatures, NodeFeatures};
 	use crate::ln::msgs;
-	use crate::ln::PaymentHash;
-	use crate::prelude::*;
+	use crate::ln::types::PaymentHash;
 	use crate::routing::router::{Path, Route, RouteHop};
 	use crate::util::ser::{VecWriter, Writeable, Writer};
 
+	#[allow(unused_imports)]
+	use crate::prelude::*;
+
 	use bitcoin::hashes::hex::FromHex;
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::secp256k1::{PublicKey, SecretKey};