]> git.bitcoin.ninja Git - rust-lightning/blob - src/ln/channel.rs
Use new ChannelError in get_channel_announcement
[rust-lightning] / src / ln / channel.rs
1 use bitcoin::blockdata::block::BlockHeader;
2 use bitcoin::blockdata::script::{Script,Builder};
3 use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
4 use bitcoin::blockdata::opcodes;
5 use bitcoin::util::hash::{Sha256dHash, Hash160};
6 use bitcoin::util::bip143;
7 use bitcoin::network::serialize::BitcoinHash;
8
9 use secp256k1::key::{PublicKey,SecretKey};
10 use secp256k1::{Secp256k1,Message,Signature};
11 use secp256k1;
12
13 use crypto::digest::Digest;
14 use crypto::hkdf::{hkdf_extract,hkdf_expand};
15
16 use ln::msgs;
17 use ln::msgs::{ErrorAction, HandleError};
18 use ln::channelmonitor::ChannelMonitor;
19 use ln::channelmanager::{PendingHTLCStatus, HTLCSource, PendingForwardHTLCInfo, HTLCFailReason, HTLCFailureMsg};
20 use ln::chan_utils::{TxCreationKeys,HTLCOutputInCommitment,HTLC_SUCCESS_TX_WEIGHT,HTLC_TIMEOUT_TX_WEIGHT};
21 use ln::chan_utils;
22 use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
23 use chain::transaction::OutPoint;
24 use util::{transaction_utils,rng};
25 use util::ser::Writeable;
26 use util::sha2::Sha256;
27 use util::logger::Logger;
28 use util::errors::APIError;
29
30 use std;
31 use std::default::Default;
32 use std::{cmp,mem};
33 use std::time::Instant;
34 use std::sync::{Arc};
35
36 pub struct ChannelKeys {
37         pub funding_key: SecretKey,
38         pub revocation_base_key: SecretKey,
39         pub payment_base_key: SecretKey,
40         pub delayed_payment_base_key: SecretKey,
41         pub htlc_base_key: SecretKey,
42         pub channel_close_key: SecretKey,
43         pub channel_monitor_claim_key: SecretKey,
44         pub commitment_seed: [u8; 32],
45 }
46
47 impl ChannelKeys {
48         pub fn new_from_seed(seed: &[u8; 32]) -> Result<ChannelKeys, secp256k1::Error> {
49                 let mut prk = [0; 32];
50                 hkdf_extract(Sha256::new(), b"rust-lightning key gen salt", seed, &mut prk);
51                 let secp_ctx = Secp256k1::without_caps();
52
53                 let mut okm = [0; 32];
54                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning funding key info", &mut okm);
55                 let funding_key = SecretKey::from_slice(&secp_ctx, &okm)?;
56
57                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning revocation base key info", &mut okm);
58                 let revocation_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
59
60                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning payment base key info", &mut okm);
61                 let payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
62
63                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning delayed payment base key info", &mut okm);
64                 let delayed_payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
65
66                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning htlc base key info", &mut okm);
67                 let htlc_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
68
69                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel close key info", &mut okm);
70                 let channel_close_key = SecretKey::from_slice(&secp_ctx, &okm)?;
71
72                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel monitor claim key info", &mut okm);
73                 let channel_monitor_claim_key = SecretKey::from_slice(&secp_ctx, &okm)?;
74
75                 hkdf_expand(Sha256::new(), &prk, b"rust-lightning local commitment seed info", &mut okm);
76
77                 Ok(ChannelKeys {
78                         funding_key: funding_key,
79                         revocation_base_key: revocation_base_key,
80                         payment_base_key: payment_base_key,
81                         delayed_payment_base_key: delayed_payment_base_key,
82                         htlc_base_key: htlc_base_key,
83                         channel_close_key: channel_close_key,
84                         channel_monitor_claim_key: channel_monitor_claim_key,
85                         commitment_seed: okm
86                 })
87         }
88 }
89
90 #[derive(PartialEq)]
91 enum InboundHTLCState {
92         /// Added by remote, to be included in next local commitment tx.
93         RemoteAnnounced,
94         /// Included in a received commitment_signed message (implying we've revoke_and_ack'ed it), but
95         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
96         /// accept this HTLC. Implies AwaitingRemoteRevoke.
97         /// We also have not yet included this HTLC in a commitment_signed message, and are waiting on
98         /// a remote revoke_and_ack on a previous state before we can do so.
99         AwaitingRemoteRevokeToAnnounce,
100         /// Included in a received commitment_signed message (implying we've revoke_and_ack'ed it), but
101         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
102         /// accept this HTLC. Implies AwaitingRemoteRevoke.
103         /// We have included this HTLC in our latest commitment_signed and are now just waiting on a
104         /// revoke_and_ack.
105         AwaitingAnnouncedRemoteRevoke,
106         Committed,
107         /// Removed by us and a new commitment_signed was sent (if we were AwaitingRemoteRevoke when we
108         /// created it we would have put it in the holding cell instead). When they next revoke_and_ack
109         /// we'll drop it.
110         /// Note that we have to keep an eye on the HTLC until we've received a broadcastable
111         /// commitment transaction without it as otherwise we'll have to force-close the channel to
112         /// claim it before the timeout (obviously doesn't apply to revoked HTLCs that we can't claim
113         /// anyway). That said, ChannelMonitor does this for us (see
114         /// ChannelMonitor::would_broadcast_at_height) so we actually remove the HTLC from our own
115         /// local state before then, once we're sure that the next commitment_signed and
116         /// ChannelMonitor::provide_latest_local_commitment_tx_info will not include this HTLC.
117         LocalRemoved,
118 }
119
120 struct InboundHTLCOutput {
121         htlc_id: u64,
122         amount_msat: u64,
123         cltv_expiry: u32,
124         payment_hash: [u8; 32],
125         state: InboundHTLCState,
126         /// If we're in LocalRemoved, set to true if we fulfilled the HTLC, and can claim money
127         local_removed_fulfilled: bool,
128         /// state pre-Committed implies pending_forward_state, otherwise it must be None
129         pending_forward_state: Option<PendingHTLCStatus>,
130 }
131
132 #[derive(PartialEq)]
133 enum OutboundHTLCState {
134         /// Added by us and included in a commitment_signed (if we were AwaitingRemoteRevoke when we
135         /// created it we would have put it in the holding cell instead). When they next revoke_and_ack
136         /// we will promote to Committed (note that they may not accept it until the next time we
137         /// revoke, but we dont really care about that:
138         ///  * they've revoked, so worst case we can announce an old state and get our (option on)
139         ///    money back (though we wont), and,
140         ///  * we'll send them a revoke when they send a commitment_signed, and since only they're
141         ///    allowed to remove it, the "can only be removed once committed on both sides" requirement
142         ///    doesn't matter to us and its up to them to enforce it, worst-case they jump ahead but
143         ///    we'll never get out of sync).
144         LocalAnnounced,
145         Committed,
146         /// Remote removed this (outbound) HTLC. We're waiting on their commitment_signed to finalize
147         /// the change (though they'll need to revoke before we fail the payment).
148         RemoteRemoved,
149         /// Remote removed this and sent a commitment_signed (implying we've revoke_and_ack'ed it), but
150         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
151         /// can do any backwards failing. Implies AwaitingRemoteRevoke.
152         /// We also have not yet removed this HTLC in a commitment_signed message, and are waiting on a
153         /// remote revoke_and_ack on a previous state before we can do so.
154         AwaitingRemoteRevokeToRemove,
155         /// Remote removed this and sent a commitment_signed (implying we've revoke_and_ack'ed it), but
156         /// the remote side hasn't yet revoked their previous state, which we need them to do before we
157         /// can do any backwards failing. Implies AwaitingRemoteRevoke.
158         /// We have removed this HTLC in our latest commitment_signed and are now just waiting on a
159         /// revoke_and_ack to drop completely.
160         AwaitingRemovedRemoteRevoke,
161 }
162
163 struct OutboundHTLCOutput {
164         htlc_id: u64,
165         amount_msat: u64,
166         cltv_expiry: u32,
167         payment_hash: [u8; 32],
168         state: OutboundHTLCState,
169         source: HTLCSource,
170         /// If we're in a removed state, set if they failed, otherwise None
171         fail_reason: Option<HTLCFailReason>,
172 }
173
174 macro_rules! get_htlc_in_commitment {
175         ($htlc: expr, $offered: expr) => {
176                 HTLCOutputInCommitment {
177                         offered: $offered,
178                         amount_msat: $htlc.amount_msat,
179                         cltv_expiry: $htlc.cltv_expiry,
180                         payment_hash: $htlc.payment_hash,
181                         transaction_output_index: 0
182                 }
183         }
184 }
185
186 /// See AwaitingRemoteRevoke ChannelState for more info
187 enum HTLCUpdateAwaitingACK {
188         AddHTLC {
189                 // always outbound
190                 amount_msat: u64,
191                 cltv_expiry: u32,
192                 payment_hash: [u8; 32],
193                 source: HTLCSource,
194                 onion_routing_packet: msgs::OnionPacket,
195                 time_created: Instant, //TODO: Some kind of timeout thing-a-majig
196         },
197         ClaimHTLC {
198                 payment_preimage: [u8; 32],
199                 htlc_id: u64,
200         },
201         FailHTLC {
202                 htlc_id: u64,
203                 err_packet: msgs::OnionErrorPacket,
204         },
205 }
206
207 /// There are a few "states" and then a number of flags which can be applied:
208 /// We first move through init with OurInitSent -> TheirInitSent -> FundingCreated -> FundingSent.
209 /// TheirFundingLocked and OurFundingLocked then get set on FundingSent, and when both are set we
210 /// move on to ChannelFunded.
211 /// Note that PeerDisconnected can be set on both ChannelFunded and FundingSent.
212 /// ChannelFunded can then get all remaining flags set on it, until we finish shutdown, then we
213 /// move on to ShutdownComplete, at which point most calls into this channel are disallowed.
214 enum ChannelState {
215         /// Implies we have (or are prepared to) send our open_channel/accept_channel message
216         OurInitSent = (1 << 0),
217         /// Implies we have received their open_channel/accept_channel message
218         TheirInitSent = (1 << 1),
219         /// We have sent funding_created and are awaiting a funding_signed to advance to FundingSent.
220         /// Note that this is nonsense for an inbound channel as we immediately generate funding_signed
221         /// upon receipt of funding_created, so simply skip this state.
222         FundingCreated = 4,
223         /// Set when we have received/sent funding_created and funding_signed and are thus now waiting
224         /// on the funding transaction to confirm. The FundingLocked flags are set to indicate when we
225         /// and our counterparty consider the funding transaction confirmed.
226         FundingSent = 8,
227         /// Flag which can be set on FundingSent to indicate they sent us a funding_locked message.
228         /// Once both TheirFundingLocked and OurFundingLocked are set, state moves on to ChannelFunded.
229         TheirFundingLocked = (1 << 4),
230         /// Flag which can be set on FundingSent to indicate we sent them a funding_locked message.
231         /// Once both TheirFundingLocked and OurFundingLocked are set, state moves on to ChannelFunded.
232         OurFundingLocked = (1 << 5),
233         ChannelFunded = 64,
234         /// Flag which is set on ChannelFunded and FundingSent indicating remote side is considered
235         /// "disconnected" and no updates are allowed until after we've done a channel_reestablish
236         /// dance.
237         PeerDisconnected = (1 << 7),
238         /// Flag which implies that we have sent a commitment_signed but are awaiting the responding
239         /// revoke_and_ack message. During this time period, we can't generate new commitment_signed
240         /// messages as then we will be unable to determine which HTLCs they included in their
241         /// revoke_and_ack implicit ACK, so instead we have to hold them away temporarily to be sent
242         /// later.
243         /// Flag is set on ChannelFunded.
244         AwaitingRemoteRevoke = (1 << 8),
245         /// Flag which is set on ChannelFunded or FundingSent after receiving a shutdown message from
246         /// the remote end. If set, they may not add any new HTLCs to the channel, and we are expected
247         /// to respond with our own shutdown message when possible.
248         RemoteShutdownSent = (1 << 9),
249         /// Flag which is set on ChannelFunded or FundingSent after sending a shutdown message. At this
250         /// point, we may not add any new HTLCs to the channel.
251         /// TODO: Investigate some kind of timeout mechanism by which point the remote end must provide
252         /// us their shutdown.
253         LocalShutdownSent = (1 << 10),
254         /// We've successfully negotiated a closing_signed dance. At this point ChannelManager is about
255         /// to drop us, but we store this anyway.
256         ShutdownComplete = 2048,
257 }
258 const BOTH_SIDES_SHUTDOWN_MASK: u32 = (ChannelState::LocalShutdownSent as u32 | ChannelState::RemoteShutdownSent as u32);
259
260 const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
261
262 // TODO: We should refactor this to be an Inbound/OutboundChannel until initial setup handshaking
263 // has been completed, and then turn into a Channel to get compiler-time enforcement of things like
264 // calling channel_id() before we're set up or things like get_outbound_funding_signed on an
265 // inbound channel.
266 pub(super) struct Channel {
267         user_id: u64,
268
269         channel_id: [u8; 32],
270         channel_state: u32,
271         channel_outbound: bool,
272         secp_ctx: Secp256k1<secp256k1::All>,
273         announce_publicly: bool,
274         channel_value_satoshis: u64,
275
276         local_keys: ChannelKeys,
277
278         // Our commitment numbers start at 2^48-1 and count down, whereas the ones used in transaction
279         // generation start at 0 and count up...this simplifies some parts of implementation at the
280         // cost of others, but should really just be changed.
281
282         cur_local_commitment_transaction_number: u64,
283         cur_remote_commitment_transaction_number: u64,
284         value_to_self_msat: u64, // Excluding all pending_htlcs, excluding fees
285         pending_inbound_htlcs: Vec<InboundHTLCOutput>,
286         pending_outbound_htlcs: Vec<OutboundHTLCOutput>,
287         holding_cell_htlc_updates: Vec<HTLCUpdateAwaitingACK>,
288
289         // pending_update_fee is filled when sending and receiving update_fee
290         // For outbound channel, feerate_per_kw is updated with the value from
291         // pending_update_fee when revoke_and_ack is received
292         //
293         // For inbound channel, feerate_per_kw is updated when it receives
294         // commitment_signed and revoke_and_ack is generated
295         // The pending value is kept when another pair of update_fee and commitment_signed
296         // is received during AwaitingRemoteRevoke and relieved when the expected
297         // revoke_and_ack is received and new commitment_signed is generated to be
298         // sent to the funder. Otherwise, the pending value is removed when receiving
299         // commitment_signed.
300         pending_update_fee: Option<u64>,
301         // update_fee() during ChannelState::AwaitingRemoteRevoke is hold in
302         // holdina_cell_update_fee then moved to pending_udpate_fee when revoke_and_ack
303         // is received. holding_cell_update_fee is updated when there are additional
304         // update_fee() during ChannelState::AwaitingRemoteRevoke.
305         holding_cell_update_fee: Option<u64>,
306         next_local_htlc_id: u64,
307         next_remote_htlc_id: u64,
308         channel_update_count: u32,
309         feerate_per_kw: u64,
310
311         #[cfg(test)]
312         // Used in ChannelManager's tests to send a revoked transaction
313         pub last_local_commitment_txn: Vec<Transaction>,
314         #[cfg(not(test))]
315         last_local_commitment_txn: Vec<Transaction>,
316
317         last_sent_closing_fee: Option<(u64, u64)>, // (feerate, fee)
318
319         /// The hash of the block in which the funding transaction reached our CONF_TARGET. We use this
320         /// to detect unconfirmation after a serialize-unserialize roudtrip where we may not see a full
321         /// series of block_connected/block_disconnected calls. Obviously this is not a guarantee as we
322         /// could miss the funding_tx_confirmed_in block as well, but it serves as a useful fallback.
323         funding_tx_confirmed_in: Option<Sha256dHash>,
324         short_channel_id: Option<u64>,
325         /// Used to deduplicate block_connected callbacks
326         last_block_connected: Sha256dHash,
327         funding_tx_confirmations: u64,
328
329         their_dust_limit_satoshis: u64,
330         our_dust_limit_satoshis: u64,
331         their_max_htlc_value_in_flight_msat: u64,
332         //get_our_max_htlc_value_in_flight_msat(): u64,
333         their_channel_reserve_satoshis: u64,
334         //get_our_channel_reserve_satoshis(): u64,
335         their_htlc_minimum_msat: u64,
336         our_htlc_minimum_msat: u64,
337         their_to_self_delay: u16,
338         //implied by BREAKDOWN_TIMEOUT: our_to_self_delay: u16,
339         their_max_accepted_htlcs: u16,
340         //implied by OUR_MAX_HTLCS: our_max_accepted_htlcs: u16,
341
342         their_funding_pubkey: Option<PublicKey>,
343         their_revocation_basepoint: Option<PublicKey>,
344         their_payment_basepoint: Option<PublicKey>,
345         their_delayed_payment_basepoint: Option<PublicKey>,
346         their_htlc_basepoint: Option<PublicKey>,
347         their_cur_commitment_point: Option<PublicKey>,
348
349         their_prev_commitment_point: Option<PublicKey>,
350         their_node_id: PublicKey,
351
352         their_shutdown_scriptpubkey: Option<Script>,
353
354         channel_monitor: ChannelMonitor,
355
356         logger: Arc<Logger>,
357 }
358
359 const OUR_MAX_HTLCS: u16 = 5; //TODO
360 /// Confirmation count threshold at which we close a channel. Ideally we'd keep the channel around
361 /// on ice until the funding transaction gets more confirmations, but the LN protocol doesn't
362 /// really allow for this, so instead we're stuck closing it out at that point.
363 const UNCONF_THRESHOLD: u32 = 6;
364 /// The amount of time we require our counterparty wait to claim their money (ie time between when
365 /// we, or our watchtower, must check for them having broadcast a theft transaction).
366 const BREAKDOWN_TIMEOUT: u16 = 6 * 24 * 7; //TODO?
367 /// The amount of time we're willing to wait to claim money back to us
368 const MAX_LOCAL_BREAKDOWN_TIMEOUT: u16 = 6 * 24 * 14;
369 const COMMITMENT_TX_BASE_WEIGHT: u64 = 724;
370 const COMMITMENT_TX_WEIGHT_PER_HTLC: u64 = 172;
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 /// Maximmum `funding_satoshis` value, according to the BOLT #2 specification
374 /// it's 2^24.
375 pub const MAX_FUNDING_SATOSHIS: u64 = (1 << 24);
376
377 /// Used to return a simple Error back to ChannelManager. Will get converted to a
378 /// msgs::ErrorAction::SendErrorMessage or msgs::ErrorAction::IgnoreError as appropriate with our
379 /// channel_id in ChannelManager.
380 pub(super) enum ChannelError {
381         Ignore(&'static str),
382         Close(&'static str),
383 }
384
385 macro_rules! secp_call {
386         ( $res: expr, $err: expr, $chan_id: expr ) => {
387                 match $res {
388                         Ok(key) => key,
389                         Err(_) => return Err(HandleError {err: $err, action: Some(msgs::ErrorAction::SendErrorMessage {msg: msgs::ErrorMessage {channel_id: $chan_id, data: $err.to_string()}})})
390                 }
391         };
392 }
393
394 macro_rules! secp_derived_key {
395         ( $res: expr, $chan_id: expr ) => {
396                 secp_call!($res, "Derived invalid key, peer is maliciously selecting parameters", $chan_id)
397         }
398 }
399 impl Channel {
400         // Convert constants + channel value to limits:
401         fn get_our_max_htlc_value_in_flight_msat(channel_value_satoshis: u64) -> u64 {
402                 channel_value_satoshis * 1000 / 10 //TODO
403         }
404
405         /// Guaranteed to return a value no larger than channel_value_satoshis
406         fn get_our_channel_reserve_satoshis(channel_value_satoshis: u64) -> u64 {
407                 let (q, _) = channel_value_satoshis.overflowing_div(100);
408                 cmp::min(channel_value_satoshis, cmp::max(q, 1000)) //TODO
409         }
410
411         fn derive_our_dust_limit_satoshis(at_open_background_feerate: u64) -> u64 {
412                 at_open_background_feerate * B_OUTPUT_PLUS_SPENDING_INPUT_WEIGHT / 1000 //TODO
413         }
414
415         fn derive_our_htlc_minimum_msat(_at_open_channel_feerate_per_kw: u64) -> u64 {
416                 1000 // TODO
417         }
418
419         fn derive_minimum_depth(_channel_value_satoshis_msat: u64, _value_to_self_msat: u64) -> u32 {
420                 // Note that in order to comply with BOLT 7 announcement_signatures requirements this must
421                 // be at least 6.
422                 const CONF_TARGET: u32 = 12; //TODO: Should be much higher
423                 CONF_TARGET
424         }
425
426         fn derive_maximum_minimum_depth(_channel_value_satoshis_msat: u64, _value_to_self_msat: u64) -> u32 {
427                 const CONF_TARGET: u32 = 12; //TODO: Should be much higher
428                 CONF_TARGET * 2
429         }
430
431         // Constructors:
432         pub fn new_outbound(fee_estimator: &FeeEstimator, chan_keys: ChannelKeys, their_node_id: PublicKey, channel_value_satoshis: u64, push_msat: u64, announce_publicly: bool, user_id: u64, logger: Arc<Logger>) -> Result<Channel, APIError> {
433                 if channel_value_satoshis >= MAX_FUNDING_SATOSHIS {
434                         return Err(APIError::APIMisuseError{err: "funding value > 2^24"});
435                 }
436
437                 if push_msat > channel_value_satoshis * 1000 {
438                         return Err(APIError::APIMisuseError{err: "push value > channel value"});
439                 }
440
441
442                 let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
443                 if Channel::get_our_channel_reserve_satoshis(channel_value_satoshis) < Channel::derive_our_dust_limit_satoshis(background_feerate) {
444                         return Err(APIError::FeeRateTooHigh{err: format!("Not enough reserve above dust limit can be found at current fee rate({})", background_feerate), feerate: background_feerate});
445                 }
446
447                 let feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
448
449                 let secp_ctx = Secp256k1::new();
450                 let our_channel_monitor_claim_key_hash = Hash160::from_data(&PublicKey::from_secret_key(&secp_ctx, &chan_keys.channel_monitor_claim_key).serialize());
451                 let our_channel_monitor_claim_script = Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script();
452                 let channel_monitor = ChannelMonitor::new(&chan_keys.revocation_base_key,
453                                                           &PublicKey::from_secret_key(&secp_ctx, &chan_keys.delayed_payment_base_key),
454                                                           &chan_keys.htlc_base_key,
455                                                           BREAKDOWN_TIMEOUT, our_channel_monitor_claim_script);
456
457                 Ok(Channel {
458                         user_id: user_id,
459
460                         channel_id: rng::rand_u832(),
461                         channel_state: ChannelState::OurInitSent as u32,
462                         channel_outbound: true,
463                         secp_ctx: secp_ctx,
464                         announce_publicly: announce_publicly,
465                         channel_value_satoshis: channel_value_satoshis,
466
467                         local_keys: chan_keys,
468                         cur_local_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
469                         cur_remote_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
470                         value_to_self_msat: channel_value_satoshis * 1000 - push_msat,
471                         pending_inbound_htlcs: Vec::new(),
472                         pending_outbound_htlcs: Vec::new(),
473                         holding_cell_htlc_updates: Vec::new(),
474                         pending_update_fee: None,
475                         holding_cell_update_fee: None,
476                         next_local_htlc_id: 0,
477                         next_remote_htlc_id: 0,
478                         channel_update_count: 1,
479
480                         last_local_commitment_txn: Vec::new(),
481
482                         last_sent_closing_fee: None,
483
484                         funding_tx_confirmed_in: None,
485                         short_channel_id: None,
486                         last_block_connected: Default::default(),
487                         funding_tx_confirmations: 0,
488
489                         feerate_per_kw: feerate,
490                         their_dust_limit_satoshis: 0,
491                         our_dust_limit_satoshis: Channel::derive_our_dust_limit_satoshis(background_feerate),
492                         their_max_htlc_value_in_flight_msat: 0,
493                         their_channel_reserve_satoshis: 0,
494                         their_htlc_minimum_msat: 0,
495                         our_htlc_minimum_msat: Channel::derive_our_htlc_minimum_msat(feerate),
496                         their_to_self_delay: 0,
497                         their_max_accepted_htlcs: 0,
498
499                         their_funding_pubkey: None,
500                         their_revocation_basepoint: None,
501                         their_payment_basepoint: None,
502                         their_delayed_payment_basepoint: None,
503                         their_htlc_basepoint: None,
504                         their_cur_commitment_point: None,
505
506                         their_prev_commitment_point: None,
507                         their_node_id: their_node_id,
508
509                         their_shutdown_scriptpubkey: None,
510
511                         channel_monitor: channel_monitor,
512
513                         logger,
514                 })
515         }
516
517         fn check_remote_fee(fee_estimator: &FeeEstimator, feerate_per_kw: u32) -> Result<(), ChannelError> {
518                 if (feerate_per_kw as u64) < fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background) {
519                         return Err(ChannelError::Close("Peer's feerate much too low"));
520                 }
521                 if (feerate_per_kw as u64) > fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority) * 2 {
522                         return Err(ChannelError::Close("Peer's feerate much too high"));
523                 }
524                 Ok(())
525         }
526
527         /// Creates a new channel from a remote sides' request for one.
528         /// Assumes chain_hash has already been checked and corresponds with what we expect!
529         pub fn new_from_req(fee_estimator: &FeeEstimator, chan_keys: ChannelKeys, their_node_id: PublicKey, msg: &msgs::OpenChannel, user_id: u64, require_announce: bool, allow_announce: bool, logger: Arc<Logger>) -> Result<Channel, ChannelError> {
530                 // Check sanity of message fields:
531                 if msg.funding_satoshis >= MAX_FUNDING_SATOSHIS {
532                         return Err(ChannelError::Close("funding value > 2^24"));
533                 }
534                 if msg.channel_reserve_satoshis > msg.funding_satoshis {
535                         return Err(ChannelError::Close("Bogus channel_reserve_satoshis"));
536                 }
537                 if msg.push_msat > (msg.funding_satoshis - msg.channel_reserve_satoshis) * 1000 {
538                         return Err(ChannelError::Close("push_msat larger than funding value"));
539                 }
540                 if msg.dust_limit_satoshis > msg.funding_satoshis {
541                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
542                 }
543                 if msg.dust_limit_satoshis > msg.channel_reserve_satoshis {
544                         return Err(ChannelError::Close("Bogus; channel reserve is less than dust limit"));
545                 }
546                 if msg.htlc_minimum_msat >= (msg.funding_satoshis - msg.channel_reserve_satoshis) * 1000 {
547                         return Err(ChannelError::Close("Miminum htlc value is full channel value"));
548                 }
549                 Channel::check_remote_fee(fee_estimator, msg.feerate_per_kw)?;
550
551                 if msg.to_self_delay > MAX_LOCAL_BREAKDOWN_TIMEOUT {
552                         return Err(ChannelError::Close("They wanted our payments to be delayed by a needlessly long period"));
553                 }
554                 if msg.max_accepted_htlcs < 1 {
555                         return Err(ChannelError::Close("0 max_accpted_htlcs makes for a useless channel"));
556                 }
557                 if msg.max_accepted_htlcs > 483 {
558                         return Err(ChannelError::Close("max_accpted_htlcs > 483"));
559                 }
560
561                 // Convert things into internal flags and prep our state:
562
563                 let their_announce = if (msg.channel_flags & 1) == 1 { true } else { false };
564                 if require_announce && !their_announce {
565                         return Err(ChannelError::Close("Peer tried to open unannounced channel, but we require public ones"));
566                 }
567                 if !allow_announce && their_announce {
568                         return Err(ChannelError::Close("Peer tried to open announced channel, but we require private ones"));
569                 }
570
571                 let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
572
573                 let our_dust_limit_satoshis = Channel::derive_our_dust_limit_satoshis(background_feerate);
574                 let our_channel_reserve_satoshis = Channel::get_our_channel_reserve_satoshis(msg.funding_satoshis);
575                 if our_channel_reserve_satoshis < our_dust_limit_satoshis {
576                         return Err(ChannelError::Close("Suitalbe channel reserve not found. aborting"));
577                 }
578                 if msg.channel_reserve_satoshis < our_dust_limit_satoshis {
579                         return Err(ChannelError::Close("channel_reserve_satoshis too small"));
580                 }
581                 if our_channel_reserve_satoshis < msg.dust_limit_satoshis {
582                         return Err(ChannelError::Close("Dust limit too high for our channel reserve"));
583                 }
584
585                 // check if the funder's amount for the initial commitment tx is sufficient
586                 // for full fee payment
587                 let funders_amount_msat = msg.funding_satoshis * 1000 - msg.push_msat;
588                 if funders_amount_msat < background_feerate * COMMITMENT_TX_BASE_WEIGHT {
589                         return Err(ChannelError::Close("Insufficient funding amount for initial commitment"));
590                 }
591
592                 let to_local_msat = msg.push_msat;
593                 let to_remote_msat = funders_amount_msat - background_feerate * COMMITMENT_TX_BASE_WEIGHT;
594                 if to_local_msat <= msg.channel_reserve_satoshis * 1000 && to_remote_msat <= our_channel_reserve_satoshis * 1000 {
595                         return Err(ChannelError::Close("Insufficient funding amount for initial commitment"));
596                 }
597
598                 let secp_ctx = Secp256k1::new();
599                 let our_channel_monitor_claim_key_hash = Hash160::from_data(&PublicKey::from_secret_key(&secp_ctx, &chan_keys.channel_monitor_claim_key).serialize());
600                 let our_channel_monitor_claim_script = Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script();
601                 let mut channel_monitor = ChannelMonitor::new(&chan_keys.revocation_base_key,
602                                                               &PublicKey::from_secret_key(&secp_ctx, &chan_keys.delayed_payment_base_key),
603                                                               &chan_keys.htlc_base_key,
604                                                               BREAKDOWN_TIMEOUT, our_channel_monitor_claim_script);
605                 channel_monitor.set_their_base_keys(&msg.htlc_basepoint, &msg.delayed_payment_basepoint);
606                 channel_monitor.set_their_to_self_delay(msg.to_self_delay);
607
608                 let mut chan = Channel {
609                         user_id: user_id,
610
611                         channel_id: msg.temporary_channel_id,
612                         channel_state: (ChannelState::OurInitSent as u32) | (ChannelState::TheirInitSent as u32),
613                         channel_outbound: false,
614                         secp_ctx: secp_ctx,
615                         announce_publicly: their_announce,
616
617                         local_keys: chan_keys,
618                         cur_local_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
619                         cur_remote_commitment_transaction_number: INITIAL_COMMITMENT_NUMBER,
620                         value_to_self_msat: msg.push_msat,
621                         pending_inbound_htlcs: Vec::new(),
622                         pending_outbound_htlcs: Vec::new(),
623                         holding_cell_htlc_updates: Vec::new(),
624                         pending_update_fee: None,
625                         holding_cell_update_fee: None,
626                         next_local_htlc_id: 0,
627                         next_remote_htlc_id: 0,
628                         channel_update_count: 1,
629
630                         last_local_commitment_txn: Vec::new(),
631
632                         last_sent_closing_fee: None,
633
634                         funding_tx_confirmed_in: None,
635                         short_channel_id: None,
636                         last_block_connected: Default::default(),
637                         funding_tx_confirmations: 0,
638
639                         feerate_per_kw: msg.feerate_per_kw as u64,
640                         channel_value_satoshis: msg.funding_satoshis,
641                         their_dust_limit_satoshis: msg.dust_limit_satoshis,
642                         our_dust_limit_satoshis: our_dust_limit_satoshis,
643                         their_max_htlc_value_in_flight_msat: cmp::min(msg.max_htlc_value_in_flight_msat, msg.funding_satoshis * 1000),
644                         their_channel_reserve_satoshis: msg.channel_reserve_satoshis,
645                         their_htlc_minimum_msat: msg.htlc_minimum_msat,
646                         our_htlc_minimum_msat: Channel::derive_our_htlc_minimum_msat(msg.feerate_per_kw as u64),
647                         their_to_self_delay: msg.to_self_delay,
648                         their_max_accepted_htlcs: msg.max_accepted_htlcs,
649
650                         their_funding_pubkey: Some(msg.funding_pubkey),
651                         their_revocation_basepoint: Some(msg.revocation_basepoint),
652                         their_payment_basepoint: Some(msg.payment_basepoint),
653                         their_delayed_payment_basepoint: Some(msg.delayed_payment_basepoint),
654                         their_htlc_basepoint: Some(msg.htlc_basepoint),
655                         their_cur_commitment_point: Some(msg.first_per_commitment_point),
656
657                         their_prev_commitment_point: None,
658                         their_node_id: their_node_id,
659
660                         their_shutdown_scriptpubkey: None,
661
662                         channel_monitor: channel_monitor,
663
664                         logger,
665                 };
666
667                 let obscure_factor = chan.get_commitment_transaction_number_obscure_factor();
668                 chan.channel_monitor.set_commitment_obscure_factor(obscure_factor);
669
670                 Ok(chan)
671         }
672
673         // Utilities to derive keys:
674
675         fn build_local_commitment_secret(&self, idx: u64) -> SecretKey {
676                 let res = chan_utils::build_commitment_secret(self.local_keys.commitment_seed, idx);
677                 SecretKey::from_slice(&self.secp_ctx, &res).unwrap()
678         }
679
680         // Utilities to build transactions:
681
682         fn get_commitment_transaction_number_obscure_factor(&self) -> u64 {
683                 let mut sha = Sha256::new();
684                 let our_payment_basepoint = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.payment_base_key);
685
686                 if self.channel_outbound {
687                         sha.input(&our_payment_basepoint.serialize());
688                         sha.input(&self.their_payment_basepoint.unwrap().serialize());
689                 } else {
690                         sha.input(&self.their_payment_basepoint.unwrap().serialize());
691                         sha.input(&our_payment_basepoint.serialize());
692                 }
693                 let mut res = [0; 32];
694                 sha.result(&mut res);
695
696                 ((res[26] as u64) << 5*8) |
697                 ((res[27] as u64) << 4*8) |
698                 ((res[28] as u64) << 3*8) |
699                 ((res[29] as u64) << 2*8) |
700                 ((res[30] as u64) << 1*8) |
701                 ((res[31] as u64) << 0*8)
702         }
703
704         /// Transaction nomenclature is somewhat confusing here as there are many different cases - a
705         /// transaction is referred to as "a's transaction" implying that a will be able to broadcast
706         /// the transaction. Thus, b will generally be sending a signature over such a transaction to
707         /// a, and a can revoke the transaction by providing b the relevant per_commitment_secret. As
708         /// such, a transaction is generally the result of b increasing the amount paid to a (or adding
709         /// an HTLC to a).
710         /// @local is used only to convert relevant internal structures which refer to remote vs local
711         /// to decide value of outputs and direction of HTLCs.
712         /// @generated_by_local is used to determine *which* HTLCs to include - noting that the HTLC
713         /// state may indicate that one peer has informed the other that they'd like to add an HTLC but
714         /// have not yet committed it. Such HTLCs will only be included in transactions which are being
715         /// generated by the peer which proposed adding the HTLCs, and thus we need to understand both
716         /// which peer generated this transaction and "to whom" this transaction flows.
717         #[inline]
718         fn build_commitment_transaction(&self, commitment_number: u64, keys: &TxCreationKeys, local: bool, generated_by_local: bool, feerate_per_kw: u64) -> (Transaction, Vec<HTLCOutputInCommitment>) {
719                 let obscured_commitment_transaction_number = self.get_commitment_transaction_number_obscure_factor() ^ (INITIAL_COMMITMENT_NUMBER - commitment_number);
720
721                 let txins = {
722                         let mut ins: Vec<TxIn> = Vec::new();
723                         ins.push(TxIn {
724                                 previous_output: self.channel_monitor.get_funding_txo().unwrap().into_bitcoin_outpoint(),
725                                 script_sig: Script::new(),
726                                 sequence: ((0x80 as u32) << 8*3) | ((obscured_commitment_transaction_number >> 3*8) as u32),
727                                 witness: Vec::new(),
728                         });
729                         ins
730                 };
731
732                 let mut txouts: Vec<(TxOut, Option<HTLCOutputInCommitment>)> = Vec::with_capacity(self.pending_inbound_htlcs.len() + self.pending_outbound_htlcs.len() + 2);
733
734                 let dust_limit_satoshis = if local { self.our_dust_limit_satoshis } else { self.their_dust_limit_satoshis };
735                 let mut remote_htlc_total_msat = 0;
736                 let mut local_htlc_total_msat = 0;
737                 let mut value_to_self_msat_offset = 0;
738
739                 macro_rules! add_htlc_output {
740                         ($htlc: expr, $outbound: expr) => {
741                                 if $outbound == local { // "offered HTLC output"
742                                         if $htlc.amount_msat / 1000 >= dust_limit_satoshis + (feerate_per_kw * HTLC_TIMEOUT_TX_WEIGHT / 1000) {
743                                                 let htlc_in_tx = get_htlc_in_commitment!($htlc, true);
744                                                 txouts.push((TxOut {
745                                                         script_pubkey: chan_utils::get_htlc_redeemscript(&htlc_in_tx, &keys).to_v0_p2wsh(),
746                                                         value: $htlc.amount_msat / 1000
747                                                 }, Some(htlc_in_tx)));
748                                         }
749                                 } else {
750                                         if $htlc.amount_msat / 1000 >= dust_limit_satoshis + (feerate_per_kw * HTLC_SUCCESS_TX_WEIGHT / 1000) {
751                                                 let htlc_in_tx = get_htlc_in_commitment!($htlc, false);
752                                                 txouts.push((TxOut { // "received HTLC output"
753                                                         script_pubkey: chan_utils::get_htlc_redeemscript(&htlc_in_tx, &keys).to_v0_p2wsh(),
754                                                         value: $htlc.amount_msat / 1000
755                                                 }, Some(htlc_in_tx)));
756                                         }
757                                 }
758                         }
759                 }
760
761                 for ref htlc in self.pending_inbound_htlcs.iter() {
762                         let include = match htlc.state {
763                                 InboundHTLCState::RemoteAnnounced => !generated_by_local,
764                                 InboundHTLCState::AwaitingRemoteRevokeToAnnounce => !generated_by_local,
765                                 InboundHTLCState::AwaitingAnnouncedRemoteRevoke => true,
766                                 InboundHTLCState::Committed => true,
767                                 InboundHTLCState::LocalRemoved => !generated_by_local,
768                         };
769
770                         if include {
771                                 add_htlc_output!(htlc, false);
772                                 remote_htlc_total_msat += htlc.amount_msat;
773                         } else {
774                                 match htlc.state {
775                                         InboundHTLCState::LocalRemoved => {
776                                                 if generated_by_local && htlc.local_removed_fulfilled {
777                                                         value_to_self_msat_offset += htlc.amount_msat as i64;
778                                                 }
779                                         },
780                                         _ => {},
781                                 }
782                         }
783                 }
784
785                 for ref htlc in self.pending_outbound_htlcs.iter() {
786                         let include = match htlc.state {
787                                 OutboundHTLCState::LocalAnnounced => generated_by_local,
788                                 OutboundHTLCState::Committed => true,
789                                 OutboundHTLCState::RemoteRemoved => generated_by_local,
790                                 OutboundHTLCState::AwaitingRemoteRevokeToRemove => generated_by_local,
791                                 OutboundHTLCState::AwaitingRemovedRemoteRevoke => false,
792                         };
793
794                         if include {
795                                 add_htlc_output!(htlc, true);
796                                 local_htlc_total_msat += htlc.amount_msat;
797                         } else {
798                                 match htlc.state {
799                                         OutboundHTLCState::AwaitingRemoteRevokeToRemove|OutboundHTLCState::AwaitingRemovedRemoteRevoke => {
800                                                 if htlc.fail_reason.is_none() {
801                                                         value_to_self_msat_offset -= htlc.amount_msat as i64;
802                                                 }
803                                         },
804                                         OutboundHTLCState::RemoteRemoved => {
805                                                 if !generated_by_local && htlc.fail_reason.is_none() {
806                                                         value_to_self_msat_offset -= htlc.amount_msat as i64;
807                                                 }
808                                         },
809                                         _ => {},
810                                 }
811                         }
812                 }
813
814
815                 let total_fee: u64 = feerate_per_kw * (COMMITMENT_TX_BASE_WEIGHT + (txouts.len() as u64) * COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
816                 let value_to_self: i64 = ((self.value_to_self_msat - local_htlc_total_msat) as i64 + value_to_self_msat_offset) / 1000 - if self.channel_outbound { total_fee as i64 } else { 0 };
817                 let value_to_remote: i64 = (((self.channel_value_satoshis * 1000 - self.value_to_self_msat - remote_htlc_total_msat) as i64 - value_to_self_msat_offset) / 1000) - if self.channel_outbound { 0 } else { total_fee as i64 };
818
819                 let value_to_a = if local { value_to_self } else { value_to_remote };
820                 let value_to_b = if local { value_to_remote } else { value_to_self };
821
822                 if value_to_a >= (dust_limit_satoshis as i64) {
823                         txouts.push((TxOut {
824                                 script_pubkey: chan_utils::get_revokeable_redeemscript(&keys.revocation_key,
825                                                                                        if local { self.their_to_self_delay } else { BREAKDOWN_TIMEOUT },
826                                                                                        &keys.a_delayed_payment_key).to_v0_p2wsh(),
827                                 value: value_to_a as u64
828                         }, None));
829                 }
830
831                 if value_to_b >= (dust_limit_satoshis as i64) {
832                         txouts.push((TxOut {
833                                 script_pubkey: Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0)
834                                                              .push_slice(&Hash160::from_data(&keys.b_payment_key.serialize())[..])
835                                                              .into_script(),
836                                 value: value_to_b as u64
837                         }, None));
838                 }
839
840                 transaction_utils::sort_outputs(&mut txouts);
841
842                 let mut outputs: Vec<TxOut> = Vec::with_capacity(txouts.len());
843                 let mut htlcs_used: Vec<HTLCOutputInCommitment> = Vec::with_capacity(txouts.len());
844                 for (idx, out) in txouts.drain(..).enumerate() {
845                         outputs.push(out.0);
846                         if let Some(out_htlc) = out.1 {
847                                 htlcs_used.push(out_htlc);
848                                 htlcs_used.last_mut().unwrap().transaction_output_index = idx as u32;
849                         }
850                 }
851
852                 (Transaction {
853                         version: 2,
854                         lock_time: ((0x20 as u32) << 8*3) | ((obscured_commitment_transaction_number & 0xffffffu64) as u32),
855                         input: txins,
856                         output: outputs,
857                 }, htlcs_used)
858         }
859
860         #[inline]
861         fn get_closing_scriptpubkey(&self) -> Script {
862                 let our_channel_close_key_hash = Hash160::from_data(&PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.channel_close_key).serialize());
863                 Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0).push_slice(&our_channel_close_key_hash[..]).into_script()
864         }
865
866         #[inline]
867         fn get_closing_transaction_weight(a_scriptpubkey: &Script, b_scriptpubkey: &Script) -> u64 {
868                 (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)
869         }
870
871         #[inline]
872         fn build_closing_transaction(&self, proposed_total_fee_satoshis: u64, skip_remote_output: bool) -> (Transaction, u64) {
873                 let txins = {
874                         let mut ins: Vec<TxIn> = Vec::new();
875                         ins.push(TxIn {
876                                 previous_output: self.channel_monitor.get_funding_txo().unwrap().into_bitcoin_outpoint(),
877                                 script_sig: Script::new(),
878                                 sequence: 0xffffffff,
879                                 witness: Vec::new(),
880                         });
881                         ins
882                 };
883
884                 assert!(self.pending_inbound_htlcs.is_empty());
885                 assert!(self.pending_outbound_htlcs.is_empty());
886                 let mut txouts: Vec<(TxOut, ())> = Vec::new();
887
888                 let mut total_fee_satoshis = proposed_total_fee_satoshis;
889                 let value_to_self: i64 = (self.value_to_self_msat as i64) / 1000 - if self.channel_outbound { total_fee_satoshis as i64 } else { 0 };
890                 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 };
891
892                 if value_to_self < 0 {
893                         assert!(self.channel_outbound);
894                         total_fee_satoshis += (-value_to_self) as u64;
895                 } else if value_to_remote < 0 {
896                         assert!(!self.channel_outbound);
897                         total_fee_satoshis += (-value_to_remote) as u64;
898                 }
899
900                 if !skip_remote_output && value_to_remote as u64 > self.our_dust_limit_satoshis {
901                         txouts.push((TxOut {
902                                 script_pubkey: self.their_shutdown_scriptpubkey.clone().unwrap(),
903                                 value: value_to_remote as u64
904                         }, ()));
905                 }
906
907                 if value_to_self as u64 > self.our_dust_limit_satoshis {
908                         txouts.push((TxOut {
909                                 script_pubkey: self.get_closing_scriptpubkey(),
910                                 value: value_to_self as u64
911                         }, ()));
912                 }
913
914                 transaction_utils::sort_outputs(&mut txouts);
915
916                 let mut outputs: Vec<TxOut> = Vec::new();
917                 for out in txouts.drain(..) {
918                         outputs.push(out.0);
919                 }
920
921                 (Transaction {
922                         version: 2,
923                         lock_time: 0,
924                         input: txins,
925                         output: outputs,
926                 }, total_fee_satoshis)
927         }
928
929         #[inline]
930         /// Creates a set of keys for build_commitment_transaction to generate a transaction which our
931         /// counterparty will sign (ie DO NOT send signatures over a transaction created by this to
932         /// our counterparty!)
933         /// The result is a transaction which we can revoke ownership of (ie a "local" transaction)
934         /// TODO Some magic rust shit to compile-time check this?
935         fn build_local_transaction_keys(&self, commitment_number: u64) -> Result<TxCreationKeys, HandleError> {
936                 let per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(commitment_number));
937                 let delayed_payment_base = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.delayed_payment_base_key);
938                 let htlc_basepoint = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.htlc_base_key);
939
940                 Ok(secp_derived_key!(TxCreationKeys::new(&self.secp_ctx, &per_commitment_point, &delayed_payment_base, &htlc_basepoint, &self.their_revocation_basepoint.unwrap(), &self.their_payment_basepoint.unwrap(), &self.their_htlc_basepoint.unwrap()), self.channel_id()))
941         }
942
943         #[inline]
944         /// Creates a set of keys for build_commitment_transaction to generate a transaction which we
945         /// will sign and send to our counterparty.
946         fn build_remote_transaction_keys(&self) -> Result<TxCreationKeys, HandleError> {
947                 //TODO: Ensure that the payment_key derived here ends up in the library users' wallet as we
948                 //may see payments to it!
949                 let payment_basepoint = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.payment_base_key);
950                 let revocation_basepoint = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.revocation_base_key);
951                 let htlc_basepoint = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.htlc_base_key);
952
953                 Ok(secp_derived_key!(TxCreationKeys::new(&self.secp_ctx, &self.their_cur_commitment_point.unwrap(), &self.their_delayed_payment_basepoint.unwrap(), &self.their_htlc_basepoint.unwrap(), &revocation_basepoint, &payment_basepoint, &htlc_basepoint), self.channel_id()))
954         }
955
956         /// Gets the redeemscript for the funding transaction output (ie the funding transaction output
957         /// pays to get_funding_redeemscript().to_v0_p2wsh()).
958         /// Panics if called before accept_channel/new_from_req
959         pub fn get_funding_redeemscript(&self) -> Script {
960                 let builder = Builder::new().push_opcode(opcodes::All::OP_PUSHNUM_2);
961                 let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key).serialize();
962                 let their_funding_key = self.their_funding_pubkey.expect("get_funding_redeemscript only allowed after accept_channel").serialize();
963                 if our_funding_key[..] < their_funding_key[..] {
964                         builder.push_slice(&our_funding_key)
965                                 .push_slice(&their_funding_key)
966                 } else {
967                         builder.push_slice(&their_funding_key)
968                                 .push_slice(&our_funding_key)
969                 }.push_opcode(opcodes::All::OP_PUSHNUM_2).push_opcode(opcodes::All::OP_CHECKMULTISIG).into_script()
970         }
971
972         fn sign_commitment_transaction(&self, tx: &mut Transaction, their_sig: &Signature) -> Signature {
973                 if tx.input.len() != 1 {
974                         panic!("Tried to sign commitment transaction that had input count != 1!");
975                 }
976                 if tx.input[0].witness.len() != 0 {
977                         panic!("Tried to re-sign commitment transaction");
978                 }
979
980                 let funding_redeemscript = self.get_funding_redeemscript();
981
982                 let sighash = Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
983                 let our_sig = self.secp_ctx.sign(&sighash, &self.local_keys.funding_key);
984
985                 tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
986
987                 let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key).serialize();
988                 let their_funding_key = self.their_funding_pubkey.unwrap().serialize();
989                 if our_funding_key[..] < their_funding_key[..] {
990                         tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
991                         tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
992                 } else {
993                         tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
994                         tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
995                 }
996                 tx.input[0].witness[1].push(SigHashType::All as u8);
997                 tx.input[0].witness[2].push(SigHashType::All as u8);
998
999                 tx.input[0].witness.push(funding_redeemscript.into_bytes());
1000
1001                 our_sig
1002         }
1003
1004         /// Builds the htlc-success or htlc-timeout transaction which spends a given HTLC output
1005         /// @local is used only to convert relevant internal structures which refer to remote vs local
1006         /// to decide value of outputs and direction of HTLCs.
1007         fn build_htlc_transaction(&self, prev_hash: &Sha256dHash, htlc: &HTLCOutputInCommitment, local: bool, keys: &TxCreationKeys, feerate_per_kw: u64) -> Transaction {
1008                 chan_utils::build_htlc_transaction(prev_hash, feerate_per_kw, if local { self.their_to_self_delay } else { BREAKDOWN_TIMEOUT }, htlc, &keys.a_delayed_payment_key, &keys.revocation_key)
1009         }
1010
1011         fn create_htlc_tx_signature(&self, tx: &Transaction, htlc: &HTLCOutputInCommitment, keys: &TxCreationKeys) -> Result<(Script, Signature, bool), HandleError> {
1012                 if tx.input.len() != 1 {
1013                         panic!("Tried to sign HTLC transaction that had input count != 1!");
1014                 }
1015
1016                 let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
1017
1018                 let our_htlc_key = secp_derived_key!(chan_utils::derive_private_key(&self.secp_ctx, &keys.per_commitment_point, &self.local_keys.htlc_base_key), self.channel_id());
1019                 let sighash = Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
1020                 let is_local_tx = PublicKey::from_secret_key(&self.secp_ctx, &our_htlc_key) == keys.a_htlc_key;
1021                 Ok((htlc_redeemscript, self.secp_ctx.sign(&sighash, &our_htlc_key), is_local_tx))
1022         }
1023
1024         /// Signs a transaction created by build_htlc_transaction. If the transaction is an
1025         /// HTLC-Success transaction (ie htlc.offered is false), preimate must be set!
1026         fn sign_htlc_transaction(&self, tx: &mut Transaction, their_sig: &Signature, preimage: &Option<[u8; 32]>, htlc: &HTLCOutputInCommitment, keys: &TxCreationKeys) -> Result<Signature, HandleError> {
1027                 if tx.input.len() != 1 {
1028                         panic!("Tried to sign HTLC transaction that had input count != 1!");
1029                 }
1030                 if tx.input[0].witness.len() != 0 {
1031                         panic!("Tried to re-sign HTLC transaction");
1032                 }
1033
1034                 let (htlc_redeemscript, our_sig, local_tx) = self.create_htlc_tx_signature(tx, htlc, keys)?;
1035
1036                 tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
1037
1038                 if local_tx { // b, then a
1039                         tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
1040                         tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
1041                 } else {
1042                         tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
1043                         tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
1044                 }
1045                 tx.input[0].witness[1].push(SigHashType::All as u8);
1046                 tx.input[0].witness[2].push(SigHashType::All as u8);
1047
1048                 if htlc.offered {
1049                         tx.input[0].witness.push(Vec::new());
1050                 } else {
1051                         tx.input[0].witness.push(preimage.unwrap().to_vec());
1052                 }
1053
1054                 tx.input[0].witness.push(htlc_redeemscript.into_bytes());
1055
1056                 Ok(our_sig)
1057         }
1058
1059         /// May return an IgnoreError, but should not, and will always return Ok(_) when
1060         /// debug_assertions are turned on
1061         fn get_update_fulfill_htlc(&mut self, htlc_id_arg: u64, payment_preimage_arg: [u8; 32]) -> Result<(Option<msgs::UpdateFulfillHTLC>, Option<ChannelMonitor>), HandleError> {
1062                 // Either ChannelFunded got set (which means it wont bet unset) or there is no way any
1063                 // caller thought we could have something claimed (cause we wouldn't have accepted in an
1064                 // incoming HTLC anyway). If we got to ShutdownComplete, callers aren't allowed to call us,
1065                 // either.
1066                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1067                         panic!("Was asked to fulfill an HTLC when channel was not in an operational state");
1068                 }
1069                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
1070
1071                 let mut sha = Sha256::new();
1072                 sha.input(&payment_preimage_arg);
1073                 let mut payment_hash_calc = [0; 32];
1074                 sha.result(&mut payment_hash_calc);
1075
1076                 let mut pending_idx = std::usize::MAX;
1077                 for (idx, htlc) in self.pending_inbound_htlcs.iter().enumerate() {
1078                         if htlc.htlc_id == htlc_id_arg {
1079                                 assert_eq!(htlc.payment_hash, payment_hash_calc);
1080                                 if htlc.state != InboundHTLCState::Committed {
1081                                         debug_assert!(false, "Have an inbound HTLC we tried to claim before it was fully committed to");
1082                                         // Don't return in release mode here so that we can update channel_monitor
1083                                 }
1084                                 pending_idx = idx;
1085                                 break;
1086                         }
1087                 }
1088                 if pending_idx == std::usize::MAX {
1089                         debug_assert!(false, "Unable to find a pending HTLC which matched the given HTLC ID");
1090                         return Err(HandleError{err: "Unable to find a pending HTLC which matched the given HTLC ID", action: Some(msgs::ErrorAction::IgnoreError)});
1091                 }
1092
1093                 // Now update local state:
1094                 //
1095                 // We have to put the payment_preimage in the channel_monitor right away here to ensure we
1096                 // can claim it even if the channel hits the chain before we see their next commitment.
1097                 self.channel_monitor.provide_payment_preimage(&payment_hash_calc, &payment_preimage_arg);
1098
1099                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32)) != 0 {
1100                         for pending_update in self.holding_cell_htlc_updates.iter() {
1101                                 match pending_update {
1102                                         &HTLCUpdateAwaitingACK::ClaimHTLC { htlc_id, .. } => {
1103                                                 if htlc_id_arg == htlc_id {
1104                                                         debug_assert!(false, "Tried to fulfill an HTLC we already had a pending fulfill for");
1105                                                         return Ok((None, None));
1106                                                 }
1107                                         },
1108                                         &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, .. } => {
1109                                                 if htlc_id_arg == htlc_id {
1110                                                         debug_assert!(false, "Tried to fulfill an HTLC we already had a holding-cell failure on");
1111                                                         return Err(HandleError{err: "Unable to find a pending HTLC which matched the given HTLC ID", action: Some(msgs::ErrorAction::IgnoreError)});
1112                                                 }
1113                                         },
1114                                         _ => {}
1115                                 }
1116                         }
1117                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::ClaimHTLC {
1118                                 payment_preimage: payment_preimage_arg, htlc_id: htlc_id_arg,
1119                         });
1120                         return Ok((None, Some(self.channel_monitor.clone())));
1121                 }
1122
1123                 {
1124                         let htlc = &mut self.pending_inbound_htlcs[pending_idx];
1125                         if htlc.state != InboundHTLCState::Committed {
1126                                 debug_assert!(false, "Have an inbound HTLC we tried to claim before it was fully committed to");
1127                                 return Ok((None, Some(self.channel_monitor.clone())));
1128                         }
1129                         htlc.state = InboundHTLCState::LocalRemoved;
1130                         htlc.local_removed_fulfilled = true;
1131                 }
1132
1133                 Ok((Some(msgs::UpdateFulfillHTLC {
1134                         channel_id: self.channel_id(),
1135                         htlc_id: htlc_id_arg,
1136                         payment_preimage: payment_preimage_arg,
1137                 }), Some(self.channel_monitor.clone())))
1138         }
1139
1140         pub fn get_update_fulfill_htlc_and_commit(&mut self, htlc_id: u64, payment_preimage: [u8; 32]) -> Result<(Option<(msgs::UpdateFulfillHTLC, msgs::CommitmentSigned)>, Option<ChannelMonitor>), HandleError> {
1141                 match self.get_update_fulfill_htlc(htlc_id, payment_preimage)? {
1142                         (Some(update_fulfill_htlc), _) => {
1143                                 let (commitment, monitor_update) = self.send_commitment_no_status_check()?;
1144                                 Ok((Some((update_fulfill_htlc, commitment)), Some(monitor_update)))
1145                         },
1146                         (None, Some(channel_monitor)) => Ok((None, Some(channel_monitor))),
1147                         (None, None) => Ok((None, None))
1148                 }
1149         }
1150
1151         /// May return an IgnoreError, but should not, and will always return Ok(_) when
1152         /// debug_assertions are turned on
1153         pub fn get_update_fail_htlc(&mut self, htlc_id_arg: u64, err_packet: msgs::OnionErrorPacket) -> Result<Option<msgs::UpdateFailHTLC>, HandleError> {
1154                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1155                         panic!("Was asked to fail an HTLC when channel was not in an operational state");
1156                 }
1157                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
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                                 if htlc.state != InboundHTLCState::Committed {
1163                                         debug_assert!(false, "Have an inbound HTLC we tried to fail before it was fully committed to");
1164                                         return Err(HandleError{err: "Unable to find a pending HTLC which matched the given HTLC ID", action: Some(msgs::ErrorAction::IgnoreError)});
1165                                 }
1166                                 pending_idx = idx;
1167                         }
1168                 }
1169                 if pending_idx == std::usize::MAX {
1170                         debug_assert!(false, "Unable to find a pending HTLC which matched the given HTLC ID");
1171                         return Err(HandleError{err: "Unable to find a pending HTLC which matched the given HTLC ID", action: Some(msgs::ErrorAction::IgnoreError)});
1172                 }
1173
1174                 // Now update local state:
1175                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32 | ChannelState::PeerDisconnected as u32)) != 0 {
1176                         for pending_update in self.holding_cell_htlc_updates.iter() {
1177                                 match pending_update {
1178                                         &HTLCUpdateAwaitingACK::ClaimHTLC { htlc_id, .. } => {
1179                                                 if htlc_id_arg == htlc_id {
1180                                                         debug_assert!(false, "Unable to find a pending HTLC which matched the given HTLC ID");
1181                                                         return Err(HandleError{err: "Unable to find a pending HTLC which matched the given HTLC ID", action: Some(msgs::ErrorAction::IgnoreError)});
1182                                                 }
1183                                         },
1184                                         &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, .. } => {
1185                                                 if htlc_id_arg == htlc_id {
1186                                                         debug_assert!(false, "Tried to fail an HTLC that we already had a pending failure for");
1187                                                         return Ok(None);
1188                                                 }
1189                                         },
1190                                         _ => {}
1191                                 }
1192                         }
1193                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::FailHTLC {
1194                                 htlc_id: htlc_id_arg,
1195                                 err_packet,
1196                         });
1197                         return Ok(None);
1198                 }
1199
1200                 {
1201                         let htlc = &mut self.pending_inbound_htlcs[pending_idx];
1202                         htlc.state = InboundHTLCState::LocalRemoved;
1203                         htlc.local_removed_fulfilled = false;
1204                 }
1205
1206                 Ok(Some(msgs::UpdateFailHTLC {
1207                         channel_id: self.channel_id(),
1208                         htlc_id: htlc_id_arg,
1209                         reason: err_packet
1210                 }))
1211         }
1212
1213         pub fn get_update_fail_htlc_and_commit(&mut self, htlc_id: u64, err_packet: msgs::OnionErrorPacket) -> Result<Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned, ChannelMonitor)>, HandleError> {
1214                 match self.get_update_fail_htlc(htlc_id, err_packet)? {
1215                         Some(update_fail_htlc) => {
1216                                 let (commitment, monitor_update) = self.send_commitment_no_status_check()?;
1217                                 Ok(Some((update_fail_htlc, commitment, monitor_update)))
1218                         },
1219                         None => Ok(None)
1220                 }
1221         }
1222
1223         // Message handlers:
1224
1225         pub fn accept_channel(&mut self, msg: &msgs::AcceptChannel) -> Result<(), ChannelError> {
1226                 // Check sanity of message fields:
1227                 if !self.channel_outbound {
1228                         return Err(ChannelError::Close("Got an accept_channel message from an inbound peer"));
1229                 }
1230                 if self.channel_state != ChannelState::OurInitSent as u32 {
1231                         return Err(ChannelError::Close("Got an accept_channel message at a strange time"));
1232                 }
1233                 if msg.dust_limit_satoshis > 21000000 * 100000000 {
1234                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
1235                 }
1236                 if msg.channel_reserve_satoshis > self.channel_value_satoshis {
1237                         return Err(ChannelError::Close("Bogus channel_reserve_satoshis"));
1238                 }
1239                 if msg.dust_limit_satoshis > msg.channel_reserve_satoshis {
1240                         return Err(ChannelError::Close("Bogus channel_reserve and dust_limit"));
1241                 }
1242                 if msg.channel_reserve_satoshis < self.our_dust_limit_satoshis {
1243                         return Err(ChannelError::Close("Peer never wants payout outputs?"));
1244                 }
1245                 if msg.dust_limit_satoshis > Channel::get_our_channel_reserve_satoshis(self.channel_value_satoshis) {
1246                         return Err(ChannelError::Close("Dust limit is bigger than our channel reverse"));
1247                 }
1248                 if msg.htlc_minimum_msat >= (self.channel_value_satoshis - msg.channel_reserve_satoshis) * 1000 {
1249                         return Err(ChannelError::Close("Minimum htlc value is full channel value"));
1250                 }
1251                 if msg.minimum_depth > Channel::derive_maximum_minimum_depth(self.channel_value_satoshis*1000,  self.value_to_self_msat) {
1252                         return Err(ChannelError::Close("minimum_depth too large"));
1253                 }
1254                 if msg.to_self_delay > MAX_LOCAL_BREAKDOWN_TIMEOUT {
1255                         return Err(ChannelError::Close("They wanted our payments to be delayed by a needlessly long period"));
1256                 }
1257                 if msg.max_accepted_htlcs < 1 {
1258                         return Err(ChannelError::Close("0 max_accpted_htlcs makes for a useless channel"));
1259                 }
1260                 if msg.max_accepted_htlcs > 483 {
1261                         return Err(ChannelError::Close("max_accpted_htlcs > 483"));
1262                 }
1263
1264                 // TODO: Optional additional constraints mentioned in the spec
1265                 // MAY fail the channel if
1266                 // funding_satoshi is too small
1267                 // htlc_minimum_msat too large
1268                 // max_htlc_value_in_flight_msat too small
1269                 // channel_reserve_satoshis too large
1270                 // max_accepted_htlcs too small
1271                 // dust_limit_satoshis too small
1272
1273                 self.channel_monitor.set_their_base_keys(&msg.htlc_basepoint, &msg.delayed_payment_basepoint);
1274
1275                 self.their_dust_limit_satoshis = msg.dust_limit_satoshis;
1276                 self.their_max_htlc_value_in_flight_msat = cmp::min(msg.max_htlc_value_in_flight_msat, self.channel_value_satoshis * 1000);
1277                 self.their_channel_reserve_satoshis = msg.channel_reserve_satoshis;
1278                 self.their_htlc_minimum_msat = msg.htlc_minimum_msat;
1279                 self.their_to_self_delay = msg.to_self_delay;
1280                 self.their_max_accepted_htlcs = msg.max_accepted_htlcs;
1281                 self.their_funding_pubkey = Some(msg.funding_pubkey);
1282                 self.their_revocation_basepoint = Some(msg.revocation_basepoint);
1283                 self.their_payment_basepoint = Some(msg.payment_basepoint);
1284                 self.their_delayed_payment_basepoint = Some(msg.delayed_payment_basepoint);
1285                 self.their_htlc_basepoint = Some(msg.htlc_basepoint);
1286                 self.their_cur_commitment_point = Some(msg.first_per_commitment_point);
1287
1288                 let obscure_factor = self.get_commitment_transaction_number_obscure_factor();
1289                 self.channel_monitor.set_commitment_obscure_factor(obscure_factor);
1290                 self.channel_monitor.set_their_to_self_delay(msg.to_self_delay);
1291
1292                 self.channel_state = ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32;
1293
1294                 Ok(())
1295         }
1296
1297         fn funding_created_signature(&mut self, sig: &Signature) -> Result<(Transaction, Signature), HandleError> {
1298                 let funding_script = self.get_funding_redeemscript();
1299
1300                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1301                 let local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, self.feerate_per_kw).0;
1302                 let local_sighash = Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
1303
1304                 // They sign the "local" commitment transaction, allowing us to broadcast the tx if we wish.
1305                 secp_call!(self.secp_ctx.verify(&local_sighash, &sig, &self.their_funding_pubkey.unwrap()), "Invalid funding_created signature from peer", self.channel_id());
1306
1307                 let remote_keys = self.build_remote_transaction_keys()?;
1308                 let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw).0;
1309                 let remote_sighash = Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
1310
1311                 // We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish.
1312                 Ok((remote_initial_commitment_tx, self.secp_ctx.sign(&remote_sighash, &self.local_keys.funding_key)))
1313         }
1314
1315         pub fn funding_created(&mut self, msg: &msgs::FundingCreated) -> Result<(msgs::FundingSigned, ChannelMonitor), HandleError> {
1316                 if self.channel_outbound {
1317                         return Err(HandleError{err: "Received funding_created for an outbound channel?", action: Some(msgs::ErrorAction::SendErrorMessage {msg: msgs::ErrorMessage {channel_id: self.channel_id, data: "Received funding_created for an outbound channel?".to_string()}})});
1318                 }
1319                 if self.channel_state != (ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32) {
1320                         // BOLT 2 says that if we disconnect before we send funding_signed we SHOULD NOT
1321                         // remember the channel, so its safe to just send an error_message here and drop the
1322                         // channel.
1323                         return Err(HandleError{err: "Received funding_created after we got the channel!", action: Some(msgs::ErrorAction::SendErrorMessage {msg: msgs::ErrorMessage {channel_id: self.channel_id, data: "Received funding_created after we got the channel!".to_string()}})});
1324                 }
1325                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
1326                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
1327                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
1328                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
1329                 }
1330
1331                 let funding_txo = OutPoint::new(msg.funding_txid, msg.funding_output_index);
1332                 let funding_txo_script = self.get_funding_redeemscript().to_v0_p2wsh();
1333                 self.channel_monitor.set_funding_info((funding_txo, funding_txo_script));
1334
1335                 let (remote_initial_commitment_tx, our_signature) = match self.funding_created_signature(&msg.signature) {
1336                         Ok(res) => res,
1337                         Err(e) => {
1338                                 self.channel_monitor.unset_funding_info();
1339                                 return Err(e);
1340                         }
1341                 };
1342
1343                 // Now that we're past error-generating stuff, update our local state:
1344
1345                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_initial_commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number);
1346                 self.channel_state = ChannelState::FundingSent as u32;
1347                 self.channel_id = funding_txo.to_channel_id();
1348                 self.cur_remote_commitment_transaction_number -= 1;
1349                 self.cur_local_commitment_transaction_number -= 1;
1350
1351                 Ok((msgs::FundingSigned {
1352                         channel_id: self.channel_id,
1353                         signature: our_signature
1354                 }, self.channel_monitor.clone()))
1355         }
1356
1357         /// Handles a funding_signed message from the remote end.
1358         /// If this call is successful, broadcast the funding transaction (and not before!)
1359         pub fn funding_signed(&mut self, msg: &msgs::FundingSigned) -> Result<ChannelMonitor, HandleError> {
1360                 if !self.channel_outbound {
1361                         return Err(HandleError{err: "Received funding_signed for an inbound channel?", action: None});
1362                 }
1363                 if self.channel_state != ChannelState::FundingCreated as u32 {
1364                         return Err(HandleError{err: "Received funding_signed in strange state!", action: None});
1365                 }
1366                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
1367                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER - 1 ||
1368                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
1369                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
1370                 }
1371
1372                 let funding_script = self.get_funding_redeemscript();
1373
1374                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1375                 let mut local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, self.feerate_per_kw).0;
1376                 let local_sighash = Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
1377
1378                 // They sign the "local" commitment transaction, allowing us to broadcast the tx if we wish.
1379                 secp_call!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid funding_signed signature from peer", self.channel_id());
1380
1381                 self.sign_commitment_transaction(&mut local_initial_commitment_tx, &msg.signature);
1382                 self.channel_monitor.provide_latest_local_commitment_tx_info(local_initial_commitment_tx.clone(), local_keys, self.feerate_per_kw, Vec::new());
1383                 self.last_local_commitment_txn = vec![local_initial_commitment_tx];
1384                 self.channel_state = ChannelState::FundingSent as u32;
1385                 self.cur_local_commitment_transaction_number -= 1;
1386
1387                 Ok(self.channel_monitor.clone())
1388         }
1389
1390         pub fn funding_locked(&mut self, msg: &msgs::FundingLocked) -> Result<(), ChannelError> {
1391                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1392                         return Err(ChannelError::Close("Peer sent funding_locked when we needed a channel_reestablish"));
1393                 }
1394                 let non_shutdown_state = self.channel_state & (!BOTH_SIDES_SHUTDOWN_MASK);
1395                 if non_shutdown_state == ChannelState::FundingSent as u32 {
1396                         self.channel_state |= ChannelState::TheirFundingLocked as u32;
1397                 } else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
1398                         self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & BOTH_SIDES_SHUTDOWN_MASK);
1399                         self.channel_update_count += 1;
1400                 } else if self.channel_state & (ChannelState::ChannelFunded as u32) != 0 &&
1401                                 // Note that funding_signed/funding_created will have decremented both by 1!
1402                                 self.cur_local_commitment_transaction_number == INITIAL_COMMITMENT_NUMBER - 1 &&
1403                                 self.cur_remote_commitment_transaction_number == INITIAL_COMMITMENT_NUMBER - 1 {
1404                         if self.their_cur_commitment_point != Some(msg.next_per_commitment_point) {
1405                                 return Err(ChannelError::Close("Peer sent a reconnect funding_locked with a different point"));
1406                         }
1407                         // They probably disconnected/reconnected and re-sent the funding_locked, which is required
1408                         return Ok(());
1409                 } else {
1410                         return Err(ChannelError::Close("Peer sent a funding_locked at a strange time"));
1411                 }
1412
1413                 self.their_prev_commitment_point = self.their_cur_commitment_point;
1414                 self.their_cur_commitment_point = Some(msg.next_per_commitment_point);
1415                 Ok(())
1416         }
1417
1418         /// Returns (inbound_htlc_count, outbound_htlc_count, htlc_outbound_value_msat, htlc_inbound_value_msat)
1419         /// If its for a remote update check, we need to be more lax about checking against messages we
1420         /// sent but they may not have received/processed before they sent this message. Further, for
1421         /// our own sends, we're more conservative and even consider things they've removed against
1422         /// totals, though there is little reason to outside of further avoiding any race condition
1423         /// issues.
1424         fn get_pending_htlc_stats(&self, for_remote_update_check: bool) -> (u32, u32, u64, u64) {
1425                 //TODO: Can probably split this into inbound/outbound
1426                 let mut inbound_htlc_count: u32 = 0;
1427                 let mut outbound_htlc_count: u32 = 0;
1428                 let mut htlc_outbound_value_msat = 0;
1429                 let mut htlc_inbound_value_msat = 0;
1430                 for ref htlc in self.pending_inbound_htlcs.iter() {
1431                         match htlc.state {
1432                                 InboundHTLCState::RemoteAnnounced => {},
1433                                 InboundHTLCState::AwaitingRemoteRevokeToAnnounce => {},
1434                                 InboundHTLCState::AwaitingAnnouncedRemoteRevoke => {},
1435                                 InboundHTLCState::Committed => {},
1436                                 InboundHTLCState::LocalRemoved => {},
1437                         }
1438                         inbound_htlc_count += 1;
1439                         htlc_inbound_value_msat += htlc.amount_msat;
1440                 }
1441                 for ref htlc in self.pending_outbound_htlcs.iter() {
1442                         match htlc.state {
1443                                 OutboundHTLCState::LocalAnnounced => { if for_remote_update_check { continue; } },
1444                                 OutboundHTLCState::Committed => {},
1445                                 OutboundHTLCState::RemoteRemoved => { if for_remote_update_check { continue; } },
1446                                 OutboundHTLCState::AwaitingRemoteRevokeToRemove => { if for_remote_update_check { continue; } },
1447                                 OutboundHTLCState::AwaitingRemovedRemoteRevoke => { if for_remote_update_check { continue; } },
1448                         }
1449                         outbound_htlc_count += 1;
1450                         htlc_outbound_value_msat += htlc.amount_msat;
1451                 }
1452
1453                 (inbound_htlc_count, outbound_htlc_count, htlc_outbound_value_msat, htlc_inbound_value_msat)
1454         }
1455
1456         pub fn update_add_htlc(&mut self, msg: &msgs::UpdateAddHTLC, pending_forward_state: PendingHTLCStatus) -> Result<(), HandleError> {
1457                 if (self.channel_state & (ChannelState::ChannelFunded as u32 | ChannelState::RemoteShutdownSent as u32)) != (ChannelState::ChannelFunded as u32) {
1458                         return Err(HandleError{err: "Got add HTLC message when channel was not in an operational state", action: None});
1459                 }
1460                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1461                         return Err(HandleError{err: "Peer sent update_add_htlc when we needed a channel_reestablish", action: Some(msgs::ErrorAction::SendErrorMessage{msg: msgs::ErrorMessage{data: "Peer sent update_add_htlc when we needed a channel_reestablish".to_string(), channel_id: msg.channel_id}})});
1462                 }
1463                 if msg.amount_msat > self.channel_value_satoshis * 1000 {
1464                         return Err(HandleError{err: "Remote side tried to send more than the total value of the channel", action: None});
1465                 }
1466                 if msg.amount_msat < self.our_htlc_minimum_msat {
1467                         return Err(HandleError{err: "Remote side tried to send less than our minimum HTLC value", action: None});
1468                 }
1469
1470                 let (inbound_htlc_count, _, htlc_outbound_value_msat, htlc_inbound_value_msat) = self.get_pending_htlc_stats(true);
1471                 if inbound_htlc_count + 1 > OUR_MAX_HTLCS as u32 {
1472                         return Err(HandleError{err: "Remote tried to push more than our max accepted HTLCs", action: None});
1473                 }
1474                 //TODO: Spec is unclear if this is per-direction or in total (I assume per direction):
1475                 // Check our_max_htlc_value_in_flight_msat
1476                 if htlc_inbound_value_msat + msg.amount_msat > Channel::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis) {
1477                         return Err(HandleError{err: "Remote HTLC add would put them over their max HTLC value in flight", action: None});
1478                 }
1479                 // Check our_channel_reserve_satoshis (we're getting paid, so they have to at least meet
1480                 // the reserve_satoshis we told them to always have as direct payment so that they lose
1481                 // something if we punish them for broadcasting an old state).
1482                 if htlc_inbound_value_msat + htlc_outbound_value_msat + msg.amount_msat + self.value_to_self_msat > (self.channel_value_satoshis - Channel::get_our_channel_reserve_satoshis(self.channel_value_satoshis)) * 1000 {
1483                         return Err(HandleError{err: "Remote HTLC add would put them over their reserve value", action: None});
1484                 }
1485                 if self.next_remote_htlc_id != msg.htlc_id {
1486                         return Err(HandleError{err: "Remote skipped HTLC ID", action: None});
1487                 }
1488                 if msg.cltv_expiry >= 500000000 {
1489                         return Err(HandleError{err: "Remote provided CLTV expiry in seconds instead of block height", action: None});
1490                 }
1491
1492                 //TODO: Check msg.cltv_expiry further? Do this in channel manager?
1493
1494                 // Now update local state:
1495                 self.next_remote_htlc_id += 1;
1496                 self.pending_inbound_htlcs.push(InboundHTLCOutput {
1497                         htlc_id: msg.htlc_id,
1498                         amount_msat: msg.amount_msat,
1499                         payment_hash: msg.payment_hash,
1500                         cltv_expiry: msg.cltv_expiry,
1501                         state: InboundHTLCState::RemoteAnnounced,
1502                         local_removed_fulfilled: false,
1503                         pending_forward_state: Some(pending_forward_state),
1504                 });
1505
1506                 Ok(())
1507         }
1508
1509         /// Removes an outbound HTLC which has been commitment_signed by the remote end
1510         #[inline]
1511         fn mark_outbound_htlc_removed(&mut self, htlc_id: u64, check_preimage: Option<[u8; 32]>, fail_reason: Option<HTLCFailReason>) -> Result<&HTLCSource, ChannelError> {
1512                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1513                         if htlc.htlc_id == htlc_id {
1514                                 match check_preimage {
1515                                         None => {},
1516                                         Some(payment_hash) =>
1517                                                 if payment_hash != htlc.payment_hash {
1518                                                         return Err(ChannelError::Close("Remote tried to fulfill HTLC with an incorrect preimage"));
1519                                                 }
1520                                 };
1521                                 match htlc.state {
1522                                         OutboundHTLCState::LocalAnnounced =>
1523                                                 return Err(ChannelError::Close("Remote tried to fulfill HTLC before it had been committed")),
1524                                         OutboundHTLCState::Committed => {
1525                                                 htlc.state = OutboundHTLCState::RemoteRemoved;
1526                                                 htlc.fail_reason = fail_reason;
1527                                         },
1528                                         OutboundHTLCState::AwaitingRemoteRevokeToRemove | OutboundHTLCState::AwaitingRemovedRemoteRevoke | OutboundHTLCState::RemoteRemoved =>
1529                                                 return Err(ChannelError::Close("Remote tried to fulfill HTLC that they'd already fulfilled")),
1530                                 }
1531                                 return Ok(&htlc.source);
1532                         }
1533                 }
1534                 Err(ChannelError::Close("Remote tried to fulfill/fail an HTLC we couldn't find"))
1535         }
1536
1537         pub fn update_fulfill_htlc(&mut self, msg: &msgs::UpdateFulfillHTLC) -> Result<&HTLCSource, ChannelError> {
1538                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1539                         return Err(ChannelError::Close("Got fulfill HTLC message when channel was not in an operational state"));
1540                 }
1541                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1542                         return Err(ChannelError::Close("Peer sent update_fulfill_htlc when we needed a channel_reestablish"));
1543                 }
1544
1545                 let mut sha = Sha256::new();
1546                 sha.input(&msg.payment_preimage);
1547                 let mut payment_hash = [0; 32];
1548                 sha.result(&mut payment_hash);
1549
1550                 self.mark_outbound_htlc_removed(msg.htlc_id, Some(payment_hash), None)
1551         }
1552
1553         pub fn update_fail_htlc(&mut self, msg: &msgs::UpdateFailHTLC, fail_reason: HTLCFailReason) -> Result<&HTLCSource, ChannelError> {
1554                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1555                         return Err(ChannelError::Close("Got fail HTLC message when channel was not in an operational state"));
1556                 }
1557                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1558                         return Err(ChannelError::Close("Peer sent update_fail_htlc when we needed a channel_reestablish"));
1559                 }
1560
1561                 self.mark_outbound_htlc_removed(msg.htlc_id, None, Some(fail_reason))
1562         }
1563
1564         pub fn update_fail_malformed_htlc<'a>(&mut self, msg: &msgs::UpdateFailMalformedHTLC, fail_reason: HTLCFailReason) -> Result<&HTLCSource, ChannelError> {
1565                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1566                         return Err(ChannelError::Close("Got fail malformed HTLC message when channel was not in an operational state"));
1567                 }
1568                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1569                         return Err(ChannelError::Close("Peer sent update_fail_malformed_htlc when we needed a channel_reestablish"));
1570                 }
1571
1572                 self.mark_outbound_htlc_removed(msg.htlc_id, None, Some(fail_reason))
1573         }
1574
1575         pub fn commitment_signed(&mut self, msg: &msgs::CommitmentSigned) -> Result<(msgs::RevokeAndACK, Option<msgs::CommitmentSigned>, ChannelMonitor), HandleError> {
1576                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1577                         return Err(HandleError{err: "Got commitment signed message when channel was not in an operational state", action: None});
1578                 }
1579                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1580                         return Err(HandleError{err: "Peer sent commitment_signed when we needed a channel_reestablish", action: Some(msgs::ErrorAction::SendErrorMessage{msg: msgs::ErrorMessage{data: "Peer sent commitment_signed when we needed a channel_reestablish".to_string(), channel_id: msg.channel_id}})});
1581                 }
1582
1583                 let funding_script = self.get_funding_redeemscript();
1584
1585                 let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
1586
1587                 let feerate_per_kw = if !self.channel_outbound && self.pending_update_fee.is_some() {
1588                         self.pending_update_fee.unwrap()
1589                 } else {
1590                         self.feerate_per_kw
1591                 };
1592
1593                 let mut local_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false, feerate_per_kw);
1594                 let local_commitment_txid = local_commitment_tx.0.txid();
1595                 let local_sighash = Message::from_slice(&bip143::SighashComponents::new(&local_commitment_tx.0).sighash_all(&local_commitment_tx.0.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
1596                 secp_call!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid commitment tx signature from peer", self.channel_id());
1597
1598                 if msg.htlc_signatures.len() != local_commitment_tx.1.len() {
1599                         return Err(HandleError{err: "Got wrong number of HTLC signatures from remote", action: None});
1600                 }
1601
1602                 let mut new_local_commitment_txn = Vec::with_capacity(local_commitment_tx.1.len() + 1);
1603                 self.sign_commitment_transaction(&mut local_commitment_tx.0, &msg.signature);
1604                 new_local_commitment_txn.push(local_commitment_tx.0.clone());
1605
1606                 let mut htlcs_and_sigs = Vec::with_capacity(local_commitment_tx.1.len());
1607                 for (idx, ref htlc) in local_commitment_tx.1.iter().enumerate() {
1608                         let mut htlc_tx = self.build_htlc_transaction(&local_commitment_txid, htlc, true, &local_keys, feerate_per_kw);
1609                         let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &local_keys);
1610                         let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
1611                         secp_call!(self.secp_ctx.verify(&htlc_sighash, &msg.htlc_signatures[idx], &local_keys.b_htlc_key), "Invalid HTLC tx siganture from peer", self.channel_id());
1612                         let htlc_sig = if htlc.offered {
1613                                 let htlc_sig = self.sign_htlc_transaction(&mut htlc_tx, &msg.htlc_signatures[idx], &None, htlc, &local_keys)?;
1614                                 new_local_commitment_txn.push(htlc_tx);
1615                                 htlc_sig
1616                         } else {
1617                                 self.create_htlc_tx_signature(&htlc_tx, htlc, &local_keys)?.1
1618                         };
1619                         htlcs_and_sigs.push(((*htlc).clone(), msg.htlc_signatures[idx], htlc_sig));
1620                 }
1621
1622                 let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number - 1));
1623                 let per_commitment_secret = chan_utils::build_commitment_secret(self.local_keys.commitment_seed, self.cur_local_commitment_transaction_number + 1);
1624
1625                 // Update state now that we've passed all the can-fail calls...
1626                 let mut need_our_commitment = false;
1627                 if !self.channel_outbound {
1628                         if let Some(fee_update) = self.pending_update_fee {
1629                                 self.feerate_per_kw = fee_update;
1630                                 // We later use the presence of pending_update_fee to indicate we should generate a
1631                                 // commitment_signed upon receipt of revoke_and_ack, so we can only set it to None
1632                                 // if we're not awaiting a revoke (ie will send a commitment_signed now).
1633                                 if (self.channel_state & ChannelState::AwaitingRemoteRevoke as u32) == 0 {
1634                                         need_our_commitment = true;
1635                                         self.pending_update_fee = None;
1636                                 }
1637                         }
1638                 }
1639
1640                 self.channel_monitor.provide_latest_local_commitment_tx_info(local_commitment_tx.0, local_keys, self.feerate_per_kw, htlcs_and_sigs);
1641
1642                 for htlc in self.pending_inbound_htlcs.iter_mut() {
1643                         if htlc.state == InboundHTLCState::RemoteAnnounced {
1644                                 htlc.state = InboundHTLCState::AwaitingRemoteRevokeToAnnounce;
1645                                 need_our_commitment = true;
1646                         }
1647                 }
1648                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1649                         if htlc.state == OutboundHTLCState::RemoteRemoved {
1650                                 htlc.state = OutboundHTLCState::AwaitingRemoteRevokeToRemove;
1651                                 need_our_commitment = true;
1652                         }
1653                 }
1654
1655                 self.cur_local_commitment_transaction_number -= 1;
1656                 self.last_local_commitment_txn = new_local_commitment_txn;
1657
1658                 let (our_commitment_signed, monitor_update) = if need_our_commitment && (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == 0 {
1659                         // If we're AwaitingRemoteRevoke we can't send a new commitment here, but that's ok -
1660                         // we'll send one right away when we get the revoke_and_ack when we
1661                         // free_holding_cell_htlcs().
1662                         let (msg, monitor) = self.send_commitment_no_status_check()?;
1663                         (Some(msg), monitor)
1664                 } else { (None, self.channel_monitor.clone()) };
1665
1666                 Ok((msgs::RevokeAndACK {
1667                         channel_id: self.channel_id,
1668                         per_commitment_secret: per_commitment_secret,
1669                         next_per_commitment_point: next_per_commitment_point,
1670                 }, our_commitment_signed, monitor_update))
1671         }
1672
1673         /// Used to fulfill holding_cell_htlcs when we get a remote ack (or implicitly get it by them
1674         /// fulfilling or failing the last pending HTLC)
1675         fn free_holding_cell_htlcs(&mut self) -> Result<Option<(msgs::CommitmentUpdate, ChannelMonitor)>, HandleError> {
1676                 if self.holding_cell_htlc_updates.len() != 0 || self.holding_cell_update_fee.is_some() {
1677                         let mut htlc_updates = Vec::new();
1678                         mem::swap(&mut htlc_updates, &mut self.holding_cell_htlc_updates);
1679                         let mut update_add_htlcs = Vec::with_capacity(htlc_updates.len());
1680                         let mut update_fulfill_htlcs = Vec::with_capacity(htlc_updates.len());
1681                         let mut update_fail_htlcs = Vec::with_capacity(htlc_updates.len());
1682                         let mut err = None;
1683                         for htlc_update in htlc_updates.drain(..) {
1684                                 // Note that this *can* fail, though it should be due to rather-rare conditions on
1685                                 // fee races with adding too many outputs which push our total payments just over
1686                                 // the limit. In case its less rare than I anticipate, we may want to revisit
1687                                 // handling this case better and maybe fufilling some of the HTLCs while attempting
1688                                 // to rebalance channels.
1689                                 if err.is_some() { // We're back to AwaitingRemoteRevoke (or are about to fail the channel)
1690                                         self.holding_cell_htlc_updates.push(htlc_update);
1691                                 } else {
1692                                         match &htlc_update {
1693                                                 &HTLCUpdateAwaitingACK::AddHTLC {amount_msat, cltv_expiry, payment_hash, ref source, ref onion_routing_packet, ..} => {
1694                                                         match self.send_htlc(amount_msat, payment_hash, cltv_expiry, source.clone(), onion_routing_packet.clone()) {
1695                                                                 Ok(update_add_msg_option) => update_add_htlcs.push(update_add_msg_option.unwrap()),
1696                                                                 Err(e) => {
1697                                                                         err = Some(e);
1698                                                                 }
1699                                                         }
1700                                                 },
1701                                                 &HTLCUpdateAwaitingACK::ClaimHTLC { payment_preimage, htlc_id, .. } => {
1702                                                         match self.get_update_fulfill_htlc(htlc_id, payment_preimage) {
1703                                                                 Ok(update_fulfill_msg_option) => update_fulfill_htlcs.push(update_fulfill_msg_option.0.unwrap()),
1704                                                                 Err(e) => {
1705                                                                         if let Some(msgs::ErrorAction::IgnoreError) = e.action {}
1706                                                                         else {
1707                                                                                 panic!("Got a non-IgnoreError action trying to fulfill holding cell HTLC");
1708                                                                         }
1709                                                                 }
1710                                                         }
1711                                                 },
1712                                                 &HTLCUpdateAwaitingACK::FailHTLC { htlc_id, ref err_packet } => {
1713                                                         match self.get_update_fail_htlc(htlc_id, err_packet.clone()) {
1714                                                                 Ok(update_fail_msg_option) => update_fail_htlcs.push(update_fail_msg_option.unwrap()),
1715                                                                 Err(e) => {
1716                                                                         if let Some(msgs::ErrorAction::IgnoreError) = e.action {}
1717                                                                         else {
1718                                                                                 panic!("Got a non-IgnoreError action trying to fail holding cell HTLC");
1719                                                                         }
1720                                                                 }
1721                                                         }
1722                                                 },
1723                                         }
1724                                         if err.is_some() {
1725                                                 self.holding_cell_htlc_updates.push(htlc_update);
1726                                         }
1727                                 }
1728                         }
1729                         //TODO: Need to examine the type of err - if its a fee issue or similar we may want to
1730                         //fail it back the route, if its a temporary issue we can ignore it...
1731                         match err {
1732                                 None => {
1733                                         if update_add_htlcs.is_empty() && update_fulfill_htlcs.is_empty() && update_fail_htlcs.is_empty() && self.holding_cell_update_fee.is_none() {
1734                                                 // This should never actually happen and indicates we got some Errs back
1735                                                 // from update_fulfill_htlc/update_fail_htlc, but we handle it anyway in
1736                                                 // case there is some strange way to hit duplicate HTLC removes.
1737                                                 return Ok(None);
1738                                         }
1739                                         let update_fee = if let Some(feerate) = self.holding_cell_update_fee {
1740                                                         self.pending_update_fee = self.holding_cell_update_fee.take();
1741                                                         Some(msgs::UpdateFee {
1742                                                                 channel_id: self.channel_id,
1743                                                                 feerate_per_kw: feerate as u32,
1744                                                         })
1745                                                 } else {
1746                                                         None
1747                                                 };
1748                                         let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
1749                                         Ok(Some((msgs::CommitmentUpdate {
1750                                                 update_add_htlcs,
1751                                                 update_fulfill_htlcs,
1752                                                 update_fail_htlcs,
1753                                                 update_fail_malformed_htlcs: Vec::new(),
1754                                                 update_fee: update_fee,
1755                                                 commitment_signed,
1756                                         }, monitor_update)))
1757                                 },
1758                                 Some(e) => Err(e)
1759                         }
1760                 } else {
1761                         Ok(None)
1762                 }
1763         }
1764
1765         /// Handles receiving a remote's revoke_and_ack. Note that we may return a new
1766         /// commitment_signed message here in case we had pending outbound HTLCs to add which were
1767         /// waiting on this revoke_and_ack. The generation of this new commitment_signed may also fail,
1768         /// generating an appropriate error *after* the channel state has been updated based on the
1769         /// revoke_and_ack message.
1770         pub fn revoke_and_ack(&mut self, msg: &msgs::RevokeAndACK) -> Result<(Option<msgs::CommitmentUpdate>, Vec<(PendingForwardHTLCInfo, u64)>, Vec<(HTLCSource, [u8; 32], HTLCFailReason)>, ChannelMonitor), HandleError> {
1771                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
1772                         return Err(HandleError{err: "Got revoke/ACK message when channel was not in an operational state", action: None});
1773                 }
1774                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
1775                         return Err(HandleError{err: "Peer sent revoke_and_ack when we needed a channel_reestablish", action: Some(msgs::ErrorAction::SendErrorMessage{msg: msgs::ErrorMessage{data: "Peer sent revoke_and_ack when we needed a channel_reestablish".to_string(), channel_id: msg.channel_id}})});
1776                 }
1777                 if let Some(their_prev_commitment_point) = self.their_prev_commitment_point {
1778                         if PublicKey::from_secret_key(&self.secp_ctx, &secp_call!(SecretKey::from_slice(&self.secp_ctx, &msg.per_commitment_secret), "Peer provided an invalid per_commitment_secret", self.channel_id())) != their_prev_commitment_point {
1779                                 return Err(HandleError{err: "Got a revoke commitment secret which didn't correspond to their current pubkey", action: None});
1780                         }
1781                 }
1782                 self.channel_monitor.provide_secret(self.cur_remote_commitment_transaction_number + 1, msg.per_commitment_secret, Some((self.cur_remote_commitment_transaction_number - 1, msg.next_per_commitment_point)))?;
1783
1784                 // Update state now that we've passed all the can-fail calls...
1785                 // (note that we may still fail to generate the new commitment_signed message, but that's
1786                 // OK, we step the channel here and *then* if the new generation fails we can fail the
1787                 // channel based on that, but stepping stuff here should be safe either way.
1788                 self.channel_state &= !(ChannelState::AwaitingRemoteRevoke as u32);
1789                 self.their_prev_commitment_point = self.their_cur_commitment_point;
1790                 self.their_cur_commitment_point = Some(msg.next_per_commitment_point);
1791                 self.cur_remote_commitment_transaction_number -= 1;
1792
1793                 let mut to_forward_infos = Vec::new();
1794                 let mut revoked_htlcs = Vec::new();
1795                 let mut update_fail_htlcs = Vec::new();
1796                 let mut update_fail_malformed_htlcs = Vec::new();
1797                 let mut require_commitment = false;
1798                 let mut value_to_self_msat_diff: i64 = 0;
1799                 // We really shouldnt have two passes here, but retain gives a non-mutable ref (Rust bug)
1800                 self.pending_inbound_htlcs.retain(|htlc| {
1801                         if htlc.state == InboundHTLCState::LocalRemoved {
1802                                 if htlc.local_removed_fulfilled {
1803                                         value_to_self_msat_diff += htlc.amount_msat as i64;
1804                                 }
1805                                 false
1806                         } else { true }
1807                 });
1808                 self.pending_outbound_htlcs.retain(|htlc| {
1809                         if htlc.state == OutboundHTLCState::AwaitingRemovedRemoteRevoke {
1810                                 if let Some(reason) = htlc.fail_reason.clone() { // We really want take() here, but, again, non-mut ref :(
1811                                         revoked_htlcs.push((htlc.source.clone(), htlc.payment_hash, reason));
1812                                 } else {
1813                                         // They fulfilled, so we sent them money
1814                                         value_to_self_msat_diff -= htlc.amount_msat as i64;
1815                                 }
1816                                 false
1817                         } else { true }
1818                 });
1819                 for htlc in self.pending_inbound_htlcs.iter_mut() {
1820                         if htlc.state == InboundHTLCState::AwaitingRemoteRevokeToAnnounce {
1821                                 htlc.state = InboundHTLCState::AwaitingAnnouncedRemoteRevoke;
1822                                 require_commitment = true;
1823                         } else if htlc.state == InboundHTLCState::AwaitingAnnouncedRemoteRevoke {
1824                                 match htlc.pending_forward_state.take().unwrap() {
1825                                         PendingHTLCStatus::Fail(fail_msg) => {
1826                                                 htlc.state = InboundHTLCState::LocalRemoved;
1827                                                 require_commitment = true;
1828                                                 match fail_msg {
1829                                                         HTLCFailureMsg::Relay(msg) => update_fail_htlcs.push(msg),
1830                                                         HTLCFailureMsg::Malformed(msg) => update_fail_malformed_htlcs.push(msg),
1831                                                 }
1832                                         },
1833                                         PendingHTLCStatus::Forward(forward_info) => {
1834                                                 to_forward_infos.push((forward_info, htlc.htlc_id));
1835                                                 htlc.state = InboundHTLCState::Committed;
1836                                         }
1837                                 }
1838                         }
1839                 }
1840                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1841                         if htlc.state == OutboundHTLCState::LocalAnnounced {
1842                                 htlc.state = OutboundHTLCState::Committed;
1843                         } else if htlc.state == OutboundHTLCState::AwaitingRemoteRevokeToRemove {
1844                                 htlc.state = OutboundHTLCState::AwaitingRemovedRemoteRevoke;
1845                                 require_commitment = true;
1846                         }
1847                 }
1848                 self.value_to_self_msat = (self.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
1849
1850                 if self.channel_outbound {
1851                         if let Some(feerate) = self.pending_update_fee.take() {
1852                                 self.feerate_per_kw = feerate;
1853                         }
1854                 } else {
1855                         if let Some(feerate) = self.pending_update_fee {
1856                                 // Because a node cannot send two commitment_signed's in a row without getting a
1857                                 // revoke_and_ack from us (as it would otherwise not know the per_commitment_point
1858                                 // it should use to create keys with) and because a node can't send a
1859                                 // commitment_signed without changes, checking if the feerate is equal to the
1860                                 // pending feerate update is sufficient to detect require_commitment.
1861                                 if feerate == self.feerate_per_kw {
1862                                         require_commitment = true;
1863                                         self.pending_update_fee = None;
1864                                 }
1865                         }
1866                 }
1867
1868                 match self.free_holding_cell_htlcs()? {
1869                         Some(mut commitment_update) => {
1870                                 commitment_update.0.update_fail_htlcs.reserve(update_fail_htlcs.len());
1871                                 for fail_msg in update_fail_htlcs.drain(..) {
1872                                         commitment_update.0.update_fail_htlcs.push(fail_msg);
1873                                 }
1874                                 commitment_update.0.update_fail_malformed_htlcs.reserve(update_fail_malformed_htlcs.len());
1875                                 for fail_msg in update_fail_malformed_htlcs.drain(..) {
1876                                         commitment_update.0.update_fail_malformed_htlcs.push(fail_msg);
1877                                 }
1878                                 Ok((Some(commitment_update.0), to_forward_infos, revoked_htlcs, commitment_update.1))
1879                         },
1880                         None => {
1881                                 if require_commitment {
1882                                         let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
1883                                         Ok((Some(msgs::CommitmentUpdate {
1884                                                 update_add_htlcs: Vec::new(),
1885                                                 update_fulfill_htlcs: Vec::new(),
1886                                                 update_fail_htlcs,
1887                                                 update_fail_malformed_htlcs,
1888                                                 update_fee: None,
1889                                                 commitment_signed
1890                                         }), to_forward_infos, revoked_htlcs, monitor_update))
1891                                 } else {
1892                                         Ok((None, to_forward_infos, revoked_htlcs, self.channel_monitor.clone()))
1893                                 }
1894                         }
1895                 }
1896
1897         }
1898
1899         /// Adds a pending update to this channel. See the doc for send_htlc for
1900         /// further details on the optionness of the return value.
1901         /// You MUST call send_commitment prior to any other calls on this Channel
1902         fn send_update_fee(&mut self, feerate_per_kw: u64) -> Option<msgs::UpdateFee> {
1903                 if !self.channel_outbound {
1904                         panic!("Cannot send fee from inbound channel");
1905                 }
1906
1907                 if !self.is_usable() {
1908                         panic!("Cannot update fee until channel is fully established and we haven't started shutting down");
1909                 }
1910
1911                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
1912                         self.holding_cell_update_fee = Some(feerate_per_kw);
1913                         return None;
1914                 }
1915
1916                 debug_assert!(self.pending_update_fee.is_none());
1917                 self.pending_update_fee = Some(feerate_per_kw);
1918
1919                 Some(msgs::UpdateFee {
1920                         channel_id: self.channel_id,
1921                         feerate_per_kw: feerate_per_kw as u32,
1922                 })
1923         }
1924
1925         pub fn send_update_fee_and_commit(&mut self, feerate_per_kw: u64) -> Result<Option<(msgs::UpdateFee, msgs::CommitmentSigned, ChannelMonitor)>, HandleError> {
1926                 match self.send_update_fee(feerate_per_kw) {
1927                         Some(update_fee) => {
1928                                 let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
1929                                 Ok(Some((update_fee, commitment_signed, monitor_update)))
1930                         },
1931                         None => Ok(None)
1932                 }
1933         }
1934
1935         /// Removes any uncommitted HTLCs, to be used on peer disconnection, including any pending
1936         /// HTLCs that we intended to add but haven't as we were waiting on a remote revoke.
1937         /// Returns the set of PendingHTLCStatuses from remote uncommitted HTLCs (which we're
1938         /// implicitly dropping) and the payment_hashes of HTLCs we tried to add but are dropping.
1939         /// No further message handling calls may be made until a channel_reestablish dance has
1940         /// completed.
1941         pub fn remove_uncommitted_htlcs_and_mark_paused(&mut self) -> Vec<(HTLCSource, [u8; 32])> {
1942                 let mut outbound_drops = Vec::new();
1943
1944                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
1945                 if self.channel_state < ChannelState::FundingSent as u32 {
1946                         self.channel_state = ChannelState::ShutdownComplete as u32;
1947                         return outbound_drops;
1948                 }
1949
1950                 let mut inbound_drop_count = 0;
1951                 self.pending_inbound_htlcs.retain(|htlc| {
1952                         match htlc.state {
1953                                 InboundHTLCState::RemoteAnnounced => {
1954                                         // They sent us an update_add_htlc but we never got the commitment_signed.
1955                                         // We'll tell them what commitment_signed we're expecting next and they'll drop
1956                                         // this HTLC accordingly
1957                                         inbound_drop_count += 1;
1958                                         false
1959                                 },
1960                                 InboundHTLCState::AwaitingRemoteRevokeToAnnounce|InboundHTLCState::AwaitingAnnouncedRemoteRevoke => {
1961                                         // Same goes for AwaitingRemoteRevokeToRemove and AwaitingRemovedRemoteRevoke
1962                                         // We received a commitment_signed updating this HTLC and (at least hopefully)
1963                                         // sent a revoke_and_ack (which we can re-transmit) and have heard nothing
1964                                         // in response to it yet, so don't touch it.
1965                                         true
1966                                 },
1967                                 InboundHTLCState::Committed => true,
1968                                 InboundHTLCState::LocalRemoved => { // Same goes for LocalAnnounced
1969                                         // We (hopefully) sent a commitment_signed updating this HTLC (which we can
1970                                         // re-transmit if needed) and they may have even sent a revoke_and_ack back
1971                                         // (that we missed). Keep this around for now and if they tell us they missed
1972                                         // the commitment_signed we can re-transmit the update then.
1973                                         true
1974                                 },
1975                         }
1976                 });
1977
1978                 for htlc in self.pending_outbound_htlcs.iter_mut() {
1979                         if htlc.state == OutboundHTLCState::RemoteRemoved {
1980                                 // They sent us an update to remove this but haven't yet sent the corresponding
1981                                 // commitment_signed, we need to move it back to Committed and they can re-send
1982                                 // the update upon reconnection.
1983                                 htlc.state = OutboundHTLCState::Committed;
1984                         }
1985                 }
1986
1987                 self.holding_cell_htlc_updates.retain(|htlc_update| {
1988                         match htlc_update {
1989                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
1990                                         outbound_drops.push((source.clone(), payment_hash.clone()));
1991                                         false
1992                                 },
1993                                 &HTLCUpdateAwaitingACK::ClaimHTLC {..} | &HTLCUpdateAwaitingACK::FailHTLC {..} => true,
1994                         }
1995                 });
1996                 self.channel_state |= ChannelState::PeerDisconnected as u32;
1997                 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()));
1998                 outbound_drops
1999         }
2000
2001         pub fn update_fee(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::UpdateFee) -> Result<(), ChannelError> {
2002                 if self.channel_outbound {
2003                         return Err(ChannelError::Close("Non-funding remote tried to update channel fee"));
2004                 }
2005                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2006                         return Err(ChannelError::Close("Peer sent update_fee when we needed a channel_reestablish"));
2007                 }
2008                 Channel::check_remote_fee(fee_estimator, msg.feerate_per_kw)?;
2009
2010                 self.pending_update_fee = Some(msg.feerate_per_kw as u64);
2011                 self.channel_update_count += 1;
2012                 Ok(())
2013         }
2014
2015         /// May panic if some calls other than message-handling calls (which will all Err immediately)
2016         /// have been called between remove_uncommitted_htlcs_and_mark_paused and this call.
2017         pub fn channel_reestablish(&mut self, msg: &msgs::ChannelReestablish) -> Result<(Option<msgs::FundingLocked>, Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, Option<ChannelMonitor>), ChannelError> {
2018                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == 0 {
2019                         // While BOLT 2 doesn't indicate explicitly we should error this channel here, it
2020                         // almost certainly indicates we are going to end up out-of-sync in some way, so we
2021                         // just close here instead of trying to recover.
2022                         return Err(ChannelError::Close("Peer sent a loose channel_reestablish not after reconnect"));
2023                 }
2024
2025                 if msg.next_local_commitment_number == 0 || msg.next_local_commitment_number >= INITIAL_COMMITMENT_NUMBER ||
2026                                 msg.next_remote_commitment_number == 0 || msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER {
2027                         return Err(ChannelError::Close("Peer send garbage channel_reestablish"));
2028                 }
2029
2030                 // Go ahead and unmark PeerDisconnected as various calls we may make check for it (and all
2031                 // remaining cases either succeed or ErrorMessage-fail).
2032                 self.channel_state &= !(ChannelState::PeerDisconnected as u32);
2033
2034                 let mut required_revoke = None;
2035                 if msg.next_remote_commitment_number == INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number {
2036                         // Remote isn't waiting on any RevokeAndACK from us!
2037                         // Note that if we need to repeat our FundingLocked we'll do that in the next if block.
2038                 } else if msg.next_remote_commitment_number == (INITIAL_COMMITMENT_NUMBER - 1) - self.cur_local_commitment_transaction_number {
2039                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &self.build_local_commitment_secret(self.cur_local_commitment_transaction_number));
2040                         let per_commitment_secret = chan_utils::build_commitment_secret(self.local_keys.commitment_seed, self.cur_local_commitment_transaction_number + 2);
2041                         required_revoke = Some(msgs::RevokeAndACK {
2042                                 channel_id: self.channel_id,
2043                                 per_commitment_secret,
2044                                 next_per_commitment_point,
2045                         });
2046                 } else {
2047                         return Err(ChannelError::Close("Peer attempted to reestablish channel with a very old local commitment transaction"));
2048                 }
2049
2050                 if msg.next_local_commitment_number == INITIAL_COMMITMENT_NUMBER - self.cur_remote_commitment_transaction_number {
2051                         if msg.next_remote_commitment_number == INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number {
2052                                 log_debug!(self, "Reconnected channel {} with no lost commitment txn", log_bytes!(self.channel_id()));
2053                                 if msg.next_local_commitment_number == 1 && msg.next_remote_commitment_number == 1 {
2054                                         let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2055                                         let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
2056                                         return Ok((Some(msgs::FundingLocked {
2057                                                 channel_id: self.channel_id(),
2058                                                 next_per_commitment_point: next_per_commitment_point,
2059                                         }), None, None, None));
2060                                 }
2061                         }
2062
2063                         if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == 0 {
2064                                 // We're up-to-date and not waiting on a remote revoke (if we are our
2065                                 // channel_reestablish should result in them sending a revoke_and_ack), but we may
2066                                 // have received some updates while we were disconnected. Free the holding cell
2067                                 // now!
2068                                 match self.free_holding_cell_htlcs() {
2069                                         Err(e) => {
2070                                                 if let &Some(msgs::ErrorAction::DisconnectPeer{msg: Some(_)}) = &e.action {
2071                                                         return Err(ChannelError::Close(e.err));
2072                                                 } else if let &Some(msgs::ErrorAction::SendErrorMessage{msg: _}) = &e.action {
2073                                                         return Err(ChannelError::Close(e.err));
2074                                                 } else {
2075                                                         panic!("Got non-channel-failing result from free_holding_cell_htlcs");
2076                                                 }
2077                                         },
2078                                         Ok(Some((commitment_update, channel_monitor))) => return Ok((None, required_revoke, Some(commitment_update), Some(channel_monitor))),
2079                                         Ok(None) => return Ok((None, required_revoke, None, None)),
2080                                 }
2081                         } else {
2082                                 return Ok((None, required_revoke, None, None));
2083                         }
2084                 } else if msg.next_local_commitment_number == (INITIAL_COMMITMENT_NUMBER - 1) - self.cur_remote_commitment_transaction_number {
2085                         return Ok((None, required_revoke,
2086                                         Some(msgs::CommitmentUpdate {
2087                                                 update_add_htlcs: Vec::new(),
2088                                                 update_fulfill_htlcs: Vec::new(),
2089                                                 update_fail_htlcs: Vec::new(),
2090                                                 update_fail_malformed_htlcs: Vec::new(),
2091                                                 update_fee: None,
2092                                                 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,
2093                                         }), None));
2094                 } else {
2095                         return Err(ChannelError::Close("Peer attempted to reestablish channel with a very old remote commitment transaction"));
2096                 }
2097         }
2098
2099         pub fn shutdown(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>, Vec<(HTLCSource, [u8; 32])>), HandleError> {
2100                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2101                         return Err(HandleError{err: "Peer sent shutdown when we needed a channel_reestablish", action: Some(msgs::ErrorAction::SendErrorMessage{msg: msgs::ErrorMessage{data: "Peer sent shutdown when we needed a channel_reestablish".to_string(), channel_id: msg.channel_id}})});
2102                 }
2103                 if self.channel_state < ChannelState::FundingSent as u32 {
2104                         self.channel_state = ChannelState::ShutdownComplete as u32;
2105                         self.channel_update_count += 1;
2106                         return Ok((None, None, Vec::new()));
2107                 }
2108                 for htlc in self.pending_inbound_htlcs.iter() {
2109                         if htlc.state == InboundHTLCState::RemoteAnnounced {
2110                                 return Err(HandleError{err: "Got shutdown with remote pending HTLCs", action: None});
2111                         }
2112                 }
2113                 if (self.channel_state & ChannelState::RemoteShutdownSent as u32) == ChannelState::RemoteShutdownSent as u32 {
2114                         return Err(HandleError{err: "Remote peer sent duplicate shutdown message", action: None});
2115                 }
2116                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
2117
2118                 // BOLT 2 says we must only send a scriptpubkey of certain standard forms, which are up to
2119                 // 34 bytes in length, so dont let the remote peer feed us some super fee-heavy script.
2120                 if self.channel_outbound && msg.scriptpubkey.len() > 34 {
2121                         return Err(HandleError{err: "Got shutdown_scriptpubkey of absurd length from remote peer", action: None});
2122                 }
2123
2124                 //Check shutdown_scriptpubkey form as BOLT says we must
2125                 if !(msg.scriptpubkey.is_p2pkh()) && !(msg.scriptpubkey.is_p2sh())
2126                         && !(msg.scriptpubkey.is_v0_p2wpkh()) && !(msg.scriptpubkey.is_v0_p2wsh()){
2127                         return Err(HandleError{err: "Got an invalid scriptpubkey from remote peer", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })});
2128                 }
2129
2130                 if self.their_shutdown_scriptpubkey.is_some() {
2131                         if Some(&msg.scriptpubkey) != self.their_shutdown_scriptpubkey.as_ref() {
2132                                 return Err(HandleError{err: "Got shutdown request with a scriptpubkey which did not match their previous scriptpubkey", action: None});
2133                         }
2134                 } else {
2135                         self.their_shutdown_scriptpubkey = Some(msg.scriptpubkey.clone());
2136                 }
2137
2138                 let our_closing_script = self.get_closing_scriptpubkey();
2139
2140                 let (proposed_feerate, proposed_fee, our_sig) = if self.channel_outbound && self.pending_inbound_htlcs.is_empty() && self.pending_outbound_htlcs.is_empty() {
2141                         let mut proposed_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
2142                         if self.feerate_per_kw > proposed_feerate {
2143                                 proposed_feerate = self.feerate_per_kw;
2144                         }
2145                         let tx_weight = Self::get_closing_transaction_weight(&our_closing_script, &msg.scriptpubkey);
2146                         let proposed_total_fee_satoshis = proposed_feerate * tx_weight / 1000;
2147
2148                         let (closing_tx, total_fee_satoshis) = self.build_closing_transaction(proposed_total_fee_satoshis, false);
2149                         let funding_redeemscript = self.get_funding_redeemscript();
2150                         let sighash = Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
2151
2152                         (Some(proposed_feerate), Some(total_fee_satoshis), Some(self.secp_ctx.sign(&sighash, &self.local_keys.funding_key)))
2153                 } else { (None, None, None) };
2154
2155                 // From here on out, we may not fail!
2156
2157                 self.channel_state |= ChannelState::RemoteShutdownSent as u32;
2158                 self.channel_update_count += 1;
2159
2160                 // We can't send our shutdown until we've committed all of our pending HTLCs, but the
2161                 // remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
2162                 // cell HTLCs and return them to fail the payment.
2163                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
2164                 self.holding_cell_htlc_updates.retain(|htlc_update| {
2165                         match htlc_update {
2166                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
2167                                         dropped_outbound_htlcs.push((source.clone(), payment_hash.clone()));
2168                                         false
2169                                 },
2170                                 _ => true
2171                         }
2172                 });
2173                 for htlc in self.pending_outbound_htlcs.iter() {
2174                         if htlc.state == OutboundHTLCState::LocalAnnounced {
2175                                 return Ok((None, None, dropped_outbound_htlcs));
2176                         }
2177                 }
2178
2179                 let our_shutdown = if (self.channel_state & ChannelState::LocalShutdownSent as u32) == ChannelState::LocalShutdownSent as u32 {
2180                         None
2181                 } else {
2182                         Some(msgs::Shutdown {
2183                                 channel_id: self.channel_id,
2184                                 scriptpubkey: our_closing_script,
2185                         })
2186                 };
2187
2188                 self.channel_state |= ChannelState::LocalShutdownSent as u32;
2189                 self.channel_update_count += 1;
2190                 if self.pending_inbound_htlcs.is_empty() && self.pending_outbound_htlcs.is_empty() && self.channel_outbound {
2191                         // There are no more HTLCs and we're the funder, this means we start the closing_signed
2192                         // dance with an initial fee proposal!
2193                         self.last_sent_closing_fee = Some((proposed_feerate.unwrap(), proposed_fee.unwrap()));
2194                         Ok((our_shutdown, Some(msgs::ClosingSigned {
2195                                 channel_id: self.channel_id,
2196                                 fee_satoshis: proposed_fee.unwrap(),
2197                                 signature: our_sig.unwrap(),
2198                         }), dropped_outbound_htlcs))
2199                 } else {
2200                         Ok((our_shutdown, None, dropped_outbound_htlcs))
2201                 }
2202         }
2203
2204         pub fn closing_signed(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::ClosingSigned) -> Result<(Option<msgs::ClosingSigned>, Option<Transaction>), HandleError> {
2205                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != BOTH_SIDES_SHUTDOWN_MASK {
2206                         return Err(HandleError{err: "Remote end sent us a closing_signed before both sides provided a shutdown", action: None});
2207                 }
2208                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2209                         return Err(HandleError{err: "Peer sent closing_signed when we needed a channel_reestablish", action: Some(msgs::ErrorAction::SendErrorMessage{msg: msgs::ErrorMessage{data: "Peer sent closing_signed when we needed a channel_reestablish".to_string(), channel_id: msg.channel_id}})});
2210                 }
2211                 if !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() {
2212                         return Err(HandleError{err: "Remote end sent us a closing_signed while there were still pending HTLCs", action: None});
2213                 }
2214                 if msg.fee_satoshis > 21000000 * 10000000 { //this is required to stop potential overflow in build_closing_transaction
2215                         return Err(HandleError{err: "Remote tried to send us a closing tx with > 21 million BTC fee", action: None});
2216                 }
2217
2218                 let funding_redeemscript = self.get_funding_redeemscript();
2219                 let (mut closing_tx, used_total_fee) = self.build_closing_transaction(msg.fee_satoshis, false);
2220                 if used_total_fee != msg.fee_satoshis {
2221                         return Err(HandleError{err: "Remote sent us a closing_signed with a fee greater than the value they can claim", action: None});
2222                 }
2223                 let mut sighash = Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
2224
2225                 match self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey.unwrap()) {
2226                         Ok(_) => {},
2227                         Err(_e) => {
2228                                 // The remote end may have decided to revoke their output due to inconsistent dust
2229                                 // limits, so check for that case by re-checking the signature here.
2230                                 closing_tx = self.build_closing_transaction(msg.fee_satoshis, true).0;
2231                                 sighash = Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
2232                                 secp_call!(self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey.unwrap()), "Invalid closing tx signature from peer", self.channel_id());
2233                         },
2234                 };
2235
2236                 if let Some((_, last_fee)) = self.last_sent_closing_fee {
2237                         if last_fee == msg.fee_satoshis {
2238                                 self.sign_commitment_transaction(&mut closing_tx, &msg.signature);
2239                                 self.channel_state = ChannelState::ShutdownComplete as u32;
2240                                 self.channel_update_count += 1;
2241                                 return Ok((None, Some(closing_tx)));
2242                         }
2243                 }
2244
2245                 macro_rules! propose_new_feerate {
2246                         ($new_feerate: expr) => {
2247                                 let closing_tx_max_weight = Self::get_closing_transaction_weight(&self.get_closing_scriptpubkey(), self.their_shutdown_scriptpubkey.as_ref().unwrap());
2248                                 let (closing_tx, used_total_fee) = self.build_closing_transaction($new_feerate * closing_tx_max_weight / 1000, false);
2249                                 sighash = Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
2250                                 let our_sig = self.secp_ctx.sign(&sighash, &self.local_keys.funding_key);
2251                                 self.last_sent_closing_fee = Some(($new_feerate, used_total_fee));
2252                                 return Ok((Some(msgs::ClosingSigned {
2253                                         channel_id: self.channel_id,
2254                                         fee_satoshis: used_total_fee,
2255                                         signature: our_sig,
2256                                 }), None))
2257                         }
2258                 }
2259
2260                 let proposed_sat_per_kw = msg.fee_satoshis * 1000 / closing_tx.get_weight();
2261                 if self.channel_outbound {
2262                         let our_max_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
2263                         if proposed_sat_per_kw > our_max_feerate {
2264                                 if let Some((last_feerate, _)) = self.last_sent_closing_fee {
2265                                         if our_max_feerate <= last_feerate {
2266                                                 return Err(HandleError{err: "Unable to come to consensus about closing feerate, remote wanted something higher than our Normal feerate", action: None});
2267                                         }
2268                                 }
2269                                 propose_new_feerate!(our_max_feerate);
2270                         }
2271                 } else {
2272                         let our_min_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
2273                         if proposed_sat_per_kw < our_min_feerate {
2274                                 if let Some((last_feerate, _)) = self.last_sent_closing_fee {
2275                                         if our_min_feerate >= last_feerate {
2276                                                 return Err(HandleError{err: "Unable to come to consensus about closing feerate, remote wanted something lower than our Background feerate", action: None});
2277                                         }
2278                                 }
2279                                 propose_new_feerate!(our_min_feerate);
2280                         }
2281                 }
2282
2283                 let our_sig = self.sign_commitment_transaction(&mut closing_tx, &msg.signature);
2284                 self.channel_state = ChannelState::ShutdownComplete as u32;
2285                 self.channel_update_count += 1;
2286
2287                 Ok((Some(msgs::ClosingSigned {
2288                         channel_id: self.channel_id,
2289                         fee_satoshis: msg.fee_satoshis,
2290                         signature: our_sig,
2291                 }), Some(closing_tx)))
2292         }
2293
2294         // Public utilities:
2295
2296         pub fn channel_id(&self) -> [u8; 32] {
2297                 self.channel_id
2298         }
2299
2300         /// Gets the "user_id" value passed into the construction of this channel. It has no special
2301         /// meaning and exists only to allow users to have a persistent identifier of a channel.
2302         pub fn get_user_id(&self) -> u64 {
2303                 self.user_id
2304         }
2305
2306         /// May only be called after funding has been initiated (ie is_funding_initiated() is true)
2307         pub fn channel_monitor(&self) -> ChannelMonitor {
2308                 if self.channel_state < ChannelState::FundingCreated as u32 {
2309                         panic!("Can't get a channel monitor until funding has been created");
2310                 }
2311                 self.channel_monitor.clone()
2312         }
2313
2314         /// Guaranteed to be Some after both FundingLocked messages have been exchanged (and, thus,
2315         /// is_usable() returns true).
2316         /// Allowed in any state (including after shutdown)
2317         pub fn get_short_channel_id(&self) -> Option<u64> {
2318                 self.short_channel_id
2319         }
2320
2321         /// Returns the funding_txo we either got from our peer, or were given by
2322         /// get_outbound_funding_created.
2323         pub fn get_funding_txo(&self) -> Option<OutPoint> {
2324                 self.channel_monitor.get_funding_txo()
2325         }
2326
2327         /// Allowed in any state (including after shutdown)
2328         pub fn get_their_node_id(&self) -> PublicKey {
2329                 self.their_node_id
2330         }
2331
2332         /// Allowed in any state (including after shutdown)
2333         pub fn get_our_htlc_minimum_msat(&self) -> u64 {
2334                 self.our_htlc_minimum_msat
2335         }
2336
2337         pub fn get_value_satoshis(&self) -> u64 {
2338                 self.channel_value_satoshis
2339         }
2340
2341         #[cfg(test)]
2342         pub fn get_feerate(&self) -> u64 {
2343                 self.feerate_per_kw
2344         }
2345
2346         //TODO: Testing purpose only, should be changed in another way after #81
2347         #[cfg(test)]
2348         pub fn get_local_keys(&self) -> &ChannelKeys {
2349                 &self.local_keys
2350         }
2351
2352         /// Allowed in any state (including after shutdown)
2353         pub fn get_channel_update_count(&self) -> u32 {
2354                 self.channel_update_count
2355         }
2356
2357         pub fn should_announce(&self) -> bool {
2358                 self.announce_publicly
2359         }
2360
2361         pub fn is_outbound(&self) -> bool {
2362                 self.channel_outbound
2363         }
2364
2365         /// Gets the fee we'd want to charge for adding an HTLC output to this Channel
2366         /// Allowed in any state (including after shutdown)
2367         pub fn get_our_fee_base_msat(&self, fee_estimator: &FeeEstimator) -> u32 {
2368                 // For lack of a better metric, we calculate what it would cost to consolidate the new HTLC
2369                 // output value back into a transaction with the regular channel output:
2370
2371                 // the fee cost of the HTLC-Success/HTLC-Timeout transaction:
2372                 let mut res = self.feerate_per_kw * cmp::max(HTLC_TIMEOUT_TX_WEIGHT, HTLC_SUCCESS_TX_WEIGHT) / 1000;
2373
2374                 if self.channel_outbound {
2375                         // + the marginal fee increase cost to us in the commitment transaction:
2376                         res += self.feerate_per_kw * COMMITMENT_TX_WEIGHT_PER_HTLC / 1000;
2377                 }
2378
2379                 // + the marginal cost of an input which spends the HTLC-Success/HTLC-Timeout output:
2380                 res += fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal) * SPENDING_INPUT_FOR_A_OUTPUT_WEIGHT / 1000;
2381
2382                 res as u32
2383         }
2384
2385         /// Returns true if we've ever received a message from the remote end for this Channel
2386         pub fn have_received_message(&self) -> bool {
2387                 self.channel_state > (ChannelState::OurInitSent as u32)
2388         }
2389
2390         /// Returns true if this channel is fully established and not known to be closing.
2391         /// Allowed in any state (including after shutdown)
2392         pub fn is_usable(&self) -> bool {
2393                 let mask = ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK;
2394                 (self.channel_state & mask) == (ChannelState::ChannelFunded as u32)
2395         }
2396
2397         /// Returns true if this channel is currently available for use. This is a superset of
2398         /// is_usable() and considers things like the channel being temporarily disabled.
2399         /// Allowed in any state (including after shutdown)
2400         pub fn is_live(&self) -> bool {
2401                 self.is_usable() && (self.channel_state & (ChannelState::PeerDisconnected as u32) == 0)
2402         }
2403
2404         /// Returns true if funding_created was sent/received.
2405         pub fn is_funding_initiated(&self) -> bool {
2406                 self.channel_state >= ChannelState::FundingCreated as u32
2407         }
2408
2409         /// Returns true if this channel is fully shut down. True here implies that no further actions
2410         /// may/will be taken on this channel, and thus this object should be freed. Any future changes
2411         /// will be handled appropriately by the chain monitor.
2412         pub fn is_shutdown(&self) -> bool {
2413                 if (self.channel_state & ChannelState::ShutdownComplete as u32) == ChannelState::ShutdownComplete as u32  {
2414                         assert!(self.channel_state == ChannelState::ShutdownComplete as u32);
2415                         true
2416                 } else { false }
2417         }
2418
2419         /// Called by channelmanager based on chain blocks being connected.
2420         /// Note that we only need to use this to detect funding_signed, anything else is handled by
2421         /// the channel_monitor.
2422         /// In case of Err, the channel may have been closed, at which point the standard requirements
2423         /// apply - no calls may be made except those explicitly stated to be allowed post-shutdown.
2424         /// Only returns an ErrorAction of DisconnectPeer, if Err.
2425         pub fn block_connected(&mut self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[u32]) -> Result<Option<msgs::FundingLocked>, HandleError> {
2426                 let non_shutdown_state = self.channel_state & (!BOTH_SIDES_SHUTDOWN_MASK);
2427                 if self.funding_tx_confirmations > 0 {
2428                         if header.bitcoin_hash() != self.last_block_connected {
2429                                 self.last_block_connected = header.bitcoin_hash();
2430                                 self.funding_tx_confirmations += 1;
2431                                 if self.funding_tx_confirmations == Channel::derive_minimum_depth(self.channel_value_satoshis*1000, self.value_to_self_msat) as u64 {
2432                                         let need_commitment_update = if non_shutdown_state == ChannelState::FundingSent as u32 {
2433                                                 self.channel_state |= ChannelState::OurFundingLocked as u32;
2434                                                 true
2435                                         } else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32) {
2436                                                 self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & BOTH_SIDES_SHUTDOWN_MASK);
2437                                                 self.channel_update_count += 1;
2438                                                 true
2439                                         } else if self.channel_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
2440                                                 // We got a reorg but not enough to trigger a force close, just update
2441                                                 // funding_tx_confirmed_in and return.
2442                                                 false
2443                                         } else if self.channel_state < ChannelState::ChannelFunded as u32 {
2444                                                 panic!("Started confirming a channel in a state pre-FundingSent?: {}", self.channel_state);
2445                                         } else {
2446                                                 // We got a reorg but not enough to trigger a force close, just update
2447                                                 // funding_tx_confirmed_in and return.
2448                                                 false
2449                                         };
2450                                         self.funding_tx_confirmed_in = Some(header.bitcoin_hash());
2451
2452                                         //TODO: Note that this must be a duplicate of the previous commitment point they sent us,
2453                                         //as otherwise we will have a commitment transaction that they can't revoke (well, kinda,
2454                                         //they can by sending two revoke_and_acks back-to-back, but not really). This appears to be
2455                                         //a protocol oversight, but I assume I'm just missing something.
2456                                         if need_commitment_update {
2457                                                 let next_per_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2458                                                 let next_per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &next_per_commitment_secret);
2459                                                 return Ok(Some(msgs::FundingLocked {
2460                                                         channel_id: self.channel_id,
2461                                                         next_per_commitment_point: next_per_commitment_point,
2462                                                 }));
2463                                         }
2464                                 }
2465                         }
2466                 }
2467                 if non_shutdown_state & !(ChannelState::TheirFundingLocked as u32) == ChannelState::FundingSent as u32 {
2468                         for (ref tx, index_in_block) in txn_matched.iter().zip(indexes_of_txn_matched) {
2469                                 if tx.txid() == self.channel_monitor.get_funding_txo().unwrap().txid {
2470                                         let txo_idx = self.channel_monitor.get_funding_txo().unwrap().index as usize;
2471                                         if txo_idx >= tx.output.len() || tx.output[txo_idx].script_pubkey != self.get_funding_redeemscript().to_v0_p2wsh() ||
2472                                                         tx.output[txo_idx].value != self.channel_value_satoshis {
2473                                                 if self.channel_outbound {
2474                                                         // If we generated the funding transaction and it doesn't match what it
2475                                                         // should, the client is really broken and we should just panic and
2476                                                         // tell them off. That said, because hash collisions happen with high
2477                                                         // probability in fuzztarget mode, if we're fuzzing we just close the
2478                                                         // channel and move on.
2479                                                         #[cfg(not(feature = "fuzztarget"))]
2480                                                         panic!("Client called ChannelManager::funding_transaction_generated with bogus transaction!");
2481                                                 }
2482                                                 self.channel_state = ChannelState::ShutdownComplete as u32;
2483                                                 self.channel_update_count += 1;
2484                                                 return Err(HandleError{err: "funding tx had wrong script/value", action: Some(ErrorAction::DisconnectPeer{msg: None})});
2485                                         } else {
2486                                                 self.funding_tx_confirmations = 1;
2487                                                 self.short_channel_id = Some(((height as u64)          << (5*8)) |
2488                                                                              ((*index_in_block as u64) << (2*8)) |
2489                                                                              ((txo_idx as u64)         << (0*8)));
2490                                         }
2491                                 }
2492                         }
2493                 }
2494                 Ok(None)
2495         }
2496
2497         /// Called by channelmanager based on chain blocks being disconnected.
2498         /// Returns true if we need to close the channel now due to funding transaction
2499         /// unconfirmation/reorg.
2500         pub fn block_disconnected(&mut self, header: &BlockHeader) -> bool {
2501                 if self.funding_tx_confirmations > 0 {
2502                         self.funding_tx_confirmations -= 1;
2503                         if self.funding_tx_confirmations == UNCONF_THRESHOLD as u64 {
2504                                 return true;
2505                         }
2506                 }
2507                 if Some(header.bitcoin_hash()) == self.funding_tx_confirmed_in {
2508                         self.funding_tx_confirmations = Channel::derive_minimum_depth(self.channel_value_satoshis*1000, self.value_to_self_msat) as u64 - 1;
2509                 }
2510                 false
2511         }
2512
2513         // Methods to get unprompted messages to send to the remote end (or where we already returned
2514         // something in the handler for the message that prompted this message):
2515
2516         pub fn get_open_channel(&self, chain_hash: Sha256dHash, fee_estimator: &FeeEstimator) -> msgs::OpenChannel {
2517                 if !self.channel_outbound {
2518                         panic!("Tried to open a channel for an inbound channel?");
2519                 }
2520                 if self.channel_state != ChannelState::OurInitSent as u32 {
2521                         panic!("Cannot generate an open_channel after we've moved forward");
2522                 }
2523
2524                 if self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
2525                         panic!("Tried to send an open_channel for a channel that has already advanced");
2526                 }
2527
2528                 let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2529
2530                 msgs::OpenChannel {
2531                         chain_hash: chain_hash,
2532                         temporary_channel_id: self.channel_id,
2533                         funding_satoshis: self.channel_value_satoshis,
2534                         push_msat: self.channel_value_satoshis * 1000 - self.value_to_self_msat,
2535                         dust_limit_satoshis: self.our_dust_limit_satoshis,
2536                         max_htlc_value_in_flight_msat: Channel::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis),
2537                         channel_reserve_satoshis: Channel::get_our_channel_reserve_satoshis(self.channel_value_satoshis),
2538                         htlc_minimum_msat: self.our_htlc_minimum_msat,
2539                         feerate_per_kw: fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background) as u32,
2540                         to_self_delay: BREAKDOWN_TIMEOUT,
2541                         max_accepted_htlcs: OUR_MAX_HTLCS,
2542                         funding_pubkey: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key),
2543                         revocation_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.revocation_base_key),
2544                         payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.payment_base_key),
2545                         delayed_payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.delayed_payment_base_key),
2546                         htlc_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.htlc_base_key),
2547                         first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret),
2548                         channel_flags: if self.announce_publicly {1} else {0},
2549                         shutdown_scriptpubkey: None,
2550                 }
2551         }
2552
2553         pub fn get_accept_channel(&self) -> msgs::AcceptChannel {
2554                 if self.channel_outbound {
2555                         panic!("Tried to send accept_channel for an outbound channel?");
2556                 }
2557                 if self.channel_state != (ChannelState::OurInitSent as u32) | (ChannelState::TheirInitSent as u32) {
2558                         panic!("Tried to send accept_channel after channel had moved forward");
2559                 }
2560                 if self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
2561                         panic!("Tried to send an accept_channel for a channel that has already advanced");
2562                 }
2563
2564                 let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
2565
2566                 msgs::AcceptChannel {
2567                         temporary_channel_id: self.channel_id,
2568                         dust_limit_satoshis: self.our_dust_limit_satoshis,
2569                         max_htlc_value_in_flight_msat: Channel::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis),
2570                         channel_reserve_satoshis: Channel::get_our_channel_reserve_satoshis(self.channel_value_satoshis),
2571                         htlc_minimum_msat: self.our_htlc_minimum_msat,
2572                         minimum_depth: Channel::derive_minimum_depth(self.channel_value_satoshis*1000, self.value_to_self_msat),
2573                         to_self_delay: BREAKDOWN_TIMEOUT,
2574                         max_accepted_htlcs: OUR_MAX_HTLCS,
2575                         funding_pubkey: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key),
2576                         revocation_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.revocation_base_key),
2577                         payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.payment_base_key),
2578                         delayed_payment_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.delayed_payment_base_key),
2579                         htlc_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.htlc_base_key),
2580                         first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret),
2581                         shutdown_scriptpubkey: None,
2582                 }
2583         }
2584
2585         fn get_outbound_funding_created_signature(&mut self) -> Result<(Signature, Transaction), HandleError> {
2586                 let funding_script = self.get_funding_redeemscript();
2587
2588                 let remote_keys = self.build_remote_transaction_keys()?;
2589                 let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw).0;
2590                 let remote_sighash = Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
2591
2592                 // We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish.
2593                 Ok((self.secp_ctx.sign(&remote_sighash, &self.local_keys.funding_key), remote_initial_commitment_tx))
2594         }
2595
2596         /// Updates channel state with knowledge of the funding transaction's txid/index, and generates
2597         /// a funding_created message for the remote peer.
2598         /// Panics if called at some time other than immediately after initial handshake, if called twice,
2599         /// or if called on an inbound channel.
2600         /// Note that channel_id changes during this call!
2601         /// Do NOT broadcast the funding transaction until after a successful funding_signed call!
2602         pub fn get_outbound_funding_created(&mut self, funding_txo: OutPoint) -> Result<(msgs::FundingCreated, ChannelMonitor), HandleError> {
2603                 if !self.channel_outbound {
2604                         panic!("Tried to create outbound funding_created message on an inbound channel!");
2605                 }
2606                 if self.channel_state != (ChannelState::OurInitSent as u32 | ChannelState::TheirInitSent as u32) {
2607                         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)");
2608                 }
2609                 if self.channel_monitor.get_min_seen_secret() != (1 << 48) ||
2610                                 self.cur_remote_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER ||
2611                                 self.cur_local_commitment_transaction_number != INITIAL_COMMITMENT_NUMBER {
2612                         panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
2613                 }
2614
2615                 let funding_txo_script = self.get_funding_redeemscript().to_v0_p2wsh();
2616                 self.channel_monitor.set_funding_info((funding_txo, funding_txo_script));
2617
2618                 let (our_signature, commitment_tx) = match self.get_outbound_funding_created_signature() {
2619                         Ok(res) => res,
2620                         Err(e) => {
2621                                 log_error!(self, "Got bad signatures: {}!", e.err);
2622                                 self.channel_monitor.unset_funding_info();
2623                                 return Err(e);
2624                         }
2625                 };
2626
2627                 let temporary_channel_id = self.channel_id;
2628
2629                 // Now that we're past error-generating stuff, update our local state:
2630                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number);
2631                 self.channel_state = ChannelState::FundingCreated as u32;
2632                 self.channel_id = funding_txo.to_channel_id();
2633                 self.cur_remote_commitment_transaction_number -= 1;
2634
2635                 Ok((msgs::FundingCreated {
2636                         temporary_channel_id: temporary_channel_id,
2637                         funding_txid: funding_txo.txid,
2638                         funding_output_index: funding_txo.index,
2639                         signature: our_signature
2640                 }, self.channel_monitor.clone()))
2641         }
2642
2643         /// Gets an UnsignedChannelAnnouncement, as well as a signature covering it using our
2644         /// bitcoin_key, if available, for this channel. The channel must be publicly announceable and
2645         /// available for use (have exchanged FundingLocked messages in both directions). Should be used
2646         /// for both loose and in response to an AnnouncementSignatures message from the remote peer.
2647         /// Will only fail if we're not in a state where channel_announcement may be sent (including
2648         /// closing).
2649         /// Note that the "channel must be funded" requirement is stricter than BOLT 7 requires - see
2650         /// https://github.com/lightningnetwork/lightning-rfc/issues/468
2651         pub fn get_channel_announcement(&self, our_node_id: PublicKey, chain_hash: Sha256dHash) -> Result<(msgs::UnsignedChannelAnnouncement, Signature), ChannelError> {
2652                 if !self.announce_publicly {
2653                         return Err(ChannelError::Ignore("Channel is not available for public announcements"));
2654                 }
2655                 if self.channel_state & (ChannelState::ChannelFunded as u32) == 0 {
2656                         return Err(ChannelError::Ignore("Cannot get a ChannelAnnouncement until the channel funding has been locked"));
2657                 }
2658                 if (self.channel_state & (ChannelState::LocalShutdownSent as u32 | ChannelState::ShutdownComplete as u32)) != 0 {
2659                         return Err(ChannelError::Ignore("Cannot get a ChannelAnnouncement once the channel is closing"));
2660                 }
2661
2662                 let were_node_one = our_node_id.serialize()[..] < self.their_node_id.serialize()[..];
2663                 let our_bitcoin_key = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key);
2664
2665                 let msg = msgs::UnsignedChannelAnnouncement {
2666                         features: msgs::GlobalFeatures::new(),
2667                         chain_hash: chain_hash,
2668                         short_channel_id: self.get_short_channel_id().unwrap(),
2669                         node_id_1: if were_node_one { our_node_id } else { self.get_their_node_id() },
2670                         node_id_2: if were_node_one { self.get_their_node_id() } else { our_node_id },
2671                         bitcoin_key_1: if were_node_one { our_bitcoin_key } else { self.their_funding_pubkey.unwrap() },
2672                         bitcoin_key_2: if were_node_one { self.their_funding_pubkey.unwrap() } else { our_bitcoin_key },
2673                         excess_data: Vec::new(),
2674                 };
2675
2676                 let msghash = Message::from_slice(&Sha256dHash::from_data(&msg.encode()[..])[..]).unwrap();
2677                 let sig = self.secp_ctx.sign(&msghash, &self.local_keys.funding_key);
2678
2679                 Ok((msg, sig))
2680         }
2681
2682         /// May panic if called on a channel that wasn't immediately-previously
2683         /// self.remove_uncommitted_htlcs_and_mark_paused()'d
2684         pub fn get_channel_reestablish(&self) -> msgs::ChannelReestablish {
2685                 assert_eq!(self.channel_state & ChannelState::PeerDisconnected as u32, ChannelState::PeerDisconnected as u32);
2686                 msgs::ChannelReestablish {
2687                         channel_id: self.channel_id(),
2688                         next_local_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_local_commitment_transaction_number,
2689                         next_remote_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_remote_commitment_transaction_number,
2690                         data_loss_protect: None,
2691                 }
2692         }
2693
2694
2695         // Send stuff to our remote peers:
2696
2697         /// Adds a pending outbound HTLC to this channel, note that you probably want
2698         /// send_htlc_and_commit instead cause you'll want both messages at once.
2699         /// This returns an option instead of a pure UpdateAddHTLC as we may be in a state where we are
2700         /// waiting on the remote peer to send us a revoke_and_ack during which time we cannot add new
2701         /// HTLCs on the wire or we wouldn't be able to determine what they actually ACK'ed.
2702         /// You MUST call send_commitment prior to any other calls on this Channel
2703         pub fn send_htlc(&mut self, amount_msat: u64, payment_hash: [u8; 32], cltv_expiry: u32, source: HTLCSource, onion_routing_packet: msgs::OnionPacket) -> Result<Option<msgs::UpdateAddHTLC>, HandleError> {
2704                 if (self.channel_state & (ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK)) != (ChannelState::ChannelFunded as u32) {
2705                         return Err(HandleError{err: "Cannot send HTLC until channel is fully established and we haven't started shutting down", action: None});
2706                 }
2707
2708                 if amount_msat > self.channel_value_satoshis * 1000 {
2709                         return Err(HandleError{err: "Cannot send more than the total value of the channel", action: None});
2710                 }
2711                 if amount_msat < self.their_htlc_minimum_msat {
2712                         return Err(HandleError{err: "Cannot send less than their minimum HTLC value", action: None});
2713                 }
2714
2715                 if (self.channel_state & (ChannelState::PeerDisconnected as u32)) == (ChannelState::PeerDisconnected as u32) {
2716                         // Note that this should never really happen, if we're !is_live() on receipt of an
2717                         // incoming HTLC for relay will result in us rejecting the HTLC and we won't allow
2718                         // the user to send directly into a !is_live() channel. However, if we
2719                         // disconnected during the time the previous hop was doing the commitment dance we may
2720                         // end up getting here after the forwarding delay. In any case, returning an
2721                         // IgnoreError will get ChannelManager to do the right thing and fail backwards now.
2722                         return Err(HandleError{err: "Cannot send an HTLC while disconnected", action: Some(ErrorAction::IgnoreError)});
2723                 }
2724
2725                 let (_, outbound_htlc_count, htlc_outbound_value_msat, htlc_inbound_value_msat) = self.get_pending_htlc_stats(false);
2726                 if outbound_htlc_count + 1 > self.their_max_accepted_htlcs as u32 {
2727                         return Err(HandleError{err: "Cannot push more than their max accepted HTLCs", action: None});
2728                 }
2729                 //TODO: Spec is unclear if this is per-direction or in total (I assume per direction):
2730                 // Check their_max_htlc_value_in_flight_msat
2731                 if htlc_outbound_value_msat + amount_msat > self.their_max_htlc_value_in_flight_msat {
2732                         return Err(HandleError{err: "Cannot send value that would put us over our max HTLC value in flight", action: None});
2733                 }
2734                 // Check their_channel_reserve_satoshis:
2735                 if htlc_inbound_value_msat + htlc_outbound_value_msat + amount_msat + (self.channel_value_satoshis * 1000 - self.value_to_self_msat) > (self.channel_value_satoshis - self.their_channel_reserve_satoshis) * 1000 {
2736                         return Err(HandleError{err: "Cannot send value that would put us over our reserve value", action: None});
2737                 }
2738
2739                 //TODO: Check cltv_expiry? Do this in channel manager?
2740
2741                 // Now update local state:
2742                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
2743                         //TODO: Check the limits *including* other pending holding cell HTLCs!
2744                         self.holding_cell_htlc_updates.push(HTLCUpdateAwaitingACK::AddHTLC {
2745                                 amount_msat: amount_msat,
2746                                 payment_hash: payment_hash,
2747                                 cltv_expiry: cltv_expiry,
2748                                 source,
2749                                 onion_routing_packet: onion_routing_packet,
2750                                 time_created: Instant::now(),
2751                         });
2752                         return Ok(None);
2753                 }
2754
2755                 self.pending_outbound_htlcs.push(OutboundHTLCOutput {
2756                         htlc_id: self.next_local_htlc_id,
2757                         amount_msat: amount_msat,
2758                         payment_hash: payment_hash.clone(),
2759                         cltv_expiry: cltv_expiry,
2760                         state: OutboundHTLCState::LocalAnnounced,
2761                         source,
2762                         fail_reason: None,
2763                 });
2764
2765                 let res = msgs::UpdateAddHTLC {
2766                         channel_id: self.channel_id,
2767                         htlc_id: self.next_local_htlc_id,
2768                         amount_msat: amount_msat,
2769                         payment_hash: payment_hash,
2770                         cltv_expiry: cltv_expiry,
2771                         onion_routing_packet: onion_routing_packet,
2772                 };
2773                 self.next_local_htlc_id += 1;
2774
2775                 Ok(Some(res))
2776         }
2777
2778         /// Creates a signed commitment transaction to send to the remote peer.
2779         /// Always returns a Channel-failing HandleError::action if an immediately-preceding (read: the
2780         /// last call to this Channel) send_htlc returned Ok(Some(_)) and there is an Err.
2781         /// May panic if called except immediately after a successful, Ok(Some(_))-returning send_htlc.
2782         pub fn send_commitment(&mut self) -> Result<(msgs::CommitmentSigned, ChannelMonitor), HandleError> {
2783                 if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
2784                         panic!("Cannot create commitment tx until channel is fully established");
2785                 }
2786                 if (self.channel_state & (ChannelState::AwaitingRemoteRevoke as u32)) == (ChannelState::AwaitingRemoteRevoke as u32) {
2787                         panic!("Cannot create commitment tx until remote revokes their previous commitment");
2788                 }
2789                 if (self.channel_state & (ChannelState::PeerDisconnected as u32)) == (ChannelState::PeerDisconnected as u32) {
2790                         panic!("Cannot create commitment tx while disconnected, as send_htlc will have returned an Err so a send_commitment precondition has been violated");
2791                 }
2792                 let mut have_updates = self.pending_update_fee.is_some();
2793                 for htlc in self.pending_outbound_htlcs.iter() {
2794                         if htlc.state == OutboundHTLCState::LocalAnnounced {
2795                                 have_updates = true;
2796                         }
2797                         if have_updates { break; }
2798                 }
2799                 if !have_updates {
2800                         panic!("Cannot create commitment tx until we have some updates to send");
2801                 }
2802                 self.send_commitment_no_status_check()
2803         }
2804         /// Only fails in case of bad keys
2805         fn send_commitment_no_status_check(&mut self) -> Result<(msgs::CommitmentSigned, ChannelMonitor), HandleError> {
2806                 // We can upgrade the status of some HTLCs that are waiting on a commitment, even if we
2807                 // fail to generate this, we still are at least at a position where upgrading their status
2808                 // is acceptable.
2809                 for htlc in self.pending_inbound_htlcs.iter_mut() {
2810                         if htlc.state == InboundHTLCState::AwaitingRemoteRevokeToAnnounce {
2811                                 htlc.state = InboundHTLCState::AwaitingAnnouncedRemoteRevoke;
2812                         }
2813                 }
2814                 for htlc in self.pending_outbound_htlcs.iter_mut() {
2815                         if htlc.state == OutboundHTLCState::AwaitingRemoteRevokeToRemove {
2816                                 htlc.state = OutboundHTLCState::AwaitingRemovedRemoteRevoke;
2817                         }
2818                 }
2819
2820                 match self.send_commitment_no_state_update() {
2821                         Ok((res, remote_commitment_tx)) => {
2822                                 // Update state now that we've passed all the can-fail calls...
2823                                 self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_commitment_tx.0, remote_commitment_tx.1, self.cur_remote_commitment_transaction_number);
2824                                 self.channel_state |= ChannelState::AwaitingRemoteRevoke as u32;
2825                                 Ok((res, self.channel_monitor.clone()))
2826                         },
2827                         Err(e) => Err(e),
2828                 }
2829         }
2830
2831         /// Only fails in case of bad keys. Used for channel_reestablish commitment_signed generation
2832         /// when we shouldn't change HTLC/channel state.
2833         fn send_commitment_no_state_update(&self) -> Result<(msgs::CommitmentSigned, (Transaction, Vec<HTLCOutputInCommitment>)), HandleError> {
2834                 let funding_script = self.get_funding_redeemscript();
2835
2836                 let mut feerate_per_kw = self.feerate_per_kw;
2837                 if let Some(feerate) = self.pending_update_fee {
2838                         if self.channel_outbound {
2839                                 feerate_per_kw = feerate;
2840                         }
2841                 }
2842
2843                 let remote_keys = self.build_remote_transaction_keys()?;
2844                 let remote_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, true, feerate_per_kw);
2845                 let remote_commitment_txid = remote_commitment_tx.0.txid();
2846                 let remote_sighash = Message::from_slice(&bip143::SighashComponents::new(&remote_commitment_tx.0).sighash_all(&remote_commitment_tx.0.input[0], &funding_script, self.channel_value_satoshis)[..]).unwrap();
2847                 let our_sig = self.secp_ctx.sign(&remote_sighash, &self.local_keys.funding_key);
2848
2849                 let mut htlc_sigs = Vec::new();
2850
2851                 for ref htlc in remote_commitment_tx.1.iter() {
2852                         let htlc_tx = self.build_htlc_transaction(&remote_commitment_txid, htlc, false, &remote_keys, feerate_per_kw);
2853                         let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &remote_keys);
2854                         let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
2855                         let our_htlc_key = secp_derived_key!(chan_utils::derive_private_key(&self.secp_ctx, &remote_keys.per_commitment_point, &self.local_keys.htlc_base_key), self.channel_id());
2856                         htlc_sigs.push(self.secp_ctx.sign(&htlc_sighash, &our_htlc_key));
2857                 }
2858
2859                 Ok((msgs::CommitmentSigned {
2860                         channel_id: self.channel_id,
2861                         signature: our_sig,
2862                         htlc_signatures: htlc_sigs,
2863                 }, remote_commitment_tx))
2864         }
2865
2866         /// Adds a pending outbound HTLC to this channel, and creates a signed commitment transaction
2867         /// to send to the remote peer in one go.
2868         /// Shorthand for calling send_htlc() followed by send_commitment(), see docs on those for
2869         /// more info.
2870         pub fn send_htlc_and_commit(&mut self, amount_msat: u64, payment_hash: [u8; 32], cltv_expiry: u32, source: HTLCSource, onion_routing_packet: msgs::OnionPacket) -> Result<Option<(msgs::UpdateAddHTLC, msgs::CommitmentSigned, ChannelMonitor)>, HandleError> {
2871                 match self.send_htlc(amount_msat, payment_hash, cltv_expiry, source, onion_routing_packet)? {
2872                         Some(update_add_htlc) => {
2873                                 let (commitment_signed, monitor_update) = self.send_commitment_no_status_check()?;
2874                                 Ok(Some((update_add_htlc, commitment_signed, monitor_update)))
2875                         },
2876                         None => Ok(None)
2877                 }
2878         }
2879
2880         /// Begins the shutdown process, getting a message for the remote peer and returning all
2881         /// holding cell HTLCs for payment failure.
2882         pub fn get_shutdown(&mut self) -> Result<(msgs::Shutdown, Vec<(HTLCSource, [u8; 32])>), HandleError> {
2883                 for htlc in self.pending_outbound_htlcs.iter() {
2884                         if htlc.state == OutboundHTLCState::LocalAnnounced {
2885                                 return Err(HandleError{err: "Cannot begin shutdown with pending HTLCs, call send_commitment first", action: None});
2886                         }
2887                 }
2888                 if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != 0 {
2889                         return Err(HandleError{err: "Shutdown already in progress", action: None});
2890                 }
2891                 assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
2892                 if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
2893                         return Err(HandleError{err: "Cannot begin shutdown while peer is disconnected, maybe force-close instead?", action: None});
2894                 }
2895
2896                 let our_closing_script = self.get_closing_scriptpubkey();
2897
2898                 // From here on out, we may not fail!
2899                 if self.channel_state < ChannelState::FundingSent as u32 {
2900                         self.channel_state = ChannelState::ShutdownComplete as u32;
2901                 } else {
2902                         self.channel_state |= ChannelState::LocalShutdownSent as u32;
2903                 }
2904                 self.channel_update_count += 1;
2905
2906                 // We can't send our shutdown until we've committed all of our pending HTLCs, but the
2907                 // remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
2908                 // cell HTLCs and return them to fail the payment.
2909                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
2910                 self.holding_cell_htlc_updates.retain(|htlc_update| {
2911                         match htlc_update {
2912                                 &HTLCUpdateAwaitingACK::AddHTLC { ref payment_hash, ref source, .. } => {
2913                                         dropped_outbound_htlcs.push((source.clone(), payment_hash.clone()));
2914                                         false
2915                                 },
2916                                 _ => true
2917                         }
2918                 });
2919
2920                 Ok((msgs::Shutdown {
2921                         channel_id: self.channel_id,
2922                         scriptpubkey: our_closing_script,
2923                 }, dropped_outbound_htlcs))
2924         }
2925
2926         /// Gets the latest commitment transaction and any dependant transactions for relay (forcing
2927         /// shutdown of this channel - no more calls into this Channel may be made afterwards except
2928         /// those explicitly stated to be allowed after shutdown completes, eg some simple getters).
2929         /// Also returns the list of payment_hashes for channels which we can safely fail backwards
2930         /// immediately (others we will have to allow to time out).
2931         pub fn force_shutdown(&mut self) -> (Vec<Transaction>, Vec<(HTLCSource, [u8; 32])>) {
2932                 assert!(self.channel_state != ChannelState::ShutdownComplete as u32);
2933
2934                 // We go ahead and "free" any holding cell HTLCs or HTLCs we haven't yet committed to and
2935                 // return them to fail the payment.
2936                 let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
2937                 for htlc_update in self.holding_cell_htlc_updates.drain(..) {
2938                         match htlc_update {
2939                                 HTLCUpdateAwaitingACK::AddHTLC { source, payment_hash, .. } => {
2940                                         dropped_outbound_htlcs.push((source, payment_hash));
2941                                 },
2942                                 _ => {}
2943                         }
2944                 }
2945
2946                 for _htlc in self.pending_outbound_htlcs.drain(..) {
2947                         //TODO: Do something with the remaining HTLCs
2948                         //(we need to have the ChannelManager monitor them so we can claim the inbound HTLCs
2949                         //which correspond)
2950                 }
2951
2952                 self.channel_state = ChannelState::ShutdownComplete as u32;
2953                 self.channel_update_count += 1;
2954                 let mut res = Vec::new();
2955                 mem::swap(&mut res, &mut self.last_local_commitment_txn);
2956                 (res, dropped_outbound_htlcs)
2957         }
2958 }
2959
2960 #[cfg(test)]
2961 mod tests {
2962         use bitcoin::util::hash::Sha256dHash;
2963         use bitcoin::util::bip143;
2964         use bitcoin::network::serialize::serialize;
2965         use bitcoin::blockdata::script::Script;
2966         use bitcoin::blockdata::transaction::Transaction;
2967         use hex;
2968         use ln::channelmanager::HTLCSource;
2969         use ln::channel::{Channel,ChannelKeys,InboundHTLCOutput,OutboundHTLCOutput,InboundHTLCState,OutboundHTLCState,HTLCOutputInCommitment,TxCreationKeys};
2970         use ln::channel::MAX_FUNDING_SATOSHIS;
2971         use ln::chan_utils;
2972         use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
2973         use chain::transaction::OutPoint;
2974         use util::test_utils;
2975         use util::logger::Logger;
2976         use secp256k1::{Secp256k1,Message,Signature};
2977         use secp256k1::key::{SecretKey,PublicKey};
2978         use crypto::sha2::Sha256;
2979         use crypto::digest::Digest;
2980         use std::sync::Arc;
2981
2982         struct TestFeeEstimator {
2983                 fee_est: u64
2984         }
2985         impl FeeEstimator for TestFeeEstimator {
2986                 fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 {
2987                         self.fee_est
2988                 }
2989         }
2990
2991         #[test]
2992         fn test_max_funding_satoshis() {
2993                 assert!(MAX_FUNDING_SATOSHIS <= 21_000_000 * 100_000_000,
2994                         "MAX_FUNDING_SATOSHIS is greater than all satoshis on existence");
2995         }
2996
2997         #[test]
2998         fn outbound_commitment_test() {
2999                 // Test vectors from BOLT 3 Appendix C:
3000                 let feeest = TestFeeEstimator{fee_est: 15000};
3001                 let logger : Arc<Logger> = Arc::new(test_utils::TestLogger::new());
3002                 let secp_ctx = Secp256k1::new();
3003
3004                 let chan_keys = ChannelKeys {
3005                         funding_key: SecretKey::from_slice(&secp_ctx, &hex::decode("30ff4956bbdd3222d44cc5e8a1261dab1e07957bdac5ae88fe3261ef321f3749").unwrap()[..]).unwrap(),
3006                         payment_base_key: SecretKey::from_slice(&secp_ctx, &hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap(),
3007                         delayed_payment_base_key: SecretKey::from_slice(&secp_ctx, &hex::decode("3333333333333333333333333333333333333333333333333333333333333333").unwrap()[..]).unwrap(),
3008                         htlc_base_key: SecretKey::from_slice(&secp_ctx, &hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap(),
3009
3010                         // These aren't set in the test vectors:
3011                         revocation_base_key: SecretKey::from_slice(&secp_ctx, &hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
3012                         channel_close_key: SecretKey::from_slice(&secp_ctx, &hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
3013                         channel_monitor_claim_key: SecretKey::from_slice(&secp_ctx, &hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
3014                         commitment_seed: [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff],
3015                 };
3016                 assert_eq!(PublicKey::from_secret_key(&secp_ctx, &chan_keys.funding_key).serialize()[..],
3017                                 hex::decode("023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb").unwrap()[..]);
3018
3019                 let their_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &[42; 32]).unwrap());
3020                 let mut chan = Channel::new_outbound(&feeest, chan_keys, their_node_id, 10000000, 100000, false, 42, Arc::clone(&logger)).unwrap(); // Nothing uses their network key in this test
3021                 chan.their_to_self_delay = 144;
3022                 chan.our_dust_limit_satoshis = 546;
3023
3024                 let funding_info = OutPoint::new(Sha256dHash::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(), 0);
3025                 chan.channel_monitor.set_funding_info((funding_info, Script::new()));
3026
3027                 chan.their_payment_basepoint = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("4444444444444444444444444444444444444444444444444444444444444444").unwrap()[..]).unwrap()));
3028                 assert_eq!(chan.their_payment_basepoint.unwrap().serialize()[..],
3029                                 hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);
3030
3031                 chan.their_funding_pubkey = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("1552dfba4f6cf29a62a0af13c8d6981d36d0ef8d61ba10fb0fe90da7634d7e13").unwrap()[..]).unwrap()));
3032                 assert_eq!(chan.their_funding_pubkey.unwrap().serialize()[..],
3033                                 hex::decode("030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c1").unwrap()[..]);
3034
3035                 chan.their_htlc_basepoint = Some(PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("4444444444444444444444444444444444444444444444444444444444444444").unwrap()[..]).unwrap()));
3036                 assert_eq!(chan.their_htlc_basepoint.unwrap().serialize()[..],
3037                                 hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);
3038
3039                 chan.their_revocation_basepoint = Some(PublicKey::from_slice(&secp_ctx, &hex::decode("02466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f27").unwrap()[..]).unwrap());
3040
3041                 // We can't just use build_local_transaction_keys here as the per_commitment_secret is not
3042                 // derived from a commitment_seed, so instead we copy it here and call
3043                 // build_commitment_transaction.
3044                 let delayed_payment_base = PublicKey::from_secret_key(&secp_ctx, &chan.local_keys.delayed_payment_base_key);
3045                 let per_commitment_secret = SecretKey::from_slice(&secp_ctx, &hex::decode("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
3046                 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
3047                 let htlc_basepoint = PublicKey::from_secret_key(&secp_ctx, &chan.local_keys.htlc_base_key);
3048                 let keys = TxCreationKeys::new(&secp_ctx, &per_commitment_point, &delayed_payment_base, &htlc_basepoint, &chan.their_revocation_basepoint.unwrap(), &chan.their_payment_basepoint.unwrap(), &chan.their_htlc_basepoint.unwrap()).unwrap();
3049
3050                 let mut unsigned_tx: (Transaction, Vec<HTLCOutputInCommitment>);
3051
3052                 macro_rules! test_commitment {
3053                         ( $their_sig_hex: expr, $our_sig_hex: expr, $tx_hex: expr) => {
3054                                 unsigned_tx = chan.build_commitment_transaction(0xffffffffffff - 42, &keys, true, false, chan.feerate_per_kw);
3055                                 let their_signature = Signature::from_der(&secp_ctx, &hex::decode($their_sig_hex).unwrap()[..]).unwrap();
3056                                 let sighash = Message::from_slice(&bip143::SighashComponents::new(&unsigned_tx.0).sighash_all(&unsigned_tx.0.input[0], &chan.get_funding_redeemscript(), chan.channel_value_satoshis)[..]).unwrap();
3057                                 secp_ctx.verify(&sighash, &their_signature, &chan.their_funding_pubkey.unwrap()).unwrap();
3058
3059                                 chan.sign_commitment_transaction(&mut unsigned_tx.0, &their_signature);
3060
3061                                 assert_eq!(serialize(&unsigned_tx.0).unwrap()[..],
3062                                                 hex::decode($tx_hex).unwrap()[..]);
3063                         };
3064                 }
3065
3066                 macro_rules! test_htlc_output {
3067                         ( $htlc_idx: expr, $their_sig_hex: expr, $our_sig_hex: expr, $tx_hex: expr ) => {
3068                                 let remote_signature = Signature::from_der(&secp_ctx, &hex::decode($their_sig_hex).unwrap()[..]).unwrap();
3069
3070                                 let ref htlc = unsigned_tx.1[$htlc_idx];
3071                                 let mut htlc_tx = chan.build_htlc_transaction(&unsigned_tx.0.txid(), &htlc, true, &keys, chan.feerate_per_kw);
3072                                 let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
3073                                 let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
3074                                 secp_ctx.verify(&htlc_sighash, &remote_signature, &keys.b_htlc_key).unwrap();
3075
3076                                 let mut preimage: Option<[u8; 32]> = None;
3077                                 if !htlc.offered {
3078                                         for i in 0..5 {
3079                                                 let mut sha = Sha256::new();
3080                                                 sha.input(&[i; 32]);
3081
3082                                                 let mut out = [0; 32];
3083                                                 sha.result(&mut out);
3084
3085                                                 if out == htlc.payment_hash {
3086                                                         preimage = Some([i; 32]);
3087                                                 }
3088                                         }
3089
3090                                         assert!(preimage.is_some());
3091                                 }
3092
3093                                 chan.sign_htlc_transaction(&mut htlc_tx, &remote_signature, &preimage, &htlc, &keys).unwrap();
3094                                 assert_eq!(serialize(&htlc_tx).unwrap()[..],
3095                                                 hex::decode($tx_hex).unwrap()[..]);
3096                         };
3097                 }
3098
3099                 {
3100                         // simple commitment tx with no HTLCs
3101                         chan.value_to_self_msat = 7000000000;
3102
3103                         test_commitment!("3045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c0",
3104                                          "3044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c3836939",
3105                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3106                 }
3107
3108                 chan.pending_inbound_htlcs.push({
3109                         let mut out = InboundHTLCOutput{
3110                                 htlc_id: 0,
3111                                 amount_msat: 1000000,
3112                                 cltv_expiry: 500,
3113                                 payment_hash: [0; 32],
3114                                 state: InboundHTLCState::Committed,
3115                                 local_removed_fulfilled: false,
3116                                 pending_forward_state: None,
3117                         };
3118                         let mut sha = Sha256::new();
3119                         sha.input(&hex::decode("0000000000000000000000000000000000000000000000000000000000000000").unwrap());
3120                         sha.result(&mut out.payment_hash);
3121                         out
3122                 });
3123                 chan.pending_inbound_htlcs.push({
3124                         let mut out = InboundHTLCOutput{
3125                                 htlc_id: 1,
3126                                 amount_msat: 2000000,
3127                                 cltv_expiry: 501,
3128                                 payment_hash: [0; 32],
3129                                 state: InboundHTLCState::Committed,
3130                                 local_removed_fulfilled: false,
3131                                 pending_forward_state: None,
3132                         };
3133                         let mut sha = Sha256::new();
3134                         sha.input(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap());
3135                         sha.result(&mut out.payment_hash);
3136                         out
3137                 });
3138                 chan.pending_outbound_htlcs.push({
3139                         let mut out = OutboundHTLCOutput{
3140                                 htlc_id: 2,
3141                                 amount_msat: 2000000,
3142                                 cltv_expiry: 502,
3143                                 payment_hash: [0; 32],
3144                                 state: OutboundHTLCState::Committed,
3145                                 source: HTLCSource::dummy(),
3146                                 fail_reason: None,
3147                         };
3148                         let mut sha = Sha256::new();
3149                         sha.input(&hex::decode("0202020202020202020202020202020202020202020202020202020202020202").unwrap());
3150                         sha.result(&mut out.payment_hash);
3151                         out
3152                 });
3153                 chan.pending_outbound_htlcs.push({
3154                         let mut out = OutboundHTLCOutput{
3155                                 htlc_id: 3,
3156                                 amount_msat: 3000000,
3157                                 cltv_expiry: 503,
3158                                 payment_hash: [0; 32],
3159                                 state: OutboundHTLCState::Committed,
3160                                 source: HTLCSource::dummy(),
3161                                 fail_reason: None,
3162                         };
3163                         let mut sha = Sha256::new();
3164                         sha.input(&hex::decode("0303030303030303030303030303030303030303030303030303030303030303").unwrap());
3165                         sha.result(&mut out.payment_hash);
3166                         out
3167                 });
3168                 chan.pending_inbound_htlcs.push({
3169                         let mut out = InboundHTLCOutput{
3170                                 htlc_id: 4,
3171                                 amount_msat: 4000000,
3172                                 cltv_expiry: 504,
3173                                 payment_hash: [0; 32],
3174                                 state: InboundHTLCState::Committed,
3175                                 local_removed_fulfilled: false,
3176                                 pending_forward_state: None,
3177                         };
3178                         let mut sha = Sha256::new();
3179                         sha.input(&hex::decode("0404040404040404040404040404040404040404040404040404040404040404").unwrap());
3180                         sha.result(&mut out.payment_hash);
3181                         out
3182                 });
3183
3184                 {
3185                         // commitment tx with all five HTLCs untrimmed (minimum feerate)
3186                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3187                         chan.feerate_per_kw = 0;
3188
3189                         test_commitment!("304402204fd4928835db1ccdfc40f5c78ce9bd65249b16348df81f0c44328dcdefc97d630220194d3869c38bc732dd87d13d2958015e2fc16829e74cd4377f84d215c0b70606",
3190                                          "30440220275b0c325a5e9355650dc30c0eccfbc7efb23987c24b556b9dfdd40effca18d202206caceb2c067836c51f296740c7ae807ffcbfbf1dd3a0d56b6de9a5b247985f06",
3191                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e80300000000000022002052bfef0479d7b293c27e0f1eb294bea154c63a3294ef092c19af51409bce0e2ad007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e0a06a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004730440220275b0c325a5e9355650dc30c0eccfbc7efb23987c24b556b9dfdd40effca18d202206caceb2c067836c51f296740c7ae807ffcbfbf1dd3a0d56b6de9a5b247985f060147304402204fd4928835db1ccdfc40f5c78ce9bd65249b16348df81f0c44328dcdefc97d630220194d3869c38bc732dd87d13d2958015e2fc16829e74cd4377f84d215c0b7060601475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3192
3193                         assert_eq!(unsigned_tx.1.len(), 5);
3194
3195                         test_htlc_output!(0,
3196                                           "304402206a6e59f18764a5bf8d4fa45eebc591566689441229c918b480fb2af8cc6a4aeb02205248f273be447684b33e3c8d1d85a8e0ca9fa0bae9ae33f0527ada9c162919a6",
3197                                           "304402207cb324fa0de88f452ffa9389678127ebcf4cabe1dd848b8e076c1a1962bf34720220116ed922b12311bd602d67e60d2529917f21c5b82f25ff6506c0f87886b4dfd5",
3198                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219700000000000000000001e8030000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402206a6e59f18764a5bf8d4fa45eebc591566689441229c918b480fb2af8cc6a4aeb02205248f273be447684b33e3c8d1d85a8e0ca9fa0bae9ae33f0527ada9c162919a60147304402207cb324fa0de88f452ffa9389678127ebcf4cabe1dd848b8e076c1a1962bf34720220116ed922b12311bd602d67e60d2529917f21c5b82f25ff6506c0f87886b4dfd5012000000000000000000000000000000000000000000000000000000000000000008a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac686800000000");
3199
3200                         test_htlc_output!(1,
3201                                           "3045022100d5275b3619953cb0c3b5aa577f04bc512380e60fa551762ce3d7a1bb7401cff9022037237ab0dac3fe100cde094e82e2bed9ba0ed1bb40154b48e56aa70f259e608b",
3202                                           "3045022100c89172099507ff50f4c925e6c5150e871fb6e83dd73ff9fbb72f6ce829a9633f02203a63821d9162e99f9be712a68f9e589483994feae2661e4546cd5b6cec007be5",
3203                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219701000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d5275b3619953cb0c3b5aa577f04bc512380e60fa551762ce3d7a1bb7401cff9022037237ab0dac3fe100cde094e82e2bed9ba0ed1bb40154b48e56aa70f259e608b01483045022100c89172099507ff50f4c925e6c5150e871fb6e83dd73ff9fbb72f6ce829a9633f02203a63821d9162e99f9be712a68f9e589483994feae2661e4546cd5b6cec007be501008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3204
3205                         test_htlc_output!(2,
3206                                           "304402201b63ec807771baf4fdff523c644080de17f1da478989308ad13a58b51db91d360220568939d38c9ce295adba15665fa68f51d967e8ed14a007b751540a80b325f202",
3207                                           "3045022100def389deab09cee69eaa1ec14d9428770e45bcbe9feb46468ecf481371165c2f022015d2e3c46600b2ebba8dcc899768874cc6851fd1ecb3fffd15db1cc3de7e10da",
3208                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219702000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402201b63ec807771baf4fdff523c644080de17f1da478989308ad13a58b51db91d360220568939d38c9ce295adba15665fa68f51d967e8ed14a007b751540a80b325f20201483045022100def389deab09cee69eaa1ec14d9428770e45bcbe9feb46468ecf481371165c2f022015d2e3c46600b2ebba8dcc899768874cc6851fd1ecb3fffd15db1cc3de7e10da012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
3209
3210                         test_htlc_output!(3,
3211                                           "3045022100daee1808f9861b6c3ecd14f7b707eca02dd6bdfc714ba2f33bc8cdba507bb182022026654bf8863af77d74f51f4e0b62d461a019561bb12acb120d3f7195d148a554",
3212                                           "30440220643aacb19bbb72bd2b635bc3f7375481f5981bace78cdd8319b2988ffcc6704202203d27784ec8ad51ed3bd517a05525a5139bb0b755dd719e0054332d186ac08727",
3213                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219703000000000000000001b80b0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100daee1808f9861b6c3ecd14f7b707eca02dd6bdfc714ba2f33bc8cdba507bb182022026654bf8863af77d74f51f4e0b62d461a019561bb12acb120d3f7195d148a554014730440220643aacb19bbb72bd2b635bc3f7375481f5981bace78cdd8319b2988ffcc6704202203d27784ec8ad51ed3bd517a05525a5139bb0b755dd719e0054332d186ac0872701008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3214
3215                         test_htlc_output!(4,
3216                                           "304402207e0410e45454b0978a623f36a10626ef17b27d9ad44e2760f98cfa3efb37924f0220220bd8acd43ecaa916a80bd4f919c495a2c58982ce7c8625153f8596692a801d",
3217                                           "30440220549e80b4496803cbc4a1d09d46df50109f546d43fbbf86cd90b174b1484acd5402205f12a4f995cb9bded597eabfee195a285986aa6d93ae5bb72507ebc6a4e2349e",
3218                                           "020000000001018154ecccf11a5fb56c39654c4deb4d2296f83c69268280b94d021370c94e219704000000000000000001a00f0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207e0410e45454b0978a623f36a10626ef17b27d9ad44e2760f98cfa3efb37924f0220220bd8acd43ecaa916a80bd4f919c495a2c58982ce7c8625153f8596692a801d014730440220549e80b4496803cbc4a1d09d46df50109f546d43fbbf86cd90b174b1484acd5402205f12a4f995cb9bded597eabfee195a285986aa6d93ae5bb72507ebc6a4e2349e012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3219                 }
3220
3221                 {
3222                         // commitment tx with seven outputs untrimmed (maximum feerate)
3223                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3224                         chan.feerate_per_kw = 647;
3225
3226                         test_commitment!("3045022100a5c01383d3ec646d97e40f44318d49def817fcd61a0ef18008a665b3e151785502203e648efddd5838981ef55ec954be69c4a652d021e6081a100d034de366815e9b",
3227                                          "304502210094bfd8f5572ac0157ec76a9551b6c5216a4538c07cd13a51af4a54cb26fa14320220768efce8ce6f4a5efac875142ff19237c011343670adf9c7ac69704a120d1163",
3228                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e80300000000000022002052bfef0479d7b293c27e0f1eb294bea154c63a3294ef092c19af51409bce0e2ad007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e09c6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040048304502210094bfd8f5572ac0157ec76a9551b6c5216a4538c07cd13a51af4a54cb26fa14320220768efce8ce6f4a5efac875142ff19237c011343670adf9c7ac69704a120d116301483045022100a5c01383d3ec646d97e40f44318d49def817fcd61a0ef18008a665b3e151785502203e648efddd5838981ef55ec954be69c4a652d021e6081a100d034de366815e9b01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3229
3230                         assert_eq!(unsigned_tx.1.len(), 5);
3231
3232                         test_htlc_output!(0,
3233                                           "30440220385a5afe75632f50128cbb029ee95c80156b5b4744beddc729ad339c9ca432c802202ba5f48550cad3379ac75b9b4fedb86a35baa6947f16ba5037fb8b11ab343740",
3234                                           "304402205999590b8a79fa346e003a68fd40366397119b2b0cdf37b149968d6bc6fbcc4702202b1e1fb5ab7864931caed4e732c359e0fe3d86a548b557be2246efb1708d579a",
3235                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb60000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220385a5afe75632f50128cbb029ee95c80156b5b4744beddc729ad339c9ca432c802202ba5f48550cad3379ac75b9b4fedb86a35baa6947f16ba5037fb8b11ab3437400147304402205999590b8a79fa346e003a68fd40366397119b2b0cdf37b149968d6bc6fbcc4702202b1e1fb5ab7864931caed4e732c359e0fe3d86a548b557be2246efb1708d579a012000000000000000000000000000000000000000000000000000000000000000008a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac686800000000");
3236
3237                         test_htlc_output!(1,
3238                                           "304402207ceb6678d4db33d2401fdc409959e57c16a6cb97a30261d9c61f29b8c58d34b90220084b4a17b4ca0e86f2d798b3698ca52de5621f2ce86f80bed79afa66874511b0",
3239                                           "304402207ff03eb0127fc7c6cae49cc29e2a586b98d1e8969cf4a17dfa50b9c2647720b902205e2ecfda2252956c0ca32f175080e75e4e390e433feb1f8ce9f2ba55648a1dac",
3240                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb60100000000000000000124060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207ceb6678d4db33d2401fdc409959e57c16a6cb97a30261d9c61f29b8c58d34b90220084b4a17b4ca0e86f2d798b3698ca52de5621f2ce86f80bed79afa66874511b00147304402207ff03eb0127fc7c6cae49cc29e2a586b98d1e8969cf4a17dfa50b9c2647720b902205e2ecfda2252956c0ca32f175080e75e4e390e433feb1f8ce9f2ba55648a1dac01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3241
3242                         test_htlc_output!(2,
3243                                           "304402206a401b29a0dff0d18ec903502c13d83e7ec019450113f4a7655a4ce40d1f65ba0220217723a084e727b6ca0cc8b6c69c014a7e4a01fcdcba3e3993f462a3c574d833",
3244                                           "3045022100d50d067ca625d54e62df533a8f9291736678d0b86c28a61bb2a80cf42e702d6e02202373dde7e00218eacdafb9415fe0e1071beec1857d1af3c6a201a44cbc47c877",
3245                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb6020000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402206a401b29a0dff0d18ec903502c13d83e7ec019450113f4a7655a4ce40d1f65ba0220217723a084e727b6ca0cc8b6c69c014a7e4a01fcdcba3e3993f462a3c574d83301483045022100d50d067ca625d54e62df533a8f9291736678d0b86c28a61bb2a80cf42e702d6e02202373dde7e00218eacdafb9415fe0e1071beec1857d1af3c6a201a44cbc47c877012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
3246
3247                         test_htlc_output!(3,
3248                                           "30450221009b1c987ba599ee3bde1dbca776b85481d70a78b681a8d84206723e2795c7cac002207aac84ad910f8598c4d1c0ea2e3399cf6627a4e3e90131315bc9f038451ce39d",
3249                                           "3045022100db9dc65291077a52728c622987e9895b7241d4394d6dcb916d7600a3e8728c22022036ee3ee717ba0bb5c45ee84bc7bbf85c0f90f26ae4e4a25a6b4241afa8a3f1cb",
3250                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb6030000000000000000010c0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009b1c987ba599ee3bde1dbca776b85481d70a78b681a8d84206723e2795c7cac002207aac84ad910f8598c4d1c0ea2e3399cf6627a4e3e90131315bc9f038451ce39d01483045022100db9dc65291077a52728c622987e9895b7241d4394d6dcb916d7600a3e8728c22022036ee3ee717ba0bb5c45ee84bc7bbf85c0f90f26ae4e4a25a6b4241afa8a3f1cb01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3251
3252                         test_htlc_output!(4,
3253                                           "3045022100cc28030b59f0914f45b84caa983b6f8effa900c952310708c2b5b00781117022022027ba2ccdf94d03c6d48b327f183f6e28c8a214d089b9227f94ac4f85315274f0",
3254                                           "304402202d1a3c0d31200265d2a2def2753ead4959ae20b4083e19553acfffa5dfab60bf022020ede134149504e15b88ab261a066de49848411e15e70f9e6a5462aec2949f8f",
3255                                           "020000000001018323148ce2419f21ca3d6780053747715832e18ac780931a514b187768882bb604000000000000000001da0d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cc28030b59f0914f45b84caa983b6f8effa900c952310708c2b5b00781117022022027ba2ccdf94d03c6d48b327f183f6e28c8a214d089b9227f94ac4f85315274f00147304402202d1a3c0d31200265d2a2def2753ead4959ae20b4083e19553acfffa5dfab60bf022020ede134149504e15b88ab261a066de49848411e15e70f9e6a5462aec2949f8f012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3256                 }
3257
3258                 {
3259                         // commitment tx with six outputs untrimmed (minimum feerate)
3260                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3261                         chan.feerate_per_kw = 648;
3262
3263                         test_commitment!("3044022072714e2fbb93cdd1c42eb0828b4f2eff143f717d8f26e79d6ada4f0dcb681bbe02200911be4e5161dd6ebe59ff1c58e1997c4aea804f81db6b698821db6093d7b057",
3264                                          "3045022100a2270d5950c89ae0841233f6efea9c951898b301b2e89e0adbd2c687b9f32efa02207943d90f95b9610458e7c65a576e149750ff3accaacad004cd85e70b235e27de",
3265                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431104e9d6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100a2270d5950c89ae0841233f6efea9c951898b301b2e89e0adbd2c687b9f32efa02207943d90f95b9610458e7c65a576e149750ff3accaacad004cd85e70b235e27de01473044022072714e2fbb93cdd1c42eb0828b4f2eff143f717d8f26e79d6ada4f0dcb681bbe02200911be4e5161dd6ebe59ff1c58e1997c4aea804f81db6b698821db6093d7b05701475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3266
3267                         assert_eq!(unsigned_tx.1.len(), 4);
3268
3269                         test_htlc_output!(0,
3270                                           "3044022062ef2e77591409d60d7817d9bb1e71d3c4a2931d1a6c7c8307422c84f001a251022022dad9726b0ae3fe92bda745a06f2c00f92342a186d84518588cf65f4dfaada8",
3271                                           "3045022100a4c574f00411dd2f978ca5cdc1b848c311cd7849c087ad2f21a5bce5e8cc5ae90220090ae39a9bce2fb8bc879d7e9f9022df249f41e25e51f1a9bf6447a9eeffc098",
3272                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd10000000000000000000123060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022062ef2e77591409d60d7817d9bb1e71d3c4a2931d1a6c7c8307422c84f001a251022022dad9726b0ae3fe92bda745a06f2c00f92342a186d84518588cf65f4dfaada801483045022100a4c574f00411dd2f978ca5cdc1b848c311cd7849c087ad2f21a5bce5e8cc5ae90220090ae39a9bce2fb8bc879d7e9f9022df249f41e25e51f1a9bf6447a9eeffc09801008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3273
3274                         test_htlc_output!(1,
3275                                           "3045022100e968cbbb5f402ed389fdc7f6cd2a80ed650bb42c79aeb2a5678444af94f6c78502204b47a1cb24ab5b0b6fe69fe9cfc7dba07b9dd0d8b95f372c1d9435146a88f8d4",
3276                                           "304402207679cf19790bea76a733d2fa0672bd43ab455687a068f815a3d237581f57139a0220683a1a799e102071c206b207735ca80f627ab83d6616b4bcd017c5d79ef3e7d0",
3277                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd10100000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e968cbbb5f402ed389fdc7f6cd2a80ed650bb42c79aeb2a5678444af94f6c78502204b47a1cb24ab5b0b6fe69fe9cfc7dba07b9dd0d8b95f372c1d9435146a88f8d40147304402207679cf19790bea76a733d2fa0672bd43ab455687a068f815a3d237581f57139a0220683a1a799e102071c206b207735ca80f627ab83d6616b4bcd017c5d79ef3e7d0012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
3278
3279                         test_htlc_output!(2,
3280                                           "3045022100aa91932e305292cf9969cc23502bbf6cef83a5df39c95ad04a707c4f4fed5c7702207099fc0f3a9bfe1e7683c0e9aa5e76c5432eb20693bf4cb182f04d383dc9c8c2",
3281                                           "304402200df76fea718745f3c529bac7fd37923e7309ce38b25c0781e4cf514dd9ef8dc802204172295739dbae9fe0474dcee3608e3433b4b2af3a2e6787108b02f894dcdda3",
3282                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd1020000000000000000010b0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100aa91932e305292cf9969cc23502bbf6cef83a5df39c95ad04a707c4f4fed5c7702207099fc0f3a9bfe1e7683c0e9aa5e76c5432eb20693bf4cb182f04d383dc9c8c20147304402200df76fea718745f3c529bac7fd37923e7309ce38b25c0781e4cf514dd9ef8dc802204172295739dbae9fe0474dcee3608e3433b4b2af3a2e6787108b02f894dcdda301008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3283
3284                         test_htlc_output!(3,
3285                                           "3044022035cac88040a5bba420b1c4257235d5015309113460bc33f2853cd81ca36e632402202fc94fd3e81e9d34a9d01782a0284f3044370d03d60f3fc041e2da088d2de58f",
3286                                           "304402200daf2eb7afd355b4caf6fb08387b5f031940ea29d1a9f35071288a839c9039e4022067201b562456e7948616c13acb876b386b511599b58ac1d94d127f91c50463a6",
3287                                           "02000000000101579c183eca9e8236a5d7f5dcd79cfec32c497fdc0ec61533cde99ecd436cadd103000000000000000001d90d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022035cac88040a5bba420b1c4257235d5015309113460bc33f2853cd81ca36e632402202fc94fd3e81e9d34a9d01782a0284f3044370d03d60f3fc041e2da088d2de58f0147304402200daf2eb7afd355b4caf6fb08387b5f031940ea29d1a9f35071288a839c9039e4022067201b562456e7948616c13acb876b386b511599b58ac1d94d127f91c50463a6012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3288                 }
3289
3290                 {
3291                         // commitment tx with six outputs untrimmed (maximum feerate)
3292                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3293                         chan.feerate_per_kw = 2069;
3294
3295                         test_commitment!("3044022001d55e488b8b035b2dd29d50b65b530923a416d47f377284145bc8767b1b6a75022019bb53ddfe1cefaf156f924777eaaf8fdca1810695a7d0a247ad2afba8232eb4",
3296                                          "304402203ca8f31c6a47519f83255dc69f1894d9a6d7476a19f498d31eaf0cd3a85eeb63022026fd92dc752b33905c4c838c528b692a8ad4ced959990b5d5ee2ff940fa90eea",
3297                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5d007000000000000220020748eba944fedc8827f6b06bc44678f93c0f9e6078b35c6331ed31e75f8ce0c2db80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311077956a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203ca8f31c6a47519f83255dc69f1894d9a6d7476a19f498d31eaf0cd3a85eeb63022026fd92dc752b33905c4c838c528b692a8ad4ced959990b5d5ee2ff940fa90eea01473044022001d55e488b8b035b2dd29d50b65b530923a416d47f377284145bc8767b1b6a75022019bb53ddfe1cefaf156f924777eaaf8fdca1810695a7d0a247ad2afba8232eb401475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3298
3299                         assert_eq!(unsigned_tx.1.len(), 4);
3300
3301                         test_htlc_output!(0,
3302                                           "3045022100d1cf354de41c1369336cf85b225ed033f1f8982a01be503668df756a7e668b66022001254144fb4d0eecc61908fccc3388891ba17c5d7a1a8c62bdd307e5a513f992",
3303                                           "3044022056eb1af429660e45a1b0b66568cb8c4a3aa7e4c9c292d5d6c47f86ebf2c8838f022065c3ac4ebe980ca7a41148569be4ad8751b0a724a41405697ec55035dae66402",
3304                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a0000000000000000000175020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d1cf354de41c1369336cf85b225ed033f1f8982a01be503668df756a7e668b66022001254144fb4d0eecc61908fccc3388891ba17c5d7a1a8c62bdd307e5a513f99201473044022056eb1af429660e45a1b0b66568cb8c4a3aa7e4c9c292d5d6c47f86ebf2c8838f022065c3ac4ebe980ca7a41148569be4ad8751b0a724a41405697ec55035dae6640201008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3305
3306                         test_htlc_output!(1,
3307                                           "3045022100d065569dcb94f090345402736385efeb8ea265131804beac06dd84d15dd2d6880220664feb0b4b2eb985fadb6ec7dc58c9334ea88ce599a9be760554a2d4b3b5d9f4",
3308                                           "3045022100914bb232cd4b2690ee3d6cb8c3713c4ac9c4fb925323068d8b07f67c8541f8d9022057152f5f1615b793d2d45aac7518989ae4fe970f28b9b5c77504799d25433f7f",
3309                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a0100000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d065569dcb94f090345402736385efeb8ea265131804beac06dd84d15dd2d6880220664feb0b4b2eb985fadb6ec7dc58c9334ea88ce599a9be760554a2d4b3b5d9f401483045022100914bb232cd4b2690ee3d6cb8c3713c4ac9c4fb925323068d8b07f67c8541f8d9022057152f5f1615b793d2d45aac7518989ae4fe970f28b9b5c77504799d25433f7f012001010101010101010101010101010101010101010101010101010101010101018a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac686800000000");
3310
3311                         test_htlc_output!(2,
3312                                           "3045022100d4e69d363de993684eae7b37853c40722a4c1b4a7b588ad7b5d8a9b5006137a102207a069c628170ee34be5612747051bdcc087466dbaa68d5756ea81c10155aef18",
3313                                           "304402200e362443f7af830b419771e8e1614fc391db3a4eb799989abfc5ab26d6fcd032022039ab0cad1c14dfbe9446bf847965e56fe016e0cbcf719fd18c1bfbf53ecbd9f9",
3314                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a020000000000000000015d060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d4e69d363de993684eae7b37853c40722a4c1b4a7b588ad7b5d8a9b5006137a102207a069c628170ee34be5612747051bdcc087466dbaa68d5756ea81c10155aef180147304402200e362443f7af830b419771e8e1614fc391db3a4eb799989abfc5ab26d6fcd032022039ab0cad1c14dfbe9446bf847965e56fe016e0cbcf719fd18c1bfbf53ecbd9f901008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3315
3316                         test_htlc_output!(3,
3317                                           "30450221008ec888e36e4a4b3dc2ed6b823319855b2ae03006ca6ae0d9aa7e24bfc1d6f07102203b0f78885472a67ff4fe5916c0bb669487d659527509516fc3a08e87a2cc0a7c",
3318                                           "304402202c3e14282b84b02705dfd00a6da396c9fe8a8bcb1d3fdb4b20a4feba09440e8b02202b058b39aa9b0c865b22095edcd9ff1f71bbfe20aa4993755e54d042755ed0d5",
3319                                           "02000000000101ca94a9ad516ebc0c4bdd7b6254871babfa978d5accafb554214137d398bfcf6a03000000000000000001f2090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221008ec888e36e4a4b3dc2ed6b823319855b2ae03006ca6ae0d9aa7e24bfc1d6f07102203b0f78885472a67ff4fe5916c0bb669487d659527509516fc3a08e87a2cc0a7c0147304402202c3e14282b84b02705dfd00a6da396c9fe8a8bcb1d3fdb4b20a4feba09440e8b02202b058b39aa9b0c865b22095edcd9ff1f71bbfe20aa4993755e54d042755ed0d5012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3320                 }
3321
3322                 {
3323                         // commitment tx with five outputs untrimmed (minimum feerate)
3324                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3325                         chan.feerate_per_kw = 2070;
3326
3327                         test_commitment!("3045022100f2377f7a67b7fc7f4e2c0c9e3a7de935c32417f5668eda31ea1db401b7dc53030220415fdbc8e91d0f735e70c21952342742e25249b0d062d43efbfc564499f37526",
3328                                          "30440220443cb07f650aebbba14b8bc8d81e096712590f524c5991ac0ed3bbc8fd3bd0c7022028a635f548e3ca64b19b69b1ea00f05b22752f91daf0b6dab78e62ba52eb7fd0",
3329                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110da966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004730440220443cb07f650aebbba14b8bc8d81e096712590f524c5991ac0ed3bbc8fd3bd0c7022028a635f548e3ca64b19b69b1ea00f05b22752f91daf0b6dab78e62ba52eb7fd001483045022100f2377f7a67b7fc7f4e2c0c9e3a7de935c32417f5668eda31ea1db401b7dc53030220415fdbc8e91d0f735e70c21952342742e25249b0d062d43efbfc564499f3752601475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3330
3331                         assert_eq!(unsigned_tx.1.len(), 3);
3332
3333                         test_htlc_output!(0,
3334                                           "3045022100eed143b1ee4bed5dc3cde40afa5db3e7354cbf9c44054b5f713f729356f08cf7022077161d171c2bbd9badf3c9934de65a4918de03bbac1450f715275f75b103f891",
3335                                           "3045022100a0d043ed533e7fb1911e0553d31a8e2f3e6de19dbc035257f29d747c5e02f1f5022030cd38d8e84282175d49c1ebe0470db3ebd59768cf40780a784e248a43904fb8",
3336                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a2180000000000000000000174020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100eed143b1ee4bed5dc3cde40afa5db3e7354cbf9c44054b5f713f729356f08cf7022077161d171c2bbd9badf3c9934de65a4918de03bbac1450f715275f75b103f89101483045022100a0d043ed533e7fb1911e0553d31a8e2f3e6de19dbc035257f29d747c5e02f1f5022030cd38d8e84282175d49c1ebe0470db3ebd59768cf40780a784e248a43904fb801008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3337
3338                         test_htlc_output!(1,
3339                                           "3044022071e9357619fd8d29a411dc053b326a5224c5d11268070e88ecb981b174747c7a02202b763ae29a9d0732fa8836dd8597439460b50472183f420021b768981b4f7cf6",
3340                                           "3045022100adb1d679f65f96178b59f23ed37d3b70443118f345224a07ecb043eee2acc157022034d24524fe857144a3bcfff3065a9994d0a6ec5f11c681e49431d573e242612d",
3341                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a218010000000000000000015c060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022071e9357619fd8d29a411dc053b326a5224c5d11268070e88ecb981b174747c7a02202b763ae29a9d0732fa8836dd8597439460b50472183f420021b768981b4f7cf601483045022100adb1d679f65f96178b59f23ed37d3b70443118f345224a07ecb043eee2acc157022034d24524fe857144a3bcfff3065a9994d0a6ec5f11c681e49431d573e242612d01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3342
3343                         test_htlc_output!(2,
3344                                           "3045022100c9458a4d2cbb741705577deb0a890e5cb90ee141be0400d3162e533727c9cb2102206edcf765c5dc5e5f9b976ea8149bf8607b5a0efb30691138e1231302b640d2a4",
3345                                           "304402200831422aa4e1ee6d55e0b894201770a8f8817a189356f2d70be76633ffa6a6f602200dd1b84a4855dc6727dd46c98daae43dfc70889d1ba7ef0087529a57c06e5e04",
3346                                           "0200000000010140a83ce364747ff277f4d7595d8d15f708418798922c40bc2b056aca5485a21802000000000000000001f1090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100c9458a4d2cbb741705577deb0a890e5cb90ee141be0400d3162e533727c9cb2102206edcf765c5dc5e5f9b976ea8149bf8607b5a0efb30691138e1231302b640d2a40147304402200831422aa4e1ee6d55e0b894201770a8f8817a189356f2d70be76633ffa6a6f602200dd1b84a4855dc6727dd46c98daae43dfc70889d1ba7ef0087529a57c06e5e04012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3347                 }
3348
3349                 {
3350                         // commitment tx with five outputs untrimmed (maximum feerate)
3351                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3352                         chan.feerate_per_kw = 2194;
3353
3354                         test_commitment!("3045022100d33c4e541aa1d255d41ea9a3b443b3b822ad8f7f86862638aac1f69f8f760577022007e2a18e6931ce3d3a804b1c78eda1de17dbe1fb7a95488c9a4ec86203953348",
3355                                          "304402203b1b010c109c2ecbe7feb2d259b9c4126bd5dc99ee693c422ec0a5781fe161ba0220571fe4e2c649dea9c7aaf7e49b382962f6a3494963c97d80fef9a430ca3f7061",
3356                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020403d394747cae42e98ff01734ad5c08f82ba123d3d9a620abda88989651e2ab5b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311040966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203b1b010c109c2ecbe7feb2d259b9c4126bd5dc99ee693c422ec0a5781fe161ba0220571fe4e2c649dea9c7aaf7e49b382962f6a3494963c97d80fef9a430ca3f706101483045022100d33c4e541aa1d255d41ea9a3b443b3b822ad8f7f86862638aac1f69f8f760577022007e2a18e6931ce3d3a804b1c78eda1de17dbe1fb7a95488c9a4ec8620395334801475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3357
3358                         assert_eq!(unsigned_tx.1.len(), 3);
3359
3360                         test_htlc_output!(0,
3361                                           "30450221009ed2f0a67f99e29c3c8cf45c08207b765980697781bb727fe0b1416de0e7622902206052684229bc171419ed290f4b615c943f819c0262414e43c5b91dcf72ddcf44",
3362                                           "3044022004ad5f04ae69c71b3b141d4db9d0d4c38d84009fb3cfeeae6efdad414487a9a0022042d3fe1388c1ff517d1da7fb4025663d372c14728ed52dc88608363450ff6a2f",
3363                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a0000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009ed2f0a67f99e29c3c8cf45c08207b765980697781bb727fe0b1416de0e7622902206052684229bc171419ed290f4b615c943f819c0262414e43c5b91dcf72ddcf4401473044022004ad5f04ae69c71b3b141d4db9d0d4c38d84009fb3cfeeae6efdad414487a9a0022042d3fe1388c1ff517d1da7fb4025663d372c14728ed52dc88608363450ff6a2f01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac6868f6010000");
3364
3365                         test_htlc_output!(1,
3366                                           "30440220155d3b90c67c33a8321996a9be5b82431b0c126613be751d400669da9d5c696702204318448bcd48824439d2c6a70be6e5747446be47ff45977cf41672bdc9b6b12d",
3367                                           "304402201707050c870c1f77cc3ed58d6d71bf281de239e9eabd8ef0955bad0d7fe38dcc02204d36d80d0019b3a71e646a08fa4a5607761d341ae8be371946ebe437c289c915",
3368                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a010000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220155d3b90c67c33a8321996a9be5b82431b0c126613be751d400669da9d5c696702204318448bcd48824439d2c6a70be6e5747446be47ff45977cf41672bdc9b6b12d0147304402201707050c870c1f77cc3ed58d6d71bf281de239e9eabd8ef0955bad0d7fe38dcc02204d36d80d0019b3a71e646a08fa4a5607761d341ae8be371946ebe437c289c91501008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3369
3370                         test_htlc_output!(2,
3371                                           "3045022100a12a9a473ece548584aabdd051779025a5ed4077c4b7aa376ec7a0b1645e5a48022039490b333f53b5b3e2ddde1d809e492cba2b3e5fc3a436cd3ffb4cd3d500fa5a",
3372                                           "3045022100ff200bc934ab26ce9a559e998ceb0aee53bc40368e114ab9d3054d9960546e2802202496856ca163ac12c143110b6b3ac9d598df7254f2e17b3b94c3ab5301f4c3b0",
3373                                           "02000000000101fb824d4e4dafc0f567789dee3a6bce8d411fe80f5563d8cdfdcc7d7e4447d43a020000000000000000019a090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a12a9a473ece548584aabdd051779025a5ed4077c4b7aa376ec7a0b1645e5a48022039490b333f53b5b3e2ddde1d809e492cba2b3e5fc3a436cd3ffb4cd3d500fa5a01483045022100ff200bc934ab26ce9a559e998ceb0aee53bc40368e114ab9d3054d9960546e2802202496856ca163ac12c143110b6b3ac9d598df7254f2e17b3b94c3ab5301f4c3b0012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3374                 }
3375
3376                 {
3377                         // commitment tx with four outputs untrimmed (minimum feerate)
3378                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3379                         chan.feerate_per_kw = 2195;
3380
3381                         test_commitment!("304402205e2f76d4657fb732c0dfc820a18a7301e368f5799e06b7828007633741bda6df0220458009ae59d0c6246065c419359e05eb2a4b4ef4a1b310cc912db44eb7924298",
3382                                          "304402203b12d44254244b8ff3bb4129b0920fd45120ab42f553d9976394b099d500c99e02205e95bb7a3164852ef0c48f9e0eaf145218f8e2c41251b231f03cbdc4f29a5429",
3383                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110b8976a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402203b12d44254244b8ff3bb4129b0920fd45120ab42f553d9976394b099d500c99e02205e95bb7a3164852ef0c48f9e0eaf145218f8e2c41251b231f03cbdc4f29a54290147304402205e2f76d4657fb732c0dfc820a18a7301e368f5799e06b7828007633741bda6df0220458009ae59d0c6246065c419359e05eb2a4b4ef4a1b310cc912db44eb792429801475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3384
3385                         assert_eq!(unsigned_tx.1.len(), 2);
3386
3387                         test_htlc_output!(0,
3388                                           "3045022100a8a78fa1016a5c5c3704f2e8908715a3cef66723fb95f3132ec4d2d05cd84fb4022025ac49287b0861ec21932405f5600cbce94313dbde0e6c5d5af1b3366d8afbfc",
3389                                           "3045022100be6ae1977fd7b630a53623f3f25c542317ccfc2b971782802a4f1ef538eb22b402207edc4d0408f8f38fd3c7365d1cfc26511b7cd2d4fecd8b005fba3cd5bc704390",
3390                                           "020000000001014e16c488fa158431c1a82e8f661240ec0a71ba0ce92f2721a6538c510226ad5c0000000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a8a78fa1016a5c5c3704f2e8908715a3cef66723fb95f3132ec4d2d05cd84fb4022025ac49287b0861ec21932405f5600cbce94313dbde0e6c5d5af1b3366d8afbfc01483045022100be6ae1977fd7b630a53623f3f25c542317ccfc2b971782802a4f1ef538eb22b402207edc4d0408f8f38fd3c7365d1cfc26511b7cd2d4fecd8b005fba3cd5bc70439001008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3391
3392                         test_htlc_output!(1,
3393                                           "3045022100e769cb156aa2f7515d126cef7a69968629620ce82afcaa9e210969de6850df4602200b16b3f3486a229a48aadde520dbee31ae340dbadaffae74fbb56681fef27b92",
3394                                           "30440220665b9cb4a978c09d1ca8977a534999bc8a49da624d0c5439451dd69cde1a003d022070eae0620f01f3c1bd029cc1488da13fb40fdab76f396ccd335479a11c5276d8",
3395                                           "020000000001014e16c488fa158431c1a82e8f661240ec0a71ba0ce92f2721a6538c510226ad5c0100000000000000000199090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e769cb156aa2f7515d126cef7a69968629620ce82afcaa9e210969de6850df4602200b16b3f3486a229a48aadde520dbee31ae340dbadaffae74fbb56681fef27b92014730440220665b9cb4a978c09d1ca8977a534999bc8a49da624d0c5439451dd69cde1a003d022070eae0620f01f3c1bd029cc1488da13fb40fdab76f396ccd335479a11c5276d8012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3396                 }
3397
3398                 {
3399                         // commitment tx with four outputs untrimmed (maximum feerate)
3400                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3401                         chan.feerate_per_kw = 3702;
3402
3403                         test_commitment!("3045022100c1a3b0b60ca092ed5080121f26a74a20cec6bdee3f8e47bae973fcdceb3eda5502207d467a9873c939bf3aa758014ae67295fedbca52412633f7e5b2670fc7c381c1",
3404                                          "304402200e930a43c7951162dc15a2b7344f48091c74c70f7024e7116e900d8bcfba861c022066fa6cbda3929e21daa2e7e16a4b948db7e8919ef978402360d1095ffdaff7b0",
3405                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020c20b5d1f8584fd90443e7b7b720136174fa4b9333c261d04dbbd012635c0f419a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431106f916a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402200e930a43c7951162dc15a2b7344f48091c74c70f7024e7116e900d8bcfba861c022066fa6cbda3929e21daa2e7e16a4b948db7e8919ef978402360d1095ffdaff7b001483045022100c1a3b0b60ca092ed5080121f26a74a20cec6bdee3f8e47bae973fcdceb3eda5502207d467a9873c939bf3aa758014ae67295fedbca52412633f7e5b2670fc7c381c101475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3406
3407                         assert_eq!(unsigned_tx.1.len(), 2);
3408
3409                         test_htlc_output!(0,
3410                                           "3045022100dfb73b4fe961b31a859b2bb1f4f15cabab9265016dd0272323dc6a9e85885c54022059a7b87c02861ee70662907f25ce11597d7b68d3399443a831ae40e777b76bdb",
3411                                           "304402202765b9c9ece4f127fa5407faf66da4c5ce2719cdbe47cd3175fc7d48b482e43d02205605125925e07bad1e41c618a4b434d72c88a164981c4b8af5eaf4ee9142ec3a",
3412                                           "02000000000101b8de11eb51c22498fe39722c7227b6e55ff1a94146cf638458cb9bc6a060d3a30000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100dfb73b4fe961b31a859b2bb1f4f15cabab9265016dd0272323dc6a9e85885c54022059a7b87c02861ee70662907f25ce11597d7b68d3399443a831ae40e777b76bdb0147304402202765b9c9ece4f127fa5407faf66da4c5ce2719cdbe47cd3175fc7d48b482e43d02205605125925e07bad1e41c618a4b434d72c88a164981c4b8af5eaf4ee9142ec3a01008576a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac6868f7010000");
3413
3414                         test_htlc_output!(1,
3415                                           "3045022100ea9dc2a7c3c3640334dab733bb4e036e32a3106dc707b24227874fa4f7da746802204d672f7ac0fe765931a8df10b81e53a3242dd32bd9dc9331eb4a596da87954e9",
3416                                           "30440220048a41c660c4841693de037d00a407810389f4574b3286afb7bc392a438fa3f802200401d71fa87c64fe621b49ac07e3bf85157ac680acb977124da28652cc7f1a5c",
3417                                           "02000000000101b8de11eb51c22498fe39722c7227b6e55ff1a94146cf638458cb9bc6a060d3a30100000000000000000176050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100ea9dc2a7c3c3640334dab733bb4e036e32a3106dc707b24227874fa4f7da746802204d672f7ac0fe765931a8df10b81e53a3242dd32bd9dc9331eb4a596da87954e9014730440220048a41c660c4841693de037d00a407810389f4574b3286afb7bc392a438fa3f802200401d71fa87c64fe621b49ac07e3bf85157ac680acb977124da28652cc7f1a5c012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3418                 }
3419
3420                 {
3421                         // commitment tx with three outputs untrimmed (minimum feerate)
3422                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3423                         chan.feerate_per_kw = 3703;
3424
3425                         test_commitment!("30450221008b7c191dd46893b67b628e618d2dc8e81169d38bade310181ab77d7c94c6675e02203b4dd131fd7c9deb299560983dcdc485545c98f989f7ae8180c28289f9e6bdb0",
3426                                          "3044022047305531dd44391dce03ae20f8735005c615eb077a974edb0059ea1a311857d602202e0ed6972fbdd1e8cb542b06e0929bc41b2ddf236e04cb75edd56151f4197506",
3427                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110eb936a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022047305531dd44391dce03ae20f8735005c615eb077a974edb0059ea1a311857d602202e0ed6972fbdd1e8cb542b06e0929bc41b2ddf236e04cb75edd56151f4197506014830450221008b7c191dd46893b67b628e618d2dc8e81169d38bade310181ab77d7c94c6675e02203b4dd131fd7c9deb299560983dcdc485545c98f989f7ae8180c28289f9e6bdb001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3428
3429                         assert_eq!(unsigned_tx.1.len(), 1);
3430
3431                         test_htlc_output!(0,
3432                                           "3044022044f65cf833afdcb9d18795ca93f7230005777662539815b8a601eeb3e57129a902206a4bf3e53392affbba52640627defa8dc8af61c958c9e827b2798ab45828abdd",
3433                                           "3045022100b94d931a811b32eeb885c28ddcf999ae1981893b21dd1329929543fe87ce793002206370107fdd151c5f2384f9ceb71b3107c69c74c8ed5a28a94a4ab2d27d3b0724",
3434                                           "020000000001011c076aa7fb3d7460d10df69432c904227ea84bbf3134d4ceee5fb0f135ef206d0000000000000000000175050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022044f65cf833afdcb9d18795ca93f7230005777662539815b8a601eeb3e57129a902206a4bf3e53392affbba52640627defa8dc8af61c958c9e827b2798ab45828abdd01483045022100b94d931a811b32eeb885c28ddcf999ae1981893b21dd1329929543fe87ce793002206370107fdd151c5f2384f9ceb71b3107c69c74c8ed5a28a94a4ab2d27d3b0724012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3435                 }
3436
3437                 {
3438                         // commitment tx with three outputs untrimmed (maximum feerate)
3439                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3440                         chan.feerate_per_kw = 4914;
3441
3442                         test_commitment!("304402206d6cb93969d39177a09d5d45b583f34966195b77c7e585cf47ac5cce0c90cefb022031d71ae4e33a4e80df7f981d696fbdee517337806a3c7138b7491e2cbb077a0e",
3443                                          "304402206a2679efa3c7aaffd2a447fd0df7aba8792858b589750f6a1203f9259173198a022008d52a0e77a99ab533c36206cb15ad7aeb2aa72b93d4b571e728cb5ec2f6fe26",
3444                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f0000000000002200208c48d15160397c9731df9bc3b236656efb6665fbfe92b4a6878e88a499f741c4c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110ae8f6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402206a2679efa3c7aaffd2a447fd0df7aba8792858b589750f6a1203f9259173198a022008d52a0e77a99ab533c36206cb15ad7aeb2aa72b93d4b571e728cb5ec2f6fe260147304402206d6cb93969d39177a09d5d45b583f34966195b77c7e585cf47ac5cce0c90cefb022031d71ae4e33a4e80df7f981d696fbdee517337806a3c7138b7491e2cbb077a0e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3445
3446                         assert_eq!(unsigned_tx.1.len(), 1);
3447
3448                         test_htlc_output!(0,
3449                                           "3045022100fcb38506bfa11c02874092a843d0cc0a8613c23b639832564a5f69020cb0f6ba02206508b9e91eaa001425c190c68ee5f887e1ad5b1b314002e74db9dbd9e42dbecf",
3450                                           "304502210086e76b460ddd3cea10525fba298405d3fe11383e56966a5091811368362f689a02200f72ee75657915e0ede89c28709acd113ede9e1b7be520e3bc5cda425ecd6e68",
3451                                           "0200000000010110a3fdcbcd5db477cd3ad465e7f501ffa8c437e8301f00a6061138590add757f0000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100fcb38506bfa11c02874092a843d0cc0a8613c23b639832564a5f69020cb0f6ba02206508b9e91eaa001425c190c68ee5f887e1ad5b1b314002e74db9dbd9e42dbecf0148304502210086e76b460ddd3cea10525fba298405d3fe11383e56966a5091811368362f689a02200f72ee75657915e0ede89c28709acd113ede9e1b7be520e3bc5cda425ecd6e68012004040404040404040404040404040404040404040404040404040404040404048a76a91414011f7254d96b819c76986c277d115efce6f7b58763ac67210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac686800000000");
3452                 }
3453
3454                 {
3455                         // commitment tx with two outputs untrimmed (minimum feerate)
3456                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3457                         chan.feerate_per_kw = 4915;
3458
3459                         test_commitment!("304402200769ba89c7330dfa4feba447b6e322305f12ac7dac70ec6ba997ed7c1b598d0802204fe8d337e7fee781f9b7b1a06e580b22f4f79d740059560191d7db53f8765552",
3460                                          "3045022100a012691ba6cea2f73fa8bac37750477e66363c6d28813b0bb6da77c8eb3fb0270220365e99c51304b0b1a6ab9ea1c8500db186693e39ec1ad5743ee231b0138384b9",
3461                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110fa926a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100a012691ba6cea2f73fa8bac37750477e66363c6d28813b0bb6da77c8eb3fb0270220365e99c51304b0b1a6ab9ea1c8500db186693e39ec1ad5743ee231b0138384b90147304402200769ba89c7330dfa4feba447b6e322305f12ac7dac70ec6ba997ed7c1b598d0802204fe8d337e7fee781f9b7b1a06e580b22f4f79d740059560191d7db53f876555201475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3462
3463                         assert_eq!(unsigned_tx.1.len(), 0);
3464                 }
3465
3466                 {
3467                         // commitment tx with two outputs untrimmed (maximum feerate)
3468                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3469                         chan.feerate_per_kw = 9651180;
3470
3471                         test_commitment!("3044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd",
3472                                          "30440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b9",
3473                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b800222020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80ec0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311004004730440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b901473044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3474
3475                         assert_eq!(unsigned_tx.1.len(), 0);
3476                 }
3477
3478                 {
3479                         // commitment tx with one output untrimmed (minimum feerate)
3480                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3481                         chan.feerate_per_kw = 9651181;
3482
3483                         test_commitment!("3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e",
3484                                          "3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1",
3485                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3486
3487                         assert_eq!(unsigned_tx.1.len(), 0);
3488                 }
3489
3490                 {
3491                         // commitment tx with fee greater than funder amount
3492                         chan.value_to_self_msat = 6993000000; // 7000000000 - 7000000
3493                         chan.feerate_per_kw = 9651936;
3494
3495                         test_commitment!("3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e",
3496                                          "3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1",
3497                                          "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220");
3498
3499                         assert_eq!(unsigned_tx.1.len(), 0);
3500                 }
3501         }
3502
3503         #[test]
3504         fn test_per_commitment_secret_gen() {
3505                 // Test vectors from BOLT 3 Appendix D:
3506
3507                 let mut seed = [0; 32];
3508                 seed[0..32].clone_from_slice(&hex::decode("0000000000000000000000000000000000000000000000000000000000000000").unwrap());
3509                 assert_eq!(chan_utils::build_commitment_secret(seed, 281474976710655),
3510                            hex::decode("02a40c85b6f28da08dfdbe0926c53fab2de6d28c10301f8f7c4073d5e42e3148").unwrap()[..]);
3511
3512                 seed[0..32].clone_from_slice(&hex::decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF").unwrap());
3513                 assert_eq!(chan_utils::build_commitment_secret(seed, 281474976710655),
3514                            hex::decode("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap()[..]);
3515
3516                 assert_eq!(chan_utils::build_commitment_secret(seed, 0xaaaaaaaaaaa),
3517                            hex::decode("56f4008fb007ca9acf0e15b054d5c9fd12ee06cea347914ddbaed70d1c13a528").unwrap()[..]);
3518
3519                 assert_eq!(chan_utils::build_commitment_secret(seed, 0x555555555555),
3520                            hex::decode("9015daaeb06dba4ccc05b91b2f73bd54405f2be9f217fbacd3c5ac2e62327d31").unwrap()[..]);
3521
3522                 seed[0..32].clone_from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap());
3523                 assert_eq!(chan_utils::build_commitment_secret(seed, 1),
3524                            hex::decode("915c75942a26bb3a433a8ce2cb0427c29ec6c1775cfc78328b57f6ba7bfeaa9c").unwrap()[..]);
3525         }
3526
3527         #[test]
3528         fn test_key_derivation() {
3529                 // Test vectors from BOLT 3 Appendix E:
3530                 let secp_ctx = Secp256k1::new();
3531
3532                 let base_secret = SecretKey::from_slice(&secp_ctx, &hex::decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f").unwrap()[..]).unwrap();
3533                 let per_commitment_secret = SecretKey::from_slice(&secp_ctx, &hex::decode("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
3534
3535                 let base_point = PublicKey::from_secret_key(&secp_ctx, &base_secret);
3536                 assert_eq!(base_point.serialize()[..], hex::decode("036d6caac248af96f6afa7f904f550253a0f3ef3f5aa2fe6838a95b216691468e2").unwrap()[..]);
3537
3538                 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
3539                 assert_eq!(per_commitment_point.serialize()[..], hex::decode("025f7117a78150fe2ef97db7cfc83bd57b2e2c0d0dd25eaf467a4a1c2a45ce1486").unwrap()[..]);
3540
3541                 assert_eq!(chan_utils::derive_public_key(&secp_ctx, &per_commitment_point, &base_point).unwrap().serialize()[..],
3542                                 hex::decode("0235f2dbfaa89b57ec7b055afe29849ef7ddfeb1cefdb9ebdc43f5494984db29e5").unwrap()[..]);
3543
3544                 assert_eq!(chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &base_secret).unwrap(),
3545                                 SecretKey::from_slice(&secp_ctx, &hex::decode("cbced912d3b21bf196a766651e436aff192362621ce317704ea2f75d87e7be0f").unwrap()[..]).unwrap());
3546
3547                 assert_eq!(chan_utils::derive_public_revocation_key(&secp_ctx, &per_commitment_point, &base_point).unwrap().serialize()[..],
3548                                 hex::decode("02916e326636d19c33f13e8c0c3a03dd157f332f3e99c317c141dd865eb01f8ff0").unwrap()[..]);
3549
3550                 assert_eq!(chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_secret, &base_secret).unwrap(),
3551                                 SecretKey::from_slice(&secp_ctx, &hex::decode("d09ffff62ddb2297ab000cc85bcb4283fdeb6aa052affbc9dddcf33b61078110").unwrap()[..]).unwrap());
3552         }
3553 }