_ Git - rust-lightning/blob - src/ln/channel.rs

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