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