X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=9f86095d647e522d876628768b7f3b4ac6bd08f1;hb=c126f0b1870552d03b011afd4104a22fb523007a;hp=2bf60cdc7971454d2afb30f8c6aef9eed9508d4a;hpb=3f416bc24e0e804e0cae1c8c5650b19500122b6d;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 2bf60cdc..9f86095d 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -63,7 +63,7 @@ use crate::offers::merkle::SignError;
 use crate::offers::offer::{DerivedMetadata, Offer, OfferBuilder};
 use crate::offers::parse::Bolt12SemanticError;
 use crate::offers::refund::{Refund, RefundBuilder};
-use crate::onion_message::{Destination, OffersMessage, OffersMessageHandler, PendingOnionMessage};
+use crate::onion_message::{Destination, OffersMessage, OffersMessageHandler, PendingOnionMessage, new_pending_onion_message};
 use crate::sign::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, WriteableEcdsaChannelSigner};
 use crate::util::config::{UserConfig, ChannelConfig, ChannelConfigUpdate};
 use crate::util::wakers::{Future, Notifier};
@@ -3420,12 +3420,10 @@ where
 		let prng_seed = self.entropy_source.get_secure_random_bytes();
 		let session_priv = SecretKey::from_slice(&session_priv_bytes[..]).expect("RNG is busted");
 
-		let onion_keys = onion_utils::construct_onion_keys(&self.secp_ctx, &path, &session_priv)
-			.map_err(|_| APIError::InvalidRoute{err: "Pubkey along hop was maliciously selected".to_owned()})?;
-		let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(path, total_value, recipient_onion, cur_height, keysend_preimage)?;
-
-		let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, prng_seed, payment_hash)
-			.map_err(|_| APIError::InvalidRoute { err: "Route size too large considering onion data".to_owned()})?;
+		let (onion_packet, htlc_msat, htlc_cltv) = onion_utils::create_payment_onion(
+			&self.secp_ctx, &path, &session_priv, total_value, recipient_onion, cur_height,
+			payment_hash, keysend_preimage, prng_seed
+		)?;
 
 		let err: Result<(), _> = loop {
 			let (counterparty_node_id, id) = match self.short_to_chan_info.read().unwrap().get(&path.hops.first().unwrap().short_channel_id) {
@@ -7505,11 +7503,11 @@ where
 
 		let mut pending_offers_messages = self.pending_offers_messages.lock().unwrap();
 		if offer.paths().is_empty() {
-			let message = PendingOnionMessage {
-				contents: OffersMessage::InvoiceRequest(invoice_request),
-				destination: Destination::Node(offer.signing_pubkey()),
-				reply_path: Some(reply_path),
-			};
+			let message = new_pending_onion_message(
+				OffersMessage::InvoiceRequest(invoice_request),
+				Destination::Node(offer.signing_pubkey()),
+				Some(reply_path),
+			);
 			pending_offers_messages.push(message);
 		} else {
 			// Send as many invoice requests as there are paths in the offer (with an upper bound).
@@ -7517,11 +7515,11 @@ where
 			// one invoice for a given payment id will be paid, even if more than one is received.
 			const REQUEST_LIMIT: usize = 10;
 			for path in offer.paths().into_iter().take(REQUEST_LIMIT) {
-				let message = PendingOnionMessage {
-					contents: OffersMessage::InvoiceRequest(invoice_request.clone()),
-					destination: Destination::BlindedPath(path.clone()),
-					reply_path: Some(reply_path.clone()),
-				};
+				let message = new_pending_onion_message(
+					OffersMessage::InvoiceRequest(invoice_request.clone()),
+					Destination::BlindedPath(path.clone()),
+					Some(reply_path.clone()),
+				);
 				pending_offers_messages.push(message);
 			}
 		}
@@ -7574,19 +7572,19 @@ where
 
 				let mut pending_offers_messages = self.pending_offers_messages.lock().unwrap();
 				if refund.paths().is_empty() {
-					let message = PendingOnionMessage {
-						contents: OffersMessage::Invoice(invoice),
-						destination: Destination::Node(refund.payer_id()),
-						reply_path: Some(reply_path),
-					};
+					let message = new_pending_onion_message(
+						OffersMessage::Invoice(invoice),
+						Destination::Node(refund.payer_id()),
+						Some(reply_path),
+					);
 					pending_offers_messages.push(message);
 				} else {
 					for path in refund.paths() {
-						let message = PendingOnionMessage {
-							contents: OffersMessage::Invoice(invoice.clone()),
-							destination: Destination::BlindedPath(path.clone()),
-							reply_path: Some(reply_path.clone()),
-						};
+						let message = new_pending_onion_message(
+							OffersMessage::Invoice(invoice.clone()),
+							Destination::BlindedPath(path.clone()),
+							Some(reply_path.clone()),
+						);
 						pending_offers_messages.push(message);
 					}
 				}