Skip to content

Commit 7334905

Browse files
committed
Remove NodeSigner::sign_bolt12_invoice_request
Now that invoice requests are signed using transient keys only, remove the corresponding signing method from NodeSigner since it is never used.
1 parent ebb5bd0 commit 7334905

File tree

6 files changed

+0
-69
lines changed

6 files changed

+0
-69
lines changed

fuzz/src/chanmon_consistency.rs

-7
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ use lightning::ln::msgs::{
5757
use lightning::ln::script::ShutdownScript;
5858
use lightning::ln::types::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
5959
use lightning::offers::invoice::UnsignedBolt12Invoice;
60-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
6160
use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
6261
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};
6362
use lightning::sign::{
@@ -339,12 +338,6 @@ impl NodeSigner for KeyProvider {
339338
unreachable!()
340339
}
341340

342-
fn sign_bolt12_invoice_request(
343-
&self, _invoice_request: &UnsignedInvoiceRequest,
344-
) -> Result<schnorr::Signature, ()> {
345-
unreachable!()
346-
}
347-
348341
fn sign_bolt12_invoice(
349342
&self, _invoice: &UnsignedBolt12Invoice,
350343
) -> Result<schnorr::Signature, ()> {

fuzz/src/full_stack.rs

-7
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ use lightning::ln::peer_handler::{
5050
use lightning::ln::script::ShutdownScript;
5151
use lightning::ln::types::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
5252
use lightning::offers::invoice::UnsignedBolt12Invoice;
53-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
5453
use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
5554
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
5655
use lightning::routing::router::{
@@ -412,12 +411,6 @@ impl NodeSigner for KeyProvider {
412411
unreachable!()
413412
}
414413

415-
fn sign_bolt12_invoice_request(
416-
&self, _invoice_request: &UnsignedInvoiceRequest,
417-
) -> Result<schnorr::Signature, ()> {
418-
unreachable!()
419-
}
420-
421414
fn sign_bolt12_invoice(
422415
&self, _invoice: &UnsignedBolt12Invoice,
423416
) -> Result<schnorr::Signature, ()> {

fuzz/src/onion_message.rs

-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use lightning::ln::features::InitFeatures;
1313
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1414
use lightning::ln::script::ShutdownScript;
1515
use lightning::offers::invoice::UnsignedBolt12Invoice;
16-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
1716
use lightning::onion_message::async_payments::{
1817
AsyncPaymentsMessageHandler, HeldHtlcAvailable, ReleaseHeldHtlc,
1918
};
@@ -232,12 +231,6 @@ impl NodeSigner for KeyProvider {
232231
unreachable!()
233232
}
234233

235-
fn sign_bolt12_invoice_request(
236-
&self, _invoice_request: &UnsignedInvoiceRequest,
237-
) -> Result<schnorr::Signature, ()> {
238-
unreachable!()
239-
}
240-
241234
fn sign_bolt12_invoice(
242235
&self, _invoice: &UnsignedBolt12Invoice,
243236
) -> Result<schnorr::Signature, ()> {

lightning/src/ln/blinded_payment_tests.rs

-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ use crate::ln::onion_utils;
2626
use crate::ln::onion_utils::INVALID_ONION_BLINDING;
2727
use crate::ln::outbound_payment::{Retry, IDEMPOTENCY_TIMEOUT_TICKS};
2828
use crate::offers::invoice::UnsignedBolt12Invoice;
29-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
3029
use crate::prelude::*;
3130
use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters};
3231
use crate::sign::{KeyMaterial, NodeSigner, Recipient};
@@ -1466,9 +1465,6 @@ fn route_blinding_spec_test_vector() {
14661465
fn sign_invoice(
14671466
&self, _invoice: &RawBolt11Invoice, _recipient: Recipient,
14681467
) -> Result<RecoverableSignature, ()> { unreachable!() }
1469-
fn sign_bolt12_invoice_request(
1470-
&self, _invoice_request: &UnsignedInvoiceRequest,
1471-
) -> Result<schnorr::Signature, ()> { unreachable!() }
14721468
fn sign_bolt12_invoice(
14731469
&self, _invoice: &UnsignedBolt12Invoice,
14741470
) -> Result<schnorr::Signature, ()> { unreachable!() }

lightning/src/sign/mod.rs

-31
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ use crate::ln::msgs::{UnsignedChannelAnnouncement, UnsignedGossipMessage};
5757
use crate::ln::script::ShutdownScript;
5858
use crate::ln::types::PaymentPreimage;
5959
use crate::offers::invoice::UnsignedBolt12Invoice;
60-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
6160
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
6261
use crate::util::transaction_utils;
6362

@@ -870,21 +869,6 @@ pub trait NodeSigner {
870869
&self, invoice: &RawBolt11Invoice, recipient: Recipient,
871870
) -> Result<RecoverableSignature, ()>;
872871

873-
/// Signs the [`TaggedHash`] of a BOLT 12 invoice request.
874-
///
875-
/// May be called by a function passed to [`UnsignedInvoiceRequest::sign`] where
876-
/// `invoice_request` is the callee.
877-
///
878-
/// Implementors may check that the `invoice_request` is expected rather than blindly signing
879-
/// the tagged hash. An `Ok` result should sign `invoice_request.tagged_hash().as_digest()` with
880-
/// the node's signing key or an ephemeral key to preserve privacy, whichever is associated with
881-
/// [`UnsignedInvoiceRequest::payer_signing_pubkey`].
882-
///
883-
/// [`TaggedHash`]: crate::offers::merkle::TaggedHash
884-
fn sign_bolt12_invoice_request(
885-
&self, invoice_request: &UnsignedInvoiceRequest,
886-
) -> Result<schnorr::Signature, ()>;
887-
888872
/// Signs the [`TaggedHash`] of a BOLT 12 invoice.
889873
///
890874
/// May be called by a function passed to [`UnsignedBolt12Invoice::sign`] where `invoice` is the
@@ -2185,15 +2169,6 @@ impl NodeSigner for KeysManager {
21852169
Ok(self.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
21862170
}
21872171

2188-
fn sign_bolt12_invoice_request(
2189-
&self, invoice_request: &UnsignedInvoiceRequest,
2190-
) -> Result<schnorr::Signature, ()> {
2191-
let message = invoice_request.tagged_hash().as_digest();
2192-
let keys = Keypair::from_secret_key(&self.secp_ctx, &self.node_secret);
2193-
let aux_rand = self.get_secure_random_bytes();
2194-
Ok(self.secp_ctx.sign_schnorr_with_aux_rand(message, &keys, &aux_rand))
2195-
}
2196-
21972172
fn sign_bolt12_invoice(
21982173
&self, invoice: &UnsignedBolt12Invoice,
21992174
) -> Result<schnorr::Signature, ()> {
@@ -2363,12 +2338,6 @@ impl NodeSigner for PhantomKeysManager {
23632338
Ok(self.inner.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
23642339
}
23652340

2366-
fn sign_bolt12_invoice_request(
2367-
&self, invoice_request: &UnsignedInvoiceRequest,
2368-
) -> Result<schnorr::Signature, ()> {
2369-
self.inner.sign_bolt12_invoice_request(invoice_request)
2370-
}
2371-
23722341
fn sign_bolt12_invoice(
23732342
&self, invoice: &UnsignedBolt12Invoice,
23742343
) -> Result<schnorr::Signature, ()> {

lightning/src/util/test_utils.rs

-13
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use crate::ln::{msgs, wire};
3434
use crate::ln::msgs::LightningError;
3535
use crate::ln::script::ShutdownScript;
3636
use crate::offers::invoice::UnsignedBolt12Invoice;
37-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
3837
use crate::onion_message::messenger::{DefaultMessageRouter, Destination, MessageRouter, OnionMessagePath};
3938
use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId, RoutingFees};
4039
use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult};
@@ -1210,12 +1209,6 @@ impl NodeSigner for TestNodeSigner {
12101209
unreachable!()
12111210
}
12121211

1213-
fn sign_bolt12_invoice_request(
1214-
&self, _invoice_request: &UnsignedInvoiceRequest
1215-
) -> Result<schnorr::Signature, ()> {
1216-
unreachable!()
1217-
}
1218-
12191212
fn sign_bolt12_invoice(
12201213
&self, _invoice: &UnsignedBolt12Invoice,
12211214
) -> Result<schnorr::Signature, ()> {
@@ -1263,12 +1256,6 @@ impl NodeSigner for TestKeysInterface {
12631256
self.backing.sign_invoice(invoice, recipient)
12641257
}
12651258

1266-
fn sign_bolt12_invoice_request(
1267-
&self, invoice_request: &UnsignedInvoiceRequest
1268-
) -> Result<schnorr::Signature, ()> {
1269-
self.backing.sign_bolt12_invoice_request(invoice_request)
1270-
}
1271-
12721259
fn sign_bolt12_invoice(
12731260
&self, invoice: &UnsignedBolt12Invoice,
12741261
) -> Result<schnorr::Signature, ()> {

0 commit comments

Comments
 (0)