@@ -18,6 +18,7 @@ use crate::chain::chaininterface::{BroadcasterInterface, fee_for_weight};
18
18
use crate :: chain:: ClaimId ;
19
19
use crate :: io_extras:: sink;
20
20
use crate :: ln:: channel:: ANCHOR_OUTPUT_VALUE_SATOSHI ;
21
+ use crate :: ln:: ChannelId ;
21
22
use crate :: ln:: chan_utils;
22
23
use crate :: ln:: chan_utils:: {
23
24
ANCHOR_INPUT_WITNESS_WEIGHT , HTLC_SUCCESS_INPUT_ANCHOR_WITNESS_WEIGHT ,
@@ -37,7 +38,7 @@ use bitcoin::blockdata::locktime::absolute::LockTime;
37
38
use bitcoin:: consensus:: Encodable ;
38
39
use bitcoin:: psbt:: PartiallySignedTransaction ;
39
40
use bitcoin:: secp256k1;
40
- use bitcoin:: secp256k1:: Secp256k1 ;
41
+ use bitcoin:: secp256k1:: { PublicKey , Secp256k1 } ;
41
42
use bitcoin:: secp256k1:: ecdsa:: Signature ;
42
43
43
44
const EMPTY_SCRIPT_SIG_WEIGHT : u64 = 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 ;
@@ -147,6 +148,14 @@ pub enum BumpTransactionEvent {
147
148
/// [`EcdsaChannelSigner::sign_holder_anchor_input`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_anchor_input
148
149
/// [`build_anchor_input_witness`]: crate::ln::chan_utils::build_anchor_input_witness
149
150
ChannelClose {
151
+ /// The `channel_id` of the channel which has been closed.
152
+ ///
153
+ /// This field will be `None` for objects serialized prior to LDK 0.0.122.
154
+ channel_id : Option < ChannelId > ,
155
+ /// Counterparty in the closed channel.
156
+ ///
157
+ /// This field will be `None` for objects serialized prior to LDK 0.0.122.
158
+ counterparty_node_id : Option < PublicKey > ,
150
159
/// The unique identifier for the claim of the anchor output in the commitment transaction.
151
160
///
152
161
/// The identifier must map to the set of external UTXOs assigned to the claim, such that
@@ -200,6 +209,14 @@ pub enum BumpTransactionEvent {
200
209
/// [`EcdsaChannelSigner`]: crate::sign::ecdsa::EcdsaChannelSigner
201
210
/// [`EcdsaChannelSigner::sign_holder_htlc_transaction`]: crate::sign::ecdsa::EcdsaChannelSigner::sign_holder_htlc_transaction
202
211
HTLCResolution {
212
+ /// The `channel_id` of the channel which has been closed.
213
+ ///
214
+ /// This field will be `None` for objects serialized prior to LDK 0.0.122.
215
+ channel_id : Option < ChannelId > ,
216
+ /// Counterparty in the closed channel.
217
+ ///
218
+ /// This field will be `None` for objects serialized prior to LDK 0.0.122.
219
+ counterparty_node_id : Option < PublicKey > ,
203
220
/// The unique identifier for the claim of the HTLCs in the confirmed commitment
204
221
/// transaction.
205
222
///
@@ -797,7 +814,7 @@ where
797
814
}
798
815
}
799
816
BumpTransactionEvent :: HTLCResolution {
800
- claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time,
817
+ claim_id, target_feerate_sat_per_1000_weight, htlc_descriptors, tx_lock_time, ..
801
818
} => {
802
819
log_info ! ( self . logger, "Handling HTLC bump (claim_id = {}, htlcs_to_claim = {})" ,
803
820
log_bytes!( claim_id. 0 ) , log_iter!( htlc_descriptors. iter( ) . map( |d| d. outpoint( ) ) ) ) ;
0 commit comments