Skip to content

Commit 0100dc4

Browse files
jkczyzjkczyz
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 b46402a commit 0100dc4

File tree

5 files changed

+0
-65
lines changed

5 files changed

+0
-65
lines changed

‎fuzz/src/chanmon_consistency.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ use lightning::ln::msgs::{
5858
use lightning::ln::script::ShutdownScript;
5959
use lightning::ln::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
6060
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
61-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
6261
use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
6362
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};
6463
use lightning::sign::{
@@ -337,12 +336,6 @@ impl NodeSigner for KeyProvider {
337336
unreachable!()
338337
}
339338

340-
fn sign_bolt12_invoice_request(
341-
&self, _invoice_request: &UnsignedInvoiceRequest,
342-
) -> Result<schnorr::Signature, ()> {
343-
unreachable!()
344-
}
345-
346339
fn sign_bolt12_invoice(
347340
&self, _invoice: &UnsignedBolt12Invoice,
348341
) -> Result<schnorr::Signature, ()> {

‎fuzz/src/full_stack.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ use lightning::ln::peer_handler::{
5151
use lightning::ln::script::ShutdownScript;
5252
use lightning::ln::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
5353
use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
54-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
5554
use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
5655
use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
5756
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‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use lightning::ln::features::InitFeatures;
1212
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1313
use lightning::ln::script::ShutdownScript;
1414
use lightning::offers::invoice::UnsignedBolt12Invoice;
15-
use lightning::offers::invoice_request::UnsignedInvoiceRequest;
1615
use lightning::onion_message::async_payments::{
1716
AsyncPaymentsMessageHandler, HeldHtlcAvailable, ReleaseHeldHtlc,
1817
};
@@ -230,12 +229,6 @@ impl NodeSigner for KeyProvider {
230229
unreachable!()
231230
}
232231

233-
fn sign_bolt12_invoice_request(
234-
&self, _invoice_request: &UnsignedInvoiceRequest,
235-
) -> Result<schnorr::Signature, ()> {
236-
unreachable!()
237-
}
238-
239232
fn sign_bolt12_invoice(
240233
&self, _invoice: &UnsignedBolt12Invoice,
241234
) -> Result<schnorr::Signature, ()> {

‎lightning/src/sign/mod.rs‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ use crate::ln::msgs::{UnsignedChannelAnnouncement, UnsignedGossipMessage};
5656
use crate::ln::script::ShutdownScript;
5757
use crate::ln::types::PaymentPreimage;
5858
use crate::offers::invoice::UnsignedBolt12Invoice;
59-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
6059
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
6160
use crate::util::transaction_utils;
6261

@@ -870,21 +869,6 @@ pub trait NodeSigner {
870869
&self, hrp_bytes: &[u8], invoice_data: &[u5], 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
@@ -2187,15 +2171,6 @@ impl NodeSigner for KeysManager {
21872171
))
21882172
}
21892173

2190-
fn sign_bolt12_invoice_request(
2191-
&self, invoice_request: &UnsignedInvoiceRequest,
2192-
) -> Result<schnorr::Signature, ()> {
2193-
let message = invoice_request.tagged_hash().as_digest();
2194-
let keys = Keypair::from_secret_key(&self.secp_ctx, &self.node_secret);
2195-
let aux_rand = self.get_secure_random_bytes();
2196-
Ok(self.secp_ctx.sign_schnorr_with_aux_rand(message, &keys, &aux_rand))
2197-
}
2198-
21992174
fn sign_bolt12_invoice(
22002175
&self, invoice: &UnsignedBolt12Invoice,
22012176
) -> Result<schnorr::Signature, ()> {
@@ -2365,12 +2340,6 @@ impl NodeSigner for PhantomKeysManager {
23652340
))
23662341
}
23672342

2368-
fn sign_bolt12_invoice_request(
2369-
&self, invoice_request: &UnsignedInvoiceRequest,
2370-
) -> Result<schnorr::Signature, ()> {
2371-
self.inner.sign_bolt12_invoice_request(invoice_request)
2372-
}
2373-
23742343
fn sign_bolt12_invoice(
23752344
&self, invoice: &UnsignedBolt12Invoice,
23762345
) -> Result<schnorr::Signature, ()> {

‎lightning/src/util/test_utils.rs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use crate::ln::{msgs, wire};
3535
use crate::ln::msgs::LightningError;
3636
use crate::ln::script::ShutdownScript;
3737
use crate::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
38-
use crate::offers::invoice_request::UnsignedInvoiceRequest;
3938
use crate::onion_message::messenger::{DefaultMessageRouter, Destination, MessageRouter, OnionMessagePath};
4039
use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId, RoutingFees};
4140
use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult};
@@ -1221,12 +1220,6 @@ impl NodeSigner for TestNodeSigner {
12211220
unreachable!()
12221221
}
12231222

1224-
fn sign_bolt12_invoice_request(
1225-
&self, _invoice_request: &UnsignedInvoiceRequest
1226-
) -> Result<schnorr::Signature, ()> {
1227-
unreachable!()
1228-
}
1229-
12301223
fn sign_bolt12_invoice(
12311224
&self, _invoice: &UnsignedBolt12Invoice,
12321225
) -> Result<schnorr::Signature, ()> {
@@ -1274,12 +1267,6 @@ impl NodeSigner for TestKeysInterface {
12741267
self.backing.sign_invoice(hrp_bytes, invoice_data, recipient)
12751268
}
12761269

1277-
fn sign_bolt12_invoice_request(
1278-
&self, invoice_request: &UnsignedInvoiceRequest
1279-
) -> Result<schnorr::Signature, ()> {
1280-
self.backing.sign_bolt12_invoice_request(invoice_request)
1281-
}
1282-
12831270
fn sign_bolt12_invoice(
12841271
&self, invoice: &UnsignedBolt12Invoice,
12851272
) -> Result<schnorr::Signature, ()> {

0 commit comments

Comments
 (0)