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