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