Disallow user-provided payer_signing_pubkey

fuzz/src/chanmon_consistency.rs

@@ -57,7 +57,6 @@ use lightning::ln::msgs::{
 use lightning::ln::script::ShutdownScript;
 use lightning::ln::types::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::offers::invoice::UnsignedBolt12Invoice;
-use lightning::offers::invoice_request::UnsignedInvoiceRequest;
 use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
 use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};
 use lightning::sign::{
@@ -339,12 +338,6 @@ impl NodeSigner for KeyProvider {
  unreachable!()
  }
 
- fn sign_bolt12_invoice_request(
- &self, _invoice_request: &UnsignedInvoiceRequest,
- ) -> Result<schnorr::Signature, ()> {
- unreachable!()
- }
-
  fn sign_bolt12_invoice(
  &self, _invoice: &UnsignedBolt12Invoice,
  ) -> Result<schnorr::Signature, ()> {

fuzz/src/full_stack.rs

@@ -50,7 +50,6 @@ use lightning::ln::peer_handler::{
 use lightning::ln::script::ShutdownScript;
 use lightning::ln::types::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::offers::invoice::UnsignedBolt12Invoice;
-use lightning::offers::invoice_request::UnsignedInvoiceRequest;
 use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::router::{
@@ -412,12 +411,6 @@ impl NodeSigner for KeyProvider {
  unreachable!()
  }
 
- fn sign_bolt12_invoice_request(
- &self, _invoice_request: &UnsignedInvoiceRequest,
- ) -> Result<schnorr::Signature, ()> {
- unreachable!()
- }
-
  fn sign_bolt12_invoice(
  &self, _invoice: &UnsignedBolt12Invoice,
  ) -> Result<schnorr::Signature, ()> {

fuzz/src/offer_deser.rs

@@ -8,11 +8,15 @@
 // licenses.
 
 use crate::utils::test_logger;
-use bitcoin::secp256k1::{Keypair, PublicKey, Secp256k1, SecretKey};
+use bitcoin::secp256k1::Secp256k1;
 use core::convert::TryFrom;
-use lightning::offers::invoice_request::UnsignedInvoiceRequest;
+use lightning::ln::channelmanager::PaymentId;
+use lightning::ln::inbound_payment::ExpandedKey;
+use lightning::offers::invoice_request::InvoiceRequest;
+use lightning::offers::nonce::Nonce;
 use lightning::offers::offer::{Amount, Offer, Quantity};
 use lightning::offers::parse::Bolt12SemanticError;
+use lightning::sign::{EntropySource, KeyMaterial};
 use lightning::util::ser::Writeable;
 
 #[inline]
@@ -22,27 +26,30 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
  offer.write(&mut bytes).unwrap();
  assert_eq!(data, bytes);
 
- let secp_ctx = Secp256k1::new();
- let keys = Keypair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
- let pubkey = PublicKey::from(keys);
  let mut buffer = Vec::new();
 
- if let Ok(invoice_request) = build_response(&offer, pubkey) {
- invoice_request
- .sign(|message: &UnsignedInvoiceRequest| {
- Ok(secp_ctx.sign_schnorr_no_aux_rand(message.as_ref().as_digest(), &keys))
- })
- .unwrap()
- .write(&mut buffer)
- .unwrap();
+ if let Ok(invoice_request) = build_request(&offer) {
+ invoice_request.write(&mut buffer).unwrap();
  }
  }
 }
 
-fn build_response(
- offer: &Offer, pubkey: PublicKey,
-) -> Result<UnsignedInvoiceRequest, Bolt12SemanticError> {
- let mut builder = offer.request_invoice(vec![42; 64], pubkey)?;
+struct FixedEntropy;
+
+impl EntropySource for FixedEntropy {
+ fn get_secure_random_bytes(&self) -> [u8; 32] {
+ [42; 32]
+ }
+}
+
+fn build_request(offer: &Offer) -> Result<InvoiceRequest, Bolt12SemanticError> {
+ let expanded_key = ExpandedKey::new(&KeyMaterial([42; 32]));
+ let entropy = FixedEntropy {};
+ let nonce = Nonce::from_entropy_source(&entropy);
+ let secp_ctx = Secp256k1::new();
+ let payment_id = PaymentId([1; 32]);
+
+ let mut builder = offer.request_invoice(&expanded_key, nonce, &secp_ctx, payment_id)?;
 
  builder = match offer.amount() {
  None => builder.amount_msats(1000).unwrap(),
@@ -56,7 +63,7 @@ fn build_response(
  Quantity::One => builder,
  };
 
- builder.build()
+ builder.build_and_sign()
 }
 
 pub fn offer_deser_test<Out: test_logger::Output>(data: &[u8], out: Out) {

fuzz/src/onion_message.rs

@@ -13,7 +13,6 @@ use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
 use lightning::ln::script::ShutdownScript;
 use lightning::offers::invoice::UnsignedBolt12Invoice;
-use lightning::offers::invoice_request::UnsignedInvoiceRequest;
 use lightning::onion_message::async_payments::{
  AsyncPaymentsMessageHandler, HeldHtlcAvailable, ReleaseHeldHtlc,
 };
@@ -232,12 +231,6 @@ impl NodeSigner for KeyProvider {
  unreachable!()
  }
 
- fn sign_bolt12_invoice_request(
- &self, _invoice_request: &UnsignedInvoiceRequest,
- ) -> Result<schnorr::Signature, ()> {
- unreachable!()
- }
-
  fn sign_bolt12_invoice(
  &self, _invoice: &UnsignedBolt12Invoice,
  ) -> Result<schnorr::Signature, ()> {

lightning/src/ln/blinded_payment_tests.rs

@@ -26,7 +26,6 @@ use crate::ln::onion_utils;
 use crate::ln::onion_utils::INVALID_ONION_BLINDING;
 use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
 use crate::offers::invoice::UnsignedBolt12Invoice;
-use crate::offers::invoice_request::UnsignedInvoiceRequest;
 use crate::prelude::*;
 use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
 use crate::sign::{KeyMaterial, NodeSigner, Recipient};
@@ -1466,9 +1465,6 @@ fn route_blinding_spec_test_vector() {
  fn sign_invoice(
  &self, _invoice: &RawBolt11Invoice, _recipient: Recipient,
  ) -> Result<RecoverableSignature, ()> { unreachable!() }
- fn sign_bolt12_invoice_request(
- &self, _invoice_request: &UnsignedInvoiceRequest,
- ) -> Result<schnorr::Signature, ()> { unreachable!() }
  fn sign_bolt12_invoice(
  &self, _invoice: &UnsignedBolt12Invoice,
  ) -> Result<schnorr::Signature, ()> { unreachable!() }

lightning/src/ln/channelmanager.rs

@@ -65,7 +65,7 @@ use crate::ln::outbound_payment::{OutboundPayments, PendingOutboundPayment, Retr
 use crate::ln::wire::Encode;
 use crate::offers::invoice::{Bolt12Invoice, DEFAULT_RELATIVE_EXPIRY, DerivedSigningPubkey, ExplicitSigningPubkey, InvoiceBuilder, UnsignedBolt12Invoice};
 use crate::offers::invoice_error::InvoiceError;
-use crate::offers::invoice_request::{DerivedPayerSigningPubkey, InvoiceRequest, InvoiceRequestBuilder};
+use crate::offers::invoice_request::{InvoiceRequest, InvoiceRequestBuilder};
 use crate::offers::nonce::Nonce;
 use crate::offers::offer::{Offer, OfferBuilder};
 use crate::offers::parse::Bolt12SemanticError;
@@ -9310,8 +9310,8 @@ where
  let secp_ctx = &self.secp_ctx;
 
  let nonce = Nonce::from_entropy_source(entropy);
- let builder: InvoiceRequestBuilder<DerivedPayerSigningPubkey, secp256k1::All> = offer
- .request_invoice_deriving_signing_pubkey(expanded_key, nonce, secp_ctx, payment_id)?
+ let builder: InvoiceRequestBuilder<secp256k1::All> = offer
+ .request_invoice(expanded_key, nonce, secp_ctx, payment_id)?
  .into();
  let builder = builder.chain_hash(self.chain_hash)?;
 

lightning/src/ln/outbound_payment.rs

@@ -2268,14 +2268,17 @@ mod tests {
  use crate::ln::types::{PaymentHash, PaymentPreimage};
  use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
  use crate::ln::features::{Bolt12InvoiceFeatures, ChannelFeatures, NodeFeatures};
+ use crate::ln::inbound_payment::ExpandedKey;
  use crate::ln::msgs::{ErrorAction, LightningError};
  use crate::ln::outbound_payment::{Bolt12PaymentError, OutboundPayments, PendingOutboundPayment, Retry, RetryableSendFailure, StaleExpiration};
  #[cfg(feature = "std")]
  use crate::offers::invoice::DEFAULT_RELATIVE_EXPIRY;
+ use crate::offers::nonce::Nonce;
  use crate::offers::offer::OfferBuilder;
  use crate::offers::test_utils::*;
  use crate::routing::gossip::NetworkGraph;
  use crate::routing::router::{InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters};
+ use crate::sign::KeyMaterial;
  use crate::sync::{Arc, Mutex, RwLock};
  use crate::util::errors::APIError;
  use crate::util::hash_tables::new_hash_map;
@@ -2620,6 +2623,8 @@ mod tests {
  let router = test_utils::TestRouter::new(network_graph, &logger, &scorer);
  let secp_ctx = Secp256k1::new();
  let keys_manager = test_utils::TestKeysInterface::new(&[0; 32], Network::Testnet);
+ let expanded_key = ExpandedKey::new(&KeyMaterial([42; 32]));
+ let nonce = Nonce([0; 16]);
 
  let pending_events = Mutex::new(VecDeque::new());
  let outbound_payments = OutboundPayments::new(new_hash_map());
@@ -2637,9 +2642,8 @@ mod tests {
  let invoice = OfferBuilder::new(recipient_pubkey())
  .amount_msats(1000)
  .build().unwrap()
- .request_invoice(vec![1; 32], payer_pubkey()).unwrap()
- .build().unwrap()
- .sign(payer_sign).unwrap()
+ .request_invoice(&expanded_key, nonce, &secp_ctx, payment_id).unwrap()
+ .build_and_sign().unwrap()
  .respond_with_no_std(payment_paths(), payment_hash(), created_at).unwrap()
  .build().unwrap()
  .sign(recipient_sign).unwrap();
@@ -2676,15 +2680,16 @@ mod tests {
 
  let pending_events = Mutex::new(VecDeque::new());
  let outbound_payments = OutboundPayments::new(new_hash_map());
+ let expanded_key = ExpandedKey::new(&KeyMaterial([42; 32]));
+ let nonce = Nonce([0; 16]);
  let payment_id = PaymentId([0; 32]);
  let expiration = StaleExpiration::AbsoluteTimeout(Duration::from_secs(100));
 
  let invoice = OfferBuilder::new(recipient_pubkey())
  .amount_msats(1000)
  .build().unwrap()
- .request_invoice(vec![1; 32], payer_pubkey()).unwrap()
- .build().unwrap()
- .sign(payer_sign).unwrap()
+ .request_invoice(&expanded_key, nonce, &secp_ctx, payment_id).unwrap()
+ .build_and_sign().unwrap()
  .respond_with_no_std(payment_paths(), payment_hash(), now()).unwrap()
  .build().unwrap()
  .sign(recipient_sign).unwrap();
@@ -2737,15 +2742,16 @@ mod tests {
 
  let pending_events = Mutex::new(VecDeque::new());
  let outbound_payments = OutboundPayments::new(new_hash_map());
+ let expanded_key = ExpandedKey::new(&KeyMaterial([42; 32]));
+ let nonce = Nonce([0; 16]);
  let payment_id = PaymentId([0; 32]);
  let expiration = StaleExpiration::AbsoluteTimeout(Duration::from_secs(100));
 
  let invoice = OfferBuilder::new(recipient_pubkey())
  .amount_msats(1000)
  .build().unwrap()
- .request_invoice(vec![1; 32], payer_pubkey()).unwrap()
- .build().unwrap()
- .sign(payer_sign).unwrap()
+ .request_invoice(&expanded_key, nonce, &secp_ctx, payment_id).unwrap()
+ .build_and_sign().unwrap()
  .respond_with_no_std(payment_paths(), payment_hash(), now()).unwrap()
  .build().unwrap()
  .sign(recipient_sign).unwrap();