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