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

   1 //! The logic to build claims and bump in-flight transactions until confirmations.
   2 //!
   3 //! OnchainTxHandler objetcs are fully-part of ChannelMonitor and encapsulates all
   4 //! building, tracking, bumping and notifications functions.
   5
   6 use bitcoin::blockdata::transaction::{Transaction, TxIn, TxOut, SigHashType};
   7 use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
   8 use bitcoin::blockdata::script::Script;
   9 use bitcoin::util::bip143;
  10
  11 use bitcoin_hashes::sha256d::Hash as Sha256dHash;
  12
  13 use secp256k1::Secp256k1;
  14 use secp256k1;
  15
  16 use ln::msgs::DecodeError;
  17 use ln::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER, InputMaterial, ClaimRequest};
  18 use ln::chan_utils::HTLCType;
  19 use chain::chaininterface::{FeeEstimator, BroadcasterInterface, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
  20 use chain::keysinterface::ChannelKeys;
  21 use util::logger::Logger;
  22 use util::ser::{ReadableArgs, Readable, Writer, Writeable};
  23 use util::byte_utils;
  24
  25 use std::collections::{HashMap, hash_map, HashSet};
  26 use std::sync::Arc;
  27 use std::cmp;
  28 use std::ops::Deref;
  29
  30 const MAX_ALLOC_SIZE: usize = 64*1024;
  31
  32 /// Upon discovering of some classes of onchain tx by ChannelMonitor, we may have to take actions on it
  33 /// once they mature to enough confirmations (ANTI_REORG_DELAY)
  34 #[derive(Clone, PartialEq)]
  35 enum OnchainEvent {
  36         /// Outpoint under claim process by our own tx, once this one get enough confirmations, we remove it from
  37         /// bump-txn candidate buffer.
  38         Claim {
  39                 claim_request: Sha256dHash,
  40         },
  41         /// Claim tx aggregate multiple claimable outpoints. One of the outpoint may be claimed by a remote party tx.
  42         /// In this case, we need to drop the outpoint and regenerate a new claim tx. By safety, we keep tracking
  43         /// the outpoint to be sure to resurect it back to the claim tx if reorgs happen.
  44         ContentiousOutpoint {
  45                 outpoint: BitcoinOutPoint,
  46                 input_material: InputMaterial,
  47         }
  48 }
  49
  50 /// Higher-level cache structure needed to re-generate bumped claim txn if needed
  51 #[derive(Clone, PartialEq)]
  52 pub struct ClaimTxBumpMaterial {
  53         // At every block tick, used to check if pending claiming tx is taking too
  54         // much time for confirmation and we need to bump it.
  55         height_timer: u32,
  56         // Tracked in case of reorg to wipe out now-superflous bump material
  57         feerate_previous: u64,
  58         // Soonest timelocks among set of outpoints claimed, used to compute
  59         // a priority of not feerate
  60         soonest_timelock: u32,
  61         // Cache of script, pubkey, sig or key to solve claimable outputs scriptpubkey.
  62         per_input_material: HashMap<BitcoinOutPoint, InputMaterial>,
  63 }
  64
  65 impl Writeable for ClaimTxBumpMaterial  {
  66         fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
  67                 writer.write_all(&byte_utils::be32_to_array(self.height_timer))?;
  68                 writer.write_all(&byte_utils::be64_to_array(self.feerate_previous))?;
  69                 writer.write_all(&byte_utils::be32_to_array(self.soonest_timelock))?;
  70                 writer.write_all(&byte_utils::be64_to_array(self.per_input_material.len() as u64))?;
  71                 for (outp, tx_material) in self.per_input_material.iter() {
  72                         outp.write(writer)?;
  73                         tx_material.write(writer)?;
  74                 }
  75                 Ok(())
  76         }
  77 }
  78
  79 impl Readable for ClaimTxBumpMaterial {
  80         fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
  81                 let height_timer = Readable::read(reader)?;
  82                 let feerate_previous = Readable::read(reader)?;
  83                 let soonest_timelock = Readable::read(reader)?;
  84                 let per_input_material_len: u64 = Readable::read(reader)?;
  85                 let mut per_input_material = HashMap::with_capacity(cmp::min(per_input_material_len as usize, MAX_ALLOC_SIZE / 128));
  86                 for _ in 0 ..per_input_material_len {
  87                         let outpoint = Readable::read(reader)?;
  88                         let input_material = Readable::read(reader)?;
  89                         per_input_material.insert(outpoint, input_material);
  90                 }
  91                 Ok(Self { height_timer, feerate_previous, soonest_timelock, per_input_material })
  92         }
  93 }
  94
  95 #[derive(PartialEq)]
  96 pub(super) enum InputDescriptors {
  97         RevokedOfferedHTLC,
  98         RevokedReceivedHTLC,
  99         OfferedHTLC,
 100         ReceivedHTLC,
 101         RevokedOutput, // either a revoked to_local output on commitment tx, a revoked HTLC-Timeout output or a revoked HTLC-Success output
 102 }
 103
 104 macro_rules! subtract_high_prio_fee {
 105         ($self: ident, $fee_estimator: expr, $value: expr, $predicted_weight: expr, $used_feerate: expr) => {
 106                 {
 107                         $used_feerate = $fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority);
 108                         let mut fee = $used_feerate * ($predicted_weight as u64) / 1000;
 109                         if $value <= fee {
 110                                 $used_feerate = $fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
 111                                 fee = $used_feerate * ($predicted_weight as u64) / 1000;
 112                                 if $value <= fee {
 113                                         $used_feerate = $fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
 114                                         fee = $used_feerate * ($predicted_weight as u64) / 1000;
 115                                         if $value <= fee {
 116                                                 log_error!($self, "Failed to generate an on-chain punishment tx as even low priority fee ({} sat) was more than the entire claim balance ({} sat)",
 117                                                         fee, $value);
 118                                                 false
 119                                         } else {
 120                                                 log_warn!($self, "Used low priority fee for on-chain punishment tx as high priority fee was more than the entire claim balance ({} sat)",
 121                                                         $value);
 122                                                 $value -= fee;
 123                                                 true
 124                                         }
 125                                 } else {
 126                                         log_warn!($self, "Used medium priority fee for on-chain punishment tx as high priority fee was more than the entire claim balance ({} sat)",
 127                                                 $value);
 128                                         $value -= fee;
 129                                         true
 130                                 }
 131                         } else {
 132                                 $value -= fee;
 133                                 true
 134                         }
 135                 }
 136         }
 137 }
 138
 139
 140 /// OnchainTxHandler receives claiming requests, aggregates them if it's sound, broadcast and
 141 /// do RBF bumping if possible.
 142 pub struct OnchainTxHandler<ChanSigner: ChannelKeys> {
 143         destination_script: Script,
 144
 145         key_storage: ChanSigner,
 146
 147         // Used to track claiming requests. If claim tx doesn't confirm before height timer expiration we need to bump
 148         // it (RBF or CPFP). If an input has been part of an aggregate tx at first claim try, we need to keep it within
 149         // another bumped aggregate tx to comply with RBF rules. We may have multiple claiming txn in the flight for the
 150         // same set of outpoints. One of the outpoints may be spent by a transaction not issued by us. That's why at
 151         // block connection we scan all inputs and if any of them is among a set of a claiming request we test for set
 152         // equality between spending transaction and claim request. If true, it means transaction was one our claiming one
 153         // after a security delay of 6 blocks we remove pending claim request. If false, it means transaction wasn't and
 154         // we need to regenerate new claim request with reduced set of still-claimable outpoints.
 155         // Key is identifier of the pending claim request, i.e the txid of the initial claiming transaction generated by
 156         // us and is immutable until all outpoint of the claimable set are post-anti-reorg-delay solved.
 157         // Entry is cache of elements need to generate a bumped claiming transaction (see ClaimTxBumpMaterial)
 158         #[cfg(test)] // Used in functional_test to verify sanitization
 159         pub pending_claim_requests: HashMap<Sha256dHash, ClaimTxBumpMaterial>,
 160         #[cfg(not(test))]
 161         pending_claim_requests: HashMap<Sha256dHash, ClaimTxBumpMaterial>,
 162
 163         // Used to link outpoints claimed in a connected block to a pending claim request.
 164         // Key is outpoint than monitor parsing has detected we have keys/scripts to claim
 165         // Value is (pending claim request identifier, confirmation_block), identifier
 166         // is txid of the initial claiming transaction and is immutable until outpoint is
 167         // post-anti-reorg-delay solved, confirmaiton_block is used to erase entry if
 168         // block with output gets disconnected.
 169         #[cfg(test)] // Used in functional_test to verify sanitization
 170         pub claimable_outpoints: HashMap<BitcoinOutPoint, (Sha256dHash, u32)>,
 171         #[cfg(not(test))]
 172         claimable_outpoints: HashMap<BitcoinOutPoint, (Sha256dHash, u32)>,
 173
 174         onchain_events_waiting_threshold_conf: HashMap<u32, Vec<OnchainEvent>>,
 175
 176         secp_ctx: Secp256k1<secp256k1::All>,
 177         logger: Arc<Logger>
 178 }
 179
 180 impl<ChanSigner: ChannelKeys + Writeable> OnchainTxHandler<ChanSigner> {
 181         pub(crate) fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
 182                 self.destination_script.write(writer)?;
 183
 184                 self.key_storage.write(writer)?;
 185
 186                 writer.write_all(&byte_utils::be64_to_array(self.pending_claim_requests.len() as u64))?;
 187                 for (ref ancestor_claim_txid, claim_tx_data) in self.pending_claim_requests.iter() {
 188                         ancestor_claim_txid.write(writer)?;
 189                         claim_tx_data.write(writer)?;
 190                 }
 191
 192                 writer.write_all(&byte_utils::be64_to_array(self.claimable_outpoints.len() as u64))?;
 193                 for (ref outp, ref claim_and_height) in self.claimable_outpoints.iter() {
 194                         outp.write(writer)?;
 195                         claim_and_height.0.write(writer)?;
 196                         claim_and_height.1.write(writer)?;
 197                 }
 198
 199                 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_waiting_threshold_conf.len() as u64))?;
 200                 for (ref target, ref events) in self.onchain_events_waiting_threshold_conf.iter() {
 201                         writer.write_all(&byte_utils::be32_to_array(**target))?;
 202                         writer.write_all(&byte_utils::be64_to_array(events.len() as u64))?;
 203                         for ev in events.iter() {
 204                                 match *ev {
 205                                         OnchainEvent::Claim { ref claim_request } => {
 206                                                 writer.write_all(&[0; 1])?;
 207                                                 claim_request.write(writer)?;
 208                                         },
 209                                         OnchainEvent::ContentiousOutpoint { ref outpoint, ref input_material } => {
 210                                                 writer.write_all(&[1; 1])?;
 211                                                 outpoint.write(writer)?;
 212                                                 input_material.write(writer)?;
 213                                         }
 214                                 }
 215                         }
 216                 }
 217                 Ok(())
 218         }
 219 }
 220
 221 impl<ChanSigner: ChannelKeys + Readable> ReadableArgs<Arc<Logger>> for OnchainTxHandler<ChanSigner> {
 222         fn read<R: ::std::io::Read>(reader: &mut R, logger: Arc<Logger>) -> Result<Self, DecodeError> {
 223                 let destination_script = Readable::read(reader)?;
 224
 225                 let key_storage = Readable::read(reader)?;
 226
 227                 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 228                 let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 229                 for _ in 0..pending_claim_requests_len {
 230                         pending_claim_requests.insert(Readable::read(reader)?, Readable::read(reader)?);
 231                 }
 232
 233                 let claimable_outpoints_len: u64 = Readable::read(reader)?;
 234                 let mut claimable_outpoints = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
 235                 for _ in 0..claimable_outpoints_len {
 236                         let outpoint = Readable::read(reader)?;
 237                         let ancestor_claim_txid = Readable::read(reader)?;
 238                         let height = Readable::read(reader)?;
 239                         claimable_outpoints.insert(outpoint, (ancestor_claim_txid, height));
 240                 }
 241                 let waiting_threshold_conf_len: u64 = Readable::read(reader)?;
 242                 let mut onchain_events_waiting_threshold_conf = HashMap::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128));
 243                 for _ in 0..waiting_threshold_conf_len {
 244                         let height_target = Readable::read(reader)?;
 245                         let events_len: u64 = Readable::read(reader)?;
 246                         let mut events = Vec::with_capacity(cmp::min(events_len as usize, MAX_ALLOC_SIZE / 128));
 247                         for _ in 0..events_len {
 248                                 let ev = match <u8 as Readable>::read(reader)? {
 249                                         0 => {
 250                                                 let claim_request = Readable::read(reader)?;
 251                                                 OnchainEvent::Claim {
 252                                                         claim_request
 253                                                 }
 254                                         },
 255                                         1 => {
 256                                                 let outpoint = Readable::read(reader)?;
 257                                                 let input_material = Readable::read(reader)?;
 258                                                 OnchainEvent::ContentiousOutpoint {
 259                                                         outpoint,
 260                                                         input_material
 261                                                 }
 262                                         }
 263                                         _ => return Err(DecodeError::InvalidValue),
 264                                 };
 265                                 events.push(ev);
 266                         }
 267                         onchain_events_waiting_threshold_conf.insert(height_target, events);
 268                 }
 269
 270                 Ok(OnchainTxHandler {
 271                         destination_script,
 272                         key_storage,
 273                         claimable_outpoints,
 274                         pending_claim_requests,
 275                         onchain_events_waiting_threshold_conf,
 276                         secp_ctx: Secp256k1::new(),
 277                         logger,
 278                 })
 279         }
 280 }
 281
 282 impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 283         pub(super) fn new(destination_script: Script, keys: ChanSigner, logger: Arc<Logger>) -> Self {
 284
 285                 let key_storage = keys;
 286
 287                 OnchainTxHandler {
 288                         destination_script,
 289                         key_storage,
 290                         pending_claim_requests: HashMap::new(),
 291                         claimable_outpoints: HashMap::new(),
 292                         onchain_events_waiting_threshold_conf: HashMap::new(),
 293
 294                         secp_ctx: Secp256k1::new(),
 295                         logger,
 296                 }
 297         }
 298
 299         pub(super) fn get_witnesses_weight(inputs: &[InputDescriptors]) -> usize {
 300                 let mut tx_weight = 2; // count segwit flags
 301                 for inp in inputs {
 302                         // We use expected weight (and not actual) as signatures and time lock delays may vary
 303                         tx_weight +=  match inp {
 304                                 // number_of_witness_elements + sig_length + revocation_sig + pubkey_length + revocationpubkey + witness_script_length + witness_script
 305                                 &InputDescriptors::RevokedOfferedHTLC => {
 306                                         1 + 1 + 73 + 1 + 33 + 1 + 133
 307                                 },
 308                                 // number_of_witness_elements + sig_length + revocation_sig + pubkey_length + revocationpubkey + witness_script_length + witness_script
 309                                 &InputDescriptors::RevokedReceivedHTLC => {
 310                                         1 + 1 + 73 + 1 + 33 + 1 + 139
 311                                 },
 312                                 // number_of_witness_elements + sig_length + remotehtlc_sig  + preimage_length + preimage + witness_script_length + witness_script
 313                                 &InputDescriptors::OfferedHTLC => {
 314                                         1 + 1 + 73 + 1 + 32 + 1 + 133
 315                                 },
 316                                 // number_of_witness_elements + sig_length + revocation_sig + pubkey_length + revocationpubkey + witness_script_length + witness_script
 317                                 &InputDescriptors::ReceivedHTLC => {
 318                                         1 + 1 + 73 + 1 + 1 + 1 + 139
 319                                 },
 320                                 // number_of_witness_elements + sig_length + revocation_sig + true_length + op_true + witness_script_length + witness_script
 321                                 &InputDescriptors::RevokedOutput => {
 322                                         1 + 1 + 73 + 1 + 1 + 1 + 77
 323                                 },
 324                         };
 325                 }
 326                 tx_weight
 327         }
 328
 329         /// In LN, output claimed are time-sensitive, which means we have to spend them before reaching some timelock expiration. At in-channel
 330         /// output detection, we generate a first version of a claim tx and associate to it a height timer. A height timer is an absolute block
 331         /// height than once reached we should generate a new bumped "version" of the claim tx to be sure than we safely claim outputs before
 332         /// than our counterparty can do it too. If timelock expires soon, height timer is going to be scale down in consequence to increase
 333         /// frequency of the bump and so increase our bets of success.
 334         fn get_height_timer(current_height: u32, timelock_expiration: u32) -> u32 {
 335                 if timelock_expiration <= current_height + 3 {
 336                         return current_height + 1
 337                 } else if timelock_expiration - current_height <= 15 {
 338                         return current_height + 3
 339                 }
 340                 current_height + 15
 341         }
 342
 343         /// Lightning security model (i.e being able to redeem/timeout HTLC or penalize coutnerparty onchain) lays on the assumption of claim transactions getting confirmed before timelock expiration
 344         /// (CSV or CLTV following cases). In case of high-fee spikes, claim tx may stuck in the mempool, so you need to bump its feerate quickly using Replace-By-Fee or Child-Pay-For-Parent.
 345         fn generate_claim_tx<F: Deref>(&self, height: u32, cached_claim_datas: &ClaimTxBumpMaterial, fee_estimator: F) -> Option<(u32, u64, Transaction)>
 346                 where F::Target: FeeEstimator
 347         {
 348                 if cached_claim_datas.per_input_material.len() == 0 { return None } // But don't prune pending claiming request yet, we may have to resurrect HTLCs
 349                 let mut inputs = Vec::new();
 350                 for outp in cached_claim_datas.per_input_material.keys() {
 351                         log_trace!(self, "Outpoint {}:{}", outp.txid, outp.vout);
 352                         inputs.push(TxIn {
 353                                 previous_output: *outp,
 354                                 script_sig: Script::new(),
 355                                 sequence: 0xfffffffd,
 356                                 witness: Vec::new(),
 357                         });
 358                 }
 359                 let mut bumped_tx = Transaction {
 360                         version: 2,
 361                         lock_time: 0,
 362                         input: inputs,
 363                         output: vec![TxOut {
 364                                 script_pubkey: self.destination_script.clone(),
 365                                 value: 0
 366                         }],
 367                 };
 368
 369                 macro_rules! RBF_bump {
 370                         ($amount: expr, $old_feerate: expr, $fee_estimator: expr, $predicted_weight: expr) => {
 371                                 {
 372                                         let mut used_feerate;
 373                                         // If old feerate inferior to actual one given back by Fee Estimator, use it to compute new fee...
 374                                         let new_fee = if $old_feerate < $fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::HighPriority) {
 375                                                 let mut value = $amount;
 376                                                 if subtract_high_prio_fee!(self, $fee_estimator, value, $predicted_weight, used_feerate) {
 377                                                         // Overflow check is done in subtract_high_prio_fee
 378                                                         $amount - value
 379                                                 } else {
 380                                                         log_trace!(self, "Can't new-estimation bump new claiming tx, amount {} is too small", $amount);
 381                                                         return None;
 382                                                 }
 383                                         // ...else just increase the previous feerate by 25% (because that's a nice number)
 384                                         } else {
 385                                                 let fee = $old_feerate * $predicted_weight / 750;
 386                                                 if $amount <= fee {
 387                                                         log_trace!(self, "Can't 25% bump new claiming tx, amount {} is too small", $amount);
 388                                                         return None;
 389                                                 }
 390                                                 fee
 391                                         };
 392
 393                                         let previous_fee = $old_feerate * $predicted_weight / 1000;
 394                                         let min_relay_fee = MIN_RELAY_FEE_SAT_PER_1000_WEIGHT * $predicted_weight / 1000;
 395                                         // BIP 125 Opt-in Full Replace-by-Fee Signaling
 396                                         //      * 3. The replacement transaction pays an absolute fee of at least the sum paid by the original transactions.
 397                                         //      * 4. The replacement transaction must also pay for its own bandwidth at or above the rate set by the node's minimum relay fee setting.
 398                                         let new_fee = if new_fee < previous_fee + min_relay_fee {
 399                                                 new_fee + previous_fee + min_relay_fee - new_fee
 400                                         } else {
 401                                                 new_fee
 402                                         };
 403                                         Some((new_fee, new_fee * 1000 / $predicted_weight))
 404                                 }
 405                         }
 406                 }
 407
 408                 // Compute new height timer to decide when we need to regenerate a new bumped version of the claim tx (if we
 409                 // didn't receive confirmation of it before, or not enough reorg-safe depth on top of it).
 410                 let new_timer = Self::get_height_timer(height, cached_claim_datas.soonest_timelock);
 411                 let mut inputs_witnesses_weight = 0;
 412                 let mut amt = 0;
 413                 for per_outp_material in cached_claim_datas.per_input_material.values() {
 414                         match per_outp_material {
 415                                 &InputMaterial::Revoked { ref witness_script, ref is_htlc, ref amount, .. } => {
 416                                         inputs_witnesses_weight += Self::get_witnesses_weight(if !is_htlc { &[InputDescriptors::RevokedOutput] } else if HTLCType::scriptlen_to_htlctype(witness_script.len()) == Some(HTLCType::OfferedHTLC) { &[InputDescriptors::RevokedOfferedHTLC] } else if HTLCType::scriptlen_to_htlctype(witness_script.len()) == Some(HTLCType::AcceptedHTLC) { &[InputDescriptors::RevokedReceivedHTLC] } else { unreachable!() });
 417                                         amt += *amount;
 418                                 },
 419                                 &InputMaterial::RemoteHTLC { ref preimage, ref amount, .. } => {
 420                                         inputs_witnesses_weight += Self::get_witnesses_weight(if preimage.is_some() { &[InputDescriptors::OfferedHTLC] } else { &[InputDescriptors::ReceivedHTLC] });
 421                                         amt += *amount;
 422                                 },
 423                                 &InputMaterial::LocalHTLC { .. } => { return None; }
 424                         }
 425                 }
 426
 427                 let predicted_weight = bumped_tx.get_weight() + inputs_witnesses_weight;
 428                 let mut new_feerate;
 429                 // If old feerate is 0, first iteration of this claim, use normal fee calculation
 430                 if cached_claim_datas.feerate_previous != 0 {
 431                         if let Some((new_fee, feerate)) = RBF_bump!(amt, cached_claim_datas.feerate_previous, fee_estimator, predicted_weight as u64) {
 432                                 // If new computed fee is superior at the whole claimable amount burn all in fees
 433                                 if new_fee > amt {
 434                                         bumped_tx.output[0].value = 0;
 435                                 } else {
 436                                         bumped_tx.output[0].value = amt - new_fee;
 437                                 }
 438                                 new_feerate = feerate;
 439                         } else { return None; }
 440                 } else {
 441                         if subtract_high_prio_fee!(self, fee_estimator, amt, predicted_weight, new_feerate) {
 442                                 bumped_tx.output[0].value = amt;
 443                         } else { return None; }
 444                 }
 445                 assert!(new_feerate != 0);
 446
 447                 for (i, (outp, per_outp_material)) in cached_claim_datas.per_input_material.iter().enumerate() {
 448                         match per_outp_material {
 449                                 &InputMaterial::Revoked { ref witness_script, ref pubkey, ref key, ref is_htlc, ref amount } => {
 450                                         let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 451                                         let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[i], &witness_script, *amount)[..]);
 452                                         let sig = self.secp_ctx.sign(&sighash, &key);
 453                                         bumped_tx.input[i].witness.push(sig.serialize_der().to_vec());
 454                                         bumped_tx.input[i].witness[0].push(SigHashType::All as u8);
 455                                         if *is_htlc {
 456                                                 bumped_tx.input[i].witness.push(pubkey.unwrap().clone().serialize().to_vec());
 457                                         } else {
 458                                                 bumped_tx.input[i].witness.push(vec!(1));
 459                                         }
 460                                         bumped_tx.input[i].witness.push(witness_script.clone().into_bytes());
 461                                         log_trace!(self, "Going to broadcast Penalty Transaction {} claiming revoked {} output {} from {} with new feerate {}...", bumped_tx.txid(), if !is_htlc { "to_local" } else if HTLCType::scriptlen_to_htlctype(witness_script.len()) == Some(HTLCType::OfferedHTLC) { "offered" } else if HTLCType::scriptlen_to_htlctype(witness_script.len()) == Some(HTLCType::AcceptedHTLC) { "received" } else { "" }, outp.vout, outp.txid, new_feerate);
 462                                 },
 463                                 &InputMaterial::RemoteHTLC { ref witness_script, ref key, ref preimage, ref amount, ref locktime } => {
 464                                         if !preimage.is_some() { bumped_tx.lock_time = *locktime }; // Right now we don't aggregate time-locked transaction, if we do we should set lock_time before to avoid breaking hash computation
 465                                         let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 466                                         let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[i], &witness_script, *amount)[..]);
 467                                         let sig = self.secp_ctx.sign(&sighash, &key);
 468                                         bumped_tx.input[i].witness.push(sig.serialize_der().to_vec());
 469                                         bumped_tx.input[i].witness[0].push(SigHashType::All as u8);
 470                                         if let &Some(preimage) = preimage {
 471                                                 bumped_tx.input[i].witness.push(preimage.clone().0.to_vec());
 472                                         } else {
 473                                                 bumped_tx.input[i].witness.push(vec![]);
 474                                         }
 475                                         bumped_tx.input[i].witness.push(witness_script.clone().into_bytes());
 476                                         log_trace!(self, "Going to broadcast Claim Transaction {} claiming remote {} htlc output {} from {} with new feerate {}...", bumped_tx.txid(), if preimage.is_some() { "offered" } else { "received" }, outp.vout, outp.txid, new_feerate);
 477                                 },
 478                                 &InputMaterial::LocalHTLC { .. } => {
 479                                         //TODO : Given that Local Commitment Transaction and HTLC-Timeout/HTLC-Success are counter-signed by peer, we can't
 480                                         // RBF them. Need a Lightning specs change and package relay modification :
 481                                         // https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2018-November/016518.html
 482                                         return None;
 483                                 }
 484                         }
 485                 }
 486                 log_trace!(self, "...with timer {}", new_timer);
 487                 assert!(predicted_weight >= bumped_tx.get_weight());
 488                 Some((new_timer, new_feerate, bumped_tx))
 489         }
 490
 491         pub(super) fn block_connected<B: Deref, F: Deref>(&mut self, txn_matched: &[&Transaction], claimable_outpoints: Vec<ClaimRequest>, height: u32, broadcaster: B, fee_estimator: F)
 492                 where B::Target: BroadcasterInterface,
 493                       F::Target: FeeEstimator
 494         {
 495                 log_trace!(self, "Block at height {} connected with {} claim requests", height, claimable_outpoints.len());
 496                 let mut new_claims = Vec::new();
 497                 let mut aggregated_claim = HashMap::new();
 498                 let mut aggregated_soonest = ::std::u32::MAX;
 499
 500                 // Try to aggregate outputs if their timelock expiration isn't imminent (absolute_timelock
 501                 // <= CLTV_SHARED_CLAIM_BUFFER) and they don't require an immediate nLockTime (aggregable).
 502                 for req in claimable_outpoints {
 503                         // Don't claim a outpoint twice that would be bad for privacy and may uselessly lock a CPFP input for a while
 504                         if let Some(_) = self.claimable_outpoints.get(&req.outpoint) { log_trace!(self, "Bouncing off outpoint {}:{}, already registered its claiming request", req.outpoint.txid, req.outpoint.vout); } else {
 505                                 log_trace!(self, "Test if outpoint can be aggregated with expiration {} against {}", req.absolute_timelock, height + CLTV_SHARED_CLAIM_BUFFER);
 506                                 if req.absolute_timelock <= height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable { // Don't aggregate if outpoint absolute timelock is soon or marked as non-aggregable
 507                                         let mut single_input = HashMap::new();
 508                                         single_input.insert(req.outpoint, req.witness_data);
 509                                         new_claims.push((req.absolute_timelock, single_input));
 510                                 } else {
 511                                         aggregated_claim.insert(req.outpoint, req.witness_data);
 512                                         if req.absolute_timelock < aggregated_soonest {
 513                                                 aggregated_soonest = req.absolute_timelock;
 514                                         }
 515                                 }
 516                         }
 517                 }
 518                 new_claims.push((aggregated_soonest, aggregated_claim));
 519
 520                 // Generate claim transactions and track them to bump if necessary at
 521                 // height timer expiration (i.e in how many blocks we're going to take action).
 522                 for claim in new_claims {
 523                         let mut claim_material = ClaimTxBumpMaterial { height_timer: 0, feerate_previous: 0, soonest_timelock: claim.0, per_input_material: claim.1.clone() };
 524                         if let Some((new_timer, new_feerate, tx)) = self.generate_claim_tx(height, &claim_material, &*fee_estimator) {
 525                                 claim_material.height_timer = new_timer;
 526                                 claim_material.feerate_previous = new_feerate;
 527                                 let txid = tx.txid();
 528                                 self.pending_claim_requests.insert(txid, claim_material);
 529                                 for k in claim.1.keys() {
 530                                         log_trace!(self, "Registering claiming request for {}:{}", k.txid, k.vout);
 531                                         self.claimable_outpoints.insert(k.clone(), (txid, height));
 532                                 }
 533                                 log_trace!(self, "Broadcast onchain {}", log_tx!(tx));
 534                                 broadcaster.broadcast_transaction(&tx);
 535                         }
 536                 }
 537
 538                 let mut bump_candidates = HashSet::new();
 539                 for tx in txn_matched {
 540                         // Scan all input to verify is one of the outpoint spent is of interest for us
 541                         let mut claimed_outputs_material = Vec::new();
 542                         for inp in &tx.input {
 543                                 if let Some(first_claim_txid_height) = self.claimable_outpoints.get(&inp.previous_output) {
 544                                         // If outpoint has claim request pending on it...
 545                                         if let Some(claim_material) = self.pending_claim_requests.get_mut(&first_claim_txid_height.0) {
 546                                                 //... we need to verify equality between transaction outpoints and claim request
 547                                                 // outpoints to know if transaction is the original claim or a bumped one issued
 548                                                 // by us.
 549                                                 let mut set_equality = true;
 550                                                 if claim_material.per_input_material.len() != tx.input.len() {
 551                                                         set_equality = false;
 552                                                 } else {
 553                                                         for (claim_inp, tx_inp) in claim_material.per_input_material.keys().zip(tx.input.iter()) {
 554                                                                 if *claim_inp != tx_inp.previous_output {
 555                                                                         set_equality = false;
 556                                                                 }
 557                                                         }
 558                                                 }
 559
 560                                                 macro_rules! clean_claim_request_after_safety_delay {
 561                                                         () => {
 562                                                                 let new_event = OnchainEvent::Claim { claim_request: first_claim_txid_height.0.clone() };
 563                                                                 match self.onchain_events_waiting_threshold_conf.entry(height + ANTI_REORG_DELAY - 1) {
 564                                                                         hash_map::Entry::Occupied(mut entry) => {
 565                                                                                 if !entry.get().contains(&new_event) {
 566                                                                                         entry.get_mut().push(new_event);
 567                                                                                 }
 568                                                                         },
 569                                                                         hash_map::Entry::Vacant(entry) => {
 570                                                                                 entry.insert(vec![new_event]);
 571                                                                         }
 572                                                                 }
 573                                                         }
 574                                                 }
 575
 576                                                 // If this is our transaction (or our counterparty spent all the outputs
 577                                                 // before we could anyway with same inputs order than us), wait for
 578                                                 // ANTI_REORG_DELAY and clean the RBF tracking map.
 579                                                 if set_equality {
 580                                                         clean_claim_request_after_safety_delay!();
 581                                                 } else { // If false, generate new claim request with update outpoint set
 582                                                         let mut at_least_one_drop = false;
 583                                                         for input in tx.input.iter() {
 584                                                                 if let Some(input_material) = claim_material.per_input_material.remove(&input.previous_output) {
 585                                                                         claimed_outputs_material.push((input.previous_output, input_material));
 586                                                                         at_least_one_drop = true;
 587                                                                 }
 588                                                                 // If there are no outpoints left to claim in this request, drop it entirely after ANTI_REORG_DELAY.
 589                                                                 if claim_material.per_input_material.is_empty() {
 590                                                                         clean_claim_request_after_safety_delay!();
 591                                                                 }
 592                                                         }
 593                                                         //TODO: recompute soonest_timelock to avoid wasting a bit on fees
 594                                                         if at_least_one_drop {
 595                                                                 bump_candidates.insert(first_claim_txid_height.0.clone());
 596                                                         }
 597                                                 }
 598                                                 break; //No need to iterate further, either tx is our or their
 599                                         } else {
 600                                                 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 601                                         }
 602                                 }
 603                         }
 604                         for (outpoint, input_material) in claimed_outputs_material.drain(..) {
 605                                 let new_event = OnchainEvent::ContentiousOutpoint { outpoint, input_material };
 606                                 match self.onchain_events_waiting_threshold_conf.entry(height + ANTI_REORG_DELAY - 1) {
 607                                         hash_map::Entry::Occupied(mut entry) => {
 608                                                 if !entry.get().contains(&new_event) {
 609                                                         entry.get_mut().push(new_event);
 610                                                 }
 611                                         },
 612                                         hash_map::Entry::Vacant(entry) => {
 613                                                 entry.insert(vec![new_event]);
 614                                         }
 615                                 }
 616                         }
 617                 }
 618
 619                 // After security delay, either our claim tx got enough confs or outpoint is definetely out of reach
 620                 if let Some(events) = self.onchain_events_waiting_threshold_conf.remove(&height) {
 621                         for ev in events {
 622                                 match ev {
 623                                         OnchainEvent::Claim { claim_request } => {
 624                                                 // We may remove a whole set of claim outpoints here, as these one may have
 625                                                 // been aggregated in a single tx and claimed so atomically
 626                                                 if let Some(bump_material) = self.pending_claim_requests.remove(&claim_request) {
 627                                                         for outpoint in bump_material.per_input_material.keys() {
 628                                                                 self.claimable_outpoints.remove(&outpoint);
 629                                                         }
 630                                                 }
 631                                         },
 632                                         OnchainEvent::ContentiousOutpoint { outpoint, .. } => {
 633                                                 self.claimable_outpoints.remove(&outpoint);
 634                                         }
 635                                 }
 636                         }
 637                 }
 638
 639                 // Check if any pending claim request must be rescheduled
 640                 for (first_claim_txid, ref claim_data) in self.pending_claim_requests.iter() {
 641                         if claim_data.height_timer == height {
 642                                 bump_candidates.insert(*first_claim_txid);
 643                         }
 644                 }
 645
 646                 // Build, bump and rebroadcast tx accordingly
 647                 log_trace!(self, "Bumping {} candidates", bump_candidates.len());
 648                 for first_claim_txid in bump_candidates.iter() {
 649                         if let Some((new_timer, new_feerate)) = {
 650                                 if let Some(claim_material) = self.pending_claim_requests.get(first_claim_txid) {
 651                                         if let Some((new_timer, new_feerate, bump_tx)) = self.generate_claim_tx(height, &claim_material, &*fee_estimator) {
 652                                                 log_trace!(self, "Broadcast onchain {}", log_tx!(bump_tx));
 653                                                 broadcaster.broadcast_transaction(&bump_tx);
 654                                                 Some((new_timer, new_feerate))
 655                                         } else { None }
 656                                 } else { unreachable!(); }
 657                         } {
 658                                 if let Some(claim_material) = self.pending_claim_requests.get_mut(first_claim_txid) {
 659                                         claim_material.height_timer = new_timer;
 660                                         claim_material.feerate_previous = new_feerate;
 661                                 } else { unreachable!(); }
 662                         }
 663                 }
 664         }
 665
 666         pub(super) fn block_disconnected<B: Deref, F: Deref>(&mut self, height: u32, broadcaster: B, fee_estimator: F)
 667                 where B::Target: BroadcasterInterface,
 668                       F::Target: FeeEstimator
 669         {
 670                 let mut bump_candidates = HashMap::new();
 671                 if let Some(events) = self.onchain_events_waiting_threshold_conf.remove(&(height + ANTI_REORG_DELAY - 1)) {
 672                         //- our claim tx on a commitment tx output
 673                         //- resurect outpoint back in its claimable set and regenerate tx
 674                         for ev in events {
 675                                 match ev {
 676                                         OnchainEvent::ContentiousOutpoint { outpoint, input_material } => {
 677                                                 if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&outpoint) {
 678                                                         if let Some(claim_material) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) {
 679                                                                 claim_material.per_input_material.insert(outpoint, input_material);
 680                                                                 // Using a HashMap guarantee us than if we have multiple outpoints getting
 681                                                                 // resurrected only one bump claim tx is going to be broadcast
 682                                                                 bump_candidates.insert(ancestor_claimable_txid.clone(), claim_material.clone());
 683                                                         }
 684                                                 }
 685                                         },
 686                                         _ => {},
 687                                 }
 688                         }
 689                 }
 690                 for (_, claim_material) in bump_candidates.iter_mut() {
 691                         if let Some((new_timer, new_feerate, bump_tx)) = self.generate_claim_tx(height, &claim_material, &*fee_estimator) {
 692                                 claim_material.height_timer = new_timer;
 693                                 claim_material.feerate_previous = new_feerate;
 694                                 broadcaster.broadcast_transaction(&bump_tx);
 695                         }
 696                 }
 697                 for (ancestor_claim_txid, claim_material) in bump_candidates.drain() {
 698                         self.pending_claim_requests.insert(ancestor_claim_txid.0, claim_material);
 699                 }
 700                 //TODO: if we implement cross-block aggregated claim transaction we need to refresh set of outpoints and regenerate tx but
 701                 // right now if one of the outpoint get disconnected, just erase whole pending claim request.
 702                 let mut remove_request = Vec::new();
 703                 self.claimable_outpoints.retain(|_, ref v|
 704                         if v.1 == height {
 705                         remove_request.push(v.0.clone());
 706                         false
 707                         } else { true });
 708                 for req in remove_request {
 709                         self.pending_claim_requests.remove(&req);
 710                 }
 711         }
 712 }