-f Drop BumpStrategy

Author: Antoine Riard

lightning/src/chain/channelmonitor.rs

@@ -43,7 +43,7 @@ use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use chain::transaction::{OutPoint, TransactionData};
 use chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface};
 use chain::onchaintx::OnchainTxHandler;
-use chain::onchain_utils::{BumpStrategy, CounterpartyHTLCOutput, HolderFundingOutput, HolderHTLCOutput, InputDescriptors, OnchainRequest, PackageMalleability, PackageSolvingData, PackageTemplate, RevokedOutput};
+use chain::onchain_utils::{CounterpartyHTLCOutput, HolderFundingOutput, HolderHTLCOutput, InputDescriptors, OnchainRequest, PackageMalleability, PackageSolvingData, PackageTemplate, RevokedOutput};
 use chain::Filter;
 use util::logger::Logger;
 use util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, U48};
@@ -1463,7 +1463,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 				if outp.script_pubkey == revokeable_p2wsh {
 					let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, outp.value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);
 					let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable);
-					claimable_outpoints.push(OnchainRequest { aggregation: true, bump_strategy: BumpStrategy::RBF, feerate_previous: 0, height_timer: None, absolute_timelock: height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, height_original: height, content: justice_package});
+					claimable_outpoints.push(OnchainRequest { aggregation: true, feerate_previous: 0, height_timer: None, absolute_timelock: height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, height_original: height, content: justice_package});
 				}
 			}
 
@@ -1477,7 +1477,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 						}
 						let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, if htlc.offered { InputDescriptors::RevokedOfferedHTLC } else { InputDescriptors::RevokedReceivedHTLC }, htlc.amount_msat / 1000, Some(htlc.clone()), self.counterparty_tx_cache.on_counterparty_tx_csv);
 						let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable);
-						claimable_outpoints.push(OnchainRequest { aggregation: true, bump_strategy: BumpStrategy::RBF, feerate_previous: 0, height_timer: None, absolute_timelock: htlc.cltv_expiry, height_original: height, content: justice_package});
+						claimable_outpoints.push(OnchainRequest { aggregation: true, feerate_previous: 0, height_timer: None, absolute_timelock: htlc.cltv_expiry, height_original: height, content: justice_package});
 					}
 				}
 			}
@@ -1627,7 +1627,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 							if preimage.is_some() || !htlc.offered {
 								let counterparty_htlc_outp = CounterpartyHTLCOutput::build(*revocation_point, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, preimage, htlc.clone());
 								let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::CounterpartyHTLCOutput(counterparty_htlc_outp), PackageMalleability::Malleable);
-								claimable_outpoints.push(OnchainRequest { aggregation: if !htlc.offered { false } else { true }, bump_strategy: BumpStrategy::RBF, feerate_previous: 0, height_timer: None, absolute_timelock: htlc.cltv_expiry, height_original: /*XXX(ariard) Option<height> */ 0, content: counterparty_package });
+								claimable_outpoints.push(OnchainRequest { aggregation: if !htlc.offered { false } else { true }, feerate_previous: 0, height_timer: None, absolute_timelock: htlc.cltv_expiry, height_original: /*XXX(ariard) Option<height> */ 0, content: counterparty_package });
 							}
 						}
 					}
@@ -1660,7 +1660,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		log_trace!(logger, "Counterparty HTLC broadcast {}:{}", htlc_txid, 0);
 		let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, tx.output[0].value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);
 		let justice_package = PackageTemplate::build_package(htlc_txid, 0, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable);
-		let claimable_outpoints = vec!(OnchainRequest { aggregation: true, bump_strategy: BumpStrategy::RBF, feerate_previous: 0, height_timer: None, absolute_timelock: height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, height_original: height, content: justice_package });
+		let claimable_outpoints = vec!(OnchainRequest { aggregation: true, feerate_previous: 0, height_timer: None, absolute_timelock: height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, height_original: height, content: justice_package });
 		let outputs = vec![(0, tx.output[0].clone())];
 		(claimable_outpoints, Some((htlc_txid, outputs)))
 	}
@@ -1685,7 +1685,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 					}
 				} else { None }, htlc.amount_msat);
 				let htlc_package = PackageTemplate::build_package(holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), PackageMalleability::Untractable);
-				claim_requests.push(OnchainRequest { aggregation: false, bump_strategy: BumpStrategy::CPFP, feerate_previous: 0, height_timer: None, absolute_timelock: height, height_original: height, content: htlc_package });
+				claim_requests.push(OnchainRequest { aggregation: false, feerate_previous: 0, height_timer: None, absolute_timelock: height, height_original: height, content: htlc_package });
 			}
 		}
 
@@ -1894,7 +1894,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		if should_broadcast {
 			let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
 			let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), PackageMalleability::Untractable);
-			claimable_outpoints.push(OnchainRequest { aggregation: false, bump_strategy: BumpStrategy::CPFP, feerate_previous: 0, height_timer: None, absolute_timelock: height, height_original: height, content: commitment_package });
+			claimable_outpoints.push(OnchainRequest { aggregation: false, feerate_previous: 0, height_timer: None, absolute_timelock: height, height_original: height, content: commitment_package });
 		}
 		if should_broadcast {
 			self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));

lightning/src/chain/onchain_utils.rs

@@ -482,6 +482,9 @@ pub(crate) struct PackageTemplate {
 }
 
 impl PackageTemplate {
+	pub(crate) fn is_malleable(&self) -> bool {
+		self.malleability == PackageMalleability::Malleable
+	}
 	pub(crate) fn outpoints(&self) -> Vec<&BitcoinOutPoint> {
 		let mut outpoints = Vec::with_capacity(self.inputs.len());
 		for (o, _) in self.inputs.iter() {
@@ -638,43 +641,6 @@ impl Readable for PackageTemplate {
 	}
 }
 
-/// BumpStrategy is a basic enum to encode a fee-committing strategy. We
-/// may extend it in the future with other stategies like BYOF-input.
-#[derive(PartialEq, Clone)]
-pub(crate) enum BumpStrategy {
-	RBF,
-	CPFP
-}
-
-impl Writeable for BumpStrategy {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		match self {
-			BumpStrategy::RBF => {
-				writer.write_all(&[0; 1])?;
-			},
-			BumpStrategy::CPFP => {
-				writer.write_all(&[1; 1])?;
-			}
-		}
-		Ok(())
-	}
-}
-
-impl Readable for BumpStrategy {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let bump_strategy = match <u8 as Readable>::read(reader)? {
-			0 => {
-				BumpStrategy::RBF
-			},
-			1 => {
-				BumpStrategy::CPFP
-			},
-			_ => return Err(DecodeError::UnknownVersion),
-		};
-		Ok(bump_strategy)
-	}
-}
-
 /// A structure to describe a claim content and its metadatas which is generated
 /// by ChannelMonitor and used by OnchainTxHandler to generate feerate-competive
 /// transactions.
@@ -700,10 +666,6 @@ pub struct OnchainRequest {
 	// of a sooner-HTLC could be swallowed by the highest nLocktime of the HTLC set.
 	// Do simplify we mark them as non-aggregable.
 	pub(crate) aggregation: bool,
-	// Content may lockdown with counter-signature of our counterparty
-	// or fully-malleable by our own. Depending on this bumping strategy
-	// must be adapted.
-	pub(crate) bump_strategy: BumpStrategy,
 	// Based feerate of previous broadcast. If resources available (either
 	// output value or utxo bumping).
 	pub(crate) feerate_previous: u64,
@@ -740,7 +702,6 @@ impl OnchainRequest {
 impl Writeable for OnchainRequest {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
 		self.aggregation.write(writer)?;
-		self.bump_strategy.write(writer)?;
 		self.feerate_previous.write(writer)?;
 		self.height_timer.write(writer)?;
 		self.absolute_timelock.write(writer)?;
@@ -754,7 +715,6 @@ impl Writeable for OnchainRequest {
 impl Readable for OnchainRequest {
 	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		let aggregation = Readable::read(reader)?;
-		let bump_strategy = Readable::read(reader)?;
 		let feerate_previous = Readable::read(reader)?;
 		let height_timer = Readable::read(reader)?;
 		let absolute_timelock = Readable::read(reader)?;
@@ -763,7 +723,6 @@ impl Readable for OnchainRequest {
 
 		Ok(OnchainRequest {
 			aggregation,
-			bump_strategy,
 			feerate_previous,
 			height_timer,
 			absolute_timelock,

lightning/src/chain/onchaintx.rs

@@ -27,7 +27,7 @@ use ln::chan_utils::{ChannelTransactionParameters, HolderCommitmentTransaction};
 use chain::chaininterface::{FeeEstimator, BroadcasterInterface};
 use chain::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER};
 use chain::keysinterface::{Sign, KeysInterface};
-use chain::onchain_utils::{OnchainRequest, PackageTemplate, BumpStrategy};
+use chain::onchain_utils::{OnchainRequest, PackageTemplate};
 use chain::onchain_utils;
 use util::logger::Logger;
 use util::ser::{Readable, ReadableArgs, Writer, Writeable, VecWriter};
@@ -334,7 +334,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		// didn't receive confirmation of it before, or not enough reorg-safe depth on top of it).
 		let new_timer = Some(Self::get_height_timer(height, cached_request.absolute_timelock));
 		let amt = cached_request.content.package_amount();
-		if cached_request.bump_strategy == BumpStrategy::RBF {
+		if cached_request.content.is_malleable() {
 			let predicted_weight = cached_request.content.package_weight(&self.destination_script);
 			if let Some((output_value, new_feerate)) = onchain_utils::compute_output_value(predicted_weight, amt, cached_request.feerate_previous, fee_estimator, logger) {
 				assert!(new_feerate != 0);