Skip to content

Commit 9838435

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 acaa310 commit 9838435

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::{
@@ -411,12 +410,6 @@ impl NodeSigner for KeyProvider {
411410
unreachable!()
412411
}
413412

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

fuzz/src/onion_message.rs

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use lightning::ln::features::InitFeatures;
1111
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1212
use lightning::ln::script::ShutdownScript;
1313
use lightning::offers::invoice::UnsignedBolt12Invoice;
14-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
1514
use lightning::onion_message::async_payments::{
1615
AsyncPaymentsMessageHandler, HeldHtlcAvailable, ReleaseHeldHtlc,
1716
};
@@ -233,12 +232,6 @@ impl NodeSigner for KeyProvider {
233232
unreachable!()
234233
}
235234

236-
fn sign_bolt12_invoice_request(
237-
&self, _invoice_request: &UnsignedInvoiceRequest,
238-
) -> Result<schnorr::Signature, ()> {
239-
unreachable!()
240-
}
241-
242235
fn sign_bolt12_invoice(
243236
&self, _invoice: &UnsignedBolt12Invoice,
244237
) -> 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
@@ -2183,15 +2167,6 @@ impl NodeSigner for KeysManager {
21832167
Ok(self.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
21842168
}
21852169

2186-
fn sign_bolt12_invoice_request(
2187-
&self, invoice_request: &UnsignedInvoiceRequest,
2188-
) -> Result<schnorr::Signature, ()> {
2189-
let message = invoice_request.tagged_hash().as_digest();
2190-
let keys = Keypair::from_secret_key(&self.secp_ctx, &self.node_secret);
2191-
let aux_rand = self.get_secure_random_bytes();
2192-
Ok(self.secp_ctx.sign_schnorr_with_aux_rand(message, &keys, &aux_rand))
2193-
}
2194-
21952170
fn sign_bolt12_invoice(
21962171
&self, invoice: &UnsignedBolt12Invoice,
21972172
) -> Result<schnorr::Signature, ()> {
@@ -2358,12 +2333,6 @@ impl NodeSigner for PhantomKeysManager {
23582333
Ok(self.inner.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
23592334
}
23602335

2361-
fn sign_bolt12_invoice_request(
2362-
&self, invoice_request: &UnsignedInvoiceRequest,
2363-
) -> Result<schnorr::Signature, ()> {
2364-
self.inner.sign_bolt12_invoice_request(invoice_request)
2365-
}
2366-
23672336
fn sign_bolt12_invoice(
23682337
&self, invoice: &UnsignedBolt12Invoice,
23692338
) -> 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};
@@ -1234,12 +1233,6 @@ impl NodeSigner for TestNodeSigner {
12341233
unreachable!()
12351234
}
12361235

1237-
fn sign_bolt12_invoice_request(
1238-
&self, _invoice_request: &UnsignedInvoiceRequest
1239-
) -> Result<schnorr::Signature, ()> {
1240-
unreachable!()
1241-
}
1242-
12431236
fn sign_bolt12_invoice(
12441237
&self, _invoice: &UnsignedBolt12Invoice,
12451238
) -> Result<schnorr::Signature, ()> {
@@ -1287,12 +1280,6 @@ impl NodeSigner for TestKeysInterface {
12871280
self.backing.sign_invoice(invoice, recipient)
12881281
}
12891282

1290-
fn sign_bolt12_invoice_request(
1291-
&self, invoice_request: &UnsignedInvoiceRequest
1292-
) -> Result<schnorr::Signature, ()> {
1293-
self.backing.sign_bolt12_invoice_request(invoice_request)
1294-
}
1295-
12961283
fn sign_bolt12_invoice(
12971284
&self, invoice: &UnsignedBolt12Invoice,
12981285
) -> Result<schnorr::Signature, ()> {

0 commit comments

Comments
 (0)