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