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