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