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

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