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