Add funding redeem script to `SplicePending' event

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 can be used to spend the funding output for this channel.
+		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/channelmanager.rs

@@ -6489,6 +6489,9 @@ 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: chan
+												.funding
+												.get_funding_redeemscript(),
 										},
 										None,
 									));
@@ -9732,6 +9735,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: channel.funding.get_funding_redeemscript(),
 								},
 								None,
 							));
@@ -10801,6 +10805,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: chan.funding.get_funding_redeemscript(),
 								},
 								None,
 							));