f play with static invoice

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

Author: vincenzopalazzo

lightning/src/ln/outbound_payment.rs

@@ -95,6 +95,8 @@ pub(crate) enum PendingOutboundPayment {
 		retry_strategy: Retry,
 		route_params: RouteParameters,
 		invoice_request: InvoiceRequest,
+		// FIXME: we should pass the invoice as a string
+		static_invoice: String,
 	},
 	Retryable {
 		retry_strategy: Option<Retry>,
@@ -989,12 +991,19 @@ impl OutboundPayments {
 					*entry.into_mut() = retryable_payment;
 					onion_session_privs
 				},
-				PendingOutboundPayment::StaticInvoiceReceived { .. } => {
+				PendingOutboundPayment::StaticInvoiceReceived { static_invoice: _static_invoice, .. } => {
 					let invreq = if let PendingOutboundPayment::StaticInvoiceReceived { invoice_request, .. } = entry.remove() {
 						invoice_request
 					} else { unreachable!() };
+
+					#[cfg(not(async_payments))]
+					let invoice: Option<OfferInvoice> = None;
+					#[cfg(async_payments)]
+					let invoice = {
+						None
+					};
 					let (retryable_payment, onion_session_privs) = Self::create_pending_payment(
-						payment_hash, recipient_onion.clone(), keysend_preimage, Some(invreq), bolt12_invoice.cloned(), &route,
+						payment_hash, recipient_onion.clone(), keysend_preimage, Some(invreq), invoice, &route,
 						Some(retry_strategy), payment_params, entropy_source, best_block_height
 					);
 					outbounds.insert(payment_id, retryable_payment);
@@ -1092,6 +1101,7 @@ impl OutboundPayments {
 						return Err(Bolt12PaymentError::SendingFailed(RetryableSendFailure::OnionPacketSizeExceeded))
 					}
 
+					// Adds the static invoice here?
 					*entry.into_mut() = PendingOutboundPayment::StaticInvoiceReceived {
 						payment_hash,
 						keysend_preimage,
@@ -1102,6 +1112,7 @@ impl OutboundPayments {
 							.take()
 							.ok_or(Bolt12PaymentError::UnexpectedInvoice)?
 							.invoice_request,
+						static_invoice: String::from("we should have the static invoice here"),
 					};
 					return Ok(())
 				},
@@ -2469,6 +2480,7 @@ impl_writeable_tlv_based_enum_upgradable!(PendingOutboundPayment,
 		(4, retry_strategy, required),
 		(6, route_params, required),
 		(8, invoice_request, required),
+		(10, static_invoice, required),
 	},
 	// Added in 0.1. Prior versions will drop these outbounds on downgrade, which is safe because
 	// no HTLCs are in-flight.

lightning/src/offers/invoice.rs

@@ -1490,7 +1490,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, Eq)]
 pub(super) struct FallbackAddress {
 	pub(super) version: u8,
 	pub(super) program: Vec<u8>,

lightning/src/offers/mod.rs

@@ -45,6 +45,7 @@ pub enum OfferInvoice {
 
 // FIXME(vincenzopalazzo): I do not think there is a way (easy and trivial) that adds cfg to the macro, so
 // when we remove the cfg will be removed we can merge these two macro in two.
+#[cfg(not(async_payments))]
 impl_writeable_tlv_based_enum_legacy!(OfferInvoice,
 	;
 	(0, Bolt12Invoice),

lightning/src/offers/offer.rs

@@ -603,7 +603,7 @@ pub struct Offer {
 ///
 /// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 /// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(test, derive(PartialEq))]
 pub(super) struct OfferContents {
 	chains: Option<Vec<ChainHash>>,

lightning/src/offers/signer.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, PartialEq, Eq)]
 pub(super) enum Metadata {
 	/// Metadata as parsed, supplied by the user, or derived from the message contents.
 	///
@@ -255,7 +255,7 @@ impl PartialEq for Metadata {
 }
 
 /// Material used to create metadata for a message.
-#[derive(Clone)]
+#[derive(Clone, PartialEq, Eq)]
 pub(super) struct MetadataMaterial {
 	nonce: Nonce,
 	hmac: HmacEngine<Sha256>,

lightning/src/offers/static_invoice.rs

@@ -63,7 +63,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, PartialEq, Eq)]
 pub struct StaticInvoice {
 	bytes: Vec<u8>,
 	contents: InvoiceContents,
@@ -73,7 +73,7 @@ pub struct StaticInvoice {
 /// The contents of a [`StaticInvoice`] for responding to an [`Offer`].
 ///
 /// [`Offer`]: crate::offers::offer::Offer
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 struct InvoiceContents {
 	offer: OfferContents,
 	payment_paths: Vec<BlindedPaymentPath>,