Update lightning/src/offers/invoice.rs

vincenzopalazzo · graphite-app[bot] · web-flow · commit 22ef851617cb · 2025-07-09T22:08:24.000+02:00
Co-authored-by: graphite-app[bot] &lt;96075541+graphite-app[bot]@users.noreply.github.com&gt;
diff --git a/lightning/src/offers/invoice.rs b/lightning/src/offers/invoice.rs
@@ -1640,8 +1640,11 @@ impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for Bolt12Invoice {
 		let pubkey = contents.fields().signing_pubkey;
 		merkle::verify_signature(&signature, &tagged_hash, pubkey)?;
 
-		let offer_id = OfferId::from_invoice_bytes(&bytes);
-		Ok(Bolt12Invoice { bytes, contents, signature, tagged_hash, offer_id: Some(offer_id) })
+		let offer_id = match &contents {
+			InvoiceContents::ForOffer { .. } => Some(OfferId::from_invoice_bytes(&bytes)),
+			InvoiceContents::ForRefund { .. } => None,
+		};
+		Ok(Bolt12Invoice { bytes, contents, signature, tagged_hash, offer_id })
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1640,8 +1640,11 @@ impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for Bolt12Invoice {`
`1640`	`1640`	`let pubkey = contents.fields().signing_pubkey;`
`1641`	`1641`	`merkle::verify_signature(&signature, &tagged_hash, pubkey)?;`
`1642`	`1642`
`1643`		`- let offer_id = OfferId::from_invoice_bytes(&bytes);`
`1644`		`- Ok(Bolt12Invoice { bytes, contents, signature, tagged_hash, offer_id: Some(offer_id) })`
	`1643`	`+ let offer_id = match &contents {`
	`1644`	`+ InvoiceContents::ForOffer { .. } => Some(OfferId::from_invoice_bytes(&bytes)),`
	`1645`	`+ InvoiceContents::ForRefund { .. } => None,`
	`1646`	`+ };`
	`1647`	`+ Ok(Bolt12Invoice { bytes, contents, signature, tagged_hash, offer_id })`
`1645`	`1648`	`}`
`1646`	`1649`	`}`
`1647`	`1650`