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