Remove duplicate TxOut persistence

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index a488b50..e5c7df6 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -6108,8 +6108,8 @@ where
 	{
 		let mut output_index = None;
 		let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
-		for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
-			if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
+		for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
+			if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 				if output_index.is_some() {
 					return Err(AbortReason::DuplicateFundingOutput);
 				}
diff --git a/lightning/src/ln/interactivetxs.rs b/lightning/src/ln/interactivetxs.rs
index 4e31d17..56800e1 100644
--- a/lightning/src/ln/interactivetxs.rs
+++ b/lightning/src/ln/interactivetxs.rs
@@ -199,7 +199,7 @@ pub(crate) struct ConstructedTransaction {
 	holder_is_initiator: bool,
 
 	input_metadata: Vec<TxInMetadata>,
-	outputs: Vec<InteractiveTxOutput>,
+	output_metadata: Vec<TxOutMetadata>,
 	tx: Transaction,
 
 	local_inputs_value_satoshis: u64,
@@ -217,6 +217,11 @@ pub(crate) struct TxInMetadata {
 	prev_output: TxOut,
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct TxOutMetadata {
+	serial_id: SerialId,
+}
+
 impl TxInMetadata {
 	pub(super) fn is_local(&self, holder_is_initiator: bool) -> bool {
 		!is_serial_id_valid_for_counterparty(holder_is_initiator, self.serial_id)
@@ -227,15 +232,25 @@ impl TxInMetadata {
 	}
 }
 
+impl TxOutMetadata {
+	pub(super) fn is_local(&self, holder_is_initiator: bool) -> bool {
+		!is_serial_id_valid_for_counterparty(holder_is_initiator, self.serial_id)
+	}
+}
+
 impl_writeable_tlv_based!(TxInMetadata, {
 	(1, serial_id, required),
 	(3, prev_output, required),
 });
 
+impl_writeable_tlv_based!(TxOutMetadata, {
+	(1, serial_id, required),
+});
+
 impl_writeable_tlv_based!(ConstructedTransaction, {
 	(1, holder_is_initiator, required),
 	(3, input_metadata, required),
-	(5, outputs, required),
+	(5, output_metadata, required),
 	(7, tx, required),
 	(9, local_inputs_value_satoshis, required),
 	(11, local_outputs_value_satoshis, required),
@@ -281,9 +296,10 @@ impl ConstructedTransaction {
 
 		let mut inputs: Vec<(TxIn, TxInMetadata)> =
 			context.inputs.into_values().map(|input| input.into_txin_and_metadata()).collect();
-		let mut outputs: Vec<InteractiveTxOutput> = context.outputs.into_values().collect();
+		let mut outputs: Vec<(TxOut, TxOutMetadata)> =
+			context.outputs.into_values().map(|output| output.into_txout_and_metadata()).collect();
 		inputs.sort_unstable_by_key(|(_, input)| input.serial_id);
-		outputs.sort_unstable_by_key(|output| output.serial_id);
+		outputs.sort_unstable_by_key(|(_, output)| output.serial_id);
 
 		let shared_input_index =
 			context.shared_funding_input.as_ref().and_then(|shared_funding_input| {
@@ -296,7 +312,8 @@ impl ConstructedTransaction {
 			});
 
 		let (input, input_metadata): (Vec<TxIn>, Vec<TxInMetadata>) = inputs.into_iter().unzip();
-		let output = outputs.iter().map(|output| output.tx_out().clone()).collect();
+		let (output, output_metadata): (Vec<TxOut>, Vec<TxOutMetadata>) =
+			outputs.into_iter().unzip();
 
 		let tx =
 			Transaction { version: Version::TWO, lock_time: context.tx_locktime, input, output };
@@ -316,7 +333,7 @@ impl ConstructedTransaction {
 			remote_outputs_value_satoshis,
 
 			input_metadata,
-			outputs,
+			output_metadata,
 			tx,
 
 			shared_input_index,
@@ -327,10 +344,6 @@ impl ConstructedTransaction {
 		&self.tx
 	}
 
-	pub fn outputs(&self) -> impl Iterator<Item = &InteractiveTxOutput> {
-		self.outputs.iter()
-	}
-
 	pub fn input_metadata(&self) -> impl Iterator<Item = &TxInMetadata> {
 		self.input_metadata.iter()
 	}
@@ -559,15 +572,10 @@ impl InteractiveTxSigningSession {
 
 	fn local_outputs_count(&self) -> usize {
 		self.unsigned_tx
-			.outputs
+			.output_metadata
 			.iter()
 			.enumerate()
-			.filter(|(_, output)| {
-				!is_serial_id_valid_for_counterparty(
-					self.unsigned_tx.holder_is_initiator,
-					output.serial_id,
-				)
-			})
+			.filter(|(_, output)| output.is_local(self.unsigned_tx.holder_is_initiator))
 			.count()
 	}
 
@@ -1771,12 +1779,6 @@ pub(crate) struct InteractiveTxOutput {
 	output: OutputOwned,
 }
 
-impl_writeable_tlv_based!(InteractiveTxOutput, {
-	(1, serial_id, required),
-	(3, added_by, required),
-	(5, output, required),
-});
-
 impl InteractiveTxOutput {
 	pub fn tx_out(&self) -> &TxOut {
 		self.output.tx_out()
@@ -1801,6 +1803,11 @@ impl InteractiveTxOutput {
 	pub fn script_pubkey(&self) -> &ScriptBuf {
 		&self.output.tx_out().script_pubkey
 	}
+
+	fn into_txout_and_metadata(self) -> (TxOut, TxOutMetadata) {
+		let txout = self.output.into_tx_out();
+		(txout, TxOutMetadata { serial_id: self.serial_id })
+	}
 }
 
 impl InteractiveTxInput {
@@ -2224,9 +2231,9 @@ mod tests {
 	use core::ops::Deref;
 
 	use super::{
-		get_output_weight, AddingRole, ConstructedTransaction, InteractiveTxOutput,
-		InteractiveTxSigningSession, OutputOwned, TxInMetadata, P2TR_INPUT_WEIGHT_LOWER_BOUND,
-		P2WPKH_INPUT_WEIGHT_LOWER_BOUND, P2WSH_INPUT_WEIGHT_LOWER_BOUND, TX_COMMON_FIELDS_WEIGHT,
+		get_output_weight, ConstructedTransaction, InteractiveTxSigningSession, TxInMetadata,
+		P2TR_INPUT_WEIGHT_LOWER_BOUND, P2WPKH_INPUT_WEIGHT_LOWER_BOUND,
+		P2WSH_INPUT_WEIGHT_LOWER_BOUND, TX_COMMON_FIELDS_WEIGHT,
 	};
 
 	const TEST_FEERATE_SATS_PER_KW: u32 = FEERATE_FLOOR_SATS_PER_KW * 10;
@@ -3309,21 +3316,10 @@ mod tests {
 			})
 			.collect();
 
-		let outputs: Vec<InteractiveTxOutput> = transaction
-			.output
-			.iter()
-			.cloned()
-			.map(|txout| InteractiveTxOutput {
-				serial_id: 0, // N/A for test
-				added_by: AddingRole::Local,
-				output: OutputOwned::Single(txout),
-			})
-			.collect();
-
 		let unsigned_tx = ConstructedTransaction {
 			holder_is_initiator: true,
 			input_metadata,
-			outputs,
+			output_metadata: vec![], // N/A for test
 			tx: transaction.clone(),
 			local_inputs_value_satoshis: 0,   // N/A for test
 			local_outputs_value_satoshis: 0,  // N/A for test
diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index a5c3518..afcde50 100644
--- a/lightning/src/util/ser.rs
+++ b/lightning/src/util/ser.rs
@@ -15,7 +15,7 @@
 
 use crate::io::{self, BufRead, Read, Write};
 use crate::io_extras::{copy, sink};
-use crate::ln::interactivetxs::{InteractiveTxOutput, TxInMetadata};
+use crate::ln::interactivetxs::{TxInMetadata, TxOutMetadata};
 use crate::ln::onion_utils::{HMAC_COUNT, HMAC_LEN, HOLD_TIME_LEN, MAX_HOPS};
 use crate::prelude::*;
 use crate::sync::{Mutex, RwLock};
@@ -1083,7 +1083,7 @@ impl_for_vec!(crate::ln::msgs::SocketAddress);
 impl_for_vec!((A, B), A, B);
 impl_for_vec!(SerialId);
 impl_for_vec!(TxInMetadata);
-impl_for_vec!(InteractiveTxOutput);
+impl_for_vec!(TxOutMetadata);
 impl_for_vec!(crate::ln::our_peer_storage::PeerStorageMonitorHolder);
 impl_for_vec!(crate::blinded_path::message::BlindedMessagePath);
 impl_writeable_for_vec!(&crate::routing::router::BlindedTail);