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