Skip to content

Commit 9cfc02f

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 5e36094 commit 9cfc02f

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;
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::{
@@ -340,12 +339,6 @@ impl NodeSigner for KeyProvider {
340339
unreachable!()
341340
}
342341

343-
fn sign_bolt12_invoice_request(
344-
&self, _invoice_request: &UnsignedInvoiceRequest,
345-
) -> Result<schnorr::Signature, ()> {
346-
unreachable!()
347-
}
348-
349342
fn sign_bolt12_invoice(
350343
&self, _invoice: &UnsignedBolt12Invoice,
351344
) -> 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;
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::{
@@ -413,12 +412,6 @@ impl NodeSigner for KeyProvider {
413412
unreachable!()
414413
}
415414

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

fuzz/src/onion_message.rs

-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1313
use lightning::ln::peer_handler::IgnoringMessageHandler;
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
};
@@ -234,12 +233,6 @@ impl NodeSigner for KeyProvider {
234233
unreachable!()
235234
}
236235

237-
fn sign_bolt12_invoice_request(
238-
&self, _invoice_request: &UnsignedInvoiceRequest,
239-
) -> Result<schnorr::Signature, ()> {
240-
unreachable!()
241-
}
242-
243236
fn sign_bolt12_invoice(
244237
&self, _invoice: &UnsignedBolt12Invoice,
245238
) -> Result<schnorr::Signature, ()> {

lightning/src/ln/blinded_payment_tests.rs

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

lightning/src/sign/mod.rs

-31
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ use crate::ln::msgs::PartialSignatureWithNonce;
5656
use crate::ln::msgs::{UnsignedChannelAnnouncement, UnsignedGossipMessage};
5757
use crate::ln::script::ShutdownScript;
5858
use crate::offers::invoice::UnsignedBolt12Invoice;
59-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
6059
use crate::types::payment::PaymentPreimage;
6160
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
6261
use crate::util::transaction_utils;
@@ -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
@@ -2206,15 +2190,6 @@ impl NodeSigner for KeysManager {
22062190
Ok(self.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
22072191
}
22082192

2209-
fn sign_bolt12_invoice_request(
2210-
&self, invoice_request: &UnsignedInvoiceRequest,
2211-
) -> Result<schnorr::Signature, ()> {
2212-
let message = invoice_request.tagged_hash().as_digest();
2213-
let keys = Keypair::from_secret_key(&self.secp_ctx, &self.node_secret);
2214-
let aux_rand = self.get_secure_random_bytes();
2215-
Ok(self.secp_ctx.sign_schnorr_with_aux_rand(message, &keys, &aux_rand))
2216-
}
2217-
22182193
fn sign_bolt12_invoice(
22192194
&self, invoice: &UnsignedBolt12Invoice,
22202195
) -> Result<schnorr::Signature, ()> {
@@ -2384,12 +2359,6 @@ impl NodeSigner for PhantomKeysManager {
23842359
Ok(self.inner.secp_ctx.sign_ecdsa_recoverable(&hash_to_message!(&hash), secret))
23852360
}
23862361

2387-
fn sign_bolt12_invoice_request(
2388-
&self, invoice_request: &UnsignedInvoiceRequest,
2389-
) -> Result<schnorr::Signature, ()> {
2390-
self.inner.sign_bolt12_invoice_request(invoice_request)
2391-
}
2392-
23932362
fn sign_bolt12_invoice(
23942363
&self, invoice: &UnsignedBolt12Invoice,
23952364
) -> 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};
@@ -1216,12 +1215,6 @@ impl NodeSigner for TestNodeSigner {
12161215
unreachable!()
12171216
}
12181217

1219-
fn sign_bolt12_invoice_request(
1220-
&self, _invoice_request: &UnsignedInvoiceRequest
1221-
) -> Result<schnorr::Signature, ()> {
1222-
unreachable!()
1223-
}
1224-
12251218
fn sign_bolt12_invoice(
12261219
&self, _invoice: &UnsignedBolt12Invoice,
12271220
) -> Result<schnorr::Signature, ()> {
@@ -1269,12 +1262,6 @@ impl NodeSigner for TestKeysInterface {
12691262
self.backing.sign_invoice(invoice, recipient)
12701263
}
12711264

1272-
fn sign_bolt12_invoice_request(
1273-
&self, invoice_request: &UnsignedInvoiceRequest
1274-
) -> Result<schnorr::Signature, ()> {
1275-
self.backing.sign_bolt12_invoice_request(invoice_request)
1276-
}
1277-
12781265
fn sign_bolt12_invoice(
12791266
&self, invoice: &UnsignedBolt12Invoice,
12801267
) -> Result<schnorr::Signature, ()> {

0 commit comments

Comments
 (0)