X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fblinded_path%2Futils.rs;h=c62b4e6c2612cb52ee57321b747947d2100bd214;hb=e5bd7920bddb4f312741673e37a07cd859fd24fb;hp=1ac6519452c1eb10af3757240d41a046d381efaa;hpb=7c1726b585af71897e15dcb83024d5cab55d4fcd;p=rust-lightning

diff --git a/lightning/src/blinded_path/utils.rs b/lightning/src/blinded_path/utils.rs
index 1ac65194..c62b4e6c 100644
--- a/lightning/src/blinded_path/utils.rs
+++ b/lightning/src/blinded_path/utils.rs
@@ -15,7 +15,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
 use bitcoin::secp256k1::ecdh::SharedSecret;
 
-use super::BlindedPath;
+use super::{BlindedHop, BlindedPath};
 use crate::ln::msgs::DecodeError;
 use crate::ln::onion_utils;
 use crate::onion_message::Destination;
@@ -105,10 +105,32 @@ where
 	Ok(())
 }
 
+// Panics if `unblinded_tlvs` length is less than `unblinded_pks` length
+pub(super) fn construct_blinded_hops<'a, T, I1, I2>(
+	secp_ctx: &Secp256k1<T>, unblinded_pks: I1, mut unblinded_tlvs: I2, session_priv: &SecretKey
+) -> Result<Vec<BlindedHop>, secp256k1::Error>
+where
+	T: secp256k1::Signing + secp256k1::Verification,
+	I1: Iterator<Item=&'a PublicKey>,
+	I2: Iterator,
+	I2::Item: Writeable
+{
+	let mut blinded_hops = Vec::with_capacity(unblinded_pks.size_hint().0);
+	construct_keys_callback(
+		secp_ctx, unblinded_pks, None, session_priv,
+		|blinded_node_id, _, _, encrypted_payload_rho, _, _| {
+			blinded_hops.push(BlindedHop {
+				blinded_node_id,
+				encrypted_payload: encrypt_payload(unblinded_tlvs.next().unwrap(), encrypted_payload_rho),
+			});
+		})?;
+	Ok(blinded_hops)
+}
+
 /// Encrypt TLV payload to be used as a [`crate::blinded_path::BlindedHop::encrypted_payload`].
-pub(super) fn encrypt_payload<P: Writeable>(payload: P, encrypted_tlvs_ss: [u8; 32]) -> Vec<u8> {
+fn encrypt_payload<P: Writeable>(payload: P, encrypted_tlvs_rho: [u8; 32]) -> Vec<u8> {
 	let mut writer = VecWriter(Vec::new());
-	let write_adapter = ChaChaPolyWriteAdapter::new(encrypted_tlvs_ss, &payload);
+	let write_adapter = ChaChaPolyWriteAdapter::new(encrypted_tlvs_rho, &payload);
 	write_adapter.write(&mut writer).expect("In-memory writes cannot fail");
 	writer.0
 }