include the bolt12_invoice inside the htlc hash

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

Author: vincenzopalazzo

lightning/src/events/mod.rs

@@ -2457,7 +2457,7 @@ impl<T: EventHandler> EventHandler for Arc<T> {
 }
 
 /// The BOLT 12 invoice that was paid, surfaced in [`Event::PaymentSent::bolt12_invoice`].
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub enum PaidBolt12Invoice {
 	/// The BOLT 12 invoice specified by the BOLT 12 specification,
 	/// allowing the user to perform proof of payment.

lightning/src/ln/channelmanager.rs

@@ -709,13 +709,13 @@ impl core::hash::Hash for HTLCSource {
 				0u8.hash(hasher);
 				prev_hop_data.hash(hasher);
 			},
-			// FIXME(vincenzopalazzo): we can ignore the bolt12_invoice here?
-			HTLCSource::OutboundRoute { path, session_priv, payment_id, first_hop_htlc_msat, .. } => {
+			HTLCSource::OutboundRoute { path, session_priv, payment_id, first_hop_htlc_msat, bolt12_invoice } => {
 				1u8.hash(hasher);
 				path.hash(hasher);
 				session_priv[..].hash(hasher);
 				payment_id.hash(hasher);
 				first_hop_htlc_msat.hash(hasher);
+				bolt12_invoice.hash(hasher);
 			},
 		}
 	}

lightning/src/ln/channelmanager.rs.bak

@@ -1495,7 +1495,7 @@ pub(super) type BlindedPayInfoIter<'a> = core::iter::Map<
 >;
 
 /// Wire representation for an on-chain fallback address.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Hash)]
 pub(super) struct FallbackAddress {
 	pub(super) version: u8,
 	pub(super) program: Vec<u8>,

lightning/src/offers/invoice.rs

@@ -26,7 +26,7 @@ use crate::prelude::*;
 /// [`Offer::metadata`]: crate::offers::offer::Offer::metadata
 /// [`Offer::issuer_signing_pubkey`]: crate::offers::offer::Offer::issuer_signing_pubkey
 /// [`ExpandedKey`]: crate::ln::inbound_payment::ExpandedKey
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub struct Nonce(pub(crate) [u8; Self::LENGTH]);
 
 impl Nonce {

lightning/src/offers/nonce.rs

@@ -604,7 +604,7 @@ pub struct Offer {
 ///
 /// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 /// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Hash)]
 #[cfg_attr(test, derive(PartialEq))]
 pub(super) struct OfferContents {
 	chains: Option<Vec<ChainHash>>,
@@ -1059,7 +1059,7 @@ impl Writeable for OfferContents {
 
 /// The minimum amount required for an item in an [`Offer`], denominated in either bitcoin or
 /// another currency.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Hash)]
 pub enum Amount {
 	/// An amount of bitcoin.
 	Bitcoin {
@@ -1079,7 +1079,7 @@ pub enum Amount {
 pub type CurrencyCode = [u8; 3];
 
 /// Quantity of items supported by an [`Offer`].
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Hash)]
 pub enum Quantity {
 	/// Up to a specific number of items (inclusive). Use when more than one item can be requested
 	/// but is limited (e.g., because of per customer or inventory limits).

lightning/src/offers/offer.rs

@@ -57,7 +57,7 @@ const ASYNC_PAYMENTS_HELD_HTLC_HMAC_INPUT: &[u8; 16] = &[9; 16];
 
 /// Message metadata which possibly is derived from [`MetadataMaterial`] such that it can be
 /// verified.
-#[derive(Clone)]
+#[derive(Clone, Hash)]
 pub(super) enum Metadata {
 	/// Metadata as parsed, supplied by the user, or derived from the message contents.
 	///
@@ -263,6 +263,13 @@ pub(super) struct MetadataMaterial {
 	encrypted_payment_id: Option<[u8; PaymentId::LENGTH]>,
 }
 
+impl std::hash::Hash for MetadataMaterial {
+	fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
+		self.nonce.hash(state);
+		self.encrypted_payment_id.hash(state);
+	}
+}
+
 impl MetadataMaterial {
 	pub fn new(nonce: Nonce, expanded_key: &ExpandedKey, payment_id: Option<PaymentId>) -> Self {
 		// Encrypt payment_id

lightning/src/offers/signer.rs

@@ -65,7 +65,7 @@ pub const SIGNATURE_TAG: &'static str = concat!("lightning", "static_invoice", "
 /// [`Offer`]: crate::offers::offer::Offer
 /// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 /// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Hash)]
 pub struct StaticInvoice {
 	bytes: Vec<u8>,
 	contents: InvoiceContents,
@@ -83,7 +83,7 @@ impl Eq for StaticInvoice {}
 /// The contents of a [`StaticInvoice`] for responding to an [`Offer`].
 ///
 /// [`Offer`]: crate::offers::offer::Offer
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Hash)]
 struct InvoiceContents {
 	offer: OfferContents,
 	payment_paths: Vec<BlindedPaymentPath>,