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