f - replace invoice_code with invoice_node_id

Author: jkczyz

lightning/src/offers/invoice.rs

@@ -85,7 +85,8 @@ impl<'a> InvoiceBuilder<'a> {
 				invoice_request: invoice_request.contents.clone(),
 				fields: InvoiceFields {
 					paths, payinfo, created_at, relative_expiry: None, payment_hash, amount_msats,
-					fallbacks: None, features: Bolt12InvoiceFeatures::empty(), code: None,
+					fallbacks: None, features: Bolt12InvoiceFeatures::empty(),
+					signing_pubkey: invoice_request.contents.offer.signing_pubkey(),
 				},
 			},
 		})
@@ -192,7 +193,7 @@ impl<'a> UnsignedInvoice<'a> {
 		let mut bytes = Vec::new();
 		unsigned_tlv_stream.write(&mut bytes).unwrap();
 
-		let pubkey = self.invoice.signing_pubkey();
+		let pubkey = self.invoice.fields().signing_pubkey;
 		let signature = merkle::sign_message(sign, SIGNATURE_TAG, &bytes, pubkey)?;
 
 		// Append the signature TLV record to the bytes.
@@ -204,7 +205,7 @@ impl<'a> UnsignedInvoice<'a> {
 		Ok(Invoice {
 			bytes,
 			contents: self.invoice,
-			signature: Some(signature),
+			signature,
 		})
 	}
 }
@@ -386,15 +387,6 @@ impl InvoiceContents {
 		}
 	}
 
-	fn signing_pubkey(&self) -> PublicKey {
-		match self {
-			InvoiceContents::ForOffer { invoice_request, .. } => {
-				invoice_request.offer.signing_pubkey()
-			},
-			InvoiceContents::ForRefund { .. } => unreachable!(),
-		}
-	}
-
 	fn fields(&self) -> &InvoiceFields {
 		match self {
 			InvoiceContents::ForOffer { fields, .. } => fields,
@@ -436,7 +428,7 @@ impl InvoiceFields {
 			amount: Some(self.amount_msats),
 			fallbacks: self.fallbacks.as_ref(),
 			features,
-			code: self.code.as_ref(),
+			node_id: Some(&self.signing_pubkey),
 		}
 	}
 }