git.bitcoin.ninja Git - rust-lightning/blob - src/ln/channel.rs

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