fix Use SharedOwnedInput for shared_funding_input

Author: optout21

lightning/src/ln/interactivetxs.rs

@@ -496,7 +496,7 @@ struct NegotiationContext {
 	/// - For the acceptor:
 	/// The expected previous funding input. It should be added by the initiator node.
 	/// The values are the output value and the holder's part of the shared input.
-	shared_funding_input: Option<(OutPoint, u64, u64)>,
+	shared_funding_input: Option<SharedOwnedInput>,
 	/// The intended/extended funding output, potentially co-owned by both peers (shared).
 	/// - For the initiator:
 	/// The output intended to be the new funding output. This will be added alonside to the
@@ -540,9 +540,8 @@ fn is_serial_id_valid_for_counterparty(holder_is_initiator: bool, serial_id: Ser
 impl NegotiationContext {
 	fn new(
 		holder_node_id: PublicKey, counterparty_node_id: PublicKey, holder_is_initiator: bool,
-		shared_funding_input: Option<(OutPoint, u64, u64)>,
-		shared_funding_output: SharedOwnedOutput, tx_locktime: AbsoluteLockTime,
-		feerate_sat_per_kw: u32,
+		shared_funding_input: Option<SharedOwnedInput>, shared_funding_output: SharedOwnedOutput,
+		tx_locktime: AbsoluteLockTime, feerate_sat_per_kw: u32,
 	) -> Self {
 		NegotiationContext {
 			holder_node_id,
@@ -636,21 +635,13 @@ impl NegotiationContext {
 					return Err(AbortReason::DuplicateFundingInput);
 				}
 				// Check if received shared input matches the expected
-				if !(shared_funding_input.0.txid == *shared_txid
-					&& shared_funding_input.0.vout == msg.prevtx_out)
+				if !(shared_funding_input.input.previous_output.txid == *shared_txid
+					&& shared_funding_input.input.previous_output.vout == msg.prevtx_out)
 				{
 					return Err(AbortReason::UnexpectedFundingInput);
 				} else {
 					let previous_output = OutPoint { txid: *shared_txid, vout: msg.prevtx_out };
-					let txin = TxIn {
-						previous_output,
-						sequence: Sequence(msg.sequence),
-						..Default::default()
-					};
-					let local_owned_sats = shared_funding_input.2;
-					let shared_input =
-						SharedOwnedInput::new(txin, shared_funding_input.1, local_owned_sats);
-					(InputOwned::Shared(shared_input), previous_output)
+					(InputOwned::Shared(shared_funding_input.clone()), previous_output)
 				}
 			} else {
 				return Err(AbortReason::UnexpectedFundingInput);
@@ -837,15 +828,8 @@ impl NegotiationContext {
 		let vout = msg.prevtx_out as usize;
 		let (prev_outpoint, input) = if let Some(shared_input_txid) = msg.shared_input_txid {
 			let prev_outpoint = OutPoint { txid: shared_input_txid, vout: msg.prevtx_out };
-			let txin = TxIn {
-				previous_output: prev_outpoint,
-				sequence: Sequence(msg.sequence),
-				..Default::default()
-			};
 			if let Some(shared_funding_input) = &self.shared_funding_input {
-				let value = shared_funding_input.1;
-				let local_owned = shared_funding_input.2;
-				(prev_outpoint, InputOwned::Shared(SharedOwnedInput::new(txin, value, local_owned)))
+				(prev_outpoint, InputOwned::Shared(shared_funding_input.clone()))
 			} else {
 				return Err(AbortReason::UnexpectedFundingInput);
 			}
@@ -952,11 +936,9 @@ impl NegotiationContext {
 		let opt_shared_funding_input = self.shared_funding_input.clone();
 		let constructed_tx = ConstructedTransaction::new(self);
 		if let Some(shared_funding_input) = &opt_shared_funding_input {
-			if !constructed_tx
-				.inputs
-				.iter()
-				.any(|input| input.txin().previous_output == shared_funding_input.0)
-			{
+			if !constructed_tx.inputs.iter().any(|input| {
+				input.txin().previous_output == shared_funding_input.input.previous_output
+			}) {
 				return Err(AbortReason::MissingFundingInput);
 			}
 		}
@@ -1179,8 +1161,7 @@ impl StateMachine {
 	fn new(
 		holder_node_id: PublicKey, counterparty_node_id: PublicKey, feerate_sat_per_kw: u32,
 		is_initiator: bool, tx_locktime: AbsoluteLockTime,
-		shared_funding_input: Option<(OutPoint, u64, u64)>,
-		shared_funding_output: SharedOwnedOutput,
+		shared_funding_input: Option<SharedOwnedInput>, shared_funding_output: SharedOwnedOutput,
 	) -> Self {
 		let context = NegotiationContext::new(
 			holder_node_id,
@@ -1275,7 +1256,7 @@ impl_writeable_tlv_based!(SingleOwnedInput, {
 });
 
 #[derive(Clone, Debug, Eq, PartialEq)]
-struct SharedOwnedInput {
+pub(super) struct SharedOwnedInput {
 	input: TxIn,
 	value: u64,
 	local_owned: u64,
@@ -1691,7 +1672,7 @@ where
 	pub is_initiator: bool,
 	pub funding_tx_locktime: AbsoluteLockTime,
 	pub inputs_to_contribute: Vec<(TxIn, TransactionU16LenLimited)>,
-	pub shared_funding_input: Option<(OutPoint, u64, u64)>,
+	pub shared_funding_input: Option<SharedOwnedInput>,
 	pub shared_funding_output: SharedOwnedOutput,
 	pub outputs_to_contribute: Vec<TxOut>,
 }
@@ -1754,19 +1735,12 @@ impl InteractiveTxConstructor {
 			if is_initiator {
 				// Add shared funding input
 				let serial_id = generate_holder_serial_id(entropy_source, is_initiator);
-				let value = shared_funding_input.1;
-				let local_owned = shared_funding_input.2;
 				// Sanity check
-				if local_owned > value {
+				if shared_funding_input.local_owned > shared_funding_input.value {
 					return Err(AbortReason::InvalidLowFundingInputValue);
 				}
-				let txin = TxIn {
-					previous_output: shared_funding_input.0,
-					sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
-					..Default::default()
-				};
-				let input = SharedOwnedInput::new(txin, value, local_owned);
-				inputs_to_contribute.push((serial_id, InputOwned::Shared(input)));
+				inputs_to_contribute
+					.push((serial_id, InputOwned::Shared(shared_funding_input.clone())));
 			}
 		}
 		// We'll sort by the randomly generated serial IDs, effectively shuffling the order of the inputs
@@ -1991,7 +1965,7 @@ mod tests {
 	use crate::ln::interactivetxs::{
 		calculate_change_output_value, generate_holder_serial_id, AbortReason,
 		HandleTxCompleteValue, InteractiveTxConstructor, InteractiveTxConstructorArgs,
-		InteractiveTxMessageSend, SharedOwnedOutput, MAX_INPUTS_OUTPUTS_COUNT,
+		InteractiveTxMessageSend, SharedOwnedInput, SharedOwnedOutput, MAX_INPUTS_OUTPUTS_COUNT,
 		MAX_RECEIVED_TX_ADD_INPUT_COUNT, MAX_RECEIVED_TX_ADD_OUTPUT_COUNT,
 	};
 	use crate::ln::types::ChannelId;
@@ -2111,7 +2085,17 @@ mod tests {
 			is_initiator: true,
 			funding_tx_locktime,
 			inputs_to_contribute: session.inputs_a,
-			shared_funding_input: session.a_shared_input,
+			shared_funding_input: session.a_shared_input.map(|(op, val, lo)| {
+				SharedOwnedInput::new(
+					TxIn {
+						previous_output: op,
+						sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
+						..Default::default()
+					},
+					val,
+					lo,
+				)
+			}),
 			shared_funding_output: SharedOwnedOutput::new(
 				session.shared_output_a.0,
 				session.shared_output_a.1,
@@ -2138,7 +2122,17 @@ mod tests {
 			is_initiator: false,
 			funding_tx_locktime,
 			inputs_to_contribute: session.inputs_b,
-			shared_funding_input: session.b_shared_input,
+			shared_funding_input: session.b_shared_input.map(|(op, val, lo)| {
+				SharedOwnedInput::new(
+					TxIn {
+						previous_output: op,
+						sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
+						..Default::default()
+					},
+					val,
+					lo,
+				)
+			}),
 			shared_funding_output: SharedOwnedOutput::new(
 				session.shared_output_b.0,
 				session.shared_output_b.1,