fixup! Add new payment type and metadata bytes

Return delta from verify and remove helper

Author: dunxen

lightning/src/ln/channelmanager.rs

@@ -3182,16 +3182,15 @@ where
 										match claimable_htlc.onion_payload {
 											OnionPayload::Invoice { .. } => {
 												let payment_data = payment_data.unwrap();
-												let payment_preimage = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
-													Ok(payment_preimage) => payment_preimage,
+												let (payment_preimage, min_final_cltv_expiry_delta) = match inbound_payment::verify(payment_hash, &payment_data, self.highest_seen_timestamp.load(Ordering::Acquire) as u64, &self.inbound_payment_key, &self.logger) {
+													Ok(result) => result,
 													Err(()) => {
 														log_trace!(self.logger, "Failing new HTLC with payment_hash {} as payment verification failed", log_bytes!(payment_hash.0));
 														fail_htlc!(claimable_htlc, payment_hash);
 														continue
 													}
 												};
-												if let Some(min_final_cltv_expiry_delta) = inbound_payment::get_custom_min_final_cltv_expiry_delta(
-													payment_data.payment_secret, &self.inbound_payment_key) {
+												if let Some(min_final_cltv_expiry_delta) = min_final_cltv_expiry_delta {
 													let expected_min_expiry_height = (self.current_best_block().height() + min_final_cltv_expiry_delta as u32) as u64;
 													if (cltv_expiry as u64) < expected_min_expiry_height {
 														log_trace!(self.logger, "Failing new HTLC with payment_hash {} as its CLTV expiry was too soon (had {}, earliest expected {})",
@@ -7393,7 +7392,7 @@ where
 								payment_preimage: match pending_inbound_payments.get(&payment_hash) {
 									Some(inbound_payment) => inbound_payment.payment_preimage,
 									None => match inbound_payment::verify(payment_hash, &hop_data, 0, &expanded_inbound_key, &args.logger) {
-										Ok(payment_preimage) => payment_preimage,
+										Ok((payment_preimage, _)) => payment_preimage,
 										Err(()) => {
 											log_error!(args.logger, "Failed to read claimable payment data for HTLC with payment hash {} - was not a pending inbound payment and didn't match our payment key", log_bytes!(payment_hash.0));
 											return Err(DecodeError::InvalidValue);

lightning/src/ln/inbound_payment.rs

@@ -15,7 +15,6 @@ use bitcoin::hashes::cmp::fixed_time_eq;
 use bitcoin::hashes::hmac::{Hmac, HmacEngine};
 use bitcoin::hashes::sha256::Hash as Sha256;
 use crate::chain::keysinterface::{KeyMaterial, EntropySource};
-use crate::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
 use crate::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::ln::msgs;
 use crate::ln::msgs::MAX_VALUE_MSAT;
@@ -252,7 +251,9 @@ fn construct_payment_secret(iv_bytes: &[u8; IV_LEN], metadata_bytes: &[u8; METAD
 /// [`NodeSigner::get_inbound_payment_key_material`]: crate::chain::keysinterface::NodeSigner::get_inbound_payment_key_material
 /// [`create_inbound_payment`]: crate::ln::channelmanager::ChannelManager::create_inbound_payment
 /// [`create_inbound_payment_for_hash`]: crate::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
-pub(super) fn verify<L: Deref>(payment_hash: PaymentHash, payment_data: &msgs::FinalOnionHopData, highest_seen_timestamp: u64, keys: &ExpandedKey, logger: &L) -> Result<Option<PaymentPreimage>, ()>
+pub(super) fn verify<L: Deref>(payment_hash: PaymentHash, payment_data: &msgs::FinalOnionHopData,
+	highest_seen_timestamp: u64, keys: &ExpandedKey, logger: &L) -> Result<
+	(Option<PaymentPreimage>, Option<u16>), ()>
 	where L::Target: Logger
 {
 	let (iv_bytes, metadata_bytes) = decrypt_metadata(payment_data.payment_secret, keys);
@@ -317,27 +318,7 @@ pub(super) fn verify<L: Deref>(payment_hash: PaymentHash, payment_data: &msgs::F
 		return Err(())
 	}
 
-	if let Some(min_final_cltv_expiry_delta) = min_final_cltv_expiry_delta {
-		if min_final_cltv_expiry_delta.saturating_add(3) < MIN_FINAL_CLTV_EXPIRY_DELTA {
-			log_trace!(logger, "Failing HTLC with payment_hash {} due to min_final_cltv_expiry_delta {} being less
-				 than our absolute minimum of {}", log_bytes!(payment_hash.0), min_final_cltv_expiry_delta,
-				MIN_FINAL_CLTV_EXPIRY_DELTA);
-			return Err(())
-		}
-	}
-
-	Ok(payment_preimage)
-}
-
-pub(super) fn get_custom_min_final_cltv_expiry_delta(payment_secret: PaymentSecret, keys: &ExpandedKey) -> Option<u16> {
-	let (_, metadata_bytes) = decrypt_metadata(payment_secret, keys);
-
-	match Method::from_bits((metadata_bytes[0] & 0b1110_0000) >> METHOD_TYPE_OFFSET) {
-		Ok(Method::UserPaymentHashCustomFinalCltv) | Ok(Method::LdkPaymentHashCustomFinalCltv) => {
-			Some(min_final_cltv_expiry_delta_from_metadata(metadata_bytes))
-		},
-		_ => None,
-	}
+	Ok((payment_preimage, min_final_cltv_expiry_delta))
 }
 
 pub(super) fn get_payment_preimage(payment_hash: PaymentHash, payment_secret: PaymentSecret, keys: &ExpandedKey) -> Result<PaymentPreimage, APIError> {