f - add more constructors

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -32,7 +32,7 @@ use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1::{PublicKey, SecretKey};
 #[cfg(splicing)]
 use bitcoin::ScriptBuf;
-use bitcoin::{secp256k1, Sequence, SignedAmount};
+use bitcoin::{secp256k1, Sequence, SignedAmount, Weight};
 
 use crate::blinded_path::message::MessageForwardNode;
 use crate::blinded_path::message::{AsyncPaymentsContext, OffersContext};
@@ -117,7 +117,10 @@ use crate::routing::router::{
 	RouteParameters, RouteParametersConfig, Router,
 };
 use crate::sign::ecdsa::EcdsaChannelSigner;
-use crate::sign::{EntropySource, NodeSigner, Recipient, SignerProvider, P2WPKH_WITNESS_WEIGHT};
+use crate::sign::{
+	EntropySource, NodeSigner, Recipient, SignerProvider, P2TR_KEY_PATH_WITNESS_WEIGHT,
+	P2WPKH_WITNESS_WEIGHT,
+};
 #[cfg(any(feature = "_test_utils", test))]
 use crate::types::features::Bolt11InvoiceFeatures;
 use crate::types::features::{
@@ -221,26 +224,77 @@ pub struct FundingTxInput {
 }
 
 impl FundingTxInput {
-	/// Creates an input spending an P2WPKH output from the given `prevtx` at index `vout` using the
-	/// provided `sequence` number.
-	///
-	/// Returns `Err` if no such output exists in `prevtx` at index `vout`.
-	pub fn new_p2wpkh(prevtx: Transaction, vout: u32, sequence: Sequence) -> Result<Self, ()> {
+	fn new<F: FnOnce(&bitcoin::Script) -> bool>(
+		prevtx: Transaction, vout: u32, sequence: Sequence, witness_weight: Weight,
+		script_filter: F,
+	) -> Result<Self, ()> {
 		Ok(FundingTxInput {
 			utxo: Utxo {
 				outpoint: bitcoin::OutPoint { txid: prevtx.compute_txid(), vout },
 				output: prevtx
 					.output
 					.get(vout as usize)
-					.filter(|output| output.script_pubkey.is_p2wpkh())
+					.filter(|output| script_filter(&output.script_pubkey))
 					.ok_or(())?
 					.clone(),
-				satisfaction_weight: EMPTY_SCRIPT_SIG_WEIGHT + P2WPKH_WITNESS_WEIGHT,
+				satisfaction_weight: EMPTY_SCRIPT_SIG_WEIGHT + witness_weight.to_wu(),
 			},
 			sequence,
 			prevtx,
 		})
 	}
+
+	/// Creates an input spending a P2WPKH output from the given `prevtx` at index `vout` using the
+	/// provided `sequence` number.
+	///
+	/// Returns `Err` if no such output exists in `prevtx` at index `vout`.
+	pub fn new_p2wpkh(prevtx: Transaction, vout: u32, sequence: Sequence) -> Result<Self, ()> {
+		let witness_weight = Weight::from_wu(P2WPKH_WITNESS_WEIGHT);
+		FundingTxInput::new(prevtx, vout, sequence, witness_weight, bitcoin::Script::is_p2wpkh)
+	}
+
+	/// Creates an input spending a P2WSH output from the given `prevtx` at index `vout` using the
+	/// provided `sequence` number.
+	///
+	/// Requires passing the weight of witness needed to satisfy the output's script.
+	///
+	/// Returns `Err` if no such output exists in `prevtx` at index `vout`.
+	pub fn new_p2wsh(
+		prevtx: Transaction, vout: u32, sequence: Sequence, witness_weight: Weight,
+	) -> Result<Self, ()> {
+		FundingTxInput::new(prevtx, vout, sequence, witness_weight, bitcoin::Script::is_p2wsh)
+	}
+
+	/// Creates an input spending a P2TR output from the given `prevtx` at index `vout` using the
+	/// provided `sequence` number.
+	///
+	/// This is meant for inputs spending a taproot output using the key path. See
+	/// [`new_p2tr_script_spend`] for when spending using a script path.
+	///
+	/// Returns `Err` if no such output exists in `prevtx` at index `vout`.
+	///
+	/// [`new_p2tr_script_spend`]: Self::new_p2tr_script_spend
+	pub fn new_p2tr_key_spend(
+		prevtx: Transaction, vout: u32, sequence: Sequence,
+	) -> Result<Self, ()> {
+		let witness_weight = Weight::from_wu(P2TR_KEY_PATH_WITNESS_WEIGHT);
+		FundingTxInput::new(prevtx, vout, sequence, witness_weight, bitcoin::Script::is_p2tr)
+	}
+
+	/// Creates an input spending a P2TR output from the given `prevtx` at index `vout` using the
+	/// provided `sequence` number.
+	///
+	/// Requires passing the weight of witness needed to satisfy a script path of the taproot
+	/// output. See [`new_p2tr_key_spend`] for when spending using the key path.
+	///
+	/// Returns `Err` if no such output exists in `prevtx` at index `vout`.
+	///
+	/// [`new_p2tr_key_spend`]: Self::new_p2tr_key_spend
+	pub fn new_p2tr_script_spend(
+		prevtx: Transaction, vout: u32, sequence: Sequence, witness_weight: Weight,
+	) -> Result<Self, ()> {
+		FundingTxInput::new(prevtx, vout, sequence, witness_weight, bitcoin::Script::is_p2tr)
+	}
 }
 
 // We hold various information about HTLC relay in the HTLC objects in Channel itself: