fixup! offer: add OfferId to Bolt12Invoice

Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

lightning/src/offers/invoice.rs

@@ -595,6 +595,7 @@ pub struct UnsignedBolt12Invoice {
 	experimental_bytes: Vec<u8>,
 	contents: InvoiceContents,
 	tagged_hash: TaggedHash,
+	offer_id: Option<OfferId>,
 }
 
 /// A function for signing an [`UnsignedBolt12Invoice`].
@@ -658,7 +659,11 @@ impl UnsignedBolt12Invoice {
 		let tlv_stream = TlvStream::new(&bytes).chain(TlvStream::new(&experimental_bytes));
 		let tagged_hash = TaggedHash::from_tlv_stream(SIGNATURE_TAG, tlv_stream);
 
-		Self { bytes, experimental_bytes, contents, tagged_hash }
+		let offer_id = match &contents {
+			InvoiceContents::ForOffer { .. } => Some(OfferId::from_valid_bolt12_tlv_stream(&bytes)),
+			InvoiceContents::ForRefund { .. } => None,
+		};
+		Self { bytes, experimental_bytes, contents, tagged_hash, offer_id }
 	}
 
 	/// Returns the [`TaggedHash`] of the invoice to sign.
@@ -686,9 +691,9 @@ macro_rules! unsigned_invoice_sign_method { ($self: ident, $self_type: ty $(, $s
 		// Append the experimental bytes after the signature.
 		$self.bytes.extend_from_slice(&$self.experimental_bytes);
 
-		let offer_id = match &self.contents {
+		let offer_id = match &$self.contents {
 			InvoiceContents::ForOffer { .. } => {
-				Some(OfferId::from_valid_bolt12_tlv_stream(&self.bytes))
+				Some(OfferId::from_valid_bolt12_tlv_stream(&$self.bytes))
 			},
 			InvoiceContents::ForRefund { .. } => None,
 		};
@@ -976,13 +981,6 @@ impl Bolt12Invoice {
 		self.tagged_hash.as_digest().as_ref().clone()
 	}
 
-	/// Returns the [`OfferId`] if this invoice corresponds to an [`Offer`].
-	///
-	/// [`Offer`]: crate::offers::offer::Offer
-	pub fn offer_id(&self) -> Option<OfferId> {
-		self.offer_id
-	}
-
 	/// Verifies that the invoice was for a request or refund created using the given key by
 	/// checking the payer metadata from the invoice request.
 	///
@@ -1448,7 +1446,12 @@ impl TryFrom<Vec<u8>> for UnsignedBolt12Invoice {
 			.map_or(0, |last_record| last_record.end);
 		let experimental_bytes = bytes.split_off(offset);
 
-		Ok(UnsignedBolt12Invoice { bytes, experimental_bytes, contents, tagged_hash })
+		let offer_id = match &contents {
+			InvoiceContents::ForOffer { .. } => Some(OfferId::from_valid_bolt12_tlv_stream(&bytes)),
+			InvoiceContents::ForRefund { .. } => None,
+		};
+
+		Ok(UnsignedBolt12Invoice { bytes, experimental_bytes, contents, tagged_hash, offer_id })
 	}
 }
 

lightning/src/offers/invoice_macros.rs

@@ -141,6 +141,13 @@ macro_rules! invoice_accessors_common { ($self: ident, $contents: expr, $invoice
 	pub fn invoice_features(&$self) -> &Bolt12InvoiceFeatures {
 		$contents.features()
 	}
+
+	/// Returns the [`OfferId`] if this invoice corresponds to an [`Offer`].
+	///
+	/// [`Offer`]: crate::offers::offer::Offer
+	pub fn offer_id(&$self) -> Option<OfferId> {
+		$self.offer_id
+	}
 } }
 
 pub(super) use invoice_accessors_common;

lightning/src/offers/static_invoice.rs

@@ -29,7 +29,7 @@ use crate::offers::merkle::{
 use crate::offers::nonce::Nonce;
 use crate::offers::offer::{
 	Amount, ExperimentalOfferTlvStream, ExperimentalOfferTlvStreamRef, Offer, OfferContents,
-	OfferTlvStream, OfferTlvStreamRef, Quantity, EXPERIMENTAL_OFFER_TYPES, OFFER_TYPES,
+	OfferId, OfferTlvStream, OfferTlvStreamRef, Quantity, EXPERIMENTAL_OFFER_TYPES, OFFER_TYPES,
 };
 use crate::offers::parse::{Bolt12ParseError, Bolt12SemanticError, ParsedMessage};
 use crate::types::features::{Bolt12InvoiceFeatures, OfferFeatures};
@@ -70,6 +70,7 @@ pub struct StaticInvoice {
 	bytes: Vec<u8>,
 	contents: InvoiceContents,
 	signature: Signature,
+	offer_id: Option<OfferId>,
 }
 
 impl PartialEq for StaticInvoice {
@@ -198,6 +199,7 @@ pub struct UnsignedStaticInvoice {
 	experimental_bytes: Vec<u8>,
 	contents: InvoiceContents,
 	tagged_hash: TaggedHash,
+	offer_id: Option<OfferId>,
 }
 
 macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
@@ -330,7 +332,9 @@ impl UnsignedStaticInvoice {
 		let tlv_stream = TlvStream::new(&bytes).chain(TlvStream::new(&experimental_bytes));
 		let tagged_hash = TaggedHash::from_tlv_stream(SIGNATURE_TAG, tlv_stream);
 
-		Self { bytes, experimental_bytes, contents, tagged_hash }
+		// FIXME: we can have a static invoice for a Refund? if yes this should be optional
+		let offer_id = OfferId::from_valid_bolt12_tlv_stream(&bytes);
+		Self { bytes, experimental_bytes, contents, tagged_hash, offer_id: Some(offer_id) }
 	}
 
 	/// Signs the [`TaggedHash`] of the invoice using the given function.
@@ -347,7 +351,13 @@ impl UnsignedStaticInvoice {
 		// Append the experimental bytes after the signature.
 		self.bytes.extend_from_slice(&self.experimental_bytes);
 
-		Ok(StaticInvoice { bytes: self.bytes, contents: self.contents, signature })
+		let offer_id = OfferId::from_valid_bolt12_tlv_stream(&self.bytes);
+		Ok(StaticInvoice {
+			bytes: self.bytes,
+			contents: self.contents,
+			signature,
+			offer_id: Some(offer_id),
+		})
 	}
 
 	invoice_accessors_common!(self, self.contents, UnsignedStaticInvoice);
@@ -627,7 +637,8 @@ impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for StaticInvoice {
 		let pubkey = contents.signing_pubkey;
 		merkle::verify_signature(&signature, &tagged_hash, pubkey)?;
 
-		Ok(StaticInvoice { bytes, contents, signature })
+		let offer_id = OfferId::from_valid_bolt12_tlv_stream(&bytes);
+		Ok(StaticInvoice { bytes, contents, signature, offer_id: Some(offer_id) })
 	}
 }