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