Unify claim txn generation path across bumping strategies

Bumping after timer expiration will only be enable for CPFP-packages
in following commits of this patchset.

Author: Antoine Riard

lightning/src/ln/onchaintx.rs

@@ -316,22 +316,22 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 
 		// Compute new height timer to decide when we need to regenerate a new bumped version of the claim tx (if we
 		// 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_amounts();
-		if cached_request.bump_strategy == BumpStrategy::RBF {
-			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);
-
-				let transaction = cached_request.content.package_finalize(self, output_value, self.destination_script.clone(), &logger).unwrap();
-				log_trace!(logger, "...with timer {} and feerate {}", new_timer.unwrap(), new_feerate);
-				assert!(predicted_weight >= transaction.get_weight());
-				return Some((new_timer, new_feerate, transaction))
-			}
-		} else {
-			if let Some(transaction) = cached_request.content.package_finalize(self, amt, self.destination_script.clone(), &logger) {
-				return Some((None, self.holder_commitment.as_ref().unwrap().feerate_per_kw as u64, transaction));
+		let mut new_timer = Some(Self::get_height_timer(height, cached_request.absolute_timelock));
+		let mut amt = cached_request.content.package_amounts();
+		let holder_commitment = self.holder_commitment.as_ref().unwrap();
+		let predicted_weight = cached_request.content.package_weight(&self.destination_script, &holder_commitment.unsigned_tx);
+		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);
+
+			let transaction = cached_request.content.package_finalize(self, output_value, self.destination_script.clone(), &logger).unwrap();
+			log_trace!(logger, "...with timer {} and feerate {}", new_timer.unwrap(), new_feerate);
+			assert!(predicted_weight >= transaction.get_weight());
+			// Temporary: disable timer for CPFP-package
+			if cached_request.bump_strategy == BumpStrategy::CPFP {
+				new_timer = None;
 			}
+
+			return Some((new_timer, new_feerate, transaction))
 		}
 		None
 	}