Add funding redeem script to `SplicePending' event

Backport of e3ebe7a

Author: benthecarman

lightning/src/events/mod.rs

@@ -1536,6 +1536,8 @@ pub enum Event {
 		/// The features that this channel will operate with. Currently, these will be the same
 		/// features that the channel was opened with, but in the future splices may change them.
 		channel_type: ChannelTypeFeatures,
+		/// The witness script that is used to lock the channel's funding output to commitment transactions.
+		new_funding_redeem_script: ScriptBuf,
 	},
 	/// Used to indicate that a splice for the given `channel_id` has failed.
 	///
@@ -2313,6 +2315,7 @@ impl Writeable for Event {
 				ref counterparty_node_id,
 				ref new_funding_txo,
 				ref channel_type,
+				ref new_funding_redeem_script,
 			} => {
 				50u8.write(writer)?;
 				write_tlv_fields!(writer, {
@@ -2321,6 +2324,7 @@ impl Writeable for Event {
 					(5, user_channel_id, required),
 					(7, counterparty_node_id, required),
 					(9, new_funding_txo, required),
+					(11, new_funding_redeem_script, required),
 				});
 			},
 			&Event::SpliceFailed {
@@ -2936,6 +2940,7 @@ impl MaybeReadable for Event {
 						(5, user_channel_id, required),
 						(7, counterparty_node_id, required),
 						(9, new_funding_txo, required),
+						(11, new_funding_redeem_script, required),
 					});
 
 					Ok(Some(Event::SplicePending {
@@ -2944,6 +2949,7 @@ impl MaybeReadable for Event {
 						counterparty_node_id: counterparty_node_id.0.unwrap(),
 						new_funding_txo: new_funding_txo.0.unwrap(),
 						channel_type: channel_type.0.unwrap(),
+						new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 					}))
 				};
 				f()

lightning/src/ln/channel.rs

@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {
 
 	/// The features that this channel will operate with.
 	pub channel_type: ChannelTypeFeatures,
+
+	/// The redeem script of the funding output.
+	pub funding_redeem_script: ScriptBuf,
 }
 
 /// Information about a splice funding negotiation that has failed.
@@ -8936,12 +8939,14 @@ where
 				let funding_txo =
 					funding.get_funding_txo().expect("funding outpoint should be set");
 				let channel_type = funding.get_channel_type().clone();
+				let funding_redeem_script = funding.get_funding_redeemscript();
 
 				pending_splice.negotiated_candidates.push(funding);
 
 				let splice_negotiated = SpliceFundingNegotiated {
 					funding_txo: funding_txo.into_bitcoin_outpoint(),
 					channel_type,
+					funding_redeem_script,
 				};
 
 				let splice_locked = pending_splice.check_get_splice_locked(

lightning/src/ln/channelmanager.rs

@@ -6459,6 +6459,8 @@ where
 											user_channel_id: chan.context.get_user_id(),
 											new_funding_txo: splice_negotiated.funding_txo,
 											channel_type: splice_negotiated.channel_type,
+											new_funding_redeem_script: splice_negotiated
+												.funding_redeem_script,
 										},
 										None,
 									));
@@ -9623,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 									user_channel_id: channel.context.get_user_id(),
 									new_funding_txo: splice_negotiated.funding_txo,
 									channel_type: splice_negotiated.channel_type,
+									new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 								},
 								None,
 							));
@@ -10652,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 									user_channel_id: chan.context.get_user_id(),
 									new_funding_txo: splice_negotiated.funding_txo,
 									channel_type: splice_negotiated.channel_type,
+									new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 								},
 								None,
 							));