Skip to content

Commit 56b0c96

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #2246 from arik-so/2023-04-sign-module
Move keysinterface.rs to a directory-level module called sign
2 parents ca1d569 + 6cb9919 commit 56b0c96

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+109
-108
lines changed

‎fuzz/src/chanmon_consistency.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
3737
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
3838
use lightning::chain::transaction::OutPoint;
3939
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
40-
use lightning::chain::keysinterface::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
40+
use lightning::sign::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
4141
use lightning::events;
4242
use lightning::events::MessageSendEventsProvider;
4343
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};

‎fuzz/src/full_stack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
3434
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
3535
use lightning::chain::chainmonitor;
3636
use lightning::chain::transaction::OutPoint;
37-
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
37+
use lightning::sign::{InMemorySigner, Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
3838
use lightning::events::Event;
3939
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
4040
use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentId, RecipientOnionFields, Retry};

‎fuzz/src/invoice_request_deser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self}
1111
use crate::utils::test_logger;
1212
use core::convert::{Infallible, TryFrom};
1313
use lightning::blinded_path::BlindedPath;
14-
use lightning::chain::keysinterface::EntropySource;
14+
use lightning::sign::EntropySource;
1515
use lightning::ln::PaymentHash;
1616
use lightning::ln::features::BlindedHopFeatures;
1717
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};

‎fuzz/src/onion_message.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
55
use bitcoin::secp256k1::ecdh::SharedSecret;
66
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
77

8-
use lightning::chain::keysinterface::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
8+
use lightning::sign::{Recipient, KeyMaterial, EntropySource, NodeSigner, SignerProvider};
99
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
1010
use lightning::ln::script::ShutdownScript;
1111
use lightning::util::enforcing_trait_impls::EnforcingSigner;

‎fuzz/src/refund_deser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
1111
use crate::utils::test_logger;
1212
use core::convert::{Infallible, TryFrom};
1313
use lightning::blinded_path::BlindedPath;
14-
use lightning::chain::keysinterface::EntropySource;
14+
use lightning::sign::EntropySource;
1515
use lightning::ln::PaymentHash;
1616
use lightning::ln::features::BlindedHopFeatures;
1717
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};

‎lightning-background-processor/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern crate lightning_rapid_gossip_sync;
2525
use lightning::chain;
2626
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
2727
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
28-
use lightning::chain::keysinterface::{EntropySource, NodeSigner, SignerProvider};
28+
use lightning::sign::{EntropySource, NodeSigner, SignerProvider};
2929
use lightning::events::{Event, PathFailure};
3030
#[cfg(feature = "std")]
3131
use lightning::events::{EventHandler, EventsProvider};
@@ -506,11 +506,11 @@ use core::task;
506506
/// # use lightning_background_processor::{process_events_async, GossipSync};
507507
/// # type MyBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
508508
/// # type MyFeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
509-
/// # type MyNodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
509+
/// # type MyNodeSigner = dyn lightning::sign::NodeSigner + Send + Sync;
510510
/// # type MyUtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
511511
/// # type MyFilter = dyn lightning::chain::Filter + Send + Sync;
512512
/// # type MyLogger = dyn lightning::util::logger::Logger + Send + Sync;
513-
/// # type MyChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<MyFilter>, Arc<MyBroadcaster>, Arc<MyFeeEstimator>, Arc<MyLogger>, Arc<MyPersister>>;
513+
/// # type MyChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::sign::InMemorySigner, Arc<MyFilter>, Arc<MyBroadcaster>, Arc<MyFeeEstimator>, Arc<MyLogger>, Arc<MyPersister>>;
514514
/// # type MyPeerManager = lightning::ln::peer_handler::SimpleArcPeerManager<MySocketDescriptor, MyChainMonitor, MyBroadcaster, MyFeeEstimator, MyUtxoLookup, MyLogger>;
515515
/// # type MyNetworkGraph = lightning::routing::gossip::NetworkGraph<Arc<MyLogger>>;
516516
/// # type MyGossipSync = lightning::routing::gossip::P2PGossipSync<Arc<MyNetworkGraph>, Arc<MyUtxoLookup>, Arc<MyLogger>>;
@@ -825,7 +825,7 @@ mod tests {
825825
use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1};
826826
use lightning::chain::{BestBlock, Confirm, chainmonitor};
827827
use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
828-
use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
828+
use lightning::sign::{InMemorySigner, KeysManager};
829829
use lightning::chain::transaction::OutPoint;
830830
use lightning::events::{Event, PathFailure, MessageSendEventsProvider, MessageSendEvent};
831831
use lightning::{get_event_msg, get_event};

‎lightning-block-sync/src/init.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ BlockSourceResult<ValidatedBlockHeader> where B::Target: BlockSource {
4747
/// use lightning::chain::channelmonitor::ChannelMonitor;
4848
/// use lightning::chain::chaininterface::BroadcasterInterface;
4949
/// use lightning::chain::chaininterface::FeeEstimator;
50-
/// use lightning::chain::keysinterface;
51-
/// use lightning::chain::keysinterface::{EntropySource, NodeSigner, SignerProvider};
50+
/// use lightning::sign;
51+
/// use lightning::sign::{EntropySource, NodeSigner, SignerProvider};
5252
/// use lightning::ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
5353
/// use lightning::routing::router::Router;
5454
/// use lightning::util::config::UserConfig;

‎lightning-invoice/src/payment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use bitcoin_hashes::Hash;
1515

1616
use lightning::chain;
1717
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
18-
use lightning::chain::keysinterface::{NodeSigner, SignerProvider, EntropySource};
18+
use lightning::sign::{NodeSigner, SignerProvider, EntropySource};
1919
use lightning::ln::PaymentHash;
2020
use lightning::ln::channelmanager::{ChannelManager, PaymentId, Retry, RetryableSendFailure, RecipientOnionFields};
2121
use lightning::routing::router::{PaymentParameters, RouteParameters, Router};

‎lightning-invoice/src/utils.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use bech32::ToBase32;
77
use bitcoin_hashes::Hash;
88
use lightning::chain;
99
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
10-
use lightning::chain::keysinterface::{Recipient, NodeSigner, SignerProvider, EntropySource};
10+
use lightning::sign::{Recipient, NodeSigner, SignerProvider, EntropySource};
1111
use lightning::ln::{PaymentHash, PaymentSecret};
1212
use lightning::ln::channelmanager::{ChannelDetails, ChannelManager, MIN_FINAL_CLTV_EXPIRY_DELTA};
1313
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_CLTV_EXPIRY_DELTA};
@@ -50,7 +50,7 @@ use core::time::Duration;
5050
/// invoices in its `sign_invoice` implementation ([`PhantomKeysManager`] satisfies this
5151
/// requirement).
5252
///
53-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
53+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
5454
/// [`ChannelManager::get_phantom_route_hints`]: lightning::ln::channelmanager::ChannelManager::get_phantom_route_hints
5555
/// [`ChannelManager::create_inbound_payment`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment
5656
/// [`ChannelManager::create_inbound_payment_for_hash`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
@@ -107,7 +107,7 @@ where
107107
/// invoices in its `sign_invoice` implementation ([`PhantomKeysManager`] satisfies this
108108
/// requirement).
109109
///
110-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
110+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
111111
/// [`ChannelManager::get_phantom_route_hints`]: lightning::ln::channelmanager::ChannelManager::get_phantom_route_hints
112112
/// [`ChannelManager::create_inbound_payment`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment
113113
/// [`ChannelManager::create_inbound_payment_for_hash`]: lightning::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
@@ -227,7 +227,7 @@ where
227227
/// * Select up to three channels per node.
228228
/// * Select one hint from each node, up to three hints or until we run out of hints.
229229
///
230-
/// [`PhantomKeysManager`]: lightning::chain::keysinterface::PhantomKeysManager
230+
/// [`PhantomKeysManager`]: lightning::sign::PhantomKeysManager
231231
fn select_phantom_hints<L: Deref>(amt_msat: Option<u64>, phantom_route_hints: Vec<PhantomRouteHints>,
232232
logger: L) -> Vec<RouteHint>
233233
where
@@ -629,7 +629,7 @@ fn sort_and_filter_channels<L: Deref>(
629629
// previous channel to avoid announcing non-public channels.
630630
let new_now_public = channel.is_public && !entry.get().is_public;
631631
// Decide whether we prefer the currently selected channel with the node to the new one,
632-
// based on their inbound capacity.
632+
// based on their inbound capacity.
633633
let prefer_current = prefer_current_channel(min_inbound_capacity_msat, current_max_capacity,
634634
channel.inbound_capacity_msat);
635635
// If the public-ness of the channel has not changed (in which case simply defer to
@@ -768,7 +768,7 @@ mod test {
768768
use crate::{Currency, Description, InvoiceDescription, SignOrCreationError, CreationError};
769769
use bitcoin_hashes::{Hash, sha256};
770770
use bitcoin_hashes::sha256::Hash as Sha256;
771-
use lightning::chain::keysinterface::PhantomKeysManager;
771+
use lightning::sign::PhantomKeysManager;
772772
use lightning::events::{MessageSendEvent, MessageSendEventsProvider, Event};
773773
use lightning::ln::{PaymentPreimage, PaymentHash};
774774
use lightning::ln::channelmanager::{PhantomRouteHints, MIN_FINAL_CLTV_EXPIRY_DELTA, PaymentId, RecipientOnionFields, Retry};
@@ -793,10 +793,10 @@ mod test {
793793

794794
// Minimum set, prefer candidate channel over minimum + buffer.
795795
assert_eq!(crate::utils::prefer_current_channel(Some(100), 105, 125), false);
796-
796+
797797
// Minimum set, both channels sufficient, prefer smaller current channel.
798798
assert_eq!(crate::utils::prefer_current_channel(Some(100), 115, 125), true);
799-
799+
800800
// Minimum set, both channels sufficient, prefer smaller candidate channel.
801801
assert_eq!(crate::utils::prefer_current_channel(Some(100), 200, 160), false);
802802

‎lightning-persister/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extern crate libc;
2020
use bitcoin::hash_types::{BlockHash, Txid};
2121
use bitcoin::hashes::hex::FromHex;
2222
use lightning::chain::channelmonitor::ChannelMonitor;
23-
use lightning::chain::keysinterface::{EntropySource, SignerProvider};
23+
use lightning::sign::{EntropySource, SignerProvider};
2424
use lightning::util::ser::{ReadableArgs, Writeable};
2525
use lightning::util::persist::KVStorePersister;
2626
use std::fs;

‎lightning/src/blinded_path/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use bitcoin::hashes::{Hash, HashEngine};
1515
use bitcoin::hashes::sha256::Hash as Sha256;
1616
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
1717

18-
use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
18+
use crate::sign::{EntropySource, NodeSigner, Recipient};
1919
use crate::onion_message::ControlTlvs;
2020
use crate::ln::msgs::DecodeError;
2121
use crate::ln::onion_utils;

‎lightning/src/chain/chainmonitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use crate::chain::{ChannelMonitorUpdateStatus, Filter, WatchedOutput};
3131
use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
3232
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, TransactionOutputs, LATENCY_GRACE_PERIOD_BLOCKS};
3333
use crate::chain::transaction::{OutPoint, TransactionData};
34-
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
34+
use crate::sign::WriteableEcdsaChannelSigner;
3535
use crate::events;
3636
use crate::events::{Event, EventHandler};
3737
use crate::util::atomic_counter::AtomicCounter;

‎lightning/src/chain/channelmonitor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use crate::chain;
4242
use crate::chain::{BestBlock, WatchedOutput};
4343
use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator, LowerBoundedFeeEstimator};
4444
use crate::chain::transaction::{OutPoint, TransactionData};
45-
use crate::chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, WriteableEcdsaChannelSigner, SignerProvider, EntropySource};
45+
use crate::sign::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, WriteableEcdsaChannelSigner, SignerProvider, EntropySource};
4646
#[cfg(anchors)]
4747
use crate::chain::onchaintx::ClaimEvent;
4848
use crate::chain::onchaintx::OnchainTxHandler;
@@ -4097,7 +4097,7 @@ mod tests {
40974097
use crate::chain::channelmonitor::ChannelMonitor;
40984098
use crate::chain::package::{weight_offered_htlc, weight_received_htlc, weight_revoked_offered_htlc, weight_revoked_received_htlc, WEIGHT_REVOKED_OUTPUT};
40994099
use crate::chain::transaction::OutPoint;
4100-
use crate::chain::keysinterface::InMemorySigner;
4100+
use crate::sign::InMemorySigner;
41014101
use crate::events::ClosureReason;
41024102
use crate::ln::{PaymentPreimage, PaymentHash};
41034103
use crate::ln::chan_utils;

‎lightning/src/chain/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use bitcoin::network::constants::Network;
1717
use bitcoin::secp256k1::PublicKey;
1818

1919
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, MonitorEvent};
20-
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
20+
use crate::sign::WriteableEcdsaChannelSigner;
2121
use crate::chain::transaction::{OutPoint, TransactionData};
2222

2323
use crate::prelude::*;
@@ -26,7 +26,6 @@ pub mod chaininterface;
2626
pub mod chainmonitor;
2727
pub mod channelmonitor;
2828
pub mod transaction;
29-
pub mod keysinterface;
3029
pub(crate) mod onchaintx;
3130
pub(crate) mod package;
3231

‎lightning/src/chain/onchaintx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use bitcoin::hash_types::{Txid, BlockHash};
2323
use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature};
2424
use bitcoin::secp256k1;
2525

26-
use crate::chain::keysinterface::{ChannelSigner, EntropySource, SignerProvider};
26+
use crate::sign::{ChannelSigner, EntropySource, SignerProvider};
2727
use crate::ln::msgs::DecodeError;
2828
use crate::ln::PaymentPreimage;
2929
#[cfg(anchors)]
@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{ChannelTransactionParameters, HolderCommitmentTransa
3333
use crate::chain::chaininterface::ConfirmationTarget;
3434
use crate::chain::chaininterface::{FeeEstimator, BroadcasterInterface, LowerBoundedFeeEstimator};
3535
use crate::chain::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER};
36-
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
36+
use crate::sign::WriteableEcdsaChannelSigner;
3737
#[cfg(anchors)]
3838
use crate::chain::package::PackageSolvingData;
3939
use crate::chain::package::PackageTemplate;

‎lightning/src/chain/package.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment};
2525
use crate::ln::chan_utils;
2626
use crate::ln::msgs::DecodeError;
2727
use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
28-
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
28+
use crate::sign::WriteableEcdsaChannelSigner;
2929
#[cfg(anchors)]
3030
use crate::chain::onchaintx::ExternalHTLCClaim;
3131
use crate::chain::onchaintx::OnchainTxHandler;

‎lightning/src/events/bump_transaction.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ pub struct AnchorDescriptor {
2424
/// A unique identifier used along with `channel_value_satoshis` to re-derive the
2525
/// [`InMemorySigner`] required to sign `input`.
2626
///
27-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
27+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
2828
pub channel_keys_id: [u8; 32],
2929
/// The value in satoshis of the channel we're attempting to spend the anchor output of. This is
3030
/// used along with `channel_keys_id` to re-derive the [`InMemorySigner`] required to sign
3131
/// `input`.
3232
///
33-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
33+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
3434
pub channel_value_satoshis: u64,
3535
/// The transaction input's outpoint corresponding to the commitment transaction's anchor
3636
/// output.
@@ -43,19 +43,19 @@ pub struct HTLCDescriptor {
4343
/// A unique identifier used along with `channel_value_satoshis` to re-derive the
4444
/// [`InMemorySigner`] required to sign `input`.
4545
///
46-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
46+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
4747
pub channel_keys_id: [u8; 32],
4848
/// The value in satoshis of the channel we're attempting to spend the anchor output of. This is
4949
/// used along with `channel_keys_id` to re-derive the [`InMemorySigner`] required to sign
5050
/// `input`.
5151
///
52-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
52+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
5353
pub channel_value_satoshis: u64,
5454
/// The necessary channel parameters that need to be provided to the re-derived
5555
/// [`InMemorySigner`] through [`ChannelSigner::provide_channel_parameters`].
5656
///
57-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
58-
/// [`ChannelSigner::provide_channel_parameters`]: crate::chain::keysinterface::ChannelSigner::provide_channel_parameters
57+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
58+
/// [`ChannelSigner::provide_channel_parameters`]: crate::sign::ChannelSigner::provide_channel_parameters
5959
pub channel_parameters: ChannelTransactionParameters,
6060
/// The txid of the commitment transaction in which the HTLC output lives.
6161
pub commitment_txid: Txid,
@@ -168,9 +168,9 @@ pub enum BumpTransactionEvent {
168168
/// an empty `pending_htlcs`), confirmation of the commitment transaction can be considered to
169169
/// be not urgent.
170170
///
171-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
172-
/// [`KeysManager::derive_channel_keys`]: crate::chain::keysinterface::KeysManager::derive_channel_keys
173-
/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::chain::keysinterface::EcdsaChannelSigner::sign_holder_anchor_input
171+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
172+
/// [`KeysManager::derive_channel_keys`]: crate::sign::KeysManager::derive_channel_keys
173+
/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::EcdsaChannelSigner::sign_holder_anchor_input
174174
/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
175175
ChannelClose {
176176
/// The target feerate that the transaction package, which consists of the commitment
@@ -217,9 +217,9 @@ pub enum BumpTransactionEvent {
217217
/// longer able to commit external confirmed funds to the HTLC transaction or the fee committed
218218
/// to the HTLC transaction is greater in value than the HTLCs being claimed.
219219
///
220-
/// [`InMemorySigner`]: crate::chain::keysinterface::InMemorySigner
221-
/// [`KeysManager::derive_channel_keys`]: crate::chain::keysinterface::KeysManager::derive_channel_keys
222-
/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::chain::keysinterface::EcdsaChannelSigner::sign_holder_htlc_transaction
220+
/// [`InMemorySigner`]: crate::sign::InMemorySigner
221+
/// [`KeysManager::derive_channel_keys`]: crate::sign::KeysManager::derive_channel_keys
222+
/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::EcdsaChannelSigner::sign_holder_htlc_transaction
223223
/// [`HTLCDescriptor::tx_input_witness`]: HTLCDescriptor::tx_input_witness
224224
HTLCResolution {
225225
/// The target feerate that the resulting HTLC transaction must meet.

0 commit comments

Comments
 (0)