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

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