Sign local HTLC transactions at broadcast-time, instead of generate
[rust-lightning] / lightning / src / ln / channel.rs
1 use bitcoin::blockdata::block::BlockHeader;
2 use bitcoin::blockdata::script::{Script,Builder};
3 use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
4 use bitcoin::blockdata::opcodes;
5 use bitcoin::util::hash::BitcoinHash;
6 use bitcoin::util::bip143;
7 use bitcoin::consensus::encode;
8
9 use bitcoin_hashes::{Hash, HashEngine};
10 use bitcoin_hashes::sha256::Hash as Sha256;
11 use bitcoin_hashes::hash160::Hash as Hash160;
12 use bitcoin_hashes::sha256d::Hash as Sha256dHash;
13
14 use secp256k1::key::{PublicKey,SecretKey};
15 use secp256k1::{Secp256k1,Signature};
16 use secp256k1;
17
18 use ln::msgs;
19 use ln::msgs::{DecodeError, OptionalField, LocalFeatures, DataLossProtect};
20 use ln::channelmonitor::ChannelMonitor;
21 use ln::channelmanager::{PendingHTLCStatus, HTLCSource, HTLCFailReason, HTLCFailureMsg, PendingForwardHTLCInfo, RAACommitmentOrder, PaymentPreimage, PaymentHash, BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT};
22 use ln::chan_utils::{LocalCommitmentTransaction,TxCreationKeys,HTLCOutputInCommitment,HTLC_SUCCESS_TX_WEIGHT,HTLC_TIMEOUT_TX_WEIGHT};
23 use ln::chan_utils;
24 use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
25 use chain::transaction::OutPoint;
26 use chain::keysinterface::{ChannelKeys, KeysInterface};
27 use util::transaction_utils;
28 use util::ser::{Readable, ReadableArgs, Writeable, Writer};
29 use util::logger::{Logger, LogHolder};
30 use util::errors::APIError;
31 use util::config::{UserConfig,ChannelConfig};
32
33 use std;
34 use std::default::Default;
35 use std::{cmp,mem,fmt};
36 use std::sync::{Arc};
37
38 #[cfg(test)]
39 pub struct ChannelValueStat {
40         pub value_to_self_msat: u64,
41         pub channel_value_msat: u64,
42         pub channel_reserve_msat: u64,
43         pub pending_outbound_htlcs_amount_msat: u64,
44         pub pending_inbound_htlcs_amount_msat: u64,
45         pub holding_cell_outbound_amount_msat: u64,
46         pub their_max_htlc_value_in_flight_msat: u64, // outgoing
47 }
48
49 enum InboundHTLCRemovalReason {
50         FailRelay(msgs::OnionErrorPacket),
51         FailMalformed(([u8; 32], u16)),
52         Fulfill(PaymentPreimage),
53 }
54
55 enum InboundHTLCState {
56         /// Added by remote, to be included in next local commitment tx.
57         RemoteAnnounced(PendingHTLCStatus),
58         /// Included in a received commitment_signed message (implying we've revoke_and_ack'ed it), but
59         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
60         /// accept this HTLC. Implies AwaitingRemoteRevoke.
61         /// We also have not yet included this HTLC in a commitment_signed message, and are waiting on
62         /// a remote revoke_and_ack on a previous state before we can do so.
63         AwaitingRemoteRevokeToAnnounce(PendingHTLCStatus),
64         /// Included in a received commitment_signed message (implying we've revoke_and_ack'ed it), but
65         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
66         /// accept this HTLC. Implies AwaitingRemoteRevoke.
67         /// We have included this HTLC in our latest commitment_signed and are now just waiting on a
68         /// revoke_and_ack.
69         AwaitingAnnouncedRemoteRevoke(PendingHTLCStatus),
70         Committed,
71         /// Removed by us and a new commitment_signed was sent (if we were AwaitingRemoteRevoke when we
72         /// created it we would have put it in the holding cell instead). When they next revoke_and_ack
73         /// we'll drop it.
74         /// Note that we have to keep an eye on the HTLC until we've received a broadcastable
75         /// commitment transaction without it as otherwise we'll have to force-close the channel to
76         /// claim it before the timeout (obviously doesn't apply to revoked HTLCs that we can't claim
77         /// anyway). That said, ChannelMonitor does this for us (see
78         /// ChannelMonitor::would_broadcast_at_height) so we actually remove the HTLC from our own
79         /// local state before then, once we're sure that the next commitment_signed and
80         /// ChannelMonitor::provide_latest_local_commitment_tx_info will not include this HTLC.
81         LocalRemoved(InboundHTLCRemovalReason),
82 }
83
84 struct InboundHTLCOutput {
85         htlc_id: u64,
86         amount_msat: u64,
87         cltv_expiry: u32,
88         payment_hash: PaymentHash,
89         state: InboundHTLCState,
90 }
91
92 enum OutboundHTLCState {
93         /// Added by us and included in a commitment_signed (if we were AwaitingRemoteRevoke when we
94         /// created it we would have put it in the holding cell instead). When they next revoke_and_ack
95         /// we will promote to Committed (note that they may not accept it until the next time we
96         /// revoke, but we don't really care about that:
97         ///  * they've revoked, so worst case we can announce an old state and get our (option on)
98         ///    money back (though we won't), and,
99         ///  * we'll send them a revoke when they send a commitment_signed, and since only they're
100         ///    allowed to remove it, the "can only be removed once committed on both sides" requirement
101         ///    doesn't matter to us and it's up to them to enforce it, worst-case they jump ahead but
102         ///    we'll never get out of sync).
103         /// Note that we Box the OnionPacket as it's rather large and we don't want to blow up
104         /// OutboundHTLCOutput's size just for a temporary bit
105         LocalAnnounced(Box<msgs::OnionPacket>),
106         Committed,
107         /// Remote removed this (outbound) HTLC. We're waiting on their commitment_signed to finalize
108         /// the change (though they'll need to revoke before we fail the payment).
109         RemoteRemoved(Option<HTLCFailReason>),
110         /// Remote removed this and sent a commitment_signed (implying we've revoke_and_ack'ed it), but
111         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
112         /// can do any backwards failing. Implies AwaitingRemoteRevoke.
113         /// We also have not yet removed this HTLC in a commitment_signed message, and are waiting on a
114         /// remote revoke_and_ack on a previous state before we can do so.
115         AwaitingRemoteRevokeToRemove(Option<HTLCFailReason>),
116         /// Remote removed this and sent a commitment_signed (implying we've revoke_and_ack'ed it), but
117         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
118         /// can do any backwards failing. Implies AwaitingRemoteRevoke.
119         /// We have removed this HTLC in our latest commitment_signed and are now just waiting on a
120         /// revoke_and_ack to drop completely.
121         AwaitingRemovedRemoteRevoke(Option<HTLCFailReason>),
122 }
123
124 struct OutboundHTLCOutput {
125         htlc_id: u64,
126         amount_msat: u64,
127         cltv_expiry: u32,
128         payment_hash: PaymentHash,
129         state: OutboundHTLCState,
130         source: HTLCSource,
131 }
132
133 /// See AwaitingRemoteRevoke ChannelState for more info
134 enum HTLCUpdateAwaitingACK {
135         AddHTLC { // TODO: Time out if we're getting close to cltv_expiry
136                 // always outbound
137                 amount_msat: u64,
138                 cltv_expiry: u32,
139                 payment_hash: PaymentHash,
140                 source: HTLCSource,
141                 onion_routing_packet: msgs::OnionPacket,
142         },
143         ClaimHTLC {
144                 payment_preimage: PaymentPreimage,
145                 htlc_id: u64,
146         },
147         FailHTLC {
148                 htlc_id: u64,
149                 err_packet: msgs::OnionErrorPacket,
150         },
151 }
152
153 /// There are a few "states" and then a number of flags which can be applied:
154 /// We first move through init with OurInitSent -> TheirInitSent -> FundingCreated -> FundingSent.
155 /// TheirFundingLocked and OurFundingLocked then get set on FundingSent, and when both are set we
156 /// move on to ChannelFunded.
157 /// Note that PeerDisconnected can be set on both ChannelFunded and FundingSent.
158 /// ChannelFunded can then get all remaining flags set on it, until we finish shutdown, then we
159 /// move on to ShutdownComplete, at which point most calls into this channel are disallowed.
160 enum ChannelState {
161         /// Implies we have (or are prepared to) send our open_channel/accept_channel message
162         OurInitSent = (1 << 0),
163         /// Implies we have received their open_channel/accept_channel message
164         TheirInitSent = (1 << 1),
165         /// We have sent funding_created and are awaiting a funding_signed to advance to FundingSent.
166         /// Note that this is nonsense for an inbound channel as we immediately generate funding_signed
167         /// upon receipt of funding_created, so simply skip this state.
168         FundingCreated = 4,
169         /// Set when we have received/sent funding_created and funding_signed and are thus now waiting
170         /// on the funding transaction to confirm. The FundingLocked flags are set to indicate when we
171         /// and our counterparty consider the funding transaction confirmed.
172         FundingSent = 8,
173         /// Flag which can be set on FundingSent to indicate they sent us a funding_locked message.
174         /// Once both TheirFundingLocked and OurFundingLocked are set, state moves on to ChannelFunded.
175         TheirFundingLocked = (1 << 4),
176         /// Flag which can be set on FundingSent to indicate we sent them a funding_locked message.
177         /// Once both TheirFundingLocked and OurFundingLocked are set, state moves on to ChannelFunded.
178         OurFundingLocked = (1 << 5),
179         ChannelFunded = 64,
180         /// Flag which is set on ChannelFunded and FundingSent indicating remote side is considered
181         /// "disconnected" and no updates are allowed until after we've done a channel_reestablish
182         /// dance.
183         PeerDisconnected = (1 << 7),
184         /// Flag which is set on ChannelFunded, FundingCreated, and FundingSent indicating the user has
185         /// told us they failed to update our ChannelMonitor somewhere and we should pause sending any
186         /// outbound messages until they've managed to do so.
187         MonitorUpdateFailed = (1 << 8),
188         /// Flag which implies that we have sent a commitment_signed but are awaiting the responding
189         /// revoke_and_ack message. During this time period, we can't generate new commitment_signed
190         /// messages as then we will be unable to determine which HTLCs they included in their
191         /// revoke_and_ack implicit ACK, so instead we have to hold them away temporarily to be sent
192         /// later.
193         /// Flag is set on ChannelFunded.
194         AwaitingRemoteRevoke = (1 << 9),
195         /// Flag which is set on ChannelFunded or FundingSent after receiving a shutdown message from
196         /// the remote end. If set, they may not add any new HTLCs to the channel, and we are expected
197         /// to respond with our own shutdown message when possible.
198         RemoteShutdownSent = (1 << 10),
199         /// Flag which is set on ChannelFunded or FundingSent after sending a shutdown message. At this
200         /// point, we may not add any new HTLCs to the channel.
201         /// TODO: Investigate some kind of timeout mechanism by which point the remote end must provide
202         /// us their shutdown.
203         LocalShutdownSent = (1 << 11),
204         /// We've successfully negotiated a closing_signed dance. At this point ChannelManager is about
205         /// to drop us, but we store this anyway.
206         ShutdownComplete = 4096,
207 }
208 const BOTH_SIDES_SHUTDOWN_MASK: u32 = (ChannelState::LocalShutdownSent as u32 | ChannelState::RemoteShutdownSent as u32);
209 const MULTI_STATE_FLAGS: u32 = (BOTH_SIDES_SHUTDOWN_MASK | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32);
210
211 const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
212
213 /// Liveness is called to fluctuate given peer disconnecton/monitor failures/closing.
214 /// If channel is public, network should have a liveness view announced by us on a
215 /// best-effort, which means we may filter out some status transitions to avoid spam.
216 /// See further timer_chan_freshness_every_min.
217 #[derive(PartialEq)]
218 enum UpdateStatus {
219         /// Status has been gossiped.
220         Fresh,
221         /// Status has been changed.
222         DisabledMarked,
223         /// Status has been marked to be gossiped at next flush
224         DisabledStaged,
225 }
226
227 // TODO: We should refactor this to be an Inbound/OutboundChannel until initial setup handshaking
228 // has been completed, and then turn into a Channel to get compiler-time enforcement of things like
229 // calling channel_id() before we're set up or things like get_outbound_funding_signed on an
230 // inbound channel.
231 pub(super) struct Channel<ChanSigner: ChannelKeys> {
232         config: ChannelConfig,
233
234         user_id: u64,
235
236         channel_id: [u8; 32],
237         channel_state: u32,
238         channel_outbound: bool,
239         secp_ctx: Secp256k1<secp256k1::All>,
240         channel_value_satoshis: u64,
241
242         local_keys: ChanSigner,
243         shutdown_pubkey: PublicKey,
244
245         // Our commitment numbers start at 2^48-1 and count down, whereas the ones used in transaction
246         // generation start at 0 and count up...this simplifies some parts of implementation at the
247         // cost of others, but should really just be changed.
248
249         cur_local_commitment_transaction_number: u64,
250         cur_remote_commitment_transaction_number: u64,
251         value_to_self_msat: u64, // Excluding all pending_htlcs, excluding fees
252         pending_inbound_htlcs: Vec<InboundHTLCOutput>,
253         pending_outbound_htlcs: Vec<OutboundHTLCOutput>,
254         holding_cell_htlc_updates: Vec<HTLCUpdateAwaitingACK>,
255
256         /// When resending CS/RAA messages on channel monitor restoration or on reconnect, we always
257         /// need to ensure we resend them in the order we originally generated them. Note that because
258         /// there can only ever be one in-flight CS and/or one in-flight RAA at any time, it is
259         /// sufficient to simply set this to the opposite of any message we are generating as we
260         /// generate it. ie when we generate a CS, we set this to RAAFirst as, if there is a pending
261         /// in-flight RAA to resend, it will have been the first thing we generated, and thus we should
262         /// send it first.
263         resend_order: RAACommitmentOrder,
264
265         monitor_pending_funding_locked: bool,
266         monitor_pending_revoke_and_ack: bool,
267         monitor_pending_commitment_signed: bool,
268         monitor_pending_forwards: Vec<(PendingForwardHTLCInfo, u64)>,
269         monitor_pending_failures: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>,
270
271         // pending_update_fee is filled when sending and receiving update_fee
272         // For outbound channel, feerate_per_kw is updated with the value from
273         // pending_update_fee when revoke_and_ack is received
274         //
275         // For inbound channel, feerate_per_kw is updated when it receives
276         // commitment_signed and revoke_and_ack is generated
277         // The pending value is kept when another pair of update_fee and commitment_signed
278         // is received during AwaitingRemoteRevoke and relieved when the expected
279         // revoke_and_ack is received and new commitment_signed is generated to be
280         // sent to the funder. Otherwise, the pending value is removed when receiving
281         // commitment_signed.
282         pending_update_fee: Option<u64>,
283         // update_fee() during ChannelState::AwaitingRemoteRevoke is hold in
284         // holdina_cell_update_fee then moved to pending_udpate_fee when revoke_and_ack
285         // is received. holding_cell_update_fee is updated when there are additional
286         // update_fee() during ChannelState::AwaitingRemoteRevoke.
287         holding_cell_update_fee: Option<u64>,
288         next_local_htlc_id: u64,
289         next_remote_htlc_id: u64,
290         channel_update_count: u32,
291         feerate_per_kw: u64,
292
293         #[cfg(debug_assertions)]
294         /// Max to_local and to_remote outputs in a locally-generated commitment transaction
295         max_commitment_tx_output_local: ::std::sync::Mutex<(u64, u64)>,
296         #[cfg(debug_assertions)]
297         /// Max to_local and to_remote outputs in a remote-generated commitment transaction
298         max_commitment_tx_output_remote: ::std::sync::Mutex<(u64, u64)>,
299
300         last_sent_closing_fee: Option<(u64, u64, Signature)>, // (feerate, fee, our_sig)
301
302         /// The hash of the block in which the funding transaction reached our CONF_TARGET. We use this
303         /// to detect unconfirmation after a serialize-unserialize roundtrip where we may not see a full
304         /// series of block_connected/block_disconnected calls. Obviously this is not a guarantee as we
305         /// could miss the funding_tx_confirmed_in block as well, but it serves as a useful fallback.
306         funding_tx_confirmed_in: Option<Sha256dHash>,
307         short_channel_id: Option<u64>,
308         /// Used to deduplicate block_connected callbacks, also used to verify consistency during
309         /// ChannelManager deserialization (hence pub(super))
310         pub(super) last_block_connected: Sha256dHash,
311         funding_tx_confirmations: u64,
312
313         their_dust_limit_satoshis: u64,
314         #[cfg(test)]
315         pub(super) our_dust_limit_satoshis: u64,
316         #[cfg(not(test))]
317         our_dust_limit_satoshis: u64,
318         #[cfg(test)]
319         pub(super) their_max_htlc_value_in_flight_msat: u64,
320         #[cfg(not(test))]
321         their_max_htlc_value_in_flight_msat: u64,
322         //get_our_max_htlc_value_in_flight_msat(): u64,
323         /// minimum channel reserve for **self** to maintain - set by them.
324         their_channel_reserve_satoshis: u64,
325         //get_our_channel_reserve_satoshis(): u64,
326         their_htlc_minimum_msat: u64,
327         our_htlc_minimum_msat: u64,
328         their_to_self_delay: u16,
329         our_to_self_delay: u16,
330         #[cfg(test)]
331         pub their_max_accepted_htlcs: u16,
332         #[cfg(not(test))]
333         their_max_accepted_htlcs: u16,
334         //implied by OUR_MAX_HTLCS: our_max_accepted_htlcs: u16,
335         minimum_depth: u32,
336
337         their_funding_pubkey: Option<PublicKey>,
338         their_revocation_basepoint: Option<PublicKey>,
339         their_payment_basepoint: Option<PublicKey>,
340         their_delayed_payment_basepoint: Option<PublicKey>,
341         their_htlc_basepoint: Option<PublicKey>,
342         their_cur_commitment_point: Option<PublicKey>,
343
344         their_prev_commitment_point: Option<PublicKey>,
345         their_node_id: PublicKey,
346
347         their_shutdown_scriptpubkey: Option<Script>,
348
349         channel_monitor: ChannelMonitor,
350
351         network_sync: UpdateStatus,
352
353         logger: Arc<Logger>,
354 }
355
356 pub const OUR_MAX_HTLCS: u16 = 50; //TODO
357 /// Confirmation count threshold at which we close a channel. Ideally we'd keep the channel around
358 /// on ice until the funding transaction gets more confirmations, but the LN protocol doesn't
359 /// really allow for this, so instead we're stuck closing it out at that point.
360 const UNCONF_THRESHOLD: u32 = 6;
361 /// Exposing these two constants for use in test in ChannelMonitor
362 pub const COMMITMENT_TX_BASE_WEIGHT: u64 = 724;
363 pub const COMMITMENT_TX_WEIGHT_PER_HTLC: u64 = 172;
364 const SPENDING_INPUT_FOR_A_OUTPUT_WEIGHT: u64 = 79; // prevout: 36, nSequence: 4, script len: 1, witness lengths: (3+1)/4, sig: 73/4, if-selector: 1, redeemScript: (6 ops + 2*33 pubkeys + 1*2 delay)/4
365 const B_OUTPUT_PLUS_SPENDING_INPUT_WEIGHT: u64 = 104; // prevout: 40, nSequence: 4, script len: 1, witness lengths: 3/4, sig: 73/4, pubkey: 33/4, output: 31 (TODO: Wrong? Useless?)
366 /// Maximmum `funding_satoshis` value, according to the BOLT #2 specification
367 /// it's 2^24.
368 pub const MAX_FUNDING_SATOSHIS: u64 = (1 << 24);
369
370 #[cfg(test)]
371 pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 138; //Here we have a diff due to HTLC CLTV expiry being < 2^15 in test
372 #[cfg(not(test))]
373 pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 139;
374 pub const OFFERED_HTLC_SCRIPT_WEIGHT: usize = 133;
375
376 /// Used to return a simple Error back to ChannelManager. Will get converted to a
377 /// msgs::ErrorAction::SendErrorMessage or msgs::ErrorAction::IgnoreError as appropriate with our
378 /// channel_id in ChannelManager.
379 pub(super) enum ChannelError {
380         Ignore(&'static str),
381         Close(&'static str),
382         CloseDelayBroadcast {
383                 msg: &'static str,
384                 update: Option<ChannelMonitor>
385         },
386 }
387
388 impl fmt::Debug for ChannelError {
389         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
390                 match self {
391                         &ChannelError::Ignore(e) => write!(f, "Ignore : {}", e),
392                         &ChannelError::Close(e) => write!(f, "Close : {}", e),
393                         &ChannelError::CloseDelayBroadcast { msg, .. } => write!(f, "CloseDelayBroadcast : {}", msg)
394                 }
395         }
396 }
397
398 macro_rules! secp_check {
399         ($res: expr, $err: expr) => {
400                 match $res {
401                         Ok(thing) => thing,
402                         Err(_) => return Err(ChannelError::Close($err)),
403                 }
404         };
405 }
406
407 impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
408         // Convert constants + channel value to limits:
409         fn get_our_max_htlc_value_in_flight_msat(channel_value_satoshis: u64) -> u64 {
410                 channel_value_satoshis * 1000 / 10 //TODO
411         }
412
413         /// Returns a minimum channel reserve value **they** need to maintain
414         ///
415         /// Guaranteed to return a value no larger than channel_value_satoshis
416         pub(crate) fn get_our_channel_reserve_satoshis(channel_value_satoshis: u64) -> u64 {
417                 let (q, _) = channel_value_satoshis.overflowing_div(100);
418                 cmp::min(channel_value_satoshis, cmp::max(q, 1000)) //TODO
419         }
420
421         fn derive_our_dust_limit_satoshis(at_open_background_feerate: u64) -> u64 {
422                 cmp::max(at_open_background_feerate * B_OUTPUT_PLUS_SPENDING_INPUT_WEIGHT / 1000, 546) //TODO
423         }
424
425         fn derive_our_htlc_minimum_msat(_at_open_channel_feerate_per_kw: u64) -> u64 {
426                 1000 // TODO
427         }
428
429         // Constructors:
430         pub fn new_outbound(fee_estimator: &FeeEstimator, keys_provider: &Arc<KeysInterface<ChanKeySigner = ChanSigner>>, their_node_id: PublicKey, channel_value_satoshis: u64, push_msat: u64, user_id: u64, logger: Arc<Logger>, config: &UserConfig) -> Result<Channel<ChanSigner>, APIError> {
431                 let chan_keys = keys_provider.get_channel_keys(false);
432
433                 if channel_value_satoshis >= MAX_FUNDING_SATOSHIS {
434                         return Err(APIError::APIMisuseError{err: "funding value > 2^24"});
435                 }
436
437                 if push_msat > channel_value_satoshis * 1000 {
438                         return Err(APIError::APIMisuseError{err: "push value > channel value"});
439                 }
440                 if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT {
441                         return Err(APIError::APIMisuseError{err: "Configured with an unreasonable our_to_self_delay putting user funds at risks"});
442                 }
443
444
445                 let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
446                 if Channel::<ChanSigner>::get_our_channel_reserve_satoshis(channel_value_satoshis) < Channel::<ChanSigner>::derive_our_dust_limit_satoshis(background_feerate) {
447                         return Err(APIError::FeeRateTooHigh{err: format!("Not enough reserve above dust limit can be found at current fee rate({})", background_feerate), feerate: background_feerate});
448                 }
449
450                 let feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
451
452                 let secp_ctx = Secp256k1::new();
453                 let channel_monitor = ChannelMonitor::new(chan_keys.funding_key(), chan_keys.revocation_base_key(), chan_keys.delayed_payment_base_key(),
454                                                           chan_keys.htlc_base_key(), chan_keys.payment_base_key(), &keys_provider.get_shutdown_pubkey(), config.own_channel_config.our_to_self_delay,
455                                                           keys_provider.get_destination_script(), logger.clone());
456
457                 Ok(Channel {
458                         user_id: user_id,
459                         config: config.channel_options.clone(),
460
461                         channel_id: keys_provider.get_channel_id(),
462                         channel_state: ChannelState::OurInitSent as u32,
463                         channel_outbound: true,
464                         secp_ctx: secp_ctx,
465                         channel_value_satoshis: channel_value_satoshis,
466
467                         local_keys: chan_keys,
468                         shutdown_pubkey: keys_provider.get_shutdown_pubkey(),
469                         cur_local_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
470                         cur_remote_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
471                         value_to_self_msat: channel_value_satoshis * 1000 - push_msat,
472
473                         pending_inbound_htlcs: Vec::new(),
474                         pending_outbound_htlcs: Vec::new(),
475                         holding_cell_htlc_updates: Vec::new(),
476                         pending_update_fee: None,
477                         holding_cell_update_fee: None,
478                         next_local_htlc_id: 0,
479                         next_remote_htlc_id: 0,
480                         channel_update_count: 1,
481
482                         resend_order: RAACommitmentOrder::CommitmentFirst,
483
484                         monitor_pending_funding_locked: false,
485                         monitor_pending_revoke_and_ack: false,
486                         monitor_pending_commitment_signed: false,
487                         monitor_pending_forwards: Vec::new(),
488                         monitor_pending_failures: Vec::new(),
489
490                         #[cfg(debug_assertions)]
491                         max_commitment_tx_output_local: ::std::sync::Mutex::new((channel_value_satoshis * 1000 - push_msat, push_msat)),
492                         #[cfg(debug_assertions)]
493                         max_commitment_tx_output_remote: ::std::sync::Mutex::new((channel_value_satoshis * 1000 - push_msat, push_msat)),
494
495                         last_sent_closing_fee: None,
496
497                         funding_tx_confirmed_in: None,
498                         short_channel_id: None,
499                         last_block_connected: Default::default(),
500                         funding_tx_confirmations: 0,
501
502                         feerate_per_kw: feerate,
503                         their_dust_limit_satoshis: 0,
504                         our_dust_limit_satoshis: Channel::<ChanSigner>::derive_our_dust_limit_satoshis(background_feerate),
505                         their_max_htlc_value_in_flight_msat: 0,
506                         their_channel_reserve_satoshis: 0,
507                         their_htlc_minimum_msat: 0,
508                         our_htlc_minimum_msat: Channel::<ChanSigner>::derive_our_htlc_minimum_msat(feerate),
509                         their_to_self_delay: 0,
510                         our_to_self_delay: config.own_channel_config.our_to_self_delay,
511                         their_max_accepted_htlcs: 0,
512                         minimum_depth: 0, // Filled in in accept_channel
513
514                         their_funding_pubkey: None,
515                         their_revocation_basepoint: None,
516                         their_payment_basepoint: None,
517                         their_delayed_payment_basepoint: None,
518                         their_htlc_basepoint: None,
519                         their_cur_commitment_point: None,
520
521                         their_prev_commitment_point: None,
522                         their_node_id: their_node_id,
523
524                         their_shutdown_scriptpubkey: None,
525
526                         channel_monitor: channel_monitor,
527
528                         network_sync: UpdateStatus::Fresh,
529
530                         logger,
531                 })
532         }
533
534         fn check_remote_fee(fee_estimator: &FeeEstimator, feerate_per_kw: u32) -> Result<(), ChannelError> {
535                 if (feerate_per_kw as u64) < fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background) {
536                         return Err(ChannelError::Close("Peer's feerate much too low"));
537                 }
538                 if (feerate_per_kw as u64) > fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority) * 2 {
539                         return Err(ChannelError::Close("Peer's feerate much too high"));
540                 }
541                 Ok(())
542         }
543
544         /// Creates a new channel from a remote sides' request for one.
545         /// Assumes chain_hash has already been checked and corresponds with what we expect!
546         pub fn new_from_req(fee_estimator: &FeeEstimator, keys_provider: &Arc<KeysInterface<ChanKeySigner = ChanSigner>>, their_node_id: PublicKey, their_local_features: LocalFeatures, msg: &msgs::OpenChannel, user_id: u64, logger: Arc<Logger>, config: &UserConfig) -> Result<Channel<ChanSigner>, ChannelError> {
547                 let chan_keys = keys_provider.get_channel_keys(true);
548                 let mut local_config = (*config).channel_options.clone();
549
550                 if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT {
551                         return Err(ChannelError::Close("Configured with an unreasonable our_to_self_delay putting user funds at risks"));
552                 }
553
554                 // Check sanity of message fields:
555                 if msg.funding_satoshis >= MAX_FUNDING_SATOSHIS {
556                         return Err(ChannelError::Close("funding value > 2^24"));
557                 }
558                 if msg.channel_reserve_satoshis > msg.funding_satoshis {
559                         return Err(ChannelError::Close("Bogus channel_reserve_satoshis"));
560                 }
561                 if msg.push_msat > (msg.funding_satoshis - msg.channel_reserve_satoshis) * 1000 {
562                         return Err(ChannelError::Close("push_msat larger than funding value"));
563                 }
564                 if msg.dust_limit_satoshis > msg.funding_satoshis {
565                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
566                 }
567                 if msg.dust_limit_satoshis > msg.channel_reserve_satoshis {
568                         return Err(ChannelError::Close("Bogus; channel reserve is less than dust limit"));
569                 }
570                 if msg.htlc_minimum_msat >= (msg.funding_satoshis - msg.channel_reserve_satoshis) * 1000 {
571                         return Err(ChannelError::Close("Minimum htlc value is full channel value"));
572                 }
573                 Channel::<ChanSigner>::check_remote_fee(fee_estimator, msg.feerate_per_kw)?;
574
575                 if msg.to_self_delay > config.peer_channel_config_limits.their_to_self_delay || msg.to_self_delay > MAX_LOCAL_BREAKDOWN_TIMEOUT {
576                         return Err(ChannelError::Close("They wanted our payments to be delayed by a needlessly long period"));
577                 }
578                 if msg.max_accepted_htlcs < 1 {
579                         return Err(ChannelError::Close("0 max_accpted_htlcs makes for a useless channel"));
580                 }
581                 if msg.max_accepted_htlcs > 483 {
582                         return Err(ChannelError::Close("max_accpted_htlcs > 483"));
583                 }
584
585                 // Now check against optional parameters as set by config...
586                 if msg.funding_satoshis < config.peer_channel_config_limits.min_funding_satoshis {
587                         return Err(ChannelError::Close("funding satoshis is less than the user specified limit"));
588                 }
589                 if msg.htlc_minimum_msat > config.peer_channel_config_limits.max_htlc_minimum_msat {
590                         return Err(ChannelError::Close("htlc minimum msat is higher than the user specified limit"));
591                 }
592                 if msg.max_htlc_value_in_flight_msat < config.peer_channel_config_limits.min_max_htlc_value_in_flight_msat {
593                         return Err(ChannelError::Close("max htlc value in flight msat is less than the user specified limit"));
594                 }
595                 if msg.channel_reserve_satoshis > config.peer_channel_config_limits.max_channel_reserve_satoshis {
596                         return Err(ChannelError::Close("channel reserve satoshis is higher than the user specified limit"));
597                 }
598                 if msg.max_accepted_htlcs < config.peer_channel_config_limits.min_max_accepted_htlcs {
599                         return Err(ChannelError::Close("max accepted htlcs is less than the user specified limit"));
600                 }
601                 if msg.dust_limit_satoshis < config.peer_channel_config_limits.min_dust_limit_satoshis {
602                         return Err(ChannelError::Close("dust limit satoshis is less than the user specified limit"));
603                 }
604                 if msg.dust_limit_satoshis > config.peer_channel_config_limits.max_dust_limit_satoshis {
605                         return Err(ChannelError::Close("dust limit satoshis is greater than the user specified limit"));
606                 }
607
608                 // Convert things into internal flags and prep our state:
609
610                 let their_announce = if (msg.channel_flags & 1) == 1 { true } else { false };
611                 if config.peer_channel_config_limits.force_announced_channel_preference {
612                         if local_config.announced_channel != their_announce {
613                                 return Err(ChannelError::Close("Peer tried to open channel but their announcement preference is different from ours"));
614                         }
615                 }
616                 // we either accept their preference or the preferences match
617                 local_config.announced_channel = their_announce;
618
619                 let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
620
621                 let our_dust_limit_satoshis = Channel::<ChanSigner>::derive_our_dust_limit_satoshis(background_feerate);
622                 let our_channel_reserve_satoshis = Channel::<ChanSigner>::get_our_channel_reserve_satoshis(msg.funding_satoshis);
623                 if our_channel_reserve_satoshis < our_dust_limit_satoshis {
624                         return Err(ChannelError::Close("Suitable channel reserve not found. aborting"));
625                 }
626                 if msg.channel_reserve_satoshis < our_dust_limit_satoshis {
627                         return Err(ChannelError::Close("channel_reserve_satoshis too small"));
628                 }
629                 if our_channel_reserve_satoshis < msg.dust_limit_satoshis {
630                         return Err(ChannelError::Close("Dust limit too high for our channel reserve"));
631                 }
632
633                 // check if the funder's amount for the initial commitment tx is sufficient
634                 // for full fee payment
635                 let funders_amount_msat = msg.funding_satoshis * 1000 - msg.push_msat;
636                 if funders_amount_msat < background_feerate * COMMITMENT_TX_BASE_WEIGHT {
637                         return Err(ChannelError::Close("Insufficient funding amount for initial commitment"));
638                 }
639
640                 let to_local_msat = msg.push_msat;
641                 let to_remote_msat = funders_amount_msat - background_feerate * COMMITMENT_TX_BASE_WEIGHT;
642                 if to_local_msat <= msg.channel_reserve_satoshis * 1000 && to_remote_msat <= our_channel_reserve_satoshis * 1000 {
643                         return Err(ChannelError::Close("Insufficient funding amount for initial commitment"));
644                 }
645
646                 let secp_ctx = Secp256k1::new();
647                 let channel_monitor = ChannelMonitor::new(chan_keys.funding_key(), chan_keys.revocation_base_key(), chan_keys.delayed_payment_base_key(),
648                                                           chan_keys.htlc_base_key(), chan_keys.payment_base_key(), &keys_provider.get_shutdown_pubkey(), config.own_channel_config.our_to_self_delay,
649                                                           keys_provider.get_destination_script(), logger.clone());
650
651                 let their_shutdown_scriptpubkey = if their_local_features.supports_upfront_shutdown_script() {
652                         match &msg.shutdown_scriptpubkey {
653                                 &OptionalField::Present(ref script) => {
654                                         // Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. We enforce it while receiving shutdown msg
655                                         if script.is_p2pkh() || script.is_p2sh() || script.is_v0_p2wsh() || script.is_v0_p2wpkh() {
656                                                 Some(script.clone())
657                                         // Peer is signaling upfront_shutdown and has opt-out with a 0-length script. We don't enforce anything
658                                         } else if script.len() == 0 {
659                                                 None
660                                         // Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. Fail the channel
661                                         } else {
662                                                 return Err(ChannelError::Close("Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format"));
663                                         }
664                                 },
665                                 // Peer is signaling upfront shutdown but don't opt-out with correct mechanism (a.k.a 0-length script). Peer looks buggy, we fail the channel
666                                 &OptionalField::Absent => {
667                                         return Err(ChannelError::Close("Peer is signaling upfront_shutdown but we don't get any script. Use 0-length script to opt-out"));
668                                 }
669                         }
670                 } else { None };
671
672                 let mut chan = Channel {
673                         user_id: user_id,
674                         config: local_config,
675
676                         channel_id: msg.temporary_channel_id,
677                         channel_state: (ChannelState::OurInitSent as u32) | (ChannelState::TheirInitSent as u32),
678                         channel_outbound: false,
679                         secp_ctx: secp_ctx,
680
681                         local_keys: chan_keys,
682                         shutdown_pubkey: keys_provider.get_shutdown_pubkey(),
683                         cur_local_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
684                         cur_remote_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
685                         value_to_self_msat: msg.push_msat,
686
687                         pending_inbound_htlcs: Vec::new(),
688                         pending_outbound_htlcs: Vec::new(),
689                         holding_cell_htlc_updates: Vec::new(),
690                         pending_update_fee: None,
691                         holding_cell_update_fee: None,
692                         next_local_htlc_id: 0,
693                         next_remote_htlc_id: 0,
694                         channel_update_count: 1,
695
696                         resend_order: RAACommitmentOrder::CommitmentFirst,
697
698                         monitor_pending_funding_locked: false,
699                         monitor_pending_revoke_and_ack: false,
700                         monitor_pending_commitment_signed: false,
701                         monitor_pending_forwards: Vec::new(),
702                         monitor_pending_failures: Vec::new(),
703
704                         #[cfg(debug_assertions)]
705                         max_commitment_tx_output_local: ::std::sync::Mutex::new((msg.push_msat, msg.funding_satoshis * 1000 - msg.push_msat)),
706                         #[cfg(debug_assertions)]
707                         max_commitment_tx_output_remote: ::std::sync::Mutex::new((msg.push_msat, msg.funding_satoshis * 1000 - msg.push_msat)),
708
709                         last_sent_closing_fee: None,
710
711                         funding_tx_confirmed_in: None,
712                         short_channel_id: None,
713                         last_block_connected: Default::default(),
714                         funding_tx_confirmations: 0,
715
716                         feerate_per_kw: msg.feerate_per_kw as u64,
717                         channel_value_satoshis: msg.funding_satoshis,
718                         their_dust_limit_satoshis: msg.dust_limit_satoshis,
719                         our_dust_limit_satoshis: our_dust_limit_satoshis,
720                         their_max_htlc_value_in_flight_msat: cmp::min(msg.max_htlc_value_in_flight_msat, msg.funding_satoshis * 1000),
721                         their_channel_reserve_satoshis: msg.channel_reserve_satoshis,
722                         their_htlc_minimum_msat: msg.htlc_minimum_msat,
723                         our_htlc_minimum_msat: Channel::<ChanSigner>::derive_our_htlc_minimum_msat(msg.feerate_per_kw as u64),
724                         their_to_self_delay: msg.to_self_delay,
725                         our_to_self_delay: config.own_channel_config.our_to_self_delay,
726                         their_max_accepted_htlcs: msg.max_accepted_htlcs,
727                         minimum_depth: config.own_channel_config.minimum_depth,
728
729                         their_funding_pubkey: Some(msg.funding_pubkey),
730                         their_revocation_basepoint: Some(msg.revocation_basepoint),
731                         their_payment_basepoint: Some(msg.payment_basepoint),
732                         their_delayed_payment_basepoint: Some(msg.delayed_payment_basepoint),
733                         their_htlc_basepoint: Some(msg.htlc_basepoint),
734                         their_cur_commitment_point: Some(msg.first_per_commitment_point),
735
736                         their_prev_commitment_point: None,
737                         their_node_id: their_node_id,
738
739                         their_shutdown_scriptpubkey,
740
741                         channel_monitor: channel_monitor,
742
743                         network_sync: UpdateStatus::Fresh,
744
745                         logger,
746                 };
747
748                 let obscure_factor = chan.get_commitment_transaction_number_obscure_factor();
749                 let funding_redeemscript = chan.get_funding_redeemscript();
750                 chan.channel_monitor.set_basic_channel_info(&msg.htlc_basepoint, &msg.delayed_payment_basepoint, msg.to_self_delay, funding_redeemscript, msg.funding_satoshis, obscure_factor);
751
752                 Ok(chan)
753         }
754
755         // Utilities to derive keys:
756
757         fn build_local_commitment_secret(&self, idx: u64) -> SecretKey {
758                 let res = chan_utils::build_commitment_secret(self.local_keys.commitment_seed(), idx);
759                 SecretKey::from_slice(&res).unwrap()
760         }
761
762         // Utilities to build transactions:
763
764         fn get_commitment_transaction_number_obscure_factor(&self) -> u64 {
765                 let mut sha = Sha256::engine();
766                 let our_payment_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.payment_base_key());
767
768                 if self.channel_outbound {
769                         sha.input(&our_payment_basepoint.serialize());
770                         sha.input(&self.their_payment_basepoint.unwrap().serialize());
771                 } else {
772                         sha.input(&self.their_payment_basepoint.unwrap().serialize());
773                         sha.input(&our_payment_basepoint.serialize());
774                 }
775                 let res = Sha256::from_engine(sha).into_inner();
776
777                 ((res[26] as u64) << 5*8) |
778                 ((res[27] as u64) << 4*8) |
779                 ((res[28] as u64) << 3*8) |
780                 ((res[29] as u64) << 2*8) |
781                 ((res[30] as u64) << 1*8) |
782                 ((res[31] as u64) << 0*8)
783         }
784
785         /// Transaction nomenclature is somewhat confusing here as there are many different cases - a
786         /// transaction is referred to as "a's transaction" implying that a will be able to broadcast
787         /// the transaction. Thus, b will generally be sending a signature over such a transaction to
788         /// a, and a can revoke the transaction by providing b the relevant per_commitment_secret. As
789         /// such, a transaction is generally the result of b increasing the amount paid to a (or adding
790         /// an HTLC to a).
791         /// @local is used only to convert relevant internal structures which refer to remote vs local
792         /// to decide value of outputs and direction of HTLCs.
793         /// @generated_by_local is used to determine *which* HTLCs to include - noting that the HTLC
794         /// state may indicate that one peer has informed the other that they'd like to add an HTLC but
795         /// have not yet committed it. Such HTLCs will only be included in transactions which are being
796         /// generated by the peer which proposed adding the HTLCs, and thus we need to understand both
797         /// which peer generated this transaction and "to whom" this transaction flows.
798         /// Returns (the transaction built, the number of HTLC outputs which were present in the
799         /// transaction, the list of HTLCs which were not ignored when building the transaction).
800         /// Note that below-dust HTLCs are included in the third return value, but not the second, and
801         /// sources are provided only for outbound HTLCs in the third return value.
802         #[inline]
803         fn build_commitment_transaction(&self, commitment_number: u64, keys: &TxCreationKeys, local: bool, generated_by_local: bool, feerate_per_kw: u64) -> (Transaction, usize, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>) {
804                 let obscured_commitment_transaction_number = self.get_commitment_transaction_number_obscure_factor() ^ (INITIAL_COMMITMENT_NUMBER - commitment_number);
805
806                 let txins = {
807                         let mut ins: Vec<TxIn> = Vec::new();
808                         ins.push(TxIn {
809                                 previous_output: self.channel_monitor.get_funding_txo().unwrap().into_bitcoin_outpoint(),
810                                 script_sig: Script::new(),
811                                 sequence: ((0x80 as u32) << 8*3) | ((obscured_commitment_transaction_number >> 3*8) as u32),
812                                 witness: Vec::new(),
813                         });
814                         ins
815                 };
816
817                 let mut txouts: Vec<(TxOut, Option<(HTLCOutputInCommitment, Option<&HTLCSource>)>)> = Vec::with_capacity(self.pending_inbound_htlcs.len() + self.pending_outbound_htlcs.len() + 2);
818                 let mut included_dust_htlcs: Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)> = Vec::new();
819
820                 let dust_limit_satoshis = if local { self.our_dust_limit_satoshis } else { self.their_dust_limit_satoshis };
821                 let mut remote_htlc_total_msat = 0;
822                 let mut local_htlc_total_msat = 0;
823                 let mut value_to_self_msat_offset = 0;
824
825                 log_trace!(self, "Building commitment transaction number {} (really {} xor {}) for {}, generated by {} with fee {}...", commitment_number, (INITIAL_COMMITMENT_NUMBER - commitment_number), self.get_commitment_transaction_number_obscure_factor(), if local { "us" } else { "remote" }, if generated_by_local { "us" } else { "remote" }, feerate_per_kw);
826
827                 macro_rules! get_htlc_in_commitment {
828                         ($htlc: expr, $offered: expr) => {
829                                 HTLCOutputInCommitment {
830                                         offered: $offered,
831                                         amount_msat: $htlc.amount_msat,
832                                         cltv_expiry: $htlc.cltv_expiry,
833                                         payment_hash: $htlc.payment_hash,
834                                         transaction_output_index: None
835                                 }
836                         }
837                 }
838
839                 macro_rules! add_htlc_output {
840                         ($htlc: expr, $outbound: expr, $source: expr, $state_name: expr) => {
841                                 if $outbound == local { // "offered HTLC output"
842                                         let htlc_in_tx = get_htlc_in_commitment!($htlc, true);
843                                         if $htlc.amount_msat / 1000 >= dust_limit_satoshis + (feerate_per_kw * HTLC_TIMEOUT_TX_WEIGHT / 1000) {
844                                                 log_trace!(self, "   ...including {} {} HTLC {} (hash {}) with value {}", if $outbound { "outbound" } else { "inbound" }, $state_name, $htlc.htlc_id, log_bytes!($htlc.payment_hash.0), $htlc.amount_msat);
845                                                 txouts.push((TxOut {
846                                                         script_pubkey: chan_utils::get_htlc_redeemscript(&htlc_in_tx, &keys).to_v0_p2wsh(),
847                                                         value: $htlc.amount_msat / 1000
848                                                 }, Some((htlc_in_tx, $source))));
849                                         } else {
850                                                 log_trace!(self, "   ...including {} {} dust HTLC {} (hash {}) with value {} due to dust limit", if $outbound { "outbound" } else { "inbound" }, $state_name, $htlc.htlc_id, log_bytes!($htlc.payment_hash.0), $htlc.amount_msat);
851                                                 included_dust_htlcs.push((htlc_in_tx, $source));
852                                         }
853                                 } else {
854                                         let htlc_in_tx = get_htlc_in_commitment!($htlc, false);
855                                         if $htlc.amount_msat / 1000 >= dust_limit_satoshis + (feerate_per_kw * HTLC_SUCCESS_TX_WEIGHT / 1000) {
856                                                 log_trace!(self, "   ...including {} {} HTLC {} (hash {}) with value {}", if $outbound { "outbound" } else { "inbound" }, $state_name, $htlc.htlc_id, log_bytes!($htlc.payment_hash.0), $htlc.amount_msat);
857                                                 txouts.push((TxOut { // "received HTLC output"
858                                                         script_pubkey: chan_utils::get_htlc_redeemscript(&htlc_in_tx, &keys).to_v0_p2wsh(),
859                                                         value: $htlc.amount_msat / 1000
860                                                 }, Some((htlc_in_tx, $source))));
861                                         } else {
862                                                 log_trace!(self, "   ...including {} {} dust HTLC {} (hash {}) with value {}", if $outbound { "outbound" } else { "inbound" }, $state_name, $htlc.htlc_id, log_bytes!($htlc.payment_hash.0), $htlc.amount_msat);
863                                                 included_dust_htlcs.push((htlc_in_tx, $source));
864                                         }
865                                 }
866                         }
867                 }
868
869                 for ref htlc in self.pending_inbound_htlcs.iter() {
870                         let (include, state_name) = match htlc.state {
871                                 InboundHTLCState::RemoteAnnounced(_) => (!generated_by_local, "RemoteAnnounced"),
872                                 InboundHTLCState::AwaitingRemoteRevokeToAnnounce(_) => (!generated_by_local, "AwaitingRemoteRevokeToAnnounce"),
873                                 InboundHTLCState::AwaitingAnnouncedRemoteRevoke(_) => (true, "AwaitingAnnouncedRemoteRevoke"),
874                                 InboundHTLCState::Committed => (true, "Committed"),
875                                 InboundHTLCState::LocalRemoved(_) => (!generated_by_local, "LocalRemoved"),
876                         };
877
878                         if include {
879                                 add_htlc_output!(htlc, false, None, state_name);
880                                 remote_htlc_total_msat += htlc.amount_msat;
881                         } else {
882                                 log_trace!(self, "   ...not including inbound HTLC {} (hash {}) with value {} due to state ({})", htlc.htlc_id, log_bytes!(htlc.payment_hash.0), htlc.amount_msat, state_name);
883                                 match &htlc.state {
884                                         &InboundHTLCState::LocalRemoved(ref reason) => {
885                                                 if generated_by_local {
886                                                         if let &InboundHTLCRemovalReason::Fulfill(_) = reason {
887                                                                 value_to_self_msat_offset += htlc.amount_msat as i64;
888                                                         }
889                                                 }
890                                         },
891                                         _ => {},
892                                 }
893                         }
894                 }
895
896                 for ref htlc in self.pending_outbound_htlcs.iter() {
897                         let (include, state_name) = match htlc.state {
898                                 OutboundHTLCState::LocalAnnounced(_) => (generated_by_local, "LocalAnnounced"),
899                                 OutboundHTLCState::Committed => (true, "Committed"),
900                                 OutboundHTLCState::RemoteRemoved(_) => (generated_by_local, "RemoteRemoved"),
901                                 OutboundHTLCState::AwaitingRemoteRevokeToRemove(_) => (generated_by_local, "AwaitingRemoteRevokeToRemove"),
902                                 OutboundHTLCState::AwaitingRemovedRemoteRevoke(_) => (false, "AwaitingRemovedRemoteRevoke"),
903                         };
904
905                         if include {
906                                 add_htlc_output!(htlc, true, Some(&htlc.source), state_name);
907                                 local_htlc_total_msat += htlc.amount_msat;
908                         } else {
909                                 log_trace!(self, "   ...not including outbound HTLC {} (hash {}) with value {} due to state ({})", htlc.htlc_id, log_bytes!(htlc.payment_hash.0), htlc.amount_msat, state_name);
910                                 match htlc.state {
911                                         OutboundHTLCState::AwaitingRemoteRevokeToRemove(None)|OutboundHTLCState::AwaitingRemovedRemoteRevoke(None) => {
912                                                 value_to_self_msat_offset -= htlc.amount_msat as i64;
913                                         },
914                                         OutboundHTLCState::RemoteRemoved(None) => {
915                                                 if !generated_by_local {
916                                                         value_to_self_msat_offset -= htlc.amount_msat as i64;
917                                                 }
918                                         },
919                                         _ => {},
920                                 }
921                         }
922                 }
923
924                 let value_to_self_msat: i64 = (self.value_to_self_msat - local_htlc_total_msat) as i64 + value_to_self_msat_offset;
925                 assert!(value_to_self_msat >= 0);
926                 // Note that in case they have several just-awaiting-last-RAA fulfills in-progress (ie
927                 // AwaitingRemoteRevokeToRemove or AwaitingRemovedRemoteRevoke) we may have allowed them to
928                 // "violate" their reserve value by couting those against it. Thus, we have to convert
929                 // everything to i64 before subtracting as otherwise we can overflow.
930                 let value_to_remote_msat: i64 = (self.channel_value_satoshis * 1000) as i64 - (self.value_to_self_msat as i64) - (remote_htlc_total_msat as i64) - value_to_self_msat_offset;
931                 assert!(value_to_remote_msat >= 0);
932
933                 #[cfg(debug_assertions)]
934                 {
935                         // Make sure that the to_self/to_remote is always either past the appropriate
936                         // channel_reserve *or* it is making progress towards it.
937                         let mut max_commitment_tx_output = if generated_by_local {
938                                 self.max_commitment_tx_output_local.lock().unwrap()
939                         } else {
940                                 self.max_commitment_tx_output_remote.lock().unwrap()
941                         };
942                         debug_assert!(max_commitment_tx_output.0 <= value_to_self_msat as u64 || value_to_self_msat / 1000 >= self.their_channel_reserve_satoshis as i64);
943                         max_commitment_tx_output.0 = cmp::max(max_commitment_tx_output.0, value_to_self_msat as u64);
944                         debug_assert!(max_commitment_tx_output.1 <= value_to_remote_msat as u64 || value_to_remote_msat / 1000 >= Channel::<ChanSigner>::get_our_channel_reserve_satoshis(self.channel_value_satoshis) as i64);
945                         max_commitment_tx_output.1 = cmp::max(max_commitment_tx_output.1, value_to_remote_msat as u64);
946                 }
947
948                 let total_fee: u64 = feerate_per_kw * (COMMITMENT_TX_BASE_WEIGHT + (txouts.len() as u64) * COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
949                 let (value_to_self, value_to_remote) = if self.channel_outbound {
950                         (value_to_self_msat / 1000 - total_fee as i64, value_to_remote_msat / 1000)
951                 } else {
952                         (value_to_self_msat / 1000, value_to_remote_msat / 1000 - total_fee as i64)
953                 };
954
955                 let value_to_a = if local { value_to_self } else { value_to_remote };
956                 let value_to_b = if local { value_to_remote } else { value_to_self };
957
958                 if value_to_a >= (dust_limit_satoshis as i64) {
959                         log_trace!(self, "   ...including {} output with value {}", if local { "to_local" } else { "to_remote" }, value_to_a);
960                         txouts.push((TxOut {
961                                 script_pubkey: chan_utils::get_revokeable_redeemscript(&keys.revocation_key,
962                                                                                        if local { self.their_to_self_delay } else { self.our_to_self_delay },
963                                                                                        &keys.a_delayed_payment_key).to_v0_p2wsh(),
964                                 value: value_to_a as u64
965                         }, None));
966                 }
967
968                 if value_to_b >= (dust_limit_satoshis as i64) {
969                         log_trace!(self, "   ...including {} output with value {}", if local { "to_remote" } else { "to_local" }, value_to_b);
970                         txouts.push((TxOut {
971                                 script_pubkey: Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0)
972                                                              .push_slice(&Hash160::hash(&keys.b_payment_key.serialize())[..])
973                                                              .into_script(),
974                                 value: value_to_b as u64
975                         }, None));
976                 }
977
978                 transaction_utils::sort_outputs(&mut txouts, |a, b| {
979                         if let &Some(ref a_htlc) = a {
980                                 if let &Some(ref b_htlc) = b {
981                                         a_htlc.0.cltv_expiry.cmp(&b_htlc.0.cltv_expiry)
982                                                 // Note that due to hash collisions, we have to have a fallback comparison
983                                                 // here for fuzztarget mode (otherwise at least chanmon_fail_consistency
984                                                 // may fail)!
985                                                 .then(a_htlc.0.payment_hash.0.cmp(&b_htlc.0.payment_hash.0))
986                                 // For non-HTLC outputs, if they're copying our SPK we don't really care if we
987                                 // close the channel due to mismatches - they're doing something dumb:
988                                 } else { cmp::Ordering::Equal }
989                         } else { cmp::Ordering::Equal }
990                 });
991
992                 let mut outputs: Vec<TxOut> = Vec::with_capacity(txouts.len());
993                 let mut htlcs_included: Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)> = Vec::with_capacity(txouts.len() + included_dust_htlcs.len());
994                 for (idx, mut out) in txouts.drain(..).enumerate() {
995                         outputs.push(out.0);
996                         if let Some((mut htlc, source_option)) = out.1.take() {
997                                 htlc.transaction_output_index = Some(idx as u32);
998                                 htlcs_included.push((htlc, source_option));
999                         }
1000                 }
1001                 let non_dust_htlc_count = htlcs_included.len();
1002                 htlcs_included.append(&mut included_dust_htlcs);
1003
1004                 (Transaction {
1005                         version: 2,
1006                         lock_time: ((0x20 as u32) << 8*3) | ((obscured_commitment_transaction_number & 0xffffffu64) as u32),
1007                         input: txins,
1008                         output: outputs,
1009                 }, non_dust_htlc_count, htlcs_included)
1010         }
1011
1012         #[inline]
1013         fn get_closing_scriptpubkey(&self) -> Script {
1014                 let our_channel_close_key_hash = Hash160::hash(&self.shutdown_pubkey.serialize());
1015                 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_close_key_hash[..]).into_script()
1016         }
1017
1018         #[inline]
1019         fn get_closing_transaction_weight(a_scriptpubkey: &Script, b_scriptpubkey: &Script) -> u64 {
1020                 (4 + 1 + 36 + 4 + 1 + 1 + 2*(8+1) + 4 + a_scriptpubkey.len() as u64 + b_scriptpubkey.len() as u64)*4 + 2 + 1 + 1 + 2*(1 + 72)
1021         }
1022
1023         #[inline]
1024         fn build_closing_transaction(&self, proposed_total_fee_satoshis: u64, skip_remote_output: bool) -> (Transaction, u64) {
1025                 let txins = {
1026                         let mut ins: Vec<TxIn> = Vec::new();
1027                         ins.push(TxIn {
1028                                 previous_output: self.channel_monitor.get_funding_txo().unwrap().into_bitcoin_outpoint(),
1029                                 script_sig: Script::new(),
1030                                 sequence: 0xffffffff,
1031                                 witness: Vec::new(),
1032                         });
1033                         ins
1034                 };
1035
1036                 assert!(self.pending_inbound_htlcs.is_empty());
1037                 assert!(self.pending_outbound_htlcs.is_empty());
1038                 let mut txouts: Vec<(TxOut, ())> = Vec::new();
1039
1040                 let mut total_fee_satoshis = proposed_total_fee_satoshis;
1041                 let value_to_self: i64 = (self.value_to_self_msat as i64) / 1000 - if self.channel_outbound { total_fee_satoshis as i64 } else { 0 };
1042                 let value_to_remote: i64 = ((self.channel_value_satoshis * 1000 - self.value_to_self_msat) as i64 / 1000) - if self.channel_outbound { 0 } else { total_fee_satoshis as i64 };
1043
1044                 if value_to_self < 0 {
1045                         assert!(self.channel_outbound);
1046                         total_fee_satoshis += (-value_to_self) as u64;
1047                 } else if value_to_remote < 0 {
1048                         assert!(!self.channel_outbound);
1049                         total_fee_satoshis += (-value_to_remote) as u64;
1050                 }
1051
1052                 if !skip_remote_output && value_to_remote as u64 > self.our_dust_limit_satoshis {
1053                         txouts.push((TxOut {
1054                                 script_pubkey: self.their_shutdown_scriptpubkey.clone().unwrap(),
1055                                 value: value_to_remote as u64
1056                         }, ()));
1057                 }
1058
1059                 if value_to_self as u64 > self.our_dust_limit_satoshis {
1060                         txouts.push((TxOut {
1061                                 script_pubkey: self.get_closing_scriptpubkey(),
1062                                 value: value_to_self as u64
1063                         }, ()));
1064                 }
1065
1066                 transaction_utils::sort_outputs(&mut txouts, |_, _| { cmp::Ordering::Equal }); // Ordering doesnt matter if they used our pubkey...
1067
1068                 let mut outputs: Vec<TxOut> = Vec::new();
1069                 for out in txouts.drain(..) {
1070                         outputs.push(out.0);
1071                 }
1072
1073                 (Transaction {
1074                         version: 2,
1075                         lock_time: 0,
1076                         input: txins,
1077                         output: outputs,
1078                 }, total_fee_satoshis)
1079         }
1080
1081         #[inline]
1082         /// Creates a set of keys for build_commitment_transaction to generate a transaction which our
1083         /// counterparty will sign (ie DO NOT send signatures over a transaction created by this to
1084         /// our counterparty!)
1085         /// The result is a transaction which we can revoke ownership of (ie a "local" transaction)
1086         /// TODO Some magic rust shit to compile-time check this?
1087         fn build_local_transaction_keys(&self, commitment_number: u64) -> Result<TxCreationKeys, ChannelError> {
1088                 let per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(commitment_number));
1089                 let delayed_payment_base = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.delayed_payment_base_key());
1090                 let htlc_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.htlc_base_key());
1091
1092                 Ok(secp_check!(TxCreationKeys::new(&self.secp_ctx, &per_commitment_point, &delayed_payment_base, &htlc_basepoint, &self.their_revocation_basepoint.unwrap(), &self.their_payment_basepoint.unwrap(), &self.their_htlc_basepoint.unwrap()), "Local tx keys generation got bogus keys"))
1093         }
1094
1095         #[inline]
1096         /// Creates a set of keys for build_commitment_transaction to generate a transaction which we
1097         /// will sign and send to our counterparty.
1098         /// If an Err is returned, it is a ChannelError::Close (for get_outbound_funding_created)
1099         fn build_remote_transaction_keys(&self) -> Result<TxCreationKeys, ChannelError> {
1100                 //TODO: Ensure that the payment_key derived here ends up in the library users' wallet as we
1101                 //may see payments to it!
1102                 let payment_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.payment_base_key());
1103                 let revocation_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.revocation_base_key());
1104                 let htlc_basepoint = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.htlc_base_key());
1105
1106                 Ok(secp_check!(TxCreationKeys::new(&self.secp_ctx, &self.their_cur_commitment_point.unwrap(), &self.their_delayed_payment_basepoint.unwrap(), &self.their_htlc_basepoint.unwrap(), &revocation_basepoint, &payment_basepoint, &htlc_basepoint), "Remote tx keys generation got bogus keys"))
1107         }
1108
1109         /// Gets the redeemscript for the funding transaction output (ie the funding transaction output
1110         /// pays to get_funding_redeemscript().to_v0_p2wsh()).
1111         /// Panics if called before accept_channel/new_from_req
1112         pub fn get_funding_redeemscript(&self) -> Script {
1113                 let builder = Builder::new().push_opcode(opcodes::all::OP_PUSHNUM_2);
1114                 let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()).serialize();
1115                 let their_funding_key = self.their_funding_pubkey.expect("get_funding_redeemscript only allowed after accept_channel").serialize();
1116                 if our_funding_key[..] < their_funding_key[..] {
1117                         builder.push_slice(&our_funding_key)
1118                                 .push_slice(&their_funding_key)
1119                 } else {
1120                         builder.push_slice(&their_funding_key)
1121                                 .push_slice(&our_funding_key)
1122                 }.push_opcode(opcodes::all::OP_PUSHNUM_2).push_opcode(opcodes::all::OP_CHECKMULTISIG).into_script()
1123         }
1124
1125         /// Builds the htlc-success or htlc-timeout transaction which spends a given HTLC output
1126         /// @local is used only to convert relevant internal structures which refer to remote vs local
1127         /// to decide value of outputs and direction of HTLCs.
1128         fn build_htlc_transaction(&self, prev_hash: &Sha256dHash, htlc: &HTLCOutputInCommitment, local: bool, keys: &TxCreationKeys, feerate_per_kw: u64) -> Transaction {
1129                 chan_utils::build_htlc_transaction(prev_hash, feerate_per_kw, if local { self.their_to_self_delay } else { self.our_to_self_delay }, htlc, &keys.a_delayed_payment_key, &keys.revocation_key)
1130         }
1131
1132         /// Per HTLC, only one get_update_fail_htlc or get_update_fulfill_htlc call may be made.
1133         /// In such cases we debug_assert!(false) and return an IgnoreError. Thus, will always return
1134         /// Ok(_) if debug assertions are turned on and preconditions are met.
1135         fn get_update_fulfill_htlc(&mut self, htlc_id_arg: u64, payment_preimage_arg: PaymentPreimage) -> Result<(Option<msgs::UpdateFulfillHTLC>, Option<ChannelMonitor>), ChannelError> {
1136                 // Either ChannelFunded got set (which means it won't be unset) or there is no way any
1137                 // caller thought we could have something claimed (cause we wouldn't have accepted in an
1138                 // incoming HTLC anyway). If we got to ShutdownComplete, callers aren't allowed to call us,
1139                 // either.
1140                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1141                         panic!("Was asked to fulfill an HTLC when channel was not in an operational state");
1142                 }
1143                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
1144
1145                 let payment_hash_calc = PaymentHash(Sha256::hash(&payment_preimage_arg.0[..]).into_inner());
1146
1147                 // ChannelManager may generate duplicate claims/fails due to HTLC update events from
1148                 // on-chain ChannelsMonitors during block rescan. Ideally we'd figure out a way to drop
1149                 // these, but for now we just have to treat them as normal.
1150
1151                 let mut pending_idx = std::usize::MAX;
1152                 for (idx, htlc) in self.pending_inbound_htlcs.iter().enumerate() {
1153                         if htlc.htlc_id == htlc_id_arg {
1154                                 assert_eq!(htlc.payment_hash, payment_hash_calc);
1155                                 match htlc.state {
1156                                         InboundHTLCState::Committed => {},
1157                                         InboundHTLCState::LocalRemoved(ref reason) => {
1158                                                 if let &InboundHTLCRemovalReason::Fulfill(_) = reason {
1159                                                 } else {
1160                                                         log_warn!(self, "Have preimage and want to fulfill HTLC with payment hash {} we already failed against channel {}", log_bytes!(htlc.payment_hash.0), log_bytes!(self.channel_id()));
1161                                                 }
1162                                                 return Ok((None, None));
1163                                         },
1164                                         _ => {
1165                                                 debug_assert!(false, "Have an inbound HTLC we tried to claim before it was fully committed to");
1166                                                 // Don't return in release mode here so that we can update channel_monitor
1167                                         }
1168                                 }
1169                                 pending_idx = idx;
1170                                 break;
1171                         }
1172                 }
1173                 if pending_idx == std::usize::MAX {
1174                         return Err(ChannelError::Ignore("Unable to find a pending HTLC which matched the given HTLC ID"));
1175                 }
1176
1177                 // Now update local state:
1178                 //
1179                 // We have to put the payment_preimage in the channel_monitor right away here to ensure we
1180                 // can claim it even if the channel hits the chain before we see their next commitment.
1181                 self.channel_monitor.provide_payment_preimage(&payment_hash_calc, &payment_preimage_arg);
1182
1183                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
1184                         for pending_update in self.holding_cell_htlc_updates.iter() {
1185                                 match pending_update {
1186                                         &HTLCUpdateAwaitingACK::ClaimHTLC { htlc_id, .. } => {
1187                                                 if htlc_id_arg == htlc_id {
1188                                                         return Ok((None, None));
1189                                                 }
1190                                         },
1191                                         &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, .. } => {
1192                                                 if htlc_id_arg == htlc_id {
1193                                                         log_warn!(self, "Have preimage and want to fulfill HTLC with pending failure against channel {}", log_bytes!(self.channel_id()));
1194                                                         // TODO: We may actually be able to switch to a fulfill here, though its
1195                                                         // rare enough it may not be worth the complexity burden.
1196                                                         return Ok((None, Some(self.channel_monitor.clone())));
1197                                                 }
1198                                         },
1199                                         _ => {}
1200                                 }
1201                         }
1202                         log_trace!(self, "Adding HTLC claim to holding_cell! Current state: {}", self.channel_state);
1203                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::ClaimHTLC {
1204                                 payment_preimage: payment_preimage_arg, htlc_id: htlc_id_arg,
1205                         });
1206                         return Ok((None, Some(self.channel_monitor.clone())));
1207                 }
1208
1209                 {
1210                         let htlc = &mut self.pending_inbound_htlcs[pending_idx];
1211                         if let InboundHTLCState::Committed = htlc.state {
1212                         } else {
1213                                 debug_assert!(false, "Have an inbound HTLC we tried to claim before it was fully committed to");
1214                                 return Ok((None, Some(self.channel_monitor.clone())));
1215                         }
1216                         log_trace!(self, "Upgrading HTLC {} to LocalRemoved with a Fulfill!", log_bytes!(htlc.payment_hash.0));
1217                         htlc.state = InboundHTLCState::LocalRemoved(InboundHTLCRemovalReason::Fulfill(payment_preimage_arg.clone()));
1218                 }
1219
1220                 Ok((Some(msgs::UpdateFulfillHTLC {
1221                         channel_id: self.channel_id(),
1222                         htlc_id: htlc_id_arg,
1223                         payment_preimage: payment_preimage_arg,
1224                 }), Some(self.channel_monitor.clone())))
1225         }
1226
1227         pub fn get_update_fulfill_htlc_and_commit(&mut self, htlc_id: u64, payment_preimage: PaymentPreimage) -> Result<(Option<(msgs::UpdateFulfillHTLC, msgs::CommitmentSigned)>, Option<ChannelMonitor>), ChannelError> {
1228                 match self.get_update_fulfill_htlc(htlc_id, payment_preimage)? {
1229                         (Some(update_fulfill_htlc), _) => {
1230                                 let (commitment, monitor_update) = self.send_commitment_no_status_check()?;
1231                                 Ok((Some((update_fulfill_htlc, commitment)), Some(monitor_update)))
1232                         },
1233                         (None, Some(channel_monitor)) => Ok((None, Some(channel_monitor))),
1234                         (None, None) => Ok((None, None))
1235                 }
1236         }
1237
1238         /// Per HTLC, only one get_update_fail_htlc or get_update_fulfill_htlc call may be made.
1239         /// In such cases we debug_assert!(false) and return an IgnoreError. Thus, will always return
1240         /// Ok(_) if debug assertions are turned on and preconditions are met.
1241         pub fn get_update_fail_htlc(&mut self, htlc_id_arg: u64, err_packet: msgs::OnionErrorPacket) -> Result<Option<msgs::UpdateFailHTLC>, ChannelError> {
1242                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1243                         panic!("Was asked to fail an HTLC when channel was not in an operational state");
1244                 }
1245                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
1246
1247                 // ChannelManager may generate duplicate claims/fails due to HTLC update events from
1248                 // on-chain ChannelsMonitors during block rescan. Ideally we'd figure out a way to drop
1249                 // these, but for now we just have to treat them as normal.
1250
1251                 let mut pending_idx = std::usize::MAX;
1252                 for (idx, htlc) in self.pending_inbound_htlcs.iter().enumerate() {
1253                         if htlc.htlc_id == htlc_id_arg {
1254                                 match htlc.state {
1255                                         InboundHTLCState::Committed => {},
1256                                         InboundHTLCState::LocalRemoved(_) => {
1257                                                 return Ok(None);
1258                                         },
1259                                         _ => {
1260                                                 debug_assert!(false, "Have an inbound HTLC we tried to claim before it was fully committed to");
1261                                                 return Err(ChannelError::Ignore("Unable to find a pending HTLC which matched the given HTLC ID"));
1262                                         }
1263                                 }
1264                                 pending_idx = idx;
1265                         }
1266                 }
1267                 if pending_idx == std::usize::MAX {
1268                         return Err(ChannelError::Ignore("Unable to find a pending HTLC which matched the given HTLC ID"));
1269                 }
1270
1271                 // Now update local state:
1272                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
1273                         for pending_update in self.holding_cell_htlc_updates.iter() {
1274                                 match pending_update {
1275                                         &HTLCUpdateAwaitingACK::ClaimHTLC { htlc_id, .. } => {
1276                                                 if htlc_id_arg == htlc_id {
1277                                                         return Err(ChannelError::Ignore("Unable to find a pending HTLC which matched the given HTLC ID"));
1278                                                 }
1279                                         },
1280                                         &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, .. } => {
1281                                                 if htlc_id_arg == htlc_id {
1282                                                         return Err(ChannelError::Ignore("Unable to find a pending HTLC which matched the given HTLC ID"));
1283                                                 }
1284                                         },
1285                                         _ => {}
1286                                 }
1287                         }
1288                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::FailHTLC {
1289                                 htlc_id: htlc_id_arg,
1290                                 err_packet,
1291                         });
1292                         return Ok(None);
1293                 }
1294
1295                 {
1296                         let htlc = &mut self.pending_inbound_htlcs[pending_idx];
1297                         htlc.state = InboundHTLCState::LocalRemoved(InboundHTLCRemovalReason::FailRelay(err_packet.clone()));
1298                 }
1299
1300                 Ok(Some(msgs::UpdateFailHTLC {
1301                         channel_id: self.channel_id(),
1302                         htlc_id: htlc_id_arg,
1303                         reason: err_packet
1304                 }))
1305         }
1306
1307         // Message handlers:
1308
1309         pub fn accept_channel(&mut self, msg: &msgs::AcceptChannel, config: &UserConfig, their_local_features: LocalFeatures) -> Result<(), ChannelError> {
1310                 // Check sanity of message fields:
1311                 if !self.channel_outbound {
1312                         return Err(ChannelError::Close("Got an accept_channel message from an inbound peer"));
1313                 }
1314                 if self.channel_state != ChannelState::OurInitSent as u32 {
1315                         return Err(ChannelError::Close("Got an accept_channel message at a strange time"));
1316                 }
1317                 if msg.dust_limit_satoshis > 21000000 * 100000000 {
1318                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
1319                 }
1320                 if msg.channel_reserve_satoshis > self.channel_value_satoshis {
1321                         return Err(ChannelError::Close("Bogus channel_reserve_satoshis"));
1322                 }
1323                 if msg.dust_limit_satoshis > msg.channel_reserve_satoshis {
1324                         return Err(ChannelError::Close("Bogus channel_reserve and dust_limit"));
1325                 }
1326                 if msg.channel_reserve_satoshis < self.our_dust_limit_satoshis {
1327                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
1328                 }
1329                 if msg.dust_limit_satoshis > Channel::<ChanSigner>::get_our_channel_reserve_satoshis(self.channel_value_satoshis) {
1330                         return Err(ChannelError::Close("Dust limit is bigger than our channel reverse"));
1331                 }
1332                 if msg.htlc_minimum_msat >= (self.channel_value_satoshis - msg.channel_reserve_satoshis) * 1000 {
1333                         return Err(ChannelError::Close("Minimum htlc value is full channel value"));
1334                 }
1335                 if msg.to_self_delay > config.peer_channel_config_limits.their_to_self_delay || msg.to_self_delay > MAX_LOCAL_BREAKDOWN_TIMEOUT {
1336                         return Err(ChannelError::Close("They wanted our payments to be delayed by a needlessly long period"));
1337                 }
1338                 if msg.max_accepted_htlcs < 1 {
1339                         return Err(ChannelError::Close("0 max_accepted_htlcs makes for a useless channel"));
1340                 }
1341                 if msg.max_accepted_htlcs > 483 {
1342                         return Err(ChannelError::Close("max_accepted_htlcs > 483"));
1343                 }
1344
1345                 // Now check against optional parameters as set by config...
1346                 if msg.htlc_minimum_msat > config.peer_channel_config_limits.max_htlc_minimum_msat {
1347                         return Err(ChannelError::Close("htlc minimum msat is higher than the user specified limit"));
1348                 }
1349                 if msg.max_htlc_value_in_flight_msat < config.peer_channel_config_limits.min_max_htlc_value_in_flight_msat {
1350                         return Err(ChannelError::Close("max htlc value in flight msat is less than the user specified limit"));
1351                 }
1352                 if msg.channel_reserve_satoshis > config.peer_channel_config_limits.max_channel_reserve_satoshis {
1353                         return Err(ChannelError::Close("channel reserve satoshis is higher than the user specified limit"));
1354                 }
1355                 if msg.max_accepted_htlcs < config.peer_channel_config_limits.min_max_accepted_htlcs {
1356                         return Err(ChannelError::Close("max accepted htlcs is less than the user specified limit"));
1357                 }
1358                 if msg.dust_limit_satoshis < config.peer_channel_config_limits.min_dust_limit_satoshis {
1359                         return Err(ChannelError::Close("dust limit satoshis is less than the user specified limit"));
1360                 }
1361                 if msg.dust_limit_satoshis > config.peer_channel_config_limits.max_dust_limit_satoshis {
1362                         return Err(ChannelError::Close("dust limit satoshis is greater than the user specified limit"));
1363                 }
1364                 if msg.minimum_depth > config.peer_channel_config_limits.max_minimum_depth {
1365                         return Err(ChannelError::Close("We consider the minimum depth to be unreasonably large"));
1366                 }
1367
1368                 let their_shutdown_scriptpubkey = if their_local_features.supports_upfront_shutdown_script() {
1369                         match &msg.shutdown_scriptpubkey {
1370                                 &OptionalField::Present(ref script) => {
1371                                         // Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. We enforce it while receiving shutdown msg
1372                                         if script.is_p2pkh() || script.is_p2sh() || script.is_v0_p2wsh() || script.is_v0_p2wpkh() {
1373                                                 Some(script.clone())
1374                                         // Peer is signaling upfront_shutdown and has opt-out with a 0-length script. We don't enforce anything
1375                                         } else if script.len() == 0 {
1376                                                 None
1377                                         // Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. Fail the channel
1378                                         } else {
1379                                                 return Err(ChannelError::Close("Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format"));
1380                                         }
1381                                 },
1382                                 // Peer is signaling upfront shutdown but don't opt-out with correct mechanism (a.k.a 0-length script). Peer looks buggy, we fail the channel
1383                                 &OptionalField::Absent => {
1384                                         return Err(ChannelError::Close("Peer is signaling upfront_shutdown but we don't get any script. Use 0-length script to opt-out"));
1385                                 }
1386                         }
1387                 } else { None };
1388
1389                 self.their_dust_limit_satoshis = msg.dust_limit_satoshis;
1390                 self.their_max_htlc_value_in_flight_msat = cmp::min(msg.max_htlc_value_in_flight_msat, self.channel_value_satoshis * 1000);
1391                 self.their_channel_reserve_satoshis = msg.channel_reserve_satoshis;
1392                 self.their_htlc_minimum_msat = msg.htlc_minimum_msat;
1393                 self.their_to_self_delay = msg.to_self_delay;
1394                 self.their_max_accepted_htlcs = msg.max_accepted_htlcs;
1395                 self.minimum_depth = msg.minimum_depth;
1396                 self.their_funding_pubkey = Some(msg.funding_pubkey);
1397                 self.their_revocation_basepoint = Some(msg.revocation_basepoint);
1398                 self.their_payment_basepoint = Some(msg.payment_basepoint);
1399                 self.their_delayed_payment_basepoint = Some(msg.delayed_payment_basepoint);
1400                 self.their_htlc_basepoint = Some(msg.htlc_basepoint);
1401                 self.their_cur_commitment_point = Some(msg.first_per_commitment_point);
1402                 self.their_shutdown_scriptpubkey = their_shutdown_scriptpubkey;
1403
1404                 let obscure_factor = self.get_commitment_transaction_number_obscure_factor();
1405                 let funding_redeemscript = self.get_funding_redeemscript();
1406                 self.channel_monitor.set_basic_channel_info(&msg.htlc_basepoint, &msg.delayed_payment_basepoint, msg.to_self_delay, funding_redeemscript, self.channel_value_satoshis, obscure_factor);
1407
1408                 self.channel_state = ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32;
1409
1410                 Ok(())
1411         }
1412
1413         fn funding_created_signature(&mut self, sig: &Signature) -> Result<(Transaction, LocalCommitmentTransaction, Signature, TxCreationKeys), ChannelError> {
1414                 let funding_script = self.get_funding_redeemscript();
1415
1416                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1417                 let local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, self.feerate_per_kw).0;
1418                 let local_sighash = hash_to_message!(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]);
1419
1420                 // They sign the "local" commitment transaction...
1421                 secp_check!(self.secp_ctx.verify(&local_sighash, &sig, &self.their_funding_pubkey.unwrap()), "Invalid funding_created signature from peer");
1422
1423                 let localtx = LocalCommitmentTransaction::new_missing_local_sig(local_initial_commitment_tx, sig, &PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()), self.their_funding_pubkey.as_ref().unwrap());
1424
1425                 let remote_keys = self.build_remote_transaction_keys()?;
1426                 let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw).0;
1427                 let remote_signature = self.local_keys.sign_remote_commitment(self.channel_value_satoshis, &self.get_funding_redeemscript(), self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), self.our_to_self_delay, &self.secp_ctx)
1428                                 .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed"))?.0;
1429
1430                 // We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish.
1431                 Ok((remote_initial_commitment_tx, localtx, remote_signature, local_keys))
1432         }
1433
1434         pub fn funding_created(&mut self, msg: &msgs::FundingCreated) -> Result<(msgs::FundingSigned, ChannelMonitor), ChannelError> {
1435                 if self.channel_outbound {
1436                         return Err(ChannelError::Close("Received funding_created for an outbound channel?"));
1437                 }
1438                 if self.channel_state != (ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32) {
1439                         // BOLT 2 says that if we disconnect before we send funding_signed we SHOULD NOT
1440                         // remember the channel, so it's safe to just send an error_message here and drop the
1441                         // channel.
1442                         return Err(ChannelError::Close("Received funding_created after we got the channel!"));
1443                 }
1444                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
1445                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
1446                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
1447                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
1448                 }
1449
1450                 let funding_txo = OutPoint::new(msg.funding_txid, msg.funding_output_index);
1451                 let funding_txo_script = self.get_funding_redeemscript().to_v0_p2wsh();
1452                 self.channel_monitor.set_funding_info((funding_txo, funding_txo_script));
1453
1454                 let (remote_initial_commitment_tx, local_initial_commitment_tx, our_signature, local_keys) = match self.funding_created_signature(&msg.signature) {
1455                         Ok(res) => res,
1456                         Err(e) => {
1457                                 self.channel_monitor.unset_funding_info();
1458                                 return Err(e);
1459                         }
1460                 };
1461
1462                 // Now that we're past error-generating stuff, update our local state:
1463
1464                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_initial_commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number, self.their_cur_commitment_point.unwrap());
1465                 self.channel_monitor.provide_latest_local_commitment_tx_info(local_initial_commitment_tx, local_keys, self.feerate_per_kw, Vec::new());
1466                 self.channel_state = ChannelState::FundingSent as u32;
1467                 self.channel_id = funding_txo.to_channel_id();
1468                 self.cur_remote_commitment_transaction_number -= 1;
1469                 self.cur_local_commitment_transaction_number -= 1;
1470
1471                 Ok((msgs::FundingSigned {
1472                         channel_id: self.channel_id,
1473                         signature: our_signature
1474                 }, self.channel_monitor.clone()))
1475         }
1476
1477         /// Handles a funding_signed message from the remote end.
1478         /// If this call is successful, broadcast the funding transaction (and not before!)
1479         pub fn funding_signed(&mut self, msg: &msgs::FundingSigned) -> Result<ChannelMonitor, ChannelError> {
1480                 if !self.channel_outbound {
1481                         return Err(ChannelError::Close("Received funding_signed for an inbound channel?"));
1482                 }
1483                 if self.channel_state & !(ChannelState::MonitorUpdateFailed as u32) != ChannelState::FundingCreated as u32 {
1484                         return Err(ChannelError::Close("Received funding_signed in strange state!"));
1485                 }
1486                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
1487                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER - 1 ||
1488                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
1489                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
1490                 }
1491
1492                 let funding_script = self.get_funding_redeemscript();
1493
1494                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1495                 let local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, self.feerate_per_kw).0;
1496                 let local_sighash = hash_to_message!(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]);
1497
1498                 // They sign the "local" commitment transaction, allowing us to broadcast the tx if we wish.
1499                 secp_check!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid funding_signed signature from peer");
1500
1501                 self.channel_monitor.provide_latest_local_commitment_tx_info(
1502                         LocalCommitmentTransaction::new_missing_local_sig(local_initial_commitment_tx, &msg.signature, &PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()), self.their_funding_pubkey.as_ref().unwrap()),
1503                         local_keys, self.feerate_per_kw, Vec::new());
1504                 self.channel_state = ChannelState::FundingSent as u32 | (self.channel_state & (ChannelState::MonitorUpdateFailed as u32));
1505                 self.cur_local_commitment_transaction_number -= 1;
1506
1507                 if self.channel_state & (ChannelState::MonitorUpdateFailed as u32) == 0 {
1508                         Ok(self.channel_monitor.clone())
1509                 } else {
1510                         Err(ChannelError::Ignore("Previous monitor update failure prevented funding_signed from allowing funding broadcast"))
1511                 }
1512         }
1513
1514         pub fn funding_locked(&mut self, msg: &msgs::FundingLocked) -> Result<(), ChannelError> {
1515                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1516                         return Err(ChannelError::Close("Peer sent funding_locked when we needed a channel_reestablish"));
1517                 }
1518
1519                 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
1520
1521                 if non_shutdown_state == ChannelState::FundingSent as u32 {
1522                         self.channel_state |= ChannelState::TheirFundingLocked as u32;
1523                 } else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
1524                         self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & MULTI_STATE_FLAGS);
1525                         self.channel_update_count += 1;
1526                 } else if (self.channel_state & (ChannelState::ChannelFunded as u32) != 0 &&
1527                                  // Note that funding_signed/funding_created will have decremented both by 1!
1528                                  self.cur_local_commitment_transaction_number == INITIAL_COMMITMENT_NUMBER - 1 &&
1529                                  self.cur_remote_commitment_transaction_number == INITIAL_COMMITMENT_NUMBER - 1) ||
1530                                 // If we reconnected before sending our funding locked they may still resend theirs:
1531                                 (self.channel_state & (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32) ==
1532                                                       (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32)) {
1533                         if self.their_cur_commitment_point != Some(msg.next_per_commitment_point) {
1534                                 return Err(ChannelError::Close("Peer sent a reconnect funding_locked with a different point"));
1535                         }
1536                         // They probably disconnected/reconnected and re-sent the funding_locked, which is required
1537                         return Ok(());
1538                 } else {
1539                         return Err(ChannelError::Close("Peer sent a funding_locked at a strange time"));
1540                 }
1541
1542                 self.their_prev_commitment_point = self.their_cur_commitment_point;
1543                 self.their_cur_commitment_point = Some(msg.next_per_commitment_point);
1544                 Ok(())
1545         }
1546
1547         /// Returns (inbound_htlc_count, htlc_inbound_value_msat)
1548         fn get_inbound_pending_htlc_stats(&self) -> (u32, u64) {
1549                 let mut htlc_inbound_value_msat = 0;
1550                 for ref htlc in self.pending_inbound_htlcs.iter() {
1551                         htlc_inbound_value_msat += htlc.amount_msat;
1552                 }
1553                 (self.pending_inbound_htlcs.len() as u32, htlc_inbound_value_msat)
1554         }
1555
1556         /// Returns (outbound_htlc_count, htlc_outbound_value_msat) *including* pending adds in our
1557         /// holding cell.
1558         fn get_outbound_pending_htlc_stats(&self) -> (u32, u64) {
1559                 let mut htlc_outbound_value_msat = 0;
1560                 for ref htlc in self.pending_outbound_htlcs.iter() {
1561                         htlc_outbound_value_msat += htlc.amount_msat;
1562                 }
1563
1564                 let mut htlc_outbound_count = self.pending_outbound_htlcs.len();
1565                 for update in self.holding_cell_htlc_updates.iter() {
1566                         if let &HTLCUpdateAwaitingACK::AddHTLC { ref amount_msat, .. } = update {
1567                                 htlc_outbound_count += 1;
1568                                 htlc_outbound_value_msat += amount_msat;
1569                         }
1570                 }
1571
1572                 (htlc_outbound_count as u32, htlc_outbound_value_msat)
1573         }
1574
1575         /// Get the available (ie not including pending HTLCs) inbound and outbound balance in msat.
1576         /// Doesn't bother handling the
1577         /// if-we-removed-it-already-but-haven't-fully-resolved-they-can-still-send-an-inbound-HTLC
1578         /// corner case properly.
1579         pub fn get_inbound_outbound_available_balance_msat(&self) -> (u64, u64) {
1580                 // Note that we have to handle overflow due to the above case.
1581                 (cmp::min(self.channel_value_satoshis as i64 * 1000 - self.value_to_self_msat as i64 - self.get_inbound_pending_htlc_stats().1 as i64, 0) as u64,
1582                 cmp::min(self.value_to_self_msat as i64 - self.get_outbound_pending_htlc_stats().1 as i64, 0) as u64)
1583         }
1584
1585         pub fn update_add_htlc(&mut self, msg: &msgs::UpdateAddHTLC, pending_forward_state: PendingHTLCStatus) -> Result<(), ChannelError> {
1586                 if (self.channel_state & (ChannelState::ChannelFunded as u32 | ChannelState::RemoteShutdownSent as u32)) != (ChannelState::ChannelFunded as u32) {
1587                         return Err(ChannelError::Close("Got add HTLC message when channel was not in an operational state"));
1588                 }
1589                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1590                         return Err(ChannelError::Close("Peer sent update_add_htlc when we needed a channel_reestablish"));
1591                 }
1592                 if msg.amount_msat > self.channel_value_satoshis * 1000 {
1593                         return Err(ChannelError::Close("Remote side tried to send more than the total value of the channel"));
1594                 }
1595                 if msg.amount_msat < self.our_htlc_minimum_msat {
1596                         return Err(ChannelError::Close("Remote side tried to send less than our minimum HTLC value"));
1597                 }
1598
1599                 let (inbound_htlc_count, htlc_inbound_value_msat) = self.get_inbound_pending_htlc_stats();
1600                 if inbound_htlc_count + 1 > OUR_MAX_HTLCS as u32 {
1601                         return Err(ChannelError::Close("Remote tried to push more than our max accepted HTLCs"));
1602                 }
1603                 // Check our_max_htlc_value_in_flight_msat
1604                 if htlc_inbound_value_msat + msg.amount_msat > Channel::<ChanSigner>::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis) {
1605                         return Err(ChannelError::Close("Remote HTLC add would put them over our max HTLC value"));
1606                 }
1607                 // Check our_channel_reserve_satoshis (we're getting paid, so they have to at least meet
1608                 // the reserve_satoshis we told them to always have as direct payment so that they lose
1609                 // something if we punish them for broadcasting an old state).
1610                 // Note that we don't really care about having a small/no to_remote output in our local
1611                 // commitment transactions, as the purpose of the channel reserve is to ensure we can
1612                 // punish *them* if they misbehave, so we discount any outbound HTLCs which will not be
1613                 // present in the next commitment transaction we send them (at least for fulfilled ones,
1614                 // failed ones won't modify value_to_self).
1615                 // Note that we will send HTLCs which another instance of rust-lightning would think
1616                 // violate the reserve value if we do not do this (as we forget inbound HTLCs from the
1617                 // Channel state once they will not be present in the next received commitment
1618                 // transaction).
1619                 let mut removed_outbound_total_msat = 0;
1620                 for ref htlc in self.pending_outbound_htlcs.iter() {
1621                         if let OutboundHTLCState::AwaitingRemoteRevokeToRemove(None) = htlc.state {
1622                                 removed_outbound_total_msat += htlc.amount_msat;
1623                         } else if let OutboundHTLCState::AwaitingRemovedRemoteRevoke(None) = htlc.state {
1624                                 removed_outbound_total_msat += htlc.amount_msat;
1625                         }
1626                 }
1627                 if htlc_inbound_value_msat + msg.amount_msat + self.value_to_self_msat > (self.channel_value_satoshis - Channel::<ChanSigner>::get_our_channel_reserve_satoshis(self.channel_value_satoshis)) * 1000 + removed_outbound_total_msat {
1628                         return Err(ChannelError::Close("Remote HTLC add would put them over their reserve value"));
1629                 }
1630                 if self.next_remote_htlc_id != msg.htlc_id {
1631                         return Err(ChannelError::Close("Remote skipped HTLC ID"));
1632                 }
1633                 if msg.cltv_expiry >= 500000000 {
1634                         return Err(ChannelError::Close("Remote provided CLTV expiry in seconds instead of block height"));
1635                 }
1636
1637                 //TODO: Check msg.cltv_expiry further? Do this in channel manager?
1638
1639                 if self.channel_state & ChannelState::LocalShutdownSent as u32 != 0 {
1640                         if let PendingHTLCStatus::Forward(_) = pending_forward_state {
1641                                 panic!("ChannelManager shouldn't be trying to add a forwardable HTLC after we've started closing");
1642                         }
1643                 }
1644
1645                 // Now update local state:
1646                 self.next_remote_htlc_id += 1;
1647                 self.pending_inbound_htlcs.push(InboundHTLCOutput {
1648                         htlc_id: msg.htlc_id,
1649                         amount_msat: msg.amount_msat,
1650                         payment_hash: msg.payment_hash,
1651                         cltv_expiry: msg.cltv_expiry,
1652                         state: InboundHTLCState::RemoteAnnounced(pending_forward_state),
1653                 });
1654                 Ok(())
1655         }
1656
1657         /// Marks an outbound HTLC which we have received update_fail/fulfill/malformed
1658         #[inline]
1659         fn mark_outbound_htlc_removed(&mut self, htlc_id: u64, check_preimage: Option<PaymentHash>, fail_reason: Option<HTLCFailReason>) -> Result<&HTLCSource, ChannelError> {
1660                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1661                         if htlc.htlc_id == htlc_id {
1662                                 match check_preimage {
1663                                         None => {},
1664                                         Some(payment_hash) =>
1665                                                 if payment_hash != htlc.payment_hash {
1666                                                         return Err(ChannelError::Close("Remote tried to fulfill HTLC with an incorrect preimage"));
1667                                                 }
1668                                 };
1669                                 match htlc.state {
1670                                         OutboundHTLCState::LocalAnnounced(_) =>
1671                                                 return Err(ChannelError::Close("Remote tried to fulfill/fail HTLC before it had been committed")),
1672                                         OutboundHTLCState::Committed => {
1673                                                 htlc.state = OutboundHTLCState::RemoteRemoved(fail_reason);
1674                                         },
1675                                         OutboundHTLCState::AwaitingRemoteRevokeToRemove(_) | OutboundHTLCState::AwaitingRemovedRemoteRevoke(_) | OutboundHTLCState::RemoteRemoved(_) =>
1676                                                 return Err(ChannelError::Close("Remote tried to fulfill/fail HTLC that they'd already fulfilled/failed")),
1677                                 }
1678                                 return Ok(&htlc.source);
1679                         }
1680                 }
1681                 Err(ChannelError::Close("Remote tried to fulfill/fail an HTLC we couldn't find"))
1682         }
1683
1684         pub fn update_fulfill_htlc(&mut self, msg: &msgs::UpdateFulfillHTLC) -> Result<HTLCSource, ChannelError> {
1685                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1686                         return Err(ChannelError::Close("Got fulfill HTLC message when channel was not in an operational state"));
1687                 }
1688                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1689                         return Err(ChannelError::Close("Peer sent update_fulfill_htlc when we needed a channel_reestablish"));
1690                 }
1691
1692                 let payment_hash = PaymentHash(Sha256::hash(&msg.payment_preimage.0[..]).into_inner());
1693                 self.mark_outbound_htlc_removed(msg.htlc_id, Some(payment_hash), None).map(|source| source.clone())
1694         }
1695
1696         pub fn update_fail_htlc(&mut self, msg: &msgs::UpdateFailHTLC, fail_reason: HTLCFailReason) -> Result<(), ChannelError> {
1697                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1698                         return Err(ChannelError::Close("Got fail HTLC message when channel was not in an operational state"));
1699                 }
1700                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1701                         return Err(ChannelError::Close("Peer sent update_fail_htlc when we needed a channel_reestablish"));
1702                 }
1703
1704                 self.mark_outbound_htlc_removed(msg.htlc_id, None, Some(fail_reason))?;
1705                 Ok(())
1706         }
1707
1708         pub fn update_fail_malformed_htlc<'a>(&mut self, msg: &msgs::UpdateFailMalformedHTLC, fail_reason: HTLCFailReason) -> Result<(), ChannelError> {
1709                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1710                         return Err(ChannelError::Close("Got fail malformed HTLC message when channel was not in an operational state"));
1711                 }
1712                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1713                         return Err(ChannelError::Close("Peer sent update_fail_malformed_htlc when we needed a channel_reestablish"));
1714                 }
1715
1716                 self.mark_outbound_htlc_removed(msg.htlc_id, None, Some(fail_reason))?;
1717                 Ok(())
1718         }
1719
1720         pub fn commitment_signed(&mut self, msg: &msgs::CommitmentSigned, fee_estimator: &FeeEstimator) -> Result<(msgs::RevokeAndACK, Option<msgs::CommitmentSigned>, Option<msgs::ClosingSigned>, ChannelMonitor), ChannelError> {
1721                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1722                         return Err(ChannelError::Close("Got commitment signed message when channel was not in an operational state"));
1723                 }
1724                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1725                         return Err(ChannelError::Close("Peer sent commitment_signed when we needed a channel_reestablish"));
1726                 }
1727                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK == BOTH_SIDES_SHUTDOWN_MASK && self.last_sent_closing_fee.is_some() {
1728                         return Err(ChannelError::Close("Peer sent commitment_signed after we'd started exchanging closing_signeds"));
1729                 }
1730
1731                 let funding_script = self.get_funding_redeemscript();
1732
1733                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1734
1735                 let mut update_fee = false;
1736                 let feerate_per_kw = if !self.channel_outbound && self.pending_update_fee.is_some() {
1737                         update_fee = true;
1738                         self.pending_update_fee.unwrap()
1739                 } else {
1740                         self.feerate_per_kw
1741                 };
1742
1743                 let mut local_commitment_tx = {
1744                         let mut commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, feerate_per_kw);
1745                         let htlcs_cloned: Vec<_> = commitment_tx.2.drain(..).map(|htlc| (htlc.0, htlc.1.map(|h| h.clone()))).collect();
1746                         (commitment_tx.0, commitment_tx.1, htlcs_cloned)
1747                 };
1748                 let local_commitment_txid = local_commitment_tx.0.txid();
1749                 let local_sighash = hash_to_message!(&bip143::SighashComponents::new(&local_commitment_tx.0).sighash_all(&local_commitment_tx.0.input[0], &funding_script, self.channel_value_satoshis)[..]);
1750                 log_trace!(self, "Checking commitment tx signature {} by key {} against tx {} with redeemscript {}", log_bytes!(msg.signature.serialize_compact()[..]), log_bytes!(self.their_funding_pubkey.unwrap().serialize()), encode::serialize_hex(&local_commitment_tx.0), encode::serialize_hex(&funding_script));
1751                 secp_check!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid commitment tx signature from peer");
1752
1753                 //If channel fee was updated by funder confirm funder can afford the new fee rate when applied to the current local commitment transaction
1754                 if update_fee {
1755                         let num_htlcs = local_commitment_tx.1;
1756                         let total_fee: u64 = feerate_per_kw as u64 * (COMMITMENT_TX_BASE_WEIGHT + (num_htlcs as u64) * COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
1757
1758                         if self.channel_value_satoshis - self.value_to_self_msat / 1000 < total_fee + self.their_channel_reserve_satoshis {
1759                                 return Err(ChannelError::Close("Funding remote cannot afford proposed new fee"));
1760                         }
1761                 }
1762
1763                 if msg.htlc_signatures.len() != local_commitment_tx.1 {
1764                         return Err(ChannelError::Close("Got wrong number of HTLC signatures from remote"));
1765                 }
1766
1767                 let mut htlcs_and_sigs = Vec::with_capacity(local_commitment_tx.2.len());
1768                 for (idx, (htlc, source)) in local_commitment_tx.2.drain(..).enumerate() {
1769                         if let Some(_) = htlc.transaction_output_index {
1770                                 let htlc_tx = self.build_htlc_transaction(&local_commitment_txid, &htlc, true, &local_keys, feerate_per_kw);
1771                                 let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &local_keys);
1772                                 log_trace!(self, "Checking HTLC tx signature {} by key {} against tx {} with redeemscript {}", log_bytes!(msg.htlc_signatures[idx].serialize_compact()[..]), log_bytes!(local_keys.b_htlc_key.serialize()), encode::serialize_hex(&htlc_tx), encode::serialize_hex(&htlc_redeemscript));
1773                                 let htlc_sighash = hash_to_message!(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]);
1774                                 secp_check!(self.secp_ctx.verify(&htlc_sighash, &msg.htlc_signatures[idx], &local_keys.b_htlc_key), "Invalid HTLC tx signature from peer");
1775                                 htlcs_and_sigs.push((htlc, Some(msg.htlc_signatures[idx]), source));
1776                         } else {
1777                                 htlcs_and_sigs.push((htlc, None, source));
1778                         }
1779                 }
1780
1781                 let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number - 1));
1782                 let per_commitment_secret = chan_utils::build_commitment_secret(self.local_keys.commitment_seed(), self.cur_local_commitment_transaction_number + 1);
1783
1784                 // Update state now that we've passed all the can-fail calls...
1785                 let mut need_our_commitment = false;
1786                 if !self.channel_outbound {
1787                         if let Some(fee_update) = self.pending_update_fee {
1788                                 self.feerate_per_kw = fee_update;
1789                                 // We later use the presence of pending_update_fee to indicate we should generate a
1790                                 // commitment_signed upon receipt of revoke_and_ack, so we can only set it to None
1791                                 // if we're not awaiting a revoke (ie will send a commitment_signed now).
1792                                 if (self.channel_state & ChannelState::AwaitingRemoteRevoke as u32) == 0 {
1793                                         need_our_commitment = true;
1794                                         self.pending_update_fee = None;
1795                                 }
1796                         }
1797                 }
1798
1799
1800                 self.channel_monitor.provide_latest_local_commitment_tx_info(
1801                         LocalCommitmentTransaction::new_missing_local_sig(local_commitment_tx.0, &msg.signature, &PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()), self.their_funding_pubkey.as_ref().unwrap()),
1802                         local_keys, self.feerate_per_kw, htlcs_and_sigs);
1803
1804                 for htlc in self.pending_inbound_htlcs.iter_mut() {
1805                         let new_forward = if let &InboundHTLCState::RemoteAnnounced(ref forward_info) = &htlc.state {
1806                                 Some(forward_info.clone())
1807                         } else { None };
1808                         if let Some(forward_info) = new_forward {
1809                                 htlc.state = InboundHTLCState::AwaitingRemoteRevokeToAnnounce(forward_info);
1810                                 need_our_commitment = true;
1811                         }
1812                 }
1813                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1814                         if let Some(fail_reason) = if let &mut OutboundHTLCState::RemoteRemoved(ref mut fail_reason) = &mut htlc.state {
1815                                 Some(fail_reason.take())
1816                         } else { None } {
1817                                 htlc.state = OutboundHTLCState::AwaitingRemoteRevokeToRemove(fail_reason);
1818                                 need_our_commitment = true;
1819                         }
1820                 }
1821
1822                 self.cur_local_commitment_transaction_number -= 1;
1823                 // Note that if we need_our_commitment & !AwaitingRemoteRevoke we'll call
1824                 // send_commitment_no_status_check() next which will reset this to RAAFirst.
1825                 self.resend_order = RAACommitmentOrder::CommitmentFirst;
1826
1827                 if (self.channel_state & ChannelState::MonitorUpdateFailed as u32) != 0 {
1828                         // In case we initially failed monitor updating without requiring a response, we need
1829                         // to make sure the RAA gets sent first.
1830                         self.monitor_pending_revoke_and_ack = true;
1831                         if need_our_commitment && (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == 0 {
1832                                 // If we were going to send a commitment_signed after the RAA, go ahead and do all
1833                                 // the corresponding HTLC status updates so that get_last_commitment_update
1834                                 // includes the right HTLCs.
1835                                 // Note that this generates a monitor update that we ignore! This is OK since we
1836                                 // won't actually send the commitment_signed that generated the update to the other
1837                                 // side until the latest monitor has been pulled from us and stored.
1838                                 self.monitor_pending_commitment_signed = true;
1839                                 self.send_commitment_no_status_check()?;
1840                         }
1841                         // TODO: Call maybe_propose_first_closing_signed on restoration (or call it here and
1842                         // re-send the message on restoration)
1843                         return Err(ChannelError::Ignore("Previous monitor update failure prevented generation of RAA"));
1844                 }
1845
1846                 let (our_commitment_signed, monitor_update, closing_signed) = if need_our_commitment && (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == 0 {
1847                         // If we're AwaitingRemoteRevoke we can't send a new commitment here, but that's ok -
1848                         // we'll send one right away when we get the revoke_and_ack when we
1849                         // free_holding_cell_htlcs().
1850                         let (msg, monitor) = self.send_commitment_no_status_check()?;
1851                         (Some(msg), monitor, None)
1852                 } else if !need_our_commitment {
1853                         (None, self.channel_monitor.clone(), self.maybe_propose_first_closing_signed(fee_estimator))
1854                 } else { (None, self.channel_monitor.clone(), None) };
1855
1856                 Ok((msgs::RevokeAndACK {
1857                         channel_id: self.channel_id,
1858                         per_commitment_secret: per_commitment_secret,
1859                         next_per_commitment_point: next_per_commitment_point,
1860                 }, our_commitment_signed, closing_signed, monitor_update))
1861         }
1862
1863         /// Used to fulfill holding_cell_htlcs when we get a remote ack (or implicitly get it by them
1864         /// fulfilling or failing the last pending HTLC)
1865         fn free_holding_cell_htlcs(&mut self) -> Result<Option<(msgs::CommitmentUpdate, ChannelMonitor)>, ChannelError> {
1866                 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, 0);
1867                 if self.holding_cell_htlc_updates.len() != 0 || self.holding_cell_update_fee.is_some() {
1868                         log_trace!(self, "Freeing holding cell with {} HTLC updates{}", self.holding_cell_htlc_updates.len(), if self.holding_cell_update_fee.is_some() { " and a fee update" } else { "" });
1869
1870                         let mut htlc_updates = Vec::new();
1871                         mem::swap(&mut htlc_updates, &mut self.holding_cell_htlc_updates);
1872                         let mut update_add_htlcs = Vec::with_capacity(htlc_updates.len());
1873                         let mut update_fulfill_htlcs = Vec::with_capacity(htlc_updates.len());
1874                         let mut update_fail_htlcs = Vec::with_capacity(htlc_updates.len());
1875                         let mut err = None;
1876                         for htlc_update in htlc_updates.drain(..) {
1877                                 // Note that this *can* fail, though it should be due to rather-rare conditions on
1878                                 // fee races with adding too many outputs which push our total payments just over
1879                                 // the limit. In case it's less rare than I anticipate, we may want to revisit
1880                                 // handling this case better and maybe fulfilling some of the HTLCs while attempting
1881                                 // to rebalance channels.
1882                                 if err.is_some() { // We're back to AwaitingRemoteRevoke (or are about to fail the channel)
1883                                         self.holding_cell_htlc_updates.push(htlc_update);
1884                                 } else {
1885                                         match &htlc_update {
1886                                                 &HTLCUpdateAwaitingACK::AddHTLC {amount_msat, cltv_expiry, ref payment_hash, ref source, ref onion_routing_packet, ..} => {
1887                                                         match self.send_htlc(amount_msat, *payment_hash, cltv_expiry, source.clone(), onion_routing_packet.clone()) {
1888                                                                 Ok(update_add_msg_option) => update_add_htlcs.push(update_add_msg_option.unwrap()),
1889                                                                 Err(e) => {
1890                                                                         match e {
1891                                                                                 ChannelError::Ignore(ref msg) => {
1892                                                                                         log_info!(self, "Failed to send HTLC with payment_hash {} due to {}", log_bytes!(payment_hash.0), msg);
1893                                                                                 },
1894                                                                                 _ => {
1895                                                                                         log_info!(self, "Failed to send HTLC with payment_hash {} resulting in a channel closure during holding_cell freeing", log_bytes!(payment_hash.0));
1896                                                                                 },
1897                                                                         }
1898                                                                         err = Some(e);
1899                                                                 }
1900                                                         }
1901                                                 },
1902                                                 &HTLCUpdateAwaitingACK::ClaimHTLC { ref payment_preimage, htlc_id, .. } => {
1903                                                         match self.get_update_fulfill_htlc(htlc_id, *payment_preimage) {
1904                                                                 Ok(update_fulfill_msg_option) => update_fulfill_htlcs.push(update_fulfill_msg_option.0.unwrap()),
1905                                                                 Err(e) => {
1906                                                                         if let ChannelError::Ignore(_) = e {}
1907                                                                         else {
1908                                                                                 panic!("Got a non-IgnoreError action trying to fulfill holding cell HTLC");
1909                                                                         }
1910                                                                 }
1911                                                         }
1912                                                 },
1913                                                 &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, ref err_packet } => {
1914                                                         match self.get_update_fail_htlc(htlc_id, err_packet.clone()) {
1915                                                                 Ok(update_fail_msg_option) => update_fail_htlcs.push(update_fail_msg_option.unwrap()),
1916                                                                 Err(e) => {
1917                                                                         if let ChannelError::Ignore(_) = e {}
1918                                                                         else {
1919                                                                                 panic!("Got a non-IgnoreError action trying to fail holding cell HTLC");
1920                                                                         }
1921                                                                 }
1922                                                         }
1923                                                 },
1924                                         }
1925                                         if err.is_some() {
1926                                                 self.holding_cell_htlc_updates.push(htlc_update);
1927                                                 if let Some(ChannelError::Ignore(_)) = err {
1928                                                         // If we failed to add the HTLC, but got an Ignore error, we should
1929                                                         // still send the new commitment_signed, so reset the err to None.
1930                                                         err = None;
1931                                                 }
1932                                         }
1933                                 }
1934                         }
1935                         //TODO: Need to examine the type of err - if it's a fee issue or similar we may want to
1936                         //fail it back the route, if it's a temporary issue we can ignore it...
1937                         match err {
1938                                 None => {
1939                                         if update_add_htlcs.is_empty() && update_fulfill_htlcs.is_empty() && update_fail_htlcs.is_empty() && self.holding_cell_update_fee.is_none() {
1940                                                 // This should never actually happen and indicates we got some Errs back
1941                                                 // from update_fulfill_htlc/update_fail_htlc, but we handle it anyway in
1942                                                 // case there is some strange way to hit duplicate HTLC removes.
1943                                                 return Ok(None);
1944                                         }
1945                                         let update_fee = if let Some(feerate) = self.holding_cell_update_fee {
1946                                                         self.pending_update_fee = self.holding_cell_update_fee.take();
1947                                                         Some(msgs::UpdateFee {
1948                                                                 channel_id: self.channel_id,
1949                                                                 feerate_per_kw: feerate as u32,
1950                                                         })
1951                                                 } else {
1952                                                         None
1953                                                 };
1954                                         let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
1955                                         Ok(Some((msgs::CommitmentUpdate {
1956                                                 update_add_htlcs,
1957                                                 update_fulfill_htlcs,
1958                                                 update_fail_htlcs,
1959                                                 update_fail_malformed_htlcs: Vec::new(),
1960                                                 update_fee: update_fee,
1961                                                 commitment_signed,
1962                                         }, monitor_update)))
1963                                 },
1964                                 Some(e) => Err(e)
1965                         }
1966                 } else {
1967                         Ok(None)
1968                 }
1969         }
1970
1971         /// Handles receiving a remote's revoke_and_ack. Note that we may return a new
1972         /// commitment_signed message here in case we had pending outbound HTLCs to add which were
1973         /// waiting on this revoke_and_ack. The generation of this new commitment_signed may also fail,
1974         /// generating an appropriate error *after* the channel state has been updated based on the
1975         /// revoke_and_ack message.
1976         pub fn revoke_and_ack(&mut self, msg: &msgs::RevokeAndACK, fee_estimator: &FeeEstimator) -> Result<(Option<msgs::CommitmentUpdate>, Vec<(PendingForwardHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, Option<msgs::ClosingSigned>, ChannelMonitor), ChannelError> {
1977                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1978                         return Err(ChannelError::Close("Got revoke/ACK message when channel was not in an operational state"));
1979                 }
1980                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1981                         return Err(ChannelError::Close("Peer sent revoke_and_ack when we needed a channel_reestablish"));
1982                 }
1983                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK == BOTH_SIDES_SHUTDOWN_MASK && self.last_sent_closing_fee.is_some() {
1984                         return Err(ChannelError::Close("Peer sent revoke_and_ack after we'd started exchanging closing_signeds"));
1985                 }
1986
1987                 if let Some(their_prev_commitment_point) = self.their_prev_commitment_point {
1988                         if PublicKey::from_secret_key(&self.secp_ctx, &secp_check!(SecretKey::from_slice(&msg.per_commitment_secret), "Peer provided an invalid per_commitment_secret")) != their_prev_commitment_point {
1989                                 return Err(ChannelError::Close("Got a revoke commitment secret which didn't correspond to their current pubkey"));
1990                         }
1991                 }
1992                 self.channel_monitor.provide_secret(self.cur_remote_commitment_transaction_number + 1, msg.per_commitment_secret)
1993                         .map_err(|e| ChannelError::Close(e.0))?;
1994
1995                 // Update state now that we've passed all the can-fail calls...
1996                 // (note that we may still fail to generate the new commitment_signed message, but that's
1997                 // OK, we step the channel here and *then* if the new generation fails we can fail the
1998                 // channel based on that, but stepping stuff here should be safe either way.
1999                 self.channel_state &= !(ChannelState::AwaitingRemoteRevoke as u32);
2000                 self.their_prev_commitment_point = self.their_cur_commitment_point;
2001                 self.their_cur_commitment_point = Some(msg.next_per_commitment_point);
2002                 self.cur_remote_commitment_transaction_number -= 1;
2003
2004                 log_trace!(self, "Updating HTLCs on receipt of RAA...");
2005                 let mut to_forward_infos = Vec::new();
2006                 let mut revoked_htlcs = Vec::new();
2007                 let mut update_fail_htlcs = Vec::new();
2008                 let mut update_fail_malformed_htlcs = Vec::new();
2009                 let mut require_commitment = false;
2010                 let mut value_to_self_msat_diff: i64 = 0;
2011
2012                 {
2013                         // Take references explicitly so that we can hold multiple references to self.
2014                         let pending_inbound_htlcs: &mut Vec<_> = &mut self.pending_inbound_htlcs;
2015                         let pending_outbound_htlcs: &mut Vec<_> = &mut self.pending_outbound_htlcs;
2016                         let logger = LogHolder { logger: &self.logger };
2017
2018                         // We really shouldnt have two passes here, but retain gives a non-mutable ref (Rust bug)
2019                         pending_inbound_htlcs.retain(|htlc| {
2020                                 if let &InboundHTLCState::LocalRemoved(ref reason) = &htlc.state {
2021                                         log_trace!(logger, " ...removing inbound LocalRemoved {}", log_bytes!(htlc.payment_hash.0));
2022                                         if let &InboundHTLCRemovalReason::Fulfill(_) = reason {
2023                                                 value_to_self_msat_diff += htlc.amount_msat as i64;
2024                                         }
2025                                         false
2026                                 } else { true }
2027                         });
2028                         pending_outbound_htlcs.retain(|htlc| {
2029                                 if let &OutboundHTLCState::AwaitingRemovedRemoteRevoke(ref fail_reason) = &htlc.state {
2030                                         log_trace!(logger, " ...removing outbound AwaitingRemovedRemoteRevoke {}", log_bytes!(htlc.payment_hash.0));
2031                                         if let Some(reason) = fail_reason.clone() { // We really want take() here, but, again, non-mut ref :(
2032                                                 revoked_htlcs.push((htlc.source.clone(), htlc.payment_hash, reason));
2033                                         } else {
2034                                                 // They fulfilled, so we sent them money
2035                                                 value_to_self_msat_diff -= htlc.amount_msat as i64;
2036                                         }
2037                                         false
2038                                 } else { true }
2039                         });
2040                         for htlc in pending_inbound_htlcs.iter_mut() {
2041                                 let swap = if let &InboundHTLCState::AwaitingRemoteRevokeToAnnounce(_) = &htlc.state {
2042                                         log_trace!(logger, " ...promoting inbound AwaitingRemoteRevokeToAnnounce {} to Committed", log_bytes!(htlc.payment_hash.0));
2043                                         true
2044                                 } else if let &InboundHTLCState::AwaitingAnnouncedRemoteRevoke(_) = &htlc.state {
2045                                         log_trace!(logger, " ...promoting inbound AwaitingAnnouncedRemoteRevoke {} to Committed", log_bytes!(htlc.payment_hash.0));
2046                                         true
2047                                 } else { false };
2048                                 if swap {
2049                                         let mut state = InboundHTLCState::Committed;
2050                                         mem::swap(&mut state, &mut htlc.state);
2051
2052                                         if let InboundHTLCState::AwaitingRemoteRevokeToAnnounce(forward_info) = state {
2053                                                 htlc.state = InboundHTLCState::AwaitingAnnouncedRemoteRevoke(forward_info);
2054                                                 require_commitment = true;
2055                                         } else if let InboundHTLCState::AwaitingAnnouncedRemoteRevoke(forward_info) = state {
2056                                                 match forward_info {
2057                                                         PendingHTLCStatus::Fail(fail_msg) => {
2058                                                                 require_commitment = true;
2059                                                                 match fail_msg {
2060                                                                         HTLCFailureMsg::Relay(msg) => {
2061                                                                                 htlc.state = InboundHTLCState::LocalRemoved(InboundHTLCRemovalReason::FailRelay(msg.reason.clone()));
2062                                                                                 update_fail_htlcs.push(msg)
2063                                                                         },
2064                                                                         HTLCFailureMsg::Malformed(msg) => {
2065                                                                                 htlc.state = InboundHTLCState::LocalRemoved(InboundHTLCRemovalReason::FailMalformed((msg.sha256_of_onion, msg.failure_code)));
2066                                                                                 update_fail_malformed_htlcs.push(msg)
2067                                                                         },
2068                                                                 }
2069                                                         },
2070                                                         PendingHTLCStatus::Forward(forward_info) => {
2071                                                                 to_forward_infos.push((forward_info, htlc.htlc_id));
2072                                                                 htlc.state = InboundHTLCState::Committed;
2073                                                         }
2074                                                 }
2075                                         }
2076                                 }
2077                         }
2078                         for htlc in pending_outbound_htlcs.iter_mut() {
2079                                 if let OutboundHTLCState::LocalAnnounced(_) = htlc.state {
2080                                         log_trace!(logger, " ...promoting outbound LocalAnnounced {} to Committed", log_bytes!(htlc.payment_hash.0));
2081                                         htlc.state = OutboundHTLCState::Committed;
2082                                 }
2083                                 if let Some(fail_reason) = if let &mut OutboundHTLCState::AwaitingRemoteRevokeToRemove(ref mut fail_reason) = &mut htlc.state {
2084                                         Some(fail_reason.take())
2085                                 } else { None } {
2086                                         log_trace!(logger, " ...promoting outbound AwaitingRemoteRevokeToRemove {} to AwaitingRemovedRemoteRevoke", log_bytes!(htlc.payment_hash.0));
2087                                         htlc.state = OutboundHTLCState::AwaitingRemovedRemoteRevoke(fail_reason);
2088                                         require_commitment = true;
2089                                 }
2090                         }
2091                 }
2092                 self.value_to_self_msat = (self.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
2093
2094                 if self.channel_outbound {
2095                         if let Some(feerate) = self.pending_update_fee.take() {
2096                                 self.feerate_per_kw = feerate;
2097                         }
2098                 } else {
2099                         if let Some(feerate) = self.pending_update_fee {
2100                                 // Because a node cannot send two commitment_signeds in a row without getting a
2101                                 // revoke_and_ack from us (as it would otherwise not know the per_commitment_point
2102                                 // it should use to create keys with) and because a node can't send a
2103                                 // commitment_signed without changes, checking if the feerate is equal to the
2104                                 // pending feerate update is sufficient to detect require_commitment.
2105                                 if feerate == self.feerate_per_kw {
2106                                         require_commitment = true;
2107                                         self.pending_update_fee = None;
2108                                 }
2109                         }
2110                 }
2111
2112                 if (self.channel_state & ChannelState::MonitorUpdateFailed as u32) == ChannelState::MonitorUpdateFailed as u32 {
2113                         // We can't actually generate a new commitment transaction (incl by freeing holding
2114                         // cells) while we can't update the monitor, so we just return what we have.
2115                         if require_commitment {
2116                                 self.monitor_pending_commitment_signed = true;
2117                                 // When the monitor updating is restored we'll call get_last_commitment_update(),
2118                                 // which does not update state, but we're definitely now awaiting a remote revoke
2119                                 // before we can step forward any more, so set it here.
2120                                 self.send_commitment_no_status_check()?;
2121                         }
2122                         self.monitor_pending_forwards.append(&mut to_forward_infos);
2123                         self.monitor_pending_failures.append(&mut revoked_htlcs);
2124                         return Ok((None, Vec::new(), Vec::new(), None, self.channel_monitor.clone()));
2125                 }
2126
2127                 match self.free_holding_cell_htlcs()? {
2128                         Some(mut commitment_update) => {
2129                                 commitment_update.0.update_fail_htlcs.reserve(update_fail_htlcs.len());
2130                                 for fail_msg in update_fail_htlcs.drain(..) {
2131                                         commitment_update.0.update_fail_htlcs.push(fail_msg);
2132                                 }
2133                                 commitment_update.0.update_fail_malformed_htlcs.reserve(update_fail_malformed_htlcs.len());
2134                                 for fail_msg in update_fail_malformed_htlcs.drain(..) {
2135                                         commitment_update.0.update_fail_malformed_htlcs.push(fail_msg);
2136                                 }
2137                                 Ok((Some(commitment_update.0), to_forward_infos, revoked_htlcs, None, commitment_update.1))
2138                         },
2139                         None => {
2140                                 if require_commitment {
2141                                         let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
2142                                         Ok((Some(msgs::CommitmentUpdate {
2143                                                 update_add_htlcs: Vec::new(),
2144                                                 update_fulfill_htlcs: Vec::new(),
2145                                                 update_fail_htlcs,
2146                                                 update_fail_malformed_htlcs,
2147                                                 update_fee: None,
2148                                                 commitment_signed
2149                                         }), to_forward_infos, revoked_htlcs, None, monitor_update))
2150                                 } else {
2151                                         Ok((None, to_forward_infos, revoked_htlcs, self.maybe_propose_first_closing_signed(fee_estimator), self.channel_monitor.clone()))
2152                                 }
2153                         }
2154                 }
2155
2156         }
2157
2158         /// Adds a pending update to this channel. See the doc for send_htlc for
2159         /// further details on the optionness of the return value.
2160         /// You MUST call send_commitment prior to any other calls on this Channel
2161         fn send_update_fee(&mut self, feerate_per_kw: u64) -> Option<msgs::UpdateFee> {
2162                 if !self.channel_outbound {
2163                         panic!("Cannot send fee from inbound channel");
2164                 }
2165                 if !self.is_usable() {
2166                         panic!("Cannot update fee until channel is fully established and we haven't started shutting down");
2167                 }
2168                 if !self.is_live() {
2169                         panic!("Cannot update fee while peer is disconnected/we're awaiting a monitor update (ChannelManager should have caught this)");
2170                 }
2171
2172                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
2173                         self.holding_cell_update_fee = Some(feerate_per_kw);
2174                         return None;
2175                 }
2176
2177                 debug_assert!(self.pending_update_fee.is_none());
2178                 self.pending_update_fee = Some(feerate_per_kw);
2179
2180                 Some(msgs::UpdateFee {
2181                         channel_id: self.channel_id,
2182                         feerate_per_kw: feerate_per_kw as u32,
2183                 })
2184         }
2185
2186         pub fn send_update_fee_and_commit(&mut self, feerate_per_kw: u64) -> Result<Option<(msgs::UpdateFee, msgs::CommitmentSigned, ChannelMonitor)>, ChannelError> {
2187                 match self.send_update_fee(feerate_per_kw) {
2188                         Some(update_fee) => {
2189                                 let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
2190                                 Ok(Some((update_fee, commitment_signed, monitor_update)))
2191                         },
2192                         None => Ok(None)
2193                 }
2194         }
2195
2196         /// Removes any uncommitted HTLCs, to be used on peer disconnection, including any pending
2197         /// HTLCs that we intended to add but haven't as we were waiting on a remote revoke.
2198         /// Returns the set of PendingHTLCStatuses from remote uncommitted HTLCs (which we're
2199         /// implicitly dropping) and the payment_hashes of HTLCs we tried to add but are dropping.
2200         /// No further message handling calls may be made until a channel_reestablish dance has
2201         /// completed.
2202         pub fn remove_uncommitted_htlcs_and_mark_paused(&mut self) -> Vec<(HTLCSource, PaymentHash)> {
2203                 let mut outbound_drops = Vec::new();
2204
2205                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
2206                 if self.channel_state < ChannelState::FundingSent as u32 {
2207                         self.channel_state = ChannelState::ShutdownComplete as u32;
2208                         return outbound_drops;
2209                 }
2210                 // Upon reconnect we have to start the closing_signed dance over, but shutdown messages
2211                 // will be retransmitted.
2212                 self.last_sent_closing_fee = None;
2213
2214                 let mut inbound_drop_count = 0;
2215                 self.pending_inbound_htlcs.retain(|htlc| {
2216                         match htlc.state {
2217                                 InboundHTLCState::RemoteAnnounced(_) => {
2218                                         // They sent us an update_add_htlc but we never got the commitment_signed.
2219                                         // We'll tell them what commitment_signed we're expecting next and they'll drop
2220                                         // this HTLC accordingly
2221                                         inbound_drop_count += 1;
2222                                         false
2223                                 },
2224                                 InboundHTLCState::AwaitingRemoteRevokeToAnnounce(_)|InboundHTLCState::AwaitingAnnouncedRemoteRevoke(_) => {
2225                                         // We received a commitment_signed updating this HTLC and (at least hopefully)
2226                                         // sent a revoke_and_ack (which we can re-transmit) and have heard nothing
2227                                         // in response to it yet, so don't touch it.
2228                                         true
2229                                 },
2230                                 InboundHTLCState::Committed => true,
2231                                 InboundHTLCState::LocalRemoved(_) => {
2232                                         // We (hopefully) sent a commitment_signed updating this HTLC (which we can
2233                                         // re-transmit if needed) and they may have even sent a revoke_and_ack back
2234                                         // (that we missed). Keep this around for now and if they tell us they missed
2235                                         // the commitment_signed we can re-transmit the update then.
2236                                         true
2237                                 },
2238                         }
2239                 });
2240                 self.next_remote_htlc_id -= inbound_drop_count;
2241
2242                 for htlc in self.pending_outbound_htlcs.iter_mut() {
2243                         if let OutboundHTLCState::RemoteRemoved(_) = htlc.state {
2244                                 // They sent us an update to remove this but haven't yet sent the corresponding
2245                                 // commitment_signed, we need to move it back to Committed and they can re-send
2246                                 // the update upon reconnection.
2247                                 htlc.state = OutboundHTLCState::Committed;
2248                         }
2249                 }
2250
2251                 self.holding_cell_htlc_updates.retain(|htlc_update| {
2252                         match htlc_update {
2253                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
2254                                         outbound_drops.push((source.clone(), payment_hash.clone()));
2255                                         false
2256                                 },
2257                                 &HTLCUpdateAwaitingACK::ClaimHTLC {..} | &HTLCUpdateAwaitingACK::FailHTLC {..} => true,
2258                         }
2259                 });
2260                 self.channel_state |= ChannelState::PeerDisconnected as u32;
2261                 log_debug!(self, "Peer disconnection resulted in {} remote-announced HTLC drops and {} waiting-to-locally-announced HTLC drops on channel {}", outbound_drops.len(), inbound_drop_count, log_bytes!(self.channel_id()));
2262                 outbound_drops
2263         }
2264
2265         /// Indicates that a ChannelMonitor update failed to be stored by the client and further
2266         /// updates are partially paused.
2267         /// This must be called immediately after the call which generated the ChannelMonitor update
2268         /// which failed. The messages which were generated from that call which generated the
2269         /// monitor update failure must *not* have been sent to the remote end, and must instead
2270         /// have been dropped. They will be regenerated when monitor_updating_restored is called.
2271         pub fn monitor_update_failed(&mut self, resend_raa: bool, resend_commitment: bool, mut pending_forwards: Vec<(PendingForwardHTLCInfo, u64)>, mut pending_fails: Vec<(HTLCSource, PaymentHash, HTLCFailReason)>) {
2272                 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, 0);
2273                 self.monitor_pending_revoke_and_ack = resend_raa;
2274                 self.monitor_pending_commitment_signed = resend_commitment;
2275                 assert!(self.monitor_pending_forwards.is_empty());
2276                 mem::swap(&mut pending_forwards, &mut self.monitor_pending_forwards);
2277                 assert!(self.monitor_pending_failures.is_empty());
2278                 mem::swap(&mut pending_fails, &mut self.monitor_pending_failures);
2279                 self.channel_state |= ChannelState::MonitorUpdateFailed as u32;
2280         }
2281
2282         /// Indicates that the latest ChannelMonitor update has been committed by the client
2283         /// successfully and we should restore normal operation. Returns messages which should be sent
2284         /// to the remote side.
2285         pub fn monitor_updating_restored(&mut self) -> (Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder, Vec<(PendingForwardHTLCInfo, u64)>, Vec<(HTLCSource, PaymentHash, HTLCFailReason)>, bool, Option<msgs::FundingLocked>) {
2286                 assert_eq!(self.channel_state & ChannelState::MonitorUpdateFailed as u32, ChannelState::MonitorUpdateFailed as u32);
2287                 self.channel_state &= !(ChannelState::MonitorUpdateFailed as u32);
2288
2289                 let needs_broadcast_safe = self.channel_state & (ChannelState::FundingSent as u32) != 0 && self.channel_outbound;
2290
2291                 // Because we will never generate a FundingBroadcastSafe event when we're in
2292                 // MonitorUpdateFailed, if we assume the user only broadcast the funding transaction when
2293                 // they received the FundingBroadcastSafe event, we can only ever hit
2294                 // monitor_pending_funding_locked when we're an inbound channel which failed to persist the
2295                 // monitor on funding_created, and we even got the funding transaction confirmed before the
2296                 // monitor was persisted.
2297                 let funding_locked = if self.monitor_pending_funding_locked {
2298                         assert!(!self.channel_outbound, "Funding transaction broadcast without FundingBroadcastSafe!");
2299                         self.monitor_pending_funding_locked = false;
2300                         let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2301                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
2302                         Some(msgs::FundingLocked {
2303                                 channel_id: self.channel_id(),
2304                                 next_per_commitment_point: next_per_commitment_point,
2305                         })
2306                 } else { None };
2307
2308                 let mut forwards = Vec::new();
2309                 mem::swap(&mut forwards, &mut self.monitor_pending_forwards);
2310                 let mut failures = Vec::new();
2311                 mem::swap(&mut failures, &mut self.monitor_pending_failures);
2312
2313                 if self.channel_state & (ChannelState::PeerDisconnected as u32) != 0 {
2314                         self.monitor_pending_revoke_and_ack = false;
2315                         self.monitor_pending_commitment_signed = false;
2316                         return (None, None, RAACommitmentOrder::RevokeAndACKFirst, forwards, failures, needs_broadcast_safe, funding_locked);
2317                 }
2318
2319                 let raa = if self.monitor_pending_revoke_and_ack {
2320                         Some(self.get_last_revoke_and_ack())
2321                 } else { None };
2322                 let commitment_update = if self.monitor_pending_commitment_signed {
2323                         Some(self.get_last_commitment_update())
2324                 } else { None };
2325
2326                 self.monitor_pending_revoke_and_ack = false;
2327                 self.monitor_pending_commitment_signed = false;
2328                 let order = self.resend_order.clone();
2329                 log_trace!(self, "Restored monitor updating resulting in {}{} commitment update and {} RAA, with {} first",
2330                         if needs_broadcast_safe { "a funding broadcast safe, " } else { "" },
2331                         if commitment_update.is_some() { "a" } else { "no" },
2332                         if raa.is_some() { "an" } else { "no" },
2333                         match order { RAACommitmentOrder::CommitmentFirst => "commitment", RAACommitmentOrder::RevokeAndACKFirst => "RAA"});
2334                 (raa, commitment_update, order, forwards, failures, needs_broadcast_safe, funding_locked)
2335         }
2336
2337         pub fn update_fee(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::UpdateFee) -> Result<(), ChannelError> {
2338                 if self.channel_outbound {
2339                         return Err(ChannelError::Close("Non-funding remote tried to update channel fee"));
2340                 }
2341                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2342                         return Err(ChannelError::Close("Peer sent update_fee when we needed a channel_reestablish"));
2343                 }
2344                 Channel::<ChanSigner>::check_remote_fee(fee_estimator, msg.feerate_per_kw)?;
2345                 self.pending_update_fee = Some(msg.feerate_per_kw as u64);
2346                 self.channel_update_count += 1;
2347                 Ok(())
2348         }
2349
2350         fn get_last_revoke_and_ack(&self) -> msgs::RevokeAndACK {
2351                 let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number));
2352                 let per_commitment_secret = chan_utils::build_commitment_secret(self.local_keys.commitment_seed(), self.cur_local_commitment_transaction_number + 2);
2353                 msgs::RevokeAndACK {
2354                         channel_id: self.channel_id,
2355                         per_commitment_secret,
2356                         next_per_commitment_point,
2357                 }
2358         }
2359
2360         fn get_last_commitment_update(&self) -> msgs::CommitmentUpdate {
2361                 let mut update_add_htlcs = Vec::new();
2362                 let mut update_fulfill_htlcs = Vec::new();
2363                 let mut update_fail_htlcs = Vec::new();
2364                 let mut update_fail_malformed_htlcs = Vec::new();
2365
2366                 for htlc in self.pending_outbound_htlcs.iter() {
2367                         if let &OutboundHTLCState::LocalAnnounced(ref onion_packet) = &htlc.state {
2368                                 update_add_htlcs.push(msgs::UpdateAddHTLC {
2369                                         channel_id: self.channel_id(),
2370                                         htlc_id: htlc.htlc_id,
2371                                         amount_msat: htlc.amount_msat,
2372                                         payment_hash: htlc.payment_hash,
2373                                         cltv_expiry: htlc.cltv_expiry,
2374                                         onion_routing_packet: (**onion_packet).clone(),
2375                                 });
2376                         }
2377                 }
2378
2379                 for htlc in self.pending_inbound_htlcs.iter() {
2380                         if let &InboundHTLCState::LocalRemoved(ref reason) = &htlc.state {
2381                                 match reason {
2382                                         &InboundHTLCRemovalReason::FailRelay(ref err_packet) => {
2383                                                 update_fail_htlcs.push(msgs::UpdateFailHTLC {
2384                                                         channel_id: self.channel_id(),
2385                                                         htlc_id: htlc.htlc_id,
2386                                                         reason: err_packet.clone()
2387                                                 });
2388                                         },
2389                                         &InboundHTLCRemovalReason::FailMalformed((ref sha256_of_onion, ref failure_code)) => {
2390                                                 update_fail_malformed_htlcs.push(msgs::UpdateFailMalformedHTLC {
2391                                                         channel_id: self.channel_id(),
2392                                                         htlc_id: htlc.htlc_id,
2393                                                         sha256_of_onion: sha256_of_onion.clone(),
2394                                                         failure_code: failure_code.clone(),
2395                                                 });
2396                                         },
2397                                         &InboundHTLCRemovalReason::Fulfill(ref payment_preimage) => {
2398                                                 update_fulfill_htlcs.push(msgs::UpdateFulfillHTLC {
2399                                                         channel_id: self.channel_id(),
2400                                                         htlc_id: htlc.htlc_id,
2401                                                         payment_preimage: payment_preimage.clone(),
2402                                                 });
2403                                         },
2404                                 }
2405                         }
2406                 }
2407
2408                 log_trace!(self, "Regenerated latest commitment update with {} update_adds, {} update_fulfills, {} update_fails, and {} update_fail_malformeds",
2409                                 update_add_htlcs.len(), update_fulfill_htlcs.len(), update_fail_htlcs.len(), update_fail_malformed_htlcs.len());
2410                 msgs::CommitmentUpdate {
2411                         update_add_htlcs, update_fulfill_htlcs, update_fail_htlcs, update_fail_malformed_htlcs,
2412                         update_fee: None,
2413                         commitment_signed: self.send_commitment_no_state_update().expect("It looks like we failed to re-generate a commitment_signed we had previously sent?").0,
2414                 }
2415         }
2416
2417         /// May panic if some calls other than message-handling calls (which will all Err immediately)
2418         /// have been called between remove_uncommitted_htlcs_and_mark_paused and this call.
2419         pub fn channel_reestablish(&mut self, msg: &msgs::ChannelReestablish) -> Result<(Option<msgs::FundingLocked>, Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, Option<ChannelMonitor>, RAACommitmentOrder, Option<msgs::Shutdown>), ChannelError> {
2420                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == 0 {
2421                         // While BOLT 2 doesn't indicate explicitly we should error this channel here, it
2422                         // almost certainly indicates we are going to end up out-of-sync in some way, so we
2423                         // just close here instead of trying to recover.
2424                         return Err(ChannelError::Close("Peer sent a loose channel_reestablish not after reconnect"));
2425                 }
2426
2427                 if msg.next_local_commitment_number >= INITIAL_COMMITMENT_NUMBER || msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER ||
2428                         msg.next_local_commitment_number == 0 {
2429                         return Err(ChannelError::Close("Peer sent a garbage channel_reestablish"));
2430                 }
2431
2432                 if msg.next_remote_commitment_number > 0 {
2433                         match msg.data_loss_protect {
2434                                 OptionalField::Present(ref data_loss) => {
2435                                         if chan_utils::build_commitment_secret(self.local_keys.commitment_seed(), INITIAL_COMMITMENT_NUMBER - msg.next_remote_commitment_number + 1) != data_loss.your_last_per_commitment_secret {
2436                                                 return Err(ChannelError::Close("Peer sent a garbage channel_reestablish with secret key not matching the commitment height provided"));
2437                                         }
2438                                         if msg.next_remote_commitment_number > INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number {
2439                                                 self.channel_monitor.provide_rescue_remote_commitment_tx_info(data_loss.my_current_per_commitment_point);
2440                                                 return Err(ChannelError::CloseDelayBroadcast { msg: "We have fallen behind - we have received proof that if we broadcast remote is going to claim our funds - we can't do any automated broadcasting", update: Some(self.channel_monitor.clone())
2441                                         });
2442                                         }
2443                                 },
2444                                 OptionalField::Absent => {}
2445                         }
2446                 }
2447
2448                 // Go ahead and unmark PeerDisconnected as various calls we may make check for it (and all
2449                 // remaining cases either succeed or ErrorMessage-fail).
2450                 self.channel_state &= !(ChannelState::PeerDisconnected as u32);
2451
2452                 let shutdown_msg = if self.channel_state & (ChannelState::LocalShutdownSent as u32) != 0 {
2453                         Some(msgs::Shutdown {
2454                                 channel_id: self.channel_id,
2455                                 scriptpubkey: self.get_closing_scriptpubkey(),
2456                         })
2457                 } else { None };
2458
2459                 if self.channel_state & (ChannelState::FundingSent as u32) == ChannelState::FundingSent as u32 {
2460                         // If we're waiting on a monitor update, we shouldn't re-send any funding_locked's.
2461                         if self.channel_state & (ChannelState::OurFundingLocked as u32) == 0 ||
2462                                         self.channel_state & (ChannelState::MonitorUpdateFailed as u32) != 0 {
2463                                 if msg.next_remote_commitment_number != 0 {
2464                                         return Err(ChannelError::Close("Peer claimed they saw a revoke_and_ack but we haven't sent funding_locked yet"));
2465                                 }
2466                                 // Short circuit the whole handler as there is nothing we can resend them
2467                                 return Ok((None, None, None, None, RAACommitmentOrder::CommitmentFirst, shutdown_msg));
2468                         }
2469
2470                         // We have OurFundingLocked set!
2471                         let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2472                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
2473                         return Ok((Some(msgs::FundingLocked {
2474                                 channel_id: self.channel_id(),
2475                                 next_per_commitment_point: next_per_commitment_point,
2476                         }), None, None, None, RAACommitmentOrder::CommitmentFirst, shutdown_msg));
2477                 }
2478
2479                 let required_revoke = if msg.next_remote_commitment_number + 1 == INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number {
2480                         // Remote isn't waiting on any RevokeAndACK from us!
2481                         // Note that if we need to repeat our FundingLocked we'll do that in the next if block.
2482                         None
2483                 } else if msg.next_remote_commitment_number + 1 == (INITIAL_COMMITMENT_NUMBER - 1) - self.cur_local_commitment_transaction_number {
2484                         if self.channel_state & (ChannelState::MonitorUpdateFailed as u32) != 0 {
2485                                 self.monitor_pending_revoke_and_ack = true;
2486                                 None
2487                         } else {
2488                                 Some(self.get_last_revoke_and_ack())
2489                         }
2490                 } else {
2491                         return Err(ChannelError::Close("Peer attempted to reestablish channel with a very old local commitment transaction"));
2492                 };
2493
2494                 // We increment cur_remote_commitment_transaction_number only upon receipt of
2495                 // revoke_and_ack, not on sending commitment_signed, so we add one if have
2496                 // AwaitingRemoteRevoke set, which indicates we sent a commitment_signed but haven't gotten
2497                 // the corresponding revoke_and_ack back yet.
2498                 let our_next_remote_commitment_number = INITIAL_COMMITMENT_NUMBER - self.cur_remote_commitment_transaction_number + if (self.channel_state & ChannelState::AwaitingRemoteRevoke as u32) != 0 { 1 } else { 0 };
2499
2500                 let resend_funding_locked = if msg.next_local_commitment_number == 1 && INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number == 1 {
2501                         // We should never have to worry about MonitorUpdateFailed resending FundingLocked
2502                         let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2503                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
2504                         Some(msgs::FundingLocked {
2505                                 channel_id: self.channel_id(),
2506                                 next_per_commitment_point: next_per_commitment_point,
2507                         })
2508                 } else { None };
2509
2510                 if msg.next_local_commitment_number == our_next_remote_commitment_number {
2511                         if required_revoke.is_some() {
2512                                 log_debug!(self, "Reconnected channel {} with only lost outbound RAA", log_bytes!(self.channel_id()));
2513                         } else {
2514                                 log_debug!(self, "Reconnected channel {} with no loss", log_bytes!(self.channel_id()));
2515                         }
2516
2517                         if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::MonitorUpdateFailed as u32)) == 0 {
2518                                 // We're up-to-date and not waiting on a remote revoke (if we are our
2519                                 // channel_reestablish should result in them sending a revoke_and_ack), but we may
2520                                 // have received some updates while we were disconnected. Free the holding cell
2521                                 // now!
2522                                 match self.free_holding_cell_htlcs() {
2523                                         Err(ChannelError::Close(msg)) => return Err(ChannelError::Close(msg)),
2524                                         Err(ChannelError::Ignore(_)) | Err(ChannelError::CloseDelayBroadcast { .. }) => panic!("Got non-channel-failing result from free_holding_cell_htlcs"),
2525                                         Ok(Some((commitment_update, channel_monitor))) => return Ok((resend_funding_locked, required_revoke, Some(commitment_update), Some(channel_monitor), self.resend_order.clone(), shutdown_msg)),
2526                                         Ok(None) => return Ok((resend_funding_locked, required_revoke, None, None, self.resend_order.clone(), shutdown_msg)),
2527                                 }
2528                         } else {
2529                                 return Ok((resend_funding_locked, required_revoke, None, None, self.resend_order.clone(), shutdown_msg));
2530                         }
2531                 } else if msg.next_local_commitment_number == our_next_remote_commitment_number - 1 {
2532                         if required_revoke.is_some() {
2533                                 log_debug!(self, "Reconnected channel {} with lost outbound RAA and lost remote commitment tx", log_bytes!(self.channel_id()));
2534                         } else {
2535                                 log_debug!(self, "Reconnected channel {} with only lost remote commitment tx", log_bytes!(self.channel_id()));
2536                         }
2537
2538                         if self.channel_state & (ChannelState::MonitorUpdateFailed as u32) != 0 {
2539                                 self.monitor_pending_commitment_signed = true;
2540                                 return Ok((resend_funding_locked, None, None, None, self.resend_order.clone(), shutdown_msg));
2541                         }
2542
2543                         return Ok((resend_funding_locked, required_revoke, Some(self.get_last_commitment_update()), None, self.resend_order.clone(), shutdown_msg));
2544                 } else {
2545                         return Err(ChannelError::Close("Peer attempted to reestablish channel with a very old remote commitment transaction"));
2546                 }
2547         }
2548
2549         fn maybe_propose_first_closing_signed(&mut self, fee_estimator: &FeeEstimator) -> Option<msgs::ClosingSigned> {
2550                 if !self.channel_outbound || !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() ||
2551                                 self.channel_state & (BOTH_SIDES_SHUTDOWN_MASK | ChannelState::AwaitingRemoteRevoke as u32) != BOTH_SIDES_SHUTDOWN_MASK ||
2552                                 self.last_sent_closing_fee.is_some() || self.pending_update_fee.is_some() {
2553                         return None;
2554                 }
2555
2556                 let mut proposed_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
2557                 if self.feerate_per_kw > proposed_feerate {
2558                         proposed_feerate = self.feerate_per_kw;
2559                 }
2560                 let tx_weight = Self::get_closing_transaction_weight(&self.get_closing_scriptpubkey(), self.their_shutdown_scriptpubkey.as_ref().unwrap());
2561                 let proposed_total_fee_satoshis = proposed_feerate * tx_weight / 1000;
2562
2563                 let (closing_tx, total_fee_satoshis) = self.build_closing_transaction(proposed_total_fee_satoshis, false);
2564                 let our_sig = self.local_keys
2565                         .sign_closing_transaction(self.channel_value_satoshis, &self.get_funding_redeemscript(), &closing_tx, &self.secp_ctx)
2566                         .ok();
2567                 if our_sig.is_none() { return None; }
2568
2569                 self.last_sent_closing_fee = Some((proposed_feerate, total_fee_satoshis, our_sig.clone().unwrap()));
2570                 Some(msgs::ClosingSigned {
2571                         channel_id: self.channel_id,
2572                         fee_satoshis: total_fee_satoshis,
2573                         signature: our_sig.unwrap(),
2574                 })
2575         }
2576
2577         pub fn shutdown(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>, Vec<(HTLCSource, PaymentHash)>), ChannelError> {
2578                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2579                         return Err(ChannelError::Close("Peer sent shutdown when we needed a channel_reestablish"));
2580                 }
2581                 if self.channel_state < ChannelState::FundingSent as u32 {
2582                         // Spec says we should fail the connection, not the channel, but that's nonsense, there
2583                         // are plenty of reasons you may want to fail a channel pre-funding, and spec says you
2584                         // can do that via error message without getting a connection fail anyway...
2585                         return Err(ChannelError::Close("Peer sent shutdown pre-funding generation"));
2586                 }
2587                 for htlc in self.pending_inbound_htlcs.iter() {
2588                         if let InboundHTLCState::RemoteAnnounced(_) = htlc.state {
2589                                 return Err(ChannelError::Close("Got shutdown with remote pending HTLCs"));
2590                         }
2591                 }
2592                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
2593
2594                 // BOLT 2 says we must only send a scriptpubkey of certain standard forms, which are up to
2595                 // 34 bytes in length, so don't let the remote peer feed us some super fee-heavy script.
2596                 if self.channel_outbound && msg.scriptpubkey.len() > 34 {
2597                         return Err(ChannelError::Close("Got shutdown_scriptpubkey of absurd length from remote peer"));
2598                 }
2599
2600                 //Check shutdown_scriptpubkey form as BOLT says we must
2601                 if !msg.scriptpubkey.is_p2pkh() && !msg.scriptpubkey.is_p2sh() && !msg.scriptpubkey.is_v0_p2wpkh() && !msg.scriptpubkey.is_v0_p2wsh() {
2602                         return Err(ChannelError::Close("Got a nonstandard scriptpubkey from remote peer"));
2603                 }
2604
2605                 if self.their_shutdown_scriptpubkey.is_some() {
2606                         if Some(&msg.scriptpubkey) != self.their_shutdown_scriptpubkey.as_ref() {
2607                                 return Err(ChannelError::Close("Got shutdown request with a scriptpubkey which did not match their previous scriptpubkey"));
2608                         }
2609                 } else {
2610                         self.their_shutdown_scriptpubkey = Some(msg.scriptpubkey.clone());
2611                 }
2612
2613                 // From here on out, we may not fail!
2614
2615                 self.channel_state |= ChannelState::RemoteShutdownSent as u32;
2616                 self.channel_update_count += 1;
2617
2618                 // We can't send our shutdown until we've committed all of our pending HTLCs, but the
2619                 // remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
2620                 // cell HTLCs and return them to fail the payment.
2621                 self.holding_cell_update_fee = None;
2622                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
2623                 self.holding_cell_htlc_updates.retain(|htlc_update| {
2624                         match htlc_update {
2625                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
2626                                         dropped_outbound_htlcs.push((source.clone(), payment_hash.clone()));
2627                                         false
2628                                 },
2629                                 _ => true
2630                         }
2631                 });
2632                 // If we have any LocalAnnounced updates we'll probably just get back a update_fail_htlc
2633                 // immediately after the commitment dance, but we can send a Shutdown cause we won't send
2634                 // any further commitment updates after we set LocalShutdownSent.
2635
2636                 let our_shutdown = if (self.channel_state & ChannelState::LocalShutdownSent as u32) == ChannelState::LocalShutdownSent as u32 {
2637                         None
2638                 } else {
2639                         Some(msgs::Shutdown {
2640                                 channel_id: self.channel_id,
2641                                 scriptpubkey: self.get_closing_scriptpubkey(),
2642                         })
2643                 };
2644
2645                 self.channel_state |= ChannelState::LocalShutdownSent as u32;
2646                 self.channel_update_count += 1;
2647                 Ok((our_shutdown, self.maybe_propose_first_closing_signed(fee_estimator), dropped_outbound_htlcs))
2648         }
2649
2650         fn build_signed_closing_transaction(&self, tx: &mut Transaction, their_sig: &Signature, our_sig: &Signature) {
2651                 if tx.input.len() != 1 { panic!("Tried to sign closing transaction that had input count != 1!"); }
2652                 if tx.input[0].witness.len() != 0 { panic!("Tried to re-sign closing transaction"); }
2653                 if tx.output.len() > 2 { panic!("Tried to sign bogus closing transaction"); }
2654
2655                 tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
2656
2657                 let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()).serialize();
2658                 let their_funding_key = self.their_funding_pubkey.unwrap().serialize();
2659                 if our_funding_key[..] < their_funding_key[..] {
2660                         tx.input[0].witness.push(our_sig.serialize_der().to_vec());
2661                         tx.input[0].witness.push(their_sig.serialize_der().to_vec());
2662                 } else {
2663                         tx.input[0].witness.push(their_sig.serialize_der().to_vec());
2664                         tx.input[0].witness.push(our_sig.serialize_der().to_vec());
2665                 }
2666                 tx.input[0].witness[1].push(SigHashType::All as u8);
2667                 tx.input[0].witness[2].push(SigHashType::All as u8);
2668
2669                 tx.input[0].witness.push(self.get_funding_redeemscript().into_bytes());
2670         }
2671
2672         pub fn closing_signed(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::ClosingSigned) -> Result<(Option<msgs::ClosingSigned>, Option<Transaction>), ChannelError> {
2673                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != BOTH_SIDES_SHUTDOWN_MASK {
2674                         return Err(ChannelError::Close("Remote end sent us a closing_signed before both sides provided a shutdown"));
2675                 }
2676                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2677                         return Err(ChannelError::Close("Peer sent closing_signed when we needed a channel_reestablish"));
2678                 }
2679                 if !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() {
2680                         return Err(ChannelError::Close("Remote end sent us a closing_signed while there were still pending HTLCs"));
2681                 }
2682                 if msg.fee_satoshis > 21000000 * 10000000 { //this is required to stop potential overflow in build_closing_transaction
2683                         return Err(ChannelError::Close("Remote tried to send us a closing tx with > 21 million BTC fee"));
2684                 }
2685
2686                 let funding_redeemscript = self.get_funding_redeemscript();
2687                 let (mut closing_tx, used_total_fee) = self.build_closing_transaction(msg.fee_satoshis, false);
2688                 if used_total_fee != msg.fee_satoshis {
2689                         return Err(ChannelError::Close("Remote sent us a closing_signed with a fee greater than the value they can claim"));
2690                 }
2691                 let mut sighash = hash_to_message!(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]);
2692
2693                 match self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey.unwrap()) {
2694                         Ok(_) => {},
2695                         Err(_e) => {
2696                                 // The remote end may have decided to revoke their output due to inconsistent dust
2697                                 // limits, so check for that case by re-checking the signature here.
2698                                 closing_tx = self.build_closing_transaction(msg.fee_satoshis, true).0;
2699                                 sighash = hash_to_message!(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]);
2700                                 secp_check!(self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid closing tx signature from peer");
2701                         },
2702                 };
2703
2704                 if let Some((_, last_fee, our_sig)) = self.last_sent_closing_fee {
2705                         if last_fee == msg.fee_satoshis {
2706                                 self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &our_sig);
2707                                 self.channel_state = ChannelState::ShutdownComplete as u32;
2708                                 self.channel_update_count += 1;
2709                                 return Ok((None, Some(closing_tx)));
2710                         }
2711                 }
2712
2713                 macro_rules! propose_new_feerate {
2714                         ($new_feerate: expr) => {
2715                                 let closing_tx_max_weight = Self::get_closing_transaction_weight(&self.get_closing_scriptpubkey(), self.their_shutdown_scriptpubkey.as_ref().unwrap());
2716                                 let (closing_tx, used_total_fee) = self.build_closing_transaction($new_feerate * closing_tx_max_weight / 1000, false);
2717                                 let our_sig = self.local_keys
2718                                         .sign_closing_transaction(self.channel_value_satoshis, &funding_redeemscript, &closing_tx, &self.secp_ctx)
2719                                         .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction"))?;
2720                                 self.last_sent_closing_fee = Some(($new_feerate, used_total_fee, our_sig.clone()));
2721                                 return Ok((Some(msgs::ClosingSigned {
2722                                         channel_id: self.channel_id,
2723                                         fee_satoshis: used_total_fee,
2724                                         signature: our_sig,
2725                                 }), None))
2726                         }
2727                 }
2728
2729                 let proposed_sat_per_kw = msg.fee_satoshis * 1000 / closing_tx.get_weight() as u64;
2730                 if self.channel_outbound {
2731                         let our_max_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
2732                         if proposed_sat_per_kw > our_max_feerate {
2733                                 if let Some((last_feerate, _, _)) = self.last_sent_closing_fee {
2734                                         if our_max_feerate <= last_feerate {
2735                                                 return Err(ChannelError::Close("Unable to come to consensus about closing feerate, remote wanted something higher than our Normal feerate"));
2736                                         }
2737                                 }
2738                                 propose_new_feerate!(our_max_feerate);
2739                         }
2740                 } else {
2741                         let our_min_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
2742                         if proposed_sat_per_kw < our_min_feerate {
2743                                 if let Some((last_feerate, _, _)) = self.last_sent_closing_fee {
2744                                         if our_min_feerate >= last_feerate {
2745                                                 return Err(ChannelError::Close("Unable to come to consensus about closing feerate, remote wanted something lower than our Background feerate"));
2746                                         }
2747                                 }
2748                                 propose_new_feerate!(our_min_feerate);
2749                         }
2750                 }
2751
2752                 let our_sig = self.local_keys
2753                         .sign_closing_transaction(self.channel_value_satoshis, &funding_redeemscript, &closing_tx, &self.secp_ctx)
2754                         .map_err(|_| ChannelError::Close("External signer refused to sign closing transaction"))?;
2755                 self.build_signed_closing_transaction(&mut closing_tx, &msg.signature, &our_sig);
2756
2757                 self.channel_state = ChannelState::ShutdownComplete as u32;
2758                 self.channel_update_count += 1;
2759
2760                 Ok((Some(msgs::ClosingSigned {
2761                         channel_id: self.channel_id,
2762                         fee_satoshis: msg.fee_satoshis,
2763                         signature: our_sig,
2764                 }), Some(closing_tx)))
2765         }
2766
2767         // Public utilities:
2768
2769         pub fn channel_id(&self) -> [u8; 32] {
2770                 self.channel_id
2771         }
2772
2773         /// Gets the "user_id" value passed into the construction of this channel. It has no special
2774         /// meaning and exists only to allow users to have a persistent identifier of a channel.
2775         pub fn get_user_id(&self) -> u64 {
2776                 self.user_id
2777         }
2778
2779         /// May only be called after funding has been initiated (ie is_funding_initiated() is true)
2780         pub fn channel_monitor(&mut self) -> &mut ChannelMonitor {
2781                 if self.channel_state < ChannelState::FundingCreated as u32 {
2782                         panic!("Can't get a channel monitor until funding has been created");
2783                 }
2784                 &mut self.channel_monitor
2785         }
2786
2787         /// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
2788         /// is_usable() returns true).
2789         /// Allowed in any state (including after shutdown)
2790         pub fn get_short_channel_id(&self) -> Option<u64> {
2791                 self.short_channel_id
2792         }
2793
2794         /// Returns the funding_txo we either got from our peer, or were given by
2795         /// get_outbound_funding_created.
2796         pub fn get_funding_txo(&self) -> Option<OutPoint> {
2797                 self.channel_monitor.get_funding_txo()
2798         }
2799
2800         /// Allowed in any state (including after shutdown)
2801         pub fn get_their_node_id(&self) -> PublicKey {
2802                 self.their_node_id
2803         }
2804
2805         /// Allowed in any state (including after shutdown)
2806         pub fn get_our_htlc_minimum_msat(&self) -> u64 {
2807                 self.our_htlc_minimum_msat
2808         }
2809
2810         /// Allowed in any state (including after shutdown)
2811         pub fn get_their_htlc_minimum_msat(&self) -> u64 {
2812                 self.our_htlc_minimum_msat
2813         }
2814
2815         pub fn get_value_satoshis(&self) -> u64 {
2816                 self.channel_value_satoshis
2817         }
2818
2819         pub fn get_fee_proportional_millionths(&self) -> u32 {
2820                 self.config.fee_proportional_millionths
2821         }
2822
2823         #[cfg(test)]
2824         pub fn get_feerate(&self) -> u64 {
2825                 self.feerate_per_kw
2826         }
2827
2828         pub fn get_cur_local_commitment_transaction_number(&self) -> u64 {
2829                 self.cur_local_commitment_transaction_number + 1
2830         }
2831
2832         pub fn get_cur_remote_commitment_transaction_number(&self) -> u64 {
2833                 self.cur_remote_commitment_transaction_number + 1 - if self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32) != 0 { 1 } else { 0 }
2834         }
2835
2836         pub fn get_revoked_remote_commitment_transaction_number(&self) -> u64 {
2837                 self.cur_remote_commitment_transaction_number + 2
2838         }
2839
2840         #[cfg(test)]
2841         pub fn get_local_keys(&self) -> &ChanSigner {
2842                 &self.local_keys
2843         }
2844
2845         #[cfg(test)]
2846         pub fn get_value_stat(&self) -> ChannelValueStat {
2847                 ChannelValueStat {
2848                         value_to_self_msat: self.value_to_self_msat,
2849                         channel_value_msat: self.channel_value_satoshis * 1000,
2850                         channel_reserve_msat: self.their_channel_reserve_satoshis * 1000,
2851                         pending_outbound_htlcs_amount_msat: self.pending_outbound_htlcs.iter().map(|ref h| h.amount_msat).sum::<u64>(),
2852                         pending_inbound_htlcs_amount_msat: self.pending_inbound_htlcs.iter().map(|ref h| h.amount_msat).sum::<u64>(),
2853                         holding_cell_outbound_amount_msat: {
2854                                 let mut res = 0;
2855                                 for h in self.holding_cell_htlc_updates.iter() {
2856                                         match h {
2857                                                 &HTLCUpdateAwaitingACK::AddHTLC{amount_msat, .. } => {
2858                                                         res += amount_msat;
2859                                                 }
2860                                                 _ => {}
2861                                         }
2862                                 }
2863                                 res
2864                         },
2865                         their_max_htlc_value_in_flight_msat: self.their_max_htlc_value_in_flight_msat,
2866                 }
2867         }
2868
2869         /// Allowed in any state (including after shutdown)
2870         pub fn get_channel_update_count(&self) -> u32 {
2871                 self.channel_update_count
2872         }
2873
2874         pub fn should_announce(&self) -> bool {
2875                 self.config.announced_channel
2876         }
2877
2878         pub fn is_outbound(&self) -> bool {
2879                 self.channel_outbound
2880         }
2881
2882         /// Gets the fee we'd want to charge for adding an HTLC output to this Channel
2883         /// Allowed in any state (including after shutdown)
2884         pub fn get_our_fee_base_msat(&self, fee_estimator: &FeeEstimator) -> u32 {
2885                 // For lack of a better metric, we calculate what it would cost to consolidate the new HTLC
2886                 // output value back into a transaction with the regular channel output:
2887
2888                 // the fee cost of the HTLC-Success/HTLC-Timeout transaction:
2889                 let mut res = self.feerate_per_kw * cmp::max(HTLC_TIMEOUT_TX_WEIGHT, HTLC_SUCCESS_TX_WEIGHT) / 1000;
2890
2891                 if self.channel_outbound {
2892                         // + the marginal fee increase cost to us in the commitment transaction:
2893                         res += self.feerate_per_kw * COMMITMENT_TX_WEIGHT_PER_HTLC / 1000;
2894                 }
2895
2896                 // + the marginal cost of an input which spends the HTLC-Success/HTLC-Timeout output:
2897                 res += fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal) * SPENDING_INPUT_FOR_A_OUTPUT_WEIGHT / 1000;
2898
2899                 res as u32
2900         }
2901
2902         /// Returns true if we've ever received a message from the remote end for this Channel
2903         pub fn have_received_message(&self) -> bool {
2904                 self.channel_state > (ChannelState::OurInitSent as u32)
2905         }
2906
2907         /// Returns true if this channel is fully established and not known to be closing.
2908         /// Allowed in any state (including after shutdown)
2909         pub fn is_usable(&self) -> bool {
2910                 let mask = ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK;
2911                 (self.channel_state & mask) == (ChannelState::ChannelFunded as u32)
2912         }
2913
2914         /// Returns true if this channel is currently available for use. This is a superset of
2915         /// is_usable() and considers things like the channel being temporarily disabled.
2916         /// Allowed in any state (including after shutdown)
2917         pub fn is_live(&self) -> bool {
2918                 self.is_usable() && (self.channel_state & (ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32) == 0)
2919         }
2920
2921         /// Returns true if this channel has been marked as awaiting a monitor update to move forward.
2922         /// Allowed in any state (including after shutdown)
2923         pub fn is_awaiting_monitor_update(&self) -> bool {
2924                 (self.channel_state & ChannelState::MonitorUpdateFailed as u32) != 0
2925         }
2926
2927         /// Returns true if funding_created was sent/received.
2928         pub fn is_funding_initiated(&self) -> bool {
2929                 self.channel_state >= ChannelState::FundingCreated as u32
2930         }
2931
2932         /// Returns true if this channel is fully shut down. True here implies that no further actions
2933         /// may/will be taken on this channel, and thus this object should be freed. Any future changes
2934         /// will be handled appropriately by the chain monitor.
2935         pub fn is_shutdown(&self) -> bool {
2936                 if (self.channel_state & ChannelState::ShutdownComplete as u32) == ChannelState::ShutdownComplete as u32  {
2937                         assert!(self.channel_state == ChannelState::ShutdownComplete as u32);
2938                         true
2939                 } else { false }
2940         }
2941
2942         pub fn to_disabled_staged(&mut self) {
2943                 self.network_sync = UpdateStatus::DisabledStaged;
2944         }
2945
2946         pub fn to_disabled_marked(&mut self) {
2947                 self.network_sync = UpdateStatus::DisabledMarked;
2948         }
2949
2950         pub fn to_fresh(&mut self) {
2951                 self.network_sync = UpdateStatus::Fresh;
2952         }
2953
2954         pub fn is_disabled_staged(&self) -> bool {
2955                 self.network_sync == UpdateStatus::DisabledStaged
2956         }
2957
2958         pub fn is_disabled_marked(&self) -> bool {
2959                 self.network_sync == UpdateStatus::DisabledMarked
2960         }
2961
2962         /// Called by channelmanager based on chain blocks being connected.
2963         /// Note that we only need to use this to detect funding_signed, anything else is handled by
2964         /// the channel_monitor.
2965         /// In case of Err, the channel may have been closed, at which point the standard requirements
2966         /// apply - no calls may be made except those explicitly stated to be allowed post-shutdown.
2967         /// Only returns an ErrorAction of DisconnectPeer, if Err.
2968         pub fn block_connected(&mut self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[u32]) -> Result<Option<msgs::FundingLocked>, msgs::ErrorMessage> {
2969                 let non_shutdown_state = self.channel_state & (!MULTI_STATE_FLAGS);
2970                 if header.bitcoin_hash() != self.last_block_connected {
2971                         self.last_block_connected = header.bitcoin_hash();
2972                         self.channel_monitor.last_block_hash = self.last_block_connected;
2973                         if self.funding_tx_confirmations > 0 {
2974                                 self.funding_tx_confirmations += 1;
2975                                 if self.funding_tx_confirmations == self.minimum_depth as u64 {
2976                                         let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
2977                                                 self.channel_state |= ChannelState::OurFundingLocked as u32;
2978                                                 true
2979                                         } else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32) {
2980                                                 self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & MULTI_STATE_FLAGS);
2981                                                 self.channel_update_count += 1;
2982                                                 true
2983                                         } else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
2984                                                 // We got a reorg but not enough to trigger a force close, just update
2985                                                 // funding_tx_confirmed_in and return.
2986                                                 false
2987                                         } else if self.channel_state < ChannelState::ChannelFunded as u32 {
2988                                                 panic!("Started confirming a channel in a state pre-FundingSent?: {}", self.channel_state);
2989                                         } else {
2990                                                 // We got a reorg but not enough to trigger a force close, just update
2991                                                 // funding_tx_confirmed_in and return.
2992                                                 false
2993                                         };
2994                                         self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
2995
2996                                         //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
2997                                         //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
2998                                         //they can by sending two revoke_and_acks back-to-back, but not really). This appears to be
2999                                         //a protocol oversight, but I assume I'm just missing something.
3000                                         if need_commitment_update {
3001                                                 if self.channel_state & (ChannelState::MonitorUpdateFailed as u32) == 0 {
3002                                                         let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
3003                                                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
3004                                                         return Ok(Some(msgs::FundingLocked {
3005                                                                 channel_id: self.channel_id,
3006                                                                 next_per_commitment_point: next_per_commitment_point,
3007                                                         }));
3008                                                 } else {
3009                                                         self.monitor_pending_funding_locked = true;
3010                                                         return Ok(None);
3011                                                 }
3012                                         }
3013                                 }
3014                         }
3015                 }
3016                 if non_shutdown_state & !(ChannelState::TheirFundingLocked as u32) == ChannelState::FundingSent as u32 {
3017                         for (ref tx, index_in_block) in txn_matched.iter().zip(indexes_of_txn_matched) {
3018                                 if tx.txid() == self.channel_monitor.get_funding_txo().unwrap().txid {
3019                                         let txo_idx = self.channel_monitor.get_funding_txo().unwrap().index as usize;
3020                                         if txo_idx >= tx.output.len() || tx.output[txo_idx].script_pubkey != self.get_funding_redeemscript().to_v0_p2wsh() ||
3021                                                         tx.output[txo_idx].value != self.channel_value_satoshis {
3022                                                 if self.channel_outbound {
3023                                                         // If we generated the funding transaction and it doesn't match what it
3024                                                         // should, the client is really broken and we should just panic and
3025                                                         // tell them off. That said, because hash collisions happen with high
3026                                                         // probability in fuzztarget mode, if we're fuzzing we just close the
3027                                                         // channel and move on.
3028                                                         #[cfg(not(feature = "fuzztarget"))]
3029                                                         panic!("Client called ChannelManager::funding_transaction_generated with bogus transaction!");
3030                                                 }
3031                                                 self.channel_state = ChannelState::ShutdownComplete as u32;
3032                                                 self.channel_update_count += 1;
3033                                                 return Err(msgs::ErrorMessage {
3034                                                         channel_id: self.channel_id(),
3035                                                         data: "funding tx had wrong script/value".to_owned()
3036                                                 });
3037                                         } else {
3038                                                 if self.channel_outbound {
3039                                                         for input in tx.input.iter() {
3040                                                                 if input.witness.is_empty() {
3041                                                                         // We generated a malleable funding transaction, implying we've
3042                                                                         // just exposed ourselves to funds loss to our counterparty.
3043                                                                         #[cfg(not(feature = "fuzztarget"))]
3044                                                                         panic!("Client called ChannelManager::funding_transaction_generated with bogus transaction!");
3045                                                                 }
3046                                                         }
3047                                                 }
3048                                                 self.funding_tx_confirmations = 1;
3049                                                 self.short_channel_id = Some(((height as u64)          << (5*8)) |
3050                                                                              ((*index_in_block as u64) << (2*8)) |
3051                                                                              ((txo_idx as u64)         << (0*8)));
3052                                         }
3053                                 }
3054                         }
3055                 }
3056                 Ok(None)
3057         }
3058
3059         /// Called by channelmanager based on chain blocks being disconnected.
3060         /// Returns true if we need to close the channel now due to funding transaction
3061         /// unconfirmation/reorg.
3062         pub fn block_disconnected(&mut self, header: &BlockHeader) -> bool {
3063                 if self.funding_tx_confirmations > 0 {
3064                         self.funding_tx_confirmations -= 1;
3065                         if self.funding_tx_confirmations == UNCONF_THRESHOLD as u64 {
3066                                 return true;
3067                         }
3068                 }
3069                 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
3070                         self.funding_tx_confirmations = self.minimum_depth as u64 - 1;
3071                 }
3072                 self.last_block_connected = header.bitcoin_hash();
3073                 self.channel_monitor.last_block_hash = self.last_block_connected;
3074                 false
3075         }
3076
3077         // Methods to get unprompted messages to send to the remote end (or where we already returned
3078         // something in the handler for the message that prompted this message):
3079
3080         pub fn get_open_channel(&self, chain_hash: Sha256dHash, fee_estimator: &FeeEstimator) -> msgs::OpenChannel {
3081                 if !self.channel_outbound {
3082                         panic!("Tried to open a channel for an inbound channel?");
3083                 }
3084                 if self.channel_state != ChannelState::OurInitSent as u32 {
3085                         panic!("Cannot generate an open_channel after we've moved forward");
3086                 }
3087
3088                 if self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
3089                         panic!("Tried to send an open_channel for a channel that has already advanced");
3090                 }
3091
3092                 let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
3093
3094                 msgs::OpenChannel {
3095                         chain_hash: chain_hash,
3096                         temporary_channel_id: self.channel_id,
3097                         funding_satoshis: self.channel_value_satoshis,
3098                         push_msat: self.channel_value_satoshis * 1000 - self.value_to_self_msat,
3099                         dust_limit_satoshis: self.our_dust_limit_satoshis,
3100                         max_htlc_value_in_flight_msat: Channel::<ChanSigner>::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis),
3101                         channel_reserve_satoshis: Channel::<ChanSigner>::get_our_channel_reserve_satoshis(self.channel_value_satoshis),
3102                         htlc_minimum_msat: self.our_htlc_minimum_msat,
3103                         feerate_per_kw: fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background) as u32,
3104                         to_self_delay: self.our_to_self_delay,
3105                         max_accepted_htlcs: OUR_MAX_HTLCS,
3106                         funding_pubkey: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()),
3107                         revocation_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.revocation_base_key()),
3108                         payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.payment_base_key()),
3109                         delayed_payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.delayed_payment_base_key()),
3110                         htlc_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.htlc_base_key()),
3111                         first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret),
3112                         channel_flags: if self.config.announced_channel {1} else {0},
3113                         shutdown_scriptpubkey: OptionalField::Present(if self.config.commit_upfront_shutdown_pubkey { self.get_closing_scriptpubkey() } else { Builder::new().into_script() })
3114                 }
3115         }
3116
3117         pub fn get_accept_channel(&self) -> msgs::AcceptChannel {
3118                 if self.channel_outbound {
3119                         panic!("Tried to send accept_channel for an outbound channel?");
3120                 }
3121                 if self.channel_state != (ChannelState::OurInitSent as u32) | (ChannelState::TheirInitSent as u32) {
3122                         panic!("Tried to send accept_channel after channel had moved forward");
3123                 }
3124                 if self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
3125                         panic!("Tried to send an accept_channel for a channel that has already advanced");
3126                 }
3127
3128                 let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
3129
3130                 msgs::AcceptChannel {
3131                         temporary_channel_id: self.channel_id,
3132                         dust_limit_satoshis: self.our_dust_limit_satoshis,
3133                         max_htlc_value_in_flight_msat: Channel::<ChanSigner>::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis),
3134                         channel_reserve_satoshis: Channel::<ChanSigner>::get_our_channel_reserve_satoshis(self.channel_value_satoshis),
3135                         htlc_minimum_msat: self.our_htlc_minimum_msat,
3136                         minimum_depth: self.minimum_depth,
3137                         to_self_delay: self.our_to_self_delay,
3138                         max_accepted_htlcs: OUR_MAX_HTLCS,
3139                         funding_pubkey: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key()),
3140                         revocation_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.revocation_base_key()),
3141                         payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.payment_base_key()),
3142                         delayed_payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.delayed_payment_base_key()),
3143                         htlc_basepoint: PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.htlc_base_key()),
3144                         first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret),
3145                         shutdown_scriptpubkey: OptionalField::Present(if self.config.commit_upfront_shutdown_pubkey { self.get_closing_scriptpubkey() } else { Builder::new().into_script() })
3146                 }
3147         }
3148
3149         /// If an Err is returned, it is a ChannelError::Close (for get_outbound_funding_created)
3150         fn get_outbound_funding_created_signature(&mut self) -> Result<(Signature, Transaction), ChannelError> {
3151                 let remote_keys = self.build_remote_transaction_keys()?;
3152                 let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw).0;
3153                 Ok((self.local_keys.sign_remote_commitment(self.channel_value_satoshis, &self.get_funding_redeemscript(), self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), self.our_to_self_delay, &self.secp_ctx)
3154                                 .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed"))?.0, remote_initial_commitment_tx))
3155         }
3156
3157         /// Updates channel state with knowledge of the funding transaction's txid/index, and generates
3158         /// a funding_created message for the remote peer.
3159         /// Panics if called at some time other than immediately after initial handshake, if called twice,
3160         /// or if called on an inbound channel.
3161         /// Note that channel_id changes during this call!
3162         /// Do NOT broadcast the funding transaction until after a successful funding_signed call!
3163         /// If an Err is returned, it is a ChannelError::Close.
3164         pub fn get_outbound_funding_created(&mut self, funding_txo: OutPoint) -> Result<(msgs::FundingCreated, ChannelMonitor), ChannelError> {
3165                 if !self.channel_outbound {
3166                         panic!("Tried to create outbound funding_created message on an inbound channel!");
3167                 }
3168                 if self.channel_state != (ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32) {
3169                         panic!("Tried to get a funding_created messsage at a time other than immediately after initial handshake completion (or tried to get funding_created twice)");
3170                 }
3171                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
3172                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
3173                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
3174                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
3175                 }
3176
3177                 let funding_txo_script = self.get_funding_redeemscript().to_v0_p2wsh();
3178                 self.channel_monitor.set_funding_info((funding_txo, funding_txo_script));
3179
3180                 let (our_signature, commitment_tx) = match self.get_outbound_funding_created_signature() {
3181                         Ok(res) => res,
3182                         Err(e) => {
3183                                 log_error!(self, "Got bad signatures: {:?}!", e);
3184                                 self.channel_monitor.unset_funding_info();
3185                                 return Err(e);
3186                         }
3187                 };
3188
3189                 let temporary_channel_id = self.channel_id;
3190
3191                 // Now that we're past error-generating stuff, update our local state:
3192                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number, self.their_cur_commitment_point.unwrap());
3193                 self.channel_state = ChannelState::FundingCreated as u32;
3194                 self.channel_id = funding_txo.to_channel_id();
3195                 self.cur_remote_commitment_transaction_number -= 1;
3196
3197                 Ok((msgs::FundingCreated {
3198                         temporary_channel_id: temporary_channel_id,
3199                         funding_txid: funding_txo.txid,
3200                         funding_output_index: funding_txo.index,
3201                         signature: our_signature
3202                 }, self.channel_monitor.clone()))
3203         }
3204
3205         /// Gets an UnsignedChannelAnnouncement, as well as a signature covering it using our
3206         /// bitcoin_key, if available, for this channel. The channel must be publicly announceable and
3207         /// available for use (have exchanged FundingLocked messages in both directions). Should be used
3208         /// for both loose and in response to an AnnouncementSignatures message from the remote peer.
3209         /// Will only fail if we're not in a state where channel_announcement may be sent (including
3210         /// closing).
3211         /// Note that the "channel must be funded" requirement is stricter than BOLT 7 requires - see
3212         /// https://github.com/lightningnetwork/lightning-rfc/issues/468
3213         pub fn get_channel_announcement(&self, our_node_id: PublicKey, chain_hash: Sha256dHash) -> Result<(msgs::UnsignedChannelAnnouncement, Signature), ChannelError> {
3214                 if !self.config.announced_channel {
3215                         return Err(ChannelError::Ignore("Channel is not available for public announcements"));
3216                 }
3217                 if self.channel_state & (ChannelState::ChannelFunded as u32) == 0 {
3218                         return Err(ChannelError::Ignore("Cannot get a ChannelAnnouncement until the channel funding has been locked"));
3219                 }
3220                 if (self.channel_state & (ChannelState::LocalShutdownSent as u32 | ChannelState::ShutdownComplete as u32)) != 0 {
3221                         return Err(ChannelError::Ignore("Cannot get a ChannelAnnouncement once the channel is closing"));
3222                 }
3223
3224                 let were_node_one = our_node_id.serialize()[..] < self.their_node_id.serialize()[..];
3225                 let our_bitcoin_key = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key());
3226
3227                 let msg = msgs::UnsignedChannelAnnouncement {
3228                         features: msgs::GlobalFeatures::new(),
3229                         chain_hash: chain_hash,
3230                         short_channel_id: self.get_short_channel_id().unwrap(),
3231                         node_id_1: if were_node_one { our_node_id } else { self.get_their_node_id() },
3232                         node_id_2: if were_node_one { self.get_their_node_id() } else { our_node_id },
3233                         bitcoin_key_1: if were_node_one { our_bitcoin_key } else { self.their_funding_pubkey.unwrap() },
3234                         bitcoin_key_2: if were_node_one { self.their_funding_pubkey.unwrap() } else { our_bitcoin_key },
3235                         excess_data: Vec::new(),
3236                 };
3237
3238                 let sig = self.local_keys.sign_channel_announcement(&msg, &self.secp_ctx)
3239                         .map_err(|_| ChannelError::Ignore("Signer rejected channel_announcement"))?;
3240
3241                 Ok((msg, sig))
3242         }
3243
3244         /// May panic if called on a channel that wasn't immediately-previously
3245         /// self.remove_uncommitted_htlcs_and_mark_paused()'d
3246         pub fn get_channel_reestablish(&self) -> msgs::ChannelReestablish {
3247                 assert_eq!(self.channel_state & ChannelState::PeerDisconnected as u32, ChannelState::PeerDisconnected as u32);
3248                 assert_ne!(self.cur_remote_commitment_transaction_number, INITIAL_COMMITMENT_NUMBER);
3249                 let data_loss_protect = if self.cur_remote_commitment_transaction_number + 1 < INITIAL_COMMITMENT_NUMBER {
3250                         let remote_last_secret = self.channel_monitor.get_secret(self.cur_remote_commitment_transaction_number + 2).unwrap();
3251                         log_trace!(self, "Enough info to generate a Data Loss Protect with per_commitment_secret {}", log_bytes!(remote_last_secret));
3252                         OptionalField::Present(DataLossProtect {
3253                                 your_last_per_commitment_secret: remote_last_secret,
3254                                 my_current_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number + 1))
3255                         })
3256                 } else {
3257                         log_debug!(self, "We don't seen yet any revoked secret, if this channnel has already been updated it means we are fallen-behind, you should wait for other peer closing");
3258                         OptionalField::Present(DataLossProtect {
3259                                 your_last_per_commitment_secret: [0;32],
3260                                 my_current_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number))
3261                         })
3262                 };
3263                 msgs::ChannelReestablish {
3264                         channel_id: self.channel_id(),
3265                         // The protocol has two different commitment number concepts - the "commitment
3266                         // transaction number", which starts from 0 and counts up, and the "revocation key
3267                         // index" which starts at INITIAL_COMMITMENT_NUMBER and counts down. We track
3268                         // commitment transaction numbers by the index which will be used to reveal the
3269                         // revocation key for that commitment transaction, which means we have to convert them
3270                         // to protocol-level commitment numbers here...
3271
3272                         // next_local_commitment_number is the next commitment_signed number we expect to
3273                         // receive (indicating if they need to resend one that we missed).
3274                         next_local_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number,
3275                         // We have to set next_remote_commitment_number to the next revoke_and_ack we expect to
3276                         // receive, however we track it by the next commitment number for a remote transaction
3277                         // (which is one further, as they always revoke previous commitment transaction, not
3278                         // the one we send) so we have to decrement by 1. Note that if
3279                         // cur_remote_commitment_transaction_number is INITIAL_COMMITMENT_NUMBER we will have
3280                         // dropped this channel on disconnect as it hasn't yet reached FundingSent so we can't
3281                         // overflow here.
3282                         next_remote_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_remote_commitment_transaction_number - 1,
3283                         data_loss_protect,
3284                 }
3285         }
3286
3287
3288         // Send stuff to our remote peers:
3289
3290         /// Adds a pending outbound HTLC to this channel, note that you probably want
3291         /// send_htlc_and_commit instead cause you'll want both messages at once.
3292         /// This returns an option instead of a pure UpdateAddHTLC as we may be in a state where we are
3293         /// waiting on the remote peer to send us a revoke_and_ack during which time we cannot add new
3294         /// HTLCs on the wire or we wouldn't be able to determine what they actually ACK'ed.
3295         /// You MUST call send_commitment prior to any other calls on this Channel
3296         /// If an Err is returned, it's a ChannelError::Ignore!
3297         pub fn send_htlc(&mut self, amount_msat: u64, payment_hash: PaymentHash, cltv_expiry: u32, source: HTLCSource, onion_routing_packet: msgs::OnionPacket) -> Result<Option<msgs::UpdateAddHTLC>, ChannelError> {
3298                 if (self.channel_state & (ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK)) != (ChannelState::ChannelFunded as u32) {
3299                         return Err(ChannelError::Ignore("Cannot send HTLC until channel is fully established and we haven't started shutting down"));
3300                 }
3301
3302                 if amount_msat > self.channel_value_satoshis * 1000 {
3303                         return Err(ChannelError::Ignore("Cannot send more than the total value of the channel"));
3304                 }
3305                 if amount_msat < self.their_htlc_minimum_msat {
3306                         return Err(ChannelError::Ignore("Cannot send less than their minimum HTLC value"));
3307                 }
3308
3309                 if (self.channel_state & (ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)) != 0 {
3310                         // Note that this should never really happen, if we're !is_live() on receipt of an
3311                         // incoming HTLC for relay will result in us rejecting the HTLC and we won't allow
3312                         // the user to send directly into a !is_live() channel. However, if we
3313                         // disconnected during the time the previous hop was doing the commitment dance we may
3314                         // end up getting here after the forwarding delay. In any case, returning an
3315                         // IgnoreError will get ChannelManager to do the right thing and fail backwards now.
3316                         return Err(ChannelError::Ignore("Cannot send an HTLC while disconnected/frozen for channel monitor update"));
3317                 }
3318
3319                 let (outbound_htlc_count, htlc_outbound_value_msat) = self.get_outbound_pending_htlc_stats();
3320                 if outbound_htlc_count + 1 > self.their_max_accepted_htlcs as u32 {
3321                         return Err(ChannelError::Ignore("Cannot push more than their max accepted HTLCs"));
3322                 }
3323                 // Check their_max_htlc_value_in_flight_msat
3324                 if htlc_outbound_value_msat + amount_msat > self.their_max_htlc_value_in_flight_msat {
3325                         return Err(ChannelError::Ignore("Cannot send value that would put us over the max HTLC value in flight our peer will accept"));
3326                 }
3327
3328                 // Check self.their_channel_reserve_satoshis (the amount we must keep as
3329                 // reserve for them to have something to claim if we misbehave)
3330                 if self.value_to_self_msat < self.their_channel_reserve_satoshis * 1000 + amount_msat + htlc_outbound_value_msat {
3331                         return Err(ChannelError::Ignore("Cannot send value that would put us over their reserve value"));
3332                 }
3333
3334                 //TODO: Check cltv_expiry? Do this in channel manager?
3335
3336                 // Now update local state:
3337                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
3338                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::AddHTLC {
3339                                 amount_msat: amount_msat,
3340                                 payment_hash: payment_hash,
3341                                 cltv_expiry: cltv_expiry,
3342                                 source,
3343                                 onion_routing_packet: onion_routing_packet,
3344                         });
3345                         return Ok(None);
3346                 }
3347
3348                 self.pending_outbound_htlcs.push(OutboundHTLCOutput {
3349                         htlc_id: self.next_local_htlc_id,
3350                         amount_msat: amount_msat,
3351                         payment_hash: payment_hash.clone(),
3352                         cltv_expiry: cltv_expiry,
3353                         state: OutboundHTLCState::LocalAnnounced(Box::new(onion_routing_packet.clone())),
3354                         source,
3355                 });
3356
3357                 let res = msgs::UpdateAddHTLC {
3358                         channel_id: self.channel_id,
3359                         htlc_id: self.next_local_htlc_id,
3360                         amount_msat: amount_msat,
3361                         payment_hash: payment_hash,
3362                         cltv_expiry: cltv_expiry,
3363                         onion_routing_packet: onion_routing_packet,
3364                 };
3365                 self.next_local_htlc_id += 1;
3366
3367                 Ok(Some(res))
3368         }
3369
3370         /// Creates a signed commitment transaction to send to the remote peer.
3371         /// Always returns a ChannelError::Close if an immediately-preceding (read: the
3372         /// last call to this Channel) send_htlc returned Ok(Some(_)) and there is an Err.
3373         /// May panic if called except immediately after a successful, Ok(Some(_))-returning send_htlc.
3374         pub fn send_commitment(&mut self) -> Result<(msgs::CommitmentSigned, ChannelMonitor), ChannelError> {
3375                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
3376                         panic!("Cannot create commitment tx until channel is fully established");
3377                 }
3378                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
3379                         panic!("Cannot create commitment tx until remote revokes their previous commitment");
3380                 }
3381                 if (self.channel_state & (ChannelState::PeerDisconnected as u32)) == (ChannelState::PeerDisconnected as u32) {
3382                         panic!("Cannot create commitment tx while disconnected, as send_htlc will have returned an Err so a send_commitment precondition has been violated");
3383                 }
3384                 if (self.channel_state & (ChannelState::MonitorUpdateFailed as u32)) == (ChannelState::MonitorUpdateFailed as u32) {
3385                         panic!("Cannot create commitment tx while awaiting monitor update unfreeze, as send_htlc will have returned an Err so a send_commitment precondition has been violated");
3386                 }
3387                 let mut have_updates = self.pending_update_fee.is_some();
3388                 for htlc in self.pending_outbound_htlcs.iter() {
3389                         if let OutboundHTLCState::LocalAnnounced(_) = htlc.state {
3390                                 have_updates = true;
3391                         }
3392                         if have_updates { break; }
3393                 }
3394                 for htlc in self.pending_inbound_htlcs.iter() {
3395                         if let InboundHTLCState::LocalRemoved(_) = htlc.state {
3396                                 have_updates = true;
3397                         }
3398                         if have_updates { break; }
3399                 }
3400                 if !have_updates {
3401                         panic!("Cannot create commitment tx until we have some updates to send");
3402                 }
3403                 self.send_commitment_no_status_check()
3404         }
3405         /// Only fails in case of bad keys
3406         fn send_commitment_no_status_check(&mut self) -> Result<(msgs::CommitmentSigned, ChannelMonitor), ChannelError> {
3407                 // We can upgrade the status of some HTLCs that are waiting on a commitment, even if we
3408                 // fail to generate this, we still are at least at a position where upgrading their status
3409                 // is acceptable.
3410                 for htlc in self.pending_inbound_htlcs.iter_mut() {
3411                         let new_state = if let &InboundHTLCState::AwaitingRemoteRevokeToAnnounce(ref forward_info) = &htlc.state {
3412                                 Some(InboundHTLCState::AwaitingAnnouncedRemoteRevoke(forward_info.clone()))
3413                         } else { None };
3414                         if let Some(state) = new_state {
3415                                 htlc.state = state;
3416                         }
3417                 }
3418                 for htlc in self.pending_outbound_htlcs.iter_mut() {
3419                         if let Some(fail_reason) = if let &mut OutboundHTLCState::AwaitingRemoteRevokeToRemove(ref mut fail_reason) = &mut htlc.state {
3420                                 Some(fail_reason.take())
3421                         } else { None } {
3422                                 htlc.state = OutboundHTLCState::AwaitingRemovedRemoteRevoke(fail_reason);
3423                         }
3424                 }
3425                 self.resend_order = RAACommitmentOrder::RevokeAndACKFirst;
3426
3427                 let (res, remote_commitment_tx, htlcs) = match self.send_commitment_no_state_update() {
3428                         Ok((res, (remote_commitment_tx, mut htlcs))) => {
3429                                 // Update state now that we've passed all the can-fail calls...
3430                                 let htlcs_no_ref = htlcs.drain(..).map(|(htlc, htlc_source)| (htlc, htlc_source.map(|source_ref| Box::new(source_ref.clone())))).collect();
3431                                 (res, remote_commitment_tx, htlcs_no_ref)
3432                         },
3433                         Err(e) => return Err(e),
3434                 };
3435
3436                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_commitment_tx, htlcs, self.cur_remote_commitment_transaction_number, self.their_cur_commitment_point.unwrap());
3437                 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
3438                 Ok((res, self.channel_monitor.clone()))
3439         }
3440
3441         /// Only fails in case of bad keys. Used for channel_reestablish commitment_signed generation
3442         /// when we shouldn't change HTLC/channel state.
3443         fn send_commitment_no_state_update(&self) -> Result<(msgs::CommitmentSigned, (Transaction, Vec<(HTLCOutputInCommitment, Option<&HTLCSource>)>)), ChannelError> {
3444                 let mut feerate_per_kw = self.feerate_per_kw;
3445                 if let Some(feerate) = self.pending_update_fee {
3446                         if self.channel_outbound {
3447                                 feerate_per_kw = feerate;
3448                         }
3449                 }
3450
3451                 let remote_keys = self.build_remote_transaction_keys()?;
3452                 let remote_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, true, feerate_per_kw);
3453                 let (signature, htlc_signatures);
3454
3455                 {
3456                         let mut htlcs = Vec::with_capacity(remote_commitment_tx.2.len());
3457                         for &(ref htlc, _) in remote_commitment_tx.2.iter() {
3458                                 htlcs.push(htlc);
3459                         }
3460
3461                         let res = self.local_keys.sign_remote_commitment(self.channel_value_satoshis, &self.get_funding_redeemscript(), feerate_per_kw, &remote_commitment_tx.0, &remote_keys, &htlcs, self.our_to_self_delay, &self.secp_ctx)
3462                                 .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed"))?;
3463                         signature = res.0;
3464                         htlc_signatures = res.1;
3465
3466                         log_trace!(self, "Signed remote commitment tx {} with redeemscript {} -> {}",
3467                                 encode::serialize_hex(&remote_commitment_tx.0),
3468                                 encode::serialize_hex(&self.get_funding_redeemscript()),
3469                                 log_bytes!(signature.serialize_compact()[..]));
3470
3471                         for (ref htlc_sig, ref htlc) in htlc_signatures.iter().zip(htlcs) {
3472                                 log_trace!(self, "Signed remote HTLC tx {} with redeemscript {} with pubkey {} -> {}",
3473                                         encode::serialize_hex(&chan_utils::build_htlc_transaction(&remote_commitment_tx.0.txid(), feerate_per_kw, self.our_to_self_delay, htlc, &remote_keys.a_delayed_payment_key, &remote_keys.revocation_key)),
3474                                         encode::serialize_hex(&chan_utils::get_htlc_redeemscript(&htlc, &remote_keys)),
3475                                         log_bytes!(remote_keys.a_htlc_key.serialize()),
3476                                         log_bytes!(htlc_sig.serialize_compact()[..]));
3477                         }
3478                 }
3479
3480                 Ok((msgs::CommitmentSigned {
3481                         channel_id: self.channel_id,
3482                         signature,
3483                         htlc_signatures,
3484                 }, (remote_commitment_tx.0, remote_commitment_tx.2)))
3485         }
3486
3487         /// Adds a pending outbound HTLC to this channel, and creates a signed commitment transaction
3488         /// to send to the remote peer in one go.
3489         /// Shorthand for calling send_htlc() followed by send_commitment(), see docs on those for
3490         /// more info.
3491         pub fn send_htlc_and_commit(&mut self, amount_msat: u64, payment_hash: PaymentHash, cltv_expiry: u32, source: HTLCSource, onion_routing_packet: msgs::OnionPacket) -> Result<Option<(msgs::UpdateAddHTLC, msgs::CommitmentSigned, ChannelMonitor)>, ChannelError> {
3492                 match self.send_htlc(amount_msat, payment_hash, cltv_expiry, source, onion_routing_packet)? {
3493                         Some(update_add_htlc) => {
3494                                 let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
3495                                 Ok(Some((update_add_htlc, commitment_signed, monitor_update)))
3496                         },
3497                         None => Ok(None)
3498                 }
3499         }
3500
3501         /// Begins the shutdown process, getting a message for the remote peer and returning all
3502         /// holding cell HTLCs for payment failure.
3503         pub fn get_shutdown(&mut self) -> Result<(msgs::Shutdown, Vec<(HTLCSource, PaymentHash)>), APIError> {
3504                 for htlc in self.pending_outbound_htlcs.iter() {
3505                         if let OutboundHTLCState::LocalAnnounced(_) = htlc.state {
3506                                 return Err(APIError::APIMisuseError{err: "Cannot begin shutdown with pending HTLCs. Process pending events first"});
3507                         }
3508                 }
3509                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != 0 {
3510                         if (self.channel_state & ChannelState::LocalShutdownSent as u32) == ChannelState::LocalShutdownSent as u32 {
3511                                 return Err(APIError::APIMisuseError{err: "Shutdown already in progress"});
3512                         }
3513                         else if (self.channel_state & ChannelState::RemoteShutdownSent as u32) == ChannelState::RemoteShutdownSent as u32 {
3514                                 return Err(APIError::ChannelUnavailable{err: "Shutdown already in progress by remote"});
3515                         }
3516                 }
3517                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
3518                 if self.channel_state & (ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32) != 0 {
3519                         return Err(APIError::ChannelUnavailable{err: "Cannot begin shutdown while peer is disconnected or we're waiting on a monitor update, maybe force-close instead?"});
3520                 }
3521
3522                 let our_closing_script = self.get_closing_scriptpubkey();
3523
3524                 // From here on out, we may not fail!
3525                 if self.channel_state < ChannelState::FundingSent as u32 {
3526                         self.channel_state = ChannelState::ShutdownComplete as u32;
3527                 } else {
3528                         self.channel_state |= ChannelState::LocalShutdownSent as u32;
3529                 }
3530                 self.channel_update_count += 1;
3531
3532                 // Go ahead and drop holding cell updates as we'd rather fail payments than wait to send
3533                 // our shutdown until we've committed all of the pending changes.
3534                 self.holding_cell_update_fee = None;
3535                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
3536                 self.holding_cell_htlc_updates.retain(|htlc_update| {
3537                         match htlc_update {
3538                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
3539                                         dropped_outbound_htlcs.push((source.clone(), payment_hash.clone()));
3540                                         false
3541                                 },
3542                                 _ => true
3543                         }
3544                 });
3545
3546                 Ok((msgs::Shutdown {
3547                         channel_id: self.channel_id,
3548                         scriptpubkey: our_closing_script,
3549                 }, dropped_outbound_htlcs))
3550         }
3551
3552         /// Gets the latest commitment transaction and any dependent transactions for relay (forcing
3553         /// shutdown of this channel - no more calls into this Channel may be made afterwards except
3554         /// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
3555         /// Also returns the list of payment_hashes for channels which we can safely fail backwards
3556         /// immediately (others we will have to allow to time out).
3557         pub fn force_shutdown(&mut self) -> (Vec<Transaction>, Vec<(HTLCSource, PaymentHash)>) {
3558                 assert!(self.channel_state != ChannelState::ShutdownComplete as u32);
3559
3560                 // We go ahead and "free" any holding cell HTLCs or HTLCs we haven't yet committed to and
3561                 // return them to fail the payment.
3562                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
3563                 for htlc_update in self.holding_cell_htlc_updates.drain(..) {
3564                         match htlc_update {
3565                                 HTLCUpdateAwaitingACK::AddHTLC { source, payment_hash, .. } => {
3566                                         dropped_outbound_htlcs.push((source, payment_hash));
3567                                 },
3568                                 _ => {}
3569                         }
3570                 }
3571
3572                 for _htlc in self.pending_outbound_htlcs.drain(..) {
3573                         //TODO: Do something with the remaining HTLCs
3574                         //(we need to have the ChannelManager monitor them so we can claim the inbound HTLCs
3575                         //which correspond)
3576                 }
3577
3578                 self.channel_state = ChannelState::ShutdownComplete as u32;
3579                 self.channel_update_count += 1;
3580                 (self.channel_monitor.get_latest_local_commitment_txn(), dropped_outbound_htlcs)
3581         }
3582 }
3583
3584 const SERIALIZATION_VERSION: u8 = 1;
3585 const MIN_SERIALIZATION_VERSION: u8 = 1;
3586
3587 impl Writeable for InboundHTLCRemovalReason {
3588         fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
3589                 match self {
3590                         &InboundHTLCRemovalReason::FailRelay(ref error_packet) => {
3591                                 0u8.write(writer)?;
3592                                 error_packet.write(writer)?;
3593                         },
3594                         &InboundHTLCRemovalReason::FailMalformed((ref onion_hash, ref err_code)) => {
3595                                 1u8.write(writer)?;
3596                                 onion_hash.write(writer)?;
3597                                 err_code.write(writer)?;
3598                         },
3599                         &InboundHTLCRemovalReason::Fulfill(ref payment_preimage) => {
3600                                 2u8.write(writer)?;
3601                                 payment_preimage.write(writer)?;
3602                         },
3603                 }
3604                 Ok(())
3605         }
3606 }
3607
3608 impl<R: ::std::io::Read> Readable<R> for InboundHTLCRemovalReason {
3609         fn read(reader: &mut R) -> Result<Self, DecodeError> {
3610                 Ok(match <u8 as Readable<R>>::read(reader)? {
3611                         0 => InboundHTLCRemovalReason::FailRelay(Readable::read(reader)?),
3612                         1 => InboundHTLCRemovalReason::FailMalformed((Readable::read(reader)?, Readable::read(reader)?)),
3613                         2 => InboundHTLCRemovalReason::Fulfill(Readable::read(reader)?),
3614                         _ => return Err(DecodeError::InvalidValue),
3615                 })
3616         }
3617 }
3618
3619 impl<ChanSigner: ChannelKeys + Writeable> Writeable for Channel<ChanSigner> {
3620         fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
3621                 // Note that we write out as if remove_uncommitted_htlcs_and_mark_paused had just been
3622                 // called but include holding cell updates (and obviously we don't modify self).
3623
3624                 writer.write_all(&[SERIALIZATION_VERSION; 1])?;
3625                 writer.write_all(&[MIN_SERIALIZATION_VERSION; 1])?;
3626
3627                 self.user_id.write(writer)?;
3628                 self.config.write(writer)?;
3629
3630                 self.channel_id.write(writer)?;
3631                 (self.channel_state | ChannelState::PeerDisconnected as u32).write(writer)?;
3632                 self.channel_outbound.write(writer)?;
3633                 self.channel_value_satoshis.write(writer)?;
3634
3635                 self.local_keys.write(writer)?;
3636                 self.shutdown_pubkey.write(writer)?;
3637
3638                 self.cur_local_commitment_transaction_number.write(writer)?;
3639                 self.cur_remote_commitment_transaction_number.write(writer)?;
3640                 self.value_to_self_msat.write(writer)?;
3641
3642                 let mut dropped_inbound_htlcs = 0;
3643                 for htlc in self.pending_inbound_htlcs.iter() {
3644                         if let InboundHTLCState::RemoteAnnounced(_) = htlc.state {
3645                                 dropped_inbound_htlcs += 1;
3646                         }
3647                 }
3648                 (self.pending_inbound_htlcs.len() as u64 - dropped_inbound_htlcs).write(writer)?;
3649                 for htlc in self.pending_inbound_htlcs.iter() {
3650                         htlc.htlc_id.write(writer)?;
3651                         htlc.amount_msat.write(writer)?;
3652                         htlc.cltv_expiry.write(writer)?;
3653                         htlc.payment_hash.write(writer)?;
3654                         match &htlc.state {
3655                                 &InboundHTLCState::RemoteAnnounced(_) => {}, // Drop
3656                                 &InboundHTLCState::AwaitingRemoteRevokeToAnnounce(ref htlc_state) => {
3657                                         1u8.write(writer)?;
3658                                         htlc_state.write(writer)?;
3659                                 },
3660                                 &InboundHTLCState::AwaitingAnnouncedRemoteRevoke(ref htlc_state) => {
3661                                         2u8.write(writer)?;
3662                                         htlc_state.write(writer)?;
3663                                 },
3664                                 &InboundHTLCState::Committed => {
3665                                         3u8.write(writer)?;
3666                                 },
3667                                 &InboundHTLCState::LocalRemoved(ref removal_reason) => {
3668                                         4u8.write(writer)?;
3669                                         removal_reason.write(writer)?;
3670                                 },
3671                         }
3672                 }
3673
3674                 macro_rules! write_option {
3675                         ($thing: expr) => {
3676                                 match &$thing {
3677                                         &None => 0u8.write(writer)?,
3678                                         &Some(ref v) => {
3679                                                 1u8.write(writer)?;
3680                                                 v.write(writer)?;
3681                                         },
3682                                 }
3683                         }
3684                 }
3685
3686                 (self.pending_outbound_htlcs.len() as u64).write(writer)?;
3687                 for htlc in self.pending_outbound_htlcs.iter() {
3688                         htlc.htlc_id.write(writer)?;
3689                         htlc.amount_msat.write(writer)?;
3690                         htlc.cltv_expiry.write(writer)?;
3691                         htlc.payment_hash.write(writer)?;
3692                         htlc.source.write(writer)?;
3693                         match &htlc.state {
3694                                 &OutboundHTLCState::LocalAnnounced(ref onion_packet) => {
3695                                         0u8.write(writer)?;
3696                                         onion_packet.write(writer)?;
3697                                 },
3698                                 &OutboundHTLCState::Committed => {
3699                                         1u8.write(writer)?;
3700                                 },
3701                                 &OutboundHTLCState::RemoteRemoved(ref fail_reason) => {
3702                                         2u8.write(writer)?;
3703                                         write_option!(*fail_reason);
3704                                 },
3705                                 &OutboundHTLCState::AwaitingRemoteRevokeToRemove(ref fail_reason) => {
3706                                         3u8.write(writer)?;
3707                                         write_option!(*fail_reason);
3708                                 },
3709                                 &OutboundHTLCState::AwaitingRemovedRemoteRevoke(ref fail_reason) => {
3710                                         4u8.write(writer)?;
3711                                         write_option!(*fail_reason);
3712                                 },
3713                         }
3714                 }
3715
3716                 (self.holding_cell_htlc_updates.len() as u64).write(writer)?;
3717                 for update in self.holding_cell_htlc_updates.iter() {
3718                         match update {
3719                                 &HTLCUpdateAwaitingACK::AddHTLC { ref amount_msat, ref cltv_expiry, ref payment_hash, ref source, ref onion_routing_packet } => {
3720                                         0u8.write(writer)?;
3721                                         amount_msat.write(writer)?;
3722                                         cltv_expiry.write(writer)?;
3723                                         payment_hash.write(writer)?;
3724                                         source.write(writer)?;
3725                                         onion_routing_packet.write(writer)?;
3726                                 },
3727                                 &HTLCUpdateAwaitingACK::ClaimHTLC { ref payment_preimage, ref htlc_id } => {
3728                                         1u8.write(writer)?;
3729                                         payment_preimage.write(writer)?;
3730                                         htlc_id.write(writer)?;
3731                                 },
3732                                 &HTLCUpdateAwaitingACK::FailHTLC { ref htlc_id, ref err_packet } => {
3733                                         2u8.write(writer)?;
3734                                         htlc_id.write(writer)?;
3735                                         err_packet.write(writer)?;
3736                                 }
3737                         }
3738                 }
3739
3740                 match self.resend_order {
3741                         RAACommitmentOrder::CommitmentFirst => 0u8.write(writer)?,
3742                         RAACommitmentOrder::RevokeAndACKFirst => 1u8.write(writer)?,
3743                 }
3744
3745                 self.monitor_pending_funding_locked.write(writer)?;
3746                 self.monitor_pending_revoke_and_ack.write(writer)?;
3747                 self.monitor_pending_commitment_signed.write(writer)?;
3748
3749                 (self.monitor_pending_forwards.len() as u64).write(writer)?;
3750                 for &(ref pending_forward, ref htlc_id) in self.monitor_pending_forwards.iter() {
3751                         pending_forward.write(writer)?;
3752                         htlc_id.write(writer)?;
3753                 }
3754
3755                 (self.monitor_pending_failures.len() as u64).write(writer)?;
3756                 for &(ref htlc_source, ref payment_hash, ref fail_reason) in self.monitor_pending_failures.iter() {
3757                         htlc_source.write(writer)?;
3758                         payment_hash.write(writer)?;
3759                         fail_reason.write(writer)?;
3760                 }
3761
3762                 write_option!(self.pending_update_fee);
3763                 write_option!(self.holding_cell_update_fee);
3764
3765                 self.next_local_htlc_id.write(writer)?;
3766                 (self.next_remote_htlc_id - dropped_inbound_htlcs).write(writer)?;
3767                 self.channel_update_count.write(writer)?;
3768                 self.feerate_per_kw.write(writer)?;
3769
3770                 match self.last_sent_closing_fee {
3771                         Some((feerate, fee, sig)) => {
3772                                 1u8.write(writer)?;
3773                                 feerate.write(writer)?;
3774                                 fee.write(writer)?;
3775                                 sig.write(writer)?;
3776                         },
3777                         None => 0u8.write(writer)?,
3778                 }
3779
3780                 write_option!(self.funding_tx_confirmed_in);
3781                 write_option!(self.short_channel_id);
3782
3783                 self.last_block_connected.write(writer)?;
3784                 self.funding_tx_confirmations.write(writer)?;
3785
3786                 self.their_dust_limit_satoshis.write(writer)?;
3787                 self.our_dust_limit_satoshis.write(writer)?;
3788                 self.their_max_htlc_value_in_flight_msat.write(writer)?;
3789                 self.their_channel_reserve_satoshis.write(writer)?;
3790                 self.their_htlc_minimum_msat.write(writer)?;
3791                 self.our_htlc_minimum_msat.write(writer)?;
3792                 self.their_to_self_delay.write(writer)?;
3793                 self.our_to_self_delay.write(writer)?;
3794                 self.their_max_accepted_htlcs.write(writer)?;
3795                 self.minimum_depth.write(writer)?;
3796
3797                 write_option!(self.their_funding_pubkey);
3798                 write_option!(self.their_revocation_basepoint);
3799                 write_option!(self.their_payment_basepoint);
3800                 write_option!(self.their_delayed_payment_basepoint);
3801                 write_option!(self.their_htlc_basepoint);
3802                 write_option!(self.their_cur_commitment_point);
3803
3804                 write_option!(self.their_prev_commitment_point);
3805                 self.their_node_id.write(writer)?;
3806
3807                 write_option!(self.their_shutdown_scriptpubkey);
3808
3809                 self.channel_monitor.write_for_disk(writer)?;
3810                 Ok(())
3811         }
3812 }
3813
3814 impl<R : ::std::io::Read, ChanSigner: ChannelKeys + Readable<R>> ReadableArgs<R, Arc<Logger>> for Channel<ChanSigner> {
3815         fn read(reader: &mut R, logger: Arc<Logger>) -> Result<Self, DecodeError> {
3816                 let _ver: u8 = Readable::read(reader)?;
3817                 let min_ver: u8 = Readable::read(reader)?;
3818                 if min_ver > SERIALIZATION_VERSION {
3819                         return Err(DecodeError::UnknownVersion);
3820                 }
3821
3822                 let user_id = Readable::read(reader)?;
3823                 let config: ChannelConfig = Readable::read(reader)?;
3824
3825                 let channel_id = Readable::read(reader)?;
3826                 let channel_state = Readable::read(reader)?;
3827                 let channel_outbound = Readable::read(reader)?;
3828                 let channel_value_satoshis = Readable::read(reader)?;
3829
3830                 let local_keys = Readable::read(reader)?;
3831                 let shutdown_pubkey = Readable::read(reader)?;
3832
3833                 let cur_local_commitment_transaction_number = Readable::read(reader)?;
3834                 let cur_remote_commitment_transaction_number = Readable::read(reader)?;
3835                 let value_to_self_msat = Readable::read(reader)?;
3836
3837                 let pending_inbound_htlc_count: u64 = Readable::read(reader)?;
3838                 let mut pending_inbound_htlcs = Vec::with_capacity(cmp::min(pending_inbound_htlc_count as usize, OUR_MAX_HTLCS as usize));
3839                 for _ in 0..pending_inbound_htlc_count {
3840                         pending_inbound_htlcs.push(InboundHTLCOutput {
3841                                 htlc_id: Readable::read(reader)?,
3842                                 amount_msat: Readable::read(reader)?,
3843                                 cltv_expiry: Readable::read(reader)?,
3844                                 payment_hash: Readable::read(reader)?,
3845                                 state: match <u8 as Readable<R>>::read(reader)? {
3846                                         1 => InboundHTLCState::AwaitingRemoteRevokeToAnnounce(Readable::read(reader)?),
3847                                         2 => InboundHTLCState::AwaitingAnnouncedRemoteRevoke(Readable::read(reader)?),
3848                                         3 => InboundHTLCState::Committed,
3849                                         4 => InboundHTLCState::LocalRemoved(Readable::read(reader)?),
3850                                         _ => return Err(DecodeError::InvalidValue),
3851                                 },
3852                         });
3853                 }
3854
3855                 let pending_outbound_htlc_count: u64 = Readable::read(reader)?;
3856                 let mut pending_outbound_htlcs = Vec::with_capacity(cmp::min(pending_outbound_htlc_count as usize, OUR_MAX_HTLCS as usize));
3857                 for _ in 0..pending_outbound_htlc_count {
3858                         pending_outbound_htlcs.push(OutboundHTLCOutput {
3859                                 htlc_id: Readable::read(reader)?,
3860                                 amount_msat: Readable::read(reader)?,
3861                                 cltv_expiry: Readable::read(reader)?,
3862                                 payment_hash: Readable::read(reader)?,
3863                                 source: Readable::read(reader)?,
3864                                 state: match <u8 as Readable<R>>::read(reader)? {
3865                                         0 => OutboundHTLCState::LocalAnnounced(Box::new(Readable::read(reader)?)),
3866                                         1 => OutboundHTLCState::Committed,
3867                                         2 => OutboundHTLCState::RemoteRemoved(Readable::read(reader)?),
3868                                         3 => OutboundHTLCState::AwaitingRemoteRevokeToRemove(Readable::read(reader)?),
3869                                         4 => OutboundHTLCState::AwaitingRemovedRemoteRevoke(Readable::read(reader)?),
3870                                         _ => return Err(DecodeError::InvalidValue),
3871                                 },
3872                         });
3873                 }
3874
3875                 let holding_cell_htlc_update_count: u64 = Readable::read(reader)?;
3876                 let mut holding_cell_htlc_updates = Vec::with_capacity(cmp::min(holding_cell_htlc_update_count as usize, OUR_MAX_HTLCS as usize*2));
3877                 for _ in 0..holding_cell_htlc_update_count {
3878                         holding_cell_htlc_updates.push(match <u8 as Readable<R>>::read(reader)? {
3879                                 0 => HTLCUpdateAwaitingACK::AddHTLC {
3880                                         amount_msat: Readable::read(reader)?,
3881                                         cltv_expiry: Readable::read(reader)?,
3882                                         payment_hash: Readable::read(reader)?,
3883                                         source: Readable::read(reader)?,
3884                                         onion_routing_packet: Readable::read(reader)?,
3885                                 },
3886                                 1 => HTLCUpdateAwaitingACK::ClaimHTLC {
3887                                         payment_preimage: Readable::read(reader)?,
3888                                         htlc_id: Readable::read(reader)?,
3889                                 },
3890                                 2 => HTLCUpdateAwaitingACK::FailHTLC {
3891                                         htlc_id: Readable::read(reader)?,
3892                                         err_packet: Readable::read(reader)?,
3893                                 },
3894                                 _ => return Err(DecodeError::InvalidValue),
3895                         });
3896                 }
3897
3898                 let resend_order = match <u8 as Readable<R>>::read(reader)? {
3899                         0 => RAACommitmentOrder::CommitmentFirst,
3900                         1 => RAACommitmentOrder::RevokeAndACKFirst,
3901                         _ => return Err(DecodeError::InvalidValue),
3902                 };
3903
3904                 let monitor_pending_funding_locked = Readable::read(reader)?;
3905                 let monitor_pending_revoke_and_ack = Readable::read(reader)?;
3906                 let monitor_pending_commitment_signed = Readable::read(reader)?;
3907
3908                 let monitor_pending_forwards_count: u64 = Readable::read(reader)?;
3909                 let mut monitor_pending_forwards = Vec::with_capacity(cmp::min(monitor_pending_forwards_count as usize, OUR_MAX_HTLCS as usize));
3910                 for _ in 0..monitor_pending_forwards_count {
3911                         monitor_pending_forwards.push((Readable::read(reader)?, Readable::read(reader)?));
3912                 }
3913
3914                 let monitor_pending_failures_count: u64 = Readable::read(reader)?;
3915                 let mut monitor_pending_failures = Vec::with_capacity(cmp::min(monitor_pending_failures_count as usize, OUR_MAX_HTLCS as usize));
3916                 for _ in 0..monitor_pending_failures_count {
3917                         monitor_pending_failures.push((Readable::read(reader)?, Readable::read(reader)?, Readable::read(reader)?));
3918                 }
3919
3920                 let pending_update_fee = Readable::read(reader)?;
3921                 let holding_cell_update_fee = Readable::read(reader)?;
3922
3923                 let next_local_htlc_id = Readable::read(reader)?;
3924                 let next_remote_htlc_id = Readable::read(reader)?;
3925                 let channel_update_count = Readable::read(reader)?;
3926                 let feerate_per_kw = Readable::read(reader)?;
3927
3928                 let last_sent_closing_fee = match <u8 as Readable<R>>::read(reader)? {
3929                         0 => None,
3930                         1 => Some((Readable::read(reader)?, Readable::read(reader)?, Readable::read(reader)?)),
3931                         _ => return Err(DecodeError::InvalidValue),
3932                 };
3933
3934                 let funding_tx_confirmed_in = Readable::read(reader)?;
3935                 let short_channel_id = Readable::read(reader)?;
3936
3937                 let last_block_connected = Readable::read(reader)?;
3938                 let funding_tx_confirmations = Readable::read(reader)?;
3939
3940                 let their_dust_limit_satoshis = Readable::read(reader)?;
3941                 let our_dust_limit_satoshis = Readable::read(reader)?;
3942                 let their_max_htlc_value_in_flight_msat = Readable::read(reader)?;
3943                 let their_channel_reserve_satoshis = Readable::read(reader)?;
3944                 let their_htlc_minimum_msat = Readable::read(reader)?;
3945                 let our_htlc_minimum_msat = Readable::read(reader)?;
3946                 let their_to_self_delay = Readable::read(reader)?;
3947                 let our_to_self_delay = Readable::read(reader)?;
3948                 let their_max_accepted_htlcs = Readable::read(reader)?;
3949                 let minimum_depth = Readable::read(reader)?;
3950
3951                 let their_funding_pubkey = Readable::read(reader)?;
3952                 let their_revocation_basepoint = Readable::read(reader)?;
3953                 let their_payment_basepoint = Readable::read(reader)?;
3954                 let their_delayed_payment_basepoint = Readable::read(reader)?;
3955                 let their_htlc_basepoint = Readable::read(reader)?;
3956                 let their_cur_commitment_point = Readable::read(reader)?;
3957
3958                 let their_prev_commitment_point = Readable::read(reader)?;
3959                 let their_node_id = Readable::read(reader)?;
3960
3961                 let their_shutdown_scriptpubkey = Readable::read(reader)?;
3962                 let (monitor_last_block, channel_monitor) = ReadableArgs::read(reader, logger.clone())?;
3963                 // We drop the ChannelMonitor's last block connected hash cause we don't actually bother
3964                 // doing full block connection operations on the internal CHannelMonitor copies
3965                 if monitor_last_block != last_block_connected {
3966                         return Err(DecodeError::InvalidValue);
3967                 }
3968
3969                 Ok(Channel {
3970                         user_id,
3971
3972                         config,
3973                         channel_id,
3974                         channel_state,
3975                         channel_outbound,
3976                         secp_ctx: Secp256k1::new(),
3977                         channel_value_satoshis,
3978
3979                         local_keys,
3980                         shutdown_pubkey,
3981
3982                         cur_local_commitment_transaction_number,
3983                         cur_remote_commitment_transaction_number,
3984                         value_to_self_msat,
3985
3986                         pending_inbound_htlcs,
3987                         pending_outbound_htlcs,
3988                         holding_cell_htlc_updates,
3989
3990                         resend_order,
3991
3992                         monitor_pending_funding_locked,
3993                         monitor_pending_revoke_and_ack,
3994                         monitor_pending_commitment_signed,
3995                         monitor_pending_forwards,
3996                         monitor_pending_failures,
3997
3998                         pending_update_fee,
3999                         holding_cell_update_fee,
4000                         next_local_htlc_id,
4001                         next_remote_htlc_id,
4002                         channel_update_count,
4003                         feerate_per_kw,
4004
4005                         #[cfg(debug_assertions)]
4006                         max_commitment_tx_output_local: ::std::sync::Mutex::new((0, 0)),
4007                         #[cfg(debug_assertions)]
4008                         max_commitment_tx_output_remote: ::std::sync::Mutex::new((0, 0)),
4009
4010                         last_sent_closing_fee,
4011
4012                         funding_tx_confirmed_in,
4013                         short_channel_id,
4014                         last_block_connected,
4015                         funding_tx_confirmations,
4016
4017                         their_dust_limit_satoshis,
4018                         our_dust_limit_satoshis,
4019                         their_max_htlc_value_in_flight_msat,
4020                         their_channel_reserve_satoshis,
4021                         their_htlc_minimum_msat,
4022                         our_htlc_minimum_msat,
4023                         their_to_self_delay,
4024                         our_to_self_delay,
4025                         their_max_accepted_htlcs,
4026                         minimum_depth,
4027
4028                         their_funding_pubkey,
4029                         their_revocation_basepoint,
4030                         their_payment_basepoint,
4031                         their_delayed_payment_basepoint,
4032                         their_htlc_basepoint,
4033                         their_cur_commitment_point,
4034
4035                         their_prev_commitment_point,
4036                         their_node_id,
4037
4038                         their_shutdown_scriptpubkey,
4039
4040                         channel_monitor,
4041
4042                         network_sync: UpdateStatus::Fresh,
4043
4044                         logger,
4045                 })
4046         }
4047 }
4048
4049 #[cfg(test)]
4050 mod tests {
4051         use bitcoin::util::bip143;
4052         use bitcoin::consensus::encode::serialize;
4053         use bitcoin::blockdata::script::{Script, Builder};
4054         use bitcoin::blockdata::transaction::Transaction;
4055         use bitcoin::blockdata::opcodes;
4056         use bitcoin_hashes::hex::FromHex;
4057         use hex;
4058         use ln::channelmanager::{HTLCSource, PaymentPreimage, PaymentHash};
4059         use ln::channel::{Channel,ChannelKeys,InboundHTLCOutput,OutboundHTLCOutput,InboundHTLCState,OutboundHTLCState,HTLCOutputInCommitment,TxCreationKeys};
4060         use ln::channel::MAX_FUNDING_SATOSHIS;
4061         use ln::chan_utils;
4062         use ln::chan_utils::LocalCommitmentTransaction;
4063         use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
4064         use chain::keysinterface::{InMemoryChannelKeys, KeysInterface};
4065         use chain::transaction::OutPoint;
4066         use util::config::UserConfig;
4067         use util::test_utils;
4068         use util::logger::Logger;
4069         use secp256k1::{Secp256k1,Message,Signature};
4070         use secp256k1::key::{SecretKey,PublicKey};
4071         use bitcoin_hashes::sha256::Hash as Sha256;
4072         use bitcoin_hashes::sha256d::Hash as Sha256dHash;
4073         use bitcoin_hashes::hash160::Hash as Hash160;
4074         use bitcoin_hashes::Hash;
4075         use std::sync::Arc;
4076
4077         struct TestFeeEstimator {
4078                 fee_est: u64
4079         }
4080         impl FeeEstimator for TestFeeEstimator {
4081                 fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 {
4082                         self.fee_est
4083                 }
4084         }
4085
4086         #[test]
4087         fn test_max_funding_satoshis() {
4088                 assert!(MAX_FUNDING_SATOSHIS <= 21_000_000 * 100_000_000,
4089                         "MAX_FUNDING_SATOSHIS is greater than all satoshis in existence");
4090         }
4091
4092         struct Keys {
4093                 chan_keys: InMemoryChannelKeys,
4094         }
4095         impl KeysInterface for Keys {
4096                 type ChanKeySigner = InMemoryChannelKeys;
4097
4098                 fn get_node_secret(&self) -> SecretKey { panic!(); }
4099                 fn get_destination_script(&self) -> Script {
4100                         let secp_ctx = Secp256k1::signing_only();
4101                         let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
4102                         let our_channel_monitor_claim_key_hash = Hash160::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
4103                         Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
4104                 }
4105
4106                 fn get_shutdown_pubkey(&self) -> PublicKey {
4107                         let secp_ctx = Secp256k1::signing_only();
4108                         let channel_close_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
4109                         PublicKey::from_secret_key(&secp_ctx, &channel_close_key)
4110                 }
4111
4112                 fn get_channel_keys(&self, _inbound: bool) -> InMemoryChannelKeys { self.chan_keys.clone() }
4113                 fn get_onion_rand(&self) -> (SecretKey, [u8; 32]) { panic!(); }
4114                 fn get_channel_id(&self) -> [u8; 32] { [0; 32] }
4115         }
4116
4117         #[test]
4118         fn outbound_commitment_test() {
4119                 // Test vectors from BOLT 3 Appendix C:
4120                 let feeest = TestFeeEstimator{fee_est: 15000};
4121                 let logger : Arc<Logger> = Arc::new(test_utils::TestLogger::new());
4122                 let secp_ctx = Secp256k1::new();
4123
4124                 let chan_keys = InMemoryChannelKeys {
4125                         funding_key: SecretKey::from_slice(&hex::decode("30ff4956bbdd3222d44cc5e8a1261dab1e07957bdac5ae88fe3261ef321f3749").unwrap()[..]).unwrap(),
4126                         payment_base_key: SecretKey::from_slice(&hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap(),
4127                         delayed_payment_base_key: SecretKey::from_slice(&hex::decode("3333333333333333333333333333333333333333333333333333333333333333").unwrap()[..]).unwrap(),
4128                         htlc_base_key: SecretKey::from_slice(&hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap(),
4129
4130                         // These aren't set in the test vectors:
4131                         revocation_base_key: SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
4132                         commitment_seed: [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff],
4133                 };
4134                 assert_eq!(PublicKey::from_secret_key(&secp_ctx, chan_keys.funding_key()).serialize()[..],
4135                                 hex::decode("023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb").unwrap()[..]);
4136                 let keys_provider: Arc<KeysInterface<ChanKeySigner = InMemoryChannelKeys>> = Arc::new(Keys { chan_keys });
4137
4138                 let their_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
4139                 let mut config = UserConfig::default();
4140                 config.channel_options.announced_channel = false;
4141                 let mut chan = Channel::<InMemoryChannelKeys>::new_outbound(&feeest, &keys_provider, their_node_id, 10000000, 100000, 42, Arc::clone(&logger), &config).unwrap(); // Nothing uses their network key in this test
4142                 chan.their_to_self_delay = 144;
4143                 chan.our_dust_limit_satoshis = 546;
4144
4145                 let funding_info = OutPoint::new(Sha256dHash::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(), 0);
4146                 chan.channel_monitor.set_funding_info((funding_info, Script::new()));
4147
4148                 chan.their_payment_basepoint = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&hex::decode("4444444444444444444444444444444444444444444444444444444444444444").unwrap()[..]).unwrap()));
4149                 assert_eq!(chan.their_payment_basepoint.unwrap().serialize()[..],
4150                                 hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);
4151
4152                 chan.their_funding_pubkey = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&hex::decode("1552dfba4f6cf29a62a0af13c8d6981d36d0ef8d61ba10fb0fe90da7634d7e13").unwrap()[..]).unwrap()));
4153                 assert_eq!(chan.their_funding_pubkey.unwrap().serialize()[..],
4154                                 hex::decode("030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c1").unwrap()[..]);
4155
4156                 chan.their_htlc_basepoint = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&hex::decode("4444444444444444444444444444444444444444444444444444444444444444").unwrap()[..]).unwrap()));
4157                 assert_eq!(chan.their_htlc_basepoint.unwrap().serialize()[..],
4158                                 hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);
4159
4160                 chan.their_revocation_basepoint = Some(PublicKey::from_slice(&hex::decode("02466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27").unwrap()[..]).unwrap());
4161
4162                 // We can't just use build_local_transaction_keys here as the per_commitment_secret is not
4163                 // derived from a commitment_seed, so instead we copy it here and call
4164                 // build_commitment_transaction.
4165                 let delayed_payment_base = PublicKey::from_secret_key(&secp_ctx, chan.local_keys.delayed_payment_base_key());
4166                 let per_commitment_secret = SecretKey::from_slice(&hex::decode("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
4167                 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
4168                 let htlc_basepoint = PublicKey::from_secret_key(&secp_ctx, chan.local_keys.htlc_base_key());
4169                 let keys = TxCreationKeys::new(&secp_ctx, &per_commitment_point, &delayed_payment_base, &htlc_basepoint, &chan.their_revocation_basepoint.unwrap(), &chan.their_payment_basepoint.unwrap(), &chan.their_htlc_basepoint.unwrap()).unwrap();
4170
4171                 let mut unsigned_tx: (Transaction, Vec<HTLCOutputInCommitment>);
4172
4173                 macro_rules! test_commitment {
4174                         ( $their_sig_hex: expr, $our_sig_hex: expr, $tx_hex: expr) => {
4175                                 unsigned_tx = {
4176                                         let mut res = chan.build_commitment_transaction(0xffffffffffff - 42, &keys, true, false, chan.feerate_per_kw);
4177                                         let htlcs = res.2.drain(..)
4178                                                 .filter_map(|(htlc, _)| if htlc.transaction_output_index.is_some() { Some(htlc) } else { None })
4179                                                 .collect();
4180                                         (res.0, htlcs)
4181                                 };
4182                                 let redeemscript = chan.get_funding_redeemscript();
4183                                 let their_signature = Signature::from_der(&hex::decode($their_sig_hex).unwrap()[..]).unwrap();
4184                                 let sighash = Message::from_slice(&bip143::SighashComponents::new(&unsigned_tx.0).sighash_all(&unsigned_tx.0.input[0], &redeemscript, chan.channel_value_satoshis)[..]).unwrap();
4185                                 secp_ctx.verify(&sighash, &their_signature, &chan.their_funding_pubkey.unwrap()).unwrap();
4186
4187                                 let mut localtx = LocalCommitmentTransaction::new_missing_local_sig(unsigned_tx.0.clone(), &their_signature, &PublicKey::from_secret_key(&secp_ctx, chan.local_keys.funding_key()), chan.their_funding_pubkey.as_ref().unwrap());
4188                                 localtx.add_local_sig(chan.local_keys.funding_key(), &redeemscript, chan.channel_value_satoshis, &chan.secp_ctx);
4189
4190                                 assert_eq!(serialize(localtx.with_valid_witness())[..],
4191                                                 hex::decode($tx_hex).unwrap()[..]);
4192                         };
4193                 }
4194
4195                 macro_rules! test_htlc_output {
4196                         ( $htlc_idx: expr, $their_sig_hex: expr, $our_sig_hex: expr, $tx_hex: expr ) => {
4197                                 let remote_signature = Signature::from_der(&hex::decode($their_sig_hex).unwrap()[..]).unwrap();
4198
4199                                 let ref htlc = unsigned_tx.1[$htlc_idx];
4200                                 let mut htlc_tx = chan.build_htlc_transaction(&unsigned_tx.0.txid(), &htlc, true, &keys, chan.feerate_per_kw);
4201                                 let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
4202                                 let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
4203                                 secp_ctx.verify(&htlc_sighash, &remote_signature, &keys.b_htlc_key).unwrap();
4204
4205                                 let mut preimage: Option<PaymentPreimage> = None;
4206                                 if !htlc.offered {
4207                                         for i in 0..5 {
4208                                                 let out = PaymentHash(Sha256::hash(&[i; 32]).into_inner());
4209                                                 if out == htlc.payment_hash {
4210                                                         preimage = Some(PaymentPreimage([i; 32]));
4211                                                 }
4212                                         }
4213
4214                                         assert!(preimage.is_some());
4215                                 }
4216
4217                                 chan_utils::sign_htlc_transaction(&mut htlc_tx, &remote_signature, &preimage, &htlc, &keys.a_htlc_key, &keys.b_htlc_key, &keys.revocation_key, &keys.per_commitment_point, chan.local_keys.htlc_base_key(), &chan.secp_ctx).unwrap();
4218                                 assert_eq!(serialize(&htlc_tx)[..],
4219                                                 hex::decode($tx_hex).unwrap()[..]);
4220                         };
4221                 }
4222
4223                 {
4224                         // simple commitment tx with no HTLCs
4225                         chan.value_to_self_msat = 7000000000;
4226
4227                         test_commitment!("3045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c0",
4228                                          "3044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c3836939",
4229                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4230                 }
4231
4232                 chan.pending_inbound_htlcs.push({
4233                         let mut out = InboundHTLCOutput{
4234                                 htlc_id: 0,
4235                                 amount_msat: 1000000,
4236                                 cltv_expiry: 500,
4237                                 payment_hash: PaymentHash([0; 32]),
4238                                 state: InboundHTLCState::Committed,
4239                         };
4240                         out.payment_hash.0 = Sha256::hash(&hex::decode("0000000000000000000000000000000000000000000000000000000000000000").unwrap()).into_inner();
4241                         out
4242                 });
4243                 chan.pending_inbound_htlcs.push({
4244                         let mut out = InboundHTLCOutput{
4245                                 htlc_id: 1,
4246                                 amount_msat: 2000000,
4247                                 cltv_expiry: 501,
4248                                 payment_hash: PaymentHash([0; 32]),
4249                                 state: InboundHTLCState::Committed,
4250                         };
4251                         out.payment_hash.0 = Sha256::hash(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()).into_inner();
4252                         out
4253                 });
4254                 chan.pending_outbound_htlcs.push({
4255                         let mut out = OutboundHTLCOutput{
4256                                 htlc_id: 2,
4257                                 amount_msat: 2000000,
4258                                 cltv_expiry: 502,
4259                                 payment_hash: PaymentHash([0; 32]),
4260                                 state: OutboundHTLCState::Committed,
4261                                 source: HTLCSource::dummy(),
4262                         };
4263                         out.payment_hash.0 = Sha256::hash(&hex::decode("0202020202020202020202020202020202020202020202020202020202020202").unwrap()).into_inner();
4264                         out
4265                 });
4266                 chan.pending_outbound_htlcs.push({
4267                         let mut out = OutboundHTLCOutput{
4268                                 htlc_id: 3,
4269                                 amount_msat: 3000000,
4270                                 cltv_expiry: 503,
4271                                 payment_hash: PaymentHash([0; 32]),
4272                                 state: OutboundHTLCState::Committed,
4273                                 source: HTLCSource::dummy(),
4274                         };
4275                         out.payment_hash.0 = Sha256::hash(&hex::decode("0303030303030303030303030303030303030303030303030303030303030303").unwrap()).into_inner();
4276                         out
4277                 });
4278                 chan.pending_inbound_htlcs.push({
4279                         let mut out = InboundHTLCOutput{
4280                                 htlc_id: 4,
4281                                 amount_msat: 4000000,
4282                                 cltv_expiry: 504,
4283                                 payment_hash: PaymentHash([0; 32]),
4284                                 state: InboundHTLCState::Committed,
4285                         };
4286                         out.payment_hash.0 = Sha256::hash(&hex::decode("0404040404040404040404040404040404040404040404040404040404040404").unwrap()).into_inner();
4287                         out
4288                 });
4289
4290                 {
4291                         // commitment tx with all five HTLCs untrimmed (minimum feerate)
4292                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4293                         chan.feerate_per_kw = 0;
4294
4295                         test_commitment!("304402204fd4928835db1ccdfc40f5c78ce9bd65249b16348df81f0c44328dcdefc97d630220194d3869c38bc732dd87d13d2958015e2fc16829e74cd4377f84d215c0b70606",
4296                                          "30440220275b0c325a5e9355650dc30c0eccfbc7efb23987c24b556b9dfdd40effca18d202206caceb2c067836c51f296740c7ae807ffcbfbf1dd3a0d56b6de9a5b247985f06",
4297                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e80300000000000022002052bfef0479d7b293c27e0f1eb294bea154c63a3294ef092c19af51409bce0e2ad007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e0a06a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004730440220275b0c325a5e9355650dc30c0eccfbc7efb23987c24b556b9dfdd40effca18d202206caceb2c067836c51f296740c7ae807ffcbfbf1dd3a0d56b6de9a5b247985f060147304402204fd4928835db1ccdfc40f5c78ce9bd65249b16348df81f0c44328dcdefc97d630220194d3869c38bc732dd87d13d2958015e2fc16829e74cd4377f84d215c0b7060601475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4298
4299                         assert_eq!(unsigned_tx.1.len(), 5);
4300
4301                         test_htlc_output!(0,
4302                                           "304402206a6e59f18764a5bf8d4fa45eebc591566689441229c918b480fb2af8cc6a4aeb02205248f273be447684b33e3c8d1d85a8e0ca9fa0bae9ae33f0527ada9c162919a6",
4303                                           "304402207cb324fa0de88f452ffa9389678127ebcf4cabe1dd848b8e076c1a1962bf34720220116ed922b12311bd602d67e60d2529917f21c5b82f25ff6506c0f87886b4dfd5",
4304                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219700000000000000000001e8030000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402206a6e59f18764a5bf8d4fa45eebc591566689441229c918b480fb2af8cc6a4aeb02205248f273be447684b33e3c8d1d85a8e0ca9fa0bae9ae33f0527ada9c162919a60147304402207cb324fa0de88f452ffa9389678127ebcf4cabe1dd848b8e076c1a1962bf34720220116ed922b12311bd602d67e60d2529917f21c5b82f25ff6506c0f87886b4dfd5012000000000000000000000000000000000000000000000000000000000000000008a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac686800000000");
4305
4306                         test_htlc_output!(1,
4307                                           "3045022100d5275b3619953cb0c3b5aa577f04bc512380e60fa551762ce3d7a1bb7401cff9022037237ab0dac3fe100cde094e82e2bed9ba0ed1bb40154b48e56aa70f259e608b",
4308                                           "3045022100c89172099507ff50f4c925e6c5150e871fb6e83dd73ff9fbb72f6ce829a9633f02203a63821d9162e99f9be712a68f9e589483994feae2661e4546cd5b6cec007be5",
4309                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219701000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d5275b3619953cb0c3b5aa577f04bc512380e60fa551762ce3d7a1bb7401cff9022037237ab0dac3fe100cde094e82e2bed9ba0ed1bb40154b48e56aa70f259e608b01483045022100c89172099507ff50f4c925e6c5150e871fb6e83dd73ff9fbb72f6ce829a9633f02203a63821d9162e99f9be712a68f9e589483994feae2661e4546cd5b6cec007be501008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4310
4311                         test_htlc_output!(2,
4312                                           "304402201b63ec807771baf4fdff523c644080de17f1da478989308ad13a58b51db91d360220568939d38c9ce295adba15665fa68f51d967e8ed14a007b751540a80b325f202",
4313                                           "3045022100def389deab09cee69eaa1ec14d9428770e45bcbe9feb46468ecf481371165c2f022015d2e3c46600b2ebba8dcc899768874cc6851fd1ecb3fffd15db1cc3de7e10da",
4314                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219702000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402201b63ec807771baf4fdff523c644080de17f1da478989308ad13a58b51db91d360220568939d38c9ce295adba15665fa68f51d967e8ed14a007b751540a80b325f20201483045022100def389deab09cee69eaa1ec14d9428770e45bcbe9feb46468ecf481371165c2f022015d2e3c46600b2ebba8dcc899768874cc6851fd1ecb3fffd15db1cc3de7e10da012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
4315
4316                         test_htlc_output!(3,
4317                                           "3045022100daee1808f9861b6c3ecd14f7b707eca02dd6bdfc714ba2f33bc8cdba507bb182022026654bf8863af77d74f51f4e0b62d461a019561bb12acb120d3f7195d148a554",
4318                                           "30440220643aacb19bbb72bd2b635bc3f7375481f5981bace78cdd8319b2988ffcc6704202203d27784ec8ad51ed3bd517a05525a5139bb0b755dd719e0054332d186ac08727",
4319                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219703000000000000000001b80b0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100daee1808f9861b6c3ecd14f7b707eca02dd6bdfc714ba2f33bc8cdba507bb182022026654bf8863af77d74f51f4e0b62d461a019561bb12acb120d3f7195d148a554014730440220643aacb19bbb72bd2b635bc3f7375481f5981bace78cdd8319b2988ffcc6704202203d27784ec8ad51ed3bd517a05525a5139bb0b755dd719e0054332d186ac0872701008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4320
4321                         test_htlc_output!(4,
4322                                           "304402207e0410e45454b0978a623f36a10626ef17b27d9ad44e2760f98cfa3efb37924f0220220bd8acd43ecaa916a80bd4f919c495a2c58982ce7c8625153f8596692a801d",
4323                                           "30440220549e80b4496803cbc4a1d09d46df50109f546d43fbbf86cd90b174b1484acd5402205f12a4f995cb9bded597eabfee195a285986aa6d93ae5bb72507ebc6a4e2349e",
4324                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219704000000000000000001a00f0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207e0410e45454b0978a623f36a10626ef17b27d9ad44e2760f98cfa3efb37924f0220220bd8acd43ecaa916a80bd4f919c495a2c58982ce7c8625153f8596692a801d014730440220549e80b4496803cbc4a1d09d46df50109f546d43fbbf86cd90b174b1484acd5402205f12a4f995cb9bded597eabfee195a285986aa6d93ae5bb72507ebc6a4e2349e012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4325                 }
4326
4327                 {
4328                         // commitment tx with seven outputs untrimmed (maximum feerate)
4329                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4330                         chan.feerate_per_kw = 647;
4331
4332                         test_commitment!("3045022100a5c01383d3ec646d97e40f44318d49def817fcd61a0ef18008a665b3e151785502203e648efddd5838981ef55ec954be69c4a652d021e6081a100d034de366815e9b",
4333                                          "304502210094bfd8f5572ac0157ec76a9551b6c5216a4538c07cd13a51af4a54cb26fa14320220768efce8ce6f4a5efac875142ff19237c011343670adf9c7ac69704a120d1163",
4334                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e80300000000000022002052bfef0479d7b293c27e0f1eb294bea154c63a3294ef092c19af51409bce0e2ad007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e09c6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040048304502210094bfd8f5572ac0157ec76a9551b6c5216a4538c07cd13a51af4a54cb26fa14320220768efce8ce6f4a5efac875142ff19237c011343670adf9c7ac69704a120d116301483045022100a5c01383d3ec646d97e40f44318d49def817fcd61a0ef18008a665b3e151785502203e648efddd5838981ef55ec954be69c4a652d021e6081a100d034de366815e9b01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4335
4336                         assert_eq!(unsigned_tx.1.len(), 5);
4337
4338                         test_htlc_output!(0,
4339                                           "30440220385a5afe75632f50128cbb029ee95c80156b5b4744beddc729ad339c9ca432c802202ba5f48550cad3379ac75b9b4fedb86a35baa6947f16ba5037fb8b11ab343740",
4340                                           "304402205999590b8a79fa346e003a68fd40366397119b2b0cdf37b149968d6bc6fbcc4702202b1e1fb5ab7864931caed4e732c359e0fe3d86a548b557be2246efb1708d579a",
4341                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb60000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220385a5afe75632f50128cbb029ee95c80156b5b4744beddc729ad339c9ca432c802202ba5f48550cad3379ac75b9b4fedb86a35baa6947f16ba5037fb8b11ab3437400147304402205999590b8a79fa346e003a68fd40366397119b2b0cdf37b149968d6bc6fbcc4702202b1e1fb5ab7864931caed4e732c359e0fe3d86a548b557be2246efb1708d579a012000000000000000000000000000000000000000000000000000000000000000008a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac686800000000");
4342
4343                         test_htlc_output!(1,
4344                                           "304402207ceb6678d4db33d2401fdc409959e57c16a6cb97a30261d9c61f29b8c58d34b90220084b4a17b4ca0e86f2d798b3698ca52de5621f2ce86f80bed79afa66874511b0",
4345                                           "304402207ff03eb0127fc7c6cae49cc29e2a586b98d1e8969cf4a17dfa50b9c2647720b902205e2ecfda2252956c0ca32f175080e75e4e390e433feb1f8ce9f2ba55648a1dac",
4346                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb60100000000000000000124060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207ceb6678d4db33d2401fdc409959e57c16a6cb97a30261d9c61f29b8c58d34b90220084b4a17b4ca0e86f2d798b3698ca52de5621f2ce86f80bed79afa66874511b00147304402207ff03eb0127fc7c6cae49cc29e2a586b98d1e8969cf4a17dfa50b9c2647720b902205e2ecfda2252956c0ca32f175080e75e4e390e433feb1f8ce9f2ba55648a1dac01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4347
4348                         test_htlc_output!(2,
4349                                           "304402206a401b29a0dff0d18ec903502c13d83e7ec019450113f4a7655a4ce40d1f65ba0220217723a084e727b6ca0cc8b6c69c014a7e4a01fcdcba3e3993f462a3c574d833",
4350                                           "3045022100d50d067ca625d54e62df533a8f9291736678d0b86c28a61bb2a80cf42e702d6e02202373dde7e00218eacdafb9415fe0e1071beec1857d1af3c6a201a44cbc47c877",
4351                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb6020000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402206a401b29a0dff0d18ec903502c13d83e7ec019450113f4a7655a4ce40d1f65ba0220217723a084e727b6ca0cc8b6c69c014a7e4a01fcdcba3e3993f462a3c574d83301483045022100d50d067ca625d54e62df533a8f9291736678d0b86c28a61bb2a80cf42e702d6e02202373dde7e00218eacdafb9415fe0e1071beec1857d1af3c6a201a44cbc47c877012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
4352
4353                         test_htlc_output!(3,
4354                                           "30450221009b1c987ba599ee3bde1dbca776b85481d70a78b681a8d84206723e2795c7cac002207aac84ad910f8598c4d1c0ea2e3399cf6627a4e3e90131315bc9f038451ce39d",
4355                                           "3045022100db9dc65291077a52728c622987e9895b7241d4394d6dcb916d7600a3e8728c22022036ee3ee717ba0bb5c45ee84bc7bbf85c0f90f26ae4e4a25a6b4241afa8a3f1cb",
4356                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb6030000000000000000010c0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009b1c987ba599ee3bde1dbca776b85481d70a78b681a8d84206723e2795c7cac002207aac84ad910f8598c4d1c0ea2e3399cf6627a4e3e90131315bc9f038451ce39d01483045022100db9dc65291077a52728c622987e9895b7241d4394d6dcb916d7600a3e8728c22022036ee3ee717ba0bb5c45ee84bc7bbf85c0f90f26ae4e4a25a6b4241afa8a3f1cb01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4357
4358                         test_htlc_output!(4,
4359                                           "3045022100cc28030b59f0914f45b84caa983b6f8effa900c952310708c2b5b00781117022022027ba2ccdf94d03c6d48b327f183f6e28c8a214d089b9227f94ac4f85315274f0",
4360                                           "304402202d1a3c0d31200265d2a2def2753ead4959ae20b4083e19553acfffa5dfab60bf022020ede134149504e15b88ab261a066de49848411e15e70f9e6a5462aec2949f8f",
4361                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb604000000000000000001da0d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cc28030b59f0914f45b84caa983b6f8effa900c952310708c2b5b00781117022022027ba2ccdf94d03c6d48b327f183f6e28c8a214d089b9227f94ac4f85315274f00147304402202d1a3c0d31200265d2a2def2753ead4959ae20b4083e19553acfffa5dfab60bf022020ede134149504e15b88ab261a066de49848411e15e70f9e6a5462aec2949f8f012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4362                 }
4363
4364                 {
4365                         // commitment tx with six outputs untrimmed (minimum feerate)
4366                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4367                         chan.feerate_per_kw = 648;
4368
4369                         test_commitment!("3044022072714e2fbb93cdd1c42eb0828b4f2eff143f717d8f26e79d6ada4f0dcb681bbe02200911be4e5161dd6ebe59ff1c58e1997c4aea804f81db6b698821db6093d7b057",
4370                                          "3045022100a2270d5950c89ae0841233f6efea9c951898b301b2e89e0adbd2c687b9f32efa02207943d90f95b9610458e7c65a576e149750ff3accaacad004cd85e70b235e27de",
4371                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431104e9d6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100a2270d5950c89ae0841233f6efea9c951898b301b2e89e0adbd2c687b9f32efa02207943d90f95b9610458e7c65a576e149750ff3accaacad004cd85e70b235e27de01473044022072714e2fbb93cdd1c42eb0828b4f2eff143f717d8f26e79d6ada4f0dcb681bbe02200911be4e5161dd6ebe59ff1c58e1997c4aea804f81db6b698821db6093d7b05701475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4372
4373                         assert_eq!(unsigned_tx.1.len(), 4);
4374
4375                         test_htlc_output!(0,
4376                                           "3044022062ef2e77591409d60d7817d9bb1e71d3c4a2931d1a6c7c8307422c84f001a251022022dad9726b0ae3fe92bda745a06f2c00f92342a186d84518588cf65f4dfaada8",
4377                                           "3045022100a4c574f00411dd2f978ca5cdc1b848c311cd7849c087ad2f21a5bce5e8cc5ae90220090ae39a9bce2fb8bc879d7e9f9022df249f41e25e51f1a9bf6447a9eeffc098",
4378                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd10000000000000000000123060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022062ef2e77591409d60d7817d9bb1e71d3c4a2931d1a6c7c8307422c84f001a251022022dad9726b0ae3fe92bda745a06f2c00f92342a186d84518588cf65f4dfaada801483045022100a4c574f00411dd2f978ca5cdc1b848c311cd7849c087ad2f21a5bce5e8cc5ae90220090ae39a9bce2fb8bc879d7e9f9022df249f41e25e51f1a9bf6447a9eeffc09801008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4379
4380                         test_htlc_output!(1,
4381                                           "3045022100e968cbbb5f402ed389fdc7f6cd2a80ed650bb42c79aeb2a5678444af94f6c78502204b47a1cb24ab5b0b6fe69fe9cfc7dba07b9dd0d8b95f372c1d9435146a88f8d4",
4382                                           "304402207679cf19790bea76a733d2fa0672bd43ab455687a068f815a3d237581f57139a0220683a1a799e102071c206b207735ca80f627ab83d6616b4bcd017c5d79ef3e7d0",
4383                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd10100000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e968cbbb5f402ed389fdc7f6cd2a80ed650bb42c79aeb2a5678444af94f6c78502204b47a1cb24ab5b0b6fe69fe9cfc7dba07b9dd0d8b95f372c1d9435146a88f8d40147304402207679cf19790bea76a733d2fa0672bd43ab455687a068f815a3d237581f57139a0220683a1a799e102071c206b207735ca80f627ab83d6616b4bcd017c5d79ef3e7d0012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
4384
4385                         test_htlc_output!(2,
4386                                           "3045022100aa91932e305292cf9969cc23502bbf6cef83a5df39c95ad04a707c4f4fed5c7702207099fc0f3a9bfe1e7683c0e9aa5e76c5432eb20693bf4cb182f04d383dc9c8c2",
4387                                           "304402200df76fea718745f3c529bac7fd37923e7309ce38b25c0781e4cf514dd9ef8dc802204172295739dbae9fe0474dcee3608e3433b4b2af3a2e6787108b02f894dcdda3",
4388                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd1020000000000000000010b0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100aa91932e305292cf9969cc23502bbf6cef83a5df39c95ad04a707c4f4fed5c7702207099fc0f3a9bfe1e7683c0e9aa5e76c5432eb20693bf4cb182f04d383dc9c8c20147304402200df76fea718745f3c529bac7fd37923e7309ce38b25c0781e4cf514dd9ef8dc802204172295739dbae9fe0474dcee3608e3433b4b2af3a2e6787108b02f894dcdda301008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4389
4390                         test_htlc_output!(3,
4391                                           "3044022035cac88040a5bba420b1c4257235d5015309113460bc33f2853cd81ca36e632402202fc94fd3e81e9d34a9d01782a0284f3044370d03d60f3fc041e2da088d2de58f",
4392                                           "304402200daf2eb7afd355b4caf6fb08387b5f031940ea29d1a9f35071288a839c9039e4022067201b562456e7948616c13acb876b386b511599b58ac1d94d127f91c50463a6",
4393                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd103000000000000000001d90d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022035cac88040a5bba420b1c4257235d5015309113460bc33f2853cd81ca36e632402202fc94fd3e81e9d34a9d01782a0284f3044370d03d60f3fc041e2da088d2de58f0147304402200daf2eb7afd355b4caf6fb08387b5f031940ea29d1a9f35071288a839c9039e4022067201b562456e7948616c13acb876b386b511599b58ac1d94d127f91c50463a6012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4394                 }
4395
4396                 {
4397                         // commitment tx with six outputs untrimmed (maximum feerate)
4398                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4399                         chan.feerate_per_kw = 2069;
4400
4401                         test_commitment!("3044022001d55e488b8b035b2dd29d50b65b530923a416d47f377284145bc8767b1b6a75022019bb53ddfe1cefaf156f924777eaaf8fdca1810695a7d0a247ad2afba8232eb4",
4402                                          "304402203ca8f31c6a47519f83255dc69f1894d9a6d7476a19f498d31eaf0cd3a85eeb63022026fd92dc752b33905c4c838c528b692a8ad4ced959990b5d5ee2ff940fa90eea",
4403                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311077956a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203ca8f31c6a47519f83255dc69f1894d9a6d7476a19f498d31eaf0cd3a85eeb63022026fd92dc752b33905c4c838c528b692a8ad4ced959990b5d5ee2ff940fa90eea01473044022001d55e488b8b035b2dd29d50b65b530923a416d47f377284145bc8767b1b6a75022019bb53ddfe1cefaf156f924777eaaf8fdca1810695a7d0a247ad2afba8232eb401475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4404
4405                         assert_eq!(unsigned_tx.1.len(), 4);
4406
4407                         test_htlc_output!(0,
4408                                           "3045022100d1cf354de41c1369336cf85b225ed033f1f8982a01be503668df756a7e668b66022001254144fb4d0eecc61908fccc3388891ba17c5d7a1a8c62bdd307e5a513f992",
4409                                           "3044022056eb1af429660e45a1b0b66568cb8c4a3aa7e4c9c292d5d6c47f86ebf2c8838f022065c3ac4ebe980ca7a41148569be4ad8751b0a724a41405697ec55035dae66402",
4410                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a0000000000000000000175020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d1cf354de41c1369336cf85b225ed033f1f8982a01be503668df756a7e668b66022001254144fb4d0eecc61908fccc3388891ba17c5d7a1a8c62bdd307e5a513f99201473044022056eb1af429660e45a1b0b66568cb8c4a3aa7e4c9c292d5d6c47f86ebf2c8838f022065c3ac4ebe980ca7a41148569be4ad8751b0a724a41405697ec55035dae6640201008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4411
4412                         test_htlc_output!(1,
4413                                           "3045022100d065569dcb94f090345402736385efeb8ea265131804beac06dd84d15dd2d6880220664feb0b4b2eb985fadb6ec7dc58c9334ea88ce599a9be760554a2d4b3b5d9f4",
4414                                           "3045022100914bb232cd4b2690ee3d6cb8c3713c4ac9c4fb925323068d8b07f67c8541f8d9022057152f5f1615b793d2d45aac7518989ae4fe970f28b9b5c77504799d25433f7f",
4415                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a0100000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d065569dcb94f090345402736385efeb8ea265131804beac06dd84d15dd2d6880220664feb0b4b2eb985fadb6ec7dc58c9334ea88ce599a9be760554a2d4b3b5d9f401483045022100914bb232cd4b2690ee3d6cb8c3713c4ac9c4fb925323068d8b07f67c8541f8d9022057152f5f1615b793d2d45aac7518989ae4fe970f28b9b5c77504799d25433f7f012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
4416
4417                         test_htlc_output!(2,
4418                                           "3045022100d4e69d363de993684eae7b37853c40722a4c1b4a7b588ad7b5d8a9b5006137a102207a069c628170ee34be5612747051bdcc087466dbaa68d5756ea81c10155aef18",
4419                                           "304402200e362443f7af830b419771e8e1614fc391db3a4eb799989abfc5ab26d6fcd032022039ab0cad1c14dfbe9446bf847965e56fe016e0cbcf719fd18c1bfbf53ecbd9f9",
4420                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a020000000000000000015d060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d4e69d363de993684eae7b37853c40722a4c1b4a7b588ad7b5d8a9b5006137a102207a069c628170ee34be5612747051bdcc087466dbaa68d5756ea81c10155aef180147304402200e362443f7af830b419771e8e1614fc391db3a4eb799989abfc5ab26d6fcd032022039ab0cad1c14dfbe9446bf847965e56fe016e0cbcf719fd18c1bfbf53ecbd9f901008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4421
4422                         test_htlc_output!(3,
4423                                           "30450221008ec888e36e4a4b3dc2ed6b823319855b2ae03006ca6ae0d9aa7e24bfc1d6f07102203b0f78885472a67ff4fe5916c0bb669487d659527509516fc3a08e87a2cc0a7c",
4424                                           "304402202c3e14282b84b02705dfd00a6da396c9fe8a8bcb1d3fdb4b20a4feba09440e8b02202b058b39aa9b0c865b22095edcd9ff1f71bbfe20aa4993755e54d042755ed0d5",
4425                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a03000000000000000001f2090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221008ec888e36e4a4b3dc2ed6b823319855b2ae03006ca6ae0d9aa7e24bfc1d6f07102203b0f78885472a67ff4fe5916c0bb669487d659527509516fc3a08e87a2cc0a7c0147304402202c3e14282b84b02705dfd00a6da396c9fe8a8bcb1d3fdb4b20a4feba09440e8b02202b058b39aa9b0c865b22095edcd9ff1f71bbfe20aa4993755e54d042755ed0d5012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4426                 }
4427
4428                 {
4429                         // commitment tx with five outputs untrimmed (minimum feerate)
4430                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4431                         chan.feerate_per_kw = 2070;
4432
4433                         test_commitment!("3045022100f2377f7a67b7fc7f4e2c0c9e3a7de935c32417f5668eda31ea1db401b7dc53030220415fdbc8e91d0f735e70c21952342742e25249b0d062d43efbfc564499f37526",
4434                                          "30440220443cb07f650aebbba14b8bc8d81e096712590f524c5991ac0ed3bbc8fd3bd0c7022028a635f548e3ca64b19b69b1ea00f05b22752f91daf0b6dab78e62ba52eb7fd0",
4435                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110da966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004730440220443cb07f650aebbba14b8bc8d81e096712590f524c5991ac0ed3bbc8fd3bd0c7022028a635f548e3ca64b19b69b1ea00f05b22752f91daf0b6dab78e62ba52eb7fd001483045022100f2377f7a67b7fc7f4e2c0c9e3a7de935c32417f5668eda31ea1db401b7dc53030220415fdbc8e91d0f735e70c21952342742e25249b0d062d43efbfc564499f3752601475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4436
4437                         assert_eq!(unsigned_tx.1.len(), 3);
4438
4439                         test_htlc_output!(0,
4440                                           "3045022100eed143b1ee4bed5dc3cde40afa5db3e7354cbf9c44054b5f713f729356f08cf7022077161d171c2bbd9badf3c9934de65a4918de03bbac1450f715275f75b103f891",
4441                                           "3045022100a0d043ed533e7fb1911e0553d31a8e2f3e6de19dbc035257f29d747c5e02f1f5022030cd38d8e84282175d49c1ebe0470db3ebd59768cf40780a784e248a43904fb8",
4442                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a2180000000000000000000174020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100eed143b1ee4bed5dc3cde40afa5db3e7354cbf9c44054b5f713f729356f08cf7022077161d171c2bbd9badf3c9934de65a4918de03bbac1450f715275f75b103f89101483045022100a0d043ed533e7fb1911e0553d31a8e2f3e6de19dbc035257f29d747c5e02f1f5022030cd38d8e84282175d49c1ebe0470db3ebd59768cf40780a784e248a43904fb801008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4443
4444                         test_htlc_output!(1,
4445                                           "3044022071e9357619fd8d29a411dc053b326a5224c5d11268070e88ecb981b174747c7a02202b763ae29a9d0732fa8836dd8597439460b50472183f420021b768981b4f7cf6",
4446                                           "3045022100adb1d679f65f96178b59f23ed37d3b70443118f345224a07ecb043eee2acc157022034d24524fe857144a3bcfff3065a9994d0a6ec5f11c681e49431d573e242612d",
4447                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a218010000000000000000015c060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022071e9357619fd8d29a411dc053b326a5224c5d11268070e88ecb981b174747c7a02202b763ae29a9d0732fa8836dd8597439460b50472183f420021b768981b4f7cf601483045022100adb1d679f65f96178b59f23ed37d3b70443118f345224a07ecb043eee2acc157022034d24524fe857144a3bcfff3065a9994d0a6ec5f11c681e49431d573e242612d01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4448
4449                         test_htlc_output!(2,
4450                                           "3045022100c9458a4d2cbb741705577deb0a890e5cb90ee141be0400d3162e533727c9cb2102206edcf765c5dc5e5f9b976ea8149bf8607b5a0efb30691138e1231302b640d2a4",
4451                                           "304402200831422aa4e1ee6d55e0b894201770a8f8817a189356f2d70be76633ffa6a6f602200dd1b84a4855dc6727dd46c98daae43dfc70889d1ba7ef0087529a57c06e5e04",
4452                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a21802000000000000000001f1090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100c9458a4d2cbb741705577deb0a890e5cb90ee141be0400d3162e533727c9cb2102206edcf765c5dc5e5f9b976ea8149bf8607b5a0efb30691138e1231302b640d2a40147304402200831422aa4e1ee6d55e0b894201770a8f8817a189356f2d70be76633ffa6a6f602200dd1b84a4855dc6727dd46c98daae43dfc70889d1ba7ef0087529a57c06e5e04012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4453                 }
4454
4455                 {
4456                         // commitment tx with five outputs untrimmed (maximum feerate)
4457                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4458                         chan.feerate_per_kw = 2194;
4459
4460                         test_commitment!("3045022100d33c4e541aa1d255d41ea9a3b443b3b822ad8f7f86862638aac1f69f8f760577022007e2a18e6931ce3d3a804b1c78eda1de17dbe1fb7a95488c9a4ec86203953348",
4461                                          "304402203b1b010c109c2ecbe7feb2d259b9c4126bd5dc99ee693c422ec0a5781fe161ba0220571fe4e2c649dea9c7aaf7e49b382962f6a3494963c97d80fef9a430ca3f7061",
4462                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311040966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203b1b010c109c2ecbe7feb2d259b9c4126bd5dc99ee693c422ec0a5781fe161ba0220571fe4e2c649dea9c7aaf7e49b382962f6a3494963c97d80fef9a430ca3f706101483045022100d33c4e541aa1d255d41ea9a3b443b3b822ad8f7f86862638aac1f69f8f760577022007e2a18e6931ce3d3a804b1c78eda1de17dbe1fb7a95488c9a4ec8620395334801475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4463
4464                         assert_eq!(unsigned_tx.1.len(), 3);
4465
4466                         test_htlc_output!(0,
4467                                           "30450221009ed2f0a67f99e29c3c8cf45c08207b765980697781bb727fe0b1416de0e7622902206052684229bc171419ed290f4b615c943f819c0262414e43c5b91dcf72ddcf44",
4468                                           "3044022004ad5f04ae69c71b3b141d4db9d0d4c38d84009fb3cfeeae6efdad414487a9a0022042d3fe1388c1ff517d1da7fb4025663d372c14728ed52dc88608363450ff6a2f",
4469                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a0000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009ed2f0a67f99e29c3c8cf45c08207b765980697781bb727fe0b1416de0e7622902206052684229bc171419ed290f4b615c943f819c0262414e43c5b91dcf72ddcf4401473044022004ad5f04ae69c71b3b141d4db9d0d4c38d84009fb3cfeeae6efdad414487a9a0022042d3fe1388c1ff517d1da7fb4025663d372c14728ed52dc88608363450ff6a2f01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
4470
4471                         test_htlc_output!(1,
4472                                           "30440220155d3b90c67c33a8321996a9be5b82431b0c126613be751d400669da9d5c696702204318448bcd48824439d2c6a70be6e5747446be47ff45977cf41672bdc9b6b12d",
4473                                           "304402201707050c870c1f77cc3ed58d6d71bf281de239e9eabd8ef0955bad0d7fe38dcc02204d36d80d0019b3a71e646a08fa4a5607761d341ae8be371946ebe437c289c915",
4474                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a010000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220155d3b90c67c33a8321996a9be5b82431b0c126613be751d400669da9d5c696702204318448bcd48824439d2c6a70be6e5747446be47ff45977cf41672bdc9b6b12d0147304402201707050c870c1f77cc3ed58d6d71bf281de239e9eabd8ef0955bad0d7fe38dcc02204d36d80d0019b3a71e646a08fa4a5607761d341ae8be371946ebe437c289c91501008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4475
4476                         test_htlc_output!(2,
4477                                           "3045022100a12a9a473ece548584aabdd051779025a5ed4077c4b7aa376ec7a0b1645e5a48022039490b333f53b5b3e2ddde1d809e492cba2b3e5fc3a436cd3ffb4cd3d500fa5a",
4478                                           "3045022100ff200bc934ab26ce9a559e998ceb0aee53bc40368e114ab9d3054d9960546e2802202496856ca163ac12c143110b6b3ac9d598df7254f2e17b3b94c3ab5301f4c3b0",
4479                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a020000000000000000019a090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a12a9a473ece548584aabdd051779025a5ed4077c4b7aa376ec7a0b1645e5a48022039490b333f53b5b3e2ddde1d809e492cba2b3e5fc3a436cd3ffb4cd3d500fa5a01483045022100ff200bc934ab26ce9a559e998ceb0aee53bc40368e114ab9d3054d9960546e2802202496856ca163ac12c143110b6b3ac9d598df7254f2e17b3b94c3ab5301f4c3b0012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4480                 }
4481
4482                 {
4483                         // commitment tx with four outputs untrimmed (minimum feerate)
4484                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4485                         chan.feerate_per_kw = 2195;
4486
4487                         test_commitment!("304402205e2f76d4657fb732c0dfc820a18a7301e368f5799e06b7828007633741bda6df0220458009ae59d0c6246065c419359e05eb2a4b4ef4a1b310cc912db44eb7924298",
4488                                          "304402203b12d44254244b8ff3bb4129b0920fd45120ab42f553d9976394b099d500c99e02205e95bb7a3164852ef0c48f9e0eaf145218f8e2c41251b231f03cbdc4f29a5429",
4489                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110b8976a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203b12d44254244b8ff3bb4129b0920fd45120ab42f553d9976394b099d500c99e02205e95bb7a3164852ef0c48f9e0eaf145218f8e2c41251b231f03cbdc4f29a54290147304402205e2f76d4657fb732c0dfc820a18a7301e368f5799e06b7828007633741bda6df0220458009ae59d0c6246065c419359e05eb2a4b4ef4a1b310cc912db44eb792429801475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4490
4491                         assert_eq!(unsigned_tx.1.len(), 2);
4492
4493                         test_htlc_output!(0,
4494                                           "3045022100a8a78fa1016a5c5c3704f2e8908715a3cef66723fb95f3132ec4d2d05cd84fb4022025ac49287b0861ec21932405f5600cbce94313dbde0e6c5d5af1b3366d8afbfc",
4495                                           "3045022100be6ae1977fd7b630a53623f3f25c542317ccfc2b971782802a4f1ef538eb22b402207edc4d0408f8f38fd3c7365d1cfc26511b7cd2d4fecd8b005fba3cd5bc704390",
4496                                           "020000000001014e16c488fa158431c1a82e8f661240ec0a71ba0ce92f2721a6538c510226ad5c0000000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a8a78fa1016a5c5c3704f2e8908715a3cef66723fb95f3132ec4d2d05cd84fb4022025ac49287b0861ec21932405f5600cbce94313dbde0e6c5d5af1b3366d8afbfc01483045022100be6ae1977fd7b630a53623f3f25c542317ccfc2b971782802a4f1ef538eb22b402207edc4d0408f8f38fd3c7365d1cfc26511b7cd2d4fecd8b005fba3cd5bc70439001008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4497
4498                         test_htlc_output!(1,
4499                                           "3045022100e769cb156aa2f7515d126cef7a69968629620ce82afcaa9e210969de6850df4602200b16b3f3486a229a48aadde520dbee31ae340dbadaffae74fbb56681fef27b92",
4500                                           "30440220665b9cb4a978c09d1ca8977a534999bc8a49da624d0c5439451dd69cde1a003d022070eae0620f01f3c1bd029cc1488da13fb40fdab76f396ccd335479a11c5276d8",
4501                                           "020000000001014e16c488fa158431c1a82e8f661240ec0a71ba0ce92f2721a6538c510226ad5c0100000000000000000199090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e769cb156aa2f7515d126cef7a69968629620ce82afcaa9e210969de6850df4602200b16b3f3486a229a48aadde520dbee31ae340dbadaffae74fbb56681fef27b92014730440220665b9cb4a978c09d1ca8977a534999bc8a49da624d0c5439451dd69cde1a003d022070eae0620f01f3c1bd029cc1488da13fb40fdab76f396ccd335479a11c5276d8012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4502                 }
4503
4504                 {
4505                         // commitment tx with four outputs untrimmed (maximum feerate)
4506                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4507                         chan.feerate_per_kw = 3702;
4508
4509                         test_commitment!("3045022100c1a3b0b60ca092ed5080121f26a74a20cec6bdee3f8e47bae973fcdceb3eda5502207d467a9873c939bf3aa758014ae67295fedbca52412633f7e5b2670fc7c381c1",
4510                                          "304402200e930a43c7951162dc15a2b7344f48091c74c70f7024e7116e900d8bcfba861c022066fa6cbda3929e21daa2e7e16a4b948db7e8919ef978402360d1095ffdaff7b0",
4511                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431106f916a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402200e930a43c7951162dc15a2b7344f48091c74c70f7024e7116e900d8bcfba861c022066fa6cbda3929e21daa2e7e16a4b948db7e8919ef978402360d1095ffdaff7b001483045022100c1a3b0b60ca092ed5080121f26a74a20cec6bdee3f8e47bae973fcdceb3eda5502207d467a9873c939bf3aa758014ae67295fedbca52412633f7e5b2670fc7c381c101475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4512
4513                         assert_eq!(unsigned_tx.1.len(), 2);
4514
4515                         test_htlc_output!(0,
4516                                           "3045022100dfb73b4fe961b31a859b2bb1f4f15cabab9265016dd0272323dc6a9e85885c54022059a7b87c02861ee70662907f25ce11597d7b68d3399443a831ae40e777b76bdb",
4517                                           "304402202765b9c9ece4f127fa5407faf66da4c5ce2719cdbe47cd3175fc7d48b482e43d02205605125925e07bad1e41c618a4b434d72c88a164981c4b8af5eaf4ee9142ec3a",
4518                                           "02000000000101b8de11eb51c22498fe39722c7227b6e55ff1a94146cf638458cb9bc6a060d3a30000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100dfb73b4fe961b31a859b2bb1f4f15cabab9265016dd0272323dc6a9e85885c54022059a7b87c02861ee70662907f25ce11597d7b68d3399443a831ae40e777b76bdb0147304402202765b9c9ece4f127fa5407faf66da4c5ce2719cdbe47cd3175fc7d48b482e43d02205605125925e07bad1e41c618a4b434d72c88a164981c4b8af5eaf4ee9142ec3a01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
4519
4520                         test_htlc_output!(1,
4521                                           "3045022100ea9dc2a7c3c3640334dab733bb4e036e32a3106dc707b24227874fa4f7da746802204d672f7ac0fe765931a8df10b81e53a3242dd32bd9dc9331eb4a596da87954e9",
4522                                           "30440220048a41c660c4841693de037d00a407810389f4574b3286afb7bc392a438fa3f802200401d71fa87c64fe621b49ac07e3bf85157ac680acb977124da28652cc7f1a5c",
4523                                           "02000000000101b8de11eb51c22498fe39722c7227b6e55ff1a94146cf638458cb9bc6a060d3a30100000000000000000176050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100ea9dc2a7c3c3640334dab733bb4e036e32a3106dc707b24227874fa4f7da746802204d672f7ac0fe765931a8df10b81e53a3242dd32bd9dc9331eb4a596da87954e9014730440220048a41c660c4841693de037d00a407810389f4574b3286afb7bc392a438fa3f802200401d71fa87c64fe621b49ac07e3bf85157ac680acb977124da28652cc7f1a5c012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4524                 }
4525
4526                 {
4527                         // commitment tx with three outputs untrimmed (minimum feerate)
4528                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4529                         chan.feerate_per_kw = 3703;
4530
4531                         test_commitment!("30450221008b7c191dd46893b67b628e618d2dc8e81169d38bade310181ab77d7c94c6675e02203b4dd131fd7c9deb299560983dcdc485545c98f989f7ae8180c28289f9e6bdb0",
4532                                          "3044022047305531dd44391dce03ae20f8735005c615eb077a974edb0059ea1a311857d602202e0ed6972fbdd1e8cb542b06e0929bc41b2ddf236e04cb75edd56151f4197506",
4533                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110eb936a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022047305531dd44391dce03ae20f8735005c615eb077a974edb0059ea1a311857d602202e0ed6972fbdd1e8cb542b06e0929bc41b2ddf236e04cb75edd56151f4197506014830450221008b7c191dd46893b67b628e618d2dc8e81169d38bade310181ab77d7c94c6675e02203b4dd131fd7c9deb299560983dcdc485545c98f989f7ae8180c28289f9e6bdb001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4534
4535                         assert_eq!(unsigned_tx.1.len(), 1);
4536
4537                         test_htlc_output!(0,
4538                                           "3044022044f65cf833afdcb9d18795ca93f7230005777662539815b8a601eeb3e57129a902206a4bf3e53392affbba52640627defa8dc8af61c958c9e827b2798ab45828abdd",
4539                                           "3045022100b94d931a811b32eeb885c28ddcf999ae1981893b21dd1329929543fe87ce793002206370107fdd151c5f2384f9ceb71b3107c69c74c8ed5a28a94a4ab2d27d3b0724",
4540                                           "020000000001011c076aa7fb3d7460d10df69432c904227ea84bbf3134d4ceee5fb0f135ef206d0000000000000000000175050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022044f65cf833afdcb9d18795ca93f7230005777662539815b8a601eeb3e57129a902206a4bf3e53392affbba52640627defa8dc8af61c958c9e827b2798ab45828abdd01483045022100b94d931a811b32eeb885c28ddcf999ae1981893b21dd1329929543fe87ce793002206370107fdd151c5f2384f9ceb71b3107c69c74c8ed5a28a94a4ab2d27d3b0724012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4541                 }
4542
4543                 {
4544                         // commitment tx with three outputs untrimmed (maximum feerate)
4545                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4546                         chan.feerate_per_kw = 4914;
4547
4548                         test_commitment!("304402206d6cb93969d39177a09d5d45b583f34966195b77c7e585cf47ac5cce0c90cefb022031d71ae4e33a4e80df7f981d696fbdee517337806a3c7138b7491e2cbb077a0e",
4549                                          "304402206a2679efa3c7aaffd2a447fd0df7aba8792858b589750f6a1203f9259173198a022008d52a0e77a99ab533c36206cb15ad7aeb2aa72b93d4b571e728cb5ec2f6fe26",
4550                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110ae8f6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402206a2679efa3c7aaffd2a447fd0df7aba8792858b589750f6a1203f9259173198a022008d52a0e77a99ab533c36206cb15ad7aeb2aa72b93d4b571e728cb5ec2f6fe260147304402206d6cb93969d39177a09d5d45b583f34966195b77c7e585cf47ac5cce0c90cefb022031d71ae4e33a4e80df7f981d696fbdee517337806a3c7138b7491e2cbb077a0e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4551
4552                         assert_eq!(unsigned_tx.1.len(), 1);
4553
4554                         test_htlc_output!(0,
4555                                           "3045022100fcb38506bfa11c02874092a843d0cc0a8613c23b639832564a5f69020cb0f6ba02206508b9e91eaa001425c190c68ee5f887e1ad5b1b314002e74db9dbd9e42dbecf",
4556                                           "304502210086e76b460ddd3cea10525fba298405d3fe11383e56966a5091811368362f689a02200f72ee75657915e0ede89c28709acd113ede9e1b7be520e3bc5cda425ecd6e68",
4557                                           "0200000000010110a3fdcbcd5db477cd3ad465e7f501ffa8c437e8301f00a6061138590add757f0000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100fcb38506bfa11c02874092a843d0cc0a8613c23b639832564a5f69020cb0f6ba02206508b9e91eaa001425c190c68ee5f887e1ad5b1b314002e74db9dbd9e42dbecf0148304502210086e76b460ddd3cea10525fba298405d3fe11383e56966a5091811368362f689a02200f72ee75657915e0ede89c28709acd113ede9e1b7be520e3bc5cda425ecd6e68012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
4558                 }
4559
4560                 {
4561                         // commitment tx with two outputs untrimmed (minimum feerate)
4562                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4563                         chan.feerate_per_kw = 4915;
4564
4565                         test_commitment!("304402200769ba89c7330dfa4feba447b6e322305f12ac7dac70ec6ba997ed7c1b598d0802204fe8d337e7fee781f9b7b1a06e580b22f4f79d740059560191d7db53f8765552",
4566                                          "3045022100a012691ba6cea2f73fa8bac37750477e66363c6d28813b0bb6da77c8eb3fb0270220365e99c51304b0b1a6ab9ea1c8500db186693e39ec1ad5743ee231b0138384b9",
4567                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110fa926a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100a012691ba6cea2f73fa8bac37750477e66363c6d28813b0bb6da77c8eb3fb0270220365e99c51304b0b1a6ab9ea1c8500db186693e39ec1ad5743ee231b0138384b90147304402200769ba89c7330dfa4feba447b6e322305f12ac7dac70ec6ba997ed7c1b598d0802204fe8d337e7fee781f9b7b1a06e580b22f4f79d740059560191d7db53f876555201475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4568
4569                         assert_eq!(unsigned_tx.1.len(), 0);
4570                 }
4571
4572                 {
4573                         // commitment tx with two outputs untrimmed (maximum feerate)
4574                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4575                         chan.feerate_per_kw = 9651180;
4576
4577                         test_commitment!("3044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd",
4578                                          "30440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b9",
4579                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b800222020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80ec0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311004004730440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b901473044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4580
4581                         assert_eq!(unsigned_tx.1.len(), 0);
4582                 }
4583
4584                 {
4585                         // commitment tx with one output untrimmed (minimum feerate)
4586                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4587                         chan.feerate_per_kw = 9651181;
4588
4589                         test_commitment!("3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e",
4590                                          "3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1",
4591                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4592
4593                         assert_eq!(unsigned_tx.1.len(), 0);
4594                 }
4595
4596                 {
4597                         // commitment tx with fee greater than funder amount
4598                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
4599                         chan.feerate_per_kw = 9651936;
4600
4601                         test_commitment!("3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e",
4602                                          "3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1",
4603                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
4604
4605                         assert_eq!(unsigned_tx.1.len(), 0);
4606                 }
4607         }
4608
4609         #[test]
4610         fn test_per_commitment_secret_gen() {
4611                 // Test vectors from BOLT 3 Appendix D:
4612
4613                 let mut seed = [0; 32];
4614                 seed[0..32].clone_from_slice(&hex::decode("0000000000000000000000000000000000000000000000000000000000000000").unwrap());
4615                 assert_eq!(chan_utils::build_commitment_secret(&seed, 281474976710655),
4616                            hex::decode("02a40c85b6f28da08dfdbe0926c53fab2de6d28c10301f8f7c4073d5e42e3148").unwrap()[..]);
4617
4618                 seed[0..32].clone_from_slice(&hex::decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF").unwrap());
4619                 assert_eq!(chan_utils::build_commitment_secret(&seed, 281474976710655),
4620                            hex::decode("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap()[..]);
4621
4622                 assert_eq!(chan_utils::build_commitment_secret(&seed, 0xaaaaaaaaaaa),
4623                            hex::decode("56f4008fb007ca9acf0e15b054d5c9fd12ee06cea347914ddbaed70d1c13a528").unwrap()[..]);
4624
4625                 assert_eq!(chan_utils::build_commitment_secret(&seed, 0x555555555555),
4626                            hex::decode("9015daaeb06dba4ccc05b91b2f73bd54405f2be9f217fbacd3c5ac2e62327d31").unwrap()[..]);
4627
4628                 seed[0..32].clone_from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap());
4629                 assert_eq!(chan_utils::build_commitment_secret(&seed, 1),
4630                            hex::decode("915c75942a26bb3a433a8ce2cb0427c29ec6c1775cfc78328b57f6ba7bfeaa9c").unwrap()[..]);
4631         }
4632
4633         #[test]
4634         fn test_key_derivation() {
4635                 // Test vectors from BOLT 3 Appendix E:
4636                 let secp_ctx = Secp256k1::new();
4637
4638                 let base_secret = SecretKey::from_slice(&hex::decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f").unwrap()[..]).unwrap();
4639                 let per_commitment_secret = SecretKey::from_slice(&hex::decode("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
4640
4641                 let base_point = PublicKey::from_secret_key(&secp_ctx, &base_secret);
4642                 assert_eq!(base_point.serialize()[..], hex::decode("036d6caac248af96f6afa7f904f550253a0f3ef3f5aa2fe6838a95b216691468e2").unwrap()[..]);
4643
4644                 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
4645                 assert_eq!(per_commitment_point.serialize()[..], hex::decode("025f7117a78150fe2ef97db7cfc83bd57b2e2c0d0dd25eaf467a4a1c2a45ce1486").unwrap()[..]);
4646
4647                 assert_eq!(chan_utils::derive_public_key(&secp_ctx, &per_commitment_point, &base_point).unwrap().serialize()[..],
4648                                 hex::decode("0235f2dbfaa89b57ec7b055afe29849ef7ddfeb1cefdb9ebdc43f5494984db29e5").unwrap()[..]);
4649
4650                 assert_eq!(chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &base_secret).unwrap(),
4651                                 SecretKey::from_slice(&hex::decode("cbced912d3b21bf196a766651e436aff192362621ce317704ea2f75d87e7be0f").unwrap()[..]).unwrap());
4652
4653                 assert_eq!(chan_utils::derive_public_revocation_key(&secp_ctx, &per_commitment_point, &base_point).unwrap().serialize()[..],
4654                                 hex::decode("02916e326636d19c33f13e8c0c3a03dd157f332f3e99c317c141dd865eb01f8ff0").unwrap()[..]);
4655
4656                 assert_eq!(chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_secret, &base_secret).unwrap(),
4657                                 SecretKey::from_slice(&hex::decode("d09ffff62ddb2297ab000cc85bcb4283fdeb6aa052affbc9dddcf33b61078110").unwrap()[..]).unwrap());
4658         }
4659 }