diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs index 7d1a325c721..e6526af2c61 100644 --- a/lightning/src/chain/channelmonitor.rs +++ b/lightning/src/chain/channelmonitor.rs @@ -2422,7 +2422,7 @@ impl ChannelMonitorImpl { let commitment_package = PackageTemplate::build_package( self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_output), - best_block_height, false, best_block_height, + best_block_height, best_block_height ); self.onchain_tx_handler.update_claims_view_from_requests( vec![commitment_package], best_block_height, best_block_height, @@ -2603,8 +2603,8 @@ impl ChannelMonitorImpl { // First, process non-htlc outputs (to_holder & to_counterparty) for (idx, outp) in tx.output.iter().enumerate() { if outp.script_pubkey == revokeable_p2wsh { - let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv); - let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, true, height); + let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors()); + let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height); claimable_outpoints.push(justice_package); to_counterparty_output_info = Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value)); @@ -2622,7 +2622,7 @@ impl ChannelMonitorImpl { to_counterparty_output_info); } let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some()); - let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, true, height); + let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height); claimable_outpoints.push(justice_package); } } @@ -2747,8 +2747,7 @@ impl ChannelMonitorImpl { self.counterparty_commitment_params.counterparty_htlc_base_key, htlc.clone(), self.onchain_tx_handler.opt_anchors())) }; - let aggregation = if !htlc.offered { false } else { true }; - let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry,aggregation, 0); + let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0); claimable_outpoints.push(counterparty_package); } } @@ -2787,11 +2786,12 @@ impl ChannelMonitorImpl { let revk_outp = RevokedOutput::build( per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, - tx.output[idx].value, self.counterparty_commitment_params.on_counterparty_tx_csv + tx.output[idx].value, self.counterparty_commitment_params.on_counterparty_tx_csv, + false ); let justice_package = PackageTemplate::build_package( htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), - height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, true, height + height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height ); claimable_outpoints.push(justice_package); if outputs_to_watch.is_none() { @@ -2814,11 +2814,11 @@ impl ChannelMonitorImpl { for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() { if let Some(transaction_output_index) = htlc.transaction_output_index { - let (htlc_output, aggregable) = if htlc.offered { + let htlc_output = if htlc.offered { let htlc_output = HolderHTLCOutput::build_offered( htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors() ); - (htlc_output, false) + htlc_output } else { let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) { preimage.clone() @@ -2829,12 +2829,12 @@ impl ChannelMonitorImpl { let htlc_output = HolderHTLCOutput::build_accepted( payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors() ); - (htlc_output, self.onchain_tx_handler.opt_anchors()) + htlc_output }; let htlc_package = PackageTemplate::build_package( holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), - htlc.cltv_expiry, aggregable, conf_height + htlc.cltv_expiry, conf_height ); claim_requests.push(htlc_package); } @@ -3174,7 +3174,7 @@ impl ChannelMonitorImpl { let should_broadcast = self.should_broadcast_holder_commitment_txn(logger); if should_broadcast { let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors()); - let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), false, self.best_block.height()); + let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height()); claimable_outpoints.push(commitment_package); self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0)); let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript); diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs index e66092222d8..4604a164cd6 100644 --- a/lightning/src/chain/package.rs +++ b/lightning/src/chain/package.rs @@ -98,10 +98,11 @@ pub(crate) struct RevokedOutput { weight: u64, amount: u64, on_counterparty_tx_csv: u16, + is_counterparty_balance_on_anchors: Option<()>, } impl RevokedOutput { - pub(crate) fn build(per_commitment_point: PublicKey, counterparty_delayed_payment_base_key: PublicKey, counterparty_htlc_base_key: PublicKey, per_commitment_key: SecretKey, amount: u64, on_counterparty_tx_csv: u16) -> Self { + pub(crate) fn build(per_commitment_point: PublicKey, counterparty_delayed_payment_base_key: PublicKey, counterparty_htlc_base_key: PublicKey, per_commitment_key: SecretKey, amount: u64, on_counterparty_tx_csv: u16, is_counterparty_balance_on_anchors: bool) -> Self { RevokedOutput { per_commitment_point, counterparty_delayed_payment_base_key, @@ -109,7 +110,8 @@ impl RevokedOutput { per_commitment_key, weight: WEIGHT_REVOKED_OUTPUT, amount, - on_counterparty_tx_csv + on_counterparty_tx_csv, + is_counterparty_balance_on_anchors: if is_counterparty_balance_on_anchors { Some(()) } else { None } } } } @@ -122,6 +124,7 @@ impl_writeable_tlv_based!(RevokedOutput, { (8, weight, required), (10, amount, required), (12, on_counterparty_tx_csv, required), + (14, is_counterparty_balance_on_anchors, option) }); /// A struct to describe a revoked offered output and corresponding information to generate a @@ -479,6 +482,24 @@ impl PackageSolvingData { }; absolute_timelock } + + fn map_output_type_flags(&self) -> (PackageMalleability, bool) { + // Post-anchor, aggregation of outputs of different types is unsafe. See https://github.com/lightning/bolts/pull/803. + let (malleability, aggregable) = match self { + PackageSolvingData::RevokedOutput(RevokedOutput { is_counterparty_balance_on_anchors: Some(()), .. }) => { (PackageMalleability::Malleable, false) }, + PackageSolvingData::RevokedOutput(RevokedOutput { is_counterparty_balance_on_anchors: None, .. }) => { (PackageMalleability::Malleable, true) }, + PackageSolvingData::RevokedHTLCOutput(..) => { (PackageMalleability::Malleable, true) }, + PackageSolvingData::CounterpartyOfferedHTLCOutput(..) => { (PackageMalleability::Malleable, true) }, + PackageSolvingData::CounterpartyReceivedHTLCOutput(..) => { (PackageMalleability::Malleable, false) }, + PackageSolvingData::HolderHTLCOutput(ref outp) => if outp.opt_anchors() { + (PackageMalleability::Malleable, outp.preimage.is_some()) + } else { + (PackageMalleability::Untractable, false) + }, + PackageSolvingData::HolderFundingOutput(..) => { (PackageMalleability::Untractable, false) }, + }; + (malleability, aggregable) + } } impl_writeable_tlv_based_enum!(PackageSolvingData, ; @@ -491,8 +512,7 @@ impl_writeable_tlv_based_enum!(PackageSolvingData, ; ); /// A malleable package might be aggregated with other packages to save on fees. -/// A untractable package has been counter-signed and aggregable will break cached counterparty -/// signatures. +/// A untractable package has been counter-signed and aggregable will break cached counterparty signatures. #[derive(Clone, PartialEq, Eq)] pub(crate) enum PackageMalleability { Malleable, @@ -826,19 +846,8 @@ impl PackageTemplate { }).is_some() } - pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, soonest_conf_deadline: u32, aggregable: bool, height_original: u32) -> Self { - let malleability = match input_solving_data { - PackageSolvingData::RevokedOutput(..) => PackageMalleability::Malleable, - PackageSolvingData::RevokedHTLCOutput(..) => PackageMalleability::Malleable, - PackageSolvingData::CounterpartyOfferedHTLCOutput(..) => PackageMalleability::Malleable, - PackageSolvingData::CounterpartyReceivedHTLCOutput(..) => PackageMalleability::Malleable, - PackageSolvingData::HolderHTLCOutput(ref outp) => if outp.opt_anchors() { - PackageMalleability::Malleable - } else { - PackageMalleability::Untractable - }, - PackageSolvingData::HolderFundingOutput(..) => PackageMalleability::Untractable, - }; + pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, soonest_conf_deadline: u32, height_original: u32) -> Self { + let (malleability, aggregable) = PackageSolvingData::map_output_type_flags(&input_solving_data); let mut inputs = Vec::with_capacity(1); inputs.push((BitcoinOutPoint { txid, vout }, input_solving_data)); PackageTemplate { @@ -880,18 +889,7 @@ impl Readable for PackageTemplate { inputs.push((outpoint, rev_outp)); } let (malleability, aggregable) = if let Some((_, lead_input)) = inputs.first() { - match lead_input { - PackageSolvingData::RevokedOutput(..) => { (PackageMalleability::Malleable, true) }, - PackageSolvingData::RevokedHTLCOutput(..) => { (PackageMalleability::Malleable, true) }, - PackageSolvingData::CounterpartyOfferedHTLCOutput(..) => { (PackageMalleability::Malleable, true) }, - PackageSolvingData::CounterpartyReceivedHTLCOutput(..) => { (PackageMalleability::Malleable, false) }, - PackageSolvingData::HolderHTLCOutput(ref outp) => if outp.opt_anchors() { - (PackageMalleability::Malleable, outp.preimage.is_some()) - } else { - (PackageMalleability::Untractable, false) - }, - PackageSolvingData::HolderFundingOutput(..) => { (PackageMalleability::Untractable, false) }, - } + PackageSolvingData::map_output_type_flags(&lead_input) } else { return Err(DecodeError::InvalidValue); }; let mut soonest_conf_deadline = 0; let mut feerate_previous = 0; @@ -1029,11 +1027,11 @@ mod tests { use bitcoin::secp256k1::Secp256k1; macro_rules! dumb_revk_output { - ($secp_ctx: expr) => { + ($secp_ctx: expr, $is_counterparty_balance_on_anchors: expr) => { { let dumb_scalar = SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap(); let dumb_point = PublicKey::from_secret_key(&$secp_ctx, &dumb_scalar); - PackageSolvingData::RevokedOutput(RevokedOutput::build(dumb_point, dumb_point, dumb_point, dumb_scalar, 0, 0)) + PackageSolvingData::RevokedOutput(RevokedOutput::build(dumb_point, dumb_point, dumb_point, dumb_scalar, 0, 0, $is_counterparty_balance_on_anchors)) } } } @@ -1077,10 +1075,10 @@ mod tests { fn test_package_differing_heights() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); - let mut package_one_hundred = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, true, 100); - let package_two_hundred = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, true, 200); + let mut package_one_hundred = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, 100); + let package_two_hundred = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, 200); package_one_hundred.merge_package(package_two_hundred); } @@ -1089,11 +1087,11 @@ mod tests { fn test_package_untractable_merge_to() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); let htlc_outp = dumb_htlc_output!(); - let mut untractable_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, true, 100); - let malleable_package = PackageTemplate::build_package(txid, 1, htlc_outp.clone(), 1000, true, 100); + let mut untractable_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, 100); + let malleable_package = PackageTemplate::build_package(txid, 1, htlc_outp.clone(), 1000, 100); untractable_package.merge_package(malleable_package); } @@ -1103,10 +1101,10 @@ mod tests { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); let htlc_outp = dumb_htlc_output!(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); - let mut malleable_package = PackageTemplate::build_package(txid, 0, htlc_outp.clone(), 1000, true, 100); - let untractable_package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, true, 100); + let mut malleable_package = PackageTemplate::build_package(txid, 0, htlc_outp.clone(), 1000, 100); + let untractable_package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, 100); malleable_package.merge_package(untractable_package); } @@ -1115,10 +1113,11 @@ mod tests { fn test_package_noaggregation_to() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); + let revk_outp_counterparty_balance = dumb_revk_output!(secp_ctx, true); - let mut noaggregation_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, false, 100); - let aggregation_package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, true, 100); + let mut noaggregation_package = PackageTemplate::build_package(txid, 0, revk_outp_counterparty_balance.clone(), 1000, 100); + let aggregation_package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, 100); noaggregation_package.merge_package(aggregation_package); } @@ -1127,10 +1126,11 @@ mod tests { fn test_package_noaggregation_from() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); + let revk_outp_counterparty_balance = dumb_revk_output!(secp_ctx, true); - let mut aggregation_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, true, 100); - let noaggregation_package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, false, 100); + let mut aggregation_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, 100); + let noaggregation_package = PackageTemplate::build_package(txid, 1, revk_outp_counterparty_balance.clone(), 1000, 100); aggregation_package.merge_package(noaggregation_package); } @@ -1139,11 +1139,11 @@ mod tests { fn test_package_empty() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); - let mut empty_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, true, 100); + let mut empty_package = PackageTemplate::build_package(txid, 0, revk_outp.clone(), 1000, 100); empty_package.inputs = vec![]; - let package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, true, 100); + let package = PackageTemplate::build_package(txid, 1, revk_outp.clone(), 1000, 100); empty_package.merge_package(package); } @@ -1152,11 +1152,11 @@ mod tests { fn test_package_differing_categories() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); let counterparty_outp = dumb_counterparty_output!(secp_ctx, 0, false); - let mut revoked_package = PackageTemplate::build_package(txid, 0, revk_outp, 1000, true, 100); - let counterparty_package = PackageTemplate::build_package(txid, 1, counterparty_outp, 1000, true, 100); + let mut revoked_package = PackageTemplate::build_package(txid, 0, revk_outp, 1000, 100); + let counterparty_package = PackageTemplate::build_package(txid, 1, counterparty_outp, 1000, 100); revoked_package.merge_package(counterparty_package); } @@ -1164,13 +1164,13 @@ mod tests { fn test_package_split_malleable() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp_one = dumb_revk_output!(secp_ctx); - let revk_outp_two = dumb_revk_output!(secp_ctx); - let revk_outp_three = dumb_revk_output!(secp_ctx); + let revk_outp_one = dumb_revk_output!(secp_ctx, false); + let revk_outp_two = dumb_revk_output!(secp_ctx, false); + let revk_outp_three = dumb_revk_output!(secp_ctx, false); - let mut package_one = PackageTemplate::build_package(txid, 0, revk_outp_one, 1000, true, 100); - let package_two = PackageTemplate::build_package(txid, 1, revk_outp_two, 1000, true, 100); - let package_three = PackageTemplate::build_package(txid, 2, revk_outp_three, 1000, true, 100); + let mut package_one = PackageTemplate::build_package(txid, 0, revk_outp_one, 1000, 100); + let package_two = PackageTemplate::build_package(txid, 1, revk_outp_two, 1000, 100); + let package_three = PackageTemplate::build_package(txid, 2, revk_outp_three, 1000, 100); package_one.merge_package(package_two); package_one.merge_package(package_three); @@ -1193,7 +1193,7 @@ mod tests { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let htlc_outp_one = dumb_htlc_output!(); - let mut package_one = PackageTemplate::build_package(txid, 0, htlc_outp_one, 1000, true, 100); + let mut package_one = PackageTemplate::build_package(txid, 0, htlc_outp_one, 1000, 100); let ret_split = package_one.split_package(&BitcoinOutPoint { txid, vout: 0}); assert!(ret_split.is_none()); } @@ -1202,9 +1202,9 @@ mod tests { fn test_package_timer() { let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(); let secp_ctx = Secp256k1::new(); - let revk_outp = dumb_revk_output!(secp_ctx); + let revk_outp = dumb_revk_output!(secp_ctx, false); - let mut package = PackageTemplate::build_package(txid, 0, revk_outp, 1000, true, 100); + let mut package = PackageTemplate::build_package(txid, 0, revk_outp, 1000, 100); assert_eq!(package.timer(), 100); package.set_timer(101); assert_eq!(package.timer(), 101); @@ -1216,7 +1216,7 @@ mod tests { let secp_ctx = Secp256k1::new(); let counterparty_outp = dumb_counterparty_output!(secp_ctx, 1_000_000, false); - let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, true, 100); + let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, 100); assert_eq!(package.package_amount(), 1000); } @@ -1229,15 +1229,15 @@ mod tests { let weight_sans_output = (4 + 4 + 1 + 36 + 4 + 1 + 1 + 8 + 1) * WITNESS_SCALE_FACTOR + 2; { - let revk_outp = dumb_revk_output!(secp_ctx); - let package = PackageTemplate::build_package(txid, 0, revk_outp, 0, true, 100); + let revk_outp = dumb_revk_output!(secp_ctx, false); + let package = PackageTemplate::build_package(txid, 0, revk_outp, 0, 100); assert_eq!(package.package_weight(&Script::new()), weight_sans_output + WEIGHT_REVOKED_OUTPUT as usize); } { for &opt_anchors in [false, true].iter() { let counterparty_outp = dumb_counterparty_output!(secp_ctx, 1_000_000, opt_anchors); - let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, true, 100); + let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, 100); assert_eq!(package.package_weight(&Script::new()), weight_sans_output + weight_received_htlc(opt_anchors) as usize); } } @@ -1245,7 +1245,7 @@ mod tests { { for &opt_anchors in [false, true].iter() { let counterparty_outp = dumb_counterparty_offered_output!(secp_ctx, 1_000_000, opt_anchors); - let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, true, 100); + let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, 100); assert_eq!(package.package_weight(&Script::new()), weight_sans_output + weight_offered_htlc(opt_anchors) as usize); } } diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs index 1f9a2cf3a74..9c5d1a314b0 100644 --- a/lightning/src/ln/monitor_tests.rs +++ b/lightning/src/ln/monitor_tests.rs @@ -2185,21 +2185,20 @@ fn test_anchors_aggregated_revoked_htlc_tx() { // revoked outputs. { let txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0); - assert_eq!(txn.len(), 2); + assert_eq!(txn.len(), 4); - let (revoked_claim_a, revoked_claim_b) = if txn[0].input[0].previous_output.txid == revoked_commitment_a.txid() { - (&txn[0], &txn[1]) + let (revoked_htlc_claim_a, revoked_htlc_claim_b) = if txn[0].input[0].previous_output.txid == revoked_commitment_a.txid() { + (if txn[0].input.len() == 2 { &txn[0] } else { &txn[1] }, if txn[2].input.len() == 2 { &txn[2] } else { &txn[3] }) } else { - (&txn[1], &txn[0]) + (if txn[2].input.len() == 2 { &txn[2] } else { &txn[3] }, if txn[0].input.len() == 2 { &txn[0] } else { &txn[1] }) }; - // TODO: to_self claim must be separate from HTLC claims - assert_eq!(revoked_claim_a.input.len(), 3); // Spends both HTLC outputs and to_self output - assert_eq!(revoked_claim_a.output.len(), 1); - check_spends!(revoked_claim_a, revoked_commitment_a); - assert_eq!(revoked_claim_b.input.len(), 3); // Spends both HTLC outputs and to_self output - assert_eq!(revoked_claim_b.output.len(), 1); - check_spends!(revoked_claim_b, revoked_commitment_b); + assert_eq!(revoked_htlc_claim_a.input.len(), 2); // Spends both HTLC outputs + assert_eq!(revoked_htlc_claim_a.output.len(), 1); + check_spends!(revoked_htlc_claim_a, revoked_commitment_a); + assert_eq!(revoked_htlc_claim_b.input.len(), 2); // Spends both HTLC outputs + assert_eq!(revoked_htlc_claim_b.output.len(), 1); + check_spends!(revoked_htlc_claim_b, revoked_commitment_b); } // Since Bob was able to confirm his revoked commitment, he'll now try to claim the HTLCs @@ -2296,21 +2295,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() { // the second level instead. let revoked_claims = { let txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0); - assert_eq!(txn.len(), 4); - - let revoked_to_self_claim_a = txn.iter().find(|tx| - tx.input.len() == 1 && - tx.output.len() == 1 && - tx.input[0].previous_output.txid == revoked_commitment_a.txid() - ).unwrap(); - check_spends!(revoked_to_self_claim_a, revoked_commitment_a); - - let revoked_to_self_claim_b = txn.iter().find(|tx| - tx.input.len() == 1 && - tx.output.len() == 1 && - tx.input[0].previous_output.txid == revoked_commitment_b.txid() - ).unwrap(); - check_spends!(revoked_to_self_claim_b, revoked_commitment_b); + assert_eq!(txn.len(), 2); let revoked_htlc_claims = txn.iter().filter(|tx| tx.input.len() == 2 && @@ -2343,7 +2328,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() { assert!(nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_events().is_empty()); let spendable_output_events = nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_events(); - assert_eq!(spendable_output_events.len(), 4); + assert_eq!(spendable_output_events.len(), 2); for (idx, event) in spendable_output_events.iter().enumerate() { if let Event::SpendableOutputs { outputs } = event { assert_eq!(outputs.len(), 1); @@ -2358,7 +2343,8 @@ fn test_anchors_aggregated_revoked_htlc_tx() { assert!(nodes[0].node.list_channels().is_empty()); assert!(nodes[1].node.list_channels().is_empty()); - assert!(nodes[0].chain_monitor.chain_monitor.get_claimable_balances(&[]).is_empty()); + // On the Alice side, the individual to_self_claim are still pending confirmation. + assert_eq!(nodes[0].chain_monitor.chain_monitor.get_claimable_balances(&[]).len(), 2); // TODO: From Bob's PoV, he still thinks he can claim the outputs from his revoked commitment. // This needs to be fixed before we enable pruning `ChannelMonitor`s once they don't have any // balances to claim.