f - replace invoice_code with invoice_node_id

Author: jkczyz

lightning/src/offers/invoice.rs

@@ -11,6 +11,7 @@
 
 use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::network::constants::Network;
+use bitcoin::secp256k1::PublicKey;
 use bitcoin::secp256k1::schnorr::Signature;
 use bitcoin::util::address::{Address, Payload, WitnessVersion};
 use core::convert::TryFrom;
@@ -48,7 +49,7 @@ const SIGNATURE_TAG: &'static str = concat!("lightning", "invoice", "signature")
 pub struct Invoice {
 	bytes: Vec<u8>,
 	contents: InvoiceContents,
-	signature: Option<Signature>,
+	signature: Signature,
 }
 
 /// The contents of an [`Invoice`] for responding to either an [`Offer`] or a [`Refund`].
@@ -82,7 +83,7 @@ struct InvoiceFields {
 	amount_msats: u64,
 	fallbacks: Option<Vec<FallbackAddress>>,
 	features: Bolt12InvoiceFeatures,
-	code: Option<String>,
+	signing_pubkey: PublicKey,
 }
 
 impl Invoice {
@@ -186,16 +187,13 @@ impl Invoice {
 		&self.contents.fields().features
 	}
 
-	/// A short string used for verifying the recipient when issuing a refund. The payer should only
-	/// pay the invoice after confirming with recipient out-of-band that this code is correct.
-	pub fn code(&self) -> Option<&str> {
-		self.contents.fields().code.as_ref().map(|code| code.as_str())
+	/// The public key used to sign invoices.
+	pub fn signing_pubkey(&self) -> PublicKey {
+		self.contents.fields().signing_pubkey
 	}
 
-	/// Signature of the invoice using [`signing_pubkey`]. `None` for invoices paying refunds.
-	///
-	/// [`signing_pubkey`]: crate::offers::offer::Offer::signing_pubkey
-	pub fn signature(&self) -> Option<Signature> {
+	/// Signature of the invoice using [`Invoice::signing_pubkey`].
+	pub fn signature(&self) -> Signature {
 		self.signature
 	}
 }
@@ -240,7 +238,7 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
 	(170, amount: (u64, HighZeroBytesDroppedBigSize)),
 	(172, fallbacks: (Vec<FallbackAddress>, WithoutLength)),
 	(174, features: (Bolt12InvoiceFeatures, WithoutLength)),
-	(176, code: (String, WithoutLength)),
+	(176, node_id: PublicKey),
 });
 
 /// Information needed to route a payment across a [`BlindedPath`] hop.
@@ -303,18 +301,12 @@ impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for Invoice {
 			(payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream, invoice_tlv_stream)
 		)?;
 
-		match &contents {
-			InvoiceContents::ForOffer { invoice_request, .. } => match &signature {
-				None => return Err(ParseError::InvalidSemantics(SemanticError::MissingSignature)),
-				Some(signature) => {
-					let pubkey = invoice_request.offer.signing_pubkey();
-					merkle::verify_signature(signature, SIGNATURE_TAG, &bytes, pubkey)?;
-				},
-			},
-			InvoiceContents::ForRefund { .. } => if let Some(_) = &signature {
-				return Err(ParseError::InvalidSemantics(SemanticError::UnexpectedSignature));
-			},
-		}
+		let signature = match signature {
+			None => return Err(ParseError::InvalidSemantics(SemanticError::MissingSignature)),
+			Some(signature) => signature,
+		};
+		let pubkey = contents.fields().signing_pubkey;
+		merkle::verify_signature(&signature, SIGNATURE_TAG, &bytes, pubkey)?;
 
 		Ok(Invoice { bytes, contents, signature })
 	}
@@ -330,7 +322,7 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 			invoice_request_tlv_stream,
 			InvoiceTlvStream {
 				paths, blindedpay, created_at, relative_expiry, payment_hash, amount, fallbacks,
-				features, code,
+				features, node_id,
 			},
 		) = tlv_stream;
 
@@ -365,17 +357,18 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 
 		let features = features.unwrap_or_else(Bolt12InvoiceFeatures::empty);
 
+		let signing_pubkey = match node_id {
+			None => return Err(SemanticError::MissingSigningPubkey),
+			Some(node_id) => node_id,
+		};
+
 		let fields = InvoiceFields {
 			paths, payinfo, created_at, relative_expiry, payment_hash, amount_msats, fallbacks,
-			features, code,
+			features, signing_pubkey,
 		};
 
 		match offer_tlv_stream.node_id {
 			Some(_) => {
-				if fields.code.is_some() {
-					return Err(SemanticError::UnexpectedCode);
-				}
-
 				let invoice_request = InvoiceRequestContents::try_from(
 					(payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream)
 				)?;

lightning/src/offers/offer.rs

@@ -486,7 +486,7 @@ impl OfferContents {
 		}
 	}
 
-	pub fn signing_pubkey(&self) -> PublicKey {
+	pub(super) fn signing_pubkey(&self) -> PublicKey {
 		self.signing_pubkey
 	}
 

lightning/src/offers/parse.rs

@@ -167,12 +167,8 @@ pub enum SemanticError {
 	MissingCreationTime,
 	/// An invoice payment hash was expected but was missing.
 	MissingPaymentHash,
-	///
-	UnexpectedCode,
 	/// A signature was expected but was missing.
 	MissingSignature,
-	///
-	UnexpectedSignature,
 }
 
 impl From<bech32::Error> for ParseError {